| Index: chrome/browser/browser_keyevents_browsertest.cc
|
| diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc
|
| index 2cc8168421fb7bb4859a5ce4f16300cb6abd8ac8..73c85e04fc413d80ad529009077cbe6ac7b45fed 100644
|
| --- a/chrome/browser/browser_keyevents_browsertest.cc
|
| +++ b/chrome/browser/browser_keyevents_browsertest.cc
|
| @@ -353,7 +353,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_NormalKeyEvents) {
|
| "U 65 0 false false false false" } },
|
| };
|
|
|
| - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
| + ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
|
| GURL url = embedded_test_server()->GetURL(kTestingPage);
|
| @@ -447,7 +447,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_CtrlKeyEvents) {
|
| "U 17 0 true false false false" }
|
| };
|
|
|
| - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
| + ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
|
| GURL url = embedded_test_server()->GetURL(kTestingPage);
|
| @@ -493,7 +493,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_CommandKeyEvents) {
|
| "U 91 0 false false false true" }
|
| };
|
|
|
| - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
| + ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
|
| GURL url = embedded_test_server()->GetURL(kTestingPage);
|
| @@ -593,7 +593,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_AccessKeys) {
|
| #endif
|
| #endif
|
|
|
| - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
| + ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
|
| GURL url = embedded_test_server()->GetURL(kTestingPage);
|
| @@ -661,7 +661,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_AccessKeys) {
|
| #define MAYBE_ReservedAccelerators ReservedAccelerators
|
| #endif
|
| IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_ReservedAccelerators) {
|
| - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
| + ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
|
| GURL url = embedded_test_server()->GetURL(kTestingPage);
|
| @@ -761,7 +761,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, EditorKeyBindings) {
|
| "U 17 0 true false false false" }
|
| };
|
|
|
| - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
| + ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
|
| GURL url = embedded_test_server()->GetURL(kTestingPage);
|
| @@ -799,7 +799,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_PageUpDownKeys) {
|
| "U 34 0 false false false false" }
|
| };
|
|
|
| - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
| + ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
|
| GURL url = embedded_test_server()->GetURL(kTestingPage);
|
| @@ -843,7 +843,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, FocusMenuBarByAltKey) {
|
| "U 17 0 true false false false" }
|
| };
|
|
|
| - ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
|
| + ASSERT_TRUE(embedded_test_server()->Start());
|
|
|
| ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
|
| GURL url = embedded_test_server()->GetURL(kTestingPage);
|
|
|