Revert 50296 (Causes DCHECK failures) - Make CookieMonster NonThreadSafe....

net/base/cookie_monster.cc

Index: net/base/cookie_monster.cc
===================================================================
--- net/base/cookie_monster.cc	(revision 50356)
+++ net/base/cookie_monster.cc	(working copy)
@@ -549,7 +549,6 @@
 
 void CookieMonster::SetCookieableSchemes(
     const char* schemes[], size_t num_schemes) {
-  DCHECK(CalledOnValidThread());
   AutoLock autolock(lock_);
 
   // Cookieable Schemes must be set before first use of function.
@@ -565,7 +564,6 @@
     const std::string& cookie_line,
     const Time& creation_time_or_null,
     const CookieOptions& options) {
-  DCHECK(CalledOnValidThread());
   AutoLock autolock(lock_);
 
   if (!HasCookieableScheme(url)) {
@@ -621,7 +619,6 @@
     const GURL& url, const std::string& name, const std::string& value,
     const std::string& domain, const std::string& path,
     const base::Time& expiration_time, bool secure, bool http_only) {
-  DCHECK(CalledOnValidThread());
 
   // Expect a valid domain attribute with no illegal characters.
   std::string parsed_domain = ParsedCookie::ParseValueString(domain);
@@ -839,7 +836,6 @@
 }
 
 int CookieMonster::DeleteAll(bool sync_to_store) {
-  DCHECK(CalledOnValidThread());
   AutoLock autolock(lock_);
   InitIfNecessary();
 
@@ -857,7 +853,6 @@
 int CookieMonster::DeleteAllCreatedBetween(const Time& delete_begin,
                                            const Time& delete_end,
                                            bool sync_to_store) {
-  DCHECK(CalledOnValidThread());
   AutoLock autolock(lock_);
   InitIfNecessary();
 
@@ -879,13 +874,11 @@
 
 int CookieMonster::DeleteAllCreatedAfter(const Time& delete_begin,
                                          bool sync_to_store) {
-  DCHECK(CalledOnValidThread());
   return DeleteAllCreatedBetween(delete_begin, Time(), sync_to_store);
 }
 
 int CookieMonster::DeleteAllForURL(const GURL& url,
                                    bool sync_to_store) {
-  DCHECK(CalledOnValidThread());
   AutoLock autolock(lock_);
   InitIfNecessary();
 
@@ -902,7 +895,6 @@
 bool CookieMonster::DeleteCookie(const std::string& domain,
                                  const CanonicalCookie& cookie,
                                  bool sync_to_store) {
-  DCHECK(CalledOnValidThread());
   AutoLock autolock(lock_);
   InitIfNecessary();
 
@@ -930,7 +922,6 @@
 bool CookieMonster::SetCookieWithOptions(const GURL& url,
                                          const std::string& cookie_line,
                                          const CookieOptions& options) {
-  DCHECK(CalledOnValidThread());
   return SetCookieWithCreationTimeAndOptions(url, cookie_line, Time(), options);
 }
 
@@ -948,7 +939,6 @@
 // should be fast and simple enough for now.
 std::string CookieMonster::GetCookiesWithOptions(const GURL& url,
                                                  const CookieOptions& options) {
-  DCHECK(CalledOnValidThread());
   AutoLock autolock(lock_);
   InitIfNecessary();
 
@@ -981,7 +971,6 @@
 
 void CookieMonster::DeleteCookie(const GURL& url,
                                  const std::string& cookie_name) {
-  DCHECK(CalledOnValidThread());
   AutoLock autolock(lock_);
   InitIfNecessary();
 
@@ -1013,7 +1002,6 @@
 }
 
 CookieMonster::CookieList CookieMonster::GetAllCookies() {
-  DCHECK(CalledOnValidThread());
   AutoLock autolock(lock_);
   InitIfNecessary();
 
@@ -1037,7 +1025,6 @@
 }
 
 CookieMonster::CookieList CookieMonster::GetAllCookiesForURL(const GURL& url) {
-  DCHECK(CalledOnValidThread());
   AutoLock autolock(lock_);
   InitIfNecessary();