summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/autocomplete/autocomplete_popup_view_mac.h1
-rw-r--r--chrome/browser/autofill/autofill_cc_infobar_delegate.h3
-rw-r--r--chrome/browser/autofill/autofill_type.h3
-rw-r--r--chrome/browser/automation/ui_controls.h2
-rw-r--r--chrome/browser/automation/url_request_automation_job.h4
-rw-r--r--chrome/browser/bookmarks/bookmark_drag_data.h1
-rw-r--r--chrome/browser/browsing_data_appcache_helper.h2
-rw-r--r--chrome/browser/chromeos/cros/input_method_library.h1
-rw-r--r--chrome/browser/chromeos/cros/mock_mount_library.h3
-rw-r--r--chrome/browser/chromeos/dom_ui/labs_handler.h2
-rw-r--r--chrome/browser/chromeos/dom_ui/proxy_handler.h2
-rw-r--r--chrome/browser/chromeos/input_method/input_method_util.h1
-rw-r--r--chrome/browser/chromeos/login/authenticator.h2
-rw-r--r--chrome/browser/chromeos/login/eula_view.h2
-rw-r--r--chrome/browser/chromeos/login/login_utils.h1
-rw-r--r--chrome/browser/chromeos/login/network_selection_view.h3
-rw-r--r--chrome/browser/chromeos/login/new_user_view.h1
-rw-r--r--chrome/browser/chromeos/login/user_image_downloader.h1
-rw-r--r--chrome/browser/chromeos/options/cellular_config_view.h4
-rw-r--r--chrome/browser/chromeos/options/language_config_model.h1
-rw-r--r--chrome/browser/chromeos/options/language_config_view.h1
-rw-r--r--chrome/browser/chromeos/panels/panel_scroller_header.h2
-rw-r--r--chrome/browser/cocoa/cocoa_test_helper.h3
-rw-r--r--chrome/browser/cocoa/content_exceptions_window_controller.h2
-rw-r--r--chrome/browser/cocoa/content_setting_bubble_cocoa.h1
-rw-r--r--chrome/browser/cocoa/download_shelf_mac.h4
-rw-r--r--chrome/browser/cocoa/extensions/extension_install_prompt_controller.h2
-rw-r--r--chrome/browser/cocoa/html_dialog_window_controller.h5
-rw-r--r--chrome/browser/cocoa/hung_renderer_controller.h4
-rw-r--r--chrome/browser/cocoa/location_bar/location_bar_view_mac.h2
-rw-r--r--chrome/browser/debugger/debugger_wrapper.h4
-rw-r--r--chrome/browser/dom_ui/dom_ui_factory.h4
-rw-r--r--chrome/browser/dom_ui/history2_ui.h1
-rw-r--r--chrome/browser/dom_ui/history_ui.h1
-rw-r--r--chrome/browser/dom_ui/ntp_resource_cache.h4
-rw-r--r--chrome/browser/dom_ui/options_ui.h1
-rw-r--r--chrome/browser/dom_ui/slideshow_ui.h2
-rw-r--r--chrome/browser/download/download_file.h4
-rw-r--r--chrome/browser/download/download_file_manager.h1
-rw-r--r--chrome/browser/download/download_shelf.h5
-rw-r--r--chrome/browser/download/download_util.h3
-rw-r--r--chrome/browser/extensions/extension_data_deleter.h3
-rw-r--r--chrome/browser/extensions/extension_rlz_module.h2
-rw-r--r--chrome/browser/first_run/first_run.h1
-rw-r--r--chrome/browser/geolocation/device_data_provider.h1
-rw-r--r--chrome/browser/geolocation/geolocation_content_settings_map.h1
-rw-r--r--chrome/browser/geolocation/geolocation_exceptions_table_model.h1
-rw-r--r--chrome/browser/geolocation/geolocation_permission_context.h1
-rw-r--r--chrome/browser/geolocation/wifi_data_provider_common_win.h2
-rw-r--r--chrome/browser/gtk/bookmark_bar_gtk.h3
-rw-r--r--chrome/browser/gtk/bookmark_editor_gtk.h4
-rw-r--r--chrome/browser/gtk/bookmark_tree_model.h3
-rw-r--r--chrome/browser/gtk/content_setting_bubble_gtk.h1
-rw-r--r--chrome/browser/gtk/custom_button.h2
-rw-r--r--chrome/browser/gtk/gtk_theme_provider.h1
-rw-r--r--chrome/browser/gtk/options/content_exception_editor.h2
-rw-r--r--chrome/browser/gtk/options/content_filter_page_gtk.h2
-rw-r--r--chrome/browser/gtk/options/fonts_page_gtk.h1
-rw-r--r--chrome/browser/gtk/options/managed_prefs_banner_gtk.h2
-rw-r--r--chrome/browser/gtk/options/simple_content_exceptions_window.h2
-rw-r--r--chrome/browser/history/history.h1
-rw-r--r--chrome/browser/history/history_publisher.h1
-rw-r--r--chrome/browser/history/in_memory_database.h4
-rw-r--r--chrome/browser/history/in_memory_history_backend.h2
-rw-r--r--chrome/browser/history/top_sites_database.h1
-rw-r--r--chrome/browser/icon_manager.h3
-rw-r--r--chrome/browser/importer/firefox_profile_lock.h2
-rw-r--r--chrome/browser/in_process_webkit/dom_storage_area.h3
-rw-r--r--chrome/browser/in_process_webkit/dom_storage_permission_request.h3
-rw-r--r--chrome/browser/managed_prefs_banner_base.h2
-rw-r--r--chrome/browser/net/chrome_cookie_policy.h1
-rw-r--r--chrome/browser/net/gaia/token_service.h1
-rw-r--r--chrome/browser/net/predictor.h1
-rw-r--r--chrome/browser/net/referrer.h3
-rw-r--r--chrome/browser/net/url_request_slow_http_job.h4
-rw-r--r--chrome/browser/notifications/balloon.h4
-rw-r--r--chrome/browser/notifications/desktop_notification_service.h3
-rw-r--r--chrome/browser/notifications/notification_exceptions_table_model.h2
-rw-r--r--chrome/browser/password_manager/native_backend_gnome_x.h2
-rw-r--r--chrome/browser/password_manager/password_store_default.h2
-rw-r--r--chrome/browser/policy/configuration_policy_pref_store.h2
-rw-r--r--chrome/browser/printing/cloud_print/cloud_print_proxy_service.h2
-rw-r--r--chrome/browser/printing/print_job_manager.h3
-rw-r--r--chrome/browser/profile_impl.h2
-rw-r--r--chrome/browser/profile_manager.h1
-rw-r--r--chrome/browser/renderer_host/render_process_host.h3
-rw-r--r--chrome/browser/renderer_host/render_widget_host_view_gtk.h1
-rw-r--r--chrome/browser/sync/engine/auth_watcher.h3
-rw-r--r--chrome/browser/sync/engine/net/server_connection_manager.h3
-rw-r--r--chrome/browser/sync/engine/syncer.h1
-rw-r--r--chrome/browser/sync/engine/syncer_thread.h3
-rw-r--r--chrome/browser/sync/engine/update_applicator.h3
-rw-r--r--chrome/browser/sync/glue/model_associator.h5
-rw-r--r--chrome/browser/sync/glue/password_change_processor.h2
-rw-r--r--chrome/browser/sync/glue/password_model_associator.h1
-rw-r--r--chrome/browser/sync/glue/sync_backend_host.h1
-rw-r--r--chrome/browser/sync/glue/typed_url_change_processor.h2
-rw-r--r--chrome/browser/sync/glue/typed_url_model_associator.h1
-rw-r--r--chrome/browser/sync/profile_sync_service.h1
-rw-r--r--chrome/browser/sync/sessions/sync_session.h2
-rw-r--r--chrome/browser/sync/syncable/directory_backing_store.h3
-rw-r--r--chrome/browser/sync/syncable/syncable.h1
-rw-r--r--chrome/browser/sync/util/user_settings.h3
-rw-r--r--chrome/browser/tab_contents/infobar_delegate.h3
-rw-r--r--chrome/browser/tab_contents/render_view_context_menu_gtk.h3
-rw-r--r--chrome/browser/tabs/pinned_tab_codec.h1
-rw-r--r--chrome/browser/translate/translate_prefs.h1
-rw-r--r--chrome/browser/views/bookmark_bubble_view.h2
-rw-r--r--chrome/browser/views/bookmark_editor_view.h2
-rw-r--r--chrome/browser/views/content_setting_bubble_views.h1
-rw-r--r--chrome/browser/views/create_application_shortcut_view.h3
-rw-r--r--chrome/browser/views/database_info_view.h3
-rw-r--r--chrome/browser/views/frame/browser_view.h1
-rw-r--r--chrome/browser/views/infobars/after_translate_infobar.h2
-rw-r--r--chrome/browser/views/infobars/before_translate_infobar.h2
-rw-r--r--chrome/browser/views/keyword_editor_view.h1
-rw-r--r--chrome/browser/views/local_storage_info_view.h3
-rw-r--r--chrome/browser/views/local_storage_set_item_info_view.h1
-rw-r--r--chrome/browser/views/modal_dialog_delegate.h4
-rw-r--r--chrome/browser/views/tabs/tab_renderer_data.h2
-rw-r--r--chrome/browser/views/tabs/tab_strip_controller.h2
-rw-r--r--chrome/browser/visitedlink_master.h1
-rw-r--r--chrome/browser/webdata/web_data_service_test_util.h2
-rw-r--r--chrome/common/chrome_plugin_lib.h2
-rw-r--r--chrome/common/extensions/extension_extent.h1
-rw-r--r--chrome/common/extensions/extension_file_util.h3
-rw-r--r--chrome/common/gpu_messages.h2
-rw-r--r--chrome/common/nacl_messages.h4
-rw-r--r--chrome/common/render_messages.h1
-rw-r--r--chrome/common/utility_messages.h3
-rw-r--r--chrome/common/zip.h4
-rw-r--r--chrome/default_plugin/plugin_impl_gtk.h1
-rw-r--r--chrome/default_plugin/plugin_impl_mac.h1
-rw-r--r--chrome/default_plugin/plugin_impl_win.h3
-rw-r--r--chrome/default_plugin/plugin_main.h1
-rw-r--r--chrome/gpu/gpu_info_collector.h3
-rw-r--r--chrome/installer/util/create_dir_work_item.h1
-rw-r--r--chrome/installer/util/logging_installer.h2
-rw-r--r--chrome/plugin/webplugin_delegate_stub.h3
-rw-r--r--chrome/renderer/devtools_agent_filter.h3
-rw-r--r--chrome/renderer/gpu_video_service_host.h2
-rw-r--r--chrome/renderer/mock_render_thread.h1
-rw-r--r--chrome/renderer/net/renderer_net_predictor.h1
-rw-r--r--chrome/renderer/notification_provider.h4
-rw-r--r--chrome/renderer/spellchecker/spellcheck.h3
-rw-r--r--chrome/renderer/spellchecker/spellcheck_worditerator.h1
-rw-r--r--chrome/renderer/user_script_slave.h3
-rw-r--r--chrome/renderer/webplugin_delegate_pepper.h1
-rw-r--r--chrome/service/cloud_print/cloud_print_proxy_backend.h1
-rw-r--r--chrome/test/automation/window_proxy.h4
-rw-r--r--chrome/test/browser_with_test_window_test.h4
-rw-r--r--chrome/test/sync/engine/proto_extension_validator.h2
-rw-r--r--chrome/test/test_launcher/test_runner.h3
-rw-r--r--chrome/tools/convert_dict/dic_reader.h4
-rw-r--r--chrome/worker/webworkerclient_proxy.h4
155 files changed, 62 insertions, 279 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.h b/chrome/browser/autocomplete/autocomplete_popup_view_mac.h
index 5dce4a4..a5e4e9a 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.h
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.h
@@ -9,7 +9,6 @@
#import <Cocoa/Cocoa.h>
#include <string>
-#include <map>
#include "base/basictypes.h"
#include "base/scoped_ptr.h"
diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate.h b/chrome/browser/autofill/autofill_cc_infobar_delegate.h
index b2dab99..6880b62 100644
--- a/chrome/browser/autofill/autofill_cc_infobar_delegate.h
+++ b/chrome/browser/autofill/autofill_cc_infobar_delegate.h
@@ -6,8 +6,7 @@
#define CHROME_BROWSER_AUTOFILL_AUTOFILL_CC_INFOBAR_DELEGATE_H_
#pragma once
-#include <string>
-
+#include "base/string16.h"
#include "chrome/browser/tab_contents/infobar_delegate.h"
class AutoFillManager;
diff --git a/chrome/browser/autofill/autofill_type.h b/chrome/browser/autofill/autofill_type.h
index c261d25..2091153 100644
--- a/chrome/browser/autofill/autofill_type.h
+++ b/chrome/browser/autofill/autofill_type.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -8,7 +8,6 @@
#include <map>
#include <set>
-#include <string>
#include "base/string16.h"
#include "chrome/browser/autofill/field_types.h"
diff --git a/chrome/browser/automation/ui_controls.h b/chrome/browser/automation/ui_controls.h
index 63ba677..4d1ce79 100644
--- a/chrome/browser/automation/ui_controls.h
+++ b/chrome/browser/automation/ui_controls.h
@@ -8,8 +8,6 @@
#include "build/build_config.h"
-#include <string>
-
#if defined(OS_WIN)
#include <wtypes.h>
#endif
diff --git a/chrome/browser/automation/url_request_automation_job.h b/chrome/browser/automation/url_request_automation_job.h
index 58b2e1c..2a76c8e 100644
--- a/chrome/browser/automation/url_request_automation_job.h
+++ b/chrome/browser/automation/url_request_automation_job.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
// This class simulates what wininet does when a dns lookup fails.
@@ -7,8 +7,6 @@
#define CHROME_BROWSER_AUTOMATION_URL_REQUEST_AUTOMATION_JOB_H_
#pragma once
-#include <vector>
-
#include "chrome/browser/automation/automation_resource_message_filter.h"
#include "chrome/common/ref_counted_util.h"
#include "net/http/http_response_headers.h"
diff --git a/chrome/browser/bookmarks/bookmark_drag_data.h b/chrome/browser/bookmarks/bookmark_drag_data.h
index aa290ca..ca1a10e 100644
--- a/chrome/browser/bookmarks/bookmark_drag_data.h
+++ b/chrome/browser/bookmarks/bookmark_drag_data.h
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_DRAG_DATA_H_
#pragma once
-#include <string>
#include <vector>
#include "base/file_path.h"
diff --git a/chrome/browser/browsing_data_appcache_helper.h b/chrome/browser/browsing_data_appcache_helper.h
index 2e57fd8..58d92af 100644
--- a/chrome/browser/browsing_data_appcache_helper.h
+++ b/chrome/browser/browsing_data_appcache_helper.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_BROWSING_DATA_APPCACHE_HELPER_H_
#pragma once
-#include <string>
-
#include "base/scoped_ptr.h"
#include "base/task.h"
#include "chrome/browser/appcache/chrome_appcache_service.h"
diff --git a/chrome/browser/chromeos/cros/input_method_library.h b/chrome/browser/chromeos/cros/input_method_library.h
index 503a322..e4f45a7 100644
--- a/chrome/browser/chromeos/cros/input_method_library.h
+++ b/chrome/browser/chromeos/cros/input_method_library.h
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_CHROMEOS_CROS_INPUT_METHOD_LIBRARY_H_
#pragma once
-#include <map>
#include <string>
#include <utility>
diff --git a/chrome/browser/chromeos/cros/mock_mount_library.h b/chrome/browser/chromeos/cros/mock_mount_library.h
index a2d5663..0aad288 100644
--- a/chrome/browser/chromeos/cros/mock_mount_library.h
+++ b/chrome/browser/chromeos/cros/mock_mount_library.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -7,7 +7,6 @@
#pragma once
#include <string>
-#include <vector>
#include "base/observer_list.h"
#include "base/time.h"
diff --git a/chrome/browser/chromeos/dom_ui/labs_handler.h b/chrome/browser/chromeos/dom_ui/labs_handler.h
index d4755cb..df2dab3 100644
--- a/chrome/browser/chromeos/dom_ui/labs_handler.h
+++ b/chrome/browser/chromeos/dom_ui/labs_handler.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_CHROMEOS_DOM_UI_LABS_HANDLER_H_
#pragma once
-#include <string>
-
#include "chrome/browser/dom_ui/options_ui.h"
// ChromeOS labs options page UI handler.
diff --git a/chrome/browser/chromeos/dom_ui/proxy_handler.h b/chrome/browser/chromeos/dom_ui/proxy_handler.h
index cd2d40b..667bcbd8 100644
--- a/chrome/browser/chromeos/dom_ui/proxy_handler.h
+++ b/chrome/browser/chromeos/dom_ui/proxy_handler.h
@@ -5,8 +5,6 @@
#ifndef CHROME_BROWSER_CHROMEOS_DOM_UI_PROXY_HANDLER_H_
#define CHROME_BROWSER_CHROMEOS_DOM_UI_PROXY_HANDLER_H_
-#include <string>
-
#include "chrome/browser/dom_ui/options_ui.h"
// ChromeOS proxy options page UI handler.
diff --git a/chrome/browser/chromeos/input_method/input_method_util.h b/chrome/browser/chromeos/input_method/input_method_util.h
index df02a64..a838686 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.h
+++ b/chrome/browser/chromeos/input_method/input_method_util.h
@@ -6,6 +6,7 @@
#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_UTIL_H_
#pragma once
+#include <map>
#include <string>
#include <vector>
diff --git a/chrome/browser/chromeos/login/authenticator.h b/chrome/browser/chromeos/login/authenticator.h
index e3cc397..861b1ce 100644
--- a/chrome/browser/chromeos/login/authenticator.h
+++ b/chrome/browser/chromeos/login/authenticator.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_CHROMEOS_LOGIN_AUTHENTICATOR_H_
#pragma once
-#include <vector>
-
#include "base/logging.h"
#include "base/ref_counted.h"
#include "chrome/browser/chrome_thread.h"
diff --git a/chrome/browser/chromeos/login/eula_view.h b/chrome/browser/chromeos/login/eula_view.h
index d792b76..8105c52 100644
--- a/chrome/browser/chromeos/login/eula_view.h
+++ b/chrome/browser/chromeos/login/eula_view.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_CHROMEOS_LOGIN_EULA_VIEW_H_
#pragma once
-#include <string>
-
#include "chrome/browser/chromeos/login/view_screen.h"
#include "chrome/browser/pref_member.h"
#include "chrome/browser/tab_contents/tab_contents_delegate.h"
diff --git a/chrome/browser/chromeos/login/login_utils.h b/chrome/browser/chromeos/login/login_utils.h
index 92bcd3e..2daa68d 100644
--- a/chrome/browser/chromeos/login/login_utils.h
+++ b/chrome/browser/chromeos/login/login_utils.h
@@ -7,7 +7,6 @@
#pragma once
#include <string>
-#include <vector>
#include "chrome/common/net/gaia/gaia_auth_consumer.h"
diff --git a/chrome/browser/chromeos/login/network_selection_view.h b/chrome/browser/chromeos/login/network_selection_view.h
index 2a17b81..e7c8a74 100644
--- a/chrome/browser/chromeos/login/network_selection_view.h
+++ b/chrome/browser/chromeos/login/network_selection_view.h
@@ -6,8 +6,7 @@
#define CHROME_BROWSER_CHROMEOS_LOGIN_NETWORK_SELECTION_VIEW_H_
#pragma once
-#include <string>
-
+#include "base/string16.h"
#include "views/controls/button/menu_button.h"
#include "views/view.h"
#include "views/widget/widget_gtk.h"
diff --git a/chrome/browser/chromeos/login/new_user_view.h b/chrome/browser/chromeos/login/new_user_view.h
index 78dc0d9..36ede7ef 100644
--- a/chrome/browser/chromeos/login/new_user_view.h
+++ b/chrome/browser/chromeos/login/new_user_view.h
@@ -7,7 +7,6 @@
#pragma once
#include <string>
-#include <vector>
#include "base/gtest_prod_util.h"
#include "base/ref_counted.h"
diff --git a/chrome/browser/chromeos/login/user_image_downloader.h b/chrome/browser/chromeos/login/user_image_downloader.h
index efd47f61..3658983 100644
--- a/chrome/browser/chromeos/login/user_image_downloader.h
+++ b/chrome/browser/chromeos/login/user_image_downloader.h
@@ -7,7 +7,6 @@
#pragma once
#include <string>
-#include <vector>
#include "base/basictypes.h"
#include "base/ref_counted.h"
diff --git a/chrome/browser/chromeos/options/cellular_config_view.h b/chrome/browser/chromeos/options/cellular_config_view.h
index 5019ed3..7887330 100644
--- a/chrome/browser/chromeos/options/cellular_config_view.h
+++ b/chrome/browser/chromeos/options/cellular_config_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_CHROMEOS_OPTIONS_CELLULAR_CONFIG_VIEW_H_
#pragma once
-#include <string>
-
#include "chrome/browser/chromeos/cros/network_library.h"
#include "views/controls/button/checkbox.h"
#include "views/view.h"
diff --git a/chrome/browser/chromeos/options/language_config_model.h b/chrome/browser/chromeos/options/language_config_model.h
index 5a842f4..4310f77 100644
--- a/chrome/browser/chromeos/options/language_config_model.h
+++ b/chrome/browser/chromeos/options/language_config_model.h
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_CHROMEOS_OPTIONS_LANGUAGE_CONFIG_MODEL_H_
#pragma once
-#include <map>
#include <set>
#include <string>
#include <vector>
diff --git a/chrome/browser/chromeos/options/language_config_view.h b/chrome/browser/chromeos/options/language_config_view.h
index 904c1cd..a7dd980 100644
--- a/chrome/browser/chromeos/options/language_config_view.h
+++ b/chrome/browser/chromeos/options/language_config_view.h
@@ -9,7 +9,6 @@
#include <map>
#include <set>
#include <string>
-#include <vector>
#include "app/table_model.h"
#include "chrome/browser/chromeos/options/language_config_model.h"
diff --git a/chrome/browser/chromeos/panels/panel_scroller_header.h b/chrome/browser/chromeos/panels/panel_scroller_header.h
index e647aed..fe4d7d4 100644
--- a/chrome/browser/chromeos/panels/panel_scroller_header.h
+++ b/chrome/browser/chromeos/panels/panel_scroller_header.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_CHROMEOS_PANELS_PANEL_SCROLLER_HEADER_H_
#pragma once
-#include <string>
-
#include "base/basictypes.h"
#include "base/string16.h"
#include "views/view.h"
diff --git a/chrome/browser/cocoa/cocoa_test_helper.h b/chrome/browser/cocoa/cocoa_test_helper.h
index dce544e..343e0ff 100644
--- a/chrome/browser/cocoa/cocoa_test_helper.h
+++ b/chrome/browser/cocoa/cocoa_test_helper.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -7,7 +7,6 @@
#pragma once
#import <Cocoa/Cocoa.h>
-#include <vector>
#import "base/chrome_application_mac.h"
#include "base/debug_util.h"
diff --git a/chrome/browser/cocoa/content_exceptions_window_controller.h b/chrome/browser/cocoa/content_exceptions_window_controller.h
index 753fde0..49975e0 100644
--- a/chrome/browser/cocoa/content_exceptions_window_controller.h
+++ b/chrome/browser/cocoa/content_exceptions_window_controller.h
@@ -4,8 +4,6 @@
#import <Cocoa/Cocoa.h>
-#include <string>
-
#include "base/cocoa_protocols_mac.h"
#include "base/scoped_ptr.h"
#include "chrome/browser/host_content_settings_map.h"
diff --git a/chrome/browser/cocoa/content_setting_bubble_cocoa.h b/chrome/browser/cocoa/content_setting_bubble_cocoa.h
index ecdaaf9..e3c8a5c 100644
--- a/chrome/browser/cocoa/content_setting_bubble_cocoa.h
+++ b/chrome/browser/cocoa/content_setting_bubble_cocoa.h
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include <map>
-#include <string>
#import <Cocoa/Cocoa.h>
diff --git a/chrome/browser/cocoa/download_shelf_mac.h b/chrome/browser/cocoa/download_shelf_mac.h
index d7c8c1b..4c158e4 100644
--- a/chrome/browser/cocoa/download_shelf_mac.h
+++ b/chrome/browser/cocoa/download_shelf_mac.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -8,8 +8,6 @@
#import <Cocoa/Cocoa.h>
-#include <vector>
-
#include "base/scoped_ptr.h"
#include "chrome/browser/download/download_shelf.h"
diff --git a/chrome/browser/cocoa/extensions/extension_install_prompt_controller.h b/chrome/browser/cocoa/extensions/extension_install_prompt_controller.h
index efd060d..0fb4d4e 100644
--- a/chrome/browser/cocoa/extensions/extension_install_prompt_controller.h
+++ b/chrome/browser/cocoa/extensions/extension_install_prompt_controller.h
@@ -6,12 +6,12 @@
#define CHROME_BROWSER_COCOA_EXTENSION_INSTALL_PROMPT_H_
#pragma once
-#include <string>
#include <vector>
#import <Cocoa/Cocoa.h>
#include "base/scoped_nsobject.h"
+#include "base/string16.h"
#include "chrome/browser/extensions/extension_install_ui.h"
#include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/cocoa/html_dialog_window_controller.h b/chrome/browser/cocoa/html_dialog_window_controller.h
index d1ba7c3..ae2e109 100644
--- a/chrome/browser/cocoa/html_dialog_window_controller.h
+++ b/chrome/browser/cocoa/html_dialog_window_controller.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,9 +6,6 @@
#define CHROME_BROWSER_COCOA_HTML_DIALOG_WINDOW_CONTROLLER_H_
#pragma once
-#include <string>
-#include <vector>
-
#import <Cocoa/Cocoa.h>
#include "base/basictypes.h"
diff --git a/chrome/browser/cocoa/hung_renderer_controller.h b/chrome/browser/cocoa/hung_renderer_controller.h
index b73ff64..8635a53 100644
--- a/chrome/browser/cocoa/hung_renderer_controller.h
+++ b/chrome/browser/cocoa/hung_renderer_controller.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -20,8 +20,6 @@
#import <Cocoa/Cocoa.h>
-#include <vector>
-
#import "base/cocoa_protocols_mac.h"
#import "base/scoped_nsobject.h"
diff --git a/chrome/browser/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/cocoa/location_bar/location_bar_view_mac.h
index 2400252..a573e30 100644
--- a/chrome/browser/cocoa/location_bar/location_bar_view_mac.h
+++ b/chrome/browser/cocoa/location_bar/location_bar_view_mac.h
@@ -7,8 +7,6 @@
#pragma once
#include <string>
-#include <map>
-#include <vector>
#import <Cocoa/Cocoa.h>
diff --git a/chrome/browser/debugger/debugger_wrapper.h b/chrome/browser/debugger/debugger_wrapper.h
index 9bced06..a9cf7bf 100644
--- a/chrome/browser/debugger/debugger_wrapper.h
+++ b/chrome/browser/debugger/debugger_wrapper.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -10,8 +10,6 @@
#define CHROME_BROWSER_DEBUGGER_DEBUGGER_WRAPPER_H_
#pragma once
-#include <string>
-
#include "base/basictypes.h"
#include "base/ref_counted.h"
diff --git a/chrome/browser/dom_ui/dom_ui_factory.h b/chrome/browser/dom_ui/dom_ui_factory.h
index 3bc80c9..ba8dabe 100644
--- a/chrome/browser/dom_ui/dom_ui_factory.h
+++ b/chrome/browser/dom_ui/dom_ui_factory.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_DOM_UI_DOM_UI_FACTORY_H_
#pragma once
-#include <vector>
-
#include "chrome/browser/favicon_service.h"
class DOMUI;
diff --git a/chrome/browser/dom_ui/history2_ui.h b/chrome/browser/dom_ui/history2_ui.h
index a6bfc3d..2ca6ba6 100644
--- a/chrome/browser/dom_ui/history2_ui.h
+++ b/chrome/browser/dom_ui/history2_ui.h
@@ -7,7 +7,6 @@
#pragma once
#include <string>
-#include <vector>
#include "base/string16.h"
#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
diff --git a/chrome/browser/dom_ui/history_ui.h b/chrome/browser/dom_ui/history_ui.h
index 8b694a8..c6cf74b 100644
--- a/chrome/browser/dom_ui/history_ui.h
+++ b/chrome/browser/dom_ui/history_ui.h
@@ -7,7 +7,6 @@
#pragma once
#include <string>
-#include <vector>
#include "base/string16.h"
#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
diff --git a/chrome/browser/dom_ui/ntp_resource_cache.h b/chrome/browser/dom_ui/ntp_resource_cache.h
index 3e583f4..4c7e42f 100644
--- a/chrome/browser/dom_ui/ntp_resource_cache.h
+++ b/chrome/browser/dom_ui/ntp_resource_cache.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_DOM_UI_NTP_RESOURCE_CACHE_H_
#pragma once
-#include <string>
-
#include "base/basictypes.h"
#include "base/ref_counted.h"
#include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/dom_ui/options_ui.h b/chrome/browser/dom_ui/options_ui.h
index d144c9d..27405c7 100644
--- a/chrome/browser/dom_ui/options_ui.h
+++ b/chrome/browser/dom_ui/options_ui.h
@@ -7,7 +7,6 @@
#pragma once
#include <string>
-#include <vector>
#include "base/scoped_ptr.h"
#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
diff --git a/chrome/browser/dom_ui/slideshow_ui.h b/chrome/browser/dom_ui/slideshow_ui.h
index 8bcb25a3..18c3966 100644
--- a/chrome/browser/dom_ui/slideshow_ui.h
+++ b/chrome/browser/dom_ui/slideshow_ui.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_DOM_UI_SLIDESHOW_UI_H_
#pragma once
-#include <vector>
-
#include "base/scoped_ptr.h"
#include "chrome/browser/dom_ui/dom_ui.h"
diff --git a/chrome/browser/download/download_file.h b/chrome/browser/download/download_file.h
index 6db951b..24025fd 100644
--- a/chrome/browser/download/download_file.h
+++ b/chrome/browser/download/download_file.h
@@ -6,10 +6,6 @@
#define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_FILE_H_
#pragma once
-#include <map>
-#include <string>
-#include <vector>
-
#include "base/basictypes.h"
#include "base/file_path.h"
#include "base/hash_tables.h"
diff --git a/chrome/browser/download/download_file_manager.h b/chrome/browser/download/download_file_manager.h
index 0aada31..15e7d21 100644
--- a/chrome/browser/download/download_file_manager.h
+++ b/chrome/browser/download/download_file_manager.h
@@ -41,7 +41,6 @@
#pragma once
#include <map>
-#include <string>
#include "base/basictypes.h"
#include "base/hash_tables.h"
diff --git a/chrome/browser/download/download_shelf.h b/chrome/browser/download/download_shelf.h
index 929a92e..df02508 100644
--- a/chrome/browser/download/download_shelf.h
+++ b/chrome/browser/download/download_shelf.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,12 +6,11 @@
#define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_SHELF_H_
#pragma once
-#include <string>
-
#include "app/menus/simple_menu_model.h"
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/scoped_ptr.h"
+#include "base/string16.h"
class BaseDownloadItemModel;
class Browser;
diff --git a/chrome/browser/download/download_util.h b/chrome/browser/download/download_util.h
index aa7832c..73365c3 100644
--- a/chrome/browser/download/download_util.h
+++ b/chrome/browser/download/download_util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
//
@@ -8,7 +8,6 @@
#define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_UTIL_H_
#pragma once
-#include <set>
#include <string>
#include "base/basictypes.h"
diff --git a/chrome/browser/extensions/extension_data_deleter.h b/chrome/browser/extensions/extension_data_deleter.h
index 9e78ab1..06d6e5d 100644
--- a/chrome/browser/extensions/extension_data_deleter.h
+++ b/chrome/browser/extensions/extension_data_deleter.h
@@ -6,9 +6,8 @@
#define CHROME_BROWSER_EXTENSIONS_EXTENSION_DATA_DELETER_H_
#pragma once
-#include <string>
-
#include "base/ref_counted.h"
+#include "base/string16.h"
#include "chrome/browser/chrome_thread.h"
#include "chrome/browser/in_process_webkit/webkit_context.h"
#include "chrome/common/net/url_request_context_getter.h"
diff --git a/chrome/browser/extensions/extension_rlz_module.h b/chrome/browser/extensions/extension_rlz_module.h
index d2fb22a..83cb662 100644
--- a/chrome/browser/extensions/extension_rlz_module.h
+++ b/chrome/browser/extensions/extension_rlz_module.h
@@ -10,8 +10,6 @@
#if defined(OS_WIN)
-#include <string>
-
#include "chrome/browser/extensions/extension_function.h"
class RlzRecordProductEventFunction : public SyncExtensionFunction {
diff --git a/chrome/browser/first_run/first_run.h b/chrome/browser/first_run/first_run.h
index 2127b9a..4cafd34 100644
--- a/chrome/browser/first_run/first_run.h
+++ b/chrome/browser/first_run/first_run.h
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
#pragma once
-#include <string>
#include <vector>
#include "base/basictypes.h"
diff --git a/chrome/browser/geolocation/device_data_provider.h b/chrome/browser/geolocation/device_data_provider.h
index 9143aa1..92649f2 100644
--- a/chrome/browser/geolocation/device_data_provider.h
+++ b/chrome/browser/geolocation/device_data_provider.h
@@ -26,7 +26,6 @@
#include <algorithm>
#include <functional>
#include <set>
-#include <string>
#include <vector>
#include "base/basictypes.h"
diff --git a/chrome/browser/geolocation/geolocation_content_settings_map.h b/chrome/browser/geolocation/geolocation_content_settings_map.h
index 966707a..ae56044 100644
--- a/chrome/browser/geolocation/geolocation_content_settings_map.h
+++ b/chrome/browser/geolocation/geolocation_content_settings_map.h
@@ -14,7 +14,6 @@
#pragma once
#include <map>
-#include <string>
#include "base/basictypes.h"
#include "base/ref_counted.h"
diff --git a/chrome/browser/geolocation/geolocation_exceptions_table_model.h b/chrome/browser/geolocation/geolocation_exceptions_table_model.h
index ffc08fb..937bbd8 100644
--- a/chrome/browser/geolocation/geolocation_exceptions_table_model.h
+++ b/chrome/browser/geolocation/geolocation_exceptions_table_model.h
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_GEOLOCATION_GEOLOCATION_EXCEPTIONS_TABLE_MODEL_H_
#pragma once
-#include <set>
#include <vector>
#include "chrome/browser/geolocation/geolocation_content_settings_map.h"
diff --git a/chrome/browser/geolocation/geolocation_permission_context.h b/chrome/browser/geolocation/geolocation_permission_context.h
index 660c676..26351f9 100644
--- a/chrome/browser/geolocation/geolocation_permission_context.h
+++ b/chrome/browser/geolocation/geolocation_permission_context.h
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_H_
#pragma once
-#include <map>
#include "base/basictypes.h"
#include "base/file_path.h"
#include "base/ref_counted.h"
diff --git a/chrome/browser/geolocation/wifi_data_provider_common_win.h b/chrome/browser/geolocation/wifi_data_provider_common_win.h
index 02ff25e..cb62ed3 100644
--- a/chrome/browser/geolocation/wifi_data_provider_common_win.h
+++ b/chrome/browser/geolocation/wifi_data_provider_common_win.h
@@ -8,7 +8,7 @@
#include <windows.h>
#include <ntddndis.h>
-#include <vector>
+
#include "chrome/browser/geolocation/device_data_provider.h"
// Extracts access point data from the NDIS_802_11_BSSID_LIST structure and
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.h b/chrome/browser/gtk/bookmark_bar_gtk.h
index caef663..4a4d973 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.h
+++ b/chrome/browser/gtk/bookmark_bar_gtk.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -8,7 +8,6 @@
#include <gtk/gtk.h>
-#include <string>
#include <vector>
#include "app/gtk_signal.h"
diff --git a/chrome/browser/gtk/bookmark_editor_gtk.h b/chrome/browser/gtk/bookmark_editor_gtk.h
index 631ed45..fda8769 100644
--- a/chrome/browser/gtk/bookmark_editor_gtk.h
+++ b/chrome/browser/gtk/bookmark_editor_gtk.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_GTK_BOOKMARK_EDITOR_GTK_H_
#pragma once
-#include <string>
-
#include "app/gtk_integers.h"
#include "app/gtk_signal.h"
#include "base/gtest_prod_util.h"
diff --git a/chrome/browser/gtk/bookmark_tree_model.h b/chrome/browser/gtk/bookmark_tree_model.h
index 2abbc69..1d28fbd 100644
--- a/chrome/browser/gtk/bookmark_tree_model.h
+++ b/chrome/browser/gtk/bookmark_tree_model.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_GTK_BOOKMARK_TREE_MODEL_H_
#pragma once
-#include <string>
#include "base/basictypes.h"
#include "base/string16.h"
diff --git a/chrome/browser/gtk/content_setting_bubble_gtk.h b/chrome/browser/gtk/content_setting_bubble_gtk.h
index 3859b30..3afa00e 100644
--- a/chrome/browser/gtk/content_setting_bubble_gtk.h
+++ b/chrome/browser/gtk/content_setting_bubble_gtk.h
@@ -7,7 +7,6 @@
#pragma once
#include <map>
-#include <string>
#include "app/gtk_signal.h"
#include "base/scoped_ptr.h"
diff --git a/chrome/browser/gtk/custom_button.h b/chrome/browser/gtk/custom_button.h
index 387a6e2..4d19510 100644
--- a/chrome/browser/gtk/custom_button.h
+++ b/chrome/browser/gtk/custom_button.h
@@ -8,8 +8,6 @@
#include <gtk/gtk.h>
-#include <string>
-
#include "app/gtk_signal.h"
#include "app/slide_animation.h"
#include "base/scoped_ptr.h"
diff --git a/chrome/browser/gtk/gtk_theme_provider.h b/chrome/browser/gtk/gtk_theme_provider.h
index 9bbd559c..6c1f59b 100644
--- a/chrome/browser/gtk/gtk_theme_provider.h
+++ b/chrome/browser/gtk/gtk_theme_provider.h
@@ -7,7 +7,6 @@
#pragma once
#include <map>
-#include <string>
#include <vector>
#include "app/gtk_integers.h"
diff --git a/chrome/browser/gtk/options/content_exception_editor.h b/chrome/browser/gtk/options/content_exception_editor.h
index 5d375c6..fed69c0 100644
--- a/chrome/browser/gtk/options/content_exception_editor.h
+++ b/chrome/browser/gtk/options/content_exception_editor.h
@@ -8,8 +8,6 @@
#include <gtk/gtk.h>
-#include <string>
-
#include "app/gtk_signal.h"
#include "chrome/browser/content_exceptions_table_model.h"
#include "chrome/browser/content_setting_combo_model.h"
diff --git a/chrome/browser/gtk/options/content_filter_page_gtk.h b/chrome/browser/gtk/options/content_filter_page_gtk.h
index 45e3720..614178e 100644
--- a/chrome/browser/gtk/options/content_filter_page_gtk.h
+++ b/chrome/browser/gtk/options/content_filter_page_gtk.h
@@ -8,8 +8,6 @@
#include <gtk/gtk.h>
-#include <string>
-
#include "app/gtk_signal.h"
#include "chrome/browser/options_page_base.h"
#include "chrome/common/content_settings_types.h"
diff --git a/chrome/browser/gtk/options/fonts_page_gtk.h b/chrome/browser/gtk/options/fonts_page_gtk.h
index b1ef255..3e1dd65 100644
--- a/chrome/browser/gtk/options/fonts_page_gtk.h
+++ b/chrome/browser/gtk/options/fonts_page_gtk.h
@@ -10,7 +10,6 @@
#pragma once
#include <gtk/gtk.h>
-#include <vector>
#include "app/gtk_signal.h"
#include "base/scoped_ptr.h"
diff --git a/chrome/browser/gtk/options/managed_prefs_banner_gtk.h b/chrome/browser/gtk/options/managed_prefs_banner_gtk.h
index e2ef6f4..ff6ce6a 100644
--- a/chrome/browser/gtk/options/managed_prefs_banner_gtk.h
+++ b/chrome/browser/gtk/options/managed_prefs_banner_gtk.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_GTK_OPTIONS_MANAGED_PREFS_BANNER_GTK_H_
#pragma once
-#include <set>
-
#include <gtk/gtk.h>
#include "chrome/browser/managed_prefs_banner_base.h"
diff --git a/chrome/browser/gtk/options/simple_content_exceptions_window.h b/chrome/browser/gtk/options/simple_content_exceptions_window.h
index e6080b6..e736120 100644
--- a/chrome/browser/gtk/options/simple_content_exceptions_window.h
+++ b/chrome/browser/gtk/options/simple_content_exceptions_window.h
@@ -8,8 +8,6 @@
#include <gtk/gtk.h>
-#include <set>
-
#include "app/gtk_signal.h"
#include "base/scoped_ptr.h"
#include "chrome/browser/gtk/gtk_tree.h"
diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h
index 121d573..bec532a 100644
--- a/chrome/browser/history/history.h
+++ b/chrome/browser/history/history.h
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_HISTORY_HISTORY_H_
#pragma once
-#include <string>
#include <vector>
#include "base/basictypes.h"
diff --git a/chrome/browser/history/history_publisher.h b/chrome/browser/history/history_publisher.h
index 29d3bcc..fdf94b7 100644
--- a/chrome/browser/history/history_publisher.h
+++ b/chrome/browser/history/history_publisher.h
@@ -7,7 +7,6 @@
#pragma once
#include <vector>
-#include <string>
#include "base/basictypes.h"
#include "base/string16.h"
diff --git a/chrome/browser/history/in_memory_database.h b/chrome/browser/history/in_memory_database.h
index 8d3f39f..27e1091 100644
--- a/chrome/browser/history/in_memory_database.h
+++ b/chrome/browser/history/in_memory_database.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_HISTORY_IN_MEMORY_DATABASE_H_
#pragma once
-#include <string>
-
#include "app/sql/connection.h"
#include "base/basictypes.h"
#include "chrome/browser/history/url_database.h"
diff --git a/chrome/browser/history/in_memory_history_backend.h b/chrome/browser/history/in_memory_history_backend.h
index ac4c185..72cf351 100644
--- a/chrome/browser/history/in_memory_history_backend.h
+++ b/chrome/browser/history/in_memory_history_backend.h
@@ -14,8 +14,6 @@
#define CHROME_BROWSER_HISTORY_IN_MEMORY_HISTORY_BACKEND_H_
#pragma once
-#include <string>
-
#include "base/basictypes.h"
#include "base/gtest_prod_util.h"
#include "base/scoped_ptr.h"
diff --git a/chrome/browser/history/top_sites_database.h b/chrome/browser/history/top_sites_database.h
index 11188a7..57a110e 100644
--- a/chrome/browser/history/top_sites_database.h
+++ b/chrome/browser/history/top_sites_database.h
@@ -8,7 +8,6 @@
#include <map>
#include <string>
-#include <vector>
#include "app/sql/connection.h"
#include "base/ref_counted.h"
diff --git a/chrome/browser/icon_manager.h b/chrome/browser/icon_manager.h
index b19c6eb..7ccd55a 100644
--- a/chrome/browser/icon_manager.h
+++ b/chrome/browser/icon_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
//
@@ -47,7 +47,6 @@
#pragma once
#include <map>
-#include <string>
#include "base/callback.h"
#include "base/hash_tables.h"
diff --git a/chrome/browser/importer/firefox_profile_lock.h b/chrome/browser/importer/firefox_profile_lock.h
index bf2e56e..9c6b687 100644
--- a/chrome/browser/importer/firefox_profile_lock.h
+++ b/chrome/browser/importer/firefox_profile_lock.h
@@ -12,8 +12,6 @@
#include <windows.h>
#endif
-#include <string>
-
#include "base/basictypes.h"
#include "base/file_path.h"
#include "base/gtest_prod_util.h"
diff --git a/chrome/browser/in_process_webkit/dom_storage_area.h b/chrome/browser/in_process_webkit/dom_storage_area.h
index 66a763a..7740bb9 100644
--- a/chrome/browser/in_process_webkit/dom_storage_area.h
+++ b/chrome/browser/in_process_webkit/dom_storage_area.h
@@ -6,12 +6,11 @@
#define CHROME_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_AREA_H_
#pragma once
-#include <string>
-
#include "base/hash_tables.h"
#include "base/nullable_string16.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
+#include "base/string16.h"
#include "chrome/common/dom_storage_common.h"
#include "googleurl/src/gurl.h"
#include "third_party/WebKit/WebKit/chromium/public/WebStorageArea.h"
diff --git a/chrome/browser/in_process_webkit/dom_storage_permission_request.h b/chrome/browser/in_process_webkit/dom_storage_permission_request.h
index e6a2893..da2ffc1 100644
--- a/chrome/browser/in_process_webkit/dom_storage_permission_request.h
+++ b/chrome/browser/in_process_webkit/dom_storage_permission_request.h
@@ -6,9 +6,8 @@
#define CHROME_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_PERMISSION_REQUEST_H_
#pragma once
-#include <string>
-
#include "base/ref_counted.h"
+#include "base/string16.h"
#include "base/time.h"
#include "base/waitable_event.h"
#include "chrome/browser/host_content_settings_map.h"
diff --git a/chrome/browser/managed_prefs_banner_base.h b/chrome/browser/managed_prefs_banner_base.h
index 9baadc9f..a5f59d6c 100644
--- a/chrome/browser/managed_prefs_banner_base.h
+++ b/chrome/browser/managed_prefs_banner_base.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_MANAGED_PREFS_BANNER_BASE_H_
#pragma once
-#include <string>
-
#include "base/basictypes.h"
#include "base/scoped_ptr.h"
#include "chrome/browser/options_window.h"
diff --git a/chrome/browser/net/chrome_cookie_policy.h b/chrome/browser/net/chrome_cookie_policy.h
index 4f555eb..8265437 100644
--- a/chrome/browser/net/chrome_cookie_policy.h
+++ b/chrome/browser/net/chrome_cookie_policy.h
@@ -7,7 +7,6 @@
#pragma once
#include <map>
-#include <queue>
#include <string>
#include <vector>
diff --git a/chrome/browser/net/gaia/token_service.h b/chrome/browser/net/gaia/token_service.h
index f687014..f182e6a 100644
--- a/chrome/browser/net/gaia/token_service.h
+++ b/chrome/browser/net/gaia/token_service.h
@@ -37,7 +37,6 @@
#include <map>
#include <string>
-#include <vector>
#include "base/scoped_ptr.h"
#include "chrome/browser/webdata/web_data_service.h"
#include "chrome/common/net/gaia/gaia_auth_consumer.h"
diff --git a/chrome/browser/net/predictor.h b/chrome/browser/net/predictor.h
index 5d35f74..5d754ae 100644
--- a/chrome/browser/net/predictor.h
+++ b/chrome/browser/net/predictor.h
@@ -24,7 +24,6 @@
#include <queue>
#include <set>
#include <string>
-#include <vector>
#include "base/gtest_prod_util.h"
#include "base/ref_counted.h"
diff --git a/chrome/browser/net/referrer.h b/chrome/browser/net/referrer.h
index 23caaf5..2e7728e 100644
--- a/chrome/browser/net/referrer.h
+++ b/chrome/browser/net/referrer.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -17,7 +17,6 @@
#pragma once
#include <map>
-#include <string>
#include "base/basictypes.h"
#include "base/time.h"
diff --git a/chrome/browser/net/url_request_slow_http_job.h b/chrome/browser/net/url_request_slow_http_job.h
index 3964a6b..0362106 100644
--- a/chrome/browser/net/url_request_slow_http_job.h
+++ b/chrome/browser/net/url_request_slow_http_job.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
//
@@ -8,8 +8,6 @@
#define CHROME_BROWSER_NET_URL_REQUEST_SLOW_HTTP_JOB_H_
#pragma once
-#include <string>
-
#include "base/timer.h"
#include "chrome/browser/net/url_request_mock_http_job.h"
diff --git a/chrome/browser/notifications/balloon.h b/chrome/browser/notifications/balloon.h
index aac052e..225eca0 100644
--- a/chrome/browser/notifications/balloon.h
+++ b/chrome/browser/notifications/balloon.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -8,8 +8,6 @@
#define CHROME_BROWSER_NOTIFICATIONS_BALLOON_H_
#pragma once
-#include <vector>
-
#include "base/basictypes.h"
#include "base/scoped_ptr.h"
#include "gfx/point.h"
diff --git a/chrome/browser/notifications/desktop_notification_service.h b/chrome/browser/notifications/desktop_notification_service.h
index 77198b8..7a1bb0a 100644
--- a/chrome/browser/notifications/desktop_notification_service.h
+++ b/chrome/browser/notifications/desktop_notification_service.h
@@ -6,9 +6,10 @@
#define CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_
#pragma once
-#include <set>
+#include <vector>
#include "base/basictypes.h"
+#include "base/string16.h"
#include "chrome/browser/notifications/notification.h"
#include "chrome/common/content_settings.h"
#include "chrome/common/notification_observer.h"
diff --git a/chrome/browser/notifications/notification_exceptions_table_model.h b/chrome/browser/notifications/notification_exceptions_table_model.h
index 71c850e..bef1fee 100644
--- a/chrome/browser/notifications/notification_exceptions_table_model.h
+++ b/chrome/browser/notifications/notification_exceptions_table_model.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_NOTIFICATIONS_NOTIFICATION_EXCEPTIONS_TABLE_MODEL_H_
#pragma once
-#include <set>
+#include <string>
#include <vector>
#include "chrome/browser/notifications/desktop_notification_service.h"
diff --git a/chrome/browser/password_manager/native_backend_gnome_x.h b/chrome/browser/password_manager/native_backend_gnome_x.h
index ed1556c..99ef284 100644
--- a/chrome/browser/password_manager/native_backend_gnome_x.h
+++ b/chrome/browser/password_manager/native_backend_gnome_x.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_PASSWORD_MANAGER_NATIVE_BACKEND_GNOME_X_H_
#pragma once
-#include <vector>
-
#include "base/basictypes.h"
#include "base/time.h"
#include "chrome/browser/password_manager/password_store_x.h"
diff --git a/chrome/browser/password_manager/password_store_default.h b/chrome/browser/password_manager/password_store_default.h
index 92fcbc6..70dc2e3c 100644
--- a/chrome/browser/password_manager/password_store_default.h
+++ b/chrome/browser/password_manager/password_store_default.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_PASSWORD_MANAGER_PASSWORD_STORE_DEFAULT_H_
#pragma once
-#include <map>
-
#include "base/file_path.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
diff --git a/chrome/browser/policy/configuration_policy_pref_store.h b/chrome/browser/policy/configuration_policy_pref_store.h
index 252614b..6828ba8 100644
--- a/chrome/browser/policy/configuration_policy_pref_store.h
+++ b/chrome/browser/policy/configuration_policy_pref_store.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_POLICY_CONFIGURATION_POLICY_PREF_STORE_H_
#pragma once
-#include <string>
-
#include "base/basictypes.h"
#include "base/gtest_prod_util.h"
#include "base/scoped_ptr.h"
diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h
index 9e45498..d3b5c4a 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h
@@ -7,8 +7,6 @@
#pragma once
#include <string>
-#include <map>
-#include <vector>
#include "base/basictypes.h"
#include "base/file_path.h"
diff --git a/chrome/browser/printing/print_job_manager.h b/chrome/browser/printing/print_job_manager.h
index 75a0ede4..15aaa9c 100644
--- a/chrome/browser/printing/print_job_manager.h
+++ b/chrome/browser/printing/print_job_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_PRINTING_PRINT_JOB_MANAGER_H_
#pragma once
-#include <string>
#include <vector>
#include "base/lock.h"
diff --git a/chrome/browser/profile_impl.h b/chrome/browser/profile_impl.h
index 4e8195a..45e3b92 100644
--- a/chrome/browser/profile_impl.h
+++ b/chrome/browser/profile_impl.h
@@ -8,8 +8,6 @@
#define CHROME_BROWSER_PROFILE_IMPL_H_
#pragma once
-#include <string>
-
#include "chrome/browser/profile.h"
#include "chrome/browser/spellcheck_host_observer.h"
#include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/profile_manager.h b/chrome/browser/profile_manager.h
index ba28b78..01a5b2e 100644
--- a/chrome/browser/profile_manager.h
+++ b/chrome/browser/profile_manager.h
@@ -8,7 +8,6 @@
#define CHROME_BROWSER_PROFILE_MANAGER_H__
#pragma once
-#include <string>
#include <vector>
#include "app/system_monitor.h"
diff --git a/chrome/browser/renderer_host/render_process_host.h b/chrome/browser/renderer_host/render_process_host.h
index 45b643f..f2b26fb 100644
--- a/chrome/browser/renderer_host/render_process_host.h
+++ b/chrome/browser/renderer_host/render_process_host.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -7,7 +7,6 @@
#pragma once
#include <set>
-#include <string>
#include "app/surface/transport_dib.h"
#include "base/id_map.h"
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.h b/chrome/browser/renderer_host/render_widget_host_view_gtk.h
index ead14ae..9d79113 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.h
@@ -8,7 +8,6 @@
#include <gdk/gdk.h>
-#include <map>
#include <vector>
#include <string>
diff --git a/chrome/browser/sync/engine/auth_watcher.h b/chrome/browser/sync/engine/auth_watcher.h
index 594758f..da90f95 100644
--- a/chrome/browser/sync/engine/auth_watcher.h
+++ b/chrome/browser/sync/engine/auth_watcher.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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,7 +9,6 @@
#define CHROME_BROWSER_SYNC_ENGINE_AUTH_WATCHER_H_
#pragma once
-#include <map>
#include <string>
#include "base/gtest_prod_util.h"
diff --git a/chrome/browser/sync/engine/net/server_connection_manager.h b/chrome/browser/sync/engine/net/server_connection_manager.h
index 9798e5a..0dfe9d5 100644
--- a/chrome/browser/sync/engine/net/server_connection_manager.h
+++ b/chrome/browser/sync/engine/net/server_connection_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -8,7 +8,6 @@
#include <iosfwd>
#include <string>
-#include <vector>
#include "base/atomicops.h"
#include "base/lock.h"
diff --git a/chrome/browser/sync/engine/syncer.h b/chrome/browser/sync/engine/syncer.h
index 236a872..e41ad8d 100644
--- a/chrome/browser/sync/engine/syncer.h
+++ b/chrome/browser/sync/engine/syncer.h
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_
#pragma once
-#include <string>
#include <utility>
#include <vector>
diff --git a/chrome/browser/sync/engine/syncer_thread.h b/chrome/browser/sync/engine/syncer_thread.h
index 5b7acf2..8c71db4 100644
--- a/chrome/browser/sync/engine/syncer_thread.h
+++ b/chrome/browser/sync/engine/syncer_thread.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
//
@@ -10,7 +10,6 @@
#pragma once
#include <list>
-#include <map>
#include <queue>
#include <vector>
diff --git a/chrome/browser/sync/engine/update_applicator.h b/chrome/browser/sync/engine/update_applicator.h
index f1e5661..ab03add 100644
--- a/chrome/browser/sync/engine/update_applicator.h
+++ b/chrome/browser/sync/engine/update_applicator.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
//
@@ -12,7 +12,6 @@
#define CHROME_BROWSER_SYNC_ENGINE_UPDATE_APPLICATOR_H_
#pragma once
-#include <set>
#include <vector>
#include "base/basictypes.h"
diff --git a/chrome/browser/sync/glue/model_associator.h b/chrome/browser/sync/glue/model_associator.h
index e9f89b3..f74129f 100644
--- a/chrome/browser/sync/glue/model_associator.h
+++ b/chrome/browser/sync/glue/model_associator.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,9 +6,6 @@
#define CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATOR_H_
#pragma once
-#include <map>
-#include <string>
-
#include "base/basictypes.h"
#include "chrome/browser/sync/syncable/model_type.h"
diff --git a/chrome/browser/sync/glue/password_change_processor.h b/chrome/browser/sync/glue/password_change_processor.h
index 317c2de..603f164 100644
--- a/chrome/browser/sync/glue/password_change_processor.h
+++ b/chrome/browser/sync/glue/password_change_processor.h
@@ -8,8 +8,6 @@
#include "chrome/browser/sync/glue/change_processor.h"
-#include <vector>
-
#include "base/basictypes.h"
#include "base/scoped_ptr.h"
#include "chrome/browser/sync/glue/sync_backend_host.h"
diff --git a/chrome/browser/sync/glue/password_model_associator.h b/chrome/browser/sync/glue/password_model_associator.h
index e1f0438..b1b6a6a 100644
--- a/chrome/browser/sync/glue/password_model_associator.h
+++ b/chrome/browser/sync/glue/password_model_associator.h
@@ -7,7 +7,6 @@
#pragma once
#include <map>
-#include <set>
#include <string>
#include <vector>
diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h
index 4e1a9cd..bc2d572 100644
--- a/chrome/browser/sync/glue/sync_backend_host.h
+++ b/chrome/browser/sync/glue/sync_backend_host.h
@@ -7,7 +7,6 @@
#pragma once
#include <map>
-#include <set>
#include <string>
#include <vector>
diff --git a/chrome/browser/sync/glue/typed_url_change_processor.h b/chrome/browser/sync/glue/typed_url_change_processor.h
index e36b6e4..7c81588 100644
--- a/chrome/browser/sync/glue/typed_url_change_processor.h
+++ b/chrome/browser/sync/glue/typed_url_change_processor.h
@@ -8,8 +8,6 @@
#include "chrome/browser/sync/glue/change_processor.h"
-#include <vector>
-
#include "base/basictypes.h"
#include "base/scoped_ptr.h"
#include "base/time.h"
diff --git a/chrome/browser/sync/glue/typed_url_model_associator.h b/chrome/browser/sync/glue/typed_url_model_associator.h
index c5891e1..7424d78b 100644
--- a/chrome/browser/sync/glue/typed_url_model_associator.h
+++ b/chrome/browser/sync/glue/typed_url_model_associator.h
@@ -7,7 +7,6 @@
#pragma once
#include <map>
-#include <set>
#include <string>
#include <vector>
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index 9f89a19..6566e40 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -7,7 +7,6 @@
#pragma once
#include <string>
-#include <map>
#include "base/basictypes.h"
#include "base/gtest_prod_util.h"
diff --git a/chrome/browser/sync/sessions/sync_session.h b/chrome/browser/sync/sessions/sync_session.h
index f36e75e..e5d6b91 100644
--- a/chrome/browser/sync/sessions/sync_session.h
+++ b/chrome/browser/sync/sessions/sync_session.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
diff --git a/chrome/browser/sync/syncable/directory_backing_store.h b/chrome/browser/sync/syncable/directory_backing_store.h
index 766ba6a..cadd7d3 100644
--- a/chrome/browser/sync/syncable/directory_backing_store.h
+++ b/chrome/browser/sync/syncable/directory_backing_store.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_SYNC_SYNCABLE_DIRECTORY_BACKING_STORE_H_
#pragma once
-#include <set>
#include <string>
#include "base/file_path.h"
diff --git a/chrome/browser/sync/syncable/syncable.h b/chrome/browser/sync/syncable/syncable.h
index 05a8c95..d54368e 100644
--- a/chrome/browser/sync/syncable/syncable.h
+++ b/chrome/browser/sync/syncable/syncable.h
@@ -10,7 +10,6 @@
#include <bitset>
#include <iosfwd>
#include <limits>
-#include <map>
#include <set>
#include <string>
#include <vector>
diff --git a/chrome/browser/sync/util/user_settings.h b/chrome/browser/sync/util/user_settings.h
index 9008c9c..0ddc0cb 100644
--- a/chrome/browser/sync/util/user_settings.h
+++ b/chrome/browser/sync/util/user_settings.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -7,7 +7,6 @@
#pragma once
#include <map>
-#include <set>
#include <string>
#include "base/file_path.h"
diff --git a/chrome/browser/tab_contents/infobar_delegate.h b/chrome/browser/tab_contents/infobar_delegate.h
index 869eabe..4da3510 100644
--- a/chrome/browser/tab_contents/infobar_delegate.h
+++ b/chrome/browser/tab_contents/infobar_delegate.h
@@ -6,9 +6,8 @@
#define CHROME_BROWSER_TAB_CONTENTS_INFOBAR_DELEGATE_H_
#pragma once
-#include <string>
-
#include "base/basictypes.h"
+#include "base/string16.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
#include "webkit/glue/window_open_disposition.h"
diff --git a/chrome/browser/tab_contents/render_view_context_menu_gtk.h b/chrome/browser/tab_contents/render_view_context_menu_gtk.h
index ad73e23..08cd752 100644
--- a/chrome/browser/tab_contents/render_view_context_menu_gtk.h
+++ b/chrome/browser/tab_contents/render_view_context_menu_gtk.h
@@ -6,9 +6,6 @@
#define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_GTK_H_
#pragma once
-#include <string>
-#include <vector>
-
#include "base/scoped_ptr.h"
#include "chrome/browser/gtk/menu_gtk.h"
#include "chrome/browser/tab_contents/render_view_context_menu.h"
diff --git a/chrome/browser/tabs/pinned_tab_codec.h b/chrome/browser/tabs/pinned_tab_codec.h
index 63de93a..55fc377 100644
--- a/chrome/browser/tabs/pinned_tab_codec.h
+++ b/chrome/browser/tabs/pinned_tab_codec.h
@@ -6,7 +6,6 @@
#define CHROME_BROWSER_TABS_PINNED_TAB_CODEC_H_
#pragma once
-#include <string>
#include <vector>
#include "chrome/browser/browser_init.h"
diff --git a/chrome/browser/translate/translate_prefs.h b/chrome/browser/translate/translate_prefs.h
index a173fab..5b94df3 100644
--- a/chrome/browser/translate/translate_prefs.h
+++ b/chrome/browser/translate/translate_prefs.h
@@ -7,7 +7,6 @@
#pragma once
#include <string>
-#include <vector>
#include "googleurl/src/gurl.h"
diff --git a/chrome/browser/views/bookmark_bubble_view.h b/chrome/browser/views/bookmark_bubble_view.h
index a185986..29528fb 100644
--- a/chrome/browser/views/bookmark_bubble_view.h
+++ b/chrome/browser/views/bookmark_bubble_view.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_VIEWS_BOOKMARK_BUBBLE_VIEW_H_
#pragma once
-#include <vector>
-
#include "chrome/browser/bookmarks/recently_used_folders_combo_model.h"
#include "chrome/browser/views/info_bubble.h"
#include "gfx/rect.h"
diff --git a/chrome/browser/views/bookmark_editor_view.h b/chrome/browser/views/bookmark_editor_view.h
index 908d7c7..29c2530 100644
--- a/chrome/browser/views/bookmark_editor_view.h
+++ b/chrome/browser/views/bookmark_editor_view.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_VIEWS_BOOKMARK_EDITOR_VIEW_H_
#pragma once
-#include <set>
-
#include "app/menus/simple_menu_model.h"
#include "app/tree_node_model.h"
#include "chrome/browser/bookmarks/bookmark_editor.h"
diff --git a/chrome/browser/views/content_setting_bubble_views.h b/chrome/browser/views/content_setting_bubble_views.h
index 93ae7f0..7def5ba 100644
--- a/chrome/browser/views/content_setting_bubble_views.h
+++ b/chrome/browser/views/content_setting_bubble_views.h
@@ -7,7 +7,6 @@
#pragma once
#include <map>
-#include <string>
#include "chrome/common/content_settings_types.h"
#include "chrome/common/notification_registrar.h"
diff --git a/chrome/browser/views/create_application_shortcut_view.h b/chrome/browser/views/create_application_shortcut_view.h
index 1fc56b8..d3112f2 100644
--- a/chrome/browser/views/create_application_shortcut_view.h
+++ b/chrome/browser/views/create_application_shortcut_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -7,7 +7,6 @@
#pragma once
#include <string>
-#include <vector>
#include "chrome/browser/web_applications/web_app.h"
#include "views/controls/label.h"
diff --git a/chrome/browser/views/database_info_view.h b/chrome/browser/views/database_info_view.h
index 10d5b7b..269d3c4 100644
--- a/chrome/browser/views/database_info_view.h
+++ b/chrome/browser/views/database_info_view.h
@@ -6,9 +6,6 @@
#define CHROME_BROWSER_VIEWS_DATABASE_INFO_VIEW_H_
#pragma once
-#include <string>
-#include <vector>
-
#include "views/view.h"
#include "chrome/browser/browsing_data_database_helper.h"
diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h
index 4cdd39e..d94726a 100644
--- a/chrome/browser/views/frame/browser_view.h
+++ b/chrome/browser/views/frame/browser_view.h
@@ -7,7 +7,6 @@
#pragma once
#include <map>
-#include <set>
#include <string>
#include <vector>
diff --git a/chrome/browser/views/infobars/after_translate_infobar.h b/chrome/browser/views/infobars/after_translate_infobar.h
index 4dff257..1b94ec8 100644
--- a/chrome/browser/views/infobars/after_translate_infobar.h
+++ b/chrome/browser/views/infobars/after_translate_infobar.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_VIEWS_INFOBARS_AFTER_TRANSLATE_INFOBAR_H_
#pragma once
-#include <string>
-
#include "chrome/browser/translate/languages_menu_model.h"
#include "chrome/browser/translate/options_menu_model.h"
#include "chrome/browser/translate/translate_infobar_view.h"
diff --git a/chrome/browser/views/infobars/before_translate_infobar.h b/chrome/browser/views/infobars/before_translate_infobar.h
index 082d3b9..7ac6208 100644
--- a/chrome/browser/views/infobars/before_translate_infobar.h
+++ b/chrome/browser/views/infobars/before_translate_infobar.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_VIEWS_INFOBARS_BEFORE_TRANSLATE_INFOBAR_H_
#pragma once
-#include <string>
-
#include "chrome/browser/translate/languages_menu_model.h"
#include "chrome/browser/translate/options_menu_model.h"
#include "chrome/browser/translate/translate_infobar_view.h"
diff --git a/chrome/browser/views/keyword_editor_view.h b/chrome/browser/views/keyword_editor_view.h
index a321347..1e68f98 100644
--- a/chrome/browser/views/keyword_editor_view.h
+++ b/chrome/browser/views/keyword_editor_view.h
@@ -7,7 +7,6 @@
#pragma once
#include <Windows.h>
-#include <map>
#include "chrome/browser/search_engines/edit_search_engine_controller.h"
#include "chrome/browser/search_engines/keyword_editor_controller.h"
diff --git a/chrome/browser/views/local_storage_info_view.h b/chrome/browser/views/local_storage_info_view.h
index b44907e..aa3e14f 100644
--- a/chrome/browser/views/local_storage_info_view.h
+++ b/chrome/browser/views/local_storage_info_view.h
@@ -6,9 +6,6 @@
#define CHROME_BROWSER_VIEWS_LOCAL_STORAGE_INFO_VIEW_H_
#pragma once
-#include <string>
-#include <vector>
-
#include "views/view.h"
#include "chrome/browser/browsing_data_local_storage_helper.h"
diff --git a/chrome/browser/views/local_storage_set_item_info_view.h b/chrome/browser/views/local_storage_set_item_info_view.h
index 788e69d..9b555b6 100644
--- a/chrome/browser/views/local_storage_set_item_info_view.h
+++ b/chrome/browser/views/local_storage_set_item_info_view.h
@@ -7,7 +7,6 @@
#pragma once
#include <string>
-#include <vector>
#include "base/string16.h"
#include "views/view.h"
diff --git a/chrome/browser/views/modal_dialog_delegate.h b/chrome/browser/views/modal_dialog_delegate.h
index 42d6a1e..ad7125e 100644
--- a/chrome/browser/views/modal_dialog_delegate.h
+++ b/chrome/browser/views/modal_dialog_delegate.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_VIEWS_MODAL_DIALOG_DELEGATE_H_
#pragma once
-#include <string>
-
#include "views/window/dialog_delegate.h"
namespace views {
diff --git a/chrome/browser/views/tabs/tab_renderer_data.h b/chrome/browser/views/tabs/tab_renderer_data.h
index 166db5f..f91a3f9 100644
--- a/chrome/browser/views/tabs/tab_renderer_data.h
+++ b/chrome/browser/views/tabs/tab_renderer_data.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_DATA_H_
#pragma once
-#include <string>
-
#include "base/string16.h"
#include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/views/tabs/tab_strip_controller.h b/chrome/browser/views/tabs/tab_strip_controller.h
index 2ec7e19..bd52452 100644
--- a/chrome/browser/views/tabs/tab_strip_controller.h
+++ b/chrome/browser/views/tabs/tab_strip_controller.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_CONTROLLER_H_
#pragma once
-#include <vector>
-
class BaseTab;
class BaseTabStrip;
class GURL;
diff --git a/chrome/browser/visitedlink_master.h b/chrome/browser/visitedlink_master.h
index 4e05c27..55d260b 100644
--- a/chrome/browser/visitedlink_master.h
+++ b/chrome/browser/visitedlink_master.h
@@ -10,7 +10,6 @@
#include <windows.h>
#endif
#include <set>
-#include <string>
#include <vector>
#include "base/file_path.h"
diff --git a/chrome/browser/webdata/web_data_service_test_util.h b/chrome/browser/webdata/web_data_service_test_util.h
index 87f17be..2ff1e09 100644
--- a/chrome/browser/webdata/web_data_service_test_util.h
+++ b/chrome/browser/webdata/web_data_service_test_util.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_WEBDATA_WEB_DATA_SERVICE_TEST_UTIL_H__
#pragma once
-#include <vector>
-
#include "base/basictypes.h"
#include "base/message_loop.h"
#include "chrome/browser/chrome_thread.h"
diff --git a/chrome/common/chrome_plugin_lib.h b/chrome/common/chrome_plugin_lib.h
index 4a4906f..b8e447b 100644
--- a/chrome/common/chrome_plugin_lib.h
+++ b/chrome/common/chrome_plugin_lib.h
@@ -6,8 +6,6 @@
#define CHROME_COMMON_CHROME_PLUGIN_LIB_H_
#pragma once
-#include <string>
-
#include "base/basictypes.h"
#include "base/file_path.h"
#include "base/ref_counted.h"
diff --git a/chrome/common/extensions/extension_extent.h b/chrome/common/extensions/extension_extent.h
index 3fc5469..bb66e1b 100644
--- a/chrome/common/extensions/extension_extent.h
+++ b/chrome/common/extensions/extension_extent.h
@@ -6,7 +6,6 @@
#define CHROME_COMMON_EXTENSIONS_EXTENSION_EXTENT_H_
#pragma once
-#include <string>
#include <vector>
#include "chrome/common/extensions/url_pattern.h"
diff --git a/chrome/common/extensions/extension_file_util.h b/chrome/common/extensions/extension_file_util.h
index 82c08f4..cfa69cc 100644
--- a/chrome/common/extensions/extension_file_util.h
+++ b/chrome/common/extensions/extension_file_util.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,7 +6,6 @@
#define CHROME_COMMON_EXTENSIONS_EXTENSION_FILE_UTIL_H_
#pragma once
-#include <set>
#include <string>
#include "base/file_path.h"
diff --git a/chrome/common/gpu_messages.h b/chrome/common/gpu_messages.h
index 1ff1741..ef143f8 100644
--- a/chrome/common/gpu_messages.h
+++ b/chrome/common/gpu_messages.h
@@ -6,8 +6,6 @@
#define CHROME_COMMON_GPU_MESSAGES_H_
#pragma once
-#include <vector>
-
#include "base/basictypes.h"
#include "base/process.h"
#include "chrome/common/common_param_traits.h"
diff --git a/chrome/common/nacl_messages.h b/chrome/common/nacl_messages.h
index 43c20c0..11abf19 100644
--- a/chrome/common/nacl_messages.h
+++ b/chrome/common/nacl_messages.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -8,8 +8,6 @@
#define CHROME_COMMON_NACL_MESSAGES_H_
#pragma once
-#include <string>
-
#include "base/basictypes.h"
#include "ipc/ipc_message_utils.h"
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 537c318..d7d8547 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -6,7 +6,6 @@
#define CHROME_COMMON_RENDER_MESSAGES_H_
#pragma once
-#include <map>
#include <string>
#include <vector>
diff --git a/chrome/common/utility_messages.h b/chrome/common/utility_messages.h
index d5ebe4d..03e0d0a 100644
--- a/chrome/common/utility_messages.h
+++ b/chrome/common/utility_messages.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -7,7 +7,6 @@
#pragma once
#include <string>
-#include <vector>
#include "base/basictypes.h"
#include "base/file_path.h"
diff --git a/chrome/common/zip.h b/chrome/common/zip.h
index 1fbb9e3..eaec297 100644
--- a/chrome/common/zip.h
+++ b/chrome/common/zip.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,8 +6,6 @@
#define CHROME_COMMON_ZIP_H_
#pragma once
-#include <vector>
-
#include "base/file_path.h"
// Zip the contents of src_dir into dest_file. src_path must be a directory.
diff --git a/chrome/default_plugin/plugin_impl_gtk.h b/chrome/default_plugin/plugin_impl_gtk.h
index 2035384..ba904b7 100644
--- a/chrome/default_plugin/plugin_impl_gtk.h
+++ b/chrome/default_plugin/plugin_impl_gtk.h
@@ -7,7 +7,6 @@
#pragma once
#include <string>
-#include <vector>
#include <gtk/gtk.h>
diff --git a/chrome/default_plugin/plugin_impl_mac.h b/chrome/default_plugin/plugin_impl_mac.h
index 267cf9f..ec72373 100644
--- a/chrome/default_plugin/plugin_impl_mac.h
+++ b/chrome/default_plugin/plugin_impl_mac.h
@@ -7,7 +7,6 @@
#pragma once
#include <string>
-#include <vector>
#include "gfx/native_widget_types.h"
#include "third_party/npapi/bindings/npapi.h"
diff --git a/chrome/default_plugin/plugin_impl_win.h b/chrome/default_plugin/plugin_impl_win.h
index d07207d..f6aa02f 100644
--- a/chrome/default_plugin/plugin_impl_win.h
+++ b/chrome/default_plugin/plugin_impl_win.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -7,7 +7,6 @@
#pragma once
#include <string>
-#include <vector>
#include "chrome/default_plugin/install_dialog.h"
#include "chrome/default_plugin/plugin_database_handler.h"
diff --git a/chrome/default_plugin/plugin_main.h b/chrome/default_plugin/plugin_main.h
index d9dac4e..ba252bd 100644
--- a/chrome/default_plugin/plugin_main.h
+++ b/chrome/default_plugin/plugin_main.h
@@ -3,7 +3,6 @@
// found in the LICENSE file.
#include <algorithm>
-#include <string>
#include "third_party/npapi/bindings/npapi.h"
#include "third_party/npapi/bindings/nphostapi.h"
diff --git a/chrome/gpu/gpu_info_collector.h b/chrome/gpu/gpu_info_collector.h
index 934f64f..0f9ce46 100644
--- a/chrome/gpu/gpu_info_collector.h
+++ b/chrome/gpu/gpu_info_collector.h
@@ -6,9 +6,6 @@
#define CHROME_GPU_GPU_INFO_COLLECTOR_H__
#pragma once
-
-#include <string>
-
#include "base/basictypes.h"
#include "chrome/common/gpu_info.h"
diff --git a/chrome/installer/util/create_dir_work_item.h b/chrome/installer/util/create_dir_work_item.h
index 0357efe..7f1f844 100644
--- a/chrome/installer/util/create_dir_work_item.h
+++ b/chrome/installer/util/create_dir_work_item.h
@@ -6,7 +6,6 @@
#define CHROME_INSTALLER_UTIL_CREATE_DIR_WORK_ITEM_H_
#pragma once
-#include <string>
#include <windows.h>
#include "base/file_path.h"
diff --git a/chrome/installer/util/logging_installer.h b/chrome/installer/util/logging_installer.h
index 50882dc..163f315 100644
--- a/chrome/installer/util/logging_installer.h
+++ b/chrome/installer/util/logging_installer.h
@@ -6,8 +6,6 @@
#define CHROME_INSTALLER_UTIL_LOGGING_INSTALLER_H_
#pragma once
-#include <string>
-
#include "base/logging.h"
class CommandLine;
diff --git a/chrome/plugin/webplugin_delegate_stub.h b/chrome/plugin/webplugin_delegate_stub.h
index 5e406ed..84b22a0 100644
--- a/chrome/plugin/webplugin_delegate_stub.h
+++ b/chrome/plugin/webplugin_delegate_stub.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,7 +6,6 @@
#define CHROME_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_
#pragma once
-#include <queue>
#include <string>
#include <vector>
diff --git a/chrome/renderer/devtools_agent_filter.h b/chrome/renderer/devtools_agent_filter.h
index 418be56..fd4d7e7 100644
--- a/chrome/renderer/devtools_agent_filter.h
+++ b/chrome/renderer/devtools_agent_filter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,7 +6,6 @@
#define CHROME_RENDERER_DEVTOOLS_AGENT_FILTER_H_
#pragma once
-#include <set>
#include <string>
#include "ipc/ipc_channel_proxy.h"
diff --git a/chrome/renderer/gpu_video_service_host.h b/chrome/renderer/gpu_video_service_host.h
index de31971..1d458e9 100644
--- a/chrome/renderer/gpu_video_service_host.h
+++ b/chrome/renderer/gpu_video_service_host.h
@@ -5,8 +5,6 @@
#ifndef CHROME_RENDERER_GPU_VIDEO_SERVICE_HOST_H_
#define CHROME_RENDERER_GPU_VIDEO_SERVICE_HOST_H_
-#include <map>
-
#include "base/singleton.h"
#include "chrome/common/gpu_video_common.h"
#include "chrome/renderer/gpu_channel_host.h"
diff --git a/chrome/renderer/mock_render_thread.h b/chrome/renderer/mock_render_thread.h
index 3e8741e..19ff4e4 100644
--- a/chrome/renderer/mock_render_thread.h
+++ b/chrome/renderer/mock_render_thread.h
@@ -7,7 +7,6 @@
#pragma once
#include <string>
-#include <vector>
#include "chrome/common/ipc_test_sink.h"
#include "chrome/renderer/mock_printer.h"
diff --git a/chrome/renderer/net/renderer_net_predictor.h b/chrome/renderer/net/renderer_net_predictor.h
index 4437dc1..36c2400 100644
--- a/chrome/renderer/net/renderer_net_predictor.h
+++ b/chrome/renderer/net/renderer_net_predictor.h
@@ -24,7 +24,6 @@
#include <map>
#include <string>
-#include <vector>
#include "base/basictypes.h"
#include "base/task.h"
diff --git a/chrome/renderer/notification_provider.h b/chrome/renderer/notification_provider.h
index 80ec832..7167902 100644
--- a/chrome/renderer/notification_provider.h
+++ b/chrome/renderer/notification_provider.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,8 +6,6 @@
#define CHROME_RENDERER_NOTIFICATION_PROVIDER_H_
#pragma once
-#include <map>
-
#include "chrome/common/desktop_notifications/active_notification_tracker.h"
#include "ipc/ipc_channel.h"
#include "third_party/WebKit/WebKit/chromium/public/WebNotification.h"
diff --git a/chrome/renderer/spellchecker/spellcheck.h b/chrome/renderer/spellchecker/spellcheck.h
index 9fab405..42dde87 100644
--- a/chrome/renderer/spellchecker/spellcheck.h
+++ b/chrome/renderer/spellchecker/spellcheck.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,7 +6,6 @@
#define CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_H_
#pragma once
-#include <queue>
#include <string>
#include <vector>
diff --git a/chrome/renderer/spellchecker/spellcheck_worditerator.h b/chrome/renderer/spellchecker/spellcheck_worditerator.h
index a9fd54a..a9ab7f2 100644
--- a/chrome/renderer/spellchecker/spellcheck_worditerator.h
+++ b/chrome/renderer/spellchecker/spellcheck_worditerator.h
@@ -10,7 +10,6 @@
#define CHROME_RENDERER_SPELLCHECKER_SPELLCHECK_WORDITERATOR_H_
#pragma once
-#include <map>
#include <string>
#include "base/basictypes.h"
diff --git a/chrome/renderer/user_script_slave.h b/chrome/renderer/user_script_slave.h
index f314924..7df6b17 100644
--- a/chrome/renderer/user_script_slave.h
+++ b/chrome/renderer/user_script_slave.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,7 +6,6 @@
#define CHROME_RENDERER_USER_SCRIPT_SLAVE_H_
#pragma once
-#include <map>
#include <set>
#include <string>
#include <vector>
diff --git a/chrome/renderer/webplugin_delegate_pepper.h b/chrome/renderer/webplugin_delegate_pepper.h
index 2535071..f85d2a9d0 100644
--- a/chrome/renderer/webplugin_delegate_pepper.h
+++ b/chrome/renderer/webplugin_delegate_pepper.h
@@ -8,7 +8,6 @@
#include "build/build_config.h"
-#include <map>
#include <string>
#include <vector>
diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.h b/chrome/service/cloud_print/cloud_print_proxy_backend.h
index 1c1dc5f..713e368 100644
--- a/chrome/service/cloud_print/cloud_print_proxy_backend.h
+++ b/chrome/service/cloud_print/cloud_print_proxy_backend.h
@@ -6,7 +6,6 @@
#define CHROME_SERVICE_CLOUD_PRINT_CLOUD_PRINT_PROXY_BACKEND_H_
#pragma once
-#include <map>
#include <string>
#include "base/thread.h"
diff --git a/chrome/test/automation/window_proxy.h b/chrome/test/automation/window_proxy.h
index 937f2ae..cb7b022 100644
--- a/chrome/test/automation/window_proxy.h
+++ b/chrome/test/automation/window_proxy.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -12,8 +12,6 @@
#include <windows.h>
#endif
-#include <string>
-
#include "base/keyboard_codes.h"
#include "base/string16.h"
#include "base/thread.h"
diff --git a/chrome/test/browser_with_test_window_test.h b/chrome/test/browser_with_test_window_test.h
index d4037c4..ae85634 100644
--- a/chrome/test/browser_with_test_window_test.h
+++ b/chrome/test/browser_with_test_window_test.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,8 +6,6 @@
#define CHROME_TEST_BROWSER_WITH_TEST_WINDOW_TEST_H_
#pragma once
-#include <string>
-
#include "base/message_loop.h"
#include "chrome/browser/renderer_host/test/test_render_view_host.h"
#include "chrome/test/test_browser_window.h"
diff --git a/chrome/test/sync/engine/proto_extension_validator.h b/chrome/test/sync/engine/proto_extension_validator.h
index 7912edb..48f7134 100644
--- a/chrome/test/sync/engine/proto_extension_validator.h
+++ b/chrome/test/sync/engine/proto_extension_validator.h
@@ -20,8 +20,6 @@
#define CHROME_TEST_SYNC_ENGINE_PROTO_EXTENSION_VALIDATOR_H_
#pragma once
-#include <vector>
-
#include "base/string_util.h"
#include "chrome/test/sync/engine/syncer_command_test.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/test/test_launcher/test_runner.h b/chrome/test/test_launcher/test_runner.h
index 3dee047..0d848bd 100644
--- a/chrome/test/test_launcher/test_runner.h
+++ b/chrome/test/test_launcher/test_runner.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -7,7 +7,6 @@
#pragma once
#include <string>
-#include <vector>
#include "base/basictypes.h"
diff --git a/chrome/tools/convert_dict/dic_reader.h b/chrome/tools/convert_dict/dic_reader.h
index b7fce71..40073c5 100644
--- a/chrome/tools/convert_dict/dic_reader.h
+++ b/chrome/tools/convert_dict/dic_reader.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -7,7 +7,7 @@
#pragma once
#include <stdio.h>
-#include <map>
+
#include <string>
#include <vector>
diff --git a/chrome/worker/webworkerclient_proxy.h b/chrome/worker/webworkerclient_proxy.h
index 07fd655..28a662c 100644
--- a/chrome/worker/webworkerclient_proxy.h
+++ b/chrome/worker/webworkerclient_proxy.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
@@ -6,8 +6,6 @@
#define CHROME_WORKER_WEBWORKERCLIENT_PROXY_H_
#pragma once
-#include <vector>
-
#include "base/basictypes.h"
#include "base/task.h"
#include "ipc/ipc_channel.h"