OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/cancelable_callback.h" | 10 #include "base/cancelable_callback.h" |
(...skipping 1179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1190 OpenDevToolsWindow("about:blank", false); | 1190 OpenDevToolsWindow("about:blank", false); |
1191 SwitchToPanel(window_, panel_name); | 1191 SwitchToPanel(window_, panel_name); |
1192 ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); | 1192 ui_test_utils::NavigateToURL(browser(), GURL(url::kAboutBlankURL)); |
1193 | 1193 |
1194 content::RenderProcessHostWatcher crash_observer( | 1194 content::RenderProcessHostWatcher crash_observer( |
1195 GetInspectedTab(), | 1195 GetInspectedTab(), |
1196 content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); | 1196 content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); |
1197 ui_test_utils::NavigateToURL(browser(), GURL(content::kChromeUICrashURL)); | 1197 ui_test_utils::NavigateToURL(browser(), GURL(content::kChromeUICrashURL)); |
1198 crash_observer.Wait(); | 1198 crash_observer.Wait(); |
1199 content::TestNavigationObserver navigation_observer(GetInspectedTab(), 1); | 1199 content::TestNavigationObserver navigation_observer(GetInspectedTab(), 1); |
1200 chrome::Reload(browser(), CURRENT_TAB); | 1200 chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB); |
1201 navigation_observer.Wait(); | 1201 navigation_observer.Wait(); |
1202 } | 1202 } |
1203 }; | 1203 }; |
1204 | 1204 |
1205 IN_PROC_BROWSER_TEST_F(DevToolsReattachAfterCrashTest, | 1205 IN_PROC_BROWSER_TEST_F(DevToolsReattachAfterCrashTest, |
1206 TestReattachAfterCrashOnTimeline) { | 1206 TestReattachAfterCrashOnTimeline) { |
1207 RunTestWithPanel("timeline"); | 1207 RunTestWithPanel("timeline"); |
1208 } | 1208 } |
1209 | 1209 |
1210 IN_PROC_BROWSER_TEST_F(DevToolsReattachAfterCrashTest, | 1210 IN_PROC_BROWSER_TEST_F(DevToolsReattachAfterCrashTest, |
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1441 test_factory.AddFactoryOverride(GURL("chrome://dummyurl").host(), | 1441 test_factory.AddFactoryOverride(GURL("chrome://dummyurl").host(), |
1442 &mock_provider); | 1442 &mock_provider); |
1443 content::WebUIControllerFactory::RegisterFactory(&test_factory); | 1443 content::WebUIControllerFactory::RegisterFactory(&test_factory); |
1444 | 1444 |
1445 ui_test_utils::NavigateToURL(browser(), GURL("chrome://dummyurl")); | 1445 ui_test_utils::NavigateToURL(browser(), GURL("chrome://dummyurl")); |
1446 DevToolsWindow* window = | 1446 DevToolsWindow* window = |
1447 DevToolsWindowTesting::OpenDevToolsWindowSync(GetInspectedTab(), true); | 1447 DevToolsWindowTesting::OpenDevToolsWindowSync(GetInspectedTab(), true); |
1448 chrome::DuplicateTab(browser()); | 1448 chrome::DuplicateTab(browser()); |
1449 chrome::SelectPreviousTab(browser()); | 1449 chrome::SelectPreviousTab(browser()); |
1450 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); | 1450 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); |
1451 chrome::GoBack(browser(), CURRENT_TAB); | 1451 chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB); |
1452 RunTestFunction(window, "testWindowInitializedOnNavigateBack"); | 1452 RunTestFunction(window, "testWindowInitializedOnNavigateBack"); |
1453 | 1453 |
1454 DevToolsWindowTesting::CloseDevToolsWindowSync(window); | 1454 DevToolsWindowTesting::CloseDevToolsWindowSync(window); |
1455 content::WebUIControllerFactory::UnregisterFactoryForTesting(&test_factory); | 1455 content::WebUIControllerFactory::UnregisterFactoryForTesting(&test_factory); |
1456 } | 1456 } |
OLD | NEW |