Add CookieMonster::SetEnableFileScheme and CookieMonster::IsCookieableScheme

net/cookies/cookie_monster.h

 // 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.
 
 // Brought to you by the letter D and the number 2.
 
 #ifndef NET_COOKIES_COOKIE_MONSTER_H_
 #define NET_COOKIES_COOKIE_MONSTER_H_
 #pragma once
 
@@ skipping 162 matching lines @@
   // regardless of path.  This includes all http_only and secure cookies,
   // but does not include any domain cookies that may apply to this host.
   // Returns the number of cookies deleted.
   void DeleteAllForHostAsync(const GURL& url,
                              const DeleteCallback& callback);
 
   // Deletes one specific cookie.
   void DeleteCanonicalCookieAsync(const CanonicalCookie& cookie,
                                   const DeleteCookieCallback& callback);
 
   // Override the default list of schemes that are allowed to be set in

[erikwright (departed), 2012/06/06 18:38:54]

// Resets the list of cookeiable schemes to the supplied schemes.

[Jesse Greenwald, 2012/06/06 21:55:41]

Done.

   // this cookie store.  Calling his overrides the value of
   // "enable_file_scheme_".
   // If this this method is called, it must be called before first use of
   // the instance (i.e. as part of the instance initialization process).
   void SetCookieableSchemes(const char* schemes[], size_t num_schemes);
 
+#if defined(OS_ANDROID)
+  // Helper method to enable or disable acceptance of file scheme cookies on

[erikwright (departed), 2012/06/06 18:38:54]

Remove #if defined

// Resets the list of cookieable schemes to kDefaultCookieableSchemes with or
without 'file' being included.

[Jesse Greenwald, 2012/06/06 21:55:41]

Done.

+  // this CookieMonster instance.
+  void SetEnableFileScheme(bool accept);
+#endif  // defined(OS_ANDROID)
+
   // Instructs the cookie monster to not delete expired cookies. This is used
   // in cases where the cookie monster is used as a data structure to keep
   // arbitrary cookies.
   void SetKeepExpiredCookies();
 
   // Delegates the call to set the |clear_local_store_on_exit_| flag of the
   // PersistentStore if it exists.
   void SetClearPersistentStoreOnExit(bool clear_local_store);
 
   // There are some unknowns about how to correctly handle file:// cookies,
@@ skipping 58 matching lines @@
   // Protects session cookies from deletion on shutdown.
   void SaveSessionCookies();
 
   // Debugging method to perform various validation checks on the map.
   // Currently just checking that there are no null CanonicalCookie pointers
   // in the map.
   // Argument |arg| is to allow retaining of arbitrary data if the CHECKs
   // in the function trip.  TODO(rdsmith):Remove hack.
   void ValidateMap(int arg);
 
+#if defined(OS_ANDROID)
+  // Determine if the scheme of the URL is a scheme that cookies will be stored

[erikwright (departed), 2012/06/06 18:38:54]

Remove '#if defined'

'Determine' -> 'Determines'

[Jesse Greenwald, 2012/06/06 21:55:41]

Done.

+  // for.
+  bool IsCookieableScheme(const std::string& scheme);
+#endif  // defined(OS_ANDROID)
+
   // The default list of schemes the cookie monster can handle.
   static const char* kDefaultCookieableSchemes[];
   static const int kDefaultCookieableSchemesCount;
 
  private:
   // For queueing the cookie monster calls.
   class CookieMonsterTask;
   class DeleteAllCreatedBetweenTask;
   class DeleteAllForHostTask;
   class DeleteAllTask;
@@ skipping 366 matching lines @@
   scoped_refptr<Delegate> delegate_;
 
   // Lock for thread-safety
   base::Lock lock_;
 
   base::Time last_statistic_record_time_;
 
   bool keep_expired_cookies_;
   bool persist_session_cookies_;
 
-  static bool enable_file_scheme_;
+  // Static setting for whether or not file scheme cookies are allows when
+  // a new CookieMonster is created, or the accepted schemes on a CookieMonster
+  // instance are reset back to defaults.
+  static bool default_enable_file_scheme_;
 
   DISALLOW_COPY_AND_ASSIGN(CookieMonster);
 };
 
 class NET_EXPORT CookieMonster::CanonicalCookie {
  public:
 
   // These constructors do no validation or canonicalization of their inputs;
   // the resulting CanonicalCookies should not be relied on to be canonical
   // unless the caller has done appropriate validation and canonicalization
@@ skipping 302 matching lines @@
   friend class base::RefCountedThreadSafe<PersistentCookieStore>;
   DISALLOW_COPY_AND_ASSIGN(PersistentCookieStore);
 };
 
 class CookieList : public std::vector<CookieMonster::CanonicalCookie> {
 };
 
 }  // namespace net
 
 #endif  // NET_COOKIES_COOKIE_MONSTER_H_