| Index: chrome/browser/extensions/all_urls_apitest.cc
|
| diff --git a/chrome/browser/extensions/all_urls_apitest.cc b/chrome/browser/extensions/all_urls_apitest.cc
|
| index 6c947f62737d0aa618099b55e8f33f0e05365eae..6422c645e66968a56679c8771c9220ec16d23bd6 100644
|
| --- a/chrome/browser/extensions/all_urls_apitest.cc
|
| +++ b/chrome/browser/extensions/all_urls_apitest.cc
|
| @@ -14,9 +14,9 @@
|
| #include "extensions/common/extension.h"
|
| #include "extensions/common/extensions_client.h"
|
| #include "extensions/test/extension_test_message_listener.h"
|
| +#include "net/test/embedded_test_server/embedded_test_server.h"
|
|
|
| -const std::string kAllUrlsTarget =
|
| - "files/extensions/api_test/all_urls/index.html";
|
| +const std::string kAllUrlsTarget = "/extensions/api_test/all_urls/index.html";
|
|
|
| typedef ExtensionApiTest AllUrlsApiTest;
|
|
|
| @@ -88,8 +88,8 @@ IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, MAYBE_WhitelistedExtension) {
|
| ASSERT_TRUE(listener4b.WaitUntilSatisfied());
|
|
|
| // Now verify we can script a regular http page.
|
| - ASSERT_TRUE(test_server()->Start());
|
| - GURL page_url = test_server()->GetURL(kAllUrlsTarget);
|
| + ASSERT_TRUE(StartEmbeddedTestServer());
|
| + GURL page_url = embedded_test_server()->GetURL(kAllUrlsTarget);
|
| ExtensionTestMessageListener listener5a("content script: " + page_url.spec(),
|
| false);
|
| ExtensionTestMessageListener listener5b("execute: " + page_url.spec(), false);
|
| @@ -115,8 +115,8 @@ IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, RegularExtensions) {
|
| EXPECT_EQ(size_before + 2, service->extensions()->size());
|
|
|
| // Now verify we can script a regular http page.
|
| - ASSERT_TRUE(test_server()->Start());
|
| - GURL page_url = test_server()->GetURL(kAllUrlsTarget);
|
| + ASSERT_TRUE(StartEmbeddedTestServer());
|
| + GURL page_url = embedded_test_server()->GetURL(kAllUrlsTarget);
|
| ExtensionTestMessageListener listener1a("content script: " + page_url.spec(),
|
| false);
|
| ExtensionTestMessageListener listener1b("execute: " + page_url.spec(), false);
|
|
|