Reduce/remove usage of BrowserThread in content/browser/loader.

content/browser/loader/resource_message_filter.h

 // 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.
 
 #ifndef CONTENT_BROWSER_LOADER_RESOURCE_MESSAGE_FILTER_H_
 #define CONTENT_BROWSER_LOADER_RESOURCE_MESSAGE_FILTER_H_
 
 #include <memory>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner_helpers.h"
+#include "base/single_thread_task_runner.h"
 #include "content/common/content_export.h"
 #include "content/common/url_loader_factory.mojom.h"
 #include "content/public/browser/browser_associated_interface.h"
 #include "content/public/browser/browser_message_filter.h"
-#include "content/public/browser/browser_thread.h"
 #include "content/public/common/resource_type.h"
 
 namespace storage {
 class FileSystemContext;
 }  // namespace storage
 
 namespace net {
 class URLRequestContext;
 }  // namespace net
 
@@ skipping 16 matching lines @@
       public mojom::URLLoaderFactory {
  public:
   typedef base::Callback<void(ResourceType resource_type,
                               ResourceContext**,
                               net::URLRequestContext**)> GetContextsCallback;
 
   // |appcache_service|, |blob_storage_context|, |file_system_context|,
   // |service_worker_context| may be nullptr in unittests.
   // InitializeForTest() needs to be manually called for unittests where
   // OnFilterAdded() would not otherwise be called.
-  ResourceMessageFilter(int child_id,
-                        ChromeAppCacheService* appcache_service,
-                        ChromeBlobStorageContext* blob_storage_context,
-                        storage::FileSystemContext* file_system_context,
-                        ServiceWorkerContextWrapper* service_worker_context,
-                        const GetContextsCallback& get_contexts_callback);
+  ResourceMessageFilter(
+      int child_id,
+      ChromeAppCacheService* appcache_service,
+      ChromeBlobStorageContext* blob_storage_context,
+      storage::FileSystemContext* file_system_context,
+      ServiceWorkerContextWrapper* service_worker_context,
+      const GetContextsCallback& get_contexts_callback,
+      const scoped_refptr<base::SingleThreadTaskRunner>& io_thread_runner);
 
   // BrowserMessageFilter implementation.
   void OnFilterAdded(IPC::Channel* channel) override;
   void OnChannelClosing() override;
   bool OnMessageReceived(const IPC::Message& message) override;
   void OnDestruct() const override;
 
   base::WeakPtr<ResourceMessageFilter> GetWeakPtr();
 
   void CreateLoaderAndStart(mojom::URLLoaderAssociatedRequest request,
@@ skipping 10 matching lines @@
   ResourceRequesterInfo* requester_info_for_test() {
     return requester_info_.get();
   }
   void InitializeForTest();
 
  protected:
   // Protected destructor so that we can be overriden in tests.
   ~ResourceMessageFilter() override;
 
  private:
-  friend struct BrowserThread::DeleteOnThread<BrowserThread::IO>;
   friend class base::DeleteHelper<ResourceMessageFilter>;
 
   // Initializes the weak pointer of this filter in |requester_info_|.
   void InitializeOnIOThread();
 
   bool is_channel_closed_;
   scoped_refptr<ResourceRequesterInfo> requester_info_;
 
+  // Task runner for the IO thead.
+  scoped_refptr<base::SingleThreadTaskRunner> io_thread_task_runner_;
+
   // This must come last to make sure weak pointers are invalidated first.
   base::WeakPtrFactory<ResourceMessageFilter> weak_ptr_factory_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ResourceMessageFilter);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_RESOURCE_MESSAGE_FILTER_H_