Internal CookieMonster Refactoring.

There are two classes of refactoring in this submission:
* Enabled by moving domain->CanonicalCookie.  This is mostly just
  eliminating domain from various argument lists.
* Combination of code that will make the next CL easier.  This is
  rewriting GetAllCookiesForURL in terms of FindCookiesForHostAndDomain
  and nuking FindRawCookies; it'll allow me to change the basic
  algorithm for probing the cookie map in a single place.

BUG=8850
TEST=Linux, net_unittests --gtest_filter=CookieMonsterTest.*:ParsedCookieTest.*

Review URL: http://codereview.chromium.org/2904006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53341 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 10 deletions

diff --git a/net/base/cookie_monster.h b/net/base/cookie_monster.h
index 623363f..9e88bb2 100644
--- a/net/base/cookie_monster.h
+++ b/net/base/cookie_monster.h
@@ -197,23 +197,16 @@ class CookieMonster : public CookieStore {
 
   void FindCookiesForHostAndDomain(const GURL& url,
                                    const CookieOptions& options,
+                                   bool update_access_time,
                                    std::vector<CanonicalCookie*>* cookies);
 
   void FindCookiesForKey(const std::string& key,
                          const GURL& url,
                          const CookieOptions& options,
                          const base::Time& current,
+                         bool update_access_time,
                          std::vector<CanonicalCookie*>* cookies);
 
-  void FindRawCookies(const std::string& key,
-                      bool include_secure,
-                      const std::string& path,
-                      CookieList* list);
-
-  // Internal helper returning all cookies for a given URL. The caller is
-  // assumed to hold lock_ and having called InitIfNecessary().
-  CookieList InternalGetAllCookiesForURL(const GURL& url);
-
   // Delete any cookies that are equivalent to |ecc| (same path, key, etc).
   // If |skip_httponly| is true, httponly cookies will not be deleted.  The
   // return value with be true if |skip_httponly| skipped an httponly cookie.
@@ -229,7 +222,6 @@ class CookieMonster : public CookieStore {
   // Helper function that sets a canonical cookie, deleting equivalents and
   // performing garbage collection.
   bool SetCanonicalCookie(scoped_ptr<CanonicalCookie>* cc,
-                          const std::string& cookie_domain,
                           const base::Time& creation_time,
                           const CookieOptions& options);