Upstream android net related code (part 2)

net/http/http_response_headers_unittest.cc

 // Copyright (c) 2011 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 <algorithm>
 
 #include "base/basictypes.h"
 #include "base/pickle.h"
 #include "base/time.h"
 #include "net/http/http_response_headers.h"
@@ skipping 17 matching lines @@
   const bool has_charset;
   const std::string all_content_type;
 };
 
 class HttpResponseHeadersTest : public testing::Test {
 };
 
 // Transform "normal"-looking headers (\n-separated) to the appropriate
 // input format for ParseRawHeaders (\0-separated).
 void HeadersToRaw(std::string* headers) {
-  replace(headers->begin(), headers->end(), '\n', '\0');
+  std::replace(headers->begin(), headers->end(), '\n', '\0');
   if (!headers->empty())
     *headers += '\0';
 }
 
 void TestCommon(const TestData& test) {
   std::string raw_headers(test.raw_headers);
   HeadersToRaw(&raw_headers);
   std::string expected_headers(test.expected_headers);
 
   std::string headers;
   scoped_refptr<net::HttpResponseHeaders> parsed(
       new net::HttpResponseHeaders(raw_headers));
   parsed->GetNormalizedHeaders(&headers);
 
   // Transform to readable output format (so it's easier to see diffs).
-  replace(headers.begin(), headers.end(), ' ', '_');
-  replace(headers.begin(), headers.end(), '\n', '\\');
-  replace(expected_headers.begin(), expected_headers.end(), ' ', '_');
-  replace(expected_headers.begin(), expected_headers.end(), '\n', '\\');
+  std::replace(headers.begin(), headers.end(), ' ', '_');
+  std::replace(headers.begin(), headers.end(), '\n', '\\');
+  std::replace(expected_headers.begin(), expected_headers.end(), ' ', '_');
+  std::replace(expected_headers.begin(), expected_headers.end(), '\n', '\\');
 
   EXPECT_EQ(expected_headers, headers);
 
   EXPECT_EQ(test.expected_response_code, parsed->response_code());
 
   EXPECT_TRUE(test.expected_parsed_version == parsed->GetParsedHttpVersion());
   EXPECT_TRUE(test.expected_version == parsed->GetHttpVersion());
 }
 
 } // end namespace
@@ skipping 1603 matching lines @@
         new net::HttpResponseHeaders(orig_headers));
 
     std::string name(tests[i].new_status);
     parsed->ReplaceStatusLine(name);
 
     std::string resulting_headers;
     parsed->GetNormalizedHeaders(&resulting_headers);
     EXPECT_EQ(std::string(tests[i].expected_headers), resulting_headers);
   }
 }