Remove dependency of sequenced_worker_pool.h on SingleThreadTaskRunner.

Breaks a cyclic dependency in an upcoming CL of mine.

Removing the include of single_thread_task_runner.h here breaks IWYU
all over the place!

The trickiest IWYU thing being exposed by this is that in order for
scoped_refptr<Foo> to be instantiated (not even used), Foo needs to be
fully defined.

This means that, by IWYU, anyone taking a scoped_refptr<Foo> by value or
returning one by value needs to #include "foo.h".

It's still fine to fwd-decl foo when passing via const scoped_refptr<Foo>&
or having a scoped_refptr<Foo> foo_; member in a class constructed/destroyed
out-of-line.

BUG=653916
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel
TBR=reviewers for IWUU side-effects (and minor other touchups):
  kmarshall@: blimp/
  danakj@: cc/
           storage/
  bartfab@: chrome/browser/chromeos/policy/
  gene@: chrome/service/
  maxbogue@: components/browser_sync/
             components/sync/
  bengr@: components/data_reduction_proxy/
  fukino@: components/drive/
  dimich@: components/gcm_driver/
  bradnelson@: components/nacl/
  achuith@: components/pairing/
  rsesek@: components/upload_list/
  mef@: components/wifi/
  michaeln@: content/browser/cache_storage/
             content/child/fileapi/
  dgozman@: content/browser/devtools/
  csharrison@: content/browser/loader/
  hbos@: content/renderer/media/
  mkwst@: content/shell/
  pfeldman@: device/usb/
  kbr@: gpu/
  droger@: ios/
  rockot@: ipc/
  dalecurtis@: media/
  agl@: net/
  garykac@: remoting/
  erg@: services/ui/
  dglazkov@: third_party/WebKit/Source/platform/

