diff options
Diffstat (limited to 'net/base/cookie_monster.h')
| -rw-r--r-- | net/base/cookie_monster.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/net/base/cookie_monster.h b/net/base/cookie_monster.h index 109fe94..ee869e9 100644 --- a/net/base/cookie_monster.h +++ b/net/base/cookie_monster.h @@ -14,8 +14,6 @@ #include "base/basictypes.h" #include "base/lock.h" -#include "base/logging.h" -#include "base/non_thread_safe.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/time.h" @@ -35,7 +33,7 @@ namespace net { // // TODO(deanm) Implement CookieMonster, the cookie database. // - Verify that our domain enforcement and non-dotted handling is correct -class CookieMonster : public CookieStore, NonThreadSafe { +class CookieMonster : public CookieStore { public: class CanonicalCookie; class Delegate; @@ -90,10 +88,7 @@ class CookieMonster : public CookieStore, NonThreadSafe { virtual std::string GetCookiesWithOptions(const GURL& url, const CookieOptions& options); virtual void DeleteCookie(const GURL& url, const std::string& cookie_name); - virtual CookieMonster* GetCookieMonster() { - DCHECK(CalledOnValidThread()); - return this; - } + virtual CookieMonster* GetCookieMonster() { return this; } // Sets a cookie given explicit user-provided cookie attributes. The cookie // name, value, domain, etc. are each provided as separate strings. This @@ -117,7 +112,6 @@ class CookieMonster : public CookieStore, NonThreadSafe { bool SetCookieWithCreationTime(const GURL& url, const std::string& cookie_line, const base::Time& creation_time) { - DCHECK(CalledOnValidThread()); return SetCookieWithCreationTimeAndOptions(url, cookie_line, creation_time, CookieOptions()); } @@ -289,8 +283,6 @@ class CookieMonster : public CookieStore, NonThreadSafe { scoped_refptr<Delegate> delegate_; - // TODO(willchan): Remove this lock after making sure CookieMonster is - // completely single threaded. // Lock for thread-safety Lock lock_; |