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

chrome/browser/extensions/extension_cookies_helpers.cc

 // 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.
 
 // Implements common functionality for the Chrome Extensions Cookies API.
 
 #include "chrome/browser/extensions/extension_cookies_helpers.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser.h"
@@ skipping 76 matching lines @@
   const std::string& domain_key = cookie_pair.first;
   const net::CookieMonster::CanonicalCookie& cookie = cookie_pair.second;
   const std::string scheme =
       cookie.IsSecure() ? chrome::kHttpsScheme : chrome::kHttpScheme;
   const std::string host =
       domain_key.find('.') != 0 ? domain_key : domain_key.substr(1);
   return GURL(scheme + chrome::kStandardSchemeSeparator + host + "/");
 }
 
 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) {
+  net::CookieMonster::CookieList all_cookies = GetCookieListFromStore(
+      cookie_store, url);
   net::CookieMonster::CookieList::const_iterator it;
   for (it = all_cookies.begin(); it != all_cookies.end(); ++it) {
     // Ignore any cookie whose domain doesn't match the extension's
     // host permissions.
     GURL cookie_domain_url = GetURLFromCookiePair(*it);
     if (!extension->HasHostPermission(cookie_domain_url))
       continue;
     // Filter the cookie using the match filter.
     extension_cookies_helpers::MatchFilter filter(details);
     if (filter.MatchesCookie(*it))
@@ skipping 64 matching lines @@
        sub_domain.length() >= filter_value.length();) {
     if (sub_domain == filter_value)
       return true;
     const size_t next_dot = sub_domain.find('.', 1);  // Skip over leading dot.
     sub_domain.erase(0, next_dot);
   }
   return false;
 }
 
 }  // namespace extension_cookies_helpers