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

chrome/browser/extensions/extension_cookies_helpers.h

 // Copyright (c) 2010 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.
 
 // Defines common functionality used by the implementation of the Chrome
 // Extensions Cookies API implemented in
 // chrome/browser/extensions/extension_cookies_api.cc. This separate interface
 // exposes pieces of the API implementation mainly for unit testing purposes.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_COOKIES_HELPERS_H_
@@ skipping 28 matching lines @@
     const std::string& store_id);
 
 // Constructs a CookieStore object as defined by the cookies API. This function
 // allocates a new DictionaryValue object; the caller is responsible for
 // freeing it.
 DictionaryValue* CreateCookieStoreValue(Profile* profile,
                                         ListValue* tab_ids);
 
 // Retrieves all cookies from the given cookie store corresponding to the given
 // URL. If the URL is empty, all cookies in the cookie store are retrieved.
-// This can only be called on the IO thread.
 net::CookieMonster::CookieList GetCookieListFromStore(
     net::CookieStore* cookie_store, const GURL& url);
 
 // Constructs a URL from a cookie's information for use in checking
 // a cookie against the extension's host permissions. The Secure
 // property of the cookie defines the URL scheme, and the cookie's
 // domain becomes the URL host.
 GURL GetURLFromCookiePair(
     const net::CookieMonster::CookieListPair& cookie_pair);
 
 // Looks through all cookies in the given cookie store, and appends to the
 // match list all the cookies that both match the given URL and cookie details
 // and are allowed by extension host permissions.
 void AppendMatchingCookiesToList(
-    const net::CookieMonster::CookieList& all_cookies,
-    const std::string& store_id,
+    net::CookieStore* cookie_store, const std::string& store_id,
     const GURL& url, const DictionaryValue* details,
     const Extension* extension,
     ListValue* match_list);
 
 // Appends the IDs of all tabs belonging to the given browser to the
 // given list.
 void AppendToTabIdList(Browser* browser, ListValue* tab_ids);
 
 // A class representing the cookie filter parameters passed into
 // cookies.getAll().
@@ skipping 31 matching lines @@
   // as '.foo.bar.com', and both will match cookies with domain values of
   // 'foo.bar.com', '.foo.bar.com', and 'baz.foo.bar.com'.
   bool MatchesDomain(const std::string& domain);
 
   const DictionaryValue* details_;
 };
 
 }  // namespace extension_cookies_helpers
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_COOKIES_HELPERS_H_