Adding SSL ETS Tests

chrome/browser/extensions/webstore_installer_test.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.
 
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/tab_helper.h"
@@ skipping 37 matching lines @@
       verified_domain_(verified_domain),
       unverified_domain_(unverified_domain) {
 }
 
 WebstoreInstallerTest::~WebstoreInstallerTest() {}
 
 void WebstoreInstallerTest::SetUpCommandLine(base::CommandLine* command_line) {
   ExtensionBrowserTest::SetUpCommandLine(command_line);
   // We start the test server now instead of in
   // SetUpInProcessBrowserTestFixture so that we can get its port number.
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
-  net::HostPortPair host_port = test_server()->host_port_pair();
-  test_gallery_url_ = base::StringPrintf(
-      "http://%s:%d/files/%s",
-      webstore_domain_.c_str(), host_port.port(), test_data_path_.c_str());
+  net::HostPortPair host_port = embedded_test_server()->host_port_pair();
+  test_gallery_url_ =
+      base::StringPrintf("http://%s:%d/%s", webstore_domain_.c_str(),
+                         host_port.port(), test_data_path_.c_str());
   command_line->AppendSwitchASCII(
       switches::kAppsGalleryURL, test_gallery_url_);
 
   GURL crx_url = GenerateTestServerUrl(webstore_domain_, crx_filename_);
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kAppsGalleryUpdateURL, crx_url.spec());
 
   // Allow tests to call window.gc(), so that we can check that callback
   // functions don't get collected prematurely.
   command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose-gc");
 }
 
 void WebstoreInstallerTest::SetUpInProcessBrowserTestFixture() {
   host_resolver()->AddRule(webstore_domain_, "127.0.0.1");
   host_resolver()->AddRule(verified_domain_, "127.0.0.1");
   host_resolver()->AddRule(unverified_domain_, "127.0.0.1");
 }
 
 void WebstoreInstallerTest::SetUpOnMainThread() {
   ExtensionBrowserTest::SetUpOnMainThread();
   ASSERT_TRUE(download_directory_.CreateUniqueTempDir());
   DownloadPrefs* download_prefs = DownloadPrefs::FromBrowserContext(
       browser()->profile());
   download_prefs->SetDownloadPath(download_directory_.path());
 }
 
 GURL WebstoreInstallerTest::GenerateTestServerUrl(
     const std::string& domain,
     const std::string& page_filename) {
-  GURL page_url = test_server()->GetURL(
-      base::StringPrintf("files/%s/%s",
-                         test_data_path_.c_str(),
-                         page_filename.c_str()));
+  GURL page_url = embedded_test_server()->GetURL(base::StringPrintf(
+      "/%s/%s", test_data_path_.c_str(), page_filename.c_str()));
 
   GURL::Replacements replace_host;
   replace_host.SetHostStr(domain);
   return page_url.ReplaceComponents(replace_host);
 }
 
 void WebstoreInstallerTest::RunTest(WebContents* web_contents,
                                     const std::string& test_function_name) {
   bool result = false;
   std::string script = base::StringPrintf(
@@ skipping 35 matching lines @@
   install_auto_confirm_.reset();  // Destroy any old override first.
   install_auto_confirm_.reset(new extensions::ScopedTestDialogAutoConfirm(
       extensions::ScopedTestDialogAutoConfirm::ACCEPT));
 }
 
 void WebstoreInstallerTest::AutoCancelInstall() {
   install_auto_confirm_.reset();  // Destroy any old override first.
   install_auto_confirm_.reset(new extensions::ScopedTestDialogAutoConfirm(
       extensions::ScopedTestDialogAutoConfirm::CANCEL));
 }