Commit 16390930 authored by mharanczyk's avatar mharanczyk Committed by Commit bot

Use embedded test server instead of spawned one in AllUrlsApiTest.

This prevents file lock problems on those tests shutdown on windows.

BUG=427420

Review URL: https://codereview.chromium.org/682593002

Cr-Commit-Position: refs/heads/master@{#301340}
parent 399e35a2
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
#include "extensions/common/extension.h" #include "extensions/common/extension.h"
#include "extensions/common/extensions_client.h" #include "extensions/common/extensions_client.h"
#include "extensions/test/extension_test_message_listener.h" #include "extensions/test/extension_test_message_listener.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
const std::string kAllUrlsTarget = const std::string kAllUrlsTarget = "/extensions/api_test/all_urls/index.html";
"files/extensions/api_test/all_urls/index.html";
typedef ExtensionApiTest AllUrlsApiTest; typedef ExtensionApiTest AllUrlsApiTest;
...@@ -88,8 +88,8 @@ IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, MAYBE_WhitelistedExtension) { ...@@ -88,8 +88,8 @@ IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, MAYBE_WhitelistedExtension) {
ASSERT_TRUE(listener4b.WaitUntilSatisfied()); ASSERT_TRUE(listener4b.WaitUntilSatisfied());
// Now verify we can script a regular http page. // Now verify we can script a regular http page.
ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(StartEmbeddedTestServer());
GURL page_url = test_server()->GetURL(kAllUrlsTarget); GURL page_url = embedded_test_server()->GetURL(kAllUrlsTarget);
ExtensionTestMessageListener listener5a("content script: " + page_url.spec(), ExtensionTestMessageListener listener5a("content script: " + page_url.spec(),
false); false);
ExtensionTestMessageListener listener5b("execute: " + page_url.spec(), false); ExtensionTestMessageListener listener5b("execute: " + page_url.spec(), false);
...@@ -115,8 +115,8 @@ IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, RegularExtensions) { ...@@ -115,8 +115,8 @@ IN_PROC_BROWSER_TEST_F(AllUrlsApiTest, RegularExtensions) {
EXPECT_EQ(size_before + 2, service->extensions()->size()); EXPECT_EQ(size_before + 2, service->extensions()->size());
// Now verify we can script a regular http page. // Now verify we can script a regular http page.
ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(StartEmbeddedTestServer());
GURL page_url = test_server()->GetURL(kAllUrlsTarget); GURL page_url = embedded_test_server()->GetURL(kAllUrlsTarget);
ExtensionTestMessageListener listener1a("content script: " + page_url.spec(), ExtensionTestMessageListener listener1a("content script: " + page_url.spec(),
false); false);
ExtensionTestMessageListener listener1b("execute: " + page_url.spec(), false); ExtensionTestMessageListener listener1b("execute: " + page_url.spec(), false);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment