Remove task.h and finish base::Bind() migration.

Over 341 CLs, in ~3 months, touching 3251 unique files!

Top 5 most CLs:
(121) jhawkins
( 45)   dcheng
( 24)  achuith
( 23)    csilv
( 12)  tfarina
( 12)    groby

~1000 files touched:
(918) jhawkins

100+ files touched:
(486)   ajwong
(385) willchan
(372)   dcheng
(126)    csilv
(123) fischman
(112)  sergeyu

49+ files touched:
(65)   tfarina
(57)  acolwell
(52)     adamk
(49)      tzik

BUG=35223
TEST=existing

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

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

26 files changed, 12 insertions, 29 deletions

diff --git a/content/browser/browser_thread_unittest.cc b/content/browser/browser_thread_unittest.cc
index 458f872..6bb8e5a 100644
--- a/content/browser/browser_thread_unittest.cc
+++ b/content/browser/browser_thread_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
@@ -38,9 +39,6 @@ class BrowserThreadTest : public testing::Test {
     message_loop->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   }
 
-  static void DoNothing() {
-  }
-
   class DeletedOnFile
       : public base::RefCountedThreadSafe<
             DeletedOnFile, BrowserThread::DeleteOnFileThread> {
@@ -119,7 +117,7 @@ TEST_F(BrowserThreadTest, PostTaskAndReply) {
   ASSERT_TRUE(BrowserThread::PostTaskAndReply(
       BrowserThread::FILE,
       FROM_HERE,
-      base::Bind(&BrowserThreadTest::DoNothing),
+      base::Bind(&base::DoNothing),
       base::Bind(&MessageLoop::Quit,
                  base::Unretained(MessageLoop::current()->current()))));
   MessageLoop::current()->Run();
diff --git a/content/browser/device_orientation/provider_unittest.cc b/content/browser/device_orientation/provider_unittest.cc
index bcfc175..12ea290 100644
--- a/content/browser/device_orientation/provider_unittest.cc
+++ b/content/browser/device_orientation/provider_unittest.cc
@@ -6,7 +6,6 @@
 
 #include "base/message_loop.h"
 #include "base/synchronization/lock.h"
-#include "base/task.h"
 #include "content/browser/device_orientation/data_fetcher.h"
 #include "content/browser/device_orientation/orientation.h"
 #include "content/browser/device_orientation/provider.h"
diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc
index 09371a3..159358b 100644
--- a/content/browser/download/download_manager_impl.cc
+++ b/content/browser/download/download_manager_impl.cc
@@ -8,6 +8,7 @@
 
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/debug/alias.h"
 #include "base/file_util.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
diff --git a/content/browser/download/save_package.h b/content/browser/download/save_package.h
index 292fd3a..3b7b495 100644
--- a/content/browser/download/save_package.h
+++ b/content/browser/download/save_package.h
@@ -16,7 +16,6 @@
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "base/task.h"
 #include "base/time.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/download_item.h"
diff --git a/content/browser/gamepad/gamepad_provider.cc b/content/browser/gamepad/gamepad_provider.cc
index 6af245c..29492fa 100644
--- a/content/browser/gamepad/gamepad_provider.cc
+++ b/content/browser/gamepad/gamepad_provider.cc
@@ -9,7 +9,6 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/task.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/gamepad/gamepad_provider.h b/content/browser/gamepad/gamepad_provider.h
index 963e768..f0e25de 100644
--- a/content/browser/gamepad/gamepad_provider.h
+++ b/content/browser/gamepad/gamepad_provider.h
@@ -11,7 +11,6 @@
 #include "base/shared_memory.h"
 #include "base/synchronization/lock.h"
 #include "base/system_monitor/system_monitor.h"
-#include "base/task.h"
 #include "content/browser/gamepad/data_fetcher.h"
 #include "content/common/content_export.h"
 #include "content/common/gamepad_hardware_buffer.h"
diff --git a/content/browser/geolocation/device_data_provider.h b/content/browser/geolocation/device_data_provider.h
index 4466f91..2951f70 100644
--- a/content/browser/geolocation/device_data_provider.h
+++ b/content/browser/geolocation/device_data_provider.h
@@ -33,7 +33,6 @@
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
-#include "base/task.h"
 #include "base/threading/non_thread_safe.h"
 #include "content/common/content_export.h"
 
diff --git a/content/browser/geolocation/gps_location_provider_linux.h b/content/browser/geolocation/gps_location_provider_linux.h
index cda7337..472d0a5 100644
--- a/content/browser/geolocation/gps_location_provider_linux.h
+++ b/content/browser/geolocation/gps_location_provider_linux.h
@@ -14,7 +14,6 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/task.h"
 #include "content/browser/geolocation/location_provider.h"
 #include "content/common/content_export.h"
 #include "content/common/geoposition.h"
diff --git a/content/browser/geolocation/mock_location_provider.cc b/content/browser/geolocation/mock_location_provider.cc
index 22b4c30..756b926 100644
--- a/content/browser/geolocation/mock_location_provider.cc
+++ b/content/browser/geolocation/mock_location_provider.cc
@@ -11,9 +11,9 @@
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
-#include "base/task.h"
 
 MockLocationProvider* MockLocationProvider::instance_ = NULL;
 
diff --git a/content/browser/geolocation/wifi_data_provider_common.h b/content/browser/geolocation/wifi_data_provider_common.h
index eda08e3..7571cb1 100644
--- a/content/browser/geolocation/wifi_data_provider_common.h
+++ b/content/browser/geolocation/wifi_data_provider_common.h
@@ -12,7 +12,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
-#include "base/task.h"
 #include "base/threading/thread.h"
 #include "content/browser/geolocation/device_data_provider.h"
 #include "content/common/content_export.h"
diff --git a/content/browser/geolocation/win7_location_provider_win.h b/content/browser/geolocation/win7_location_provider_win.h
index 276015b..ed96275 100644
--- a/content/browser/geolocation/win7_location_provider_win.h
+++ b/content/browser/geolocation/win7_location_provider_win.h
@@ -8,7 +8,6 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/task.h"
 #include "content/browser/geolocation/location_provider.h"
 #include "content/browser/geolocation/win7_location_api_win.h"
 #include "content/common/content_export.h"
diff --git a/content/browser/gpu/gpu_data_manager.h b/content/browser/gpu/gpu_data_manager.h
index 568b969..bf04036 100644
--- a/content/browser/gpu/gpu_data_manager.h
+++ b/content/browser/gpu/gpu_data_manager.h
@@ -14,7 +14,6 @@
 #include "base/memory/singleton.h"
 #include "base/observer_list_threadsafe.h"
 #include "base/synchronization/lock.h"
-#include "base/task.h"
 #include "base/values.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/gpu_feature_flags.h"
diff --git a/content/browser/in_process_webkit/dom_storage_area.cc b/content/browser/in_process_webkit/dom_storage_area.cc
index 3079e43..cb69f17 100644
--- a/content/browser/in_process_webkit/dom_storage_area.cc
+++ b/content/browser/in_process_webkit/dom_storage_area.cc
@@ -4,7 +4,7 @@
 
 #include "content/browser/in_process_webkit/dom_storage_area.h"
 
-#include "base/task.h"
+#include "base/logging.h"
 #include "content/browser/in_process_webkit/dom_storage_context.h"
 #include "content/browser/in_process_webkit/dom_storage_namespace.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
diff --git a/content/browser/in_process_webkit/indexed_db_context.cc b/content/browser/in_process_webkit/indexed_db_context.cc
index 8afd98c..0d1c818 100644
--- a/content/browser/in_process_webkit/indexed_db_context.cc
+++ b/content/browser/in_process_webkit/indexed_db_context.cc
@@ -10,7 +10,6 @@
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "base/string_util.h"
-#include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/in_process_webkit/indexed_db_quota_client.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
diff --git a/content/browser/net/url_request_abort_on_end_job.cc b/content/browser/net/url_request_abort_on_end_job.cc
index 609d7bb..4d3bad7 100644
--- a/content/browser/net/url_request_abort_on_end_job.cc
+++ b/content/browser/net/url_request_abort_on_end_job.cc
@@ -8,7 +8,6 @@
 
 #include "base/compiler_specific.h"
 #include "base/string_util.h"
-#include "base/task.h"
 #include "content/browser/net/url_request_abort_on_end_job.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/io_buffer.h"
diff --git a/content/browser/plugin_service_impl_browsertest.cc b/content/browser/plugin_service_impl_browsertest.cc
index 2fc2ca3..dbf3fee 100644
--- a/content/browser/plugin_service_impl_browsertest.cc
+++ b/content/browser/plugin_service_impl_browsertest.cc
@@ -5,6 +5,7 @@
 #include "content/browser/plugin_service_impl.h"
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "chrome/browser/ui/browser.h"
@@ -148,8 +149,6 @@ class MockCanceledPluginServiceClient : public PluginProcessHost::Client {
   DISALLOW_COPY_AND_ASSIGN(MockCanceledPluginServiceClient);
 };
 
-void DoNothing() {}
-
 void QuitUIMessageLoopFromIOThread() {
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           MessageLoop::QuitClosure());
@@ -168,7 +167,7 @@ void OpenChannelAndThenCancel(PluginProcessHost::Client* client) {
   // the UI thread to stop and exit the test.
   BrowserThread::PostTaskAndReply(
       BrowserThread::FILE, FROM_HERE,
-      base::Bind(&DoNothing),
+      base::Bind(&base::DoNothing),
       base::Bind(&QuitUIMessageLoopFromIOThread));
 }
 
diff --git a/content/browser/renderer_host/async_resource_handler.cc b/content/browser/renderer_host/async_resource_handler.cc
index 6074fe9..cc75155 100644
--- a/content/browser/renderer_host/async_resource_handler.cc
+++ b/content/browser/renderer_host/async_resource_handler.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <vector>
 
+#include "base/debug/alias.h"
 #include "base/hash_tables.h"
 #include "base/logging.h"
 #include "base/shared_memory.h"
diff --git a/content/browser/renderer_host/gpu_message_filter.h b/content/browser/renderer_host/gpu_message_filter.h
index bb5f5b9..7d5b91e 100644
--- a/content/browser/renderer_host/gpu_message_filter.h
+++ b/content/browser/renderer_host/gpu_message_filter.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "base/message_loop_helpers.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "content/public/browser/browser_message_filter.h"
diff --git a/content/browser/renderer_host/media/media_stream_device_settings.cc b/content/browser/renderer_host/media/media_stream_device_settings.cc
index 433f3c2..ecfcc3e 100644
--- a/content/browser/renderer_host/media/media_stream_device_settings.cc
+++ b/content/browser/renderer_host/media/media_stream_device_settings.cc
@@ -5,7 +5,6 @@
 #include "content/browser/renderer_host/media/media_stream_device_settings.h"
 
 #include "base/stl_util.h"
-#include "base/task.h"
 #include "content/browser/renderer_host/media/media_stream_settings_requester.h"
 #include "content/common/media/media_stream_options.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/renderer_host/media/video_capture_controller.h b/content/browser/renderer_host/media/video_capture_controller.h
index aa7e470..2faa29d 100644
--- a/content/browser/renderer_host/media/video_capture_controller.h
+++ b/content/browser/renderer_host/media/video_capture_controller.h
@@ -23,7 +23,6 @@
 #include "base/memory/ref_counted.h"
 #include "base/process.h"
 #include "base/synchronization/lock.h"
-#include "base/task.h"
 #include "content/browser/renderer_host/media/video_capture_controller_event_handler.h"
 #include "content/common/media/video_capture.h"
 #include "media/video/capture/video_capture.h"
diff --git a/content/browser/renderer_host/redirect_to_file_resource_handler.cc b/content/browser/renderer_host/redirect_to_file_resource_handler.cc
index b24ed44..1c10a3e 100644
--- a/content/browser/renderer_host/redirect_to_file_resource_handler.cc
+++ b/content/browser/renderer_host/redirect_to_file_resource_handler.cc
@@ -10,7 +10,6 @@
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "base/platform_file.h"
-#include "base/task.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/public/common/resource_response.h"
 #include "net/base/file_stream.h"
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 91c5795..37bc99e 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -9,6 +9,7 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
+#include "base/debug/alias.h"
 #include "base/file_util.h"
 #include "base/process_util.h"
 #include "base/sys_string_conversions.h"
diff --git a/content/browser/renderer_host/render_process_host_browsertest.cc b/content/browser/renderer_host/render_process_host_browsertest.cc
index d69383c..4d4676d 100644
--- a/content/browser/renderer_host/render_process_host_browsertest.cc
+++ b/content/browser/renderer_host/render_process_host_browsertest.cc
@@ -5,6 +5,7 @@
 #include "content/browser/renderer_host/render_process_host_browsertest.h"
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/process.h"
 #include "chrome/browser/ui/browser.h"
@@ -37,8 +38,6 @@ void PostQuit(MessageLoop* loop) {
   loop->PostTask(FROM_HERE, MessageLoop::QuitClosure());
 }
 
-void DoNothing() {}
-
 // Show a tab, activating the current one if there is one, and wait for
 // the renderer process to be created or foregrounded, returning the process
 // handle.
@@ -50,7 +49,7 @@ base::ProcessHandle RenderProcessHostTest::ShowSingletonTab(const GURL& page) {
   // Ensure that the backgrounding / foregrounding gets a chance to run.
   content::BrowserThread::PostTaskAndReply(
       content::BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
-      base::Bind(DoNothing), MessageLoop::QuitClosure());
+      base::Bind(&base::DoNothing), MessageLoop::QuitClosure());
   MessageLoop::current()->Run();
 
   return wc->GetRenderProcessHost()->GetHandle();
diff --git a/content/browser/speech/endpointer/endpointer_unittest.cc b/content/browser/speech/endpointer/endpointer_unittest.cc
index 3d1583e..b71c01a 100644
--- a/content/browser/speech/endpointer/endpointer_unittest.cc
+++ b/content/browser/speech/endpointer/endpointer_unittest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/task.h"
 #include "content/browser/speech/endpointer/endpointer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/content/browser/tab_contents/web_drag_source_mac.mm b/content/browser/tab_contents/web_drag_source_mac.mm
index d0922a03..4c1dedf 100644
--- a/content/browser/tab_contents/web_drag_source_mac.mm
+++ b/content/browser/tab_contents/web_drag_source_mac.mm
@@ -11,7 +11,6 @@
 #include "base/pickle.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
-#include "base/task.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
diff --git a/content/browser/worker_host/message_port_service.h b/content/browser/worker_host/message_port_service.h
index 1fd97e8..11621c8 100644
--- a/content/browser/worker_host/message_port_service.h
+++ b/content/browser/worker_host/message_port_service.h
@@ -13,7 +13,6 @@
 #include "base/basictypes.h"
 #include "base/memory/singleton.h"
 #include "base/string16.h"
-#include "base/task.h"
 #include "ipc/ipc_message.h"
 
 class WorkerMessageFilter;