Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(183)

Unified Diff: chrome/browser/app_controller_mac_browsertest.mm

Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/apps/drive/drive_app_converter_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/app_controller_mac_browsertest.mm
diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm
index 4a4794ce03531938fc740483f5cf227725e6dfbe..bd36bb6171f4a2ed6431a81a5d562433aab93e40 100644
--- a/chrome/browser/app_controller_mac_browsertest.mm
+++ b/chrome/browser/app_controller_mac_browsertest.mm
@@ -371,7 +371,7 @@ class AppControllerOpenShortcutBrowserTest : public InProcessBrowserTest {
method_exchangeImplementations(original, destination);
- ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+ ASSERT_TRUE(embedded_test_server()->Start());
g_open_shortcut_url = embedded_test_server()->GetURL("/simple.html");
}
@@ -395,7 +395,7 @@ class AppControllerReplaceNTPBrowserTest : public InProcessBrowserTest {
AppControllerReplaceNTPBrowserTest() {}
void SetUpInProcessBrowserTestFixture() override {
- ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+ ASSERT_TRUE(embedded_test_server()->Start());
}
void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -633,7 +633,7 @@ class AppControllerHandoffBrowserTest : public InProcessBrowserTest {
// switches between browser windows, the correct URL is being passed to the
// Handoff.
IN_PROC_BROWSER_TEST_F(AppControllerHandoffBrowserTest, TestHandoffURLs) {
- ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+ ASSERT_TRUE(embedded_test_server()->Start());
EXPECT_EQ(g_handoff_url, GURL(url::kAboutBlankURL));
// Test that navigating to a URL updates the handoff URL.
« no previous file with comments | « no previous file | chrome/browser/apps/drive/drive_app_converter_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698