Review-Url: https://codereview.chromium.org/2443103003
Cr-Commit-Position: refs/heads/master@{#429451}

base/threading/sequenced_worker_pool.cc

@@ -30,10 +30,10 @@
 #include "base/task_scheduler/post_task.h"
 #include "base/task_scheduler/task_scheduler.h"
 #include "base/threading/platform_thread.h"
+#include "base/threading/sequenced_task_runner_handle.h"
 #include "base/threading/simple_thread.h"
 #include "base/threading/thread_local.h"
 #include "base/threading/thread_restrictions.h"
-#include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/trace_event/trace_event.h"
 #include "base/tracked_objects.h"
@@ -1462,7 +1462,7 @@ void SequencedWorkerPool::ResetRedirectToTaskSchedulerForProcessForTesting() {
 SequencedWorkerPool::SequencedWorkerPool(size_t max_threads,
                                          const std::string& thread_name_prefix,
                                          base::TaskPriority task_priority)
-    : constructor_task_runner_(ThreadTaskRunnerHandle::Get()),
+    : constructor_task_runner_(SequencedTaskRunnerHandle::Get()),
       inner_(new Inner(this,
                        max_threads,
                        thread_name_prefix,
@@ -1473,7 +1473,7 @@ SequencedWorkerPool::SequencedWorkerPool(size_t max_threads,
                                          const std::string& thread_name_prefix,
                                          base::TaskPriority task_priority,
                                          TestingObserver* observer)
-    : constructor_task_runner_(ThreadTaskRunnerHandle::Get()),
+    : constructor_task_runner_(SequencedTaskRunnerHandle::Get()),
       inner_(new Inner(this,
                        max_threads,
                        thread_name_prefix,
@@ -1609,7 +1609,7 @@ void SequencedWorkerPool::SignalHasWorkForTesting() {
 }
 
 void SequencedWorkerPool::Shutdown(int max_new_blocking_tasks_after_shutdown) {
-  DCHECK(constructor_task_runner_->BelongsToCurrentThread());
+  DCHECK(constructor_task_runner_->RunsTasksOnCurrentThread());
   inner_->Shutdown(max_new_blocking_tasks_after_shutdown);
 }
 

base/threading/sequenced_worker_pool.h

@@ -13,9 +13,9 @@
 
 #include "base/base_export.h"
 #include "base/callback_forward.h"
+#include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/single_thread_task_runner.h"
 #include "base/task_runner.h"
 #include "base/task_scheduler/task_traits.h"
 
@@ -25,12 +25,10 @@ class Location;
 
 namespace base {
 
-class SingleThreadTaskRunner;
+class SequencedTaskRunner;
 
 template <class T> class DeleteHelper;
 
-class SequencedTaskRunner;
-
 // A worker thread pool that enforces ordering between sets of tasks. It also
 // allows you to specify what should happen to your tasks on shutdown.
 //
@@ -232,7 +230,7 @@ class BASE_EXPORT SequencedWorkerPool : public TaskRunner {
   // delay are posted with SKIP_ON_SHUTDOWN behavior and tasks with zero delay
   // are posted with BLOCK_SHUTDOWN behavior.
   scoped_refptr<SequencedTaskRunner> GetSequencedTaskRunner(
-      SequenceToken token);
+      SequenceToken token) WARN_UNUSED_RESULT;
 
   // Returns a SequencedTaskRunner wrapper which posts to this
   // SequencedWorkerPool using the given sequence token. Tasks with nonzero
@@ -240,14 +238,14 @@ class BASE_EXPORT SequencedWorkerPool : public TaskRunner {
   // are posted with the given shutdown behavior.
   scoped_refptr<SequencedTaskRunner> GetSequencedTaskRunnerWithShutdownBehavior(
       SequenceToken token,
-      WorkerShutdown shutdown_behavior);
+      WorkerShutdown shutdown_behavior) WARN_UNUSED_RESULT;
 
   // Returns a TaskRunner wrapper which posts to this SequencedWorkerPool using
   // the given shutdown behavior. Tasks with nonzero delay are posted with
   // SKIP_ON_SHUTDOWN behavior and tasks with zero delay are posted with the
   // given shutdown behavior.
   scoped_refptr<TaskRunner> GetTaskRunnerWithShutdownBehavior(
-      WorkerShutdown shutdown_behavior);
+      WorkerShutdown shutdown_behavior) WARN_UNUSED_RESULT;
 
   // Posts the given task for execution in the worker pool. Tasks posted with
   // this function will execute in an unspecified order on a background thread.
@@ -398,7 +396,7 @@ class BASE_EXPORT SequencedWorkerPool : public TaskRunner {
   // sequence_token.
   bool IsRunningSequenceOnCurrentThread(SequenceToken sequence_token) const;
 
-  const scoped_refptr<SingleThreadTaskRunner> constructor_task_runner_;
+  const scoped_refptr<SequencedTaskRunner> constructor_task_runner_;
 
   // Avoid pulling in too many headers by putting (almost) everything
   // into |inner_|.

blimp/client/core/context/assignment_fetcher.h

@@ -8,6 +8,8 @@
 #include <memory>
 #include <string>
 
+#include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
 #include "blimp/client/core/session/assignment_source.h"
 #include "blimp/client/core/session/identity_source.h"
 

blimp/client/core/session/assignment_source.cc

@@ -16,6 +16,7 @@
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/numerics/safe_conversions.h"
+#include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_restrictions.h"

blimp/client/core/session/assignment_source.h

@@ -8,6 +8,7 @@
 #include <string>
 
 #include "base/callback.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "blimp/client/public/session/assignment.h"
 #include "net/url_request/url_fetcher_delegate.h"

blimp/engine/renderer/frame_scheduler.h

@@ -6,7 +6,9 @@
 #define BLIMP_ENGINE_RENDERER_FRAME_SCHEDULER_H_
 
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/single_thread_task_runner.h"
 #include "base/timer/timer.h"
 
 namespace blimp {

cc/blimp/remote_compositor_bridge.cc

@@ -4,7 +4,7 @@
 
 #include "cc/blimp/remote_compositor_bridge.h"
 
-#include "base/single_thread_task_runner.h"
+#include <utility>
 
 namespace cc {
 

cc/blimp/remote_compositor_bridge.h

@@ -7,13 +7,11 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
 #include "cc/base/cc_export.h"
 
-namespace base {
-class SingleThreadTaskRunner;
-}  // namespace base
-
 namespace cc {
+
 class CompositorProtoState;
 class RemoteCompositorBridgeClient;
 
@@ -52,4 +50,5 @@ class CC_EXPORT RemoteCompositorBridge {
 };
 
 }  // namespace cc
+
 #endif  // CC_BLIMP_REMOTE_COMPOSITOR_BRIDGE_H_

cc/blimp/remote_compositor_bridge_client.h

@@ -10,10 +10,6 @@
 #include "base/macros.h"
 #include "cc/base/cc_export.h"
 
-namespace base {
-class SingleThreadTaskRunner;
-}  // namespace base
-
 namespace gfx {
 class ScrollOffset;
 }  // namespace gfx

cc/output/context_cache_controller.cc

@@ -7,7 +7,6 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "third_party/skia/include/gpu/GrContext.h"

cc/output/context_cache_controller.h

@@ -11,13 +11,13 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/single_thread_task_runner.h"
 #include "cc/base/cc_export.h"
 
 class GrContext;
 
 namespace base {
 class Lock;
-class SingleThreadTaskRunner;
 }
 
 namespace gpu {

cc/test/fake_remote_compositor_bridge.cc

@@ -6,6 +6,7 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
+#include "base/single_thread_task_runner.h"
 #include "cc/blimp/remote_compositor_bridge_client.h"
 
 namespace cc {

cc/test/fake_remote_compositor_bridge.h

@@ -9,6 +9,7 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "base/single_thread_task_runner.h"
 #include "cc/blimp/compositor_proto_state.h"
 #include "cc/blimp/remote_compositor_bridge.h"
 

chrome/browser/chromeos/policy/upload_job_impl.cc

@@ -10,6 +10,7 @@
 
 #include "base/location.h"
 #include "base/macros.h"
+#include "base/sequenced_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/syslog_logging.h"
 #include "google_apis/gaia/gaia_constants.h"

chrome/browser/chromeos/policy/upload_job_impl.h

@@ -20,6 +20,10 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
 
+namespace base {
+class SequencedTaskRunner;
+}
+
 namespace policy {
 
 // This implementation of UploadJob uses the OAuth2TokenService to acquire

chrome/service/service_utility_process_host.cc

@@ -19,6 +19,7 @@
 #include "base/macros.h"
 #include "base/metrics/histogram.h"
 #include "base/process/launch.h"
+#include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_task_runner_handle.h"

chrome/service/service_utility_process_host.h

@@ -19,6 +19,7 @@ class CommandLine;
 class File;
 class FilePath;
 class ScopedTempDir;
+class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace content {

components/browser_sync/signin_confirmation_helper.cc

@@ -6,6 +6,7 @@
 
 #include <memory>
 
+#include "base/single_thread_task_runner.h"
 #include "base/strings/string16.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/history/core/browser/history_backend.h"

components/browser_sync/signin_confirmation_helper.h

@@ -11,6 +11,10 @@
 #include "base/memory/ref_counted.h"
 #include "base/task/cancelable_task_tracker.h"
 
+namespace base {
+class SingleThreadTaskRunner;
+}
+
 namespace history {
 class HistoryService;
 class QueryResults;

components/data_reduction_proxy/core/browser/data_reduction_proxy_service.cc

@@ -11,6 +11,7 @@
 #include "base/location.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/sequenced_task_runner.h"
+#include "base/single_thread_task_runner.h"
 #include "base/task_runner_util.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"

components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h

@@ -16,7 +16,6 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
-#include "base/sequenced_task_runner.h"
 #include "base/threading/non_thread_safe.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_metrics.h"
 #include "components/data_reduction_proxy/core/browser/db_data_owner.h"
@@ -27,6 +26,7 @@ class PrefService;
 
 namespace base {
 class SequencedTaskRunner;
+class SingleThreadTaskRunner;
 class TimeDelta;
 class Value;
 }

components/drive/chromeos/file_system.cc

@@ -9,6 +9,8 @@
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
+#include "base/sequenced_task_runner.h"
+#include "base/single_thread_task_runner.h"
 #include "components/drive/chromeos/change_list_loader.h"
 #include "components/drive/chromeos/directory_loader.h"
 #include "components/drive/chromeos/file_cache.h"

components/drive/chromeos/file_system.h

@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
@@ -24,6 +25,7 @@ class PrefService;
 
 namespace base {
 class SequencedTaskRunner;
+class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace google_apis {

components/drive/chromeos/file_system/get_file_for_saving_operation.cc

@@ -9,6 +9,7 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
+#include "base/sequenced_task_runner.h"
 #include "components/drive/chromeos/file_cache.h"
 #include "components/drive/chromeos/file_system/create_file_operation.h"
 #include "components/drive/chromeos/file_system/download_operation.h"

components/drive/chromeos/file_system/get_file_for_saving_operation.h

@@ -18,6 +18,7 @@ namespace base {
 class FilePath;
 class ScopedClosureRunner;
 class SequencedTaskRunner;
+class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace drive {

components/drive/chromeos/resource_metadata.h

@@ -14,6 +14,8 @@
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/sequenced_task_runner.h"
 #include "base/threading/thread_checker.h"
 #include "components/drive/file_errors.h"
 #include "components/drive/resource_metadata_storage.h"

components/drive/file_system/get_file_for_saving_operation_unittest.cc

@@ -9,7 +9,9 @@
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
+#include "base/single_thread_task_runner.h"
 #include "base/task_runner_util.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/file_change.h"

components/drive/file_write_watcher.cc

@@ -15,6 +15,8 @@
 #include "base/files/file_path_watcher.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
 #include "base/timer/timer.h"
 #include "google_apis/drive/task_util.h"
 

components/gcm_driver/crypto/gcm_key_store.cc

@@ -12,6 +12,7 @@
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
+#include "base/sequenced_task_runner.h"
 #include "components/gcm_driver/crypto/p256_key_util.h"
 #include "components/leveldb_proto/proto_database_impl.h"
 #include "crypto/random.h"

components/gcm_driver/fake_gcm_driver.cc

@@ -5,6 +5,7 @@
 #include "components/gcm_driver/fake_gcm_driver.h"
 
 #include "base/files/file_path.h"
+#include "base/sequenced_task_runner.h"
 
 namespace gcm {
 

components/gcm_driver/fake_gcm_driver.h

@@ -7,6 +7,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
 #include "components/gcm_driver/gcm_driver.h"
 
 namespace base {

components/nacl/common/nacl_debug_exception_handler_win.h

@@ -8,6 +8,7 @@
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/process/process.h"
+#include "base/single_thread_task_runner.h"
 
 namespace base {
 class SingleThreadTaskRunner;

components/pairing/bluetooth_host_pairing_controller.cc

@@ -8,6 +8,7 @@
 #include "base/hash.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/task_runner_util.h"
 #include "chromeos/system/devicetype.h"

components/pairing/bluetooth_host_pairing_controller.h

@@ -21,6 +21,10 @@
 #include "device/bluetooth/bluetooth_socket.h"
 #include "device/hid/input_service_linux.h"
 
+namespace base {
+class SingleThreadTaskRunner;
+}
+
 namespace device {
 class BluetoothAdapter;
 }

components/sync/model_impl/model_type_store_impl.cc

@@ -10,7 +10,6 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "base/sequenced_task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/sync/model_impl/model_type_store_backend.h"

components/sync/model_impl/model_type_store_impl.h

@@ -10,6 +10,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/sequenced_task_runner.h"
 #include "base/threading/non_thread_safe.h"
 #include "components/sync/base/model_type.h"
 #include "components/sync/model/model_type_store.h"

components/upload_list/crash_upload_list.h

@@ -7,11 +7,11 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/task_runner.h"
 #include "components/upload_list/upload_list.h"
 
 namespace base {
 class FilePath;
-class TaskRunner;
 }
 
 // An upload list manager for crash reports from breakpad.

components/wifi/wifi_service.h

@@ -14,7 +14,8 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/threading/sequenced_worker_pool.h"
+#include "base/sequenced_task_runner.h"
+#include "base/single_thread_task_runner.h"
 #include "base/values.h"
 #include "components/wifi/wifi_export.h"
 

content/browser/cache_storage/cache_storage_operation.h

@@ -9,6 +9,7 @@
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/single_thread_task_runner.h"
 #include "base/time/time.h"
 #include "content/browser/cache_storage/cache_storage_scheduler_client.h"
 #include "content/common/content_export.h"

content/browser/devtools/protocol/tethering_handler.h

@@ -9,7 +9,9 @@
 #include <string>
 
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/single_thread_task_runner.h"
 #include "content/browser/devtools/protocol/devtools_protocol_dispatcher.h"
 
 namespace net {

content/browser/loader/upload_data_stream_builder.cc

@@ -14,6 +14,7 @@
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
 #include "content/browser/fileapi/upload_file_system_file_element_reader.h"
 #include "content/common/resource_request_body_impl.h"
 #include "net/base/elements_upload_data_stream.h"
@@ -24,6 +25,10 @@
 #include "storage/browser/blob/blob_storage_context.h"
 #include "storage/browser/blob/upload_blob_element_reader.h"
 
+namespace base {
+class TaskRunner;
+}
+
 namespace disk_cache {
 class Entry;
 }

content/child/fileapi/webfilewriter_impl.h

@@ -13,6 +13,10 @@
 #include "base/memory/weak_ptr.h"
 #include "content/child/fileapi/webfilewriter_base.h"
 
+namespace base {
+class SingleThreadTaskRunner;
+}
+
 namespace content {
 
 // An implementation of WebFileWriter for use in chrome renderers and workers.

content/public/browser/browser_thread.h

@@ -11,6 +11,7 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/time/time.h"

content/renderer/media/gpu/rtc_video_encoder.h

@@ -21,6 +21,10 @@
 #include "third_party/webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "ui/gfx/geometry/size.h"
 
+namespace base {
+class SingleThreadTaskRunner;
+}
+
 namespace media {
 class GpuVideoAcceleratorFactories;
 }  // namespace media

content/renderer/media/html_video_element_capturer_source.h

@@ -16,6 +16,10 @@
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 
+namespace base{
+class SingleThreadTaskRunner;
+}
+
 namespace blink {
 class WebMediaPlayer;
 }  // namespace blink

content/shell/browser/shell_url_request_context_getter.h

@@ -11,6 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
 #include "content/public/browser/browser_context.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/url_request/url_request_context_getter.h"

device/usb/usb_device_handle_android.h

@@ -6,6 +6,8 @@
 #define DEVICE_USB_USB_DEVICE_HANDLE_ANDROID_H_
 
 #include "base/android/scoped_java_ref.h"
+#include "base/memory/ref_counted.h"
+#include "base/sequenced_task_runner.h"
 #include "device/usb/usb_device_handle_usbfs.h"
 
 namespace device {

device/usb/usb_device_handle_usbfs.h

@@ -11,6 +11,8 @@
 #include <vector>
 
 #include "base/files/scoped_file.h"
+#include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
 #include "device/usb/usb_device_handle.h"
 
 struct usbdevfs_urb;

device/usb/usb_service.h

@@ -15,12 +15,10 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
+#include "base/sequenced_task_runner.h"
+#include "base/single_thread_task_runner.h"
 #include "base/threading/non_thread_safe.h"
 
-namespace base {
-class SequencedTaskRunner;
-}
-
 namespace device {
 
 class UsbDevice;

gpu/ipc/client/command_buffer_proxy_impl.h

@@ -21,6 +21,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
+#include "base/single_thread_task_runner.h"
 #include "base/threading/thread_checker.h"
 #include "gpu/command_buffer/client/gpu_control.h"
 #include "gpu/command_buffer/common/command_buffer.h"

ios/web/public/web_thread.h

@@ -12,6 +12,8 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
 #include "base/task_runner_util.h"
 
 namespace base {

ipc/attachment_broker.h

@@ -9,6 +9,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/process/process_handle.h"
+#include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "build/build_config.h"
 #include "ipc/brokerable_attachment.h"

ipc/attachment_broker_privileged.h

@@ -10,6 +10,7 @@
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
 #include "build/build_config.h"
 #include "ipc/attachment_broker.h"
 #include "ipc/ipc_export.h"

media/base/android/media_drm_bridge.h

@@ -15,6 +15,7 @@
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/android/media_drm_bridge_cdm_context.h"
 #include "media/base/android/provision_fetcher.h"
@@ -28,6 +29,10 @@
 
 class GURL;
 
+namespace base {
+class SingleThreadTaskRunner;
+}
+
 namespace media {
 
 // Implements a CDM using Android MediaDrm API.

media/base/media_url_demuxer.cc

@@ -5,6 +5,7 @@
 #include "media/base/media_url_demuxer.h"
 
 #include "base/bind.h"
+#include "base/single_thread_task_runner.h"
 
 namespace media {
 

media/base/media_url_demuxer.h

@@ -13,6 +13,10 @@
 #include "media/base/demuxer.h"
 #include "url/gurl.h"
 
+namespace base {
+class SingleThreadTaskRunner;
+}
+
 namespace media {
 
 // Class that saves a URL for later retrieval. To be used in conjunction with

media/renderers/video_overlay_factory.cc

@@ -4,6 +4,7 @@
 
 #include "media/renderers/video_overlay_factory.h"
 
+#include "base/single_thread_task_runner.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/common/mailbox.h"

net/base/upload_file_element_reader.cc

@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
+#include "base/task_runner.h"
 #include "base/task_runner_util.h"
 #include "net/base/file_stream.h"
 #include "net/base/io_buffer.h"

net/nqe/socket_watcher_factory.h

@@ -10,12 +10,12 @@
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/single_thread_task_runner.h"
 #include "base/threading/thread_checker.h"
 #include "net/socket/socket_performance_watcher.h"
 #include "net/socket/socket_performance_watcher_factory.h"
 
 namespace base {
-class SingleThreadTaskRunner;
 class TimeDelta;
 }  // namespace base
 
@@ -63,4 +63,4 @@ class SocketWatcherFactory : public SocketPerformanceWatcherFactory {
 
 }  // namespace net
 
-#endif  // NET_NQE_SOCKET_WATCHER_FACTORY_H_
+#endif  // NET_NQE_SOCKET_WATCHER_FACTORY_H_

net/ssl/ssl_platform_key.h

@@ -7,14 +7,9 @@
 
 #include <memory>
 
-#include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "net/base/net_export.h"
 
-namespace base {
-class SequencedTaskRunner;
-}
-
 namespace net {
 
 class SSLPrivateKey;

net/ssl/ssl_platform_key_chromecast.cc

@@ -9,7 +9,6 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "base/sequenced_task_runner.h"
 #include "crypto/scoped_nss_types.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/client_key_store.h"

net/ssl/ssl_platform_key_mac.cc

@@ -19,7 +19,6 @@
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/scoped_policy.h"
-#include "base/sequenced_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "crypto/mac_security_services_lock.h"
 #include "crypto/openssl_util.h"

net/ssl/ssl_platform_key_nss.cc

@@ -12,7 +12,6 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "base/sequenced_task_runner.h"
 #include "crypto/scoped_nss_types.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/client_key_store.h"

net/ssl/ssl_platform_key_util.h

@@ -8,13 +8,10 @@
 #include <stddef.h>
 
 #include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
 #include "net/base/net_export.h"
 #include "net/ssl/ssl_private_key.h"
 
-namespace base {
-class SingleThreadTaskRunner;
-}
-
 namespace net {
 
 class X509Certificate;

net/ssl/ssl_platform_key_win.cc

@@ -14,7 +14,6 @@
 
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/sequenced_task_runner.h"
 #include "crypto/openssl_util.h"
 #include "crypto/scoped_capi_types.h"
 #include "crypto/wincrypt_shim.h"

remoting/client/queued_task_poster.h

@@ -10,7 +10,9 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/single_thread_task_runner.h"
 
 namespace remoting {
 

remoting/client/queued_task_poster_unittest.cc

@@ -8,8 +8,10 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
+#include "base/single_thread_task_runner.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "testing/gtest/include/gtest/gtest.h"

remoting/host/fake_desktop_environment.cc

@@ -56,8 +56,9 @@ void FakeScreenControls::SetScreenResolution(
 
 FakeDesktopEnvironment::FakeDesktopEnvironment(
     scoped_refptr<base::SingleThreadTaskRunner> capture_thread)
-    : capture_thread_(capture_thread) {}
-FakeDesktopEnvironment::~FakeDesktopEnvironment() {}
+    : capture_thread_(std::move(capture_thread)) {}
+
+FakeDesktopEnvironment::~FakeDesktopEnvironment() = default;
 
 // DesktopEnvironment implementation.
 std::unique_ptr<AudioCapturer> FakeDesktopEnvironment::CreateAudioCapturer() {
@@ -104,8 +105,9 @@ uint32_t FakeDesktopEnvironment::GetDesktopSessionId() const {
 
 FakeDesktopEnvironmentFactory::FakeDesktopEnvironmentFactory(
     scoped_refptr<base::SingleThreadTaskRunner> capture_thread)
-    : capture_thread_(capture_thread) {}
-FakeDesktopEnvironmentFactory::~FakeDesktopEnvironmentFactory() {}
+    : capture_thread_(std::move(capture_thread)) {}
+
+FakeDesktopEnvironmentFactory::~FakeDesktopEnvironmentFactory() = default;
 
 // DesktopEnvironmentFactory implementation.
 std::unique_ptr<DesktopEnvironment> FakeDesktopEnvironmentFactory::Create(

remoting/host/fake_desktop_environment.h

@@ -11,6 +11,8 @@
 #include <vector>
 
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
 #include "remoting/host/desktop_environment.h"
 #include "remoting/host/fake_mouse_cursor_monitor.h"
 #include "remoting/host/input_injector.h"

remoting/host/native_messaging/log_message_handler.cc

@@ -6,6 +6,7 @@
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
+#include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_task_runner_handle.h"

remoting/host/native_messaging/log_message_handler.h

@@ -10,9 +10,14 @@
 #include <memory>
 
 #include "base/callback.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 
+namespace base {
+class SingleThreadTaskRunner;
+}
+
 namespace remoting {
 
 // Helper class for logging::SetLogMessageHandler to deliver log messages to

remoting/protocol/ice_connection_to_client.cc

@@ -57,8 +57,8 @@ IceConnectionToClient::IceConnectionToClient(
     scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner)
     : event_handler_(nullptr),
       session_(std::move(session)),
-      video_encode_task_runner_(video_encode_task_runner),
-      audio_task_runner_(audio_task_runner),
+      video_encode_task_runner_(std::move(video_encode_task_runner)),
+      audio_task_runner_(std::move(audio_task_runner)),
       transport_(transport_context, this),
       control_dispatcher_(new HostControlDispatcher()),
       event_dispatcher_(new HostEventDispatcher()),

remoting/protocol/ice_connection_to_client.h

@@ -11,6 +11,8 @@
 #include <string>
 
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
 #include "base/threading/thread_checker.h"
 #include "remoting/protocol/channel_dispatcher_base.h"
 #include "remoting/protocol/connection_to_client.h"

remoting/protocol/ice_connection_to_host.h

@@ -12,6 +12,7 @@
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/single_thread_task_runner.h"
 #include "base/threading/non_thread_safe.h"
 #include "remoting/proto/internal.pb.h"
 #include "remoting/protocol/channel_dispatcher_base.h"

remoting/protocol/webrtc_audio_source_adapter.cc

@@ -4,6 +4,8 @@
 
 #include "remoting/protocol/webrtc_audio_source_adapter.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/synchronization/lock.h"
@@ -144,7 +146,7 @@ void WebrtcAudioSourceAdapter::Core::OnAudioPacket(
 
 WebrtcAudioSourceAdapter::WebrtcAudioSourceAdapter(
     scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner)
-    : audio_task_runner_(audio_task_runner), core_(new Core()) {}
+    : audio_task_runner_(std::move(audio_task_runner)), core_(new Core()) {}
 
 WebrtcAudioSourceAdapter::~WebrtcAudioSourceAdapter() {
   audio_task_runner_->DeleteSoon(FROM_HERE, core_.release());

remoting/protocol/webrtc_audio_source_adapter.h

@@ -8,7 +8,9 @@
 #include <memory>
 
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
+#include "base/single_thread_task_runner.h"
 #include "third_party/webrtc/api/mediastreaminterface.h"
 
 namespace webrtc {

remoting/protocol/webrtc_dummy_video_encoder.h

@@ -11,6 +11,7 @@
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/single_thread_task_runner.h"
 #include "base/synchronization/lock.h"
 #include "remoting/codec/webrtc_video_encoder.h"
 #include "third_party/webrtc/media/engine/webrtcvideoencoderfactory.h"

remoting/protocol/webrtc_video_stream.cc

@@ -71,7 +71,7 @@ void WebrtcVideoStream::Start(
   DCHECK(peer_connection_factory);
   DCHECK(peer_connection_);
 
-  encode_task_runner_ = encode_task_runner;
+  encode_task_runner_ = std::move(encode_task_runner);
   capturer_ = std::move(desktop_capturer);
   webrtc_transport_ = webrtc_transport;
   // TODO(isheriff): make this codec independent

remoting/protocol/webrtc_video_stream.h

@@ -13,6 +13,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/single_thread_task_runner.h"
 #include "base/threading/thread_checker.h"
 #include "remoting/codec/webrtc_video_encoder.h"
 #include "remoting/protocol/host_video_stats_dispatcher.h"

services/ui/public/cpp/gles2_context.h

@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "base/macros.h"
+#include "base/single_thread_task_runner.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 namespace gpu {

services/ui/surfaces/surfaces_context_provider.cc

@@ -9,6 +9,7 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
+#include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"

services/ui/surfaces/surfaces_context_provider.h

@@ -10,6 +10,7 @@
 #include <memory>
 
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
 #include "base/threading/non_thread_safe.h"
 #include "cc/output/context_provider.h"
 #include "ui/gfx/native_widget_types.h"

services/ui/ws/server_window_compositor_frame_sink.cc

@@ -6,6 +6,8 @@
 
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
+#include "base/single_thread_task_runner.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/texture_mailbox_deleter.h"

services/ui/ws/server_window_compositor_frame_sink.h

@@ -5,9 +5,11 @@
 #ifndef SERVICES_UI_WS_SERVER_WINDOW_COMPOSITOR_FRAME_SINK_H_
 #define SERVICES_UI_WS_SERVER_WINDOW_COMPOSITOR_FRAME_SINK_H_
 
+#include <memory>
 #include <set>
 
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
 #include "cc/ipc/compositor_frame.mojom.h"
 #include "cc/ipc/mojo_compositor_frame_sink.mojom.h"
 #include "cc/output/context_provider.h"
@@ -23,6 +25,10 @@
 #include "services/ui/surfaces/surfaces_context_provider.h"
 #include "services/ui/ws/ids.h"
 
+namespace base {
+class SingleThreadTaskRunner;
+}
+
 namespace gpu {
 class GpuMemoryBufferManager;
 }

storage/browser/blob/blob_async_builder_host.h

@@ -17,7 +17,6 @@
 #include "base/callback.h"
 #include "base/files/file.h"
 #include "base/macros.h"
-#include "base/memory/ref_counted.h"
 #include "base/memory/shared_memory_handle.h"
 #include "base/memory/weak_ptr.h"
 #include "storage/browser/blob/blob_async_transport_request_builder.h"

storage/browser/blob/blob_data_handle.cc

@@ -103,10 +103,7 @@ BlobDataHandle::BlobDataHandle(const std::string& uuid,
   DCHECK(io_task_runner_->RunsTasksOnCurrentThread());
 }
 
-BlobDataHandle::BlobDataHandle(const BlobDataHandle& other) {
-  io_task_runner_ = other.io_task_runner_;
-  shared_ = other.shared_;
-}
+BlobDataHandle::BlobDataHandle(const BlobDataHandle& other) = default;
 
 BlobDataHandle::~BlobDataHandle() {
   if (!io_task_runner_->RunsTasksOnCurrentThread()) {
@@ -117,6 +114,9 @@ BlobDataHandle::~BlobDataHandle() {
   }
 }
 
+BlobDataHandle& BlobDataHandle::operator=(
+    const BlobDataHandle& other) = default;
+
 bool BlobDataHandle::IsBeingBuilt() const {
   DCHECK(io_task_runner_->RunsTasksOnCurrentThread());
   if (!shared_->context_)

storage/browser/blob/blob_data_handle.h

@@ -47,6 +47,9 @@ class STORAGE_EXPORT BlobDataHandle
   BlobDataHandle(const BlobDataHandle& other);  // May be copied on any thread.
   ~BlobDataHandle() override;                   // May be deleted on any thread.
 
+  // Assignment operator matching copy constructor.
+  BlobDataHandle& operator=(const BlobDataHandle& other);
+
   // Returns if this blob is still constructing. If so, one can use the
   // RunOnConstructionComplete to wait.
   // Must be called on IO thread.

third_party/WebKit/Source/platform/DEPS

@@ -4,7 +4,6 @@ include_rules = [
     "+base/bind.h",
     "+base/callback.h",
     "+base/files",
-    "+base/test/fuzzed_data_provider.h",
     "+base/guid.h",
     "+base/json",
     "+base/location.h",
@@ -13,11 +12,13 @@ include_rules = [
     "+base/metrics/histogram_base.h",
     "+base/metrics/histogram_samples.h",
     "+base/metrics/sparse_histogram.h",
+    "+base/single_thread_task_runner.h",
     "+base/strings/string_util.h",
     "+base/strings/stringprintf.h",
     "+base/synchronization/waitable_event.h",
     "+base/sys_info.h",
     "+base/test",
+    "+base/test/fuzzed_data_provider.h",
     "+base/threading/thread_task_runner_handle.h",
     "+base/time",
     "+base/timer",

third_party/WebKit/Source/platform/WebTaskRunner.cpp

@@ -4,6 +4,8 @@
 
 #include "public/platform/WebTaskRunner.h"
 
+#include "base/single_thread_task_runner.h"
+
 namespace blink {
 
 // This class holds a reference to a TaskHandle to keep it alive while a task is

third_party/WebKit/Source/platform/heap/PersistentNode.cpp

@@ -4,6 +4,7 @@
 
 #include "platform/heap/PersistentNode.h"
 
+#include "base/debug/alias.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {