| 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 "base/path_service.h" |
| 6 #include "chrome/browser/browser.h" | 7 #include "chrome/browser/browser.h" |
| 7 #include "chrome/browser/debugger/devtools_client_host.h" | 8 #include "chrome/browser/debugger/devtools_client_host.h" |
| 8 #include "chrome/browser/debugger/devtools_manager.h" | 9 #include "chrome/browser/debugger/devtools_manager.h" |
| 9 #include "chrome/browser/debugger/devtools_window.h" | 10 #include "chrome/browser/debugger/devtools_window.h" |
| 10 #include "chrome/browser/extensions/extension_host.h" | 11 #include "chrome/browser/extensions/extension_host.h" |
| 11 #include "chrome/browser/extensions/extensions_service.h" | 12 #include "chrome/browser/extensions/extensions_service.h" |
| 12 #include "chrome/browser/profile.h" | 13 #include "chrome/browser/profile.h" |
| 13 #include "chrome/browser/renderer_host/render_view_host.h" | 14 #include "chrome/browser/renderer_host/render_view_host.h" |
| 14 #include "chrome/browser/tab_contents/tab_contents.h" | 15 #include "chrome/browser/tab_contents/tab_contents.h" |
| 15 #include "chrome/common/chrome_paths.h" | 16 #include "chrome/common/chrome_paths.h" |
| 16 #include "chrome/common/chrome_switches.h" | 17 #include "chrome/common/chrome_switches.h" |
| 17 #include "chrome/common/notification_registrar.h" | 18 #include "chrome/common/notification_registrar.h" |
| 18 #include "chrome/common/notification_service.h" | 19 #include "chrome/common/notification_service.h" |
| 19 #include "chrome/test/in_process_browser_test.h" | 20 #include "chrome/test/in_process_browser_test.h" |
| 20 #include "chrome/test/ui_test_utils.h" | 21 #include "chrome/test/ui_test_utils.h" |
| 22 #include "net/test/test_server.h" |
| 21 | 23 |
| 22 namespace { | 24 namespace { |
| 23 | 25 |
| 24 // Used to block until a dev tools client window's browser is closed. | 26 // Used to block until a dev tools client window's browser is closed. |
| 25 class BrowserClosedObserver : public NotificationObserver { | 27 class BrowserClosedObserver : public NotificationObserver { |
| 26 public: | 28 public: |
| 27 explicit BrowserClosedObserver(Browser* browser) { | 29 explicit BrowserClosedObserver(Browser* browser) { |
| 28 registrar_.Add(this, NotificationType::BROWSER_CLOSED, | 30 registrar_.Add(this, NotificationType::BROWSER_CLOSED, |
| 29 Source<Browser>(browser)); | 31 Source<Browser>(browser)); |
| 30 ui_test_utils::RunMessageLoop(); | 32 ui_test_utils::RunMessageLoop(); |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 test_name.c_str())), | 107 test_name.c_str())), |
| 106 &result)); | 108 &result)); |
| 107 EXPECT_EQ("[OK]", result); | 109 EXPECT_EQ("[OK]", result); |
| 108 } else { | 110 } else { |
| 109 FAIL() << "DevTools front-end is broken."; | 111 FAIL() << "DevTools front-end is broken."; |
| 110 } | 112 } |
| 111 CloseDevToolsWindow(); | 113 CloseDevToolsWindow(); |
| 112 } | 114 } |
| 113 | 115 |
| 114 void OpenDevToolsWindow(const std::string& test_page) { | 116 void OpenDevToolsWindow(const std::string& test_page) { |
| 115 HTTPTestServer* server = StartHTTPServer(); | 117 net::HTTPTestServer* server = StartHTTPServer(); |
| 116 GURL url = server->TestServerPage(test_page); | 118 GURL url = server->TestServerPage(test_page); |
| 117 ui_test_utils::NavigateToURL(browser(), url); | 119 ui_test_utils::NavigateToURL(browser(), url); |
| 118 | 120 |
| 119 inspected_rvh_ = GetInspectedTab()->render_view_host(); | 121 inspected_rvh_ = GetInspectedTab()->render_view_host(); |
| 120 DevToolsManager* devtools_manager = DevToolsManager::GetInstance(); | 122 DevToolsManager* devtools_manager = DevToolsManager::GetInstance(); |
| 121 devtools_manager->OpenDevToolsWindow(inspected_rvh_); | 123 devtools_manager->OpenDevToolsWindow(inspected_rvh_); |
| 122 | 124 |
| 123 DevToolsClientHost* client_host = | 125 DevToolsClientHost* client_host = |
| 124 devtools_manager->GetDevToolsClientHostFor(inspected_rvh_); | 126 devtools_manager->GetDevToolsClientHostFor(inspected_rvh_); |
| 125 window_ = client_host->AsDevToolsWindow(); | 127 window_ = client_host->AsDevToolsWindow(); |
| (...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 // Test that Storage panel can be shown. | 471 // Test that Storage panel can be shown. |
| 470 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowStoragePanel) { | 472 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowStoragePanel) { |
| 471 RunTest("testShowStoragePanel", kDebuggerTestPage); | 473 RunTest("testShowStoragePanel", kDebuggerTestPage); |
| 472 } | 474 } |
| 473 | 475 |
| 474 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestMessageLoopReentrant) { | 476 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestMessageLoopReentrant) { |
| 475 RunTest("testMessageLoopReentrant", kDebuggerTestPage); | 477 RunTest("testMessageLoopReentrant", kDebuggerTestPage); |
| 476 } | 478 } |
| 477 | 479 |
| 478 } // namespace | 480 } // namespace |
| OLD | NEW |