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

chrome/browser/translate/translate_browsertest.cc

 // Copyright 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.
 
 // This entire test suite relies on the translate infobar which has been removed
 // from Aura. The file should be ported to use the bubble.
 #if !defined(USE_AURA)
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 11 matching lines @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/infobars/core/infobar.h"
 #include "components/translate/core/browser/translate_infobar_delegate.h"
 #include "components/translate/core/browser/translate_manager.h"
 #include "components/translate/core/browser/translate_script.h"
 #include "components/translate/core/common/translate_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/http/http_status_code.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
 namespace {
 
 const base::FilePath::CharType kTranslateRoot[] =
     FILE_PATH_LITERAL("chrome/test/data/translate");
-const char kNonSecurePrefix[] = "translate/";
-const char kSecurePrefix[] = "files/";
 const char kFrenchTestPath[] = "/fr_test.html";
 const char kBasicFrenchTestPath[] = "/basic_fr_test.html";
 const char kRefreshMetaTagTestPath[] = "/refresh_meta_tag.html";
 const char kRefreshMetaTagCaseInsensitiveTestPath[] =
     "/refresh_meta_tag_casei.html";
 const char kRefreshMetaTagAtOnloadTestPath[] =
     "/refresh_meta_tag_at_onload.html";
 const char kUpdateLocationTestPath[] = "/update_location.html";
 const char kUpdateLocationAtOnloadTestPath[] =
     "/update_location_at_onload.html";
 const char kMainScriptPath[] = "/pseudo_main.js";
 const char kElementMainScriptPath[] = "/pseudo_element_main.js";
 
 };  // namespace
 
 // Basic translate browser test with an embedded non-secure test server.
 class TranslateBaseBrowserTest : public InProcessBrowserTest {
  public:
   TranslateBaseBrowserTest() {}
 
   void SetUp() override {
     set_open_about_blank_on_browser_launch(false);
     translate::TranslateManager::SetIgnoreMissingKeyForTesting(true);
     InProcessBrowserTest::SetUp();
   }
 
   void SetUpOnMainThread() override {
-    net::test_server::EmbeddedTestServer* test_server = embedded_test_server();
-    base::FilePath test_data_dir;
-    PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
-    test_data_dir = test_data_dir.AppendASCII(kNonSecurePrefix);
-    test_server->ServeFilesFromDirectory(test_data_dir);
-    ASSERT_TRUE(test_server->InitializeAndWaitUntilReady());
+    net::EmbeddedTestServer* test_server = embedded_test_server();
+    test_server->ServeFilesFromSourceDirectory(kTranslateRoot);
+    ASSERT_TRUE(test_server->Start());
     InProcessBrowserTest::SetUpOnMainThread();
   }
 
  protected:
   GURL GetNonSecureURL(const std::string& path) const {
     return embedded_test_server()->GetURL(path);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TranslateBaseBrowserTest);
@@ skipping 105 matching lines @@
   }
 
  private:
   InfoBarService* infobar_service_;
 };
 
 // Translate browser test with a seperate secure server setup.
 class TranslateWithSecureServerBrowserTest : public TranslateBrowserTest {
  public:
   TranslateWithSecureServerBrowserTest()
-      : https_server_(net::SpawnedTestServer::TYPE_HTTPS,
-                      SSLOptions(SSLOptions::CERT_OK),
-                      base::FilePath(kTranslateRoot)) {}
+      : https_server_(net::EmbeddedTestServer::TYPE_HTTPS) {
+    https_server_.ServeFilesFromSourceDirectory(kTranslateRoot);
+  }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ASSERT_TRUE(https_server_.Start());
     // Setup alternate security origin for testing in order to allow XHR against
     // local test server. Note that this flag shows a confirm infobar in tests.
-    GURL base_url = GetSecureURL("");
+    GURL base_url = GetSecureURL("/");
     command_line->AppendSwitchASCII(
         translate::switches::kTranslateSecurityOrigin,
         base_url.GetOrigin().spec());
     TranslateBrowserTest::SetUpCommandLine(command_line);
   }
 
  protected:
   GURL GetSecureURL(const std::string& path) const {
-    std::string prefix(kSecurePrefix);
-    return https_server_.GetURL(prefix + path);
+    return https_server_.GetURL(path);
   }
 
  private:
-  net::SpawnedTestServer https_server_;
-
-  typedef net::SpawnedTestServer::SSLOptions SSLOptions;
+  net::EmbeddedTestServer https_server_;
 
   DISALLOW_COPY_AND_ASSIGN(TranslateWithSecureServerBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(TranslateWithSecureServerBrowserTest,
                        TranslateInIsolatedWorld) {
   net::TestURLFetcherFactory factory;
   ASSERT_NO_FATAL_FAILURE(CheckForTranslateUI(kFrenchTestPath, true));
 
   // Setup page title observer.
@@ skipping 59 matching lines @@
 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocation) {
   ASSERT_NO_FATAL_FAILURE(CheckForTranslateUI(
       kUpdateLocationTestPath, false));
 }
 
 IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocationAtOnload) {
   ASSERT_NO_FATAL_FAILURE(CheckForTranslateUI(
       kUpdateLocationAtOnloadTestPath, false));
 }
 #endif  // !defined(USE_AURA)