Make CookieStore no longer threadsafe.

net/cookies/cookie_store.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 number 42.
 
 #ifndef NET_COOKIES_COOKIE_STORE_H_
 #define NET_COOKIES_COOKIE_STORE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/callback_list.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "net/base/net_export.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_options.h"
 
 class GURL;
 
 namespace net {
 
 class CookieMonster;
 
-// An interface for storing and retrieving cookies. Implementations need to
-// be thread safe as its methods can be accessed from IO as well as UI threads.
+// An interface for storing and retrieving cookies. Implementations are not
+// thread safe, as with most other net classes. All methods must be invoked on
+// the network thread, and all callbacks will be calle there.
 //
-// All async functions may either invoke the callback asynchronously on the same
-// thread, or they may be invoked immediately (prior to return of the
-// asynchronous function).
+// All async functions may either invoke the callback asynchronously, or they
+// may be invoked immediately (prior to return of the asynchronous function).
+// Destroying the CookieStore will cancel pending async callbacks.
 class NET_EXPORT CookieStore : public base::RefCountedThreadSafe<CookieStore> {
  public:
   // Callback definitions.
   typedef base::Callback<void(const CookieList& cookies)> GetCookieListCallback;
   typedef base::Callback<void(const std::string& cookie)> GetCookiesCallback;
   typedef base::Callback<void(bool success)> SetCookiesCallback;
   typedef base::Callback<void(int num_deleted)> DeleteCallback;
   typedef base::Callback<void(const CanonicalCookie& cookie, bool removed)>
       CookieChangedCallback;
   typedef base::CallbackList<void(const CanonicalCookie& cookie, bool removed)>
@@ skipping 121 matching lines @@
       const GURL& url,
       const DeleteCallback& callback) = 0;
 
   virtual void DeleteSessionCookiesAsync(const DeleteCallback&) = 0;
 
   // Deletes all cookies in the store.
   void DeleteAllAsync(const DeleteCallback& callback);
 
   // Flush the backing store (if any) to disk and post the given callback when
   // done.
-  // WARNING: THE CALLBACK WILL RUN ON A RANDOM THREAD. IT MUST BE THREAD SAFE.
-  // It may be posted to the current thread, or it may run on the thread that
-  // actually does the flushing. Your Task should generally post a notification
-  // to the thread you actually want to be notified on.
-  // TODO(mmenke):  Once this class is no longer thread-safe, this will always
-  // be invoked on the CookieStore's thread, and this comment can be removed.
-  // https://crbug.com/46185
   virtual void FlushStore(const base::Closure& callback) = 0;
 
   // Protects session cookies from deletion on shutdown, if the underlying
   // CookieStore implemention is currently configured to store them to disk.
   // Otherwise, does nothing.
   virtual void SetForceKeepSessionState();
 
   // Add a callback to be notified when the set of cookies named |name| that
   // would be sent for a request to |url| changes. The returned handle is
   // guaranteed not to hold a hard reference to the CookieStore object.
@@ skipping 17 matching lines @@
 
  protected:
   friend class base::RefCountedThreadSafe<CookieStore>;
   CookieStore();
   virtual ~CookieStore();
 };
 
 }  // namespace net
 
 #endif  // NET_COOKIES_COOKIE_STORE_H_