From d2ad262d31b75f74e9500500459e48724be599bc Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Mon, 30 Nov 2009 19:32:39 +0000 Subject: Revert 33301 and 33305 due to unit_tests breakage. TBR=pawel Review URL: http://codereview.chromium.org/453007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33309 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/alternate_nav_url_fetcher.cc | 1 - chrome/browser/autocomplete/history_contents_provider.cc | 1 - chrome/browser/bookmarks/bookmark_index_unittest.cc | 1 - chrome/browser/bookmarks/bookmark_model.h | 5 +---- chrome/browser/browser.cc | 1 - chrome/browser/browser.h | 2 +- chrome/browser/browser_init.cc | 4 +--- chrome/browser/browser_process_impl.cc | 1 - chrome/browser/chromeos/status_area_view.cc | 1 - chrome/browser/cocoa/browser_window_cocoa.mm | 1 - chrome/browser/cocoa/browser_window_controller.mm | 1 - chrome/browser/cocoa/extensions/extension_popup_controller.mm | 2 -- chrome/browser/cocoa/keystone_infobar.mm | 1 - chrome/browser/cocoa/keyword_editor_cocoa_controller.mm | 1 - chrome/browser/debugger/devtools_sanity_unittest.cc | 2 +- chrome/browser/dom_ui/most_visited_handler.cc | 1 - chrome/browser/dom_ui/shown_sections_handler.cc | 1 - chrome/browser/extensions/extension_browser_actions_api.cc | 1 - chrome/browser/extensions/extension_dom_ui.cc | 1 - chrome/browser/extensions/extension_function_dispatcher.cc | 1 - chrome/browser/extensions/extension_i18n_api.cc | 1 - chrome/browser/extensions/extension_shelf_model.h | 4 ++-- chrome/browser/extensions/extensions_service.cc | 1 - chrome/browser/extensions/extensions_service.h | 2 ++ chrome/browser/gtk/bookmark_manager_gtk.cc | 1 - chrome/browser/gtk/browser_titlebar.cc | 1 - chrome/browser/gtk/gtk_theme_provider.cc | 1 - chrome/browser/gtk/location_bar_view_gtk.cc | 3 --- chrome/browser/gtk/options/advanced_contents_gtk.cc | 1 - chrome/browser/gtk/options/url_picker_dialog_gtk.cc | 1 - chrome/browser/gtk/task_manager_gtk.cc | 1 - chrome/browser/gtk/task_manager_gtk.h | 1 - chrome/browser/importer/firefox2_importer.h | 2 -- chrome/browser/importer/ie_importer.h | 1 - chrome/browser/importer/importer.cc | 1 - chrome/browser/importer/importer.h | 4 +--- chrome/browser/importer/importer_list.cc | 1 - chrome/browser/importer/safari_importer.h | 2 -- chrome/browser/importer/toolbar_importer.cc | 1 - chrome/browser/importer/toolbar_importer.h | 1 - chrome/browser/memory_purger.cc | 1 - chrome/browser/net/ssl_config_service_manager_pref.cc | 1 - chrome/browser/net/url_fetcher.cc | 1 - chrome/browser/net/url_fetcher.h | 1 + chrome/browser/omnibox_search_hint.cc | 1 - chrome/browser/possible_url_model.cc | 1 - chrome/browser/privacy_blacklist/blacklist_manager_browsertest.cc | 3 --- chrome/browser/profile.cc | 1 - chrome/browser/profile.h | 2 +- chrome/browser/safe_browsing/safe_browsing_service.cc | 1 - chrome/browser/ssl/ssl_manager.h | 2 +- chrome/browser/sync/glue/change_processor.cc | 2 -- chrome/browser/sync/sync_setup_flow.cc | 1 - chrome/browser/tab_contents/render_view_context_menu.cc | 1 - chrome/browser/task_manager.cc | 1 - chrome/browser/task_manager.h | 2 +- chrome/browser/task_manager_browsertest.cc | 1 - chrome/browser/task_manager_resource_providers.h | 1 - chrome/browser/task_manager_unittest.cc | 2 -- chrome/browser/toolbar_model.cc | 1 - chrome/browser/views/create_application_shortcut_view.cc | 1 - chrome/browser/views/dialog_stubs_gtk.cc | 1 - chrome/browser/views/extensions/extension_installed_bubble.cc | 3 +-- chrome/common/extensions/extension.h | 2 -- chrome/test/browser_with_test_window_test.cc | 7 +++++++ chrome/test/browser_with_test_window_test.h | 3 --- chrome_frame/test/net/fake_external_tab.cc | 1 - chrome_frame/test/net/test_automation_provider.h | 2 -- 68 files changed, 21 insertions(+), 87 deletions(-) diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc index 2ac0716..e789b20 100644 --- a/chrome/browser/alternate_nav_url_fetcher.cc +++ b/chrome/browser/alternate_nav_url_fetcher.cc @@ -13,7 +13,6 @@ #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "net/url_request/url_request.h" AlternateNavURLFetcher::AlternateNavURLFetcher( const GURL& alternate_nav_url) diff --git a/chrome/browser/autocomplete/history_contents_provider.cc b/chrome/browser/autocomplete/history_contents_provider.cc index 0b3865e..8a950ca 100644 --- a/chrome/browser/autocomplete/history_contents_provider.cc +++ b/chrome/browser/autocomplete/history_contents_provider.cc @@ -7,7 +7,6 @@ #include "base/histogram.h" #include "base/string_util.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/history/query_parser.h" #include "chrome/browser/profile.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/bookmarks/bookmark_index_unittest.cc b/chrome/browser/bookmarks/bookmark_index_unittest.cc index cfc1972..cbc941e 100644 --- a/chrome/browser/bookmarks/bookmark_index_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_index_unittest.cc @@ -9,7 +9,6 @@ #include "base/string_util.h" #include "chrome/browser/bookmarks/bookmark_index.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/history/history_database.h" #include "chrome/browser/history/in_memory_database.h" diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index 88286a09..6bd988c 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -17,6 +17,7 @@ #include "chrome/browser/bookmarks/bookmark_model_observer.h" #include "chrome/browser/bookmarks/bookmark_service.h" #include "chrome/browser/bookmarks/bookmark_storage.h" +#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/cancelable_request.h" #include "chrome/browser/favicon_service.h" #include "chrome/browser/history/history.h" @@ -32,10 +33,6 @@ class BookmarkModel; class BookmarkCodec; class Profile; -namespace bookmark_utils { -struct TitleMatch; -} - // BookmarkNode --------------------------------------------------------------- // BookmarkNode contains information about a starred entry: title, URL, favicon, diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 604f122..521d15a 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -28,7 +28,6 @@ #include "chrome/browser/extensions/crashed_extension_infobar.h" #include "chrome/browser/extensions/extension_browser_event_router.h" #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h" -#include "chrome/browser/extensions/extension_shelf_model.h" #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/find_bar.h" diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h index cf92360..4fac987 100644 --- a/chrome/browser/browser.h +++ b/chrome/browser/browser.h @@ -14,6 +14,7 @@ #include "base/scoped_ptr.h" #include "base/task.h" #include "chrome/browser/command_updater.h" +#include "chrome/browser/extensions/extension_shelf_model.h" #include "chrome/browser/sessions/session_id.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/tabs/tab_strip_model.h" @@ -26,7 +27,6 @@ class BrowserWindow; class DebuggerWindow; -class ExtensionShelfModel; class FindBarController; class GoButton; class LocationBar; diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index ba3bc11..ee192b4 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -33,16 +33,14 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "chrome/common/result_codes.h" #include "chrome/common/url_constants.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" -#include "net/base/net_util.h" #include "net/http/http_network_layer.h" -#include "net/url_request/url_request.h" +#include "net/base/net_util.h" #include "webkit/glue/webkit_glue.h" #if defined(OS_MACOSX) diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 9b110a65..49993fb 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -28,7 +28,6 @@ #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" -#include "chrome/common/child_process_host.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/chromeos/status_area_view.cc b/chrome/browser/chromeos/status_area_view.cc index d44cb79..dedbf5b 100755 --- a/chrome/browser/chromeos/status_area_view.cc +++ b/chrome/browser/chromeos/status_area_view.cc @@ -24,7 +24,6 @@ #endif #include "chrome/browser/profile.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm index 58cd1ee..2d48ebd 100644 --- a/chrome/browser/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/cocoa/browser_window_cocoa.mm @@ -26,7 +26,6 @@ #include "chrome/browser/browser.h" #include "chrome/browser/download/download_shelf.h" #include "chrome/browser/global_keyboard_shortcuts_mac.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm index ab139df..b5c2dd1 100644 --- a/chrome/browser/cocoa/browser_window_controller.mm +++ b/chrome/browser/cocoa/browser_window_controller.mm @@ -14,7 +14,6 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/dock_info.h" #include "chrome/browser/encoding_menu_controller.h" #include "chrome/browser/location_bar.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/cocoa/extensions/extension_popup_controller.mm index 4e4a075..48a8a22 100644 --- a/chrome/browser/cocoa/extensions/extension_popup_controller.mm +++ b/chrome/browser/cocoa/extensions/extension_popup_controller.mm @@ -10,8 +10,6 @@ #import "chrome/browser/cocoa/browser_window_cocoa.h" #import "chrome/browser/cocoa/extension_view_mac.h" #import "chrome/browser/cocoa/info_bubble_window.h" -#include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/profile.h" // The minimum/maximum dimensions of the popup. diff --git a/chrome/browser/cocoa/keystone_infobar.mm b/chrome/browser/cocoa/keystone_infobar.mm index 0da4846..689a1ad 100644 --- a/chrome/browser/cocoa/keystone_infobar.mm +++ b/chrome/browser/cocoa/keystone_infobar.mm @@ -23,7 +23,6 @@ #include "chrome/browser/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/cocoa/keyword_editor_cocoa_controller.mm b/chrome/browser/cocoa/keyword_editor_cocoa_controller.mm index 4f20b37..86b7e56 100644 --- a/chrome/browser/cocoa/keyword_editor_cocoa_controller.mm +++ b/chrome/browser/cocoa/keyword_editor_cocoa_controller.mm @@ -5,7 +5,6 @@ #import #import "base/mac_util.h" -#include "base/singleton.h" #include "base/sys_string_conversions.h" #include "chrome/browser/browser_process.h" #import "chrome/browser/cocoa/edit_search_engine_cocoa_controller.h" diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index 06034fa..3c3b8d4 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -7,7 +7,6 @@ #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/extensions/extension_host.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/render_view_host.h" @@ -19,6 +18,7 @@ #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" + namespace { // Used to block until a dev tools client window's browser is closed. diff --git a/chrome/browser/dom_ui/most_visited_handler.cc b/chrome/browser/dom_ui/most_visited_handler.cc index bf5a0f2..853a3c9 100644 --- a/chrome/browser/dom_ui/most_visited_handler.cc +++ b/chrome/browser/dom_ui/most_visited_handler.cc @@ -21,7 +21,6 @@ #include "chrome/common/notification_type.h" #include "chrome/common/notification_source.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/dom_ui/shown_sections_handler.cc b/chrome/browser/dom_ui/shown_sections_handler.cc index d4388e7..d6769b3 100644 --- a/chrome/browser/dom_ui/shown_sections_handler.cc +++ b/chrome/browser/dom_ui/shown_sections_handler.cc @@ -8,7 +8,6 @@ #include "base/values.h" #include "chrome/browser/profile.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" void ShownSectionsHandler::RegisterMessages() { dom_ui_->RegisterMessageCallback("getShownSections", diff --git a/chrome/browser/extensions/extension_browser_actions_api.cc b/chrome/browser/extensions/extension_browser_actions_api.cc index 7306d98..012f582 100644 --- a/chrome/browser/extensions/extension_browser_actions_api.cc +++ b/chrome/browser/extensions/extension_browser_actions_api.cc @@ -6,7 +6,6 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" diff --git a/chrome/browser/extensions/extension_dom_ui.cc b/chrome/browser/extensions/extension_dom_ui.cc index fb95005..9f118aa 100644 --- a/chrome/browser/extensions/extension_dom_ui.cc +++ b/chrome/browser/extensions/extension_dom_ui.cc @@ -7,7 +7,6 @@ #include "base/string_util.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" -#include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/bindings_policy.h" diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc index 3a99e37..cb77169 100644 --- a/chrome/browser/extensions/extension_function_dispatcher.cc +++ b/chrome/browser/extensions/extension_function_dispatcher.cc @@ -24,7 +24,6 @@ #include "chrome/browser/extensions/extension_tabs_module_constants.h" #include "chrome/browser/extensions/extension_test_api.h" #include "chrome/browser/extensions/extension_toolstrip_api.h" -#include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" diff --git a/chrome/browser/extensions/extension_i18n_api.cc b/chrome/browser/extensions/extension_i18n_api.cc index 7789c52..7629821 100644 --- a/chrome/browser/extensions/extension_i18n_api.cc +++ b/chrome/browser/extensions/extension_i18n_api.cc @@ -6,7 +6,6 @@ #include "chrome/browser/profile.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" namespace { // Errors. diff --git a/chrome/browser/extensions/extension_shelf_model.h b/chrome/browser/extensions/extension_shelf_model.h index 67de937..bffdbdf 100644 --- a/chrome/browser/extensions/extension_shelf_model.h +++ b/chrome/browser/extensions/extension_shelf_model.h @@ -9,10 +9,10 @@ #include "base/basictypes.h" #include "base/observer_list.h" -#include "chrome/browser/extensions/extension_host.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" +#include "chrome/browser/extensions/extension_host.h" +#include "chrome/browser/extensions/extensions_service.h" class Browser; class ExtensionPrefs; diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc index 09f964c..2772660 100644 --- a/chrome/browser/extensions/extensions_service.cc +++ b/chrome/browser/extensions/extensions_service.cc @@ -19,7 +19,6 @@ #include "chrome/browser/extensions/extension_dom_ui.h" #include "chrome/browser/extensions/extension_file_util.h" #include "chrome/browser/extensions/extension_history_api.h" -#include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_updater.h" #include "chrome/browser/extensions/external_extension_provider.h" diff --git a/chrome/browser/extensions/extensions_service.h b/chrome/browser/extensions/extensions_service.h index 283d0dd..8ac318e 100644 --- a/chrome/browser/extensions/extensions_service.h +++ b/chrome/browser/extensions/extensions_service.h @@ -38,6 +38,8 @@ class Profile; class ResourceDispatcherHost; class SiteInstance; +typedef std::vector ExtensionList; + // This is an interface class to encapsulate the dependencies that // ExtensionUpdater has on ExtensionsService. This allows easy mocking. class ExtensionUpdateService { diff --git a/chrome/browser/gtk/bookmark_manager_gtk.cc b/chrome/browser/gtk/bookmark_manager_gtk.cc index 59f548b4..a0a939d 100644 --- a/chrome/browser/gtk/bookmark_manager_gtk.cc +++ b/chrome/browser/gtk/bookmark_manager_gtk.cc @@ -17,7 +17,6 @@ #include "chrome/browser/bookmarks/bookmark_manager.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_table_model.h" -#include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/gtk/bookmark_tree_model.h" #include "chrome/browser/gtk/bookmark_utils_gtk.h" diff --git a/chrome/browser/gtk/browser_titlebar.cc b/chrome/browser/gtk/browser_titlebar.cc index 7d95754..b8a64c4 100644 --- a/chrome/browser/gtk/browser_titlebar.cc +++ b/chrome/browser/gtk/browser_titlebar.cc @@ -14,7 +14,6 @@ #include "app/gfx/skbitmap_operations.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "base/command_line.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser.h" #include "chrome/browser/encoding_menu_controller.h" diff --git a/chrome/browser/gtk/gtk_theme_provider.cc b/chrome/browser/gtk/gtk_theme_provider.cc index c12ec92..23812e8 100644 --- a/chrome/browser/gtk/gtk_theme_provider.cc +++ b/chrome/browser/gtk/gtk_theme_provider.cc @@ -13,7 +13,6 @@ #include "chrome/browser/gtk/cairo_cached_surface.h" #include "chrome/browser/gtk/gtk_chrome_button.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_source.h" diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc index ec4b1eb..fd4d27f 100644 --- a/chrome/browser/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/gtk/location_bar_view_gtk.cc @@ -19,7 +19,6 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/command_updater.h" -#include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/extensions/extension_browser_event_router.h" #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/gtk/cairo_cached_surface.h" @@ -31,8 +30,6 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/extension_action.h" #include "chrome/common/gtk_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/page_transition_types.h" diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc index 2d75fed..c17d137 100644 --- a/chrome/browser/gtk/options/advanced_contents_gtk.cc +++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc @@ -25,7 +25,6 @@ #include "chrome/browser/options_page_base.h" #include "chrome/browser/options_util.h" #include "chrome/browser/profile.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/gtk_util.h" diff --git a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc index f7198b4..e646552 100644 --- a/chrome/browser/gtk/options/url_picker_dialog_gtk.cc +++ b/chrome/browser/gtk/options/url_picker_dialog_gtk.cc @@ -14,7 +14,6 @@ #include "chrome/common/gtk_tree.h" #include "chrome/common/gtk_util.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/task_manager_gtk.cc b/chrome/browser/gtk/task_manager_gtk.cc index d66c292..8695346 100644 --- a/chrome/browser/gtk/task_manager_gtk.cc +++ b/chrome/browser/gtk/task_manager_gtk.cc @@ -23,7 +23,6 @@ #include "chrome/common/pref_service.h" #include "grit/app_resources.h" #include "grit/chromium_strings.h" -#include "third_party/skia/include/core/SkBitmap.h" namespace { diff --git a/chrome/browser/gtk/task_manager_gtk.h b/chrome/browser/gtk/task_manager_gtk.h index 30d3958..8a9ae4a 100644 --- a/chrome/browser/gtk/task_manager_gtk.h +++ b/chrome/browser/gtk/task_manager_gtk.h @@ -9,7 +9,6 @@ #include -#include "base/scoped_ptr.h" #include "chrome/browser/task_manager.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/importer/firefox2_importer.h b/chrome/browser/importer/firefox2_importer.h index 97b7318..b0ae776 100644 --- a/chrome/browser/importer/firefox2_importer.h +++ b/chrome/browser/importer/firefox2_importer.h @@ -7,8 +7,6 @@ #include "chrome/browser/importer/importer.h" -#include "testing/gtest/include/gtest/gtest_prod.h" - class TemplateURL; // Importer for Mozilla Firefox 2. diff --git a/chrome/browser/importer/ie_importer.h b/chrome/browser/importer/ie_importer.h index a43932b..ea38901 100644 --- a/chrome/browser/importer/ie_importer.h +++ b/chrome/browser/importer/ie_importer.h @@ -6,7 +6,6 @@ #define CHROME_BROWSER_IMPORTER_IE_IMPORTER_H_ #include "chrome/browser/importer/importer.h" -#include "testing/gtest/include/gtest/gtest_prod.h" class IEImporter : public Importer { public: diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index eddc493..966cf5b 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -20,7 +20,6 @@ #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "grit/generated_resources.h" #include "skia/ext/image_operations.h" #include "webkit/glue/image_decoder.h" diff --git a/chrome/browser/importer/importer.h b/chrome/browser/importer/importer.h index 4c9220a..a8fe226 100644 --- a/chrome/browser/importer/importer.h +++ b/chrome/browser/importer/importer.h @@ -13,16 +13,14 @@ #include "app/gfx/native_widget_types.h" #include "base/basictypes.h" #include "base/ref_counted.h" -#include "base/scoped_ptr.h" #include "chrome/browser/bookmarks/bookmark_model_observer.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/importer/importer_list.h" +#include "chrome/browser/profile.h" #include "chrome/common/notification_registrar.h" #include "googleurl/src/gurl.h" class ImporterBridge; -class Profile; -class Task; class TemplateURL; struct IE7PasswordInfo; diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc index fe8ecb7..c705b51 100644 --- a/chrome/browser/importer/importer_list.cc +++ b/chrome/browser/importer/importer_list.cc @@ -7,7 +7,6 @@ #include "app/l10n_util.h" #include "base/file_util.h" #include "base/stl_util-inl.h" -#include "base/values.h" #include "chrome/browser/first_run.h" #include "chrome/browser/importer/firefox2_importer.h" #include "chrome/browser/importer/firefox3_importer.h" diff --git a/chrome/browser/importer/safari_importer.h b/chrome/browser/importer/safari_importer.h index c47bdac..b42f401 100644 --- a/chrome/browser/importer/safari_importer.h +++ b/chrome/browser/importer/safari_importer.h @@ -11,9 +11,7 @@ #include #include -#include "base/file_path.h" #include "chrome/common/sqlite_utils.h" -#include "testing/gtest/include/gtest/gtest_prod.h" #if __OBJC__ @class NSDictionary; diff --git a/chrome/browser/importer/toolbar_importer.cc b/chrome/browser/importer/toolbar_importer.cc index 3dc301c..50c6ae9 100644 --- a/chrome/browser/importer/toolbar_importer.cc +++ b/chrome/browser/importer/toolbar_importer.cc @@ -13,7 +13,6 @@ #include "chrome/browser/first_run.h" #include "chrome/browser/importer/importer_bridge.h" #include "chrome/browser/net/url_request_context_getter.h" -#include "chrome/browser/profile.h" #include "chrome/common/libxml_utils.h" #include "grit/generated_resources.h" #include "net/base/cookie_monster.h" diff --git a/chrome/browser/importer/toolbar_importer.h b/chrome/browser/importer/toolbar_importer.h index 14df86b..37a97fe 100644 --- a/chrome/browser/importer/toolbar_importer.h +++ b/chrome/browser/importer/toolbar_importer.h @@ -13,7 +13,6 @@ #include "chrome/browser/importer/importer.h" #include "chrome/browser/net/url_fetcher.h" -#include "testing/gtest/include/gtest/gtest_prod.h" class ImporterBridge; class XmlReader; diff --git a/chrome/browser/memory_purger.cc b/chrome/browser/memory_purger.cc index bde8cdb..456448a 100644 --- a/chrome/browser/memory_purger.cc +++ b/chrome/browser/memory_purger.cc @@ -13,7 +13,6 @@ #include "chrome/browser/profile_manager.h" #include "chrome/browser/renderer_host/backing_store_manager.h" #include "chrome/browser/renderer_host/render_process_host.h" -#include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/render_messages.h" diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc index 57cf83f..0b89b25 100644 --- a/chrome/browser/net/ssl_config_service_manager_pref.cc +++ b/chrome/browser/net/ssl_config_service_manager_pref.cc @@ -10,7 +10,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_member.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "net/base/ssl_config_service.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/net/url_fetcher.cc b/chrome/browser/net/url_fetcher.cc index dcfc2bf..f8707a8 100644 --- a/chrome/browser/net/url_fetcher.cc +++ b/chrome/browser/net/url_fetcher.cc @@ -9,7 +9,6 @@ #include "base/thread.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_thread.h" -#include "chrome/browser/net/url_fetcher_protect.h" #include "chrome/browser/net/url_request_context_getter.h" #include "googleurl/src/gurl.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/net/url_fetcher.h b/chrome/browser/net/url_fetcher.h index 2d581f4..6850a36 100644 --- a/chrome/browser/net/url_fetcher.h +++ b/chrome/browser/net/url_fetcher.h @@ -13,6 +13,7 @@ #include "base/leak_tracker.h" #include "base/message_loop.h" #include "base/ref_counted.h" +#include "chrome/browser/net/url_fetcher_protect.h" class GURL; typedef std::vector ResponseCookies; diff --git a/chrome/browser/omnibox_search_hint.cc b/chrome/browser/omnibox_search_hint.cc index 6abc5aa..47f9d5a 100644 --- a/chrome/browser/omnibox_search_hint.cc +++ b/chrome/browser/omnibox_search_hint.cc @@ -21,7 +21,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/possible_url_model.cc b/chrome/browser/possible_url_model.cc index 86e1f1e..7fb38f9 100644 --- a/chrome/browser/possible_url_model.cc +++ b/chrome/browser/possible_url_model.cc @@ -12,7 +12,6 @@ #include "chrome/browser/favicon_service.h" #include "chrome/browser/profile.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/privacy_blacklist/blacklist_manager_browsertest.cc b/chrome/browser/privacy_blacklist/blacklist_manager_browsertest.cc index a89fb90..a235df3 100644 --- a/chrome/browser/privacy_blacklist/blacklist_manager_browsertest.cc +++ b/chrome/browser/privacy_blacklist/blacklist_manager_browsertest.cc @@ -8,9 +8,6 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "chrome/browser/extensions/extensions_service.h" -#include "chrome/browser/privacy_blacklist/blacklist.h" -#include "chrome/browser/privacy_blacklist/blacklist_manager.h" #include "chrome/browser/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index 7f6c3f0..c32e1a9 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -46,7 +46,6 @@ #include "chrome/browser/visitedlink_master.h" #include "chrome/browser/visitedlink_event_listener.h" #include "chrome/browser/webdata/web_data_service.h" -#include "chrome/browser/web_resource/web_resource_service.h" #include "chrome/common/appcache/chrome_appcache_service.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/profile.h b/chrome/browser/profile.h index 8b0eaae..010744a 100644 --- a/chrome/browser/profile.h +++ b/chrome/browser/profile.h @@ -15,6 +15,7 @@ #include "base/scoped_ptr.h" #include "base/timer.h" #include "chrome/browser/spellcheck_host.h" +#include "chrome/browser/web_resource/web_resource_service.h" #include "chrome/common/notification_registrar.h" #if defined(OS_CHROMEOS) @@ -66,7 +67,6 @@ class VisitedLinkMaster; class VisitedLinkEventListener; class WebDataService; class WebKitContext; -class WebResourceService; typedef intptr_t ProfileId; diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index 236791f..64d1e58 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -18,7 +18,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "chrome/common/url_constants.h" #include "net/base/registry_controlled_domain.h" diff --git a/chrome/browser/ssl/ssl_manager.h b/chrome/browser/ssl/ssl_manager.h index b0f18e1..7298e93 100644 --- a/chrome/browser/ssl/ssl_manager.h +++ b/chrome/browser/ssl/ssl_manager.h @@ -8,7 +8,7 @@ #include #include "base/basictypes.h" -#include "base/scoped_ptr.h" +#include "chrome/browser/ssl/ssl_policy.h" #include "chrome/browser/ssl/ssl_policy_backend.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/sync/glue/change_processor.cc b/chrome/browser/sync/glue/change_processor.cc index 6b4e9f7..4691bd4 100644 --- a/chrome/browser/sync/glue/change_processor.cc +++ b/chrome/browser/sync/glue/change_processor.cc @@ -4,8 +4,6 @@ #include "chrome/browser/sync/glue/change_processor.h" -#include - #include "app/gfx/codec/png_codec.h" #include "base/string_util.h" #include "chrome/browser/bookmarks/bookmark_utils.h" diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc index 5c4b3d5..70d796e 100755 --- a/chrome/browser/sync/sync_setup_flow.cc +++ b/chrome/browser/sync/sync_setup_flow.cc @@ -22,7 +22,6 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "grit/locale_settings.h" // XPath expression for finding specific iframes. diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index d7d299a..3b6baa5 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -31,7 +31,6 @@ #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "net/base/escape.h" -#include "net/url_request/url_request.h" #include "third_party/WebKit/WebKit/chromium/public/WebMediaPlayerAction.h" #include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h" diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc index 43952a5..090f626 100644 --- a/chrome/browser/task_manager.cc +++ b/chrome/browser/task_manager.cc @@ -18,7 +18,6 @@ #include "chrome/browser/net/url_request_tracking.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/resource_dispatcher_host.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/task_manager_resource_providers.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/task_manager.h b/chrome/browser/task_manager.h index cdd94b4..2fe885e 100644 --- a/chrome/browser/task_manager.h +++ b/chrome/browser/task_manager.h @@ -18,13 +18,13 @@ #include "base/singleton.h" #include "base/timer.h" #include "chrome/browser/renderer_host/web_cache_manager.h" +#include "chrome/browser/tab_contents/tab_contents.h" #include "net/url_request/url_request_job_tracker.h" #include "testing/gtest/include/gtest/gtest_prod.h" #include "third_party/WebKit/WebKit/chromium/public/WebCache.h" class Extension; class SkBitmap; -class TabContents; class TaskManager; class TaskManagerModel; diff --git a/chrome/browser/task_manager_browsertest.cc b/chrome/browser/task_manager_browsertest.cc index c1104ee..cedcc84 100644 --- a/chrome/browser/task_manager_browsertest.cc +++ b/chrome/browser/task_manager_browsertest.cc @@ -8,7 +8,6 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/extensions/extension_browsertest.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/page_transition_types.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" diff --git a/chrome/browser/task_manager_resource_providers.h b/chrome/browser/task_manager_resource_providers.h index 65209f4..3f76046 100644 --- a/chrome/browser/task_manager_resource_providers.h +++ b/chrome/browser/task_manager_resource_providers.h @@ -13,7 +13,6 @@ #include "chrome/browser/task_manager.h" #include "chrome/common/child_process_info.h" #include "chrome/common/notification_observer.h" -#include "chrome/common/notification_registrar.h" #include "third_party/WebKit/WebKit/chromium/public/WebCache.h" class Extension; diff --git a/chrome/browser/task_manager_unittest.cc b/chrome/browser/task_manager_unittest.cc index 0961b6d..ce1d17c 100644 --- a/chrome/browser/task_manager_unittest.cc +++ b/chrome/browser/task_manager_unittest.cc @@ -7,12 +7,10 @@ #include #include "app/l10n_util.h" -#include "base/message_loop.h" #include "base/process_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/skia/include/core/SkBitmap.h" namespace { diff --git a/chrome/browser/toolbar_model.cc b/chrome/browser/toolbar_model.cc index b3bb005..42977f6 100644 --- a/chrome/browser/toolbar_model.cc +++ b/chrome/browser/toolbar_model.cc @@ -15,7 +15,6 @@ #include "chrome/common/pref_service.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" -#include "net/base/cert_status_flags.h" #include "net/base/net_util.h" ToolbarModel::ToolbarModel() : input_in_progress_(false) { diff --git a/chrome/browser/views/create_application_shortcut_view.cc b/chrome/browser/views/create_application_shortcut_view.cc index 0736d55..16b5631 100644 --- a/chrome/browser/views/create_application_shortcut_view.cc +++ b/chrome/browser/views/create_application_shortcut_view.cc @@ -17,7 +17,6 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/base/load_flags.h" -#include "net/url_request/url_request.h" #include "third_party/skia/include/core/SkRect.h" #include "third_party/skia/include/core/SkPaint.h" #include "views/controls/button/checkbox.h" diff --git a/chrome/browser/views/dialog_stubs_gtk.cc b/chrome/browser/views/dialog_stubs_gtk.cc index 27d7662..53bfc58 100644 --- a/chrome/browser/views/dialog_stubs_gtk.cc +++ b/chrome/browser/views/dialog_stubs_gtk.cc @@ -18,7 +18,6 @@ #include "chrome/browser/gtk/repost_form_warning_gtk.h" #include "chrome/browser/gtk/task_manager_gtk.h" #include "chrome/browser/options_window.h" -#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/browser_dialogs.h" #include "views/widget/widget.h" diff --git a/chrome/browser/views/extensions/extension_installed_bubble.cc b/chrome/browser/views/extensions/extension_installed_bubble.cc index 4d903ec..3c198b3 100644 --- a/chrome/browser/views/extensions/extension_installed_bubble.cc +++ b/chrome/browser/views/extensions/extension_installed_bubble.cc @@ -13,7 +13,6 @@ #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/location_bar_view.h" #include "chrome/browser/views/toolbar_view.h" -#include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "grit/generated_resources.h" @@ -115,7 +114,7 @@ class InstalledBubbleContent : public views::View, width += kIconSize; width += kPanelHorizMargin; width += kRightColumnWidth; - width += 2*kPanelHorizMargin; + width += 2*kPanelHorizMargin; width += kHorizOuterMargin; int height = kVertOuterMargin; diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h index 331de16..77e5a64 100644 --- a/chrome/common/extensions/extension.h +++ b/chrome/common/extensions/extension.h @@ -423,6 +423,4 @@ class Extension { DISALLOW_COPY_AND_ASSIGN(Extension); }; -typedef std::vector ExtensionList; - #endif // CHROME_COMMON_EXTENSIONS_EXTENSION_H_ diff --git a/chrome/test/browser_with_test_window_test.cc b/chrome/test/browser_with_test_window_test.cc index fe52160..8dede7c 100644 --- a/chrome/test/browser_with_test_window_test.cc +++ b/chrome/test/browser_with_test_window_test.cc @@ -12,6 +12,9 @@ BrowserWithTestWindowTest::BrowserWithTestWindowTest() : rph_factory_(), rvh_factory_(&rph_factory_) { +#if defined(OS_WIN) + OleInitialize(NULL); +#endif } void BrowserWithTestWindowTest::SetUp() { @@ -36,6 +39,10 @@ BrowserWithTestWindowTest::~BrowserWithTestWindowTest() { MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask); MessageLoop::current()->Run(); + +#if defined(OS_WIN) + OleUninitialize(); +#endif } TestRenderViewHost* BrowserWithTestWindowTest::TestRenderViewHostForTab( diff --git a/chrome/test/browser_with_test_window_test.h b/chrome/test/browser_with_test_window_test.h index 0223bd6..835bdeb 100644 --- a/chrome/test/browser_with_test_window_test.h +++ b/chrome/test/browser_with_test_window_test.h @@ -8,7 +8,6 @@ #include #include "base/message_loop.h" -#include "chrome/app/scoped_ole_initializer.h" #include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/test/test_browser_window.h" #include "testing/gtest/include/gtest/gtest.h" @@ -97,8 +96,6 @@ class BrowserWithTestWindowTest : public testing::Test { MockRenderProcessHostFactory rph_factory_; TestRenderViewHostFactory rvh_factory_; - ScopedOleInitializer ole_initializer_; - DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest); }; diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index af65424..2ea35d9 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -29,7 +29,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" -#include "chrome/common/pref_service.h" #include "chrome_frame/utils.h" #include "chrome_frame/test/chrome_frame_test_utils.h" #include "chrome_frame/test/net/dialog_watchdog.h" diff --git a/chrome_frame/test/net/test_automation_provider.h b/chrome_frame/test/net/test_automation_provider.h index 9e52b3b..a745537 100644 --- a/chrome_frame/test/net/test_automation_provider.h +++ b/chrome_frame/test/net/test_automation_provider.h @@ -7,8 +7,6 @@ #include "chrome/browser/automation/automation_provider.h" class TestAutomationResourceMessageFilter; -class URLRequest; -class URLRequestJob; // Callback interface for TestAutomationProvider. class TestAutomationProviderDelegate { -- cgit v1.1