Replace the existing SpdyHeaderBlock typedef with a class.

net/tools/flip_server/spdy_interface.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/tools/flip_server/spdy_interface.h"
 
 #include <algorithm>
 #include <string>
 
 #include "net/spdy/spdy_framer.h"
@@ skipping 136 matching lines @@
     if (url == headers.end() || method == headers.end() ||
         version == headers.end() || scheme == headers.end()) {
       VLOG(2) << ACCEPTOR_CLIENT_IDENT << "SpdySM: A mandatory header is "
               << "missing. Not creating stream";
       return 0;
     }
     // url->second here only ever seems to contain just the path. When this
     // path contains a query string with a http:// in one of its values,
     // UrlUtilities::GetUrlPath will fail and always return a / breaking
     // the request. GetUrlPath assumes the absolute URL is being passed in.
-    path_string = UrlUtilities::GetUrlPath(url->second);
-    host_string = UrlUtilities::GetUrlHost(url->second);
-    version_string = version->second;
+    path_string = UrlUtilities::GetUrlPath(url->second.as_string());
+    host_string = UrlUtilities::GetUrlHost(url->second.as_string());
+    version_string = version->second.as_string();
   } else {
     method = headers.find(":method");
     host = headers.find(":host");
     path = headers.find(":path");
     scheme = headers.find(":scheme");
     if (method == headers.end() || host == headers.end() ||
         path == headers.end() || scheme == headers.end()) {
       VLOG(2) << ACCEPTOR_CLIENT_IDENT << "SpdySM: A mandatory header is "
               << "missing. Not creating stream";
       return 0;
     }
-    host_string = host->second;
-    path_string = path->second;
+    host_string = host->second.as_string();
+    path_string = path->second.as_string();
     version_string = "HTTP/1.1";
   }
 
   if (scheme->second.compare("https") == 0) {
     *is_https_scheme = true;
   }
 
   if (acceptor_->flip_handler_type_ == FLIP_HANDLER_SPDY_SERVER) {
     VLOG(1) << ACCEPTOR_CLIENT_IDENT << "Request: " << method->second
             << " " << path_string;
-    std::string filename = EncodeURL(path_string,
-                                     host_string,
-                                     method->second);
+    std::string filename =
+        EncodeURL(path_string, host_string, method->second.as_string());
     NewStream(stream_id, priority, filename);
   } else {
-    http_data +=
-        method->second + " " + path_string + " " + version_string + "\r\n";
+    http_data += method->second.as_string() + " " + path_string + " " +
+                 version_string + "\r\n";
     VLOG(1) << ACCEPTOR_CLIENT_IDENT << "Request: " << method->second << " "
             << path_string << " " << version_string;
     http_data += "Host: " + (*is_https_scheme ?
                              acceptor_->https_server_ip_ :
                              acceptor_->http_server_ip_) + "\r\n";
     for (SpdyHeaderBlock::const_iterator i = headers.begin();
          i != headers.end(); ++i) {
       if ((i->first.size() > 0 && i->first[0] == ':') ||
           i->first == "host" ||
           i == method ||
           i == host ||
           i == path ||
           i == scheme ||
           i == version ||
           i == url) {
         // Ignore the entry.
       } else {
-        http_data += i->first + ": " + i->second + "\r\n";
-        VLOG(2) << ACCEPTOR_CLIENT_IDENT << i->first.c_str() << ":"
-                << i->second.c_str();
+        http_data +=
+            i->first.as_string() + ": " + i->second.as_string() + "\r\n";
+        VLOG(2) << ACCEPTOR_CLIENT_IDENT << i->first << ":" << i->second;
       }
     }
     if (forward_ip_header_.length()) {
       // X-Client-Cluster-IP header
       http_data += forward_ip_header_ + ": " +
           connection_->client_ip() + "\r\n";
     }
     http_data += "\r\n";
   }
 
@@ skipping 408 matching lines @@
   }
 }
 
 void SpdySM::CreateFramer(SpdyMajorVersion spdy_version) {
   DCHECK(!buffered_spdy_framer_);
   buffered_spdy_framer_.reset(new BufferedSpdyFramer(spdy_version, true));
   buffered_spdy_framer_->set_visitor(this);
 }
 
 }  // namespace net