Revert of Implement $Secure- cookie prefix

net/cookies/cookie_monster.cc

Index: net/cookies/cookie_monster.cc
diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc
index 0f8ba79d515d61fb15958769013eedc3dbaa4623..2292f8c25a7786127d70f1b133822d23207df4e3 100644
--- a/net/cookies/cookie_monster.cc
+++ b/net/cookies/cookie_monster.cc
@@ -331,13 +331,6 @@
   proxy->PostTask(FROM_HERE, base::Bind(callback, cookie, removed));
 }
 
-bool CheckCookiePrefix(CanonicalCookie* cc, const CookieOptions& options) {
-  const char kSecurePrefix[] = "$Secure-";
-  if (cc->Name().find(kSecurePrefix) == 0)
-    return cc->IsSecure() && cc->Source().SchemeIsCryptographic();
-  return true;
-}
-
 }  // namespace
 
 CookieMonster::CookieMonster(PersistentCookieStore* store,
@@ -446,7 +439,6 @@
                            bool secure,
                            bool http_only,
                            bool first_party_only,
-                           bool enforce_prefixes,
                            CookiePriority priority,
                            const SetCookiesCallback& callback)
       : CookieMonsterTask(cookie_monster),
@@ -459,7 +451,6 @@
         secure_(secure),
         http_only_(http_only),
         first_party_only_(first_party_only),
-        enforce_prefixes_(enforce_prefixes),
         priority_(priority),
         callback_(callback) {}
 
@@ -479,7 +470,6 @@
   bool secure_;
   bool http_only_;
   bool first_party_only_;
-  bool enforce_prefixes_;
   CookiePriority priority_;
   SetCookiesCallback callback_;
 
@@ -489,7 +479,7 @@
 void CookieMonster::SetCookieWithDetailsTask::Run() {
   bool success = this->cookie_monster()->SetCookieWithDetails(
       url_, name_, value_, domain_, path_, expiration_time_, secure_,
-      http_only_, first_party_only_, enforce_prefixes_, priority_);
+      http_only_, first_party_only_, priority_);
   if (!callback_.is_null()) {
     this->InvokeCallback(base::Bind(&SetCookiesCallback::Run,
                                     base::Unretained(&callback_), success));
@@ -938,12 +928,11 @@
     bool secure,
     bool http_only,
     bool first_party_only,
-    bool enforce_prefixes,
     CookiePriority priority,
     const SetCookiesCallback& callback) {
   scoped_refptr<SetCookieWithDetailsTask> task = new SetCookieWithDetailsTask(
       this, url, name, value, domain, path, expiration_time, secure, http_only,
-      first_party_only, enforce_prefixes, priority, callback);
+      first_party_only, priority, callback);
   DoCookieTaskForURL(task, url);
 }
 
@@ -1123,7 +1112,6 @@
                                          bool secure,
                                          bool http_only,
                                          bool first_party_only,
-                                         bool enforce_prefixes,
                                          CookiePriority priority) {
   base::AutoLock autolock(lock_);
 
@@ -1144,8 +1132,6 @@
   CookieOptions options;
   options.set_include_httponly();
   options.set_include_first_party_only();
-  if (enforce_prefixes)
-    options.set_enforce_prefixes();
   return SetCanonicalCookie(&cc, creation_time, options);
 }
 
@@ -1901,12 +1887,6 @@
                                        const CookieOptions& options) {
   const std::string key(GetKey((*cc)->Domain()));
   bool already_expired = (*cc)->IsExpired(creation_time);
-
-  if (options.enforce_prefixes() && !CheckCookiePrefix(cc->get(), options)) {
-    VLOG(kVlogSetCookies) << "SetCookie() not storing cookie '" << (*cc)->Name()
-                          << "' that violates prefix rules.";
-    return false;
-  }
 
   if (DeleteAnyEquivalentCookie(key, **cc, options.exclude_httponly(),
                                 already_expired)) {