diff options
245 files changed, 160 insertions, 352 deletions
diff --git a/ash/shell.h b/ash/shell.h index 88951e8..3881712 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -13,7 +13,6 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" -#include "base/task.h" #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" diff --git a/base/at_exit.cc b/base/at_exit.cc index 38e8bbe..0fba355 100644 --- a/base/at_exit.cc +++ b/base/at_exit.cc @@ -8,8 +8,8 @@ #include <ostream> #include "base/bind.h" +#include "base/callback.h" #include "base/logging.h" -#include "base/task.h" namespace base { diff --git a/base/base.gyp b/base/base.gyp index a5c045c..b3262b5 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -127,6 +127,7 @@ 'at_exit_unittest.cc', 'atomicops_unittest.cc', 'base64_unittest.cc', + 'bind_helpers_unittest.cc', 'bind_unittest.cc', 'bind_unittest.nc', 'bits_unittest.cc', @@ -219,7 +220,6 @@ 'sys_string_conversions_mac_unittest.mm', 'sys_string_conversions_unittest.cc', 'system_monitor/system_monitor_unittest.cc', - 'task_unittest.cc', 'template_util_unittest.cc', 'test/trace_event_analyzer_unittest.cc', 'threading/non_thread_safe_unittest.cc', diff --git a/base/base.gypi b/base/base.gypi index 8ffde65..3c02234 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -51,6 +51,7 @@ 'base_switches.h', 'basictypes.h', 'bind.h', + 'bind_helpers.cc', 'bind_helpers.h', 'bind_internal.h', 'bind_internal_win.h', @@ -304,8 +305,6 @@ 'sys_string_conversions_mac.mm', 'sys_string_conversions_posix.cc', 'sys_string_conversions_win.cc', - 'task.cc', - 'task.h', 'template_util.h', 'threading/non_thread_safe.h', 'threading/non_thread_safe_impl.cc', diff --git a/base/task.cc b/base/bind_helpers.cc index baf4e0f6..f2fc3bb 100644 --- a/base/task.cc +++ b/base/bind_helpers.cc @@ -2,10 +2,15 @@ // 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 "base/bind_helpers.h" + +#include "base/callback.h" namespace base { +void DoNothing() { +} + ScopedClosureRunner::ScopedClosureRunner(const Closure& closure) : closure_(closure) { } diff --git a/base/bind_helpers.h b/base/bind_helpers.h index af6ff26..ae2a63c 100644 --- a/base/bind_helpers.h +++ b/base/bind_helpers.h @@ -6,7 +6,13 @@ // can be used specify the refcounting and reference semantics of arguments // that are bound by the Bind() function in base/bind.h. // -// The public functions are base::Unretained(), base::Owned(), bass::Passed(), +// It also defines a set of simple functions and utilities that people want +// when using Callback<> and Bind(). +// +// +// ARGUMENT BINDING WRAPPERS +// +// The wrapper functions are base::Unretained(), base::Owned(), bass::Passed(), // base::ConstRef(), and base::IgnoreResult(). // // Unretained() allows Bind() to bind a non-refcounted class, and to disable @@ -124,6 +130,19 @@ // ownership of an argument into a task, but don't necessarily know if the // task will always be executed. This can happen if the task is cancellable // or if it is posted to a MessageLoopProxy. +// +// +// SIMPLE FUNCTIONS AND UTILITIES. +// +// DoNothing() - Useful for creating a Closure that does nothing when called. +// DeletePointer<T>() - Useful for creating a Closure that will delete a +// pointer when invoked. Only use this when necessary. +// In most cases MessageLoop::DeleteSoon() is a better +// fit. +// ScopedClosureRunner - Scoper object that runs the wrapped closure when it +// goes out of scope. It's conceptually similar to +// scoped_ptr<> but calls Run() instead of deleting +// the pointer. #ifndef BASE_BIND_HELPERS_H_ #define BASE_BIND_HELPERS_H_ @@ -517,6 +536,28 @@ IgnoreResult(const Callback<T>& data) { return internal::IgnoreResultHelper<Callback<T> >(data); } +BASE_EXPORT void DoNothing(); + +template<typename T> +void DeletePointer(T* obj) { + delete obj; +} + +// ScopedClosureRunner is akin to scoped_ptr for Closures. It ensures that the +// Closure is executed and deleted no matter how the current scope exits. +class BASE_EXPORT ScopedClosureRunner { + public: + explicit ScopedClosureRunner(const Closure& closure); + ~ScopedClosureRunner(); + + Closure Release(); + + private: + Closure closure_; + + DISALLOW_IMPLICIT_CONSTRUCTORS(ScopedClosureRunner); +}; + } // namespace base #endif // BASE_BIND_HELPERS_H_ diff --git a/base/task_unittest.cc b/base/bind_helpers_unittest.cc index 1fcbfa9..3ef2d75 100644 --- a/base/task_unittest.cc +++ b/base/bind_helpers_unittest.cc @@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/bind_helpers.h" + +#include "base/callback.h" #include "base/bind.h" -#include "base/memory/ref_counted.h" -#include "base/task.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -13,7 +14,7 @@ void Increment(int* value) { (*value)++; } -TEST(TaskTest, TestScopedClosureRunnerExitScope) { +TEST(BindHelpersTest, TestScopedClosureRunnerExitScope) { int run_count = 0; { base::ScopedClosureRunner runner(base::Bind(&Increment, &run_count)); @@ -22,7 +23,7 @@ TEST(TaskTest, TestScopedClosureRunnerExitScope) { EXPECT_EQ(1, run_count); } -TEST(TaskTest, TestScopedClosureRunnerRelease) { +TEST(BindHelpersTest, TestScopedClosureRunnerRelease) { int run_count = 0; base::Closure c; { diff --git a/base/files/file_path_watcher_linux.cc b/base/files/file_path_watcher_linux.cc index 9711766..be4e760 100644 --- a/base/files/file_path_watcher_linux.cc +++ b/base/files/file_path_watcher_linux.cc @@ -28,7 +28,6 @@ #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/synchronization/lock.h" -#include "base/task.h" #include "base/threading/thread.h" namespace base { diff --git a/base/message_loop.h b/base/message_loop.h index edaa71a..e14baa7 100644 --- a/base/message_loop.h +++ b/base/message_loop.h @@ -20,7 +20,6 @@ #include "base/observer_list.h" #include "base/pending_task.h" #include "base/synchronization/lock.h" -#include "base/task.h" #include "base/tracking_info.h" #include "base/time.h" diff --git a/base/message_loop_proxy.h b/base/message_loop_proxy.h index ef1f658..4487775 100644 --- a/base/message_loop_proxy.h +++ b/base/message_loop_proxy.h @@ -11,7 +11,6 @@ #include "base/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/message_loop_helpers.h" -#include "base/task.h" namespace tracked_objects { class Location; diff --git a/base/message_loop_unittest.cc b/base/message_loop_unittest.cc index e528286..9cf4400 100644 --- a/base/message_loop_unittest.cc +++ b/base/message_loop_unittest.cc @@ -11,7 +11,6 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" -#include "base/task.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/base/message_pump_glib_unittest.cc b/base/message_pump_glib_unittest.cc index 467088c..c709355 100644 --- a/base/message_pump_glib_unittest.cc +++ b/base/message_pump_glib_unittest.cc @@ -141,10 +141,6 @@ GSourceFuncs EventInjector::SourceFuncs = { NULL }; -// Does nothing. This function can be called from a task. -void DoNothing() { -} - void IncrementInt(int *value) { ++*value; } @@ -211,24 +207,24 @@ TEST_F(MessagePumpGLibTest, TestEventTaskInterleave) { // If changes cause this test to fail, it is reasonable to change it, but // TestWorkWhileWaitingForEvents and TestEventsWhileWaitingForWork have to be // changed accordingly, otherwise they can become flaky. - injector()->AddEventAsTask(0, base::Bind(&DoNothing)); + injector()->AddEventAsTask(0, base::Bind(&base::DoNothing)); base::Closure check_task = base::Bind(&ExpectProcessedEvents, base::Unretained(injector()), 2); base::Closure posted_task = base::Bind(&PostMessageLoopTask, FROM_HERE, check_task); injector()->AddEventAsTask(0, posted_task); - injector()->AddEventAsTask(0, base::Bind(&DoNothing)); + injector()->AddEventAsTask(0, base::Bind(&base::DoNothing)); injector()->AddEvent(0, MessageLoop::QuitClosure()); loop()->Run(); EXPECT_EQ(4, injector()->processed_events()); injector()->Reset(); - injector()->AddEventAsTask(0, base::Bind(&DoNothing)); + injector()->AddEventAsTask(0, base::Bind(&base::DoNothing)); check_task = base::Bind(&ExpectProcessedEvents, base::Unretained(injector()), 2); posted_task = base::Bind(&PostMessageLoopTask, FROM_HERE, check_task); injector()->AddEventAsTask(0, posted_task); - injector()->AddEventAsTask(10, base::Bind(&DoNothing)); + injector()->AddEventAsTask(10, base::Bind(&base::DoNothing)); injector()->AddEvent(0, MessageLoop::QuitClosure()); loop()->Run(); EXPECT_EQ(4, injector()->processed_events()); @@ -384,8 +380,8 @@ void AddEventsAndDrainGLib(EventInjector* injector) { injector->AddEvent(0, MessageLoop::QuitClosure()); // Post a couple of dummy tasks - MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&DoNothing)); - MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&DoNothing)); + MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&base::DoNothing)); + MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&base::DoNothing)); // Drain the events while (g_main_context_pending(NULL)) { @@ -417,8 +413,8 @@ void AddEventsAndDrainGtk(EventInjector* injector) { injector->AddEvent(0, MessageLoop::QuitClosure()); // Post a couple of dummy tasks - MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&DoNothing)); - MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&DoNothing)); + MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&base::DoNothing)); + MessageLoop::current()->PostTask(FROM_HERE, base::Bind(&base::DoNothing)); // Drain the events while (gtk_events_pending()) { diff --git a/base/observer_list_threadsafe.h b/base/observer_list_threadsafe.h index 9acb82a..c24e96a 100644 --- a/base/observer_list_threadsafe.h +++ b/base/observer_list_threadsafe.h @@ -17,7 +17,6 @@ #include "base/message_loop.h" #include "base/message_loop_proxy.h" #include "base/observer_list.h" -#include "base/task.h" #include "base/threading/platform_thread.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/base/task.h b/base/task.h deleted file mode 100644 index dbef70b..0000000 --- a/base/task.h +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (c) 2012 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. - -// ============================================================================ -// **************************************************************************** -// * THIS HEADER IS DEPRECATED, SEE base/callback.h FOR NEW IMPLEMENTATION * -// **************************************************************************** -// ============================================================================ -// ============================================================================ -// **************************************************************************** -// * THIS HEADER IS DEPRECATED, SEE base/callback.h FOR NEW IMPLEMENTATION * -// **************************************************************************** -// ============================================================================ -// ============================================================================ -// **************************************************************************** -// * THIS HEADER IS DEPRECATED, SEE base/callback.h FOR NEW IMPLEMENTATION * -// **************************************************************************** -// ============================================================================ -// ============================================================================ -// **************************************************************************** -// * THIS HEADER IS DEPRECATED, SEE base/callback.h FOR NEW IMPLEMENTATION * -// **************************************************************************** -// ============================================================================ -// ============================================================================ -// **************************************************************************** -// * THIS HEADER IS DEPRECATED, SEE base/callback.h FOR NEW IMPLEMENTATION * -// **************************************************************************** -// ============================================================================ -#ifndef BASE_TASK_H_ -#define BASE_TASK_H_ -#pragma once - -#include "base/base_export.h" -#include "base/callback.h" -#include "base/debug/alias.h" -#include "base/memory/raw_scoped_refptr_mismatch_checker.h" -#include "base/memory/weak_ptr.h" -#include "base/tuple.h" - -namespace base { -const size_t kDeadTask = 0xDEAD7A53; -} - -template<typename T> -void DeletePointer(T* obj) { - delete obj; -} - -namespace base { - -// ScopedClosureRunner is akin to scoped_ptr for Closures. It ensures that the -// Closure is executed and deleted no matter how the current scope exits. -class BASE_EXPORT ScopedClosureRunner { - public: - explicit ScopedClosureRunner(const Closure& closure); - ~ScopedClosureRunner(); - - Closure Release(); - - private: - Closure closure_; - - DISALLOW_IMPLICIT_CONSTRUCTORS(ScopedClosureRunner); -}; - -} // namespace base - -#endif // BASE_TASK_H_ diff --git a/base/threading/worker_pool_posix.cc b/base/threading/worker_pool_posix.cc index 2655b85c..c139ffa 100644 --- a/base/threading/worker_pool_posix.cc +++ b/base/threading/worker_pool_posix.cc @@ -5,12 +5,12 @@ #include "base/threading/worker_pool_posix.h" #include "base/bind.h" +#include "base/callback.h" #include "base/debug/trace_event.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/stringprintf.h" -#include "base/task.h" #include "base/threading/platform_thread.h" #include "base/threading/worker_pool.h" #include "base/tracked_objects.h" diff --git a/base/threading/worker_pool_unittest.cc b/base/threading/worker_pool_unittest.cc index d36cb1b..4be06d3 100644 --- a/base/threading/worker_pool_unittest.cc +++ b/base/threading/worker_pool_unittest.cc @@ -8,7 +8,6 @@ #include "base/bind_helpers.h" #include "base/location.h" #include "base/message_loop.h" -#include "base/task.h" #include "base/test/test_timeouts.h" #include "base/time.h" #include "base/threading/thread_checker_impl.h" diff --git a/base/threading/worker_pool_win.cc b/base/threading/worker_pool_win.cc index d4249ea..9f7c19f 100644 --- a/base/threading/worker_pool_win.cc +++ b/base/threading/worker_pool_win.cc @@ -5,10 +5,10 @@ #include "base/threading/worker_pool.h" #include "base/bind.h" +#include "base/callback.h" #include "base/debug/trace_event.h" #include "base/logging.h" #include "base/pending_task.h" -#include "base/task.h" #include "base/tracked_objects.h" namespace base { diff --git a/base/timer_unittest.cc b/base/timer_unittest.cc index a31f7ba..d4b666f 100644 --- a/base/timer_unittest.cc +++ b/base/timer_unittest.cc @@ -4,7 +4,6 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/task.h" #include "base/timer.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/autocomplete_history_manager_unittest.cc b/chrome/browser/autocomplete_history_manager_unittest.cc index b08f7f5..83f27c3 100644 --- a/chrome/browser/autocomplete_history_manager_unittest.cc +++ b/chrome/browser/autocomplete_history_manager_unittest.cc @@ -6,7 +6,6 @@ #include "base/memory/ref_counted.h" #include "base/string16.h" -#include "base/task.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete_history_manager.h" #include "chrome/browser/autofill/autofill_external_delegate.h" diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index f33ca73..85c7f3a 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -22,7 +22,6 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/synchronization/waitable_event.h" -#include "base/task.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/automation/ui_controls_internal_win.cc b/chrome/browser/automation/ui_controls_internal_win.cc index 76be27f..39925cf 100644 --- a/chrome/browser/automation/ui_controls_internal_win.cc +++ b/chrome/browser/automation/ui_controls_internal_win.cc @@ -9,7 +9,6 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" -#include "base/task.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" diff --git a/chrome/browser/automation/url_request_automation_job.h b/chrome/browser/automation/url_request_automation_job.h index 096ce06..72ab6bb 100644 --- a/chrome/browser/automation/url_request_automation_job.h +++ b/chrome/browser/automation/url_request_automation_job.h @@ -8,7 +8,6 @@ #pragma once #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "chrome/common/ref_counted_util.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" diff --git a/chrome/browser/background/background_contents_service.h b/chrome/browser/background/background_contents_service.h index 5e8062a..b45112c 100644 --- a/chrome/browser/background/background_contents_service.h +++ b/chrome/browser/background/background_contents_service.h @@ -12,7 +12,6 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" -#include "base/task.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "chrome/browser/tab_contents/background_contents.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/background/background_mode_manager_gtk.cc b/chrome/browser/background/background_mode_manager_gtk.cc index 27923fc..26f2b1e 100644 --- a/chrome/browser/background/background_mode_manager_gtk.cc +++ b/chrome/browser/background/background_mode_manager_gtk.cc @@ -11,7 +11,6 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/nix/xdg_util.h" -#include "base/task.h" #include "chrome/browser/background/background_mode_manager.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/ui/gtk/gtk_util.h" diff --git a/chrome/browser/background/background_mode_manager_win.cc b/chrome/browser/background/background_mode_manager_win.cc index a27632a..63e846f 100644 --- a/chrome/browser/background/background_mode_manager_win.cc +++ b/chrome/browser/background/background_mode_manager_win.cc @@ -8,7 +8,6 @@ #include "base/file_path.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/task.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" #include "chrome/browser/background/background_mode_manager.h" diff --git a/chrome/browser/browsing_data_quota_helper_impl.h b/chrome/browser/browsing_data_quota_helper_impl.h index d436449..26071b9 100644 --- a/chrome/browser/browsing_data_quota_helper_impl.h +++ b/chrome/browser/browsing_data_quota_helper_impl.h @@ -14,6 +14,7 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "base/memory/weak_ptr.h" #include "base/time.h" #include "chrome/browser/browsing_data_quota_helper.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/cancelable_request.h b/chrome/browser/cancelable_request.h index ae57ba5..9e7c5a4 100644 --- a/chrome/browser/cancelable_request.h +++ b/chrome/browser/cancelable_request.h @@ -102,7 +102,6 @@ #include "base/message_loop.h" #include "base/synchronization/cancellation_flag.h" #include "base/synchronization/lock.h" -#include "base/task.h" #include "build/build_config.h" class CancelableRequestBase; diff --git a/chrome/browser/chromeos/disks/disk_mount_manager.cc b/chrome/browser/chromeos/disks/disk_mount_manager.cc index e04abcb..e831ccf 100644 --- a/chrome/browser/chromeos/disks/disk_mount_manager.cc +++ b/chrome/browser/chromeos/disks/disk_mount_manager.cc @@ -10,6 +10,7 @@ #include <sys/statvfs.h> #include "base/bind.h" +#include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/string_util.h" #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" @@ -72,7 +73,7 @@ class DiskMountManagerImpl : public DiskMountManager { type, // When succeeds, OnMountCompleted will be called by // "MountCompleted" signal instead. - base::Bind(&DoNothing), + base::Bind(&base::DoNothing), base::Bind(&DiskMountManagerImpl::OnMountCompleted, weak_ptr_factory_.GetWeakPtr(), MOUNT_ERROR_INTERNAL, @@ -87,7 +88,7 @@ class DiskMountManagerImpl : public DiskMountManager { cros_disks_client_->Unmount(mount_path, base::Bind(&DiskMountManagerImpl::OnUnmountPath, weak_ptr_factory_.GetWeakPtr()), - base::Bind(&DoNothing)); + base::Bind(&base::DoNothing)); } // DiskMountManager override. @@ -219,7 +220,7 @@ class DiskMountManagerImpl : public DiskMountManager { cros_disks_client_->EnumerateAutoMountableDevices( base::Bind(&DiskMountManagerImpl::OnRequestMountInfo, weak_ptr_factory_.GetWeakPtr()), - base::Bind(&DoNothing)); + base::Bind(&base::DoNothing)); } // DiskMountManager override. @@ -395,7 +396,7 @@ class DiskMountManagerImpl : public DiskMountManager { devices[i], base::Bind(&DiskMountManagerImpl::OnGetDeviceProperties, weak_ptr_factory_.GetWeakPtr()), - base::Bind(&DoNothing)); + base::Bind(&base::DoNothing)); } } // Search and remove disks that are no longer present. @@ -422,7 +423,7 @@ class DiskMountManagerImpl : public DiskMountManager { device_path, base::Bind(&DiskMountManagerImpl::OnGetDeviceProperties, weak_ptr_factory_.GetWeakPtr()), - base::Bind(&DoNothing)); + base::Bind(&base::DoNothing)); return; } case DISK_REMOVED: { @@ -526,10 +527,6 @@ class DiskMountManagerImpl : public DiskMountManager { return EmptyString(); } - // A function to be used as an empty callback. - static void DoNothing() { - } - // Mount event change observers. ObserverList<Observer> observers_; diff --git a/chrome/browser/chromeos/external_metrics.h b/chrome/browser/chromeos/external_metrics.h index 55b0f7a..afbabe3 100644 --- a/chrome/browser/chromeos/external_metrics.h +++ b/chrome/browser/chromeos/external_metrics.h @@ -11,7 +11,7 @@ #include "base/file_path.h" #include "base/gtest_prod_util.h" #include "base/hash_tables.h" -#include "base/task.h" +#include "base/memory/ref_counted.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h index b22c057..ec36479 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.h +++ b/chrome/browser/chromeos/login/existing_user_controller.h @@ -14,7 +14,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/string16.h" -#include "base/task.h" #include "base/timer.h" #include "chrome/browser/chromeos/login/captcha_view.h" #include "chrome/browser/chromeos/login/login_display.h" diff --git a/chrome/browser/chromeos/login/login_performer.h b/chrome/browser/chromeos/login/login_performer.h index e45136a..08343cc 100644 --- a/chrome/browser/chromeos/login/login_performer.h +++ b/chrome/browser/chromeos/login/login_performer.h @@ -10,7 +10,6 @@ #include "base/basictypes.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "chrome/browser/chromeos/login/authenticator.h" #include "chrome/browser/chromeos/login/login_status_consumer.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/chromeos/login/mock_url_fetchers.h b/chrome/browser/chromeos/login/mock_url_fetchers.h index 44254dc..02a33a0 100644 --- a/chrome/browser/chromeos/login/mock_url_fetchers.h +++ b/chrome/browser/chromeos/login/mock_url_fetchers.h @@ -11,7 +11,6 @@ #include "base/memory/weak_ptr.h" #include "base/compiler_specific.h" #include "base/message_loop.h" -#include "base/task.h" #include "content/test/test_url_fetcher_factory.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/chromeos/login/network_screen.h b/chrome/browser/chromeos/login/network_screen.h index 04c6ab6..483bdc1 100644 --- a/chrome/browser/chromeos/login/network_screen.h +++ b/chrome/browser/chromeos/login/network_screen.h @@ -9,7 +9,6 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/string16.h" -#include "base/task.h" #include "base/timer.h" #include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/chromeos/login/language_switch_menu.h" diff --git a/chrome/browser/chromeos/login/tpm_password_fetcher.h b/chrome/browser/chromeos/login/tpm_password_fetcher.h index b30783d..326e942 100644 --- a/chrome/browser/chromeos/login/tpm_password_fetcher.h +++ b/chrome/browser/chromeos/login/tpm_password_fetcher.h @@ -9,7 +9,6 @@ #include "base/basictypes.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc index f56f299..be6fc80 100644 --- a/chrome/browser/chromeos/login/user_manager.cc +++ b/chrome/browser/chromeos/login/user_manager.cc @@ -19,7 +19,6 @@ #include "base/rand_util.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/task.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/chromeos/net/network_change_notifier_chromeos.h b/chrome/browser/chromeos/net/network_change_notifier_chromeos.h index f41dd61..a2bf168 100644 --- a/chrome/browser/chromeos/net/network_change_notifier_chromeos.h +++ b/chrome/browser/chromeos/net/network_change_notifier_chromeos.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/task.h" +#include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/chromeos/dbus/power_manager_client.h" #include "net/base/network_change_notifier.h" diff --git a/chrome/browser/chromeos/offline/offline_load_page.h b/chrome/browser/chromeos/offline/offline_load_page.h index 5288291..e403949 100644 --- a/chrome/browser/chromeos/offline/offline_load_page.h +++ b/chrome/browser/chromeos/offline/offline_load_page.h @@ -9,7 +9,6 @@ #include <string> #include "base/compiler_specific.h" -#include "base/task.h" #include "chrome/browser/tab_contents/chrome_interstitial_page.h" #include "net/base/network_change_notifier.h" diff --git a/chrome/browser/chromeos/system/statistics_provider.cc b/chrome/browser/chromeos/system/statistics_provider.cc index 17e4bd2..32ef5ca 100644 --- a/chrome/browser/chromeos/system/statistics_provider.cc +++ b/chrome/browser/chromeos/system/statistics_provider.cc @@ -10,7 +10,6 @@ #include "base/logging.h" #include "base/memory/singleton.h" #include "base/synchronization/waitable_event.h" -#include "base/task.h" #include "base/time.h" #include "chrome/browser/chromeos/system/name_value_pairs_parser.h" #include "chrome/browser/chromeos/system/runtime_environment.h" diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc index a5a6690..a6c0b97 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry_unittest.cc @@ -8,7 +8,6 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/task.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/custom_handlers/protocol_handler.h" diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome/browser/download/chrome_download_manager_delegate.h index b1e7817..b8f0ff10 100644 --- a/chrome/browser/download/chrome_download_manager_delegate.h +++ b/chrome/browser/download/chrome_download_manager_delegate.h @@ -10,7 +10,7 @@ #include "base/hash_tables.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/task.h" +#include "base/memory/weak_ptr.h" #include "chrome/browser/safe_browsing/download_protection_service.h" #include "content/public/browser/download_manager_delegate.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc index e6e127b..0c0a613 100644 --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc @@ -11,7 +11,6 @@ #include "base/string_split.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" -#include "base/task.h" #include "base/utf_string_conversions.h" #include "chrome/browser/download/chrome_download_manager_delegate.h" #include "chrome/browser/download/download_extensions.h" diff --git a/chrome/browser/extensions/extension_cookies_api.cc b/chrome/browser/extensions/extension_cookies_api.cc index 596278e..1a8fe97 100644 --- a/chrome/browser/extensions/extension_cookies_api.cc +++ b/chrome/browser/extensions/extension_cookies_api.cc @@ -8,7 +8,6 @@ #include "base/bind.h" #include "base/json/json_writer.h" -#include "base/task.h" #include "base/values.h" #include "chrome/browser/extensions/extension_cookies_api_constants.h" #include "chrome/browser/extensions/extension_cookies_helpers.h" diff --git a/chrome/browser/extensions/extension_devtools_manager.cc b/chrome/browser/extensions/extension_devtools_manager.cc index 20f4eb0..e0a739c 100644 --- a/chrome/browser/extensions/extension_devtools_manager.cc +++ b/chrome/browser/extensions/extension_devtools_manager.cc @@ -6,7 +6,6 @@ #include "base/message_loop.h" #include "base/string_util.h" -#include "base/task.h" #include "chrome/browser/extensions/extension_devtools_bridge.h" #include "chrome/browser/extensions/extension_devtools_events.h" diff --git a/chrome/browser/extensions/extension_idle_api.cc b/chrome/browser/extensions/extension_idle_api.cc index ffdf9a7..74dc949 100644 --- a/chrome/browser/extensions/extension_idle_api.cc +++ b/chrome/browser/extensions/extension_idle_api.cc @@ -13,7 +13,6 @@ #include "base/json/json_writer.h" #include "base/message_loop.h" #include "base/stl_util.h" -#include "base/task.h" #include "base/time.h" #include "chrome/browser/extensions/extension_event_router.h" #include "chrome/browser/extensions/extension_host.h" diff --git a/chrome/browser/extensions/extension_processes_api.cc b/chrome/browser/extensions/extension_processes_api.cc index ff58808..bbf1faf 100644 --- a/chrome/browser/extensions/extension_processes_api.cc +++ b/chrome/browser/extensions/extension_processes_api.cc @@ -8,7 +8,6 @@ #include "base/json/json_writer.h" #include "base/message_loop.h" #include "base/string_number_conversions.h" -#include "base/task.h" #include "base/utf_string_conversions.h" #include "base/values.h" diff --git a/chrome/browser/extensions/extension_webrequest_api_unittest.cc b/chrome/browser/extensions/extension_webrequest_api_unittest.cc index 2d266b5b..0eb1aaf 100644 --- a/chrome/browser/extensions/extension_webrequest_api_unittest.cc +++ b/chrome/browser/extensions/extension_webrequest_api_unittest.cc @@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/file_util.h" #include "base/json/json_value_serializer.h" +#include "base/memory/weak_ptr.h" #include "base/path_service.h" #include "base/stl_util.h" #include "base/utf_string_conversions.h" @@ -62,7 +63,7 @@ class TestIPCSender : public IPC::Message::Sender { // Adds a Task to the queue. We will fire these in order as events are // dispatched. - void PushTask(base::Closure task) { + void PushTask(const base::Closure& task) { task_queue_.push(task); } @@ -361,9 +362,6 @@ class ExtensionWebRequestHeaderModificationTest : scoped_refptr<TestURLRequestContext> context_; }; -static void DoNothing() { -} - TEST_P(ExtensionWebRequestHeaderModificationTest, TestModifications) { std::string extension1_id("1"); std::string extension2_id("2"); @@ -439,7 +437,7 @@ TEST_P(ExtensionWebRequestHeaderModificationTest, TestModifications) { } // Don't do anything for the onSendHeaders message. - ipc_sender_.PushTask(base::Bind(&DoNothing)); + ipc_sender_.PushTask(base::Bind(&base::DoNothing)); // Note that we mess up the headers slightly: // request.Start() will first add additional headers (e.g. the User-Agent) diff --git a/chrome/browser/extensions/settings/settings_backend.h b/chrome/browser/extensions/settings/settings_backend.h index ab36894..e80e182 100644 --- a/chrome/browser/extensions/settings/settings_backend.h +++ b/chrome/browser/extensions/settings/settings_backend.h @@ -11,7 +11,6 @@ #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/observer_list_threadsafe.h" -#include "base/task.h" #include "chrome/browser/extensions/settings/settings_leveldb_storage.h" #include "chrome/browser/extensions/settings/settings_observer.h" #include "chrome/browser/extensions/settings/syncable_settings_storage.h" diff --git a/chrome/browser/extensions/settings/settings_leveldb_storage.h b/chrome/browser/extensions/settings/settings_leveldb_storage.h index 390bc61..6af1eed 100644 --- a/chrome/browser/extensions/settings/settings_leveldb_storage.h +++ b/chrome/browser/extensions/settings/settings_leveldb_storage.h @@ -12,7 +12,6 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/task.h" #include "chrome/browser/extensions/settings/settings_storage.h" #include "chrome/browser/extensions/settings/settings_storage_factory.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" diff --git a/chrome/browser/extensions/settings/settings_storage_quota_enforcer.cc b/chrome/browser/extensions/settings/settings_storage_quota_enforcer.cc index 83c044a..10f379d 100644 --- a/chrome/browser/extensions/settings/settings_storage_quota_enforcer.cc +++ b/chrome/browser/extensions/settings/settings_storage_quota_enforcer.cc @@ -9,7 +9,6 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" -#include "base/task.h" namespace extensions { diff --git a/chrome/browser/extensions/settings/settings_storage_unittest.h b/chrome/browser/extensions/settings/settings_storage_unittest.h index 890b8aa..55930d5 100644 --- a/chrome/browser/extensions/settings/settings_storage_unittest.h +++ b/chrome/browser/extensions/settings/settings_storage_unittest.h @@ -12,7 +12,6 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/scoped_temp_dir.h" -#include "base/task.h" #include "chrome/browser/extensions/settings/settings_backend.h" #include "chrome/browser/extensions/settings/settings_frontend.h" #include "chrome/test/base/testing_profile.h" diff --git a/chrome/browser/extensions/settings/settings_sync_unittest.cc b/chrome/browser/extensions/settings/settings_sync_unittest.cc index ef84c79..2f7ef83 100644 --- a/chrome/browser/extensions/settings/settings_sync_unittest.cc +++ b/chrome/browser/extensions/settings/settings_sync_unittest.cc @@ -10,7 +10,6 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/scoped_temp_dir.h" -#include "base/task.h" #include "chrome/browser/extensions/settings/failing_settings_storage.h" #include "chrome/browser/extensions/settings/settings_frontend.h" #include "chrome/browser/extensions/settings/settings_storage_cache.h" diff --git a/chrome/browser/favicon/favicon_service.h b/chrome/browser/favicon/favicon_service.h index 179b743..6c8c4b1 100644 --- a/chrome/browser/favicon/favicon_service.h +++ b/chrome/browser/favicon/favicon_service.h @@ -11,7 +11,6 @@ #include "base/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" -#include "base/task.h" #include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history_types.h" #include "chrome/common/ref_counted_util.h" diff --git a/chrome/browser/google/google_update.cc b/chrome/browser/google/google_update.cc index dd6afd8..75eca53 100644 --- a/chrome/browser/google/google_update.cc +++ b/chrome/browser/google/google_update.cc @@ -13,7 +13,6 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/task.h" #include "base/threading/thread.h" #include "base/win/scoped_comptr.h" #include "base/win/windows_version.h" diff --git a/chrome/browser/history/expire_history_backend.h b/chrome/browser/history/expire_history_backend.h index 67c97b7..ed8ca36 100644 --- a/chrome/browser/history/expire_history_backend.h +++ b/chrome/browser/history/expire_history_backend.h @@ -14,7 +14,6 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "base/time.h" #include "chrome/browser/history/history_types.h" diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc index 2f3cc3c..7ef5edd 100644 --- a/chrome/browser/history/history.cc +++ b/chrome/browser/history/history.cc @@ -29,7 +29,6 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/string_util.h" -#include "base/task.h" #include "base/threading/thread.h" #include "chrome/browser/autocomplete/history_url_provider.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h index 00365b5..71e4df9 100644 --- a/chrome/browser/history/history.h +++ b/chrome/browser/history/history.h @@ -15,7 +15,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/string16.h" -#include "base/task.h" #include "chrome/browser/cancelable_request.h" #include "chrome/browser/favicon/favicon_service.h" #include "chrome/browser/history/history_types.h" diff --git a/chrome/browser/history/history_extension_api.cc b/chrome/browser/history/history_extension_api.cc index bee3543..2d2695b 100644 --- a/chrome/browser/history/history_extension_api.cc +++ b/chrome/browser/history/history_extension_api.cc @@ -10,7 +10,6 @@ #include "base/json/json_writer.h" #include "base/message_loop.h" #include "base/string_number_conversions.h" -#include "base/task.h" #include "base/values.h" #include "chrome/browser/extensions/extension_event_router.h" #include "chrome/browser/history/history.h" diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc index dba30db..66a8dbf 100644 --- a/chrome/browser/history/history_unittest.cc +++ b/chrome/browser/history/history_unittest.cc @@ -34,7 +34,6 @@ #include "base/path_service.h" #include "base/scoped_temp_dir.h" #include "base/string_util.h" -#include "base/task.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/history_backend.h" diff --git a/chrome/browser/history/shortcuts_backend.cc b/chrome/browser/history/shortcuts_backend.cc index 8d8f936..5af231a 100644 --- a/chrome/browser/history/shortcuts_backend.cc +++ b/chrome/browser/history/shortcuts_backend.cc @@ -12,7 +12,6 @@ #include "base/bind_helpers.h" #include "base/i18n/case_conversion.h" #include "base/string_util.h" -#include "base/task.h" #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/history/history.h" diff --git a/chrome/browser/history/text_database_manager.h b/chrome/browser/history/text_database_manager.h index 89b750a..514a25e 100644 --- a/chrome/browser/history/text_database_manager.h +++ b/chrome/browser/history/text_database_manager.h @@ -14,7 +14,6 @@ #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/string16.h" -#include "base/task.h" #include "base/memory/mru_cache.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/history/text_database.h" diff --git a/chrome/browser/mac/keystone_glue.mm b/chrome/browser/mac/keystone_glue.mm index f837410..6704e3c 100644 --- a/chrome/browser/mac/keystone_glue.mm +++ b/chrome/browser/mac/keystone_glue.mm @@ -18,7 +18,6 @@ #include "base/mac/scoped_nsexception_enabler.h" #include "base/memory/ref_counted.h" #include "base/sys_string_conversions.h" -#include "base/task.h" #include "base/threading/worker_pool.h" #include "chrome/browser/mac/authorization_util.h" #import "chrome/browser/mac/keystone_registration.h" diff --git a/chrome/browser/mock_browsing_data_cookie_helper.cc b/chrome/browser/mock_browsing_data_cookie_helper.cc index 2d85cab..be897b5 100644 --- a/chrome/browser/mock_browsing_data_cookie_helper.cc +++ b/chrome/browser/mock_browsing_data_cookie_helper.cc @@ -4,6 +4,8 @@ #include "chrome/browser/mock_browsing_data_cookie_helper.h" +#include "base/logging.h" + MockBrowsingDataCookieHelper::MockBrowsingDataCookieHelper(Profile* profile) : BrowsingDataCookieHelper(profile), profile_(profile) { diff --git a/chrome/browser/net/connection_tester.cc b/chrome/browser/net/connection_tester.cc index 6aa1e9a..63af8d1 100644 --- a/chrome/browser/net/connection_tester.cc +++ b/chrome/browser/net/connection_tester.cc @@ -8,8 +8,8 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/memory/weak_ptr.h" #include "base/message_loop.h" -#include "base/task.h" #include "base/threading/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/importer/firefox_proxy_settings.h" diff --git a/chrome/browser/net/cookie_policy_browsertest.cc b/chrome/browser/net/cookie_policy_browsertest.cc index ae8a3af..b41333f 100644 --- a/chrome/browser/net/cookie_policy_browsertest.cc +++ b/chrome/browser/net/cookie_policy_browsertest.cc @@ -4,7 +4,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/task.h" #include "base/synchronization/waitable_event.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/net/crl_set_fetcher.h b/chrome/browser/net/crl_set_fetcher.h index be97726..b6958637 100644 --- a/chrome/browser/net/crl_set_fetcher.h +++ b/chrome/browser/net/crl_set_fetcher.h @@ -10,7 +10,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/task.h" #include "base/time.h" #include "chrome/browser/component_updater/component_updater_service.h" diff --git a/chrome/browser/net/net_pref_observer.cc b/chrome/browser/net/net_pref_observer.cc index 198a993..6566553 100644 --- a/chrome/browser/net/net_pref_observer.cc +++ b/chrome/browser/net/net_pref_observer.cc @@ -5,7 +5,6 @@ #include "chrome/browser/net/net_pref_observer.h" #include "base/bind.h" -#include "base/task.h" #include "chrome/browser/net/predictor.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prerender/prerender_manager.h" diff --git a/chrome/browser/net/network_stats.cc b/chrome/browser/net/network_stats.cc index 919cf69..1cb0c6b 100644 --- a/chrome/browser/net/network_stats.cc +++ b/chrome/browser/net/network_stats.cc @@ -10,7 +10,6 @@ #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/stringprintf.h" -#include "base/task.h" #include "base/threading/platform_thread.h" #include "base/time.h" #include "base/tuple.h" diff --git a/chrome/browser/net/predictor.h b/chrome/browser/net/predictor.h index 2ec8dc0..db6114e 100644 --- a/chrome/browser/net/predictor.h +++ b/chrome/browser/net/predictor.h @@ -28,6 +28,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" +#include "base/memory/weak_ptr.h" #include "chrome/browser/net/url_info.h" #include "chrome/browser/net/referrer.h" #include "chrome/common/net/predictor_common.h" diff --git a/chrome/browser/net/referrer.h b/chrome/browser/net/referrer.h index ff6a26f..7a76419 100644 --- a/chrome/browser/net/referrer.h +++ b/chrome/browser/net/referrer.h @@ -19,7 +19,6 @@ #include <map> #include "base/basictypes.h" -#include "base/task.h" #include "base/time.h" #include "googleurl/src/gurl.h" #include "net/base/host_port_pair.h" diff --git a/chrome/browser/net/sdch_dictionary_fetcher.h b/chrome/browser/net/sdch_dictionary_fetcher.h index 0eaa0b9..b96368f 100644 --- a/chrome/browser/net/sdch_dictionary_fetcher.h +++ b/chrome/browser/net/sdch_dictionary_fetcher.h @@ -15,7 +15,7 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/task.h" +#include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" #include "content/public/common/url_fetcher_delegate.h" #include "net/base/sdch_manager.h" diff --git a/chrome/browser/oom_priority_manager.h b/chrome/browser/oom_priority_manager.h index 0872712..5bff732 100644 --- a/chrome/browser/oom_priority_manager.h +++ b/chrome/browser/oom_priority_manager.h @@ -14,7 +14,6 @@ #include "base/process.h" #include "base/string16.h" #include "base/synchronization/lock.h" -#include "base/task.h" #include "base/time.h" #include "base/timer.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/password_manager/password_store_mac.cc b/chrome/browser/password_manager/password_store_mac.cc index 1cdc148..f1980ef 100644 --- a/chrome/browser/password_manager/password_store_mac.cc +++ b/chrome/browser/password_manager/password_store_mac.cc @@ -10,12 +10,12 @@ #include <string> #include <vector> +#include "base/callback.h" #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/message_loop.h" #include "base/stl_util.h" #include "base/string_util.h" -#include "base/task.h" #include "base/utf_string_conversions.h" #include "chrome/browser/keychain_mac.h" #include "chrome/browser/password_manager/login_database.h" diff --git a/chrome/browser/platform_util_chromeos.cc b/chrome/browser/platform_util_chromeos.cc index de0bac4..e8a76ef 100644 --- a/chrome/browser/platform_util_chromeos.cc +++ b/chrome/browser/platform_util_chromeos.cc @@ -5,8 +5,8 @@ #include "chrome/browser/platform_util.h" #include "base/bind.h" +#include "base/callback.h" #include "base/file_util.h" -#include "base/task.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/file_manager_util.h" #include "chrome/browser/tabs/tab_strip_model.h" diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc index c0f1f31..81e7d35 100644 --- a/chrome/browser/prerender/prerender_contents.cc +++ b/chrome/browser/prerender/prerender_contents.cc @@ -8,7 +8,6 @@ #include <utility> #include "base/process_util.h" -#include "base/task.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/history_tab_helper.h" #include "chrome/browser/history/history_types.h" diff --git a/chrome/browser/prerender/prerender_manager.h b/chrome/browser/prerender/prerender_manager.h index e823f9b..3a3ec35 100644 --- a/chrome/browser/prerender/prerender_manager.h +++ b/chrome/browser/prerender/prerender_manager.h @@ -14,7 +14,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "base/threading/non_thread_safe.h" #include "base/time.h" #include "base/timer.h" diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h index 18c8259..13c0053 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.h @@ -9,9 +9,9 @@ #include <string> #include "base/basictypes.h" +#include "base/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" -#include "base/task.h" #include "chrome/browser/prefs/pref_change_registrar.h" #include "chrome/browser/printing/cloud_print/cloud_print_setup_handler.h" #include "chrome/browser/profiles/profile_keyed_service.h" diff --git a/chrome/browser/printing/print_job_worker.h b/chrome/browser/printing/print_job_worker.h index cfbae62..fee682d 100644 --- a/chrome/browser/printing/print_job_worker.h +++ b/chrome/browser/printing/print_job_worker.h @@ -9,7 +9,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "base/threading/thread.h" #include "printing/page_number.h" #include "printing/printing_context.h" diff --git a/chrome/browser/printing/print_system_task_proxy.h b/chrome/browser/printing/print_system_task_proxy.h index 420ffd8..8d9c5767 100644 --- a/chrome/browser/printing/print_system_task_proxy.h +++ b/chrome/browser/printing/print_system_task_proxy.h @@ -11,6 +11,7 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "base/memory/weak_ptr.h" #include "base/message_loop_helpers.h" #include "build/build_config.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.cc b/chrome/browser/safe_browsing/browser_feature_extractor.cc index 4c694c4..4c11126 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor.cc +++ b/chrome/browser/safe_browsing/browser_feature_extractor.cc @@ -12,7 +12,6 @@ #include "base/format_macros.h" #include "base/stl_util.h" #include "base/stringprintf.h" -#include "base/task.h" #include "base/time.h" #include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc index 05d6dd81..0af1ab4 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc @@ -12,8 +12,6 @@ #include "base/metrics/histogram.h" #include "base/stl_util.h" #include "base/string_util.h" -#include "base/task.h" -#include "base/time.h" #include "base/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_service.h b/chrome/browser/safe_browsing/client_side_detection_service.h index 03a3b05..83ae62a 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service.h +++ b/chrome/browser/safe_browsing/client_side_detection_service.h @@ -22,11 +22,12 @@ #include <vector> #include "base/basictypes.h" +#include "base/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/task.h" +#include "base/memory/weak_ptr.h" #include "base/time.h" #include "content/public/common/url_fetcher_delegate.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc index 56dc133..e17de28 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc @@ -11,7 +11,6 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/task.h" #include "base/time.h" #include "chrome/browser/safe_browsing/client_side_detection_service.h" #include "chrome/common/safe_browsing/client_model.pb.h" diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc index d157f8c..669c85c 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc @@ -15,7 +15,6 @@ #include "base/stl_util.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/task.h" #include "base/timer.h" #include "chrome/browser/safe_browsing/protocol_parser.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_database.h b/chrome/browser/safe_browsing/safe_browsing_database.h index e254190..37aefe7 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database.h +++ b/chrome/browser/safe_browsing/safe_browsing_database.h @@ -12,8 +12,8 @@ #include "base/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" +#include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" -#include "base/task.h" #include "chrome/browser/safe_browsing/safe_browsing_store.h" namespace base { diff --git a/chrome/browser/search_engines/search_host_to_urls_map.cc b/chrome/browser/search_engines/search_host_to_urls_map.cc index cb91724..af8257e 100644 --- a/chrome/browser/search_engines/search_host_to_urls_map.cc +++ b/chrome/browser/search_engines/search_host_to_urls_map.cc @@ -5,7 +5,6 @@ #include "chrome/browser/search_engines/search_host_to_urls_map.h" #include "base/memory/scoped_ptr.h" -#include "base/task.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" diff --git a/chrome/browser/service/service_process_control.h b/chrome/browser/service/service_process_control.h index 51929da..8da4956 100644 --- a/chrome/browser/service/service_process_control.h +++ b/chrome/browser/service/service_process_control.h @@ -16,7 +16,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/process.h" -#include "base/task.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ipc/ipc_channel_proxy.h" diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc index 4ec3e02..d74cf87 100644 --- a/chrome/browser/shell_integration_linux.cc +++ b/chrome/browser/shell_integration_linux.cc @@ -27,7 +27,6 @@ #include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "base/string_tokenizer.h" -#include "base/task.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" diff --git a/chrome/browser/sync/profile_sync_components_factory.h b/chrome/browser/sync/profile_sync_components_factory.h index ed4e91d..6779b7e 100644 --- a/chrome/browser/sync/profile_sync_components_factory.h +++ b/chrome/browser/sync/profile_sync_components_factory.h @@ -8,6 +8,7 @@ #include <string> +#include "base/memory/weak_ptr.h" #include "chrome/browser/sync/glue/data_type_controller.h" #include "chrome/browser/sync/internal_api/includes/unrecoverable_error_handler.h" diff --git a/chrome/browser/ui/certificate_dialogs.cc b/chrome/browser/ui/certificate_dialogs.cc index 406b48c..0b12590 100644 --- a/chrome/browser/ui/certificate_dialogs.cc +++ b/chrome/browser/ui/certificate_dialogs.cc @@ -12,7 +12,6 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/task.h" #include "chrome/common/net/x509_certificate_model.h" #include "content/public/browser/browser_thread.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm index 07618585..ea45d80 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm @@ -5,7 +5,6 @@ #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h" #include "base/sys_string_conversions.h" -#include "base/task.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h" diff --git a/chrome/browser/ui/fullscreen_controller.h b/chrome/browser/ui/fullscreen_controller.h index de86677..4a6a48a 100644 --- a/chrome/browser/ui/fullscreen_controller.h +++ b/chrome/browser/ui/fullscreen_controller.h @@ -8,7 +8,6 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/task.h" #include "chrome/browser/ui/fullscreen_exit_bubble_type.h" #include "chrome/common/content_settings.h" diff --git a/chrome/browser/ui/gtk/back_forward_button_gtk.h b/chrome/browser/ui/gtk/back_forward_button_gtk.h index d09a71f..0063dda 100644 --- a/chrome/browser/ui/gtk/back_forward_button_gtk.h +++ b/chrome/browser/ui/gtk/back_forward_button_gtk.h @@ -9,7 +9,6 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "chrome/browser/ui/gtk/custom_button.h" #include "chrome/browser/ui/gtk/menu_gtk.h" #include "ui/base/gtk/gtk_signal.h" diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h index d34742a..fd69535 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h @@ -20,7 +20,6 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index 98a68d1..8ce9b47 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -22,7 +22,6 @@ #include "base/nix/xdg_util.h" #include "base/path_service.h" #include "base/string_util.h" -#include "base/task.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -1581,7 +1580,7 @@ void BrowserWindowGtk::OnMainWindowDestroy(GtkWidget* widget) { // We don't want to use DeleteSoon() here since it won't work on a nested pump // (like in UI tests). MessageLoop::current()->PostTask( - FROM_HERE, base::Bind(&DeletePointer<BrowserWindowGtk>, this)); + FROM_HERE, base::Bind(&base::DeletePointer<BrowserWindowGtk>, this)); } void BrowserWindowGtk::UnMaximize() { diff --git a/chrome/browser/ui/gtk/constrained_window_gtk.h b/chrome/browser/ui/gtk/constrained_window_gtk.h index 49eb7bc..d0d456f 100644 --- a/chrome/browser/ui/gtk/constrained_window_gtk.h +++ b/chrome/browser/ui/gtk/constrained_window_gtk.h @@ -11,7 +11,6 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "chrome/browser/ui/constrained_window.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/gtk/owned_widget_gtk.h" diff --git a/chrome/browser/ui/gtk/extensions/extension_popup_gtk.h b/chrome/browser/ui/gtk/extensions/extension_popup_gtk.h index 4cb5a30..462fcc6 100644 --- a/chrome/browser/ui/gtk/extensions/extension_popup_gtk.h +++ b/chrome/browser/ui/gtk/extensions/extension_popup_gtk.h @@ -9,7 +9,6 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "chrome/browser/ui/gtk/bubble/bubble_gtk.h" #include "chrome/browser/ui/gtk/extensions/extension_view_gtk.h" #include "content/public/browser/notification_observer.h" diff --git a/chrome/browser/ui/gtk/tabs/dragged_view_gtk.h b/chrome/browser/ui/gtk/tabs/dragged_view_gtk.h index 7e8c195..ffa2b76 100644 --- a/chrome/browser/ui/gtk/tabs/dragged_view_gtk.h +++ b/chrome/browser/ui/gtk/tabs/dragged_view_gtk.h @@ -9,9 +9,9 @@ #include <gtk/gtk.h> #include <vector> +#include "base/callback.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" -#include "base/task.h" #include "ui/base/animation/animation_delegate.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/gtk/gtk_signal.h" diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h index fb72d5d..2795b24 100644 --- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h +++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.h @@ -13,7 +13,6 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" -#include "base/task.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/gtk/tabs/tab_gtk.h" #include "chrome/browser/ui/gtk/tabstrip_origin_provider.h" diff --git a/chrome/browser/ui/panels/base_panel_browser_test.h b/chrome/browser/ui/panels/base_panel_browser_test.h index 641660e..9a08681 100644 --- a/chrome/browser/ui/panels/base_panel_browser_test.h +++ b/chrome/browser/ui/panels/base_panel_browser_test.h @@ -6,7 +6,6 @@ #define CHROME_BROWSER_UI_PANELS_BASE_PANEL_BROWSER_TEST_H_ #pragma once -#include "base/task.h" #include "base/values.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/panels/auto_hiding_desktop_bar.h" diff --git a/chrome/browser/ui/tabs/dock_info_gtk.cc b/chrome/browser/ui/tabs/dock_info_gtk.cc index 07c14c1..09b8888 100644 --- a/chrome/browser/ui/tabs/dock_info_gtk.cc +++ b/chrome/browser/ui/tabs/dock_info_gtk.cc @@ -7,7 +7,6 @@ #include <gtk/gtk.h> #include "base/logging.h" -#include "base/task.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/gtk/browser_window_gtk.h" diff --git a/chrome/browser/ui/views/accessibility_event_router_views.h b/chrome/browser/ui/views/accessibility_event_router_views.h index 88fced0..04e519a 100644 --- a/chrome/browser/ui/views/accessibility_event_router_views.h +++ b/chrome/browser/ui/views/accessibility_event_router_views.h @@ -12,7 +12,6 @@ #include "base/gtest_prod_util.h" #include "base/memory/singleton.h" #include "base/string16.h" -#include "base/task.h" #include "chrome/browser/accessibility/accessibility_events.h" #include "ui/base/accessibility/accessibility_types.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h index d7ade8e..c2c14ac 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h @@ -10,7 +10,6 @@ #include <vector> #include "base/compiler_specific.h" -#include "base/task.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/first_run/first_run.h" diff --git a/chrome/browser/ui/views/login_view.h b/chrome/browser/ui/views/login_view.h index cb50699..8c152d1 100644 --- a/chrome/browser/ui/views/login_view.h +++ b/chrome/browser/ui/views/login_view.h @@ -6,7 +6,6 @@ #define CHROME_BROWSER_UI_VIEWS_LOGIN_VIEW_H_ #pragma once -#include "base/task.h" #include "chrome/browser/ui/login/login_model.h" #include "ui/views/view.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc index a104b37..44e39ee 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_drag_win.cc @@ -11,7 +11,6 @@ #include "base/bind.h" #include "base/file_path.h" #include "base/message_loop.h" -#include "base/task.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_backend.h b/chrome/browser/ui/webui/chrome_url_data_manager_backend.h index 765f90e..c9271de 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager_backend.h +++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.h @@ -12,7 +12,6 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/task.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "net/url_request/url_request_job_factory.h" diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc index 083a687..f2cd398 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc +++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_ui.cc @@ -119,9 +119,8 @@ WebUIHandlerTaskProxy::~WebUIHandlerTaskProxy() { } void WebUIHandlerTaskProxy::DeleteOnUIThread() { - BrowserThread::PostTask( - BrowserThread::UI, FROM_HERE, - base::Bind(&WebUIHandlerTaskProxy::DoNothing, this)); + BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, + base::Bind(&base::DoNothing)); } //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc index 4691162..f5493b9 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc +++ b/chrome/browser/ui/webui/chromeos/imageburner/imageburner_utils.cc @@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/path_service.h" #include "base/string_util.h" -#include "base/task.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" #include "content/browser/download/download_types.h" diff --git a/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h b/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h index 972ed9d5..dc8d061 100644 --- a/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h +++ b/chrome/browser/ui/webui/chromeos/imageburner/webui_handler.h @@ -9,6 +9,7 @@ #include <string> #include "base/file_path.h" +#include "base/memory/weak_ptr.h" #include "base/string16.h" #include "base/values.h" #include "chrome/browser/chromeos/cros/burn_library.h" @@ -59,8 +60,6 @@ class WebUIHandlerTaskProxy // we need to post back to the UI thread for destruction. void DeleteOnUIThread(); - void DoNothing() {} - private: base::WeakPtr<Delegate> delegate_; diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc index c8922ec..ef86fb1 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc @@ -9,7 +9,6 @@ #include "base/command_line.h" #include "base/hash_tables.h" #include "base/logging.h" -#include "base/task.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_shutdown.h" diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h index bb49f7e..18caf44 100644 --- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h +++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h @@ -10,7 +10,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "chrome/browser/browsing_data_remover.h" #include "chrome/browser/chromeos/login/help_app_launcher.h" #include "chrome/browser/chromeos/login/user_manager.h" diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index 2078414b..ddc6ee1 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc @@ -12,7 +12,6 @@ #include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/task.h" #include "base/threading/thread.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" diff --git a/chrome/browser/ui/webui/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview_handler.cc index 44bb85d..02befb6 100644 --- a/chrome/browser/ui/webui/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview_handler.cc @@ -189,8 +189,9 @@ void ReportPrintSettingsStats(const DictionaryValue& settings) { void PrintToPdfCallback(Metafile* metafile, const FilePath& path) { metafile->SaveTo(path); // |metafile| must be deleted on the UI thread. - BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, - base::Bind(&DeletePointer<Metafile>, metafile)); + BrowserThread::PostTask( + BrowserThread::UI, FROM_HERE, + base::Bind(&base::DeletePointer<Metafile>, metafile)); } } // namespace diff --git a/chrome/browser/ui/webui/screenshot_source.cc b/chrome/browser/ui/webui/screenshot_source.cc index 97338da..4a55a1d 100644 --- a/chrome/browser/ui/webui/screenshot_source.cc +++ b/chrome/browser/ui/webui/screenshot_source.cc @@ -10,7 +10,6 @@ #include "base/memory/ref_counted_memory.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/task.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/webui/sync_internals_ui.cc b/chrome/browser/ui/webui/sync_internals_ui.cc index 79229a3..d90e632 100644 --- a/chrome/browser/ui/webui/sync_internals_ui.cc +++ b/chrome/browser/ui/webui/sync_internals_ui.cc @@ -9,7 +9,6 @@ #include "base/logging.h" #include "base/memory/ref_counted.h" -#include "base/task.h" #include "base/tracked_objects.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/common/important_file_writer.cc b/chrome/common/important_file_writer.cc index 7c1f0b1..6a76dfb 100644 --- a/chrome/common/important_file_writer.cc +++ b/chrome/common/important_file_writer.cc @@ -15,7 +15,6 @@ #include "base/message_loop_proxy.h" #include "base/metrics/histogram.h" #include "base/string_number_conversions.h" -#include "base/task.h" #include "base/threading/thread.h" #include "base/time.h" diff --git a/chrome/common/net/gaia/gaia_oauth_client.cc b/chrome/common/net/gaia/gaia_oauth_client.cc index 0e4a745..6d8b1b0 100644 --- a/chrome/common/net/gaia/gaia_oauth_client.cc +++ b/chrome/common/net/gaia/gaia_oauth_client.cc @@ -5,6 +5,7 @@ #include "chrome/common/net/gaia/gaia_oauth_client.h" #include "base/json/json_reader.h" +#include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/values.h" #include "chrome/common/net/http_return.h" diff --git a/chrome/common/service_process_util_win.cc b/chrome/common/service_process_util_win.cc index cccb7a9..d06989b 100644 --- a/chrome/common/service_process_util_win.cc +++ b/chrome/common/service_process_util_win.cc @@ -4,13 +4,13 @@ #include "chrome/common/service_process_util.h" +#include "base/callback.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/string16.h" -#include "base/task.h" #include "base/utf_string_conversions.h" #include "base/win/object_watcher.h" #include "base/win/scoped_handle.h" diff --git a/chrome/common/worker_thread_ticker.cc b/chrome/common/worker_thread_ticker.cc index 3616c15..391f0a3 100644 --- a/chrome/common/worker_thread_ticker.cc +++ b/chrome/common/worker_thread_ticker.cc @@ -10,7 +10,6 @@ #include "base/bind_helpers.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/task.h" #include "base/threading/thread.h" WorkerThreadTicker::WorkerThreadTicker(int tick_interval) diff --git a/chrome/renderer/net/renderer_net_predictor.h b/chrome/renderer/net/renderer_net_predictor.h index 71f5223..9499cf7 100644 --- a/chrome/renderer/net/renderer_net_predictor.h +++ b/chrome/renderer/net/renderer_net_predictor.h @@ -27,7 +27,6 @@ #include "base/basictypes.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "chrome/renderer/net/predictor_queue.h" class RendererNetPredictor { diff --git a/chrome/renderer/renderer_histogram_snapshots.h b/chrome/renderer/renderer_histogram_snapshots.h index 5fe8ad6..0f5628e 100644 --- a/chrome/renderer/renderer_histogram_snapshots.h +++ b/chrome/renderer/renderer_histogram_snapshots.h @@ -14,7 +14,6 @@ #include "base/memory/weak_ptr.h" #include "base/metrics/histogram.h" #include "base/process.h" -#include "base/task.h" #include "chrome/common/metrics_helpers.h" #include "content/public/renderer/render_process_observer.h" diff --git a/chrome/renderer/safe_browsing/malware_dom_details.h b/chrome/renderer/safe_browsing/malware_dom_details.h index a464cec..4bbcbb6 100644 --- a/chrome/renderer/safe_browsing/malware_dom_details.h +++ b/chrome/renderer/safe_browsing/malware_dom_details.h @@ -14,7 +14,6 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "base/task.h" #include "content/public/renderer/render_view_observer.h" namespace WebKit { diff --git a/chrome/renderer/safe_browsing/phishing_classifier.h b/chrome/renderer/safe_browsing/phishing_classifier.h index 557bf29..2a8a9f9 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier.h +++ b/chrome/renderer/safe_browsing/phishing_classifier.h @@ -19,9 +19,10 @@ #define CHROME_RENDERER_SAFE_BROWSING_PHISHING_CLASSIFIER_H_ #include "base/basictypes.h" +#include "base/callback.h" #include "base/memory/scoped_ptr.h" +#include "base/memory/weak_ptr.h" #include "base/string16.h" -#include "base/task.h" namespace content { class RenderView; diff --git a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.h b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.h index 8d83fb6..f553b48 100644 --- a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.h +++ b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor.h @@ -15,7 +15,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/memory/scoped_ptr.h" -#include "base/task.h" +#include "base/memory/weak_ptr.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h" class GURL; diff --git a/chrome/renderer/safe_browsing/phishing_term_feature_extractor.h b/chrome/renderer/safe_browsing/phishing_term_feature_extractor.h index fbd9238..5e9bce5 100644 --- a/chrome/renderer/safe_browsing/phishing_term_feature_extractor.h +++ b/chrome/renderer/safe_browsing/phishing_term_feature_extractor.h @@ -23,9 +23,9 @@ #include "base/hash_tables.h" #include "base/memory/mru_cache.h" #include "base/memory/scoped_ptr.h" +#include "base/memory/weak_ptr.h" #include "base/string_piece.h" #include "base/string16.h" -#include "base/task.h" namespace safe_browsing { class FeatureExtractorClock; diff --git a/chrome/service/cloud_print/cloud_print_helpers.cc b/chrome/service/cloud_print/cloud_print_helpers.cc index 311f69c..603d741 100644 --- a/chrome/service/cloud_print/cloud_print_helpers.cc +++ b/chrome/service/cloud_print/cloud_print_helpers.cc @@ -10,7 +10,6 @@ #include "base/rand_util.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/task.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/service/cloud_print/cloud_print_consts.h" diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc index 41485d3..1371a0b 100644 --- a/chrome/service/cloud_print/print_system_cups.cc +++ b/chrome/service/cloud_print/print_system_cups.cc @@ -23,7 +23,6 @@ #include "base/rand_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/task.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/service/cloud_print/cloud_print_consts.h" diff --git a/chrome/service/service_utility_process_host.h b/chrome/service/service_utility_process_host.h index a0bef70..0b91776 100644 --- a/chrome/service/service_utility_process_host.h +++ b/chrome/service/service_utility_process_host.h @@ -16,7 +16,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/process.h" -#include "base/task.h" #include "ipc/ipc_channel.h" #include "content/public/common/child_process_host_delegate.h" #include "printing/pdf_render_settings.h" diff --git a/chrome/test/webdriver/webdriver_automation.h b/chrome/test/webdriver/webdriver_automation.h index 861f53a..73ac2c6 100644 --- a/chrome/test/webdriver/webdriver_automation.h +++ b/chrome/test/webdriver/webdriver_automation.h @@ -13,7 +13,6 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/task.h" #include "chrome/common/automation_constants.h" #include "chrome/test/webdriver/webdriver_logging.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/chrome/test/webdriver/webdriver_key_converter.cc b/chrome/test/webdriver/webdriver_key_converter.cc index ef71693..0ac9aa6 100644 --- a/chrome/test/webdriver/webdriver_key_converter.cc +++ b/chrome/test/webdriver/webdriver_key_converter.cc @@ -5,6 +5,7 @@ #include "chrome/test/webdriver/webdriver_key_converter.h" #include "base/format_macros.h" +#include "base/logging.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/common/automation_constants.h" diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h index 59060e3..0115157 100644 --- a/chrome_frame/chrome_frame_automation.h +++ b/chrome_frame/chrome_frame_automation.h @@ -15,7 +15,6 @@ #include "base/memory/scoped_handle.h" #include "base/stack_container.h" #include "base/synchronization/lock.h" -#include "base/task.h" #include "base/threading/thread.h" #include "base/timer.h" #include "chrome/test/automation/automation_proxy.h" diff --git a/chrome_frame/chrome_frame_delegate.h b/chrome_frame/chrome_frame_delegate.h index 2373b94..856fcb8 100644 --- a/chrome_frame/chrome_frame_delegate.h +++ b/chrome_frame/chrome_frame_delegate.h @@ -17,7 +17,6 @@ #include "base/location.h" #include "base/pending_task.h" #include "base/synchronization/lock.h" -#include "base/task.h" #include "chrome/common/automation_constants.h" #include "ipc/ipc_message.h" diff --git a/chrome_frame/custom_sync_call_context.h b/chrome_frame/custom_sync_call_context.h index 58e8476..58b9c5a 100644 --- a/chrome_frame/custom_sync_call_context.h +++ b/chrome_frame/custom_sync_call_context.h @@ -9,6 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/synchronization/waitable_event.h" +#include "base/tuple.h" #include "chrome_frame/sync_msg_reply_dispatcher.h" #include "chrome_frame/chrome_frame_automation.h" #include "ipc/ipc_sync_message.h" diff --git a/chrome_frame/external_tab.cc b/chrome_frame/external_tab.cc index e00c2db..89b3a06 100644 --- a/chrome_frame/external_tab.cc +++ b/chrome_frame/external_tab.cc @@ -7,7 +7,6 @@ #include "base/lazy_instance.h" #include "base/location.h" #include "chrome_frame/external_tab.h" -#include "base/task.h" #include "base/synchronization/waitable_event.h" #include "chrome/common/automation_messages.h" #include "chrome_frame/chrome_frame_delegate.h" diff --git a/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc b/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc index c9084ca..15711ea 100644 --- a/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc +++ b/chrome_frame/ready_mode/internal/registry_ready_mode_state.cc @@ -11,7 +11,6 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/time.h" -#include "base/task.h" #include "base/win/registry.h" #include "base/win/scoped_comptr.h" #include "base/win/scoped_handle.h" diff --git a/chrome_frame/task_marshaller.cc b/chrome_frame/task_marshaller.cc index 5bc6a12..c02c245 100644 --- a/chrome_frame/task_marshaller.cc +++ b/chrome_frame/task_marshaller.cc @@ -3,7 +3,9 @@ // found in the LICENSE file. #include "chrome_frame/task_marshaller.h" -#include "base/task.h" + +#include "base/callback.h" +#include "base/logging.h" TaskMarshallerThroughMessageQueue::TaskMarshallerThroughMessageQueue() : wnd_(NULL), diff --git a/chrome_frame/test/html_util_unittests.cc b/chrome_frame/test/html_util_unittests.cc index 17589c0..95a408f 100644 --- a/chrome_frame/test/html_util_unittests.cc +++ b/chrome_frame/test/html_util_unittests.cc @@ -15,7 +15,6 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/task.h" #include "base/utf_string_conversions.h" #include "net/base/net_util.h" 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; diff --git a/content/gpu/gpu_watchdog_thread.cc b/content/gpu/gpu_watchdog_thread.cc index 86cd112..dd7e075 100644 --- a/content/gpu/gpu_watchdog_thread.cc +++ b/content/gpu/gpu_watchdog_thread.cc @@ -9,6 +9,7 @@ #include "content/gpu/gpu_watchdog_thread.h" #include "base/bind.h" +#include "base/bind_helpers.h" #include "base/compiler_specific.h" #include "base/process_util.h" #include "base/process.h" @@ -17,10 +18,7 @@ namespace { const int64 kCheckPeriod = 2000; - -void DoNothing() { -} -} +} // namespace GpuWatchdogThread::GpuWatchdogThread(int timeout) : base::Thread("Watchdog"), @@ -179,7 +177,7 @@ void GpuWatchdogThread::OnCheck() { // also wake up the observer. This simply ensures there is at least one. watched_message_loop_->PostTask( FROM_HERE, - base::Bind(&DoNothing)); + base::Bind(&base::DoNothing)); // Post a task to the watchdog thread to exit if the monitored thread does // not respond in time. diff --git a/content/plugin/webplugin_delegate_stub.h b/content/plugin/webplugin_delegate_stub.h index 981febb..8d7d3df 100644 --- a/content/plugin/webplugin_delegate_stub.h +++ b/content/plugin/webplugin_delegate_stub.h @@ -10,7 +10,6 @@ #include <vector> #include "base/memory/ref_counted.h" -#include "base/task.h" #include "googleurl/src/gurl.h" #include "ipc/ipc_channel.h" #include "third_party/npapi/bindings/npapi.h" diff --git a/content/public/browser/browser_thread.h b/content/public/browser/browser_thread.h index ae9b6a8..53345fa 100644 --- a/content/public/browser/browser_thread.h +++ b/content/public/browser/browser_thread.h @@ -9,7 +9,6 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/message_loop_proxy.h" -#include "base/task.h" #include "base/tracked_objects.h" #include "content/common/content_export.h" #include "content/public/browser/browser_thread_delegate.h" diff --git a/content/renderer/gpu/command_buffer_proxy.cc b/content/renderer/gpu/command_buffer_proxy.cc index 4a3b740..243288b 100644 --- a/content/renderer/gpu/command_buffer_proxy.cc +++ b/content/renderer/gpu/command_buffer_proxy.cc @@ -4,12 +4,12 @@ #include "content/renderer/gpu/command_buffer_proxy.h" +#include "base/callback.h" #include "base/debug/trace_event.h" #include "base/logging.h" #include "base/process_util.h" #include "base/shared_memory.h" #include "base/stl_util.h" -#include "base/task.h" #include "content/common/child_process_messages.h" #include "content/common/child_thread.h" #include "content/common/gpu/gpu_messages.h" diff --git a/content/renderer/gpu/command_buffer_proxy.h b/content/renderer/gpu/command_buffer_proxy.h index c2f28b6..7c9778e 100644 --- a/content/renderer/gpu/command_buffer_proxy.h +++ b/content/renderer/gpu/command_buffer_proxy.h @@ -15,7 +15,6 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "content/renderer/gpu/gpu_video_decode_accelerator_host.h" #include "gpu/command_buffer/common/command_buffer.h" #include "ipc/ipc_channel.h" diff --git a/content/renderer/gpu/gpu_video_decode_accelerator_host.cc b/content/renderer/gpu/gpu_video_decode_accelerator_host.cc index 02eec34..dfc265f 100644 --- a/content/renderer/gpu/gpu_video_decode_accelerator_host.cc +++ b/content/renderer/gpu/gpu_video_decode_accelerator_host.cc @@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/task.h" #include "content/common/gpu/gpu_messages.h" #include "content/common/view_messages.h" #include "content/renderer/gpu/gpu_channel_host.h" diff --git a/content/renderer/media/rtc_video_decoder.cc b/content/renderer/media/rtc_video_decoder.cc index 75293a8..3b3f86f 100644 --- a/content/renderer/media/rtc_video_decoder.cc +++ b/content/renderer/media/rtc_video_decoder.cc @@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/callback.h" #include "base/message_loop.h" -#include "base/task.h" #include "media/base/demuxer.h" #include "media/base/filter_host.h" #include "media/base/filters.h" diff --git a/content/renderer/notification_provider.cc b/content/renderer/notification_provider.cc index 36e6759..9123a32 100644 --- a/content/renderer/notification_provider.cc +++ b/content/renderer/notification_provider.cc @@ -5,7 +5,6 @@ #include "content/renderer/notification_provider.h" #include "base/string_util.h" -#include "base/task.h" #include "content/common/desktop_notification_messages.h" #include "content/common/view_messages.h" #include "content/renderer/render_view_impl.h" diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc index f69efe4..793543a 100644 --- a/content/renderer/pepper_plugin_delegate_impl.cc +++ b/content/renderer/pepper_plugin_delegate_impl.cc @@ -14,9 +14,9 @@ #include "base/file_util_proxy.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" +#include "base/memory/weak_ptr.h" #include "base/string_split.h" #include "base/sync_socket.h" -#include "base/task.h" #include "base/time.h" #include "content/common/child_process.h" #include "content/common/child_process_messages.h" diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index c188d1e..6dd026c 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -18,7 +18,6 @@ #include "base/metrics/stats_table.h" #include "base/shared_memory.h" #include "base/string_number_conversions.h" // Temporary -#include "base/task.h" #include "base/threading/thread_local.h" #include "base/values.h" #include "base/win/scoped_com_initializer.h" diff --git a/gpu/command_buffer/service/command_buffer_service.h b/gpu/command_buffer/service/command_buffer_service.h index 1429c7e..7704636 100644 --- a/gpu/command_buffer/service/command_buffer_service.h +++ b/gpu/command_buffer/service/command_buffer_service.h @@ -12,7 +12,6 @@ #include "base/memory/linked_ptr.h" #include "base/memory/scoped_ptr.h" #include "base/shared_memory.h" -#include "base/task.h" #include "gpu/command_buffer/common/command_buffer.h" namespace gpu { diff --git a/jingle/notifier/base/task_pump.h b/jingle/notifier/base/task_pump.h index b0a1a4d..08f67f7 100644 --- a/jingle/notifier/base/task_pump.h +++ b/jingle/notifier/base/task_pump.h @@ -7,7 +7,6 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "base/threading/non_thread_safe.h" #include "talk/base/taskrunner.h" diff --git a/jingle/notifier/listener/mediator_thread_impl.h b/jingle/notifier/listener/mediator_thread_impl.h index 454d6b5..bf86933 100644 --- a/jingle/notifier/listener/mediator_thread_impl.h +++ b/jingle/notifier/listener/mediator_thread_impl.h @@ -27,7 +27,6 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "jingle/notifier/base/notifier_options.h" #include "jingle/notifier/listener/mediator_thread.h" diff --git a/media/audio/audio_manager.h b/media/audio/audio_manager.h index 2c5f2af..fd59486 100644 --- a/media/audio/audio_manager.h +++ b/media/audio/audio_manager.h @@ -10,7 +10,6 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/string16.h" -#include "base/task.h" #include "media/audio/audio_device_name.h" #include "media/audio/audio_parameters.h" diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc index 65ba2eb..8327e5b 100644 --- a/media/audio/audio_output_controller_unittest.cc +++ b/media/audio/audio_output_controller_unittest.cc @@ -6,7 +6,6 @@ #include "base/environment.h" #include "base/basictypes.h" #include "base/logging.h" -#include "base/task.h" #include "base/synchronization/waitable_event.h" #include "media/audio/audio_output_controller.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/media/audio/audio_output_proxy.cc b/media/audio/audio_output_proxy.cc index b304ebb..e8309cf 100644 --- a/media/audio/audio_output_proxy.cc +++ b/media/audio/audio_output_proxy.cc @@ -6,7 +6,6 @@ #include "base/logging.h" #include "base/message_loop.h" -#include "base/task.h" #include "media/audio/audio_manager.h" #include "media/audio/audio_output_dispatcher.h" diff --git a/media/audio/audio_output_proxy.h b/media/audio/audio_output_proxy.h index 064771d..af081c1 100644 --- a/media/audio/audio_output_proxy.h +++ b/media/audio/audio_output_proxy.h @@ -6,7 +6,8 @@ #define MEDIA_AUDIO_AUDIO_OUTPUT_PROXY_H_ #include "base/basictypes.h" -#include "base/task.h" +#include "base/compiler_specific.h" +#include "base/memory/ref_counted.h" #include "media/audio/audio_io.h" #include "media/audio/audio_parameters.h" diff --git a/media/audio/pulse/pulse_output.h b/media/audio/pulse/pulse_output.h index 5275934..d3ef866 100644 --- a/media/audio/pulse/pulse_output.h +++ b/media/audio/pulse/pulse_output.h @@ -23,7 +23,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "media/audio/audio_io.h" #include "media/base/channel_layout.h" diff --git a/media/filters/audio_renderer_algorithm_base_unittest.cc b/media/filters/audio_renderer_algorithm_base_unittest.cc index 489182e..d685816 100644 --- a/media/filters/audio_renderer_algorithm_base_unittest.cc +++ b/media/filters/audio_renderer_algorithm_base_unittest.cc @@ -22,13 +22,12 @@ namespace media { static const int kChannels = 1; static const int kSampleRate = 1000; static const int kSampleBits = 8; -static void DoNothing() {} TEST(AudioRendererAlgorithmBaseTest, FillBuffer_NormalRate) { // When playback rate == 1.0f: straight copy of whatever is in |queue_|. AudioRendererAlgorithmBase algorithm; algorithm.Initialize(kChannels, kSampleRate, kSampleBits, 1.0f, - base::Bind(&DoNothing)); + base::Bind(&base::DoNothing)); // Enqueue a buffer of any size since it doesn't matter. const size_t kDataSize = 1024; @@ -45,7 +44,7 @@ TEST(AudioRendererAlgorithmBaseTest, FillBuffer_DoubleRate) { // When playback rate > 1.0f: input is read faster than output is written. AudioRendererAlgorithmBase algorithm; algorithm.Initialize(kChannels, kSampleRate, kSampleBits, 2.0f, - base::Bind(&DoNothing)); + base::Bind(&base::DoNothing)); // First parameter is the input buffer size, second parameter is how much data // we expect to consume in order to have no data left in the |algorithm|. @@ -77,7 +76,7 @@ TEST(AudioRendererAlgorithmBaseTest, FillBuffer_HalfRate) { // When playback rate < 1.0f: input is read slower than output is written. AudioRendererAlgorithmBase algorithm; algorithm.Initialize(kChannels, kSampleRate, kSampleBits, 0.5f, - base::Bind(&DoNothing)); + base::Bind(&base::DoNothing)); // First parameter is the input buffer size, second parameter is how much data // we expect to consume in order to have no data left in the |algorithm|. @@ -109,7 +108,7 @@ TEST(AudioRendererAlgorithmBaseTest, FillBuffer_QuarterRate) { // When playback rate is very low the audio is simply muted. AudioRendererAlgorithmBase algorithm; algorithm.Initialize(kChannels, kSampleRate, kSampleBits, 0.25f, - base::Bind(&DoNothing)); + base::Bind(&base::DoNothing)); // First parameter is the input buffer size, second parameter is how much data // we expect to consume in order to have no data left in the |algorithm|. diff --git a/media/tools/tile_render_bench/tile_render_bench.cc b/media/tools/tile_render_bench/tile_render_bench.cc index 4447954..1f19b40 100644 --- a/media/tools/tile_render_bench/tile_render_bench.cc +++ b/media/tools/tile_render_bench/tile_render_bench.cc @@ -17,7 +17,6 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/task.h" #include "ui/gfx/gl/gl_bindings.h" #include "ui/gfx/gl/gl_implementation.h" diff --git a/media/video/capture/video_capture_proxy.h b/media/video/capture/video_capture_proxy.h index 2db3dbf..98d9b76 100644 --- a/media/video/capture/video_capture_proxy.h +++ b/media/video/capture/video_capture_proxy.h @@ -7,7 +7,6 @@ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" -#include "base/task.h" #include "media/video/capture/video_capture.h" namespace base { diff --git a/net/base/cookie_monster.h b/net/base/cookie_monster.h index b22578f..b93aee9 100644 --- a/net/base/cookie_monster.h +++ b/net/base/cookie_monster.h @@ -22,7 +22,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" -#include "base/task.h" #include "base/time.h" #include "net/base/cookie_store.h" #include "net/base/net_export.h" diff --git a/net/base/keygen_handler_unittest.cc b/net/base/keygen_handler_unittest.cc index b553411..5188d9d 100644 --- a/net/base/keygen_handler_unittest.cc +++ b/net/base/keygen_handler_unittest.cc @@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/location.h" #include "base/logging.h" -#include "base/task.h" #include "base/threading/worker_pool.h" #include "base/threading/thread_restrictions.h" #include "base/synchronization/waitable_event.h" diff --git a/net/curvecp/client_packetizer.h b/net/curvecp/client_packetizer.h index ac27c19..01869f4 100644 --- a/net/curvecp/client_packetizer.h +++ b/net/curvecp/client_packetizer.h @@ -9,7 +9,6 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" #include "net/curvecp/packetizer.h" diff --git a/net/curvecp/messenger.h b/net/curvecp/messenger.h index 6aedd709..4657df9 100644 --- a/net/curvecp/messenger.h +++ b/net/curvecp/messenger.h @@ -10,7 +10,6 @@ #include <list> #include "base/basictypes.h" -#include "base/task.h" #include "base/threading/non_thread_safe.h" #include "base/timer.h" #include "net/base/completion_callback.h" diff --git a/net/curvecp/server_messenger.h b/net/curvecp/server_messenger.h index ab131d7..bea2128 100644 --- a/net/curvecp/server_messenger.h +++ b/net/curvecp/server_messenger.h @@ -10,7 +10,6 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/task.h" #include "net/curvecp/messenger.h" #include "net/curvecp/packetizer.h" #include "net/socket/socket.h" diff --git a/net/curvecp/test_client.h b/net/curvecp/test_client.h index 07ae3a6..1348b8a 100644 --- a/net/curvecp/test_client.h +++ b/net/curvecp/test_client.h @@ -6,7 +6,6 @@ #define NET_CURVECP_TEST_CLIENT_H_ #pragma once -#include "base/task.h" #include "net/base/completion_callback.h" #include "net/base/host_port_pair.h" #include "net/base/io_buffer.h" diff --git a/net/http/http_pipelined_connection_impl.h b/net/http/http_pipelined_connection_impl.h index 6fa963c..e09c3f9 100644 --- a/net/http/http_pipelined_connection_impl.h +++ b/net/http/http_pipelined_connection_impl.h @@ -14,7 +14,6 @@ #include "base/location.h" #include "base/memory/linked_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "net/base/completion_callback.h" #include "net/base/net_export.h" #include "net/base/net_log.h" diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index bcc2f0a..6bb153f 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -34,7 +34,6 @@ #include "base/string_number_conversions.h" #include "base/string_tokenizer.h" #include "base/string_util.h" -#include "base/task.h" #include "base/threading/thread_restrictions.h" #include "base/timer.h" #include "googleurl/src/url_canon.h" diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc index d0e70ee..f8e2238 100644 --- a/net/proxy/proxy_config_service_linux_unittest.cc +++ b/net/proxy/proxy_config_service_linux_unittest.cc @@ -17,7 +17,6 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/synchronization/waitable_event.h" -#include "base/task.h" #include "base/threading/thread.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service_common_unittest.h" diff --git a/net/proxy/proxy_script_fetcher_impl.h b/net/proxy/proxy_script_fetcher_impl.h index 927c2c5..3774748 100644 --- a/net/proxy/proxy_script_fetcher_impl.h +++ b/net/proxy/proxy_script_fetcher_impl.h @@ -14,7 +14,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/string16.h" -#include "base/task.h" #include "base/time.h" #include "net/proxy/proxy_script_fetcher.h" #include "net/url_request/url_request.h" diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h index bfe5d45..0cca6f4a 100644 --- a/net/socket/client_socket_pool_base.h +++ b/net/socket/client_socket_pool_base.h @@ -34,7 +34,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "base/time.h" #include "base/timer.h" #include "net/base/address_list.h" diff --git a/net/socket/web_socket_server_socket_unittest.cc b/net/socket/web_socket_server_socket_unittest.cc index ef02a0d..531ff20 100644 --- a/net/socket/web_socket_server_socket_unittest.cc +++ b/net/socket/web_socket_server_socket_unittest.cc @@ -10,9 +10,9 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/memory/ref_counted.h" +#include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/string_util.h" -#include "base/task.h" #include "base/time.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h index 1e0d6e4..4dae5e8 100644 --- a/net/socket_stream/socket_stream.h +++ b/net/socket_stream/socket_stream.h @@ -13,7 +13,6 @@ #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/task.h" #include "net/base/address_list.h" #include "net/base/completion_callback.h" #include "net/base/io_buffer.h" diff --git a/net/url_request/url_request_ftp_job.h b/net/url_request/url_request_ftp_job.h index 05def33..5012386 100644 --- a/net/url_request/url_request_ftp_job.h +++ b/net/url_request/url_request_ftp_job.h @@ -8,7 +8,7 @@ #include <string> -#include "base/task.h" +#include "base/memory/weak_ptr.h" #include "net/base/auth.h" #include "net/base/completion_callback.h" #include "net/ftp/ftp_request_info.h" diff --git a/ppapi/proxy/ppb_file_system_proxy.cc b/ppapi/proxy/ppb_file_system_proxy.cc index d25452d..48942ee 100644 --- a/ppapi/proxy/ppb_file_system_proxy.cc +++ b/ppapi/proxy/ppb_file_system_proxy.cc @@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "base/task.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_file_system.h" #include "ppapi/proxy/enter_proxy.h" diff --git a/ppapi/proxy/ppb_var_deprecated_proxy.cc b/ppapi/proxy/ppb_var_deprecated_proxy.cc index 2637a02..f62e220c 100644 --- a/ppapi/proxy/ppb_var_deprecated_proxy.cc +++ b/ppapi/proxy/ppb_var_deprecated_proxy.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/task.h" #include "ppapi/c/dev/ppb_var_deprecated.h" #include "ppapi/c/pp_var.h" #include "ppapi/c/ppb_var.h" diff --git a/ppapi/proxy/ppb_var_deprecated_proxy.h b/ppapi/proxy/ppb_var_deprecated_proxy.h index 5e6efd3..59400ae 100644 --- a/ppapi/proxy/ppb_var_deprecated_proxy.h +++ b/ppapi/proxy/ppb_var_deprecated_proxy.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/task.h" +#include "base/memory/weak_ptr.h" #include "ppapi/c/pp_instance.h" #include "ppapi/proxy/interface_proxy.h" diff --git a/ppapi/shared_impl/callback_tracker.h b/ppapi/shared_impl/callback_tracker.h index 5e354fb..f19f276 100644 --- a/ppapi/shared_impl/callback_tracker.h +++ b/ppapi/shared_impl/callback_tracker.h @@ -10,7 +10,6 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/task.h" #include "ppapi/c/pp_resource.h" #include "ppapi/shared_impl/ppapi_shared_export.h" diff --git a/ppapi/shared_impl/tracked_callback.h b/ppapi/shared_impl/tracked_callback.h index d04606f..a75bded 100644 --- a/ppapi/shared_impl/tracked_callback.h +++ b/ppapi/shared_impl/tracked_callback.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" -#include "base/task.h" +#include "base/memory/weak_ptr.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_resource.h" #include "ppapi/shared_impl/ppapi_shared_export.h" diff --git a/remoting/client/rectangle_update_decoder.cc b/remoting/client/rectangle_update_decoder.cc index 697a913..3ce8b65 100644 --- a/remoting/client/rectangle_update_decoder.cc +++ b/remoting/client/rectangle_update_decoder.cc @@ -5,6 +5,8 @@ #include "remoting/client/rectangle_update_decoder.h" #include "base/bind.h" +#include "base/bind_helpers.h" +#include "base/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/message_loop_proxy.h" diff --git a/remoting/host/screen_recorder.cc b/remoting/host/screen_recorder.cc index 8aa333f..e332f27 100644 --- a/remoting/host/screen_recorder.cc +++ b/remoting/host/screen_recorder.cc @@ -255,7 +255,7 @@ void ScreenRecorder::DoSendVideoPacket(VideoPacket* packet) { } else { // TODO(hclam): Fix this code since it causes multiple deletion if there's // more than one connection. - done_task = base::Bind(&DeletePointer<VideoPacket>, packet); + done_task = base::Bind(&base::DeletePointer<VideoPacket>, packet); } (*i)->video_stub()->ProcessVideoPacket(packet, done_task); diff --git a/remoting/jingle_glue/jingle_info_request.cc b/remoting/jingle_glue/jingle_info_request.cc index e08dbf9..cc92233 100644 --- a/remoting/jingle_glue/jingle_info_request.cc +++ b/remoting/jingle_glue/jingle_info_request.cc @@ -5,7 +5,6 @@ #include "remoting/jingle_glue/jingle_info_request.h" #include "base/bind.h" -#include "base/task.h" #include "base/message_loop.h" #include "base/stl_util.h" #include "base/string_number_conversions.h" diff --git a/remoting/protocol/client_control_dispatcher.cc b/remoting/protocol/client_control_dispatcher.cc index 1e76e32..54e1d1c 100644 --- a/remoting/protocol/client_control_dispatcher.cc +++ b/remoting/protocol/client_control_dispatcher.cc @@ -4,6 +4,8 @@ #include "remoting/protocol/client_control_dispatcher.h" +#include "base/bind_helpers.h" +#include "base/callback.h" #include "base/message_loop_proxy.h" #include "net/socket/stream_socket.h" #include "remoting/base/constants.h" diff --git a/remoting/protocol/connection_to_client_unittest.cc b/remoting/protocol/connection_to_client_unittest.cc index 83cf225..0d27fee 100644 --- a/remoting/protocol/connection_to_client_unittest.cc +++ b/remoting/protocol/connection_to_client_unittest.cc @@ -64,7 +64,7 @@ TEST_F(ConnectionToClientTest, SendUpdateStream) { // Then send the actual data. VideoPacket* packet = new VideoPacket(); viewer_->video_stub()->ProcessVideoPacket( - packet, base::Bind(&DeletePointer<VideoPacket>, packet)); + packet, base::Bind(&base::DeletePointer<VideoPacket>, packet)); message_loop_.RunAllPending(); @@ -84,7 +84,7 @@ TEST_F(ConnectionToClientTest, NoWriteAfterDisconnect) { // Then send the actual data. VideoPacket* packet = new VideoPacket(); viewer_->video_stub()->ProcessVideoPacket( - packet, base::Bind(&DeletePointer<VideoPacket>, packet)); + packet, base::Bind(&base::DeletePointer<VideoPacket>, packet)); // And then close the connection to ConnectionToClient. viewer_->Disconnect(); diff --git a/remoting/protocol/connection_to_host.h b/remoting/protocol/connection_to_host.h index 86bd005..f025a20 100644 --- a/remoting/protocol/connection_to_host.h +++ b/remoting/protocol/connection_to_host.h @@ -7,9 +7,9 @@ #include <string> +#include "base/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/task.h" #include "remoting/jingle_glue/signal_strategy.h" #include "remoting/proto/internal.pb.h" #include "remoting/protocol/message_reader.h" diff --git a/remoting/protocol/host_event_dispatcher.cc b/remoting/protocol/host_event_dispatcher.cc index 34fba3f..22cee04 100644 --- a/remoting/protocol/host_event_dispatcher.cc +++ b/remoting/protocol/host_event_dispatcher.cc @@ -4,6 +4,7 @@ #include "remoting/protocol/host_event_dispatcher.h" +#include "base/bind_helpers.h" #include "net/socket/stream_socket.h" #include "remoting/base/constants.h" #include "remoting/proto/event.pb.h" diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h index 3f6b46a..7ab5f14 100644 --- a/remoting/protocol/jingle_session.h +++ b/remoting/protocol/jingle_session.h @@ -6,7 +6,7 @@ #define REMOTING_PROTOCOL_JINGLE_SESSION_H_ #include "base/memory/ref_counted.h" -#include "base/task.h" +#include "base/memory/weak_ptr.h" #include "net/base/completion_callback.h" #include "remoting/protocol/session.h" #include "third_party/libjingle/source/talk/base/sigslot.h" diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc index 845a1d9..c1705c0 100644 --- a/remoting/protocol/jingle_session_manager.cc +++ b/remoting/protocol/jingle_session_manager.cc @@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/message_loop_proxy.h" #include "base/string_util.h" -#include "base/task.h" #include "remoting/base/constants.h" #include "remoting/jingle_glue/jingle_info_request.h" #include "remoting/jingle_glue/jingle_signaling_connector.h" diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc index d7f2149..ca78e9a 100644 --- a/remoting/protocol/jingle_session_unittest.cc +++ b/remoting/protocol/jingle_session_unittest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/bind.h" +#include "base/bind_helpers.h" #include "base/message_loop_proxy.h" #include "base/time.h" #include "net/socket/socket.h" @@ -262,8 +263,6 @@ class JingleSessionTest : public testing::Test { host_socket_.reset(host_socket); } - static void DoNothing() { } - JingleThreadMessageLoop message_loop_; scoped_ptr<FakeSignalStrategy> host_signal_strategy_; diff --git a/remoting/protocol/protobuf_video_reader.cc b/remoting/protocol/protobuf_video_reader.cc index 07f6035..c418522 100644 --- a/remoting/protocol/protobuf_video_reader.cc +++ b/remoting/protocol/protobuf_video_reader.cc @@ -5,7 +5,6 @@ #include "remoting/protocol/protobuf_video_reader.h" #include "base/bind.h" -#include "base/task.h" #include "net/socket/stream_socket.h" #include "remoting/base/constants.h" #include "remoting/proto/video.pb.h" diff --git a/remoting/protocol/protobuf_video_writer.cc b/remoting/protocol/protobuf_video_writer.cc index 9b15a79..47f5c0f 100644 --- a/remoting/protocol/protobuf_video_writer.cc +++ b/remoting/protocol/protobuf_video_writer.cc @@ -5,7 +5,6 @@ #include "remoting/protocol/protobuf_video_writer.h" #include "base/bind.h" -#include "base/task.h" #include "net/socket/stream_socket.h" #include "remoting/base/constants.h" #include "remoting/proto/video.pb.h" diff --git a/remoting/protocol/rtp_video_reader.cc b/remoting/protocol/rtp_video_reader.cc index 75c1ba5..b43b2b9 100644 --- a/remoting/protocol/rtp_video_reader.cc +++ b/remoting/protocol/rtp_video_reader.cc @@ -5,7 +5,7 @@ #include "remoting/protocol/rtp_video_reader.h" #include "base/bind.h" -#include "base/task.h" +#include "base/bind_helpers.h" #include "remoting/base/constants.h" #include "remoting/proto/video.pb.h" #include "remoting/protocol/session.h" @@ -216,7 +216,7 @@ void RtpVideoReader::RebuildVideoPacket(const PacketsQueue::iterator& first, packet->mutable_format()->set_encoding(VideoPacketFormat::ENCODING_VP8); video_stub_->ProcessVideoPacket( - packet, base::Bind(&DeletePointer<VideoPacket>, packet)); + packet, base::Bind(&base::DeletePointer<VideoPacket>, packet)); SendReceiverReportIf(); } diff --git a/remoting/protocol/rtp_video_writer.cc b/remoting/protocol/rtp_video_writer.cc index f6bcb64..828c10a 100644 --- a/remoting/protocol/rtp_video_writer.cc +++ b/remoting/protocol/rtp_video_writer.cc @@ -5,7 +5,7 @@ #include "remoting/protocol/rtp_video_writer.h" #include "base/bind.h" -#include "base/task.h" +#include "base/callback.h" #include "net/base/io_buffer.h" #include "remoting/base/compound_buffer.h" #include "remoting/base/constants.h" diff --git a/remoting/protocol/rtp_video_writer_unittest.cc b/remoting/protocol/rtp_video_writer_unittest.cc index e993e5a..90484b1 100644 --- a/remoting/protocol/rtp_video_writer_unittest.cc +++ b/remoting/protocol/rtp_video_writer_unittest.cc @@ -132,7 +132,7 @@ class RtpVideoWriterTest : public testing::Test { TEST_F(RtpVideoWriterTest, NotFragmented_FirstPacket) { InitPacket(1024, true, false); writer_.ProcessVideoPacket( - packet_, base::Bind(&DeletePointer<VideoPacket>, packet_)); + packet_, base::Bind(&base::DeletePointer<VideoPacket>, packet_)); message_loop_.RunAllPending(); ExpectedPacket expected[] = { @@ -144,7 +144,7 @@ TEST_F(RtpVideoWriterTest, NotFragmented_FirstPacket) { TEST_F(RtpVideoWriterTest, NotFragmented_LastPackes) { InitPacket(1024, false, true); writer_.ProcessVideoPacket( - packet_, base::Bind(&DeletePointer<VideoPacket>, packet_)); + packet_, base::Bind(&base::DeletePointer<VideoPacket>, packet_)); message_loop_.RunAllPending(); ExpectedPacket expected[] = { @@ -156,7 +156,7 @@ TEST_F(RtpVideoWriterTest, NotFragmented_LastPackes) { TEST_F(RtpVideoWriterTest, TwoFragments_FirstPacket) { InitPacket(2000, true, false); writer_.ProcessVideoPacket( - packet_, base::Bind(&DeletePointer<VideoPacket>, packet_)); + packet_, base::Bind(&base::DeletePointer<VideoPacket>, packet_)); message_loop_.RunAllPending(); ExpectedPacket expected[] = { @@ -169,7 +169,7 @@ TEST_F(RtpVideoWriterTest, TwoFragments_FirstPacket) { TEST_F(RtpVideoWriterTest, TwoFragments_LastPacket) { InitPacket(2000, false, true); writer_.ProcessVideoPacket( - packet_, base::Bind(&DeletePointer<VideoPacket>, packet_)); + packet_, base::Bind(&base::DeletePointer<VideoPacket>, packet_)); message_loop_.RunAllPending(); ExpectedPacket expected[] = { @@ -182,7 +182,7 @@ TEST_F(RtpVideoWriterTest, TwoFragments_LastPacket) { TEST_F(RtpVideoWriterTest, ThreeFragments) { InitPacket(3000, true, true); writer_.ProcessVideoPacket( - packet_, base::Bind(&DeletePointer<VideoPacket>, packet_)); + packet_, base::Bind(&base::DeletePointer<VideoPacket>, packet_)); message_loop_.RunAllPending(); ExpectedPacket expected[] = { diff --git a/remoting/protocol/util.cc b/remoting/protocol/util.cc index 080fcc3..95211c5 100644 --- a/remoting/protocol/util.cc +++ b/remoting/protocol/util.cc @@ -7,7 +7,6 @@ #include "base/basictypes.h" #include "base/hash_tables.h" #include "base/logging.h" -#include "base/task.h" #include "net/base/io_buffer.h" #include "third_party/libjingle/source/talk/base/byteorder.h" diff --git a/third_party/leveldatabase/env_chromium.cc b/third_party/leveldatabase/env_chromium.cc index 9fd2c61..012aea2 100644 --- a/third_party/leveldatabase/env_chromium.cc +++ b/third_party/leveldatabase/env_chromium.cc @@ -16,7 +16,6 @@ #include "base/stringprintf.h" #include "base/synchronization/lock.h" #include "base/sys_info.h" -#include "base/task.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h index 1355ab4..89eaa17 100644 --- a/ui/aura/root_window.h +++ b/ui/aura/root_window.h @@ -10,7 +10,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" -#include "base/task.h" #include "ui/aura/aura_export.h" #include "ui/aura/cursor.h" #include "ui/aura/focus_manager.h" diff --git a/ui/gfx/surface/accelerated_surface_win.cc b/ui/gfx/surface/accelerated_surface_win.cc index 9845f8f..0d58da9 100644 --- a/ui/gfx/surface/accelerated_surface_win.cc +++ b/ui/gfx/surface/accelerated_surface_win.cc @@ -10,6 +10,7 @@ #include <list> #include "base/bind.h" +#include "base/bind_helpers.h" #include "base/callback.h" #include "base/command_line.h" #include "base/debug/trace_event.h" diff --git a/webkit/appcache/appcache_group.h b/webkit/appcache/appcache_group.h index ef5c7f5..776a4b7 100644 --- a/webkit/appcache/appcache_group.h +++ b/webkit/appcache/appcache_group.h @@ -13,7 +13,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "base/task.h" #include "base/time.h" #include "googleurl/src/gurl.h" #include "webkit/appcache/appcache_export.h" diff --git a/webkit/appcache/appcache_request_handler_unittest.cc b/webkit/appcache/appcache_request_handler_unittest.cc index 5d61e86..37b7bd1 100644 --- a/webkit/appcache/appcache_request_handler_unittest.cc +++ b/webkit/appcache/appcache_request_handler_unittest.cc @@ -10,7 +10,6 @@ #include "base/bind_helpers.h" #include "base/callback.h" #include "base/message_loop.h" -#include "base/task.h" #include "base/threading/thread.h" #include "base/synchronization/waitable_event.h" #include "net/base/net_errors.h" diff --git a/webkit/appcache/appcache_storage_impl.h b/webkit/appcache/appcache_storage_impl.h index b983f47..b01ad89c 100644 --- a/webkit/appcache/appcache_storage_impl.h +++ b/webkit/appcache/appcache_storage_impl.h @@ -15,7 +15,6 @@ #include "base/file_path.h" #include "base/memory/weak_ptr.h" #include "base/message_loop_proxy.h" -#include "base/task.h" #include "webkit/appcache/appcache_database.h" #include "webkit/appcache/appcache_disk_cache.h" #include "webkit/appcache/appcache_export.h" diff --git a/webkit/appcache/appcache_update_job.h b/webkit/appcache/appcache_update_job.h index 2fa660e5..5961214 100644 --- a/webkit/appcache/appcache_update_job.h +++ b/webkit/appcache/appcache_update_job.h @@ -13,7 +13,6 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" -#include "base/task.h" #include "googleurl/src/gurl.h" #include "net/base/completion_callback.h" #include "net/http/http_response_headers.h" diff --git a/webkit/blob/blob_url_request_job.h b/webkit/blob/blob_url_request_job.h index 00cf0c6..6652ca3 100644 --- a/webkit/blob/blob_url_request_job.h +++ b/webkit/blob/blob_url_request_job.h @@ -8,7 +8,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/platform_file.h" -#include "base/task.h" #include "net/http/http_byte_range.h" #include "net/url_request/url_request_job.h" #include "webkit/blob/blob_data.h" diff --git a/webkit/database/database_connections_unittest.cc b/webkit/database/database_connections_unittest.cc index 27eb8cc..0056dac 100644 --- a/webkit/database/database_connections_unittest.cc +++ b/webkit/database/database_connections_unittest.cc @@ -4,7 +4,6 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "base/task.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/webkit/fileapi/file_system_dir_url_request_job.h b/webkit/fileapi/file_system_dir_url_request_job.h index d7c8431..6176e12 100644 --- a/webkit/fileapi/file_system_dir_url_request_job.h +++ b/webkit/fileapi/file_system_dir_url_request_job.h @@ -14,7 +14,6 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" -#include "base/task.h" #include "net/url_request/url_request_job.h" namespace fileapi { diff --git a/webkit/fileapi/file_system_quota_client.cc b/webkit/fileapi/file_system_quota_client.cc index e1fdb52..bb86fd9 100644 --- a/webkit/fileapi/file_system_quota_client.cc +++ b/webkit/fileapi/file_system_quota_client.cc @@ -12,7 +12,6 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop_proxy.h" -#include "base/task.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" #include "webkit/fileapi/file_system_context.h" diff --git a/webkit/fileapi/file_system_url_request_job.h b/webkit/fileapi/file_system_url_request_job.h index ad65392..b980b56 100644 --- a/webkit/fileapi/file_system_url_request_job.h +++ b/webkit/fileapi/file_system_url_request_job.h @@ -12,7 +12,6 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" -#include "base/task.h" #include "net/http/http_byte_range.h" #include "net/url_request/url_request_job.h" diff --git a/webkit/fileapi/file_writer_delegate.h b/webkit/fileapi/file_writer_delegate.h index 05e2796..81f2d29 100644 --- a/webkit/fileapi/file_writer_delegate.h +++ b/webkit/fileapi/file_writer_delegate.h @@ -10,7 +10,6 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop_proxy.h" #include "base/platform_file.h" -#include "base/task.h" #include "base/time.h" #include "net/base/file_stream.h" #include "net/base/io_buffer.h" diff --git a/webkit/plugins/ppapi/message_channel.h b/webkit/plugins/ppapi/message_channel.h index 05a468e..1555b90 100644 --- a/webkit/plugins/ppapi/message_channel.h +++ b/webkit/plugins/ppapi/message_channel.h @@ -5,7 +5,7 @@ #ifndef WEBKIT_PLUGINS_PPAPI_MESSAGE_CHANNEL_H_ #define WEBKIT_PLUGINS_PPAPI_MESSAGE_CHANNEL_H_ -#include "base/task.h" +#include "base/memory/weak_ptr.h" #include "ppapi/shared_impl/resource.h" #include "third_party/npapi/bindings/npruntime.h" @@ -102,4 +102,3 @@ class MessageChannel { } // namespace webkit #endif // WEBKIT_PLUGINS_PPAPI_MESSAGE_CHANNEL_H_ - diff --git a/webkit/plugins/ppapi/mock_plugin_delegate.cc b/webkit/plugins/ppapi/mock_plugin_delegate.cc index 52d59bc..a991c50 100644 --- a/webkit/plugins/ppapi/mock_plugin_delegate.cc +++ b/webkit/plugins/ppapi/mock_plugin_delegate.cc @@ -4,6 +4,7 @@ #include "webkit/plugins/ppapi/mock_plugin_delegate.h" +#include "base/logging.h" #include "base/message_loop_proxy.h" #include "ppapi/c/pp_errors.h" #include "ppapi/shared_impl/ppapi_preferences.h" diff --git a/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc b/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc index dec85d0..caeef5c 100644 --- a/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc +++ b/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/logging.h" #include "base/message_loop.h" -#include "base/task.h" #include "skia/ext/platform_canvas.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/pp_rect.h" diff --git a/webkit/plugins/ppapi/ppb_scrollbar_impl.h b/webkit/plugins/ppapi/ppb_scrollbar_impl.h index 4d9e8ce..44b76f7 100644 --- a/webkit/plugins/ppapi/ppb_scrollbar_impl.h +++ b/webkit/plugins/ppapi/ppb_scrollbar_impl.h @@ -8,7 +8,6 @@ #include <vector> #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "ppapi/thunk/ppb_scrollbar_api.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebScrollbarClient.h" diff --git a/webkit/plugins/ppapi/quota_file_io.cc b/webkit/plugins/ppapi/quota_file_io.cc index f8fc9dc..fb78c15 100644 --- a/webkit/plugins/ppapi/quota_file_io.cc +++ b/webkit/plugins/ppapi/quota_file_io.cc @@ -10,7 +10,6 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop_proxy.h" #include "base/stl_util.h" -#include "base/task.h" #include "webkit/plugins/ppapi/host_globals.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" #include "webkit/plugins/ppapi/resource_helper.h" diff --git a/webkit/plugins/ppapi/quota_file_io_unittest.cc b/webkit/plugins/ppapi/quota_file_io_unittest.cc index e50f9d2..aba1660 100644 --- a/webkit/plugins/ppapi/quota_file_io_unittest.cc +++ b/webkit/plugins/ppapi/quota_file_io_unittest.cc @@ -12,7 +12,6 @@ #include "base/message_loop.h" #include "base/platform_file.h" #include "base/scoped_temp_dir.h" -#include "base/task.h" #include "webkit/plugins/ppapi/mock_plugin_delegate.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" #include "webkit/plugins/ppapi/ppapi_unittest.h" diff --git a/webkit/quota/mock_storage_client.h b/webkit/quota/mock_storage_client.h index 1e42b75..41abdaf 100644 --- a/webkit/quota/mock_storage_client.h +++ b/webkit/quota/mock_storage_client.h @@ -12,7 +12,6 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "base/time.h" #include "googleurl/src/gurl.h" #include "webkit/quota/quota_client.h" diff --git a/webkit/quota/quota_temporary_storage_evictor_unittest.cc b/webkit/quota/quota_temporary_storage_evictor_unittest.cc index 226be6b..dc87a99 100644 --- a/webkit/quota/quota_temporary_storage_evictor_unittest.cc +++ b/webkit/quota/quota_temporary_storage_evictor_unittest.cc @@ -12,7 +12,6 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/message_loop_proxy.h" -#include "base/task.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/quota/mock_storage_client.h" #include "webkit/quota/quota_manager.h" diff --git a/webkit/support/test_webmessageportchannel.cc b/webkit/support/test_webmessageportchannel.cc index 98fae47..8655fd3 100644 --- a/webkit/support/test_webmessageportchannel.cc +++ b/webkit/support/test_webmessageportchannel.cc @@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/task.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMessagePortChannelClient.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" diff --git a/webkit/tools/test_shell/notification_presenter.cc b/webkit/tools/test_shell/notification_presenter.cc index b9d3672..a09bfcf 100644 --- a/webkit/tools/test_shell/notification_presenter.cc +++ b/webkit/tools/test_shell/notification_presenter.cc @@ -6,7 +6,6 @@ #include "base/bind.h" #include "base/message_loop.h" -#include "base/task.h" #include "googleurl/src/gurl.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotification.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPermissionCallback.h" diff --git a/webkit/tools/test_shell/simple_appcache_system.cc b/webkit/tools/test_shell/simple_appcache_system.cc index a47fffb..6c066db 100644 --- a/webkit/tools/test_shell/simple_appcache_system.cc +++ b/webkit/tools/test_shell/simple_appcache_system.cc @@ -10,7 +10,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" -#include "base/task.h" #include "base/synchronization/waitable_event.h" #include "webkit/appcache/appcache_interceptor.h" #include "webkit/appcache/web_application_cache_host_impl.h" diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.h b/webkit/tools/test_shell/test_shell_devtools_agent.h index 826664d..f562752 100644 --- a/webkit/tools/test_shell/test_shell_devtools_agent.h +++ b/webkit/tools/test_shell/test_shell_devtools_agent.h @@ -8,7 +8,6 @@ #include <string> #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgentClient.h" diff --git a/webkit/tools/test_shell/test_shell_devtools_client.h b/webkit/tools/test_shell/test_shell_devtools_client.h index 42cf3f0..a20fe06 100644 --- a/webkit/tools/test_shell/test_shell_devtools_client.h +++ b/webkit/tools/test_shell/test_shell_devtools_client.h @@ -7,7 +7,6 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsFrontendClient.h" diff --git a/webkit/tools/test_shell/webwidget_host.h b/webkit/tools/test_shell/webwidget_host.h index 130c81c..6c50d07 100644 --- a/webkit/tools/test_shell/webwidget_host.h +++ b/webkit/tools/test_shell/webwidget_host.h @@ -8,7 +8,6 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "base/task.h" #include "skia/ext/platform_canvas.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" |