diff options
54 files changed, 46 insertions, 71 deletions
diff --git a/chrome/browser/automation/extension_port_container.cc b/chrome/browser/automation/extension_port_container.cc index ff504b6..6a31c299 100644 --- a/chrome/browser/automation/extension_port_container.cc +++ b/chrome/browser/automation/extension_port_container.cc @@ -10,7 +10,6 @@ #include "base/values.h" #include "chrome/browser/automation/automation_provider.h" #include "chrome/browser/automation/extension_automation_constants.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_message_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_host/render_process_host.h" diff --git a/chrome/browser/chromeos/cros/speech_synthesis_library.cc b/chrome/browser/chromeos/cros/speech_synthesis_library.cc index b3b19ea..14860ba 100644 --- a/chrome/browser/chromeos/cros/speech_synthesis_library.cc +++ b/chrome/browser/chromeos/cros/speech_synthesis_library.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/cros/speech_synthesis_library.h" #include "base/message_loop.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "cros/chromeos_speech_synthesis.h" diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc index fbc904b..c48f26b 100644 --- a/chrome/browser/chromeos/input_method/input_method_util.cc +++ b/chrome/browser/chromeos/input_method/input_method_util.cc @@ -5,6 +5,7 @@ #include "chrome/browser/chromeos/input_method/input_method_util.h" #include <algorithm> +#include <functional> #include <map> #include <utility> @@ -20,7 +21,6 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/keyboard_library.h" #include "chrome/browser/chromeos/language_preferences.h" diff --git a/chrome/browser/chromeos/login/cryptohome_op.cc b/chrome/browser/chromeos/login/cryptohome_op.cc index b73da68..688b2ba 100644 --- a/chrome/browser/chromeos/login/cryptohome_op.cc +++ b/chrome/browser/chromeos/login/cryptohome_op.cc @@ -6,6 +6,7 @@ #include <string> +#include "chrome/browser/browser_thread.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/cryptohome_library.h" #include "chrome/browser/chromeos/login/auth_attempt_state.h" diff --git a/chrome/browser/chromeos/login/cryptohome_op.h b/chrome/browser/chromeos/login/cryptohome_op.h index d1e6e20..959c390 100644 --- a/chrome/browser/chromeos/login/cryptohome_op.h +++ b/chrome/browser/chromeos/login/cryptohome_op.h @@ -9,7 +9,6 @@ #include <string> #include "base/ref_counted.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/chromeos/cros/cryptohome_library.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/mock_url_fetchers.h b/chrome/browser/chromeos/login/mock_url_fetchers.h index 187fc66..c3fd37b 100644 --- a/chrome/browser/chromeos/login/mock_url_fetchers.h +++ b/chrome/browser/chromeos/login/mock_url_fetchers.h @@ -6,8 +6,9 @@ #define CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_URL_FETCHERS_H_ #pragma once +#include <string> + #include "base/message_loop.h" -#include "chrome/browser/browser_thread.h" #include "chrome/common/net/url_fetcher.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/chromeos/login/online_attempt.h b/chrome/browser/chromeos/login/online_attempt.h index ed1b447..f91c468 100644 --- a/chrome/browser/chromeos/login/online_attempt.h +++ b/chrome/browser/chromeos/login/online_attempt.h @@ -11,11 +11,11 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/chromeos/login/login_status_consumer.h" #include "chrome/common/net/gaia/gaia_auth_consumer.h" #include "chrome/common/net/gaia/google_service_auth_error.h" +class CancelableTask; class GaiaAuthFetcher; class Profile; diff --git a/chrome/browser/chromeos/login/owner_manager_unittest.h b/chrome/browser/chromeos/login/owner_manager_unittest.h index a3609d6..6d72247 100644 --- a/chrome/browser/chromeos/login/owner_manager_unittest.h +++ b/chrome/browser/chromeos/login/owner_manager_unittest.h @@ -8,11 +8,11 @@ #include "chrome/browser/chromeos/login/owner_manager.h" #include <string> +#include <vector> #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" -#include "chrome/browser/browser_thread.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/chromeos/login/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/screen_locker_browsertest.cc index 321e0c8..0b7023b 100644 --- a/chrome/browser/chromeos/login/screen_locker_browsertest.cc +++ b/chrome/browser/chromeos/login/screen_locker_browsertest.cc @@ -6,7 +6,6 @@ #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "chrome/browser/automation/ui_controls.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" #include "chrome/browser/chromeos/cros/mock_input_method_library.h" diff --git a/chrome/browser/chromeos/views/domui_menu_widget.cc b/chrome/browser/chromeos/views/domui_menu_widget.cc index 6231d6a..b0cda2b 100644 --- a/chrome/browser/chromeos/views/domui_menu_widget.cc +++ b/chrome/browser/chromeos/views/domui_menu_widget.cc @@ -4,10 +4,11 @@ #include "chrome/browser/chromeos/views/domui_menu_widget.h" +#include <algorithm> + #include "base/stringprintf.h" #include "base/singleton.h" #include "base/task.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/chromeos/views/menu_locator.h" #include "chrome/browser/chromeos/views/native_menu_domui.h" #include "chrome/browser/chromeos/wm_ipc.h" @@ -210,7 +211,7 @@ gboolean MapToFocus(GtkWidget* widget, GdkEvent* event, gpointer data) { void DOMUIMenuWidget::EnableScroll(bool enable) { ExecuteJavascript(StringPrintf( - L"enableScroll(%ls)", enable ? L"true" : L"false" )); + L"enableScroll(%ls)", enable ? L"true" : L"false")); } void DOMUIMenuWidget::EnableInput(bool select_item) { diff --git a/chrome/browser/device_orientation/provider_impl.cc b/chrome/browser/device_orientation/provider_impl.cc index e5e2397..5ebfdb6 100644 --- a/chrome/browser/device_orientation/provider_impl.cc +++ b/chrome/browser/device_orientation/provider_impl.cc @@ -7,8 +7,9 @@ #include <vector> #include "base/logging.h" +#include "base/message_loop.h" #include "base/task.h" -#include "chrome/browser/browser_thread.h" +#include "base/thread.h" #include "chrome/browser/device_orientation/orientation.h" #include "chrome/browser/device_orientation/provider_impl.h" @@ -150,6 +151,7 @@ void ProviderImpl::ScheduleDoPoll() { } namespace { + bool IsElementSignificantlyDifferent(bool can_provide_element1, bool can_provide_element2, double element1, @@ -163,7 +165,7 @@ bool IsElementSignificantlyDifferent(bool can_provide_element1, return true; return false; } -} // namespace +} // namespace // Returns true if two orientations are considered different enough that // observers should be notified of the new orientation. diff --git a/chrome/browser/dom_ui/constrained_html_ui_browsertest.cc b/chrome/browser/dom_ui/constrained_html_ui_browsertest.cc index a1cd300..2862dbe 100644 --- a/chrome/browser/dom_ui/constrained_html_ui_browsertest.cc +++ b/chrome/browser/dom_ui/constrained_html_ui_browsertest.cc @@ -6,7 +6,6 @@ #include "base/file_path.h" #include "base/message_loop.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/dom_ui/constrained_html_ui.h" #include "chrome/browser/dom_ui/html_dialog_ui.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" diff --git a/chrome/browser/dom_ui/dom_ui_factory.cc b/chrome/browser/dom_ui/dom_ui_factory.cc index 3d171c2..beb4f43 100644 --- a/chrome/browser/dom_ui/dom_ui_factory.cc +++ b/chrome/browser/dom_ui/dom_ui_factory.cc @@ -6,7 +6,6 @@ #include "base/command_line.h" #include "chrome/browser/about_flags.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/dom_ui/bookmarks_ui.h" #include "chrome/browser/dom_ui/bug_report_ui.h" #include "chrome/browser/dom_ui/constrained_html_ui.h" diff --git a/chrome/browser/dom_ui/dom_ui_favicon_source.cc b/chrome/browser/dom_ui/dom_ui_favicon_source.cc index aef6d48..565d4ed 100644 --- a/chrome/browser/dom_ui/dom_ui_favicon_source.cc +++ b/chrome/browser/dom_ui/dom_ui_favicon_source.cc @@ -6,7 +6,6 @@ #include "app/resource_bundle.h" #include "base/callback.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" #include "grit/app_resources.h" diff --git a/chrome/browser/dom_ui/new_tab_ui_uitest.cc b/chrome/browser/dom_ui/new_tab_ui_uitest.cc index f50e179..51d2b05 100644 --- a/chrome/browser/dom_ui/new_tab_ui_uitest.cc +++ b/chrome/browser/dom_ui/new_tab_ui_uitest.cc @@ -5,7 +5,6 @@ #include "chrome/test/ui/ui_test.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/dom_ui/new_tab_ui.h" #include "chrome/browser/prefs/pref_value_store.h" #include "chrome/browser/sync/signin_manager.h" diff --git a/chrome/browser/dom_ui/shown_sections_handler_unittest.cc b/chrome/browser/dom_ui/shown_sections_handler_unittest.cc index 9e9278e..7ca5631 100644 --- a/chrome/browser/dom_ui/shown_sections_handler_unittest.cc +++ b/chrome/browser/dom_ui/shown_sections_handler_unittest.cc @@ -5,7 +5,6 @@ #include "chrome/browser/dom_ui/shown_sections_handler.h" #include "base/scoped_ptr.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/prefs/pref_value_store.h" #include "chrome/common/json_pref_store.h" #include "chrome/common/pref_names.h" @@ -23,7 +22,7 @@ int MigratePrefValue(PrefService* prefs, int starting_value) { return prefs->GetInteger(prefs::kNTPShownSections); } -} +} // namespace TEST_F(ShownSectionsHandlerTest, MigrateUserPrefs) { scoped_ptr<PrefService> pref(new TestingPrefService); diff --git a/chrome/browser/extensions/extension_disabled_infobar_delegate.cc b/chrome/browser/extensions/extension_disabled_infobar_delegate.cc index 354fea9..f1ec321 100644 --- a/chrome/browser/extensions/extension_disabled_infobar_delegate.cc +++ b/chrome/browser/extensions/extension_disabled_infobar_delegate.cc @@ -8,7 +8,6 @@ #include "app/l10n_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/tab_contents/infobar_delegate.h" diff --git a/chrome/browser/extensions/extension_dom_ui.cc b/chrome/browser/extensions/extension_dom_ui.cc index e933191..c59383f0 100644 --- a/chrome/browser/extensions/extension_dom_ui.cc +++ b/chrome/browser/extensions/extension_dom_ui.cc @@ -5,12 +5,12 @@ #include "chrome/browser/extensions/extension_dom_ui.h" #include <set> +#include <vector> #include "net/base/file_stream.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_bookmark_manager_api.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/extensions/image_loading_tracker.h" diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index d5ebe02..6b59740 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/chrome/browser/extensions/extension_prefs_unittest.cc @@ -8,7 +8,6 @@ #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/test_extension_prefs.h" #include "chrome/browser/prefs/pref_change_registrar.h" diff --git a/chrome/browser/extensions/extension_webnavigation_unittest.cc b/chrome/browser/extensions/extension_webnavigation_unittest.cc index 71d76ea..cfeada0 100644 --- a/chrome/browser/extensions/extension_webnavigation_unittest.cc +++ b/chrome/browser/extensions/extension_webnavigation_unittest.cc @@ -8,7 +8,6 @@ #include "testing/gtest/include/gtest/gtest.h" #include "base/values.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_webnavigation_api.h" #include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/browser/tab_contents/test_tab_contents.h" diff --git a/chrome/browser/favicon_service.cc b/chrome/browser/favicon_service.cc index d41ec5b..b476a41 100644 --- a/chrome/browser/favicon_service.cc +++ b/chrome/browser/favicon_service.cc @@ -4,7 +4,6 @@ #include "chrome/browser/favicon_service.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/dom_ui/dom_ui_factory.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/history_backend.h" diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index d574bf0..c118c3f 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -7,7 +7,6 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/dom_operation_notification_details.h" #include "chrome/browser/geolocation/geolocation_content_settings_map.h" #include "chrome/browser/geolocation/geolocation_settings_state.h" @@ -34,7 +33,7 @@ // load and wait one single frame here by calling a javascript function. class IFrameLoader : public NotificationObserver { public: - IFrameLoader(Browser* browser, int iframe_id, const GURL& url) + IFrameLoader(Browser* browser, int iframe_id, const GURL& url) : navigation_completed_(false), javascript_completed_(false) { NavigationController* controller = diff --git a/chrome/browser/geolocation/win7_location_api_unittest_win.cc b/chrome/browser/geolocation/win7_location_api_unittest_win.cc index 3b86762..16d867c 100644 --- a/chrome/browser/geolocation/win7_location_api_unittest_win.cc +++ b/chrome/browser/geolocation/win7_location_api_unittest_win.cc @@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <Objbase.h> + #include <algorithm> #include <cmath> -#include <Objbase.h> #include "base/compiler_specific.h" #include "base/logging.h" @@ -13,7 +14,6 @@ #include "base/time.h" #include "base/win_util.h" #include "chrome/common/geoposition.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/geolocation/win7_location_api_win.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -25,12 +25,12 @@ using testing::Invoke; using testing::Return; class MockLatLongReport : public ILatLongReport { -public: + public: MockLatLongReport() : ref_count_(1) { ON_CALL(*this, GetAltitude(_)) .WillByDefault(Invoke(this, &MockLatLongReport::GetAltitudeValid)); ON_CALL(*this, GetAltitudeError(_)) - .WillByDefault(Invoke(this, + .WillByDefault(Invoke(this, &MockLatLongReport::GetAltitudeErrorValid)); ON_CALL(*this, GetErrorRadius(_)) .WillByDefault(Invoke(this, &MockLatLongReport::GetErrorRadiusValid)); @@ -38,7 +38,7 @@ public: .WillByDefault(Invoke(this, &MockLatLongReport::GetLatitudeValid)); ON_CALL(*this, GetLongitude(_)) .WillByDefault(Invoke(this, &MockLatLongReport::GetLongitudeValid)); - ON_CALL(*this, GetValue(_,_)) + ON_CALL(*this, GetValue(_, _)) .WillByDefault(Invoke(this, &MockLatLongReport::GetValueValid)); ON_CALL(*this, Release()) .WillByDefault(Invoke(this, &MockLatLongReport::ReleaseInternal)); @@ -120,7 +120,7 @@ public: delete this; return new_ref_count; } - + LONG ref_count_; }; @@ -136,7 +136,7 @@ class MockReport : public ILocationReport { ON_CALL(*this, AddRef()) .WillByDefault(Invoke(this, &MockReport::AddRefInternal)); } - + // ILocationReport MOCK_METHOD1_WITH_CALLTYPE(STDMETHODCALLTYPE, GetSensorID, @@ -160,7 +160,7 @@ class MockReport : public ILocationReport { MockLatLongReport* mock_lat_long_report_; -private: + private: ~MockReport() { mock_lat_long_report_->Release(); } @@ -242,10 +242,10 @@ class MockLocation : public ILocation { MockReport* mock_report_; private: - ~MockLocation() { + ~MockLocation() { mock_report_->Release(); } - + HRESULT GetReportValid(REFIID report_type, ILocationReport** location_report) { *location_report = reinterpret_cast<ILocationReport*>(mock_report_); @@ -288,7 +288,7 @@ class GeolocationApiWin7Tests : public testing::Test { locator_->Release(); api_.reset(); } - ~GeolocationApiWin7Tests(){ + ~GeolocationApiWin7Tests() { } protected: Win7LocationApi* CreateMock() { diff --git a/chrome/browser/geolocation/win7_location_provider_unittest_win.cc b/chrome/browser/geolocation/win7_location_provider_unittest_win.cc index 487f005..ababadd 100644 --- a/chrome/browser/geolocation/win7_location_provider_unittest_win.cc +++ b/chrome/browser/geolocation/win7_location_provider_unittest_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/browser_thread.h" +#include "base/message_loop.h" #include "chrome/browser/geolocation/win7_location_provider_win.h" #include "chrome/browser/geolocation/win7_location_api_win.h" #include "testing/gmock/include/gmock/gmock.h" @@ -49,10 +49,10 @@ class MockWin7LocationApi : public Win7LocationApi { } private: - MockWin7LocationApi() : Win7LocationApi(NULL, NULL, NULL) { + MockWin7LocationApi() : Win7LocationApi(NULL, NULL, NULL) { ON_CALL(*this, GetPosition(_)) .WillByDefault(Invoke(this, - &MockWin7LocationApi::GetPositionValid)); + &MockWin7LocationApi::GetPositionValid)); ON_CALL(*this, SetHighAccuracy(true)) .WillByDefault(Return(true)); ON_CALL(*this, SetHighAccuracy(false)) diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc index 3177dde..6b10689 100644 --- a/chrome/browser/history/expire_history_backend_unittest.cc +++ b/chrome/browser/history/expire_history_backend_unittest.cc @@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <string> +#include <utility> + #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/file_path.h" @@ -12,6 +15,7 @@ #include "base/string16.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" +#include "chrome/browser/browser_thread.h" #include "chrome/browser/history/archived_database.h" #include "chrome/browser/history/expire_history_backend.h" #include "chrome/browser/history/history_database.h" diff --git a/chrome/browser/history/top_sites.h b/chrome/browser/history/top_sites.h index 8992483..0cba15b 100644 --- a/chrome/browser/history/top_sites.h +++ b/chrome/browser/history/top_sites.h @@ -9,6 +9,7 @@ #include <list> #include <set> #include <string> +#include <utility> #include "base/basictypes.h" #include "base/gtest_prod_util.h" @@ -17,7 +18,6 @@ #include "base/ref_counted_memory.h" #include "base/time.h" #include "base/timer.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/history/history.h" diff --git a/chrome/browser/importer/importer_bridge.h b/chrome/browser/importer/importer_bridge.h index 186821e..43667b5 100644 --- a/chrome/browser/importer/importer_bridge.h +++ b/chrome/browser/importer/importer_bridge.h @@ -6,14 +6,11 @@ #define CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_ #pragma once -#include "build/build_config.h" - #include <vector> #include "base/basictypes.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/importer/importer_data_types.h" // TODO: remove this, see friend declaration in ImporterBridge. #include "chrome/browser/importer/toolbar_importer.h" diff --git a/chrome/browser/in_process_webkit/dom_storage_area.cc b/chrome/browser/in_process_webkit/dom_storage_area.cc index d91c230..d0d9cbf 100644 --- a/chrome/browser/in_process_webkit/dom_storage_area.cc +++ b/chrome/browser/in_process_webkit/dom_storage_area.cc @@ -5,7 +5,6 @@ #include "chrome/browser/in_process_webkit/dom_storage_area.h" #include "base/task.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/in_process_webkit/dom_storage_context.h" #include "chrome/browser/in_process_webkit/dom_storage_dispatcher_host.h" diff --git a/chrome/browser/metrics/metrics_service_uitest.cc b/chrome/browser/metrics/metrics_service_uitest.cc index 4d67c13..16eb641 100644 --- a/chrome/browser/metrics/metrics_service_uitest.cc +++ b/chrome/browser/metrics/metrics_service_uitest.cc @@ -11,7 +11,6 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/platform_thread.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_service_mock_builder.h" #include "chrome/browser/prefs/pref_value_store.h" diff --git a/chrome/browser/net/chrome_net_log.h b/chrome/browser/net/chrome_net_log.h index f6a5c20..12daee8 100644 --- a/chrome/browser/net/chrome_net_log.h +++ b/chrome/browser/net/chrome_net_log.h @@ -12,7 +12,7 @@ #include "base/lock.h" #include "base/observer_list.h" #include "base/scoped_ptr.h" -#include "chrome/browser/browser_thread.h" +#include "base/time.h" #include "net/base/net_log.h" class LoadTimingObserver; diff --git a/chrome/browser/net/load_timing_observer.cc b/chrome/browser/net/load_timing_observer.cc index 7d2571c..326a699 100644 --- a/chrome/browser/net/load_timing_observer.cc +++ b/chrome/browser/net/load_timing_observer.cc @@ -4,8 +4,8 @@ #include "chrome/browser/net/load_timing_observer.h" -#include "base/compiler_specific.h" #include "base/time.h" +#include "chrome/browser/browser_thread.h" #include "chrome/browser/net/chrome_net_log.h" #include "chrome/common/resource_response.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/net/load_timing_observer_unittest.cc b/chrome/browser/net/load_timing_observer_unittest.cc index 7d5ffa9..091b5c7 100644 --- a/chrome/browser/net/load_timing_observer_unittest.cc +++ b/chrome/browser/net/load_timing_observer_unittest.cc @@ -8,6 +8,7 @@ #include "base/format_macros.h" #include "base/string_util.h" #include "base/time.h" +#include "chrome/browser/browser_thread.h" #include "net/base/load_flags.h" #include "net/url_request/url_request_netlog_params.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/net/passive_log_collector.cc b/chrome/browser/net/passive_log_collector.cc index b7ef11e..b325ba8 100644 --- a/chrome/browser/net/passive_log_collector.cc +++ b/chrome/browser/net/passive_log_collector.cc @@ -10,7 +10,6 @@ #include "base/lock.h" #include "base/string_util.h" #include "base/format_macros.h" -#include "chrome/browser/browser_thread.h" #include "net/url_request/url_request_netlog_params.h" namespace { diff --git a/chrome/browser/policy/asynchronous_policy_loader.cc b/chrome/browser/policy/asynchronous_policy_loader.cc index f244eda..cca7212 100644 --- a/chrome/browser/policy/asynchronous_policy_loader.cc +++ b/chrome/browser/policy/asynchronous_policy_loader.cc @@ -6,7 +6,6 @@ #include "base/message_loop.h" #include "base/task.h" -#include "chrome/browser/browser_thread.h" namespace policy { diff --git a/chrome/browser/policy/asynchronous_policy_provider.cc b/chrome/browser/policy/asynchronous_policy_provider.cc index 709568f..87b94a6 100644 --- a/chrome/browser/policy/asynchronous_policy_provider.cc +++ b/chrome/browser/policy/asynchronous_policy_provider.cc @@ -4,7 +4,6 @@ #include "chrome/browser/policy/asynchronous_policy_provider.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/policy/asynchronous_policy_loader.h" namespace policy { diff --git a/chrome/browser/policy/device_management_service_browsertest.cc b/chrome/browser/policy/device_management_service_browsertest.cc index 1b5496c..feed86f 100644 --- a/chrome/browser/policy/device_management_service_browsertest.cc +++ b/chrome/browser/policy/device_management_service_browsertest.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "base/message_loop.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/policy/device_management_backend_mock.h" #include "chrome/browser/policy/device_management_service.h" #include "chrome/browser/policy/proto/device_management_constants.h" diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc index 62a9a3f..a19ade2 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc @@ -4,12 +4,13 @@ #include "chrome/browser/printing/cloud_print/cloud_print_setup_source.h" +#include <algorithm> + #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/google/google_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/jstemplate_builder.h" diff --git a/chrome/browser/remoting/remoting_resources_source.cc b/chrome/browser/remoting/remoting_resources_source.cc index 6be7cbc..1af7a2a9 100644 --- a/chrome/browser/remoting/remoting_resources_source.cc +++ b/chrome/browser/remoting/remoting_resources_source.cc @@ -4,12 +4,14 @@ #include "chrome/browser/remoting/remoting_resources_source.h" +#include <algorithm> +#include <string> + #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/google/google_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/jstemplate_builder.h" diff --git a/chrome/browser/renderer_host/cross_site_resource_handler.cc b/chrome/browser/renderer_host/cross_site_resource_handler.cc index 2e21515..b1ac20a 100644 --- a/chrome/browser/renderer_host/cross_site_resource_handler.cc +++ b/chrome/browser/renderer_host/cross_site_resource_handler.cc @@ -7,7 +7,6 @@ #include "chrome/browser/renderer_host/cross_site_resource_handler.h" #include "base/logging.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/renderer_host/global_request_id.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc index ae142eb..342e887 100644 --- a/chrome/browser/renderer_host/render_widget_host.cc +++ b/chrome/browser/renderer_host/render_widget_host.cc @@ -10,7 +10,6 @@ #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "chrome/browser/accessibility/browser_accessibility_state.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/renderer_host/backing_store.h" #include "chrome/browser/renderer_host/backing_store_manager.h" #include "chrome/browser/renderer_host/render_process_host.h" diff --git a/chrome/browser/renderer_host/x509_user_cert_resource_handler.cc b/chrome/browser/renderer_host/x509_user_cert_resource_handler.cc index 7da37a1..68b62ca 100644 --- a/chrome/browser/renderer_host/x509_user_cert_resource_handler.cc +++ b/chrome/browser/renderer_host/x509_user_cert_resource_handler.cc @@ -5,7 +5,6 @@ #include "chrome/browser/renderer_host/x509_user_cert_resource_handler.h" #include "base/string_util.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/download/download_types.h" #include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h" diff --git a/chrome/browser/safe_browsing/malware_details.cc b/chrome/browser/safe_browsing/malware_details.cc index 0bd829c..b4860a2 100644 --- a/chrome/browser/safe_browsing/malware_details.cc +++ b/chrome/browser/safe_browsing/malware_details.cc @@ -6,7 +6,6 @@ #include "chrome/browser/safe_browsing/malware_details.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/sync/engine/syncer.cc b/chrome/browser/sync/engine/syncer.cc index d6a03a06..cbf9753 100644 --- a/chrome/browser/sync/engine/syncer.cc +++ b/chrome/browser/sync/engine/syncer.cc @@ -6,7 +6,6 @@ #include "base/message_loop.h" #include "base/time.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/sync/engine/apply_updates_command.h" #include "chrome/browser/sync/engine/build_and_process_conflict_sets_command.h" #include "chrome/browser/sync/engine/build_commit_command.h" diff --git a/chrome/browser/sync/glue/history_model_worker.cc b/chrome/browser/sync/glue/history_model_worker.cc index 1c39501..bb1ac93 100644 --- a/chrome/browser/sync/glue/history_model_worker.cc +++ b/chrome/browser/sync/glue/history_model_worker.cc @@ -8,7 +8,6 @@ #include "base/ref_counted.h" #include "base/task.h" #include "base/waitable_event.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/history/history.h" using base::WaitableEvent; diff --git a/chrome/browser/sync/glue/password_model_associator.h b/chrome/browser/sync/glue/password_model_associator.h index 5cf5599..8bc40cc 100644 --- a/chrome/browser/sync/glue/password_model_associator.h +++ b/chrome/browser/sync/glue/password_model_associator.h @@ -13,7 +13,6 @@ #include "base/basictypes.h" #include "base/lock.h" #include "base/task.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/sync/glue/model_associator.h" #include "chrome/browser/sync/protocol/password_specifics.pb.h" diff --git a/chrome/browser/sync/glue/typed_url_model_associator.h b/chrome/browser/sync/glue/typed_url_model_associator.h index ca875c9..72dd13e 100644 --- a/chrome/browser/sync/glue/typed_url_model_associator.h +++ b/chrome/browser/sync/glue/typed_url_model_associator.h @@ -13,7 +13,6 @@ #include "base/basictypes.h" #include "base/string16.h" #include "base/task.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/sync/glue/model_associator.h" #include "chrome/browser/sync/protocol/typed_url_specifics.pb.h" diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 2567dda..272dbe2 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -19,7 +19,6 @@ #include "base/string_util.h" #include "base/task.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/prefs/pref_service.h" @@ -199,7 +198,6 @@ void ProfileSyncService::Initialize() { token_migrator_->TryMigration(); } } - } void ProfileSyncService::RegisterAuthNotifications() { diff --git a/chrome/browser/ui/views/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmark_bar_view.cc index a43130c..37e9580 100644 --- a/chrome/browser/ui/views/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmark_bar_view.cc @@ -20,7 +20,6 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser_shutdown.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/ui/views/html_dialog_view_browsertest.cc b/chrome/browser/ui/views/html_dialog_view_browsertest.cc index e79712b..a230922 100644 --- a/chrome/browser/ui/views/html_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/html_dialog_view_browsertest.cc @@ -7,7 +7,6 @@ #include "base/file_path.h" #include "base/message_loop.h" #include "base/singleton.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/dom_ui/html_dialog_ui.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_win.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_win.cc index d860953..c7ddab3 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector_win.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector_win.cc @@ -12,7 +12,6 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/ssl/ssl_client_auth_handler.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/worker_host/message_port_dispatcher.cc b/chrome/browser/worker_host/message_port_dispatcher.cc index 3fedd675..4d2782f 100644 --- a/chrome/browser/worker_host/message_port_dispatcher.cc +++ b/chrome/browser/worker_host/message_port_dispatcher.cc @@ -6,7 +6,6 @@ #include "base/callback.h" #include "base/singleton.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/renderer_host/resource_message_filter.h" #include "chrome/browser/worker_host/worker_process_host.h" #include "chrome/common/notification_service.h" diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc index fa06d56..24bf087 100644 --- a/chrome/test/reliability/page_load_test.cc +++ b/chrome/test/reliability/page_load_test.cc @@ -47,7 +47,6 @@ #include "base/string_util.h" #include "base/test/test_file_util.h" #include "base/time.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_service_mock_builder.h" diff --git a/chrome/tools/DEPS b/chrome/tools/DEPS index 08de473..77b4ec8 100644 --- a/chrome/tools/DEPS +++ b/chrome/tools/DEPS @@ -1,4 +1,4 @@ include_rules = [ - "+chrome/browser/history", + "+chrome/browser", "+chrome/third_party/hunspell/google", ] diff --git a/chrome/tools/profiles/generate_profile.cc b/chrome/tools/profiles/generate_profile.cc index ca6e00a..89eebbd 100644 --- a/chrome/tools/profiles/generate_profile.cc +++ b/chrome/tools/profiles/generate_profile.cc @@ -18,10 +18,10 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/string_number_conversions.h" -#include "base/utf_string_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/win_util.h" +#include "chrome/browser/browser_thread.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/top_sites.h" #include "chrome/common/chrome_paths.h" @@ -94,7 +94,7 @@ std::wstring RandomWords(int count) { // Return a random URL-looking string. GURL ConstructRandomURL() { return GURL(std::wstring(L"http://") + RandomChars(3) + L".com/" + - RandomChars(RandomInt(5,20))); + RandomChars(RandomInt(5, 20))); } // Return a random page title-looking string. |