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

net/spdy/spdy_frame_builder_test.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/spdy_frame_builder.h"
 
 #include "net/spdy/spdy_framer.h"
 #include "net/spdy/spdy_protocol.h"
 #include "testing/platform_test.h"
 
 namespace net {
 
 class SpdyFrameBuilderTest : public ::testing::TestWithParam<SpdyMajorVersion> {
  protected:
-  virtual void SetUp() {
-    spdy_version_ = GetParam();
-  }
+  void SetUp() override { spdy_version_ = GetParam(); }
 
   // Major version of SPDY protocol to be used.
   SpdyMajorVersion spdy_version_;
 };
 
 // All tests are run with two different SPDY versions: SPDY/2 and SPDY/3.
 INSTANTIATE_TEST_CASE_P(SpdyFrameBuilderTests,
                         SpdyFrameBuilderTest,
                         ::testing::Values(SPDY2, SPDY3, SPDY4));
 
@@ skipping 42 matching lines @@
   scoped_ptr<SpdyFrame> expected(framer.SerializeHeaders(headers_ir));
   SpdyFrameBuilder builder(expected->size(), spdy_version_);
   builder.BeginNewFrame(framer, HEADERS, 0, 1);
   builder.OverwriteFlags(framer, HEADERS_FLAG_END_HEADERS);
   scoped_ptr<SpdyFrame> built(builder.take());
   EXPECT_EQ(base::StringPiece(expected->data(), expected->size()),
             base::StringPiece(built->data(), built->size()));
 }
 
 }  // namespace net