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

chrome/browser/chromeos/login/oobe_browsertest.cc

 // Copyright (c) 2013 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 "base/command_line.h"
 #include "base/path_service.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 #include "google_apis/gaia/gaia_switches.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 "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using namespace google_apis;
-using namespace google_apis::test_server;
+using namespace net::test_server;
 
 namespace {
 
 // Used to add an observer to NotificationService after it's created.
 class TestBrowserMainExtraParts
     : public ChromeBrowserMainExtraParts,
       public content::NotificationObserver {
  public:
   TestBrowserMainExtraParts()
       : webui_visible_(false),
@@ skipping 100 matching lines @@
     content_browser_client_.reset(new TestContentBrowserClient());
     original_content_browser_client_ = content::SetBrowserClientForTesting(
         content_browser_client_.get());
     base::FilePath test_data_dir;
     PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
     CHECK(file_util::ReadFileToString(test_data_dir.Append(kServiceLogin),
                                       &service_login_response_));
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    test_server_ = new HttpServer(
+    test_server_ = new EmbeddedTestServer(
         content::BrowserThread::GetMessageLoopProxyForThread(
             content::BrowserThread::IO));
     CHECK(test_server_->InitializeAndWaitUntilReady());
     test_server_->RegisterRequestHandler(
         base::Bind(&OobeTest::HandleRequest, base::Unretained(this)));
     LOG(INFO) << "Set up http server at " << test_server_->base_url();
     CHECK(test_server_->port() >= 8040 && test_server_->port() < 8045)
         << "Current manifest_test.json for gaia_login restrictions "
         << "does not allow this port";
 
     const std::string gaia_url =
         "http://localhost:" + test_server_->base_url().port();
     content_browser_client_->browser_main_extra_parts_->set_gaia_url(gaia_url);
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     LOG(INFO) << "Stopping the http server.";
     EXPECT_TRUE(test_server_->ShutdownAndWaitUntilComplete());
     delete test_server_;  // Destructor wants UI thread.
   }
 
   scoped_ptr<HttpResponse> HandleRequest(const HttpRequest& request) {
     GURL url = test_server_->GetURL(request.relative_url);
     LOG(INFO) << "Http request: " << url.spec();
 
     scoped_ptr<HttpResponse> http_response(new HttpResponse());
     if (url.path() == "/ServiceLogin") {
-      http_response->set_code(test_server::SUCCESS);
+      http_response->set_code(net::test_server::SUCCESS);
       http_response->set_content(service_login_response_);
       http_response->set_content_type("text/html");
     } else if (url.path() == "/ServiceLoginAuth") {
       LOG(INFO) << "Params: " << request.content;
       static const char kContinueParam[] = "continue=";
       int continue_arg_begin = request.content.find(kContinueParam) +
           arraysize(kContinueParam) - 1;
       int continue_arg_end = request.content.find("&", continue_arg_begin);
       const std::string continue_url = request.content.substr(
           continue_arg_begin, continue_arg_end - continue_arg_begin);
-      http_response->set_code(test_server::SUCCESS);
+      http_response->set_code(net::test_server::SUCCESS);
       const std::string redirect_js =
           "document.location.href = unescape('" + continue_url + "');";
       http_response->set_content(
           "<HTML><HEAD><SCRIPT>\n" + redirect_js + "\n</SCRIPT></HEAD></HTML>");
       http_response->set_content_type("text/html");
     } else {
       NOTREACHED() << url.path();
     }
     return http_response.Pass();
   }
 
   scoped_ptr<TestContentBrowserClient> content_browser_client_;
   content::ContentBrowserClient* original_content_browser_client_;
   std::string service_login_response_;
-  HttpServer* test_server_;  // cant use scoped_ptr because destructor
-                             // needs UI thread.
+  EmbeddedTestServer* test_server_;  // cant use scoped_ptr because destructor
+                                     // needs UI thread.
 };
 
 IN_PROC_BROWSER_TEST_F(OobeTest, NewUser) {
   chromeos::WizardController::SkipPostLoginScreensForTesting();
   chromeos::WizardController* wizard_controller =
       chromeos::WizardController::default_controller();
   CHECK(wizard_controller);
   wizard_controller->SkipToLoginForTesting();
 
   scoped_refptr<content::MessageLoopRunner> runner =
       new content::MessageLoopRunner;
   content_browser_client_->browser_main_extra_parts_->set_quit_task(
       runner->QuitClosure());
   runner->Run();
 }
 
 }