Replace the existing SpdyHeaderBlock typedef with a class.

net/spdy/spdy_stream.cc

 // Copyright (c) 2012 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_stream.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 864 matching lines @@
   if (new_response_headers.find("transfer-encoding") !=
       new_response_headers.end()) {
     session_->ResetStream(stream_id_, RST_STREAM_PROTOCOL_ERROR,
                          "Received transfer-encoding header");
     return ERR_SPDY_PROTOCOL_ERROR;
   }
 
   for (SpdyHeaderBlock::const_iterator it = new_response_headers.begin();
       it != new_response_headers.end(); ++it) {
     // Disallow uppercase headers.
-    if (ContainsUppercaseAscii(it->first)) {
-      session_->ResetStream(stream_id_, RST_STREAM_PROTOCOL_ERROR,
-                            "Upper case characters in header: " + it->first);
+    if (ContainsUppercaseAscii(it->first.as_string())) {
+      session_->ResetStream(
+          stream_id_, RST_STREAM_PROTOCOL_ERROR,
+          "Upper case characters in header: " + it->first.as_string());
       return ERR_SPDY_PROTOCOL_ERROR;
     }
 
-    SpdyHeaderBlock::iterator it2 = response_headers_.lower_bound(it->first);
+    SpdyHeaderBlock::iterator it2 =
+        response_headers_.find(it->first.as_string());
     // Disallow duplicate headers.  This is just to be conservative.
-    if (it2 != response_headers_.end() && it2->first == it->first) {
+    if (it2 != response_headers_.end()) {
       session_->ResetStream(stream_id_, RST_STREAM_PROTOCOL_ERROR,
-                            "Duplicate header: " + it->first);
+                            "Duplicate header: " + it->first.as_string());
       return ERR_SPDY_PROTOCOL_ERROR;
     }
 
-    response_headers_.insert(it2, *it);
+    response_headers_.insert(*it);
   }
 
   // If delegate_ is not yet attached, we'll call
   // OnResponseHeadersUpdated() after the delegate gets attached to
   // the stream.
   if (delegate_) {
     // The call to OnResponseHeadersUpdated() below may delete |this|,
     // so use |weak_this| to detect that.
     base::WeakPtr<SpdyStream> weak_this = GetWeakPtr();
 
@@ skipping 34 matching lines @@
       description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
                                        state);
       break;
   }
   return description;
 }
 
 #undef STATE_CASE
 
 }  // namespace net