Adding ThreadTaskRunnerHandle in lieu of MessageLoopProxy in net/cert and net/cookies module

net/cookies/cookie_monster.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.
 
 // Portions of this code based on Mozilla:
 //   (netwerk/cookie/src/nsCookieService.cpp)
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ skipping 36 matching lines @@
 #include <algorithm>
 #include <functional>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
-#include "base/message_loop/message_loop_proxy.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/profiler/scoped_tracker.h"
+#include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "base/thread_task_runner_handle.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_util.h"
 #include "net/cookies/parsed_cookie.h"
 
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
 
 // In steady state, most cookie requests can be satisfied by the in memory
@@ skipping 313 matching lines @@
   // appropriate thread. Maintains a reference to this CookieMonsterTask
   // instance until the callback completes.
   void InvokeCallback(base::Closure callback);
 
   CookieMonster* cookie_monster() { return cookie_monster_; }
 
  private:
   friend class base::RefCountedThreadSafe<CookieMonsterTask>;
 
   CookieMonster* cookie_monster_;
-  scoped_refptr<base::MessageLoopProxy> thread_;
+  scoped_refptr<base::SingleThreadTaskRunner> thread_;
 
   DISALLOW_COPY_AND_ASSIGN(CookieMonsterTask);
 };
 
 CookieMonster::CookieMonsterTask::CookieMonsterTask(
     CookieMonster* cookie_monster)
     : cookie_monster_(cookie_monster),
-      thread_(base::MessageLoopProxy::current()) {
+      thread_(base::ThreadTaskRunnerHandle::Get()) {
 }
 
 CookieMonster::CookieMonsterTask::~CookieMonsterTask() {
 }
 
 // Unfortunately, one cannot re-bind a Callback with parameters into a closure.
 // Therefore, the closure passed to InvokeCallback is a clumsy binding of
 // Callback::Run on a wrapped Callback instance. Since Callback is not
 // reference counted, we bind to an instance that is a member of the
 // CookieMonsterTask subclass. Then, we cannot simply post the callback to a
@@ skipping 2006 matching lines @@
 
 scoped_ptr<CookieStore::CookieChangedSubscription>
 CookieMonster::AddCallbackForCookie(const GURL& gurl,
                                     const std::string& name,
                                     const CookieChangedCallback& callback) {
   base::AutoLock autolock(lock_);
   std::pair<GURL, std::string> key(gurl, name);
   if (hook_map_.count(key) == 0)
     hook_map_[key] = make_linked_ptr(new CookieChangedCallbackList());
   return hook_map_[key]->Add(
-      base::Bind(&RunAsync, base::MessageLoopProxy::current(), callback));
+      base::Bind(&RunAsync, base::ThreadTaskRunnerHandle::Get(), callback));
 }
 
 #if defined(OS_ANDROID)
 void CookieMonster::SetEnableFileScheme(bool accept) {
   // This assumes "file" is always at the end of the array. See the comment
   // above kDefaultCookieableSchemes.
   //
   // TODO(mkwst): We're keeping this method around to support the
   // 'CookieManager::setAcceptFileSchemeCookies' method on Android's WebView;
   // if/when we can deprecate and remove that method, we can remove this one
@@ skipping 20 matching lines @@
        it != hook_map_.end(); ++it) {
     std::pair<GURL, std::string> key = it->first;
     if (cookie.IncludeForRequestURL(key.first, opts) &&
         cookie.Name() == key.second) {
       it->second->Notify(cookie, removed);
     }
   }
 }
 
 }  // namespace net