Replace GetIOMessageLoopProxy() with GetNetworkTaskRunner() in UrlRequestContextGetter.

Also updated all code that depends on that methods.

TBR=mnissler@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10539148

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

3 files changed, 16 insertions, 16 deletions

diff --git a/remoting/host/url_fetcher.cc b/remoting/host/url_fetcher.cc
index 606d1f9..91b23b3 100644
--- a/remoting/host/url_fetcher.cc
+++ b/remoting/host/url_fetcher.cc
@@ -51,7 +51,7 @@ class UrlFetcher::Core : public base::RefCountedThreadSafe<Core>,
   Method method_;
 
   scoped_refptr<base::MessageLoopProxy> delegate_message_loop_;
-  scoped_refptr<base::MessageLoopProxy> io_message_loop_;
+  scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
 
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
 
@@ -100,29 +100,29 @@ void UrlFetcher::Core::SetHeader(const std::string& key,
 
 void UrlFetcher::Core::Start(const UrlFetcher::DoneCallback& done_callback) {
   done_callback_ = done_callback;
-  io_message_loop_ = request_context_getter_->GetIOMessageLoopProxy();
-  DCHECK(io_message_loop_);
-  io_message_loop_->PostTask(FROM_HERE, base::Bind(
+  network_task_runner_ = request_context_getter_->GetNetworkTaskRunner();
+  DCHECK(network_task_runner_);
+  network_task_runner_->PostTask(FROM_HERE, base::Bind(
       &UrlFetcher::Core::DoStart, this));
 }
 
 void UrlFetcher::Core::Detach() {
   DCHECK(delegate_message_loop_->BelongsToCurrentThread());
-  io_message_loop_->PostTask(
+  network_task_runner_->PostTask(
       FROM_HERE, base::Bind(&UrlFetcher::Core::CancelRequest, this));
   done_callback_.Reset();
 }
 
 void UrlFetcher::Core::OnResponseStarted(net::URLRequest* request) {
   DCHECK_EQ(request, request_.get());
-  DCHECK(io_message_loop_->BelongsToCurrentThread());
+  DCHECK(network_task_runner_->BelongsToCurrentThread());
   ReadResponse();
 }
 
 void UrlFetcher::Core::OnReadCompleted(net::URLRequest* request,
                                        int bytes_read) {
   DCHECK_EQ(request, request_.get());
-  DCHECK(io_message_loop_->BelongsToCurrentThread());
+  DCHECK(network_task_runner_->BelongsToCurrentThread());
 
   do {
     if (!request_->status().is_success() || bytes_read <= 0)
@@ -141,7 +141,7 @@ void UrlFetcher::Core::OnReadCompleted(net::URLRequest* request,
 }
 
 void UrlFetcher::Core::DoStart() {
-  DCHECK(io_message_loop_->BelongsToCurrentThread());
+  DCHECK(network_task_runner_->BelongsToCurrentThread());
 
   request_.reset(new net::URLRequest(url_, this));
   request_->set_context(request_context_getter_->GetURLRequestContext());
diff --git a/remoting/host/url_request_context.cc b/remoting/host/url_request_context.cc
index f254258..3781b39 100644
--- a/remoting/host/url_request_context.cc
+++ b/remoting/host/url_request_context.cc
@@ -116,9 +116,9 @@ URLRequestContextGetter::URLRequestContextGetter(
     base::MessageLoopProxy* ui_message_loop,
     MessageLoop* io_message_loop,
     MessageLoopForIO* file_message_loop)
-    : io_message_loop_proxy_(io_message_loop->message_loop_proxy()) {
+    : network_task_runner_(io_message_loop->message_loop_proxy()) {
   proxy_config_service_.reset(CreateSystemProxyConfigService(
-      ui_message_loop, io_message_loop_proxy_, file_message_loop));
+      ui_message_loop, network_task_runner_, file_message_loop));
 }
 
 net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
@@ -129,9 +129,9 @@ net::URLRequestContext* URLRequestContextGetter::GetURLRequestContext() {
   return url_request_context_.get();
 }
 
-scoped_refptr<base::MessageLoopProxy>
-URLRequestContextGetter::GetIOMessageLoopProxy() const {
-  return io_message_loop_proxy_;
+scoped_refptr<base::SingleThreadTaskRunner>
+URLRequestContextGetter::GetNetworkTaskRunner() const {
+  return network_task_runner_;
 }
 
 URLRequestContextGetter::~URLRequestContextGetter() {}
diff --git a/remoting/host/url_request_context.h b/remoting/host/url_request_context.h
index d1f2cd3..71766b7 100644
--- a/remoting/host/url_request_context.h
+++ b/remoting/host/url_request_context.h
@@ -45,14 +45,14 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
 
   // Overridden from net::URLRequestContextGetter:
   virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
-  virtual scoped_refptr<base::MessageLoopProxy>
-      GetIOMessageLoopProxy() const OVERRIDE;
+  virtual scoped_refptr<base::SingleThreadTaskRunner>
+      GetNetworkTaskRunner() const OVERRIDE;
 
  protected:
   virtual ~URLRequestContextGetter();
 
  private:
-  scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_;
+  scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
   scoped_ptr<net::ProxyConfigService> proxy_config_service_;
   scoped_ptr<net::URLRequestContext> url_request_context_;