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

chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc

Index: chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc
diff --git a/chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc b/chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc
index 871ff72b6193e134b2f9dcf56d7dd842227c8900..ab2a0eebf11c8ab6e99327bce6be875531842823 100644
--- a/chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc
+++ b/chrome/browser/ui/views/extensions/bookmark_override_browsertest.cc
@@ -15,6 +15,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/test/result_catcher.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 #include "ui/events/event_utils.h"
 
 typedef ExtensionApiTest BookmarkOverrideTest;
@@ -32,7 +33,7 @@ const char kBookmarkKeybinding[] = "Ctrl+D";
 // requests to override ctrl-D and the user has assigned it to an extension.
 // Flaky on all platforms: https://crbug.com/448956.
 IN_PROC_BROWSER_TEST_F(BookmarkOverrideTest, DISABLED_NonOverrideStarClick) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
   ASSERT_TRUE(RunExtensionTest("keybinding/basics")) << message_;
   const extensions::Extension* extension = GetSingleLoadedExtension();
 
@@ -70,7 +71,7 @@ IN_PROC_BROWSER_TEST_F(BookmarkOverrideTest, DISABLED_NonOverrideStarClick) {
 // the user has assigned it to an extension.
 // Flaky on all platforms: https://crbug.com/448956.
 IN_PROC_BROWSER_TEST_F(BookmarkOverrideTest, DISABLED_NonOverrideBookmarkPage) {
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
   ASSERT_TRUE(RunExtensionTest("keybinding/basics")) << message_;
   const extensions::Extension* extension = GetSingleLoadedExtension();