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

chrome/browser/google_apis/test_util.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_GOOGLE_APIS_TEST_UTIL_H_
 #define CHROME_BROWSER_GOOGLE_APIS_TEST_UTIL_H_
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/template_util.h"
 #include "chrome/browser/google_apis/base_operations.h"
 #include "chrome/browser/google_apis/gdata_errorcode.h"
 
 class GURL;
 
 namespace base {
 class FilePath;
 class Value;
 }
 
+namespace net {
+namespace test_server {
+struct HttpRequest;
+class HttpResponse;
+}
+}
+
 namespace google_apis {
 
 class AboutResource;
 class AccountMetadata;
 class AppList;
 class AuthenticatedOperationInterface;
 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
 // to the UI message loop and the blocking pool.
 //
 // A task is often posted to the blocking pool with PostTaskAndReply(). In
 // that case, a task is posted back to the UI message loop, which can again
 // post a task to the blocking pool. This function processes these tasks
 // repeatedly.
 void RunBlockingPoolTask();
@@ skipping 28 matching lines @@
 bool CreateFileOfSpecifiedSize(const base::FilePath& temp_dir,
                                size_t size,
                                base::FilePath* path,
                                std::string* data);
 
 // Loads a test JSON file as a base::Value, from a test file stored under
 // chrome/test/data.
 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
 // if it is not expected to reach this method as there won't be any
 // authentication failures in the test.
 void DoNothingForReAuthenticateCallback(
     AuthenticatedOperationInterface* operation);
 
 // Handles a request for downloading a file. Reads a file from the test
 // 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)
 // if necessary.
 bool VerifyJsonData(const base::FilePath& expected_json_file_path,
                     const base::Value* json_data);
 
 // Parses a value of Content-Range header, which looks like
 // "bytes <start_position>-<end_position>/<length>".
 // Returns true on success.
@@ skipping 192 matching lines @@
   const GetContentCallback callback_;
   ScopedVector<std::string> data_;
 
   DISALLOW_COPY_AND_ASSIGN(TestGetContentCallback);
 };
 
 }  // namespace test_util
 }  // namespace google_apis
 
 #endif  // CHROME_BROWSER_GOOGLE_APIS_TEST_UTIL_H_