| Index: chrome/browser/extensions/process_management_browsertest.cc
|
| diff --git a/chrome/browser/extensions/process_management_browsertest.cc b/chrome/browser/extensions/process_management_browsertest.cc
|
| index d6ea919e12c4b2d814639abe100c7490d1e77ba5..bb54aeb8df0af48d0c0cb48b1f65554f2013f967 100644
|
| --- a/chrome/browser/extensions/process_management_browsertest.cc
|
| +++ b/chrome/browser/extensions/process_management_browsertest.cc
|
| @@ -20,6 +20,7 @@
|
| #include "content/public/browser/site_instance.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "net/dns/mock_host_resolver.h"
|
| +#include "net/test/embedded_test_server/embedded_test_server.h"
|
|
|
| using content::NavigationController;
|
| using content::WebContents;
|
| @@ -53,7 +54,7 @@ IN_PROC_BROWSER_TEST_F(ProcessManagementTest, MAYBE_ProcessOverflow) {
|
| content::RenderProcessHost::SetMaxRendererProcessCount(1);
|
|
|
| host_resolver()->AddRule("*", "127.0.0.1");
|
| - ASSERT_TRUE(test_server()->Start());
|
| + ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
|
|
| ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app1")));
|
| ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("isolated_apps/app2")));
|
| @@ -63,8 +64,8 @@ IN_PROC_BROWSER_TEST_F(ProcessManagementTest, MAYBE_ProcessOverflow) {
|
|
|
| // The app under test acts on URLs whose host is "localhost",
|
| // so the URLs we navigate to must have host "localhost".
|
| - GURL base_url = test_server()->GetURL(
|
| - "files/extensions/");
|
| + GURL base_url = embedded_test_server()->GetURL(
|
| + "/extensions/");
|
| GURL::Replacements replace_host;
|
| std::string host_str("localhost"); // Must stay in scope with replace_host.
|
| replace_host.SetHostStr(host_str);
|
| @@ -194,12 +195,12 @@ IN_PROC_BROWSER_TEST_F(ProcessManagementTest, MAYBE_ExtensionProcessBalancing) {
|
| content::RenderProcessHost::SetMaxRendererProcessCount(6);
|
|
|
| host_resolver()->AddRule("*", "127.0.0.1");
|
| - ASSERT_TRUE(test_server()->Start());
|
| + ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
|
|
| // The app under test acts on URLs whose host is "localhost",
|
| // so the URLs we navigate to must have host "localhost".
|
| - GURL base_url = test_server()->GetURL(
|
| - "files/extensions/");
|
| + GURL base_url = embedded_test_server()->GetURL(
|
| + "/extensions/");
|
| GURL::Replacements replace_host;
|
| std::string host_str("localhost"); // Must stay in scope with replace_host.
|
| replace_host.SetHostStr(host_str);
|
|
|