Remove the force_session cookie option, as it's not used anymore

chrome/browser/automation/automation_util.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.
 
 #include "chrome/browser/automation/automation_util.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 245 matching lines @@
   ListValue* list = new ListValue();
   for (size_t i = 0; i < cookie_list.size(); ++i) {
     const net::CookieMonster::CanonicalCookie& cookie = cookie_list[i];
     DictionaryValue* cookie_dict = new DictionaryValue();
     cookie_dict->SetString("name", cookie.Name());
     cookie_dict->SetString("value", cookie.Value());
     cookie_dict->SetString("path", cookie.Path());
     cookie_dict->SetString("domain", cookie.Domain());
     cookie_dict->SetBoolean("secure", cookie.IsSecure());
     cookie_dict->SetBoolean("http_only", cookie.IsHttpOnly());
-    if (cookie.DoesExpire())
+    if (cookie.IsPersistent())
       cookie_dict->SetDouble("expiry", cookie.ExpiryDate().ToDoubleT());
     list->Append(cookie_dict);
   }
   DictionaryValue dict;
   dict.Set("cookies", list);
   reply.SendSuccess(&dict);
 }
 
 void DeleteCookieJSON(AutomationProvider* provider,
                       DictionaryValue* args,
@@ skipping 84 matching lines @@
   if (cookie_dict->HasKey("http_only") &&
       !cookie_dict->GetBoolean("http_only", &http_only)) {
     reply.SendError("optional 'http_only' invalid");
     return;
   }
 
   scoped_ptr<net::CookieMonster::CanonicalCookie> cookie(
       net::CookieMonster::CanonicalCookie::Create(
           GURL(url), name, value, domain, path,
           mac_key, mac_algorithm, base::Time(),
-          base::Time::FromDoubleT(expiry), secure, http_only, expiry != 0));
+          base::Time::FromDoubleT(expiry), secure, http_only));
   if (!cookie.get()) {
     reply.SendError("given 'cookie' parameters are invalid");
     return;
   }
 
   // Since we may be on the UI thread don't call GetURLRequestContext().
   scoped_refptr<net::URLRequestContextGetter> context_getter =
       provider->profile()->GetRequestContext();
 
   base::WaitableEvent event(true /* manual reset */,
@@ skipping 173 matching lines @@
       const extensions::Extension* extension;
       return GetExtensionForId(id, profile, &extension);
     }
     default:
       break;
   }
   return false;
 }
 
 }  // namespace automation_util