SessionRestore: Store session cookies and restore them if chrome crashes or auto-restarts.

net/base/cookie_monster.h

Index: net/base/cookie_monster.h
diff --git a/net/base/cookie_monster.h b/net/base/cookie_monster.h
index 6d590921b0e4413f4260956c665334a0289d48c6..32c29442161f508f8f690ac158d987508d15c901 100644
--- a/net/base/cookie_monster.h
+++ b/net/base/cookie_monster.h
@@ -282,6 +282,10 @@ class NET_EXPORT CookieMonster : public CookieStore {
   // in the function trip.  TODO(rdsmith):Remove hack.
   void ValidateMap(int arg);
 
+  // Adds cookies in |session_cookie_monster| as session cookies to this cookie
+  // monster.
+  void MergeSessionCookies(CookieMonster* session_cookie_monster);
+
   // The default list of schemes the cookie monster can handle.
   static const char* kDefaultCookieableSchemes[];
   static const int kDefaultCookieableSchemesCount;
@@ -596,6 +600,9 @@ class NET_EXPORT CookieMonster : public CookieStore {
   void DoCookieTaskForURL(const scoped_refptr<CookieMonsterTask>& task_item,
     const GURL& url);
 
+  // Callback used for merging session cookies.
+  void OnGotSessionCookies(const net::CookieList& cookie_list);
+
   // Histogram variables; see CookieMonster::InitializeHistograms() in
   // cookie_monster.cc for details.
   base::Histogram* histogram_expiration_duration_minutes_;
@@ -773,6 +780,10 @@ class NET_EXPORT CookieMonster::CanonicalCookie {
     last_access_date_ = date;
   }
 
+  void SetPersistent(bool is_persistent) {
+    is_persistent_ = is_persistent;
+  }
+
   bool IsOnPath(const std::string& url_path) const;
   bool IsDomainMatch(const std::string& scheme, const std::string& host) const;