Update from https://crrev.com/309415

net/spdy/spdy_headers_block_parser_test.cc

 // Copyright 2014 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_headers_block_parser.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 21 matching lines @@
 
 class SpdyHeadersBlockParserTest :
     public ::testing::TestWithParam<SpdyMajorVersion> {
  public:
   virtual ~SpdyHeadersBlockParserTest() {}
 
  protected:
   void SetUp() override {
     // Create a parser using the mock handler.
     spdy_version_ = GetParam();
+
     parser_.reset(new SpdyHeadersBlockParser(spdy_version_, &handler_));
     length_field_size_ =
         SpdyHeadersBlockParser::LengthFieldSizeForVersion(spdy_version_);
   }
 
   // Create a header block with a specified number of headers.
   string CreateHeaders(uint32_t num_headers, bool insert_nulls) {
     string headers;
 
     // First, write the number of headers in the header block.
@@ skipping 165 matching lines @@
 TEST_P(SpdyHeadersBlockParserTest, LargeBlocksDiscardedTest) {
   // Header block with too many headers.
   {
     string headers = EncodeLength(
         parser_->MaxNumberOfHeadersForVersion(spdy_version_) + 1);
     EXPECT_FALSE(parser_->
         HandleControlFrameHeadersData(1, headers.c_str(), headers.length()));
     EXPECT_EQ(SpdyHeadersBlockParser::HEADER_BLOCK_TOO_LARGE,
               parser_->get_error());
   }
-  parser_->Reset();
+  parser_.reset(new SpdyHeadersBlockParser(spdy_version_, &handler_));
   // Header block with one header, which has a too-long key.
   {
     EXPECT_CALL(handler_, OnHeaderBlock(1, 1)).Times(1);
 
     string headers = EncodeLength(1) + EncodeLength(
         SpdyHeadersBlockParser::kMaximumFieldLength + 1);
     EXPECT_FALSE(parser_->
         HandleControlFrameHeadersData(1, headers.c_str(), headers.length()));
     EXPECT_EQ(SpdyHeadersBlockParser::HEADER_FIELD_TOO_LARGE,
               parser_->get_error());
@@ skipping 10 matching lines @@
   string expect_value = kBaseValue + IntToString(0);
   EXPECT_CALL(handler_, OnHeader(1, StringPiece(expect_key),
                                  StringPiece(expect_value))).Times(1);
 
   EXPECT_FALSE(parser_->
       HandleControlFrameHeadersData(1, headers.c_str(), headers.length()));
   EXPECT_EQ(SpdyHeadersBlockParser::TOO_MUCH_DATA, parser_->get_error());
 }
 
 }  // namespace net