Cleanup: Remove unneeded forward declarations from various chrome/browser subdirectories.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/8539006

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

41 files changed, 25 insertions, 111 deletions

diff --git a/chrome/browser/autocomplete/autocomplete.h b/chrome/browser/autocomplete/autocomplete.h
index 02dc34a..8c96837 100644
--- a/chrome/browser/autocomplete/autocomplete.h
+++ b/chrome/browser/autocomplete/autocomplete.h
@@ -174,7 +174,6 @@ class AutocompleteInput;
 struct AutocompleteMatch;
 class AutocompleteProvider;
 class AutocompleteResult;
-class HistoryContentsProvider;
 class KeywordProvider;
 class Profile;
 class SearchProvider;
diff --git a/chrome/browser/autocomplete/history_provider.h b/chrome/browser/autocomplete/history_provider.h
index 231a7b1..7b145a2 100644
--- a/chrome/browser/autocomplete/history_provider.h
+++ b/chrome/browser/autocomplete/history_provider.h
@@ -9,14 +9,6 @@
 #include "base/compiler_specific.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 
-namespace history {
-
-class HistoryBackend;
-class URLDatabase;
-class URLRow;
-
-}  // namespace history
-
 // This class is a base class for the history autocomplete providers and
 // provides functions useful to all derived classes.
 class HistoryProvider : public AutocompleteProvider {
diff --git a/chrome/browser/autocomplete/history_quick_provider.h b/chrome/browser/autocomplete/history_quick_provider.h
index c8dadf9..e5743b9 100644
--- a/chrome/browser/autocomplete/history_quick_provider.h
+++ b/chrome/browser/autocomplete/history_quick_provider.h
@@ -16,10 +16,6 @@
 class Profile;
 class TermMatches;
 
-namespace history {
-class HistoryBackend;
-}  // namespace history
-
 // This class is an autocomplete provider (a pseudo-internal component of
 // the history system) which quickly (and synchronously) provides matching
 // results from recently or frequently visited sites in the profile's
diff --git a/chrome/browser/autocomplete/history_url_provider.h b/chrome/browser/autocomplete/history_url_provider.h
index b1fdc87..2fa6e77 100644
--- a/chrome/browser/autocomplete/history_url_provider.h
+++ b/chrome/browser/autocomplete/history_url_provider.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <string>
+#include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/synchronization/cancellation_flag.h"
@@ -20,7 +21,6 @@ namespace history {
 
 class HistoryBackend;
 class URLDatabase;
-class URLRow;
 
 }  // namespace history
 
diff --git a/chrome/browser/autocomplete/shortcuts_provider.h b/chrome/browser/autocomplete/shortcuts_provider.h
index 170cfea8..b57e993 100644
--- a/chrome/browser/autocomplete/shortcuts_provider.h
+++ b/chrome/browser/autocomplete/shortcuts_provider.h
@@ -19,7 +19,6 @@
 #include "chrome/browser/history/shortcuts_backend.h"
 
 class Profile;
-struct AutocompleteLog;
 
 // Provider of recently autocompleted links. Provides autocomplete suggestions
 // from previously selected suggestions. The more often a user selects a
diff --git a/chrome/browser/content_settings/content_settings_provider.h b/chrome/browser/content_settings/content_settings_provider.h
index 7459370..48a554a 100644
--- a/chrome/browser/content_settings/content_settings_provider.h
+++ b/chrome/browser/content_settings/content_settings_provider.h
@@ -17,7 +17,6 @@
 #include "chrome/common/content_settings.h"
 
 class ContentSettingsPattern;
-class GURL;
 
 namespace content_settings {
 
diff --git a/chrome/browser/download/download_extension_api.h b/chrome/browser/download/download_extension_api.h
index 183cf1f..b6e494b 100644
--- a/chrome/browser/download/download_extension_api.h
+++ b/chrome/browser/download/download_extension_api.h
@@ -17,11 +17,8 @@
 #include "content/browser/download/download_item.h"
 #include "content/browser/download/download_manager.h"
 
-namespace base {
-class DictionaryValue;
-}
 class ResourceDispatcherHost;
-class TabContents;
+
 namespace content {
 class ResourceContext;
 }
diff --git a/chrome/browser/download/download_request_infobar_delegate.h b/chrome/browser/download/download_request_infobar_delegate.h
index 0442b8d..1df4da7 100644
--- a/chrome/browser/download/download_request_infobar_delegate.h
+++ b/chrome/browser/download/download_request_infobar_delegate.h
@@ -10,8 +10,6 @@
 #include "chrome/browser/download/download_request_limiter.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 
-class TabContents;
-
 // An infobar delegate that presents the user with a choice to allow or deny
 // multiple downloads from the same site. This confirmation step protects
 // against "carpet-bombing", where a malicious site forces multiple downloads
diff --git a/chrome/browser/download/download_throttling_resource_handler.h b/chrome/browser/download/download_throttling_resource_handler.h
index 83e06fa..e17e3a3f 100644
--- a/chrome/browser/download/download_throttling_resource_handler.h
+++ b/chrome/browser/download/download_throttling_resource_handler.h
@@ -12,7 +12,6 @@
 #include "content/browser/renderer_host/resource_handler.h"
 #include "googleurl/src/gurl.h"
 
-class DownloadResourceHandler;
 class ResourceDispatcherHost;
 
 namespace net {
diff --git a/chrome/browser/download/download_util.h b/chrome/browser/download/download_util.h
index 3367fda..b69806c 100644
--- a/chrome/browser/download/download_util.h
+++ b/chrome/browser/download/download_util.h
@@ -20,24 +20,10 @@
 #include "views/view.h"
 #endif
 
-class BaseDownloadItemModel;
-class CrxInstaller;
 class DownloadItem;
-class GURL;
-class Profile;
-class ResourceDispatcherHost;
-class SkBitmap;
-
-struct DownloadCreateInfo;
-struct DownloadSaveInfo;
 
 namespace base {
 class DictionaryValue;
-class TimeTicks;
-}
-
-namespace content {
-class ResourceContext;
 }
 
 namespace gfx {
diff --git a/chrome/browser/google/google_url_tracker.h b/chrome/browser/google/google_url_tracker.h
index bbdd161..8cf99b5 100644
--- a/chrome/browser/google/google_url_tracker.h
+++ b/chrome/browser/google/google_url_tracker.h
@@ -21,7 +21,6 @@
 class NavigationController;
 class PrefService;
 class TabContents;
-class TemplateURL;
 
 // This object is responsible for checking the Google URL once per network
 // change, and if necessary prompting the user to see if they want to change to
diff --git a/chrome/browser/intents/register_intent_handler_infobar_delegate.h b/chrome/browser/intents/register_intent_handler_infobar_delegate.h
index 473eb33..b4aa263 100644
--- a/chrome/browser/intents/register_intent_handler_infobar_delegate.h
+++ b/chrome/browser/intents/register_intent_handler_infobar_delegate.h
@@ -12,7 +12,6 @@
 #include "webkit/glue/web_intent_service_data.h"
 
 class InfoBarTabHelper;
-class TabContents;
 class WebIntentsRegistry;
 
 // The InfoBar used to request permission for a site to be registered as an
diff --git a/chrome/browser/metrics/field_trial_synchronizer.h b/chrome/browser/metrics/field_trial_synchronizer.h
index d72a75a..eb2cc73 100644
--- a/chrome/browser/metrics/field_trial_synchronizer.h
+++ b/chrome/browser/metrics/field_trial_synchronizer.h
@@ -13,9 +13,6 @@
 #include "base/memory/ref_counted.h"
 #include "base/metrics/field_trial.h"
 
-class MessageLoop;
-class Task;
-
 // This class is used by the browser process to communicate FieldTrial setting
 // (field trial name and group) to any previously started renderers.
 //
diff --git a/chrome/browser/metrics/metrics_log.h b/chrome/browser/metrics/metrics_log.h
index 1d9c0f1..95b1252 100644
--- a/chrome/browser/metrics/metrics_log.h
+++ b/chrome/browser/metrics/metrics_log.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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,11 +9,13 @@
 #define CHROME_BROWSER_METRICS_METRICS_LOG_H_
 #pragma once
 
+#include <string>
+#include <vector>
+
 #include "base/basictypes.h"
 #include "chrome/common/metrics_helpers.h"
 
 struct AutocompleteLog;
-class GURL;
 class PrefService;
 
 namespace base {
diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h
index 643bcb4..ee39a35 100644
--- a/chrome/browser/metrics/metrics_service.h
+++ b/chrome/browser/metrics/metrics_service.h
@@ -30,8 +30,6 @@
 
 class BookmarkModel;
 class BookmarkNode;
-class HistogramSynchronizer;
-class MetricsLogBase;
 class MetricsReportingScheduler;
 class PrefService;
 class Profile;
diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
index aa469f5..359e5b9 100644
--- a/chrome/browser/net/chrome_url_request_context.h
+++ b/chrome/browser/net/chrome_url_request_context.h
@@ -24,9 +24,6 @@ class ProfileIOData;
 namespace base {
 class WaitableEvent;
 }
-namespace net {
-class NetworkDelegate;
-}
 
 // Subclass of net::URLRequestContext which can be used to store extra
 // information for requests.
diff --git a/chrome/browser/net/net_pref_observer.h b/chrome/browser/net/net_pref_observer.h
index 8e15ce4..b6da810 100644
--- a/chrome/browser/net/net_pref_observer.h
+++ b/chrome/browser/net/net_pref_observer.h
@@ -12,8 +12,6 @@
 #include "chrome/browser/prefs/pref_member.h"
 #include "content/public/browser/notification_observer.h"
 
-class Profile;
-
 namespace chrome_browser_net {
 class Predictor;
 }
diff --git a/chrome/browser/notifications/balloon.h b/chrome/browser/notifications/balloon.h
index e843362..b1b89e7 100644
--- a/chrome/browser/notifications/balloon.h
+++ b/chrome/browser/notifications/balloon.h
@@ -19,7 +19,6 @@ class BalloonCollection;
 class BalloonHost;
 class Notification;
 class Profile;
-class SiteInstance;
 
 // Interface for a view that displays a balloon.
 class BalloonView {
diff --git a/chrome/browser/notifications/balloon_host.h b/chrome/browser/notifications/balloon_host.h
index 06b5cdb..7dfd875 100644
--- a/chrome/browser/notifications/balloon_host.h
+++ b/chrome/browser/notifications/balloon_host.h
@@ -21,7 +21,6 @@ class Balloon;
 class Browser;
 class Profile;
 class SiteInstance;
-struct WebPreferences;
 
 namespace IPC {
 class Message;
diff --git a/chrome/browser/notifications/desktop_notification_service.h b/chrome/browser/notifications/desktop_notification_service.h
index 2ae0c4b..f32044a 100644
--- a/chrome/browser/notifications/desktop_notification_service.h
+++ b/chrome/browser/notifications/desktop_notification_service.h
@@ -23,11 +23,8 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
 
 class ContentSettingsPattern;
-class Extension;
 class Notification;
-class NotificationDelegate;
 class NotificationUIManager;
-class PrefService;
 class Profile;
 class TabContents;
 
diff --git a/chrome/browser/notifications/notification_object_proxy.h b/chrome/browser/notifications/notification_object_proxy.h
index 0c84c3a..efb0fc1 100644
--- a/chrome/browser/notifications/notification_object_proxy.h
+++ b/chrome/browser/notifications/notification_object_proxy.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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,11 +10,6 @@
 
 #include "chrome/browser/notifications/notification_delegate.h"
 
-class MessageLoop;
-namespace IPC {
-class Message;
-}
-
 // A NotificationObjectProxy stands in for the JavaScript Notification object
 // which corresponds to a notification toast on the desktop.  It can be signaled
 // when various events occur regarding the desktop notification, and the
diff --git a/chrome/browser/notifications/notification_ui_manager.h b/chrome/browser/notifications/notification_ui_manager.h
index a64c852..60605c4 100644
--- a/chrome/browser/notifications/notification_ui_manager.h
+++ b/chrome/browser/notifications/notification_ui_manager.h
@@ -8,6 +8,7 @@
 
 #include <deque>
 #include <string>
+#include <vector>
 
 #include "base/id_map.h"
 #include "base/memory/scoped_ptr.h"
@@ -22,7 +23,6 @@ class Notification;
 class PrefService;
 class Profile;
 class QueuedNotification;
-class SiteInstance;
 
 // The notification manager manages use of the desktop for notifications.
 // It maintains a queue of pending notifications when space becomes constrained.
diff --git a/chrome/browser/prefs/pref_service_mock_builder.h b/chrome/browser/prefs/pref_service_mock_builder.h
index 7beb084..7b4fe72 100644
--- a/chrome/browser/prefs/pref_service_mock_builder.h
+++ b/chrome/browser/prefs/pref_service_mock_builder.h
@@ -14,7 +14,6 @@
 class CommandLine;
 class FilePath;
 class PrefService;
-class Profile;
 
 namespace policy {
 class ConfigurationPolicyProvider;
diff --git a/chrome/browser/prefs/pref_value_store.h b/chrome/browser/prefs/pref_value_store.h
index a9763b8..6037633 100644
--- a/chrome/browser/prefs/pref_value_store.h
+++ b/chrome/browser/prefs/pref_value_store.h
@@ -17,7 +17,6 @@
 #include "chrome/common/pref_store.h"
 #include "content/public/browser/browser_thread.h"
 
-class FilePath;
 class PrefModelAssociator;
 class PrefNotifier;
 class PrefStore;
diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.h b/chrome/browser/renderer_host/chrome_render_message_filter.h
index 8f0be66..9a077df 100644
--- a/chrome/browser/renderer_host/chrome_render_message_filter.h
+++ b/chrome/browser/renderer_host/chrome_render_message_filter.h
@@ -6,6 +6,9 @@
 #define CHROME_BROWSER_RENDERER_HOST_CHROME_RENDER_MESSAGE_FILTER_H_
 #pragma once
 
+#include <string>
+#include <vector>
+
 #include "base/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/common/content_settings.h"
@@ -18,7 +21,6 @@ class CookieSettings;
 struct ExtensionHostMsg_Request_Params;
 class ExtensionInfoMap;
 class GURL;
-class HostContentSettingsMap;
 
 namespace net {
 class URLRequestContextGetter;
diff --git a/chrome/browser/renderer_host/offline_resource_handler.h b/chrome/browser/renderer_host/offline_resource_handler.h
index 19e2081..2966c0d 100644
--- a/chrome/browser/renderer_host/offline_resource_handler.h
+++ b/chrome/browser/renderer_host/offline_resource_handler.h
@@ -14,7 +14,6 @@
 #include "net/base/completion_callback.h"
 
 class ChromeAppCacheService;
-class MessageLoop;
 class ResourceDispatcherHost;
 
 namespace net {
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.h b/chrome/browser/renderer_host/render_widget_host_view_views.h
index 5ec1186..ac18bf2 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_views.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.h
@@ -39,7 +39,6 @@ class AcceleratedSurfaceContainerLinux;
 #endif
 
 class RenderWidgetHost;
-struct NativeWebKeyboardEvent;
 
 // -----------------------------------------------------------------------------
 // See comments in render_widget_host_view.h about this class and its members.
diff --git a/chrome/browser/safe_browsing/download_protection_service.h b/chrome/browser/safe_browsing/download_protection_service.h
index 5eee939..deb0614 100644
--- a/chrome/browser/safe_browsing/download_protection_service.h
+++ b/chrome/browser/safe_browsing/download_protection_service.h
@@ -20,12 +20,12 @@
 #include "base/memory/ref_counted.h"
 #include "googleurl/src/gurl.h"
 
+class DownloadItem;
+class SafeBrowsingService;
+
 namespace net {
 class URLRequestContextGetter;
-class URLRequestStatus;
 }  // namespace net
-class DownloadItem;
-class SafeBrowsingService;
 
 namespace safe_browsing {
 class SignatureUtil;
diff --git a/chrome/browser/safe_browsing/malware_details_cache.h b/chrome/browser/safe_browsing/malware_details_cache.h
index 0a96ca6..383e8b6 100644
--- a/chrome/browser/safe_browsing/malware_details_cache.h
+++ b/chrome/browser/safe_browsing/malware_details_cache.h
@@ -24,8 +24,6 @@ namespace net {
 class URLRequestContext;
 }
 
-class MalwareDetailsFactory;
-
 namespace safe_browsing {
 
 // Maps a URL to its Resource.
diff --git a/chrome/browser/safe_browsing/malware_details_history.h b/chrome/browser/safe_browsing/malware_details_history.h
index f2776c6..c7e4a6b 100644
--- a/chrome/browser/safe_browsing/malware_details_history.h
+++ b/chrome/browser/safe_browsing/malware_details_history.h
@@ -21,8 +21,6 @@
 #include "content/public/browser/notification_registrar.h"
 #include "net/base/completion_callback.h"
 
-class TabContents;
-
 namespace safe_browsing {
 typedef std::vector<GURL> RedirectChain;
 }
@@ -32,7 +30,6 @@ class MalwareDetailsRedirectsCollector
           MalwareDetailsRedirectsCollector,
           content::BrowserThread::DeleteOnUIThread>,
       public content::NotificationObserver {
-
  public:
   explicit MalwareDetailsRedirectsCollector(Profile* profile);
   virtual ~MalwareDetailsRedirectsCollector();
diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h
index aad7eb8..981150c 100644
--- a/chrome/browser/safe_browsing/protocol_manager.h
+++ b/chrome/browser/safe_browsing/protocol_manager.h
@@ -27,10 +27,6 @@
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 #include "content/public/common/url_fetcher_delegate.h"
 
-namespace net {
-class URLRequestStatus;
-}  // namespace net
-
 #if defined(COMPILER_GCC)
 // Allows us to use URLFetchers in a hash_map with gcc (MSVC is okay without
 // specifying this).
@@ -203,6 +199,7 @@ class SafeBrowsingProtocolManager : public content::URLFetcherDelegate {
       const std::string& http_url_prefix,
       const std::string& https_url_prefix,
       bool disable_auto_update);
+
  private:
   friend class SBProtocolManagerFactoryImpl;
 
diff --git a/chrome/browser/search_engines/template_url.h b/chrome/browser/search_engines/template_url.h
index e6da1bc..6d4bfa0 100644
--- a/chrome/browser/search_engines/template_url.h
+++ b/chrome/browser/search_engines/template_url.h
@@ -20,7 +20,6 @@ class Profile;
 class SearchTermsData;
 class TemplateURL;
 class WebDataService;
-struct WDKeywordsResult;
 
 // TemplateURL represents the relevant portions of the Open Search Description
 // Document (http://www.opensearch.org/Specifications/OpenSearch).
diff --git a/chrome/browser/search_engines/template_url_service.h b/chrome/browser/search_engines/template_url_service.h
index f633566..f956601 100644
--- a/chrome/browser/search_engines/template_url_service.h
+++ b/chrome/browser/search_engines/template_url_service.h
@@ -23,16 +23,15 @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
-class GURL;
 class Extension;
+class GURL;
 class PrefService;
-class Profile;
 class PrefSetObserver;
+class Profile;
 class SearchHostToURLsMap;
 class SearchTermsData;
 class SyncData;
 class TemplateURLServiceObserver;
-class TemplateURLRef;
 
 namespace history {
 struct URLVisitedDetails;
@@ -418,7 +417,7 @@ class TemplateURLService : public WebDataServiceConsumer,
   // does not occur multiple times.
   static bool BuildQueryTerms(
       const GURL& url,
-      std::map<std::string,std::string>* query_terms);
+      std::map<std::string, std::string>* query_terms);
 
   // Invoked when the Google base URL has changed. Updates the mapping for all
   // TemplateURLs that have a replacement term of {google:baseURL} or
diff --git a/chrome/browser/tab_contents/simple_alert_infobar_delegate.h b/chrome/browser/tab_contents/simple_alert_infobar_delegate.h
index 0ea8249..01f8427 100644
--- a/chrome/browser/tab_contents/simple_alert_infobar_delegate.h
+++ b/chrome/browser/tab_contents/simple_alert_infobar_delegate.h
@@ -11,9 +11,6 @@
 #include "base/string16.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 
-class SkBitmap;
-class TabContents;
-
 class SimpleAlertInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   SimpleAlertInfoBarDelegate(InfoBarTabHelper* infobar_helper,
diff --git a/chrome/browser/tab_contents/spelling_menu_observer.h b/chrome/browser/tab_contents/spelling_menu_observer.h
index 76faa28..56fdb61 100644
--- a/chrome/browser/tab_contents/spelling_menu_observer.h
+++ b/chrome/browser/tab_contents/spelling_menu_observer.h
@@ -15,7 +15,6 @@
 #include "chrome/browser/tab_contents/render_view_context_menu_observer.h"
 #include "content/public/common/url_fetcher_delegate.h"
 
-class GURL;
 class RenderViewContextMenuProxy;
 
 namespace net {
diff --git a/chrome/browser/translate/translate_infobar_delegate.h b/chrome/browser/translate/translate_infobar_delegate.h
index 0670bfc..a7fe3b7 100644
--- a/chrome/browser/translate/translate_infobar_delegate.h
+++ b/chrome/browser/translate/translate_infobar_delegate.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ -15,7 +16,6 @@
 #include "chrome/common/translate_errors.h"
 
 class PrefService;
-class SkBitmap;
 class TranslateInfoBarView;
 
 class TranslateInfoBarDelegate : public InfoBarDelegate {
@@ -167,8 +167,8 @@ class TranslateInfoBarDelegate : public InfoBarDelegate {
   virtual void InfoBarDismissed() OVERRIDE;
   virtual gfx::Image* GetIcon() const OVERRIDE;
   virtual InfoBarDelegate::Type GetInfoBarType() const OVERRIDE;
-   virtual bool ShouldExpire(
-       const content::LoadCommittedDetails& details) const;
+  virtual bool ShouldExpire(
+       const content::LoadCommittedDetails& details) const OVERRIDE;
   virtual TranslateInfoBarDelegate* AsTranslateInfoBarDelegate() OVERRIDE;
 
   // Gets the host of the page being translated, or an empty string if no URL is
diff --git a/chrome/browser/web_applications/web_app.h b/chrome/browser/web_applications/web_app.h
index 0718fb8..c43c6ae 100644
--- a/chrome/browser/web_applications/web_app.h
+++ b/chrome/browser/web_applications/web_app.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_WEB_APPLICATIONS_WEB_APP_H_
 #pragma once
 
+#include <string>
 #include <vector>
 
 #include "base/callback_old.h"
@@ -14,8 +15,6 @@
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/web_apps.h"
 
-class Profile;
-
 namespace web_app {
 
 // Compute a deterministic name based on data in the shortcut_info.
diff --git a/chrome/browser/webdata/autocomplete_syncable_service.h b/chrome/browser/webdata/autocomplete_syncable_service.h
index a33d527..963a1ad 100644
--- a/chrome/browser/webdata/autocomplete_syncable_service.h
+++ b/chrome/browser/webdata/autocomplete_syncable_service.h
@@ -7,6 +7,7 @@
 
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
@@ -24,10 +25,6 @@
 
 class ProfileSyncServiceAutofillTest;
 
-namespace browser_sync {
-class UnrecoverableErrorHandler;
-}
-
 namespace sync_pb {
 class AutofillSpecifics;
 }
diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.h b/chrome/browser/webdata/autofill_profile_syncable_service.h
index a8c42e6..bab8d78 100644
--- a/chrome/browser/webdata/autofill_profile_syncable_service.h
+++ b/chrome/browser/webdata/autofill_profile_syncable_service.h
@@ -29,10 +29,6 @@ class AutofillTable;
 class ProfileSyncServiceAutofillTest;
 class WebDataService;
 
-namespace browser_sync {
-class UnrecoverableErrorHandler;
-}
-
 extern const char kAutofillProfileTag[];
 
 // The sync implementation for AutofillProfiles.
diff --git a/chrome/browser/webdata/keyword_table.h b/chrome/browser/webdata/keyword_table.h
index 3f8e9ba..0767d8d 100644
--- a/chrome/browser/webdata/keyword_table.h
+++ b/chrome/browser/webdata/keyword_table.h
@@ -13,13 +13,8 @@
 #include "chrome/browser/webdata/web_database_table.h"
 #include "chrome/browser/search_engines/template_url_id.h"
 
-class GURL;
 class TemplateURL;
 
-namespace base {
-class Time;
-}
-
 // This class manages the |keywords| MetaTable within the SQLite database
 // passed to the constructor. It expects the following schema:
 //
diff --git a/chrome/browser/webdata/web_intents_table.h b/chrome/browser/webdata/web_intents_table.h
index bcb94ec..2cd20ab 100644
--- a/chrome/browser/webdata/web_intents_table.h
+++ b/chrome/browser/webdata/web_intents_table.h
@@ -13,8 +13,6 @@
 #include "chrome/browser/webdata/web_database_table.h"
 #include "webkit/glue/web_intent_service_data.h"
 
-class GURL;
-
 namespace sql {
 class Connection;
 class MetaTable;
@@ -31,8 +29,8 @@ class MetaTable;
 // Intents are uniquely identified by the <service_url,action,type> tuple.
 class WebIntentsTable : public WebDatabaseTable {
  public:
-   WebIntentsTable(sql::Connection* db, sql::MetaTable* meta_table);
-   virtual ~WebIntentsTable();
+  WebIntentsTable(sql::Connection* db, sql::MetaTable* meta_table);
+  virtual ~WebIntentsTable();
 
   // WebDatabaseTable implementation.
   virtual bool Init();