Promote CookieMonster::DeleteCanonicalCookieAsync to CookieStore.

chrome/browser/browsing_data/browsing_data_cookie_helper.cc

Index: chrome/browser/browsing_data/browsing_data_cookie_helper.cc
diff --git a/chrome/browser/browsing_data/browsing_data_cookie_helper.cc b/chrome/browser/browsing_data/browsing_data_cookie_helper.cc
index 6f72890365da0aaaeb0b7c9506cab38ed5987337..cac6e2d68d99800ee3c7aa2aad70f7d4f6e19f76 100644
--- a/chrome/browser/browsing_data/browsing_data_cookie_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_cookie_helper.cc
@@ -68,26 +68,16 @@ 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(
@@ -142,7 +132,7 @@ size_t CannedBrowsingDataCookieHelper::GetCookieCount() const {
 
 
 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_) {