Adding SSL ETS Tests

chrome/browser/net/proxy_browsertest.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/files/file_path.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/login/login_prompt.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/base/test_data_directory.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 
 namespace {
 
 // PAC script that sends all requests to an invalid proxy server.
 const base::FilePath::CharType kPACScript[] = FILE_PATH_LITERAL(
     "bad_server.pac");
 
 // Verify kPACScript is installed as the PAC script.
 void VerifyProxyScript(Browser* browser) {
@@ skipping 103 matching lines @@
                                    .ReplaceComponents(replacements));
 
   const base::string16 result = watcher.WaitAndGetTitle();
   EXPECT_TRUE(base::EqualsASCII(result, "PASS"));
   EXPECT_TRUE(observer.auth_handled());
 }
 
 // Fetch PAC script via an http:// URL.
 class HttpProxyScriptBrowserTest : public InProcessBrowserTest {
  public:
-  HttpProxyScriptBrowserTest()
-      : http_server_(net::SpawnedTestServer::TYPE_HTTP,
-                     net::SpawnedTestServer::kLocalhost,
-                     base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))) {
+  HttpProxyScriptBrowserTest() {
+    http_server_.ServeFilesFromSourceDirectory("chrome/test/data");
   }
   ~HttpProxyScriptBrowserTest() override {}
 
   void SetUp() override {
     ASSERT_TRUE(http_server_.Start());
     InProcessBrowserTest::SetUp();
   }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
-    base::FilePath pac_script_path(FILE_PATH_LITERAL("files"));
+    base::FilePath pac_script_path(FILE_PATH_LITERAL("/"));
     command_line->AppendSwitchASCII(switches::kProxyPacUrl, http_server_.GetURL(
         pac_script_path.Append(kPACScript).MaybeAsASCII()).spec());
   }
 
  private:
-  net::SpawnedTestServer http_server_;
+  net::EmbeddedTestServer http_server_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpProxyScriptBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(HttpProxyScriptBrowserTest, Verify) {
   VerifyProxyScript(browser());
 }
 
 // Fetch PAC script via a file:// URL.
 class FileProxyScriptBrowserTest : public InProcessBrowserTest {
@@ skipping 93 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(OutOfProcessProxyResolverBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(OutOfProcessProxyResolverBrowserTest, Verify) {
   VerifyProxyScript(browser());
 }
 
 }  // namespace