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

net/cookies/cookie_monster_store_test.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 "net/cookies/cookie_monster_store_test.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
@@ skipping 98 matching lines @@
   // functions. Would be nice to export them, and re-use here.
   EXPECT_FALSE(pc.HasMaxAge());
   EXPECT_TRUE(pc.HasPath());
   base::Time cookie_expires = pc.HasExpires() ?
       CookieMonster::ParseCookieTime(pc.Expires()) : base::Time();
   std::string cookie_path = pc.Path();
 
   return CookieMonster::CanonicalCookie(
       GURL(), pc.Name(), pc.Value(), key, cookie_path,
       pc.MACKey(), pc.MACAlgorithm(),
-      creation_time, creation_time, cookie_expires,
-      pc.IsSecure(), pc.IsHttpOnly(),
-      !cookie_expires.is_null(), !cookie_expires.is_null());
+      creation_time, cookie_expires, creation_time,
+      pc.IsSecure(), pc.IsHttpOnly());
 }
 
 void AddCookieToList(
     const std::string& key,
     const std::string& cookie_line,
     const base::Time& creation_time,
     std::vector<CookieMonster::CanonicalCookie*>* out_list) {
   scoped_ptr<CookieMonster::CanonicalCookie> cookie(
       new CookieMonster::CanonicalCookie(
           BuildCanonicalCookie(key, cookie_line, creation_time)));
@@ skipping 78 matching lines @@
     base::Time last_access_time =
         (i < num_old_cookies) ? current - base::TimeDelta::FromDays(days_old) :
                                 current;
 
     std::string mac_key;
     std::string mac_algorithm;
 
     CookieMonster::CanonicalCookie cc(
         GURL(), "a", "1", base::StringPrintf("h%05d.izzle", i), "/path",
         mac_key, mac_algorithm, creation_time, expiration_time,
-        last_access_time, false, false, true, true);
+        last_access_time, false, false);
     store->AddCookie(cc);
   }
 
   return new CookieMonster(store, NULL);
 }
 
 MockSimplePersistentCookieStore::~MockSimplePersistentCookieStore() {}
 
 }  // namespace net