Simplify CookieMonster::SetAllCookies{,Async}() implementation.

net/cookies/cookie_monster.h

 // 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.
 
 // Brought to you by the letter D and the number 2.
 
 #ifndef NET_COOKIES_COOKIE_MONSTER_H_
 #define NET_COOKIES_COOKIE_MONSTER_H_
 
 #include <stddef.h>
@@ skipping 131 matching lines @@
                 CookieMonsterDelegate* delegate,
                 ChannelIDService* channel_id_service);
 
   // Only used during unit testing.
   CookieMonster(PersistentCookieStore* store,
                 CookieMonsterDelegate* delegate,
                 base::TimeDelta last_access_threshold);
 
   ~CookieMonster() override;
 
-  // Writes all the cookies in |list| into the store, replacing existing
-  // cookies that collide.  Does not affect cookies not listed in |list|.
+  // Writes all the cookies in |list| into the store, replacing all cookies
+  // currently present in store.
   // This method does not flush the backend.
   // TODO(rdsmith, mmenke): Do not use this function; it is deprecated
   // and should be removed.
   // See https://codereview.chromium.org/2882063002/#msg64.
   void SetAllCookiesAsync(const CookieList& list, SetCookiesCallback callback);
 
   // CookieStore implementation.
   void SetCookieWithOptionsAsync(const GURL& url,
                                  const std::string& cookie_line,
                                  const CookieOptions& options,
@@ skipping 84 matching lines @@
 
   // For validation of key values.
   FRIEND_TEST_ALL_PREFIXES(CookieMonsterTest, TestDomainTree);
   FRIEND_TEST_ALL_PREFIXES(CookieMonsterTest, TestImport);
   FRIEND_TEST_ALL_PREFIXES(CookieMonsterTest, GetKey);
   FRIEND_TEST_ALL_PREFIXES(CookieMonsterTest, TestGetKey);
 
   // For FindCookiesForKey.
   FRIEND_TEST_ALL_PREFIXES(CookieMonsterTest, ShortLivedSessionCookies);
 
-  // For ComputeCookieDiff.
-  FRIEND_TEST_ALL_PREFIXES(CookieMonsterTest, ComputeCookieDiff);
-
   // For CookieSource histogram enum.
   FRIEND_TEST_ALL_PREFIXES(CookieMonsterTest, CookieSourceHistogram);
 
   // For kSafeFromGlobalPurgeDays in CookieStore.
   FRIEND_TEST_ALL_PREFIXES(CookieMonsterTest, EvictSecureCookies);
 
   // For CookieDeleteEquivalent histogram enum.
   FRIEND_TEST_ALL_PREFIXES(CookieMonsterTest,
                            CookieDeleteEquivalentHistogramTest);
 
@@ skipping 360 matching lines @@
   base::Time CurrentTime();
 
   // Runs the callback if, or defers the callback until, the full cookie
   // database is loaded.
   void DoCookieCallback(base::OnceClosure callback);
 
   // Runs the callback if, or defers the callback until, the cookies for the
   // given URL are loaded.
   void DoCookieCallbackForURL(base::OnceClosure callback, const GURL& url);
 
-  // Computes the difference between |old_cookies| and |new_cookies|, and writes
-  // the result in |cookies_to_add| and |cookies_to_delete|.
-  // This function has the side effect of changing the order of |old_cookies|
-  // and |new_cookies|. |cookies_to_add| and |cookies_to_delete| must be empty,
-  // and none of the arguments can be null.
-  void ComputeCookieDiff(CookieList* old_cookies,
-                         CookieList* new_cookies,
-                         CookieList* cookies_to_add,
-                         CookieList* cookies_to_delete);
-
   // Run all cookie changed callbacks that are monitoring |cookie|.
   // |removed| is true if the cookie was deleted.
   void RunCookieChangedCallbacks(const CanonicalCookie& cookie,
                                  CookieStore::ChangeCause cause);
 
   // Histogram variables; see CookieMonster::InitializeHistograms() in
   // cookie_monster.cc for details.
   base::HistogramBase* histogram_expiration_duration_minutes_;
   base::HistogramBase* histogram_count_;
   base::HistogramBase* histogram_cookie_type_;
@@ skipping 147 matching lines @@
   virtual ~PersistentCookieStore() {}
 
  private:
   friend class base::RefCountedThreadSafe<PersistentCookieStore>;
   DISALLOW_COPY_AND_ASSIGN(PersistentCookieStore);
 };
 
 }  // namespace net
 
 #endif  // NET_COOKIES_COOKIE_MONSTER_H_