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

chrome/browser/google_apis/test_util.h

Index: chrome/browser/google_apis/test_util.h
diff --git a/chrome/browser/google_apis/test_util.h b/chrome/browser/google_apis/test_util.h
index a846a3bfb7ede12f1069b67053f5b846dd23bfa2..d8756c6662661b03185812d548de27641a0db089 100644
--- a/chrome/browser/google_apis/test_util.h
+++ b/chrome/browser/google_apis/test_util.h
@@ -24,6 +24,13 @@ class FilePath;
 class Value;
 }
 
+namespace net {
+namespace test_server {
+struct HttpRequest;
+class HttpResponse;
+}
+}
+
 namespace google_apis {
 
 class AboutResource;
@@ -34,11 +41,6 @@ class ResourceEntry;
 class ResourceList;
 struct UploadRangeResponse;
 
-namespace test_server {
-struct HttpRequest;
-class HttpResponse;
-}
-
 namespace test_util {
 
 // Runs a task posted to the blocking pool, including subsequent tasks posted
@@ -87,7 +89,7 @@ bool CreateFileOfSpecifiedSize(const base::FilePath& temp_dir,
 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);
 
 // Does nothing for ReAuthenticateCallback(). This function should be used
@@ -100,10 +102,10 @@ void DoNothingForReAuthenticateCallback(
 // directory and returns the content. Also, copies the |request| to the memory
 // pointed by |out_request|.
 // |base_url| must be set to the server's base url.
-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);
 
 // Returns true if |json_data| is not NULL and equals to the content in
 // |expected_json_file_path|. The failure reason will be logged into LOG(ERROR)