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

chrome/browser/ui/bookmarks/bookmark_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/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 
 using bookmarks::BookmarkModel;
 
 namespace {
 const char kPersistBookmarkURL[] = "http://www.cnn.com/";
 const char kPersistBookmarkTitle[] = "CNN";
 } // namespace
 
 class TestBookmarkTabHelperDelegate : public BookmarkTabHelperDelegate {
  public:
@@ skipping 124 matching lines @@
 #if defined(OS_LINUX)
 #define MAYBE_HideStarOnNonbookmarkedInterstitial \
     DISABLED_HideStarOnNonbookmarkedInterstitial
 #else
 #define MAYBE_HideStarOnNonbookmarkedInterstitial \
     HideStarOnNonbookmarkedInterstitial
 #endif
 IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest,
                        MAYBE_HideStarOnNonbookmarkedInterstitial) {
   // Start an HTTPS server with a certificate error.
-  net::SpawnedTestServer::SSLOptions https_options;
-  https_options.server_certificate =
-      net::SpawnedTestServer::SSLOptions::CERT_MISMATCHED_NAME;
-  net::SpawnedTestServer https_server(
-      net::SpawnedTestServer::TYPE_HTTPS, https_options,
-      base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
+  net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS);
+  https_server.SetSSLConfig(net::EmbeddedTestServer::CERT_MISMATCHED_NAME);
+  https_server.ServeFilesFromSourceDirectory("chrome/test/data");
   ASSERT_TRUE(https_server.Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
 
   BookmarkModel* bookmark_model = WaitForBookmarkModel(browser()->profile());
-  GURL bookmark_url = test_server()->GetURL("http://example.test");
+  GURL bookmark_url = embedded_test_server()->GetURL("example.test", "/");
   bookmarks::AddIfNotBookmarked(bookmark_model,
                                 bookmark_url,
                                 base::ASCIIToUTF16("Bookmark"));
 
   TestBookmarkTabHelperDelegate bookmark_delegate;
   content::WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   BookmarkTabHelper* tab_helper =
       BookmarkTabHelper::FromWebContents(web_contents);
   tab_helper->set_delegate(&bookmark_delegate);
 
   // Go to a bookmarked url. Bookmark star should show.
   ui_test_utils::NavigateToURL(browser(), bookmark_url);
   EXPECT_FALSE(web_contents->ShowingInterstitialPage());
   EXPECT_TRUE(bookmark_delegate.is_starred());
 
   // Now go to a non-bookmarked url which triggers an SSL warning. Bookmark
   // star should disappear.
-  GURL error_url = https_server.GetURL(".");
+  GURL error_url = https_server.GetURL("/");
   ui_test_utils::NavigateToURL(browser(), error_url);
   web_contents = browser()->tab_strip_model()->GetActiveWebContents();
   content::WaitForInterstitialAttach(web_contents);
   EXPECT_TRUE(web_contents->ShowingInterstitialPage());
   EXPECT_FALSE(bookmark_delegate.is_starred());
 
   // The delegate is required to outlive the tab helper.
   tab_helper->set_delegate(nullptr);
 }