Revert 52336 - More header cleanup:

- Some cleanup to url_request.h
- Remove task.h from headers that don't need it.
- Remove histogram.h from message_loop.h

BUG=none
TEST=none

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

TBR=erg@chromium.org
Review URL: http://codereview.chromium.org/2969006

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

37 files changed, 26 insertions, 30 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index 32a4fec..bf676e6 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -7,7 +7,6 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
diff --git a/chrome/browser/autocomplete/autocomplete_unittest.cc b/chrome/browser/autocomplete/autocomplete_unittest.cc
index 42963df..6a66e98 100644
--- a/chrome/browser/autocomplete/autocomplete_unittest.cc
+++ b/chrome/browser/autocomplete/autocomplete_unittest.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
-#include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h
index f59dc26..9ec2c3a 100644
--- a/chrome/browser/autocomplete/search_provider.h
+++ b/chrome/browser/autocomplete/search_provider.h
@@ -19,7 +19,6 @@
 #include <string>
 #include <vector>
 
-#include "base/scoped_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history_types.h"
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index 5e3e37e..495ce1c 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -10,7 +10,6 @@
 #include "app/resource_bundle.h"
 #include "base/env_var.h"
 #include "base/event_recorder.h"
-#include "base/histogram.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/automation/automation_provider.h"
diff --git a/chrome/browser/cancelable_request.h b/chrome/browser/cancelable_request.h
index 0e31f25..f3251f0 100644
--- a/chrome/browser/cancelable_request.h
+++ b/chrome/browser/cancelable_request.h
@@ -96,7 +96,6 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
 #include "base/task.h"
 
 class CancelableRequestBase;
diff --git a/chrome/browser/chrome_thread_unittest.cc b/chrome/browser/chrome_thread_unittest.cc
index 034f0d8..2284d3b 100644
--- a/chrome/browser/chrome_thread_unittest.cc
+++ b/chrome/browser/chrome_thread_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
-#include "base/scoped_ptr.h"
 #include "chrome/browser/chrome_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
diff --git a/chrome/browser/chromeos/boot_times_loader.cc b/chrome/browser/chromeos/boot_times_loader.cc
index 8ae86d6..e32e9b8 100644
--- a/chrome/browser/chromeos/boot_times_loader.cc
+++ b/chrome/browser/chromeos/boot_times_loader.cc
@@ -9,7 +9,6 @@
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/histogram.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
diff --git a/chrome/browser/cocoa/download_item_controller.mm b/chrome/browser/cocoa/download_item_controller.mm
index 61b0aa3..ccc2770 100644
--- a/chrome/browser/cocoa/download_item_controller.mm
+++ b/chrome/browser/cocoa/download_item_controller.mm
@@ -7,7 +7,6 @@
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
-#include "base/histogram.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
diff --git a/chrome/browser/cocoa/external_protocol_dialog.mm b/chrome/browser/cocoa/external_protocol_dialog.mm
index dc3ca24..c729cbf 100644
--- a/chrome/browser/cocoa/external_protocol_dialog.mm
+++ b/chrome/browser/cocoa/external_protocol_dialog.mm
@@ -5,7 +5,6 @@
 #import "chrome/browser/cocoa/external_protocol_dialog.h"
 
 #include "app/l10n_util_mac.h"
-#include "base/histogram.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
diff --git a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h
index b839cc7..b4987b8 100644
--- a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h
+++ b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h
@@ -23,7 +23,6 @@
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/browser/debugger/devtools_remote.h"
diff --git a/chrome/browser/download/download_util.h b/chrome/browser/download/download_util.h
index 6ee8f89..dee3600 100644
--- a/chrome/browser/download/download_util.h
+++ b/chrome/browser/download/download_util.h
@@ -11,6 +11,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/task.h"
 #include "gfx/native_widget_types.h"
 
 #if defined(TOOLKIT_VIEWS)
