| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "chrome/browser/browser.h" | 6 #include "chrome/browser/browser.h" |
| 7 #include "chrome/browser/debugger/devtools_client_host.h" | 7 #include "chrome/browser/debugger/devtools_client_host.h" |
| 8 #include "chrome/browser/debugger/devtools_manager.h" | 8 #include "chrome/browser/debugger/devtools_manager.h" |
| 9 #include "chrome/browser/debugger/devtools_window.h" | 9 #include "chrome/browser/debugger/devtools_window.h" |
| 10 #include "chrome/browser/extensions/extensions_service.h" | 10 #include "chrome/browser/extensions/extensions_service.h" |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 FAIL() << "DevTools front-end is broken."; | 101 FAIL() << "DevTools front-end is broken."; |
| 102 } | 102 } |
| 103 CloseDevToolsWindow(); | 103 CloseDevToolsWindow(); |
| 104 } | 104 } |
| 105 | 105 |
| 106 void OpenDevToolsWindow(const std::wstring& test_page) { | 106 void OpenDevToolsWindow(const std::wstring& test_page) { |
| 107 HTTPTestServer* server = StartHTTPServer(); | 107 HTTPTestServer* server = StartHTTPServer(); |
| 108 GURL url = server->TestServerPageW(test_page); | 108 GURL url = server->TestServerPageW(test_page); |
| 109 ui_test_utils::NavigateToURL(browser(), url); | 109 ui_test_utils::NavigateToURL(browser(), url); |
| 110 | 110 |
| 111 TabContents* tab = browser()->GetTabContentsAt(0); | 111 inspected_rvh_ = GetInspectedTab()->render_view_host(); |
| 112 inspected_rvh_ = tab->render_view_host(); | |
| 113 DevToolsManager* devtools_manager = DevToolsManager::GetInstance(); | 112 DevToolsManager* devtools_manager = DevToolsManager::GetInstance(); |
| 114 devtools_manager->OpenDevToolsWindow(inspected_rvh_); | 113 devtools_manager->OpenDevToolsWindow(inspected_rvh_); |
| 115 | 114 |
| 116 DevToolsClientHost* client_host = | 115 DevToolsClientHost* client_host = |
| 117 devtools_manager->GetDevToolsClientHostFor(inspected_rvh_); | 116 devtools_manager->GetDevToolsClientHostFor(inspected_rvh_); |
| 118 window_ = client_host->AsDevToolsWindow(); | 117 window_ = client_host->AsDevToolsWindow(); |
| 119 RenderViewHost* client_rvh = window_->GetRenderViewHost(); | 118 RenderViewHost* client_rvh = window_->GetRenderViewHost(); |
| 120 client_contents_ = client_rvh->delegate()->GetAsTabContents(); | 119 client_contents_ = client_rvh->delegate()->GetAsTabContents(); |
| 121 ui_test_utils::WaitForNavigation(&client_contents_->controller()); | 120 ui_test_utils::WaitForNavigation(&client_contents_->controller()); |
| 122 } | 121 } |
| 123 | 122 |
| 123 TabContents* GetInspectedTab() { |
| 124 return browser()->GetTabContentsAt(0); |
| 125 } |
| 126 |
| 124 void CloseDevToolsWindow() { | 127 void CloseDevToolsWindow() { |
| 125 DevToolsManager* devtools_manager = DevToolsManager::GetInstance(); | 128 DevToolsManager* devtools_manager = DevToolsManager::GetInstance(); |
| 126 // UnregisterDevToolsClientHostFor may destroy window_ so store the browser | 129 // UnregisterDevToolsClientHostFor may destroy window_ so store the browser |
| 127 // first. | 130 // first. |
| 128 Browser* browser = window_->browser(); | 131 Browser* browser = window_->browser(); |
| 129 devtools_manager->UnregisterDevToolsClientHostFor(inspected_rvh_); | 132 devtools_manager->UnregisterDevToolsClientHostFor(inspected_rvh_); |
| 130 BrowserClosedObserver close_observer(browser); | 133 BrowserClosedObserver close_observer(browser); |
| 131 } | 134 } |
| 132 | 135 |
| 133 TabContents* client_contents_; | 136 TabContents* client_contents_; |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 // Tests profiler panel. | 278 // Tests profiler panel. |
| 276 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestProfilerTab) { | 279 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestProfilerTab) { |
| 277 RunTest("testProfilerTab", kJsPage); | 280 RunTest("testProfilerTab", kJsPage); |
| 278 } | 281 } |
| 279 | 282 |
| 280 // Tests scripts panel showing. | 283 // Tests scripts panel showing. |
| 281 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) { | 284 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) { |
| 282 RunTest("testShowScriptsTab", kDebuggerTestPage); | 285 RunTest("testShowScriptsTab", kDebuggerTestPage); |
| 283 } | 286 } |
| 284 | 287 |
| 288 // Tests that scripts tab is populated with inspected scripts even if it |
| 289 // hadn't been shown by the moment inspected paged refreshed. |
| 290 // @see http://crbug.com/26312 |
| 291 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, |
| 292 TestScriptsTabIsPopulatedOnInspectedPageRefresh) { |
| 293 // Reset inspector settings to defaults to ensure that Elements will be |
| 294 // current panel when DevTools window is open. |
| 295 GetInspectedTab()->render_view_host()->delegate()->UpdateInspectorSettings( |
| 296 WebPreferences().inspector_settings); |
| 297 RunTest("testScriptsTabIsPopulatedOnInspectedPageRefresh", |
| 298 kDebuggerTestPage); |
| 299 } |
| 300 |
| 301 |
| 285 // Tests that a content script is in the scripts list. | 302 // Tests that a content script is in the scripts list. |
| 286 IN_PROC_BROWSER_TEST_F(DevToolsExtensionDebugTest, | 303 IN_PROC_BROWSER_TEST_F(DevToolsExtensionDebugTest, |
| 287 TestContentScriptIsPresent) { | 304 TestContentScriptIsPresent) { |
| 288 LoadExtension("simple_content_script"); | 305 LoadExtension("simple_content_script"); |
| 289 RunTest("testContentScriptIsPresent", kPageWithContentScript); | 306 RunTest("testContentScriptIsPresent", kPageWithContentScript); |
| 290 } | 307 } |
| 291 | 308 |
| 292 // Tests that scripts are not duplicated after Scripts Panel switch. | 309 // Tests that scripts are not duplicated after Scripts Panel switch. |
| 293 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, | 310 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, |
| 294 TestNoScriptDuplicatesOnPanelSwitch) { | 311 TestNoScriptDuplicatesOnPanelSwitch) { |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestConsoleLog) { | 372 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestConsoleLog) { |
| 356 RunTest("testConsoleLog", kConsoleTestPage); | 373 RunTest("testConsoleLog", kConsoleTestPage); |
| 357 } | 374 } |
| 358 | 375 |
| 359 // Tests eval global values. | 376 // Tests eval global values. |
| 360 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestEvalGlobal) { | 377 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestEvalGlobal) { |
| 361 RunTest("testEvalGlobal", kEvalTestPage); | 378 RunTest("testEvalGlobal", kEvalTestPage); |
| 362 } | 379 } |
| 363 | 380 |
| 364 } // namespace | 381 } // namespace |
| OLD | NEW |