Remove some #includes where possible.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/335002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29915 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 22 insertions, 30 deletions

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"