Remove calls to MessageLoop::current() in ios.

ios/crnet/crnet_environment.mm

 // Copyright 2014 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 "ios/crnet/crnet_environment.h"
 
 #import <Foundation/Foundation.h>
 
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/atomicops.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/i18n/icu_util.h"
 #include "base/json/json_writer.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_block.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/path_service.h"
+#include "base/single_thread_task_runner.h"
 #include "base/threading/worker_pool.h"
 #include "components/prefs/json_pref_store.h"
 #include "components/prefs/pref_filter.h"
 #include "ios/crnet/sdch_owner_pref_storage.h"
 #include "ios/net/cookies/cookie_store_ios.h"
 #include "ios/net/crn_http_protocol_handler.h"
 #include "ios/net/empty_nsurlcache.h"
 #include "ios/net/http_cache_helper.h"
 #include "ios/net/request_tracker.h"
 #include "ios/web/public/user_agent.h"
@@ skipping 133 matching lines @@
 void CrNetEnvironment::StartNetLog(base::FilePath::StringType file_name,
     bool log_bytes) {
   DCHECK(file_name.length());
   PostToFileUserBlockingThread(FROM_HERE,
       base::Bind(&CrNetEnvironment::StartNetLogInternal,
                  base::Unretained(this), file_name, log_bytes));
 }
 
 void CrNetEnvironment::StartNetLogInternal(
     base::FilePath::StringType file_name, bool log_bytes) {
-  DCHECK(base::MessageLoop::current() ==
-         file_user_blocking_thread_->message_loop());
+  DCHECK(file_user_blocking_thread_->task_runner()->BelongsToCurrentThread());
   DCHECK(file_name.length());
   DCHECK(net_log_);
 
   if (net_log_observer_)
     return;
 
   base::FilePath temp_dir;
   if (!base::GetTempDir(&temp_dir))
     return;
 
@@ skipping 12 matching lines @@
                                     nullptr);
 }
 
 void CrNetEnvironment::StopNetLog() {
   PostToFileUserBlockingThread(FROM_HERE,
       base::Bind(&CrNetEnvironment::StopNetLogInternal,
       base::Unretained(this)));
 }
 
 void CrNetEnvironment::StopNetLogInternal() {
-  DCHECK(base::MessageLoop::current() ==
-         file_user_blocking_thread_->message_loop());
+  DCHECK(file_user_blocking_thread_->task_runner()->BelongsToCurrentThread());
   if (net_log_observer_) {
     net_log_observer_->StopObserving(nullptr);
     net_log_observer_.reset();
   }
 }
 
 void CrNetEnvironment::CloseAllSpdySessions() {
   PostToNetworkThread(FROM_HERE,
       base::Bind(&CrNetEnvironment::CloseAllSpdySessionsInternal,
       base::Unretained(this)));
 }
 
 void CrNetEnvironment::SetRequestFilterBlock(RequestFilterBlock block) {
   http_protocol_handler_delegate_.reset(
       new CrNetHttpProtocolHandlerDelegate(main_context_getter_.get(), block));
   net::HTTPProtocolHandlerDelegate::SetInstance(
       http_protocol_handler_delegate_.get());
 }
 
 net::HttpNetworkSession* CrNetEnvironment::GetHttpNetworkSession(
     net::URLRequestContext* context) {
   DCHECK(context);
   if (!context->http_transaction_factory())
     return nullptr;
 
   return context->http_transaction_factory()->GetSession();
 }
 
 void CrNetEnvironment::CloseAllSpdySessionsInternal() {
-  DCHECK(base::MessageLoop::current() ==
-         network_io_thread_->message_loop());
+  DCHECK(network_io_thread_->task_runner()->BelongsToCurrentThread());
 
   net::HttpNetworkSession* http_network_session =
       GetHttpNetworkSession(GetMainContextGetter()->GetURLRequestContext());
 
   if (http_network_session) {
     net::SpdySessionPool *spdy_session_pool =
         http_network_session->spdy_session_pool();
     if (spdy_session_pool)
       spdy_session_pool->CloseCurrentSessions(net::ERR_ABORTED);
   }
@@ skipping 63 matching lines @@
   } else {
     // Set up an empty default cache, with default size.
     // TODO(droger): If the NSURLCache is to be used, its size should most
     // likely be changed. On an iPod2 with iOS4, the default size is 512k.
     [NSURLCache setSharedURLCache:[[[NSURLCache alloc] init] autorelease]];
     [NSURLProtocol unregisterClass:[CRNPauseableHTTPProtocolHandler class]];
   }
 }
 
 void CrNetEnvironment::ConfigureSdchOnNetworkThread() {
-  DCHECK(base::MessageLoop::current() == network_io_thread_->message_loop());
+  DCHECK(network_io_thread_->task_runner()->BelongsToCurrentThread());
   net::URLRequestContext* context =
       main_context_getter_->GetURLRequestContext();
 
   if (!sdch_enabled_) {
     DCHECK_EQ(static_cast<net::SdchManager*>(nullptr), context->sdch_manager());
     return;
   }
 
   sdch_manager_.reset(new net::SdchManager());
   sdch_owner_.reset(new net::SdchOwner(sdch_manager_.get(), context));
   if (!sdch_pref_store_filename_.empty()) {
     base::FilePath path(sdch_pref_store_filename_);
     pref_store_worker_pool_ = file_user_blocking_thread_->task_runner();
     net_pref_store_ = new JsonPrefStore(path, pref_store_worker_pool_.get(),
                                         std::unique_ptr<PrefFilter>());
     net_pref_store_->ReadPrefsAsync(nullptr);
     sdch_owner_->EnablePersistentStorage(
         std::unique_ptr<net::SdchOwner::PrefStorage>(
             new SdchOwnerPrefStorage(net_pref_store_.get())));
   }
   context->set_sdch_manager(sdch_manager_.get());
 }
 
 void CrNetEnvironment::InitializeOnNetworkThread() {
-  DCHECK(base::MessageLoop::current() == network_io_thread_->message_loop());
+  DCHECK(network_io_thread_->task_runner()->BelongsToCurrentThread());
 
   ConfigureSdchOnNetworkThread();
 
   NSString* bundlePath =
       [[NSBundle mainBundle] pathForResource:@"crnet_resources"
                                       ofType:@"bundle"];
   NSBundle* bundle = [NSBundle bundleWithPath:bundlePath];
   NSString* acceptableLanguages = NSLocalizedStringWithDefaultValue(
       @"IDS_ACCEPT_LANGUAGES",
       @"Localizable",
@@ skipping 113 matching lines @@
 
   return user_agent_settings->GetUserAgent();
 }
 
 void CrNetEnvironment::ClearCache(ClearCacheCallback callback) {
   PostToNetworkThread(
       FROM_HERE,
       base::Bind(&net::ClearHttpCache, main_context_getter_,
                  network_io_thread_->task_runner(), base::BindBlock(callback)));
 }