| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/string16.h" | 9 #include "base/string16.h" |
| 10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 MessageLoopForUI::current(), &MessageLoop::Quit)); | 83 MessageLoopForUI::current(), &MessageLoop::Quit)); |
| 84 } | 84 } |
| 85 | 85 |
| 86 // Executes javascript to execute a given test case found in the current | 86 // Executes javascript to execute a given test case found in the current |
| 87 // page's script. If |wait_for_response| is true, this method will not | 87 // page's script. If |wait_for_response| is true, this method will not |
| 88 // return until the javascript has been executed. | 88 // return until the javascript has been executed. |
| 89 // Use with [ASSERT|EXPECT]_NO_FATAL_FAILURE. | 89 // Use with [ASSERT|EXPECT]_NO_FATAL_FAILURE. |
| 90 void RunTestCaseInJavaScript(int test_case_number, bool wait_for_response) { | 90 void RunTestCaseInJavaScript(int test_case_number, bool wait_for_response) { |
| 91 std::string script = base::StringPrintf("runTestCase(%d);", | 91 std::string script = base::StringPrintf("runTestCase(%d);", |
| 92 test_case_number); | 92 test_case_number); |
| 93 RenderViewHost* host = | 93 content::RenderViewHost* host = |
| 94 browser()->GetSelectedWebContents()->GetRenderViewHost(); | 94 browser()->GetSelectedWebContents()->GetRenderViewHost(); |
| 95 if (wait_for_response) { | 95 if (wait_for_response) { |
| 96 ASSERT_TRUE(ui_test_utils::ExecuteJavaScript( | 96 ASSERT_TRUE(ui_test_utils::ExecuteJavaScript( |
| 97 host, L"", ASCIIToWide(script))); | 97 host, L"", ASCIIToWide(script))); |
| 98 } else { | 98 } else { |
| 99 script += "window.domAutomationController.setAutomationId(0);" | 99 script += "window.domAutomationController.setAutomationId(0);" |
| 100 "window.domAutomationController.send(0);"; | 100 "window.domAutomationController.send(0);"; |
| 101 host->ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16(script)); | 101 host->ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16(script)); |
| 102 } | 102 } |
| 103 } | 103 } |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 IN_PROC_BROWSER_TEST_F(AutomationTabHelperBrowserTest, | 207 IN_PROC_BROWSER_TEST_F(AutomationTabHelperBrowserTest, |
| 208 CrashedTabStopsLoading) { | 208 CrashedTabStopsLoading) { |
| 209 MockTabEventObserver mock_tab_observer(tab_helper()); | 209 MockTabEventObserver mock_tab_observer(tab_helper()); |
| 210 | 210 |
| 211 testing::InSequence expect_in_sequence; | 211 testing::InSequence expect_in_sequence; |
| 212 EXPECT_CALL(mock_tab_observer, OnFirstPendingLoad(_)); | 212 EXPECT_CALL(mock_tab_observer, OnFirstPendingLoad(_)); |
| 213 EXPECT_CALL(mock_tab_observer, OnNoMorePendingLoads(_)); | 213 EXPECT_CALL(mock_tab_observer, OnNoMorePendingLoads(_)); |
| 214 | 214 |
| 215 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUICrashURL)); | 215 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUICrashURL)); |
| 216 } | 216 } |
| OLD | NEW |