15 files changed, 49 insertions, 131 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index 4d5ec2d..095edae 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -1,36 +1,21 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
 #include "chrome/browser/browser_init.h"
 
-#include <algorithm>
-
-#if defined(OS_WIN)
-#include "app/win_util.h"
-#endif
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/basictypes.h"
-#include "base/command_line.h"
-#include "base/compiler_specific.h"
 #include "base/event_recorder.h"
-#include "base/file_path.h"
-#include "base/file_util.h"
-#include "base/histogram.h"
 #include "base/path_service.h"
-#include "base/string_util.h"
 #include "base/sys_info.h"
-#include "chrome/browser/autocomplete/autocomplete.h"
+#include "base/thread.h"
 #include "chrome/browser/automation/automation_provider.h"
-#include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_creator.h"
-#include "chrome/browser/extensions/extensions_service.h"
-#include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/profile.h"
@@ -48,7 +33,6 @@
 #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"
@@ -57,11 +41,10 @@
 #include "grit/theme_resources.h"
 #include "net/http/http_network_layer.h"
 #include "net/base/net_util.h"
-#include "net/url_request/url_request.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
-#include "base/win_util.h"
+#include "app/win_util.h"
 #endif
 
 #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index 0e7bbbb..e2d30f1 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -1,38 +1,28 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
 #include "chrome/browser/importer/importer.h"
 
-#include <map>
-#include <set>
-
 #include "app/gfx/favicon_size.h"
 #include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
-#include "base/file_util.h"
-#include "base/message_loop.h"
 #include "base/string_util.h"
+#include "base/thread.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_instance.h"
-#include "chrome/browser/favicon_service.h"
-#include "chrome/browser/first_run.h"
 #include "chrome/browser/importer/firefox_profile_lock.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/shell_integration.h"
 #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"
-#include "webkit/glue/password_form.h"
 
 // TODO(port): Port these files.
 #if defined(OS_WIN)
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index 0cffb8f..20b7adc 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -168,42 +168,32 @@
 #include "third_party/bzip2/bzlib.h"
 #endif
 
-#include "base/file_path.h"
-#include "base/histogram.h"
-#include "base/path_service.h"
-#include "base/platform_thread.h"
-#include "base/rand_util.h"
-#include "base/string_util.h"
-#include "base/task.h"
+#include "base/thread.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/memory_details.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
-#include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/common/child_process_info.h"
-#include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/histogram_synchronizer.h"
-#include "chrome/common/libxml_utils.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/render_messages.h"
-#include "googleurl/src/gurl.h"
-#include "net/base/load_flags.h"
 #include "webkit/glue/plugins/plugin_list.h"
 
+#if !defined(OS_WIN)
+#include "base/rand_util.h"
+#endif
+
 #if defined(OS_POSIX)
 // TODO(port): Move these headers above as they are ported.
 #include "chrome/common/temp_scaffolding_stubs.h"
 #else
 #include "chrome/installer/util/browser_distribution.h"
-#include "chrome/installer/util/google_update_settings.h"
 #endif
 
 using base::Time;
diff --git a/chrome/browser/search_engines/template_url.h b/chrome/browser/search_engines/template_url.h
index 5abcb14..2d8228b 100644
--- a/chrome/browser/search_engines/template_url.h
+++ b/chrome/browser/search_engines/template_url.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 @@
 
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 
diff --git a/chrome/browser/search_engines/template_url_model.cc b/chrome/browser/search_engines/template_url_model.cc
index c4c6103..2021841 100644
--- a/chrome/browser/search_engines/template_url_model.cc
+++ b/chrome/browser/search_engines/template_url_model.cc
@@ -1,33 +1,24 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
 #include "chrome/browser/search_engines/template_url_model.h"
 
-#include <algorithm>
 
 #include "app/l10n_util.h"
-#include "base/logging.h"
 #include "base/stl_util-inl.h"
-#include "base/string_util.h"
-#include "chrome/browser/browser_process.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/google_url_tracker.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/rlz/rlz.h"
-#include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/url_constants.h"
-#include "googleurl/src/gurl.h"
-#include "googleurl/src/url_parse.h"
-#include "grit/locale_settings.h"
 #include "net/base/net_util.h"
-#include "unicode/rbbi.h"
-#include "unicode/uchar.h"
 
 using base::Time;
 
diff --git a/chrome/browser/search_engines/template_url_model.h b/chrome/browser/search_engines/template_url_model.h
index c0e169b..a1b406a 100644
--- a/chrome/browser/search_engines/template_url_model.h
+++ b/chrome/browser/search_engines/template_url_model.h
@@ -1,25 +1,24 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_TEMPLATE_URL_MODEL_H__
 #define CHROME_BROWSER_TEMPLATE_URL_MODEL_H__
 
