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

chrome/browser/extensions/api/streams_private/streams_private_apitest.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 "base/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/mime_types_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/resource_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/download_test_observer.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"
 
 using content::BrowserContext;
 using content::BrowserThread;
 using content::DownloadItem;
 using content::DownloadManager;
 using content::DownloadUrlParameters;
 using content::ResourceController;
 using content::WebContents;
 using extensions::Event;
 using extensions::ExtensionSystem;
-using google_apis::test_server::HttpRequest;
-using google_apis::test_server::HttpResponse;
-using google_apis::test_server::HttpServer;
+using net::test_server::HttpRequest;
+using net::test_server::HttpResponse;
+using net::test_server::EmbeddedTestServer;
 using testing::_;
 
 namespace {
 
 // Test server's request handler.
 // Returns response that should be sent by the test server.
 scoped_ptr<HttpResponse> HandleRequest(const HttpRequest& request) {
   scoped_ptr<HttpResponse> response(new HttpResponse());
 
   // For relative path "/doc_path.doc", return success response with MIME type
   // "application/msword".
   if (request.relative_url == "/doc_path.doc") {
-    response->set_code(google_apis::test_server::SUCCESS);
+    response->set_code(net::test_server::SUCCESS);
     response->set_content_type("application/msword");
     return response.Pass();
   }
 
   // For relative path "/test_path_attch.txt", return success response with
   // MIME type "plain/text" and content "txt content". Also, set content
   // disposition to be attachment.
   if (request.relative_url == "/text_path_attch.txt") {
-    response->set_code(google_apis::test_server::SUCCESS);
+    response->set_code(net::test_server::SUCCESS);
     response->set_content("txt content");
     response->set_content_type("plain/text");
     response->AddCustomHeader("Content-Disposition",
                               "attachment; filename=test_path.txt");
     return response.Pass();
   }
   // For relative path "/test_path_attch.txt", return success response with
   // MIME type "plain/text" and content "txt content".
   if (request.relative_url == "/text_path.txt") {
-    response->set_code(google_apis::test_server::SUCCESS);
+    response->set_code(net::test_server::SUCCESS);
     response->set_content("txt content");
     response->set_content_type("plain/text");
     return response.Pass();
   }
 
   // No other requests should be handled in the tests.
   EXPECT_TRUE(false) << "NOTREACHED!";
-  response->set_code(google_apis::test_server::NOT_FOUND);
+  response->set_code(net::test_server::NOT_FOUND);
   return response.Pass();
 }
 
 // Tests to verify that resources are correctly intercepted by
 // StreamsResourceThrottle.
 // The test extension expects the resources that should be handed to the
 // extension to have MIME type 'application/msword' and the resources that
 // should be downloaded by the browser to have MIME type 'plain/text'.
 class StreamsPrivateApiTest : public ExtensionApiTest {
  public:
   StreamsPrivateApiTest() {}
 
   virtual ~StreamsPrivateApiTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     // Init test server.
-    test_server_.reset(new HttpServer(
+    test_server_.reset(new EmbeddedTestServer(
                            content::BrowserThread::GetMessageLoopProxyForThread(
                                content::BrowserThread::IO)));
     ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady());
     test_server_->RegisterRequestHandler(base::Bind(&HandleRequest));
 
     ExtensionApiTest::SetUpOnMainThread();
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     // Tear down the test server.
@@ skipping 77 matching lines @@
                                      DownloadManager* manager) {
     scoped_refptr<content::DownloadTestFlushObserver> flush_observer(
         new content::DownloadTestFlushObserver(manager));
     download->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
     flush_observer->WaitForFlush();
   }
 
  protected:
   std::string test_extension_id_;
   // The HTTP server used in the tests.
-  scoped_ptr<HttpServer> test_server_;
+  scoped_ptr<EmbeddedTestServer> test_server_;
   base::ScopedTempDir downloads_dir_;
 };
 
 // Tests that navigating to a resource with a MIME type handleable by an
 // installed, white-listed extension invokes the extension's
 // onExecuteContentHandler event (and does not start a download).
 IN_PROC_BROWSER_TEST_F(StreamsPrivateApiTest, Navigate) {
   ASSERT_TRUE(LoadTestExtension()) << message_;
 
   ResultCatcher catcher;
@@ skipping 99 matching lines @@
   // The test extension should not receive any events by now. Send it an event
   // with MIME type "test/done", so it stops waiting for the events. (If there
   // was an event with MIME type 'plain/text', |catcher.GetNextResult()| will
   // fail regardless of the sent event; chrome.test.notifySuccess will not be
   // called by the extension).
   SendDoneEvent();
   EXPECT_TRUE(catcher.GetNextResult());
 }
 
 }  // namespace