Get rid of CookieMonster::Delegate typedef.

Almost everything's switched to the new one by now. Finish the job.

BUG=none

Review URL: https://codereview.chromium.org/1392973005

Cr-Commit-Position: refs/heads/master@{#353586}

7 files changed, 15 insertions, 16 deletions

diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc
index e9a5025..8f020919 100644
--- a/chrome/browser/extensions/api/cookies/cookies_api.cc
+++ b/chrome/browser/extensions/api/cookies/cookies_api.cc
@@ -148,23 +148,23 @@ void CookiesEventRouter::CookieChanged(
   // Map the internal cause to an external string.
   std::string cause;
   switch (details->cause) {
-    case net::CookieMonster::Delegate::CHANGE_COOKIE_EXPLICIT:
+    case net::CookieMonsterDelegate::CHANGE_COOKIE_EXPLICIT:
       cause = keys::kExplicitChangeCause;
       break;
 
-    case net::CookieMonster::Delegate::CHANGE_COOKIE_OVERWRITE:
+    case net::CookieMonsterDelegate::CHANGE_COOKIE_OVERWRITE:
       cause = keys::kOverwriteChangeCause;
       break;
 
-    case net::CookieMonster::Delegate::CHANGE_COOKIE_EXPIRED:
+    case net::CookieMonsterDelegate::CHANGE_COOKIE_EXPIRED:
       cause = keys::kExpiredChangeCause;
       break;
 
-    case net::CookieMonster::Delegate::CHANGE_COOKIE_EVICTED:
+    case net::CookieMonsterDelegate::CHANGE_COOKIE_EVICTED:
       cause = keys::kEvictedChangeCause;
       break;
 
-    case net::CookieMonster::Delegate::CHANGE_COOKIE_EXPIRED_OVERWRITE:
+    case net::CookieMonsterDelegate::CHANGE_COOKIE_EXPIRED_OVERWRITE:
       cause = keys::kExpiredOverwriteChangeCause;
       break;
 
diff --git a/chrome/browser/extensions/extension_cookie_monster_delegate.cc b/chrome/browser/extensions/extension_cookie_monster_delegate.cc
index e07efbd..c1316cd 100644
--- a/chrome/browser/extensions/extension_cookie_monster_delegate.cc
+++ b/chrome/browser/extensions/extension_cookie_monster_delegate.cc
@@ -30,11 +30,11 @@ ExtensionCookieMonsterDelegate::ExtensionCookieMonsterDelegate(Profile* profile)
   DCHECK(profile);
 }
 
-// net::CookieMonster::Delegate implementation.
+// net::CookieMonsterDelegate implementation.
 void ExtensionCookieMonsterDelegate::OnCookieChanged(
     const net::CanonicalCookie& cookie,
     bool removed,
-    net::CookieMonster::Delegate::ChangeCause cause) {
+    net::CookieMonsterDelegate::ChangeCause cause) {
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&ExtensionCookieMonsterDelegate::OnCookieChangedAsyncHelper,
@@ -46,7 +46,7 @@ ExtensionCookieMonsterDelegate::~ExtensionCookieMonsterDelegate() {}
 void ExtensionCookieMonsterDelegate::OnCookieChangedAsyncHelper(
     const net::CanonicalCookie& cookie,
     bool removed,
-    net::CookieMonster::Delegate::ChangeCause cause) {
+    net::CookieMonsterDelegate::ChangeCause cause) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   Profile* profile = profile_getter_.Run();
   if (profile) {
diff --git a/chrome/browser/extensions/extension_cookie_monster_delegate.h b/chrome/browser/extensions/extension_cookie_monster_delegate.h
index 75c7fc7..9ce6f93 100644
--- a/chrome/browser/extensions/extension_cookie_monster_delegate.h
+++ b/chrome/browser/extensions/extension_cookie_monster_delegate.h
@@ -17,11 +17,11 @@ class ExtensionCookieMonsterDelegate : public net::CookieMonsterDelegate {
  public:
   explicit ExtensionCookieMonsterDelegate(Profile* profile);
 
-  // net::CookieMonster::Delegate implementation.
+  // net::CookieMonsterDelegate implementation.
   void OnCookieChanged(
       const net::CanonicalCookie& cookie,
       bool removed,
-      net::CookieMonster::Delegate::ChangeCause cause) override;
+      net::CookieMonsterDelegate::ChangeCause cause) override;
 
  private:
   ~ExtensionCookieMonsterDelegate() override;
@@ -29,7 +29,7 @@ class ExtensionCookieMonsterDelegate : public net::CookieMonsterDelegate {
   void OnCookieChangedAsyncHelper(
       const net::CanonicalCookie& cookie,
       bool removed,
-      net::CookieMonster::Delegate::ChangeCause cause);
+      net::CookieMonsterDelegate::ChangeCause cause);
 
   const base::Callback<Profile*(void)> profile_getter_;
 
diff --git a/chrome/browser/net/chrome_cookie_notification_details.h b/chrome/browser/net/chrome_cookie_notification_details.h
index d54f280..5b46b19 100644
--- a/chrome/browser/net/chrome_cookie_notification_details.h
+++ b/chrome/browser/net/chrome_cookie_notification_details.h
@@ -15,7 +15,7 @@ struct ChromeCookieDetails {
  public:
   ChromeCookieDetails(const net::CanonicalCookie* cookie_copy,
                       bool is_removed,
-                      net::CookieMonster::Delegate::ChangeCause cause)
+                      net::CookieMonsterDelegate::ChangeCause cause)
       : cookie(cookie_copy),
         removed(is_removed),
         cause(cause) {
@@ -23,7 +23,7 @@ struct ChromeCookieDetails {
 
   const net::CanonicalCookie* cookie;
   bool removed;
-  net::CookieMonster::Delegate::ChangeCause cause;
+  net::CookieMonsterDelegate::ChangeCause cause;
 };
 
 #endif  // CHROME_BROWSER_NET_CHROME_COOKIE_NOTIFICATION_DETAILS_H_
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index d90f71e..9b94833 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -287,7 +287,7 @@ class ProfileIOData {
     scoped_refptr<content_settings::CookieSettings> cookie_settings;
     scoped_refptr<HostContentSettingsMap> host_content_settings_map;
     scoped_refptr<net::SSLConfigService> ssl_config_service;
-    scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate;
+    scoped_refptr<net::CookieMonsterDelegate> cookie_monster_delegate;
 #if defined(ENABLE_EXTENSIONS)
     scoped_refptr<extensions::InfoMap> extension_info_map;
 #endif
diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h
index ced1c23..72d09d0 100644
--- a/net/cookies/cookie_monster.h
+++ b/net/cookies/cookie_monster.h
@@ -67,7 +67,6 @@ class ParsedCookie;
 class NET_EXPORT CookieMonster : public CookieStore {
  public:
   class PersistentCookieStore;
-  typedef CookieMonsterDelegate Delegate;
 
   // Terminology:
   //    * The 'top level domain' (TLD) of an internet domain name is
diff --git a/net/cookies/cookie_monster_store_test.cc b/net/cookies/cookie_monster_store_test.cc
index bf422ed..4a2b3f0 100644
--- a/net/cookies/cookie_monster_store_test.cc
+++ b/net/cookies/cookie_monster_store_test.cc
@@ -93,7 +93,7 @@ MockCookieMonsterDelegate::MockCookieMonsterDelegate() {
 void MockCookieMonsterDelegate::OnCookieChanged(
     const CanonicalCookie& cookie,
     bool removed,
-    CookieMonster::Delegate::ChangeCause cause) {
+    CookieMonsterDelegate::ChangeCause cause) {
   CookieNotification notification(cookie, removed);
   changes_.push_back(notification);
 }