Revert r42300: "HttpRequestHeaders refactor."

net/url_request/url_request_unittest.cc

 // Copyright (c) 2006-2009 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/url_request/url_request_unittest.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 1074 matching lines @@
 TEST_F(URLRequestTestHTTP, VaryHeader) {
   ASSERT_TRUE(NULL != server_.get());
 
   scoped_refptr<URLRequestContext> context = new URLRequestTestContext();
 
   // populate the cache
   {
     TestDelegate d;
     URLRequest req(server_->TestServerPage("echoheader?foo"), &d);
     req.set_context(context);
-    req.SetExtraRequestHeaders("foo: 1");
+    req.SetExtraRequestHeaders("foo:1");
     req.Start();
     MessageLoop::current()->Run();
   }
 
   // expect a cache hit
   {
     TestDelegate d;
     URLRequest req(server_->TestServerPage("echoheader?foo"), &d);
     req.set_context(context);
-    req.SetExtraRequestHeaders("foo: 1");
+    req.SetExtraRequestHeaders("foo:1");
     req.Start();
     MessageLoop::current()->Run();
 
     EXPECT_TRUE(req.was_cached());
   }
 
   // expect a cache miss
   {
     TestDelegate d;
     URLRequest req(server_->TestServerPage("echoheader?foo"), &d);
     req.set_context(context);
-    req.SetExtraRequestHeaders("foo: 2");
+    req.SetExtraRequestHeaders("foo:2");
     req.Start();
     MessageLoop::current()->Run();
 
     EXPECT_FALSE(req.was_cached());
   }
 }
 
 TEST_F(URLRequestTestHTTP, BasicAuth) {
   scoped_refptr<URLRequestContext> context = new URLRequestTestContext();
   ASSERT_TRUE(NULL != server_.get());
@@ skipping 1387 matching lines @@
   ASSERT_TRUE(NULL != server_.get());
   TestDelegate d;
   TestURLRequest
       req(server_->TestServerPage("echoheaderoverride?Accept-Charset"), &d);
   req.set_context(new URLRequestTestContext());
   req.SetExtraRequestHeaders("Accept-Charset: koi-8r");
   req.Start();
   MessageLoop::current()->Run();
   EXPECT_EQ(std::string("koi-8r"), d.data_received());
 }