-#include <map>
-#include <string>
-#include <vector>
+#include <set>
 
 #include "base/observer_list.h"
-#include "chrome/browser/history/history_notifications.h"
-#include "chrome/browser/history/history_types.h"
+#include "base/scoped_ptr.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/notification_registrar.h"
+#include "testing/gtest/include/gtest/gtest_prod.h"
 
-class GURL;
 class PrefService;
 class Profile;
-class TemplateURL;
-class TemplateURLModelTest;
+
+namespace history {
+struct URLVisitedDetails;
+}
 
 // TemplateURLModel is the backend for keywords. It's used by
 // KeywordAutocomplete.
diff --git a/chrome/browser/search_engines/template_url_model_unittest.cc b/chrome/browser/search_engines/template_url_model_unittest.cc
index 2c4d07c..3d4b5e9 100644
--- a/chrome/browser/search_engines/template_url_model_unittest.cc
+++ b/chrome/browser/search_engines/template_url_model_unittest.cc
@@ -1,15 +1,11 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
-#include "base/file_util.h"
 #include "base/path_service.h"
-#include "base/string_util.h"
-#include "chrome/browser/search_engines/template_url.h"
-#include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/common/pref_service.h"
+#include "base/thread.h"
+#include "chrome/browser/webdata/web_database.h"
 #include "chrome/test/testing_profile.h"
-#include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
diff --git a/chrome/browser/search_engines/template_url_table_model.cc b/chrome/browser/search_engines/template_url_table_model.cc
index 4b9663f..5007758 100644
--- a/chrome/browser/search_engines/template_url_table_model.cc
+++ b/chrome/browser/search_engines/template_url_table_model.cc
@@ -8,13 +8,11 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/table_model_observer.h"
+#include "base/stl_util-inl.h"
 #include "chrome/browser/favicon_service.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/search_engines/template_url.h"
-#include "chrome/browser/search_engines/template_url_model.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 
 // Group IDs used by TemplateURLTableModel.
 static const int kMainGroupID = 0;
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index dec21b8..ff6034b 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -8,43 +8,26 @@
 #include <gtk/gtk.h>
 #endif
 
-#include "build/build_config.h"
-
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
-#include "base/file_util.h"
-#include "base/keyboard_codes.h"
-#include "base/path_service.h"
-#include "base/string_util.h"
+#include "base/stl_util-inl.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
-#include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/bubble_positioner.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
-#include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extensions_service.h"
-#include "chrome/browser/page_info_window.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/view_ids.h"
-#include "chrome/browser/views/info_bubble.h"
-#include "chrome/common/extensions/extension_action.h"
-#include "chrome/common/extensions/extension.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "views/focus/focus_manager.h"
-#include "views/widget/root_view.h"
-#include "views/widget/widget.h"
 
 #if defined(OS_WIN)
-#include "app/win_util.h"
 #include "chrome/browser/views/first_run_bubble.h"
 #endif
 
diff --git a/chrome/browser/webdata/web_data_service.cc b/chrome/browser/webdata/web_data_service.cc
index 32e194e..d1cc7f8 100644
--- a/chrome/browser/webdata/web_data_service.cc
+++ b/chrome/browser/webdata/web_data_service.cc
@@ -1,13 +1,11 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
 #include "chrome/browser/webdata/web_data_service.h"
 
-#include "base/file_util.h"
-#include "base/path_service.h"
-#include "base/scoped_ptr.h"
-#include "chrome/browser/search_engines/template_url.h"
+#include "base/thread.h"
+#include "chrome/browser/webdata/web_database.h"
 #include "chrome/common/chrome_constants.h"
 #include "webkit/glue/password_form.h"
 
@@ -319,8 +317,8 @@ void WebDataService::RemoveLogin(const PasswordForm& form) {
                                  request));
 }
 
