summaryrefslogtreecommitdiffstats
path: root/extensions/browser/guest_view
diff options
context:
space:
mode:
authorsvaldez <svaldez@chromium.org>2015-11-19 08:27:30 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-19 16:28:09 +0000
commit969a51186f89a385a8f5bd9ddc49f35dccf9cdd2 (patch)
tree4e34164ddd2c7039be295c8ac8a95be7a7a95c25 /extensions/browser/guest_view
parentfa5a66979cdf91dc7c0cb79f54dda08254c343ec (diff)
downloadchromium_src-969a51186f89a385a8f5bd9ddc49f35dccf9cdd2.zip
chromium_src-969a51186f89a385a8f5bd9ddc49f35dccf9cdd2.tar.gz
chromium_src-969a51186f89a385a8f5bd9ddc49f35dccf9cdd2.tar.bz2
Migrating tests to use EmbeddedTestServer (misc)
- Moving tests to use EmbeddedTestServer where possible. - net::test_server::EmbeddedTestServer references to net::EmbeddedTestServer - Using server.Start() instead of server.InitializeAndWaitUntilReady() - Renaming test_server() to be spawned_test_server() or embedded_test_server() - Enabling tests disabled due to SpawnedTestServer compatibility BUG=496825 TBR=brettw@chromium.org,jochen@chromium.org Review URL: https://codereview.chromium.org/1431653003 Cr-Commit-Position: refs/heads/master@{#360598}
Diffstat (limited to 'extensions/browser/guest_view')
-rw-r--r--extensions/browser/guest_view/web_view/web_view_apitest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/browser/guest_view/web_view/web_view_apitest.cc b/extensions/browser/guest_view/web_view/web_view_apitest.cc
index e4ca00b..378cafc 100644
--- a/extensions/browser/guest_view/web_view/web_view_apitest.cc
+++ b/extensions/browser/guest_view/web_view/web_view_apitest.cc
@@ -196,7 +196,7 @@ void WebViewAPITest::SetUpOnMainThread() {
void WebViewAPITest::StartTestServer() {
// For serving guest pages.
- if (!embedded_test_server()->InitializeAndWaitUntilReady()) {
+ if (!embedded_test_server()->Start()) {
LOG(ERROR) << "Failed to start test server.";
return;
}