| 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 #include <vector> | 8 #include <vector> | 
| 9 | 9 | 
| 10 #include "base/bind.h" | 10 #include "base/bind.h" | 
| (...skipping 1795 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1806         GetInspectedTab(), | 1806         GetInspectedTab(), | 
| 1807         content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); | 1807         content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT); | 
| 1808     ui_test_utils::NavigateToURL(browser(), GURL(content::kChromeUICrashURL)); | 1808     ui_test_utils::NavigateToURL(browser(), GURL(content::kChromeUICrashURL)); | 
| 1809     crash_observer.Wait(); | 1809     crash_observer.Wait(); | 
| 1810     content::TestNavigationObserver navigation_observer(GetInspectedTab(), 1); | 1810     content::TestNavigationObserver navigation_observer(GetInspectedTab(), 1); | 
| 1811     chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB); | 1811     chrome::Reload(browser(), WindowOpenDisposition::CURRENT_TAB); | 
| 1812     navigation_observer.Wait(); | 1812     navigation_observer.Wait(); | 
| 1813   } | 1813   } | 
| 1814 }; | 1814 }; | 
| 1815 | 1815 | 
|  | 1816 // TODO(hans): Temporarily disable while enabling Clang by default on Windows | 
|  | 1817 // over the weekend. (crbug.com/727458) | 
|  | 1818 #if !(defined(OS_WIN) && defined(__clang__)) | 
| 1816 IN_PROC_BROWSER_TEST_F(DevToolsReattachAfterCrashTest, | 1819 IN_PROC_BROWSER_TEST_F(DevToolsReattachAfterCrashTest, | 
| 1817                        TestReattachAfterCrashOnTimeline) { | 1820                        TestReattachAfterCrashOnTimeline) { | 
| 1818   RunTestWithPanel("timeline"); | 1821   RunTestWithPanel("timeline"); | 
| 1819 } | 1822 } | 
|  | 1823 #endif | 
| 1820 | 1824 | 
| 1821 IN_PROC_BROWSER_TEST_F(DevToolsReattachAfterCrashTest, | 1825 IN_PROC_BROWSER_TEST_F(DevToolsReattachAfterCrashTest, | 
| 1822                        TestReattachAfterCrashOnNetwork) { | 1826                        TestReattachAfterCrashOnNetwork) { | 
| 1823   RunTestWithPanel("network"); | 1827   RunTestWithPanel("network"); | 
| 1824 } | 1828 } | 
| 1825 | 1829 | 
| 1826 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, AutoAttachToWindowOpen) { | 1830 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, AutoAttachToWindowOpen) { | 
| 1827   OpenDevToolsWindow(kWindowOpenTestPage, false); | 1831   OpenDevToolsWindow(kWindowOpenTestPage, false); | 
| 1828   DispatchOnTestSuite(window_, "enableAutoAttachToCreatedPages"); | 1832   DispatchOnTestSuite(window_, "enableAutoAttachToCreatedPages"); | 
| 1829   DevToolsWindowCreationObserver observer; | 1833   DevToolsWindowCreationObserver observer; | 
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2069   RunTestFunction(window, "testWindowInitializedOnNavigateBack"); | 2073   RunTestFunction(window, "testWindowInitializedOnNavigateBack"); | 
| 2070 | 2074 | 
| 2071   DevToolsWindowTesting::CloseDevToolsWindowSync(window); | 2075   DevToolsWindowTesting::CloseDevToolsWindowSync(window); | 
| 2072   content::WebUIControllerFactory::UnregisterFactoryForTesting(&test_factory); | 2076   content::WebUIControllerFactory::UnregisterFactoryForTesting(&test_factory); | 
| 2073 } | 2077 } | 
| 2074 | 2078 | 
| 2075 // Tests scripts panel showing. | 2079 // Tests scripts panel showing. | 
| 2076 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestDevToolsSharedWorker) { | 2080 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestDevToolsSharedWorker) { | 
| 2077   RunTest("testDevToolsSharedWorker", url::kAboutBlankURL); | 2081   RunTest("testDevToolsSharedWorker", url::kAboutBlankURL); | 
| 2078 } | 2082 } | 
| OLD | NEW | 
|---|