Migrating tests to use EmbeddedTestServer (/chrome/browser misc)

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/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 25 matching lines @@
 using content::DownloadManager;
 using content::DownloadUrlParameters;
 using content::ResourceController;
 using content::WebContents;
 using extensions::Event;
 using extensions::ExtensionSystem;
 using extensions::ResultCatcher;
 using net::test_server::BasicHttpResponse;
 using net::test_server::HttpRequest;
 using net::test_server::HttpResponse;
-using net::test_server::EmbeddedTestServer;
 using testing::_;
 
 namespace streams_private = extensions::api::streams_private;
 
 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<BasicHttpResponse> response(new BasicHttpResponse());
@@ skipping 72 matching lines @@
 // extension to have MIME type 'application/msword' and the resources that
 // should be downloaded by the browser to have MIME type 'text/plain'.
 class StreamsPrivateApiTest : public ExtensionApiTest {
  public:
   StreamsPrivateApiTest() {}
 
   ~StreamsPrivateApiTest() override {}
 
   void SetUpOnMainThread() override {
     // Init test server.
-    test_server_.reset(new EmbeddedTestServer);
-    ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady());
+    test_server_.reset(new net::EmbeddedTestServer);
+    ASSERT_TRUE(test_server_->Start());
     test_server_->RegisterRequestHandler(base::Bind(&HandleRequest));
 
     ExtensionApiTest::SetUpOnMainThread();
   }
 
   void TearDownOnMainThread() override {
     // Tear down the test server.
     EXPECT_TRUE(test_server_->ShutdownAndWaitUntilComplete());
     test_server_.reset();
     ExtensionApiTest::TearDownOnMainThread();
@@ skipping 77 matching lines @@
                                      DownloadManager* manager) {
     scoped_refptr<content::DownloadTestFlushObserver> flush_observer(
         new content::DownloadTestFlushObserver(manager));
     download->Remove();
     flush_observer->WaitForFlush();
   }
 
  protected:
   std::string test_extension_id_;
   // The HTTP server used in the tests.
-  scoped_ptr<EmbeddedTestServer> test_server_;
+  scoped_ptr<net::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) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 232 matching lines @@
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_TRUE(catcher.GetNextResult());
 
   ui_test_utils::NavigateToURL(browser(),
                                test_server_->GetURL("/abort.rtf"));
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_TRUE(catcher.GetNextResult());
 }
 
 }  // namespace