Upstream android net related code (part 2)

net/http/http_response_headers_unittest.cc

Index: net/http/http_response_headers_unittest.cc
diff --git a/net/http/http_response_headers_unittest.cc b/net/http/http_response_headers_unittest.cc
index b089cac1687c2fcefeb4f570517f7c159a6cad50..483667c7b2a81a3297acfe69905c7fbece3054d6 100644
--- a/net/http/http_response_headers_unittest.cc
+++ b/net/http/http_response_headers_unittest.cc
@@ -35,7 +35,7 @@ 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';
 }
@@ -51,10 +51,10 @@ void TestCommon(const TestData& test) {
   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);