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

chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc

 // 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.
 
 #include "chrome/browser/chromeos/contacts/gdata_contacts_service.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "chrome/browser/chromeos/contacts/contact.pb.h"
 #include "chrome/browser/chromeos/contacts/contact_test_util.h"
 #include "chrome/browser/google_apis/auth_service.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "chrome/browser/google_apis/time_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
-#include "net/test/embedded_test_server/http_server.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/size.h"
 
 using content::BrowserThread;
 
 namespace contacts {
 namespace {
 
 const char kTestGDataAuthToken[] = "testtoken";
@@ skipping 40 matching lines @@
   }
 
   virtual void SetUp() OVERRIDE {
     io_thread_.StartIOThread();
     profile_.reset(new TestingProfile);
     request_context_getter_ = new net::TestURLRequestContextGetter(
         content::BrowserThread::GetMessageLoopProxyForThread(
             content::BrowserThread::IO));
 
     test_server_.reset(
-        new google_apis::test_server::HttpServer(
+        new net::test_server::EmbeddedTestServer(
             content::BrowserThread::GetMessageLoopProxyForThread(
                 content::BrowserThread::IO)));
     ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady());
     test_server_->RegisterRequestHandler(
         base::Bind(&GDataContactsServiceTest::HandleDownloadRequest,
                    base::Unretained(this)));
     service_.reset(new GDataContactsService(
         request_context_getter_,
         profile_.get()));
     service_->Initialize();
@@ skipping 31 matching lines @@
                    base::Unretained(this)),
         base::Bind(&GDataContactsServiceTest::OnFailure,
                    base::Unretained(this)),
         min_update_time);
     content::RunMessageLoop();
     contacts->swap(downloaded_contacts_);
     return download_was_successful_;
   }
 
   scoped_ptr<GDataContactsService> service_;
-  scoped_ptr<google_apis::test_server::HttpServer> test_server_;
+  scoped_ptr<net::test_server::EmbeddedTestServer> test_server_;
 
  private:
   // Rewrites |original_url|, a photo URL from a contacts feed, to instead point
   // at a file on |test_server_|.
   std::string RewritePhotoUrl(const std::string& original_url) {
     return test_server_->GetURL(GURL(original_url).path()).spec();
   }
 
   // Handles success for Download().
   void OnSuccess(scoped_ptr<ScopedVector<contacts::Contact> > contacts) {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     download_was_successful_ = true;
     downloaded_contacts_.swap(contacts);
     MessageLoop::current()->Quit();
   }
 
   // Handles failure for Download().
   void OnFailure() {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     download_was_successful_ = false;
     downloaded_contacts_.reset(new ScopedVector<contacts::Contact>());
     MessageLoop::current()->Quit();
   }
 
   // Handles a request for downloading a file. Reads a requested file and
   // returns the content.
-  scoped_ptr<google_apis::test_server::HttpResponse> HandleDownloadRequest(
-      const google_apis::test_server::HttpRequest& request) {
+  scoped_ptr<net::test_server::HttpResponse> HandleDownloadRequest(
+      const net::test_server::HttpRequest& request) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     // Requested url must not contain a query string.
-    scoped_ptr<google_apis::test_server::HttpResponse> result =
+    scoped_ptr<net::test_server::HttpResponse> result =
         google_apis::test_util::CreateHttpResponseFromFile(
             google_apis::test_util::GetTestFilePath(
                 std::string("chromeos/gdata/contacts") + request.relative_url));
     return result.Pass();
   }
 
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread io_thread_;
   scoped_ptr<TestingProfile> profile_;
@@ skipping 155 matching lines @@
   scoped_ptr<contacts::Contact> contact2(new contacts::Contact);
   InitContact("http://example.com/2", "2012-06-21T16:20:13.208Z",
               false, "Bob Smith", "Bob", "", "Smith", "", "",
               contact2.get());
   EXPECT_EQ(contacts::test::VarContactsToString(
                 2, contact1.get(), contact2.get()),
             contacts::test::ContactsToString(*contacts));
 }
 
 }  // namespace contacts