REVIEW: Subscribe to cookie store for changes in place of CookieMonsterDelegate

atom/browser/api/atom_api_cookies.cc

@@ -20,7 +20,6 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
-using atom::AtomCookieDelegate;
 using content::BrowserThread;
 
 namespace mate {
@@ -238,17 +237,16 @@ void SetCookieOnIO(scoped_refptr<net::URLRequestContextGetter> getter,
 
 }  // namespace
 
-Cookies::Cookies(v8::Isolate* isolate,
-                 AtomBrowserContext* browser_context)
-      : request_context_getter_(browser_context->url_request_context_getter()),
-        cookie_delegate_(browser_context->cookie_delegate()) {
+Cookies::Cookies(v8::Isolate* isolate, AtomBrowserContext* browser_context)
+    : request_context_getter_(browser_context->url_request_context_getter()) {
   Init(isolate);
-  cookie_delegate_->AddObserver(this);
+  cookie_change_subscription_ =
+      browser_context->url_request_context_getter()
+          ->RegisterCookieChangeCallback(
+              base::Bind(&Cookies::OnCookieChanged, base::Unretained(this)));
 }
 
-Cookies::~Cookies() {
-  cookie_delegate_->RemoveObserver(this);
-}
+Cookies::~Cookies() {}
 
 void Cookies::Get(const base::DictionaryValue& filter,
                   const GetCallback& callback) {
@@ -283,10 +281,8 @@ void Cookies::FlushStore(const base::Closure& callback) {
       base::Bind(FlushCookieStoreOnIOThread, getter, callback));
 }
 
-void Cookies::OnCookieChanged(const net::CanonicalCookie& cookie,
-                              bool removed,
-                              net::CookieStore::ChangeCause cause) {
-  Emit("changed", cookie, cause, removed);
+void Cookies::OnCookieChanged(const brightray::CookieDetails* details) {
+  Emit("changed", *(details->cookie), details->cause, details->removed);
 }
 
 

atom/browser/api/atom_api_cookies.h

@@ -8,8 +8,8 @@
 #include <string>
 
 #include "atom/browser/api/trackable_object.h"
-#include "atom/browser/net/atom_cookie_delegate.h"
 #include "base/callback.h"
+#include "brightray/browser/net/cookie_details.h"
 #include "native_mate/handle.h"
 #include "net/cookies/canonical_cookie.h"
 
@@ -27,8 +27,7 @@ class AtomBrowserContext;
 
 namespace api {
 
-class Cookies : public mate::TrackableObject<Cookies>,
-                public AtomCookieDelegate::Observer {
+class Cookies : public mate::TrackableObject<Cookies> {
  public:
   enum Error {
     SUCCESS,
@@ -55,14 +54,14 @@ class Cookies : public mate::TrackableObject<Cookies>,
   void Set(const base::DictionaryValue& details, const SetCallback& callback);
   void FlushStore(const base::Closure& callback);
 
-  // AtomCookieDelegate::Observer:
-  void OnCookieChanged(const net::CanonicalCookie& cookie,
-                       bool removed,
-                       net::CookieStore::ChangeCause cause) override;
+  // brightray::URLRequestContextGetter subscription:
+  void OnCookieChanged(const brightray::CookieDetails*);
 
  private:
   net::URLRequestContextGetter* request_context_getter_;
-  scoped_refptr<AtomCookieDelegate> cookie_delegate_;
+  std::unique_ptr<
+      base::CallbackList<void(const brightray::CookieDetails*)>::Subscription>
+      cookie_change_subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(Cookies);
 };

atom/browser/atom_browser_context.cc

@@ -70,8 +70,7 @@ std::string RemoveWhitespace(const std::string& str) {
 AtomBrowserContext::AtomBrowserContext(const std::string& partition,
                                        bool in_memory,
                                        const base::DictionaryValue& options)
-    : brightray::BrowserContext(partition, in_memory),
-      cookie_delegate_(new AtomCookieDelegate) {
+    : brightray::BrowserContext(partition, in_memory) {
   // Construct user agent string.
   Browser* browser = Browser::Get();
   std::string name = RemoveWhitespace(browser->GetName());
@@ -108,10 +107,6 @@ AtomBrowserContext::CreateNetworkDelegate() {
   return base::MakeUnique<AtomNetworkDelegate>();
 }
 
-net::CookieMonsterDelegate* AtomBrowserContext::CreateCookieDelegate() {
-  return cookie_delegate();
-}
-
 std::string AtomBrowserContext::GetUserAgent() {
   return user_agent_;
 }

atom/browser/atom_browser_context.h

@@ -8,9 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "atom/browser/net/atom_cookie_delegate.h"
 #include "brightray/browser/browser_context.h"
-#include "net/cookies/cookie_monster.h"
 
 namespace atom {
 
@@ -33,7 +31,6 @@ class AtomBrowserContext : public brightray::BrowserContext {
 
   // brightray::URLRequestContextGetter::Delegate:
   std::unique_ptr<net::NetworkDelegate> CreateNetworkDelegate() override;
-  net::CookieMonsterDelegate* CreateCookieDelegate() override;
   std::string GetUserAgent() override;
   std::unique_ptr<net::URLRequestJobFactory> CreateURLRequestJobFactory(
       content::ProtocolHandlerMap* protocol_handlers) override;
@@ -52,9 +49,6 @@ class AtomBrowserContext : public brightray::BrowserContext {
   void RegisterPrefs(PrefRegistrySimple* pref_registry) override;
 
   AtomBlobReader* GetBlobReader();
-  AtomCookieDelegate* cookie_delegate() const {
-    return cookie_delegate_.get();
-  }
 
  protected:
   AtomBrowserContext(const std::string& partition, bool in_memory,
@@ -69,8 +63,6 @@ class AtomBrowserContext : public brightray::BrowserContext {
   std::string user_agent_;
   bool use_cache_;
 
-  scoped_refptr<AtomCookieDelegate> cookie_delegate_;
-
   DISALLOW_COPY_AND_ASSIGN(AtomBrowserContext);
 };
 

atom/browser/net/atom_cookie_delegate.cc

@@ -1,44 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#include "atom/browser/net/atom_cookie_delegate.h"
-
-#include "content/public/browser/browser_thread.h"
-
-namespace atom {
-
-AtomCookieDelegate::AtomCookieDelegate() {
-}
-
-AtomCookieDelegate::~AtomCookieDelegate() {
-}
-
-void AtomCookieDelegate::AddObserver(Observer* observer) {
-  observers_.AddObserver(observer);
-}
-
-void AtomCookieDelegate::RemoveObserver(Observer* observer) {
-  observers_.RemoveObserver(observer);
-}
-
-void AtomCookieDelegate::NotifyObservers(
-    const net::CanonicalCookie& cookie,
-    bool removed,
-    net::CookieStore::ChangeCause cause) {
-  for (Observer& observer : observers_)
-    observer.OnCookieChanged(cookie, removed, cause);
-}
-
-void AtomCookieDelegate::OnCookieChanged(
-    const net::CanonicalCookie& cookie,
-    bool removed,
-    net::CookieStore::ChangeCause cause) {
-  content::BrowserThread::PostTask(
-      content::BrowserThread::UI,
-      FROM_HERE,
-      base::Bind(&AtomCookieDelegate::NotifyObservers,
-                 this, cookie, removed, cause));
-}
-
-}  // namespace atom

atom/browser/net/atom_cookie_delegate.h

@@ -1,48 +0,0 @@
-// Copyright (c) 2016 GitHub, Inc.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-#ifndef ATOM_BROWSER_NET_ATOM_COOKIE_DELEGATE_H_
-#define ATOM_BROWSER_NET_ATOM_COOKIE_DELEGATE_H_
-
-#include "base/observer_list.h"
-#include "net/cookies/cookie_monster.h"
-
-namespace atom {
-
-class AtomCookieDelegate : public net::CookieMonsterDelegate {
- public:
-  AtomCookieDelegate();
-  ~AtomCookieDelegate() override;
-
-  class Observer {
-   public:
-    virtual void OnCookieChanged(const net::CanonicalCookie& cookie,
-                                 bool removed,
-                                 net::CookieStore::ChangeCause cause) {}
-   protected:
-    virtual ~Observer() {}
-  };
-
-  void AddObserver(Observer* observer);
-  void RemoveObserver(Observer* observer);
-
-  // net::CookieMonsterDelegate:
-  void OnCookieChanged(const net::CanonicalCookie& cookie,
-                       bool removed,
-                       net::CookieStore::ChangeCause cause) override;
-
-
- private:
-  base::ObserverList<Observer> observers_;
-
-  void NotifyObservers(const net::CanonicalCookie& cookie,
-                       bool removed,
-                       net::CookieStore::ChangeCause cause);
-
-  DISALLOW_COPY_AND_ASSIGN(AtomCookieDelegate);
-};
-
-}   // namespace atom
-
-#endif  // ATOM_BROWSER_NET_ATOM_COOKIE_DELEGATE_H_