Remove WorkerPool dependency from URLRequestFileJob.

net/url_request/url_request_context_builder.cc

 // 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.
 
 #include "net/url_request/url_request_context_builder.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 138 matching lines @@
   void StartFileThread() {
     file_thread_.StartWithOptions(
         base::Thread::Options(base::MessageLoop::TYPE_DEFAULT, 0));
   }
 
   base::MessageLoop* file_message_loop() {
     DCHECK(file_thread_.IsRunning());
     return file_thread_.message_loop();
   }
 
+  scoped_refptr<base::MessageLoopProxy> file_message_loop_proxy() {
+    DCHECK(file_thread_.IsRunning());
+    return file_thread_.message_loop_proxy();
+  }
+
  protected:
   virtual ~BasicURLRequestContext() {}
 
  private:
   base::Thread cache_thread_;
   base::Thread file_thread_;
   URLRequestContextStorage storage_;
   DISALLOW_COPY_AND_ASSIGN(BasicURLRequestContext);
 };
 
@@ skipping 14 matching lines @@
 
 URLRequestContextBuilder::HttpNetworkSessionParams::~HttpNetworkSessionParams()
 {}
 
 URLRequestContextBuilder::URLRequestContextBuilder()
     : data_enabled_(false),
       file_enabled_(false),
 #if !defined(DISABLE_FTP_SUPPORT)
       ftp_enabled_(false),
 #endif
-      http_cache_enabled_(true) {}
+      http_cache_enabled_(true) {
+}
+
 URLRequestContextBuilder::~URLRequestContextBuilder() {}
 
 #if defined(OS_LINUX) || defined(OS_ANDROID)
 void URLRequestContextBuilder::set_proxy_config_service(
     ProxyConfigService* proxy_config_service) {
   proxy_config_service_.reset(proxy_config_service);
 }
 #endif  // defined(OS_LINUX) || defined(OS_ANDROID)
 
 URLRequestContext* URLRequestContextBuilder::Build() {
@@ skipping 90 matching lines @@
         new net::HttpNetworkSession(network_session_params));
 
     http_transaction_factory = new HttpNetworkLayer(network_session.get());
   }
   storage->set_http_transaction_factory(http_transaction_factory);
 
   URLRequestJobFactoryImpl* job_factory = new URLRequestJobFactoryImpl;
   if (data_enabled_)
     job_factory->SetProtocolHandler("data", new DataProtocolHandler);
   if (file_enabled_)
-    job_factory->SetProtocolHandler("file", new FileProtocolHandler);
+    job_factory->SetProtocolHandler(
+        "file", new FileProtocolHandler(context->file_message_loop_proxy()));
 #if !defined(DISABLE_FTP_SUPPORT)
   if (ftp_enabled_) {
     ftp_transaction_factory_.reset(
         new FtpNetworkLayer(context->host_resolver()));
     job_factory->SetProtocolHandler("ftp",
         new FtpProtocolHandler(ftp_transaction_factory_.get()));
   }
 #endif
   storage->set_job_factory(job_factory);
 
   // TODO(willchan): Support sdch.
 
   return context;
 }
 
 }  // namespace net