-void WebDataService::RemoveLoginsCreatedBetween(const Time delete_begin,
-                                                const Time delete_end) {
+void WebDataService::RemoveLoginsCreatedBetween(const Time& delete_begin,
+                                                const Time& delete_end) {
   GenericRequest2<Time, Time>* request =
     new GenericRequest2<Time, Time>(this,
                                     GetNextRequestHandle(),
@@ -332,7 +330,7 @@ void WebDataService::RemoveLoginsCreatedBetween(const Time delete_begin,
       &WebDataService::RemoveLoginsCreatedBetweenImpl, request));
 }
 
-void WebDataService::RemoveLoginsCreatedAfter(const Time delete_begin) {
+void WebDataService::RemoveLoginsCreatedAfter(const Time& delete_begin) {
   RemoveLoginsCreatedBetween(delete_begin, Time());
 }
 
diff --git a/chrome/browser/webdata/web_data_service.h b/chrome/browser/webdata/web_data_service.h
index 6794030..82b0eb1 100644
--- a/chrome/browser/webdata/web_data_service.h
+++ b/chrome/browser/webdata/web_data_service.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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,22 +8,23 @@
 #include <map>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/lock.h"
-#include "base/message_loop.h"
 #include "base/ref_counted.h"
-#include "base/scoped_vector.h"
-#include "base/thread.h"
-#include "chrome/browser/webdata/web_database.h"
+#include "chrome/browser/search_engines/template_url.h"
+#include "third_party/skia/include/core/SkBitmap.h"
 #include "webkit/glue/form_field.h"
 
 #if defined(OS_WIN)
 struct IE7PasswordInfo;
 #endif
 class FilePath;
-class GURL;
-class ShutdownTask;
-class TemplateURL;
+class MessageLoop;
+class Task;
+class WebDatabase;
+
+namespace base {
+class Thread;
+}
 
 namespace webkit_glue {
 struct PasswordForm;
@@ -323,11 +324,11 @@ class WebDataService : public base::RefCountedThreadSafe<WebDataService> {
   void RemoveLogin(const webkit_glue::PasswordForm& form);
 
   // Removes all logins created in the specified daterange
-  void RemoveLoginsCreatedBetween(const base::Time delete_begin,
-                                  const base::Time delete_end);
+  void RemoveLoginsCreatedBetween(const base::Time& delete_begin,
+                                  const base::Time& delete_end);
 
   // Removes all logins created on or after the date passed in.
-  void RemoveLoginsCreatedAfter(const base::Time delete_begin);
+  void RemoveLoginsCreatedAfter(const base::Time& delete_begin);
 
   // Gets a list of password forms that match |form|.
   // |consumer| will be notified when the request is done. The result is of
@@ -489,8 +490,6 @@ class WebDataService : public base::RefCountedThreadSafe<WebDataService> {
 
   base::Thread* thread() { return thread_; }
 
- private:
-
   // Schedule a task on our worker thread.
   void ScheduleTask(Task* t);
 
diff --git a/chrome/browser/webdata/web_data_service_win.cc b/chrome/browser/webdata/web_data_service_win.cc
index 7219b82..1c4f307 100644
--- a/chrome/browser/webdata/web_data_service_win.cc
+++ b/chrome/browser/webdata/web_data_service_win.cc
@@ -4,7 +4,9 @@
 
 #include "chrome/browser/webdata/web_data_service.h"
 
+#include "base/task.h"
 #include "chrome/browser/password_manager/ie7_password.h"
+#include "chrome/browser/webdata/web_database.h"
 
 void WebDataService::AddIE7Login(const IE7PasswordInfo& info) {
   GenericRequest<IE7PasswordInfo>* request =
diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index ffe484c..4d61431 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -4,20 +4,15 @@
 
 #include "chrome/browser/webdata/web_database.h"
 
-#include <algorithm>
 #include <limits>
-#include <set>
-#include <vector>
 
 #include "app/gfx/codec/png_codec.h"
 #include "app/l10n_util.h"
 #include "app/sql/statement.h"
 #include "app/sql/transaction.h"
-#include "base/string_util.h"
-#include "base/time.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 #include "chrome/browser/history/history_database.h"
-#include "chrome/browser/search_engines/template_url.h"
 #include "webkit/glue/password_form.h"
 
 // Encryptor is the *wrong* way of doing things; we need to turn it into a
diff --git a/chrome/browser/webdata/web_database.h b/chrome/browser/webdata/web_database.h
index 32abb4b..8d93363 100644
--- a/chrome/browser/webdata/web_database.h
+++ b/chrome/browser/webdata/web_database.h
@@ -5,12 +5,10 @@
 #ifndef CHROME_BROWSER_WEBDATA_WEB_DATABASE_H_
 #define CHROME_BROWSER_WEBDATA_WEB_DATABASE_H_
 
-#include <string>
 #include <vector>
 
 #include "app/sql/connection.h"
 #include "app/sql/meta_table.h"
-#include "base/basictypes.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
diff --git a/webkit/glue/form_field_values.h b/webkit/glue/form_field_values.h
index 5c2ea62c..d0accf7 100644
--- a/webkit/glue/form_field_values.h
+++ b/webkit/glue/form_field_values.h
@@ -7,12 +7,9 @@
 
 #include <vector>
 
+#include "base/string16.h"
 #include "webkit/glue/form_field.h"
 
-namespace WebCore {
-class HTMLInputElement;
-}
-
 namespace WebKit {
 class WebForm;
 }