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

chrome/browser/ui/search/instant_test_utils.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 "chrome/browser/ui/search/instant_test_utils.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 17 matching lines @@
 
 std::string WrapScript(const std::string& script) {
   return "domAutomationController.send(" + script + ")";
 }
 
 }  // namespace
 
 // InstantTestBase -----------------------------------------------------------
 
 InstantTestBase::InstantTestBase()
-    : https_test_server_(
-          net::SpawnedTestServer::TYPE_HTTPS,
-          net::BaseTestServer::SSLOptions(),
-          base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))),
+    : https_test_server_(net::EmbeddedTestServer::TYPE_HTTPS),
       init_suggestions_url_(false) {
+  https_test_server_.ServeFilesFromSourceDirectory("chrome/test/data");
 }
 
 InstantTestBase::~InstantTestBase() {}
 
 void InstantTestBase::SetupInstant(Browser* browser) {
   browser_ = browser;
 
   TemplateURLService* service =
       TemplateURLServiceFactory::GetForProfile(browser_->profile());
   search_test_utils::WaitForTemplateURLServiceToLoad(service);
@@ skipping 117 matching lines @@
   return content::ExecuteScriptAndExtractBool(rvh, js_chrome, loaded);
 }
 
 base::string16 InstantTestBase::GetBlueText() {
   size_t start = 0, end = 0;
   omnibox()->GetSelectionBounds(&start, &end);
   if (start > end)
     std::swap(start, end);
   return omnibox()->GetText().substr(start, end - start);
 }