@@ -29,6 +30,23 @@ class SkBitmap;
 
 namespace download_util {
 
+// DownloadProgressTask --------------------------------------------------------
+
+// A class for managing the timed progress animations for a download view. The
+// view must implement an UpdateDownloadProgress() method.
+template<class DownloadView>
+class DownloadProgressTask : public Task {
+ public:
+  explicit DownloadProgressTask(DownloadView* view) : view_(view) {}
+  virtual ~DownloadProgressTask() {}
+  virtual void Run() {
+    view_->UpdateDownloadProgress();
+  }
+ private:
+  DownloadView* view_;
+  DISALLOW_COPY_AND_ASSIGN(DownloadProgressTask);
+};
+
 // Download opening ------------------------------------------------------------
 
 // Whether it is OK to open this download.
diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h
index 9ab011b..810a8fc 100644
--- a/chrome/browser/extensions/crx_installer.h
+++ b/chrome/browser/extensions/crx_installer.h
@@ -9,6 +9,7 @@
 
 #include "base/file_path.h"
 #include "base/ref_counted.h"
+#include "base/task.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/sandboxed_extension_unpacker.h"
diff --git a/chrome/browser/extensions/extension_prefs.h b/chrome/browser/extensions/extension_prefs.h
index 6977fb4..f7733c3 100644
--- a/chrome/browser/extensions/extension_prefs.h
+++ b/chrome/browser/extensions/extension_prefs.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "base/linked_ptr.h"
+#include "base/task.h"
 #include "base/time.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/common/extensions/extension.h"
diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc
index 3985704..c3b1907 100644
--- a/chrome/browser/extensions/extension_updater.cc
+++ b/chrome/browser/extensions/extension_updater.cc
@@ -10,7 +10,6 @@
 #include "base/logging.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
-#include "base/histogram.h"
 #include "base/rand_util.h"
 #include "base/sha2.h"
 #include "base/stl_util-inl.h"
diff --git a/chrome/browser/gears_integration.cc b/chrome/browser/gears_integration.cc
index d1f13cf..5cfad85 100644
--- a/chrome/browser/gears_integration.cc
+++ b/chrome/browser/gears_integration.cc
@@ -10,7 +10,6 @@
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_plugin_host.h"
 #include "chrome/common/chrome_plugin_util.h"
diff --git a/chrome/browser/geolocation/access_token_store.h b/chrome/browser/geolocation/access_token_store.h
index 1002044..8ecc81c 100644
--- a/chrome/browser/geolocation/access_token_store.h
+++ b/chrome/browser/geolocation/access_token_store.h
@@ -17,6 +17,7 @@
 
 #include "base/ref_counted.h"
 #include "base/string16.h"
+#include "base/task.h"
 #include "chrome/browser/cancelable_request.h"
 #include "googleurl/src/gurl.h"
 
diff --git a/chrome/browser/google_url_tracker.h b/chrome/browser/google_url_tracker.h
index 5158ec8..6cd8b2f 100644
--- a/chrome/browser/google_url_tracker.h
+++ b/chrome/browser/google_url_tracker.h
@@ -8,7 +8,6 @@
 #include <string>
 
 #include "base/gtest_prod_util.h"
-#include "base/scoped_ptr.h"
 #include "chrome/common/net/url_fetcher.h"
 #include "chrome/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/gtk/download_item_gtk.cc b/chrome/browser/gtk/download_item_gtk.cc
index 6f0791b..1a4c9b9 100644
--- a/chrome/browser/gtk/download_item_gtk.cc
+++ b/chrome/browser/gtk/download_item_gtk.cc
@@ -12,7 +12,6 @@
 #include "app/text_elider.h"
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "base/histogram.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/browser.h"
diff --git a/chrome/browser/idle.h b/chrome/browser/idle.h
index 4fe750f..e850dbe 100644
--- a/chrome/browser/idle.h
+++ b/chrome/browser/idle.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_BROWSER_IDLE_H_
 #define CHROME_BROWSER_IDLE_H_
 
+#include "base/task.h"
+
 enum IdleState {
   IDLE_STATE_ACTIVE = 0,
   IDLE_STATE_IDLE = 1,   // No activity within threshold.
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index caa5998..2df6b68 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -10,6 +10,7 @@
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "base/task.h"
 #include "chrome/browser/browser_process_sub_thread.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/common/net/predictor_common.h"
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index 5c38d97..5106912 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -6,7 +6,6 @@
 
 #include "app/l10n_util.h"
 #include "base/file_version_info.h"
-#include "base/histogram.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_child_process_host.h"
diff --git a/chrome/browser/net/chrome_net_log.h b/chrome/browser/net/chrome_net_log.h
index 3d94ac6..092be8d 100644
--- a/chrome/browser/net/chrome_net_log.h
+++ b/chrome/browser/net/chrome_net_log.h
@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_NET_CHROME_NET_LOG_H_
 
 #include "base/observer_list.h"
-#include "base/scoped_ptr.h"
 #include "net/base/net_log.h"
 
 class PassiveLogCollector;
diff --git a/chrome/browser/omnibox_search_hint.cc b/chrome/browser/omnibox_search_hint.cc
index c54794c..28db8a9 100644
--- a/chrome/browser/omnibox_search_hint.cc
+++ b/chrome/browser/omnibox_search_hint.cc
@@ -8,7 +8,6 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
-#include "base/histogram.h"
 #include "base/task.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
diff --git a/chrome/browser/plugin_process_host.h b/chrome/browser/plugin_process_host.h
index 8e14707..a9c8bb6 100644
--- a/chrome/browser/plugin_process_host.h
+++ b/chrome/browser/plugin_process_host.h
@@ -14,6 +14,7 @@
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
+#include "base/task.h"
 #include "chrome/browser/browser_child_process_host.h"
 #include "chrome/browser/net/resolve_proxy_msg_helper.h"
 #include "chrome/browser/renderer_host/resource_message_filter.h"
diff --git a/chrome/browser/printing/print_job.h b/chrome/browser/printing/print_job.h
index 640ffdb..e21f865 100644
--- a/chrome/browser/printing/print_job.h
+++ b/chrome/browser/printing/print_job.h
@@ -7,7 +7,6 @@
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
-#include "base/scoped_ptr.h"
 #include "chrome/browser/printing/print_job_worker_owner.h"
 #include "chrome/common/notification_registrar.h"
 #include "gfx/native_widget_types.h"
diff --git a/chrome/browser/profile_import_process_host.h b/chrome/browser/profile_import_process_host.h
index a4b7a2a..878d972 100644
--- a/chrome/browser/profile_import_process_host.h
+++ b/chrome/browser/profile_import_process_host.h
@@ -10,6 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
+#include "base/task.h"
 #include "base/values.h"
 #include "chrome/browser/browser_child_process_host.h"
 #include "chrome/browser/chrome_thread.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc b/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc
index 73f991d..b322c95 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc
@@ -6,7 +6,6 @@
 
 #include "base/auto_reset.h"
 #include "base/file_util.h"
-#include "base/histogram.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/sha2.h"
diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc
index 802d88c..cbd5dc0 100644
--- a/chrome/browser/sessions/session_service.cc
+++ b/chrome/browser/sessions/session_service.cc
@@ -10,7 +10,6 @@
 
 #include "base/callback.h"
 #include "base/file_util.h"
-#include "base/histogram.h"
 #include "base/message_loop.h"
 #include "base/pickle.h"
 #include "base/scoped_vector.h"
diff --git a/chrome/browser/spellcheck_host.h b/chrome/browser/spellcheck_host.h
index da6305d..c0382c8 100644
--- a/chrome/browser/spellcheck_host.h
+++ b/chrome/browser/spellcheck_host.h
@@ -11,7 +11,6 @@
 #include "base/file_path.h"
 #include "base/platform_file.h"
 #include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/common/net/url_fetcher.h"
 
diff --git a/chrome/browser/sync/util/extensions_activity_monitor.h b/chrome/browser/sync/util/extensions_activity_monitor.h
index a1e36f2..9f5a1a3 100644
--- a/chrome/browser/sync/util/extensions_activity_monitor.h
+++ b/chrome/browser/sync/util/extensions_activity_monitor.h
@@ -5,8 +5,6 @@
 #ifndef CHROME_BROWSER_SYNC_UTIL_EXTENSIONS_ACTIVITY_MONITOR_H_
 #define CHROME_BROWSER_SYNC_UTIL_EXTENSIONS_ACTIVITY_MONITOR_H_
 
-#include <map>
-
 #include "base/lock.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
diff --git a/chrome/browser/translate/translate_infobar_delegate.cc b/chrome/browser/translate/translate_infobar_delegate.cc
index b1fa79e..1ca430e 100644
--- a/chrome/browser/translate/translate_infobar_delegate.cc
+++ b/chrome/browser/translate/translate_infobar_delegate.cc
@@ -8,7 +8,6 @@
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "base/histogram.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc
index 348c86d..3800685 100644
--- a/chrome/browser/views/download_item_view.cc
+++ b/chrome/browser/views/download_item_view.cc
@@ -12,7 +12,6 @@
 #include "app/theme_provider.h"
 #include "base/callback.h"
 #include "base/file_path.h"
-#include "base/histogram.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
diff --git a/chrome/common/desktop_notifications/active_notification_tracker.cc b/chrome/common/desktop_notifications/active_notification_tracker.cc
index 9822711..0bfff59 100644
--- a/chrome/common/desktop_notifications/active_notification_tracker.cc
+++ b/chrome/common/desktop_notifications/active_notification_tracker.cc
@@ -5,7 +5,6 @@
 #include "chrome/common/desktop_notifications/active_notification_tracker.h"
 
 #include "base/message_loop.h"
-#include "base/scoped_ptr.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNotification.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNotificationPermissionCallback.h"
 
diff --git a/chrome/common/net/gaia/gaia_authenticator2.h b/chrome/common/net/gaia/gaia_authenticator2.h
index 0e6c203c..ac44efa 100644
--- a/chrome/common/net/gaia/gaia_authenticator2.h
+++ b/chrome/common/net/gaia/gaia_authenticator2.h
@@ -8,7 +8,6 @@
 #include <string>
 
 #include "base/gtest_prod_util.h"
-#include "base/scoped_ptr.h"
 #include "chrome/common/net/gaia/gaia_auth_consumer.h"
 #include "chrome/common/net/url_fetcher.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/renderer/gpu_channel_host.h b/chrome/renderer/gpu_channel_host.h
index d697fd1..4b982bf 100644
--- a/chrome/renderer/gpu_channel_host.h
+++ b/chrome/renderer/gpu_channel_host.h
@@ -8,7 +8,6 @@
 #include <string>
 
 #include "base/hash_tables.h"
-#include "base/scoped_ptr.h"
 #include "chrome/common/message_router.h"
 #include "gfx/native_widget_types.h"
 #include "gfx/size.h"
diff --git a/chrome/service/cloud_print/job_status_updater.h b/chrome/service/cloud_print/job_status_updater.h
index 68c0fc8..ed4ab21 100644
--- a/chrome/service/cloud_print/job_status_updater.h
+++ b/chrome/service/cloud_print/job_status_updater.h
@@ -9,7 +9,6 @@
 
 #include "base/file_path.h"
 #include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
 #include "base/thread.h"
 #include "chrome/service/cloud_print/print_system.h"
 #include "chrome/common/net/url_fetcher.h"
diff --git a/chrome/service/service_process.h b/chrome/service/service_process.h
index bbd30e8..2dfb413 100644
--- a/chrome/service/service_process.h
+++ b/chrome/service/service_process.h
@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
 #include "base/thread.h"
 
 class CloudPrintProxy;