Rename the embedded test server to EmbeddedTestServer in net::test_server namespace.

chrome/browser/google_apis/test_util.cc

Index: chrome/browser/google_apis/test_util.cc
diff --git a/chrome/browser/google_apis/test_util.cc b/chrome/browser/google_apis/test_util.cc
index 8115f5a2d8a2db8f25a96667c962e9672ff6b5ff..3293729f08038d19dacb13a1e96391345b6dbf42 100644
--- a/chrome/browser/google_apis/test_util.cc
+++ b/chrome/browser/google_apis/test_util.cc
@@ -126,11 +126,11 @@ scoped_ptr<base::Value> LoadJSONFile(const std::string& relative_path) {
 }
 
 // Returns a HttpResponse created from the given file path.
-scoped_ptr<test_server::HttpResponse> CreateHttpResponseFromFile(
+scoped_ptr<net::test_server::HttpResponse> CreateHttpResponseFromFile(
     const base::FilePath& file_path) {
   std::string content;
   if (!file_util::ReadFileToString(file_path, &content))
-    return scoped_ptr<test_server::HttpResponse>();
+    return scoped_ptr<net::test_server::HttpResponse>();
 
   std::string content_type = "text/plain";
   if (EndsWith(file_path.AsUTF8Unsafe(), ".json", true /* case sensitive */)) {
@@ -139,9 +139,9 @@ scoped_ptr<test_server::HttpResponse> CreateHttpResponseFromFile(
     content_type = "application/atom+xml";
   }
 
-  scoped_ptr<test_server::HttpResponse> http_response(
-      new test_server::HttpResponse);
-  http_response->set_code(test_server::SUCCESS);
+  scoped_ptr<net::test_server::HttpResponse> http_response(
+      new net::test_server::HttpResponse);
+  http_response->set_code(net::test_server::SUCCESS);
   http_response->set_content(content);
   http_response->set_content_type(content_type);
   return http_response.Pass();
@@ -152,16 +152,16 @@ void DoNothingForReAuthenticateCallback(
   NOTREACHED();
 }
 
-scoped_ptr<test_server::HttpResponse> HandleDownloadRequest(
+scoped_ptr<net::test_server::HttpResponse> HandleDownloadRequest(
     const GURL& base_url,
-    test_server::HttpRequest* out_request,
-    const test_server::HttpRequest& request) {
+    net::test_server::HttpRequest* out_request,
+    const net::test_server::HttpRequest& request) {
   *out_request = request;
 
   GURL absolute_url = base_url.Resolve(request.relative_url);
   std::string remaining_path;
   if (!RemovePrefix(absolute_url.path(), "/files/", &remaining_path))
-    return scoped_ptr<test_server::HttpResponse>();
+    return scoped_ptr<net::test_server::HttpResponse>();
   return CreateHttpResponseFromFile(GetTestFilePath(remaining_path));
 }