Update from chromium https://crrev.com/302282

Updates based on chromium https://crrev.com/302282 /
30228db41b946899ce33f284da0adf2b35188d552de47. Contains updates for
https://crrev.com/301916 and https://crrev.com/301795.

TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/683113005
diff --git a/net/tools/flip_server/spdy_interface.cc b/net/tools/flip_server/spdy_interface.cc
index eec20c0..297045d 100644
--- a/net/tools/flip_server/spdy_interface.cc
+++ b/net/tools/flip_server/spdy_interface.cc
@@ -27,7 +27,7 @@
     size = spdy_frame->size();
   }
 
-  virtual ~SpdyFrameDataFrame() { delete frame; }
+  ~SpdyFrameDataFrame() override { delete frame; }
 
   const SpdyFrame* frame;
 };