Promote CookieMonster::DeleteCanonicalCookieAsync to CookieStore.

chrome/browser/browsing_data/browsing_data_cookie_helper.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 "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 50 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&BrowsingDataCookieHelper::DeleteCookieOnIOThread,
                  this, cookie));
 }
 
 void BrowsingDataCookieHelper::FetchCookiesOnIOThread(
     const FetchCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(!callback.is_null());
-  scoped_refptr<net::CookieMonster> cookie_monster =
-      request_context_getter_->GetURLRequestContext()->
-      cookie_store()->GetCookieMonster();
-  if (cookie_monster.get()) {
-    cookie_monster->GetAllCookiesAsync(base::Bind(&OnFetchComplete, callback));
-  } else {
-    OnFetchComplete(callback, net::CookieList());
-  }
+  request_context_getter_->GetURLRequestContext()->cookie_store()->
+      GetAllCookiesAsync(base::Bind(&OnFetchComplete, callback));
 }
 
 void BrowsingDataCookieHelper::DeleteCookieOnIOThread(
     const net::CanonicalCookie& cookie) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  scoped_refptr<net::CookieMonster> cookie_monster =
-      request_context_getter_->GetURLRequestContext()->
-      cookie_store()->GetCookieMonster();
-  if (cookie_monster.get()) {
-    cookie_monster->DeleteCanonicalCookieAsync(
-        cookie, net::CookieMonster::DeleteCookieCallback());
-  }
+  request_context_getter_->GetURLRequestContext()->cookie_store()->
+      DeleteCanonicalCookieAsync(
+          cookie, net::CookieStore::DeleteCallback());
 }
 
 CannedBrowsingDataCookieHelper::CannedBrowsingDataCookieHelper(
     net::URLRequestContextGetter* request_context_getter)
     : BrowsingDataCookieHelper(request_context_getter) {
 }
 
 CannedBrowsingDataCookieHelper::~CannedBrowsingDataCookieHelper() {
   Reset();
 }
@@ skipping 34 matching lines @@
 
 size_t CannedBrowsingDataCookieHelper::GetCookieCount() const {
   size_t count = 0;
   for (const auto& pair : origin_cookie_set_map_)
     count += pair.second->size();
   return count;
 }
 
 
 void CannedBrowsingDataCookieHelper::StartFetching(
-    const net::CookieMonster::GetCookieListCallback& callback) {
+    const net::CookieStore::GetCookieListCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   net::CookieList cookie_list;
   for (const auto& pair : origin_cookie_set_map_) {
     cookie_list.insert(cookie_list.begin(), pair.second->begin(),
                        pair.second->end());
   }
   callback.Run(cookie_list);
 }
 
 void CannedBrowsingDataCookieHelper::DeleteCookie(
@@ skipping 41 matching lines @@
   // TODO(markusheintz): A) Change the GetCookiesCount method to prevent
   // counting cookies multiple times if they are stored in multiple cookie
   // sets.  B) Replace the GetCookieFor method call below with:
   // "GetCookiesFor(frame_url.GetOrigin());"
   CR_DEFINE_STATIC_LOCAL(const GURL, origin_cookie_url, (kGlobalCookieSetURL));
   canonical_cookie::CookieHashSet* cookie_set =
       GetCookiesFor(origin_cookie_url);
   DeleteMatchingCookie(cookie, cookie_set);
   cookie_set->insert(cookie);
 }