Pass a RemovalCause to CookieChangedCallback

chrome/browser/extensions/api/cookies/cookies_api.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.
 
 // Implements the Chrome Extensions Cookies API.
 
 #include "chrome/browser/extensions/api/cookies/cookies_api.h"
 
 #include <memory>
 #include <utility>
@@ skipping 125 matching lines @@
   std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   dict->SetBoolean(keys::kRemovedKey, details->removed);
 
   cookies::Cookie cookie = cookies_helpers::CreateCookie(
       *details->cookie, cookies_helpers::GetStoreIdFromProfile(profile));
   dict->Set(keys::kCookieKey, cookie.ToValue());
 
   // Map the internal cause to an external string.
   std::string cause;
   switch (details->cause) {
-    case net::CookieMonsterDelegate::CHANGE_COOKIE_EXPLICIT:
+    case net::CookieStore::ChangeCause::INSERTED:
+    case net::CookieStore::ChangeCause::EXPLICIT:
       cause = keys::kExplicitChangeCause;
       break;
 
-    case net::CookieMonsterDelegate::CHANGE_COOKIE_OVERWRITE:
+    case net::CookieStore::ChangeCause::OVERWRITE:
       cause = keys::kOverwriteChangeCause;
       break;
 
-    case net::CookieMonsterDelegate::CHANGE_COOKIE_EXPIRED:
+    case net::CookieStore::ChangeCause::EXPIRED:
       cause = keys::kExpiredChangeCause;
       break;
 
-    case net::CookieMonsterDelegate::CHANGE_COOKIE_EVICTED:
+    case net::CookieStore::ChangeCause::EVICTED:
       cause = keys::kEvictedChangeCause;
       break;
 
-    case net::CookieMonsterDelegate::CHANGE_COOKIE_EXPIRED_OVERWRITE:
+    case net::CookieStore::ChangeCause::EXPIRED_OVERWRITE:
       cause = keys::kExpiredOverwriteChangeCause;
       break;
 
+    case net::CookieStore::ChangeCause::UNKNOWN_DELETION:
     default:

[Devlin, 2016/09/27 15:48:05]

Can we remove the default: case here?

[nharper, 2016/09/27 17:43:48]

Done.

       NOTREACHED();
   }
   dict->SetString(keys::kCauseKey, cause);
 
   args->Append(std::move(dict));
 
   GURL cookie_domain =
       cookies_helpers::GetURLFromCanonicalCookie(*details->cookie);
   DispatchEvent(profile, events::COOKIES_ON_CHANGED,
                 cookies::OnChanged::kEventName, std::move(args), cookie_domain);
@@ skipping 408 matching lines @@
 BrowserContextKeyedAPIFactory<CookiesAPI>* CookiesAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 void CookiesAPI::OnListenerAdded(const EventListenerInfo& details) {
   cookies_event_router_.reset(new CookiesEventRouter(browser_context_));
   EventRouter::Get(browser_context_)->UnregisterObserver(this);
 }
 
 }  // namespace extensions