Adding SSL ETS Tests

chrome/browser/translate/translate_browsertest.cc

Index: chrome/browser/translate/translate_browsertest.cc
diff --git a/chrome/browser/translate/translate_browsertest.cc b/chrome/browser/translate/translate_browsertest.cc
index eaa53a5a2375bc454104d5d2264e5089226aeb29..15439539a3f1c71b196bbccb5a54ab3c3edff030 100644
--- a/chrome/browser/translate/translate_browsertest.cc
+++ b/chrome/browser/translate/translate_browsertest.cc
@@ -27,7 +27,6 @@
 #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"
 
@@ -36,7 +35,7 @@ namespace {
 const base::FilePath::CharType kTranslateRoot[] =
     FILE_PATH_LITERAL("chrome/test/data/translate");
 const char kNonSecurePrefix[] = "/translate/";
-const char kSecurePrefix[] = "files/";
+const char kSecurePrefix[] = "/";
 const char kFrenchTestPath[] = "fr_test.html";
 const char kRefreshMetaTagTestPath[] = "refresh_meta_tag.html";
 const char kRefreshMetaTagCaseInsensitiveTestPath[] =
@@ -53,18 +52,17 @@ const char kElementMainScriptPath[] = "pseudo_element_main.js";
 class TranslateBrowserTest : public InProcessBrowserTest {
  public:
   TranslateBrowserTest()
-      : https_server_(net::SpawnedTestServer::TYPE_HTTPS,
-                      SSLOptions(SSLOptions::CERT_OK),
-                      base::FilePath(kTranslateRoot)),
+      : https_server_(net::EmbeddedTestServer::TYPE_HTTPS),
         infobar_service_(NULL) {}
 
   void SetUp() override {
     translate::TranslateManager::SetIgnoreMissingKeyForTesting(true);
+    https_server_.ServeFilesFromSourceDirectory(base::FilePath(kTranslateRoot));
+    ASSERT_TRUE(https_server_.InitializeAndListen());
     InProcessBrowserTest::SetUp();
   }
 
   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("");
@@ -73,6 +71,12 @@ class TranslateBrowserTest : public InProcessBrowserTest {
         base_url.GetOrigin().spec());
   }
 
+  void SetUpOnMainThread() override {
+    InProcessBrowserTest::SetUpOnMainThread();
+
+    https_server_.StartAcceptingConnections();
+  }
+
  protected:
   GURL GetNonSecureURL(const std::string& path) const {
     std::string prefix(kNonSecurePrefix);
@@ -124,11 +128,9 @@ class TranslateBrowserTest : public InProcessBrowserTest {
   }
 
  private:
-  net::SpawnedTestServer https_server_;
+  net::EmbeddedTestServer https_server_;
   InfoBarService* infobar_service_;
 
-  typedef net::SpawnedTestServer::SSLOptions SSLOptions;
-
   DISALLOW_COPY_AND_ASSIGN(TranslateBrowserTest);
 };
 
@@ -138,7 +140,7 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, TranslateInIsolatedWorld) {
     return;
 
   net::TestURLFetcherFactory factory;
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   // Check if there is no Translate infobar.
   translate::TranslateInfoBarDelegate* translate =
@@ -203,7 +205,7 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, IgnoreRefreshMetaTag) {
   if (TranslateService::IsTranslateBubbleEnabled())
     return;
 
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   // Check if there is no Translate infobar.
   translate::TranslateInfoBarDelegate* translate =
@@ -237,7 +239,7 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest,
   if (TranslateService::IsTranslateBubbleEnabled())
     return;
 
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   // Check if there is no Translate infobar.
   translate::TranslateInfoBarDelegate* translate =
@@ -270,7 +272,7 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, IgnoreRefreshMetaTagAtOnload) {
   if (TranslateService::IsTranslateBubbleEnabled())
     return;
 
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   // Check if there is no Translate infobar.
   translate::TranslateInfoBarDelegate* translate =
@@ -303,7 +305,7 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocation) {
   if (TranslateService::IsTranslateBubbleEnabled())
     return;
 
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   // Check if there is no Translate infobar.
   translate::TranslateInfoBarDelegate* translate =
@@ -336,7 +338,7 @@ IN_PROC_BROWSER_TEST_F(TranslateBrowserTest, UpdateLocationAtOnload) {
   if (TranslateService::IsTranslateBubbleEnabled())
     return;
 
-  ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   // Check if there is no Translate infobar.
   translate::TranslateInfoBarDelegate* translate =