diff options
Diffstat (limited to 'chrome/browser/debugger')
14 files changed, 37 insertions, 36 deletions
diff --git a/chrome/browser/debugger/debugger_remote_service.cc b/chrome/browser/debugger/debugger_remote_service.cc index b930365..d5e12b7 100644 --- a/chrome/browser/debugger/debugger_remote_service.cc +++ b/chrome/browser/debugger/debugger_remote_service.cc @@ -16,11 +16,11 @@ #include "chrome/browser/debugger/devtools_protocol_handler.h" #include "chrome/browser/debugger/devtools_remote_message.h" #include "chrome/browser/debugger/inspectable_tab_proxy.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/devtools_messages.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/tab_contents.h" namespace { @@ -79,7 +79,7 @@ void DebuggerRemoteService::HandleMessage( content->GetString(kCommandKey, &command); response.SetString(kCommandKey, command); bool send_response = true; - if (destination.size() == 0) { + if (destination.empty()) { // Unknown command (bad format?) NOTREACHED(); response.SetInteger(kResultKey, RESULT_UNKNOWN_COMMAND); diff --git a/chrome/browser/debugger/devtools_http_protocol_handler.cc b/chrome/browser/debugger/devtools_http_protocol_handler.cc index 43ac93b..7e70ec5 100644 --- a/chrome/browser/debugger/devtools_http_protocol_handler.cc +++ b/chrome/browser/debugger/devtools_http_protocol_handler.cc @@ -12,14 +12,14 @@ #include "base/string_number_conversions.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/debugger/devtools_client_host.h" #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/devtools_messages.h" #include "chrome/common/net/url_request_context_getter.h" +#include "content/browser/browser_thread.h" +#include "content/browser/tab_contents/tab_contents.h" #include "googleurl/src/gurl.h" #include "net/base/io_buffer.h" #include "net/server/http_server_request_info.h" @@ -296,7 +296,7 @@ void DevToolsHttpProtocolHandler::OnWebSocketMessageUI( DevToolsManager* manager = DevToolsManager::GetInstance(); - //TODO(pfeldman): remove this once front-end stops sending it upstream. + // TODO(pfeldman): remove this once front-end stops sending it upstream. if (data == "loaded") return; diff --git a/chrome/browser/debugger/devtools_manager.cc b/chrome/browser/debugger/devtools_manager.cc index e7d3b53..3fc44b5 100644 --- a/chrome/browser/debugger/devtools_manager.cc +++ b/chrome/browser/debugger/devtools_manager.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,20 +9,20 @@ #include "base/auto_reset.h" #include "base/message_loop.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browsing_instance.h" -#include "chrome/browser/child_process_security_policy.h" #include "chrome/browser/debugger/devtools_client_host.h" #include "chrome/browser/debugger/devtools_netlog_observer.h" #include "chrome/browser/debugger/devtools_window.h" #include "chrome/browser/io_thread.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/devtools_messages.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" +#include "content/browser/browsing_instance.h" +#include "content/browser/child_process_security_policy.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/site_instance.h" #include "googleurl/src/gurl.h" // static diff --git a/chrome/browser/debugger/devtools_manager_unittest.cc b/chrome/browser/debugger/devtools_manager_unittest.cc index 751410a..b2a7d2a 100644 --- a/chrome/browser/debugger/devtools_manager_unittest.cc +++ b/chrome/browser/debugger/devtools_manager_unittest.cc @@ -6,9 +6,9 @@ #include "chrome/browser/debugger/devtools_client_host.h" #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/debugger/devtools_window.h" -#include "chrome/browser/renderer_host/test/test_render_view_host.h" -#include "testing/gtest/include/gtest/gtest.h" #include "chrome/common/render_messages.h" +#include "content/browser/renderer_host/test_render_view_host.h" +#include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/debugger/devtools_netlog_observer.cc b/chrome/browser/debugger/devtools_netlog_observer.cc index 0c2bb3e..6724a53 100644 --- a/chrome/browser/debugger/devtools_netlog_observer.cc +++ b/chrome/browser/debugger/devtools_netlog_observer.cc @@ -6,7 +6,7 @@ #include "base/string_util.h" #include "chrome/browser/io_thread.h" -#include "chrome/common/resource_response.h" +#include "content/common/resource_response.h" #include "net/base/load_flags.h" #include "net/http/http_net_log_params.h" #include "net/http/http_response_headers.h" diff --git a/chrome/browser/debugger/devtools_protocol_handler.cc b/chrome/browser/debugger/devtools_protocol_handler.cc index 0024164..4ad52c9 100644 --- a/chrome/browser/debugger/devtools_protocol_handler.cc +++ b/chrome/browser/debugger/devtools_protocol_handler.cc @@ -5,13 +5,13 @@ #include "chrome/browser/debugger/devtools_protocol_handler.h" #include "base/logging.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/debugger/inspectable_tab_proxy.h" #include "chrome/browser/debugger/debugger_remote_service.h" #include "chrome/browser/debugger/devtools_remote_message.h" #include "chrome/browser/debugger/devtools_remote_listen_socket.h" #include "chrome/browser/debugger/devtools_remote_service.h" #include "chrome/browser/debugger/extension_ports_remote_service.h" +#include "content/browser/browser_thread.h" // static scoped_refptr<DevToolsProtocolHandler> DevToolsProtocolHandler::Start( diff --git a/chrome/browser/debugger/devtools_remote_listen_socket.cc b/chrome/browser/debugger/devtools_remote_listen_socket.cc index c5804d5..19234e5 100644 --- a/chrome/browser/debugger/devtools_remote_listen_socket.cc +++ b/chrome/browser/debugger/devtools_remote_listen_socket.cc @@ -58,7 +58,7 @@ void DevToolsRemoteListenSocket::StartNextField() { state_ = HEADERS; break; case HEADERS: - if (protocol_field_.size() == 0) { // empty line - end of headers + if (protocol_field_.empty()) { // empty line - end of headers const std::string& payload_length_string = GetHeader( DevToolsRemoteMessageHeaders::kContentLength, "0"); base::StringToInt(payload_length_string, &remaining_payload_length_); @@ -164,7 +164,7 @@ void DevToolsRemoteListenSocket::DispatchField() { } break; case HEADERS: { - if (protocol_field_.size() > 0) { // not end-of-headers + if (!protocol_field_.empty()) { // not end-of-headers std::string::size_type colon_pos = protocol_field_.find_first_of(":"); if (colon_pos == std::string::npos) { // TODO(apavlov): handle the error (malformed header) diff --git a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc index f877473..0914594 100644 --- a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc +++ b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc @@ -176,7 +176,7 @@ bool DevToolsRemoteListenSocketTester::NextAction(int timeout) { if (ret != WAIT_OBJECT_0) return false; EnterCriticalSection(&lock_); - if (queue_.size() == 0) { + if (queue_.empty()) { LeaveCriticalSection(&lock_); return false; } @@ -197,7 +197,7 @@ bool DevToolsRemoteListenSocketTester::NextAction(int timeout) { break; } pthread_mutex_lock(&lock_); - if (queue_.size() == 0) { + if (queue_.empty()) { pthread_mutex_unlock(&lock_); return false; } diff --git a/chrome/browser/debugger/devtools_remote_service.cc b/chrome/browser/debugger/devtools_remote_service.cc index 2c37917..a55c627 100644 --- a/chrome/browser/debugger/devtools_remote_service.cc +++ b/chrome/browser/debugger/devtools_remote_service.cc @@ -14,9 +14,9 @@ #include "chrome/browser/debugger/devtools_protocol_handler.h" #include "chrome/browser/debugger/devtools_remote_message.h" #include "chrome/browser/debugger/inspectable_tab_proxy.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/common/devtools_messages.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_entry.h" const char DevToolsRemoteServiceCommand::kPing[] = "ping"; const char DevToolsRemoteServiceCommand::kVersion[] = "version"; diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index 5498dfd..6a5a138 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -12,14 +12,14 @@ #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/tab_contents.h" #include "net/test/test_server.h" namespace { @@ -247,7 +247,7 @@ class DevToolsExtensionDebugTest : public DevToolsSanityTest, }; // Tests heap profiler. -IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestHeapProfiler) { +IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, FAILS_TestHeapProfiler) { RunTest("testHeapProfiler", kHeapProfilerPage); } @@ -290,7 +290,8 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPauseWhenLoadingDevTools) { // Tests that pressing 'Pause' will pause script execution if the script // is already running. -IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestPauseWhenScriptIsRunning) { +// Marked as DISABLED due to http://crbug.com/74923 +IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestPauseWhenScriptIsRunning) { RunTest("testPauseWhenScriptIsRunning", kPauseWhenScriptIsRunning); } diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index 4bfe6a4..f613e76 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -13,15 +13,9 @@ #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/debugger/devtools_window.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/in_process_webkit/session_storage_namespace.h" #include "chrome/browser/load_notification_details.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/browser.h" @@ -31,6 +25,12 @@ #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" +#include "content/browser/in_process_webkit/session_storage_namespace.h" +#include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_entry.h" +#include "content/browser/tab_contents/tab_contents.h" +#include "content/browser/tab_contents/tab_contents_view.h" #include "grit/generated_resources.h" const char DevToolsWindow::kDevToolsApp[] = "DevToolsApp"; diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h index 689ae40..febd7f7 100644 --- a/chrome/browser/debugger/devtools_window.h +++ b/chrome/browser/debugger/devtools_window.h @@ -11,9 +11,9 @@ #include "base/basictypes.h" #include "chrome/browser/debugger/devtools_client_host.h" #include "chrome/browser/debugger/devtools_toggle_action.h" -#include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "content/browser/tab_contents/tab_contents_delegate.h" namespace IPC { class Message; diff --git a/chrome/browser/debugger/extension_ports_remote_service.cc b/chrome/browser/debugger/extension_ports_remote_service.cc index 6f4fbb9..711e3f8 100644 --- a/chrome/browser/debugger/extension_ports_remote_service.cc +++ b/chrome/browser/debugger/extension_ports_remote_service.cc @@ -20,10 +20,10 @@ #include "chrome/browser/debugger/devtools_remote_message.h" #include "chrome/browser/debugger/inspectable_tab_proxy.h" #include "chrome/browser/profiles/profile_manager.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/devtools_messages.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" +#include "content/browser/tab_contents/tab_contents.h" namespace { @@ -174,7 +174,7 @@ void ExtensionPortsRemoteService::HandleMessage( } int destination = -1; - if (destinationString.size() != 0) + if (!destinationString.empty()) base::StringToInt(destinationString, &destination); if (command == kConnect) { diff --git a/chrome/browser/debugger/inspectable_tab_proxy.cc b/chrome/browser/debugger/inspectable_tab_proxy.cc index 652e540..0f31b0a 100644 --- a/chrome/browser/debugger/inspectable_tab_proxy.cc +++ b/chrome/browser/debugger/inspectable_tab_proxy.cc @@ -10,10 +10,10 @@ #include "chrome/browser/debugger/debugger_remote_service.h" #include "chrome/browser/debugger/devtools_client_host.h" #include "chrome/browser/sessions/session_id.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/devtools_messages.h" +#include "content/browser/tab_contents/tab_contents.h" DevToolsClientHostImpl::DevToolsClientHostImpl( int32 id, @@ -105,7 +105,7 @@ DevToolsClientHost* InspectableTabProxy::NewClientHost( } void InspectableTabProxy::OnRemoteDebuggerDetached() { - while (id_to_client_host_map_.size() > 0) { + while (!id_to_client_host_map_.empty()) { IdToClientHostMap::iterator it = id_to_client_host_map_.begin(); it->second->debugger_remote_service()->DetachFromTab( base::IntToString(it->first), NULL); |