Replace the existing SpdyHeaderBlock typedef with a class.

net/tools/flip_server/spdy_interface_test.cc

 // Copyright 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/tools/flip_server/spdy_interface.h"
 
 #include <list>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
@@ skipping 377 matching lines @@
 
   std::list<DataFrame*>::const_iterator i = connection_->output_list()->begin();
   DataFrame* df = *i++;
   spdy_framer_->ProcessInput(df->data, df->size);
   checkpoint.Call(0);
   df = *i++;
   spdy_framer_->ProcessInput(df->data, df->size);
 
   ASSERT_EQ(2, spdy_framer_->frames_received());
   ASSERT_EQ(2u, actual_header_block.size());
-  ASSERT_EQ("404 Not Found", actual_header_block[":status"]);
-  ASSERT_EQ("HTTP/1.1", actual_header_block[":version"]);
+  ASSERT_EQ("404 Not Found",
+            static_cast<StringPiece>(actual_header_block[":status"]));
+  ASSERT_EQ("HTTP/1.1",
+            static_cast<StringPiece>(actual_header_block[":version"]));
   ASSERT_EQ("wtf?", StringPiece(actual_data, actual_size));
 }
 
 TEST_P(SpdySMProxyTest, SendSynStream) {
   uint32 stream_id = 82;
   BalsaHeaders headers;
   SpdyHeaderBlock actual_header_block;
   headers.AppendHeader("key1", "value1");
   headers.AppendHeader("Host", "www.example.com");
   headers.SetRequestFirstlineFromStringPieces("GET", "/path", "HTTP/1.1");
 
   interface_->SendSynStream(stream_id, headers);
 
   ASSERT_EQ(1u, connection_->output_list()->size());
   std::list<DataFrame*>::const_iterator i = connection_->output_list()->begin();
   DataFrame* df = *i++;
 
   {
     InSequence s;
     EXPECT_CALL(*spdy_framer_visitor_,
                 OnSynStream(stream_id, 0, _, false, false, _))
         .WillOnce(SaveArg<5>(&actual_header_block));
   }
 
   spdy_framer_->ProcessInput(df->data, df->size);
   ASSERT_EQ(1, spdy_framer_->frames_received());
   ASSERT_EQ(5u, actual_header_block.size());
-  ASSERT_EQ("GET", actual_header_block[":method"]);
-  ASSERT_EQ("HTTP/1.1", actual_header_block[":version"]);
-  ASSERT_EQ("/path", actual_header_block[":path"]);
-  ASSERT_EQ("www.example.com", actual_header_block[":host"]);
-  ASSERT_EQ("value1", actual_header_block["key1"]);
+  ASSERT_EQ("GET", static_cast<StringPiece>(actual_header_block[":method"]));
+  ASSERT_EQ("HTTP/1.1",
+            static_cast<StringPiece>(actual_header_block[":version"]));
+  ASSERT_EQ("/path", static_cast<StringPiece>(actual_header_block[":path"]));
+  ASSERT_EQ("www.example.com",
+            static_cast<StringPiece>(actual_header_block[":host"]));
+  ASSERT_EQ("value1", static_cast<StringPiece>(actual_header_block["key1"]));
 }
 
 TEST_P(SpdySMProxyTest, SendSynReply) {
   uint32 stream_id = 82;
   BalsaHeaders headers;
   SpdyHeaderBlock actual_header_block;
   headers.AppendHeader("key1", "value1");
   headers.SetResponseFirstlineFromStringPieces("HTTP/1.1", "200", "OK");
 
   interface_->SendSynReply(stream_id, headers);
@@ skipping 11 matching lines @@
       EXPECT_CALL(*spdy_framer_visitor_,
                   OnHeaders(stream_id, /*has_priority=*/false, _, _, _,
                             /*fin=*/false, _))
           .WillOnce(SaveArg<6>(&actual_header_block));
     }
   }
 
   spdy_framer_->ProcessInput(df->data, df->size);
   ASSERT_EQ(1, spdy_framer_->frames_received());
   ASSERT_EQ(3u, actual_header_block.size());
-  ASSERT_EQ("200 OK", actual_header_block[":status"]);
-  ASSERT_EQ("HTTP/1.1", actual_header_block[":version"]);
-  ASSERT_EQ("value1", actual_header_block["key1"]);
+  ASSERT_EQ("200 OK", static_cast<StringPiece>(actual_header_block[":status"]));
+  ASSERT_EQ("HTTP/1.1",
+            static_cast<StringPiece>(actual_header_block[":version"]));
+  ASSERT_EQ("value1", static_cast<StringPiece>(actual_header_block["key1"]));
 }
 
 TEST_P(SpdySMProxyTest, SendDataFrame) {
   uint32 stream_id = 133;
   SpdyDataFlags flags = DATA_FLAG_NONE;
   const char* actual_data;
   size_t actual_size;
 
   interface_->SendDataFrame(stream_id, "hello", 5, flags, true);
 
@@ skipping 119 matching lines @@
 
   std::list<DataFrame*>::const_iterator i = connection_->output_list()->begin();
   DataFrame* df = *i++;
   spdy_framer_->ProcessInput(df->data, df->size);
   checkpoint.Call(0);
   df = *i++;
   spdy_framer_->ProcessInput(df->data, df->size);
 
   ASSERT_EQ(2, spdy_framer_->frames_received());
   ASSERT_EQ(2u, actual_header_block.size());
-  ASSERT_EQ("404 Not Found", actual_header_block["status"]);
-  ASSERT_EQ("HTTP/1.1", actual_header_block["version"]);
+  ASSERT_EQ("404 Not Found",
+            static_cast<StringPiece>(actual_header_block["status"]));
+  ASSERT_EQ("HTTP/1.1",
+            static_cast<StringPiece>(actual_header_block["version"]));
   ASSERT_EQ("wtf?", StringPiece(actual_data, actual_size));
 }
 
 }  // namespace
 
 }  // namespace net