Add IncludeForRequestURL method to CanonicalCookie

net/cookies/cookie_monster.cc

 // Copyright (c) 2012 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.
 
 // Portions of this code based on Mozilla:
 //   (netwerk/cookie/src/nsCookieService.cpp)
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ skipping 1584 matching lines @@
 
 void CookieMonster::FindCookiesForKey(
     const std::string& key,
     const GURL& url,
     const CookieOptions& options,
     const Time& current,
     bool update_access_time,
     std::vector<CanonicalCookie*>* cookies) {
   lock_.AssertAcquired();
 
-  const std::string host(url.host());
-  bool secure = url.SchemeIsSecure();
-
   for (CookieMapItPair its = cookies_.equal_range(key);
        its.first != its.second; ) {
     CookieMap::iterator curit = its.first;
     CanonicalCookie* cc = curit->second;
     ++its.first;
 
     // If the cookie is expired, delete it.
     if (cc->IsExpired(current) && !keep_expired_cookies_) {
       InternalDeleteCookie(curit, true, DELETE_COOKIE_EXPIRED);
       continue;
     }
 
     // Filter out HttpOnly cookies, per options.
     if (options.exclude_httponly() && cc->IsHttpOnly())
       continue;

[markusheintz_, 2012/11/29 15:16:14]

I think I should even move the if above to the new "IncludeForRequest" method
and pass the options as additional param.

 
-    // Filter out secure cookies unless we're https.
-    if (!secure && cc->IsSecure())
+    // Filter out cookies that should not be included for a request to the
+    // given |url|.
+    if (!cc->IncludeForRequest(url))
       continue;
 
-    // Filter out cookies that don't apply to this domain.
-    if (!cc->IsDomainMatch(host))
-      continue;
-
-    if (!cc->IsOnPath(url.path()))
-      continue;
-
-    // Add this cookie to the set of matching cookies.  Update the access
+    // Add this cookie to the set of matching cookies. Update the access
     // time if we've been requested to do so.
     if (update_access_time) {
       InternalUpdateCookieAccessTime(cc, current);
     }
     cookies->push_back(cc);
   }
 }
 
 bool CookieMonster::DeleteAnyEquivalentCookie(const std::string& key,
                                               const CanonicalCookie& ecc,
@@ skipping 467 matching lines @@
 
 // The system resolution is not high enough, so we can have multiple
 // set cookies that result in the same system time.  When this happens, we
 // increment by one Time unit.  Let's hope computers don't get too fast.
 Time CookieMonster::CurrentTime() {
   return std::max(Time::Now(),
       Time::FromInternalValue(last_time_seen_.ToInternalValue() + 1));
 }
 
 }  // namespace net