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

chrome/browser/profiles/profile_impl.cc

 // Copyright (c) 2011 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/profiles/profile_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 149 matching lines @@
 }
 
 FilePath GetCachePath(const FilePath& base) {
   return base.Append(chrome::kCacheDirname);
 }
 
 FilePath GetMediaCachePath(const FilePath& base) {
   return base.Append(chrome::kMediaCacheDirname);
 }
 
+void SaveSessionStateOnIOThread(
+    net::URLRequestContextGetter* url_request_context_getter) {
+  url_request_context_getter->GetURLRequestContext()->cookie_store()->
+      GetCookieMonster()->SaveSessionCookies();
+}
+
 }  // namespace
 
 // static
 Profile* Profile::CreateProfile(const FilePath& path) {
   if (!file_util::PathExists(path)) {
     // TODO(tc): http://b/1094718 Bad things happen if we can't write to the
     // profile directory.  We should eventually be able to run in this
     // situation.
     if (!file_util::CreateDirectory(path))
       return NULL;
@@ skipping 42 matching lines @@
       host_zoom_map_(NULL),
       history_service_created_(false),
       favicon_service_created_(false),
       created_web_data_service_(false),
       created_password_store_(false),
       start_time_(Time::Now()),
 #if defined(OS_WIN)
       checked_instant_promo_(false),
 #endif
       delegate_(delegate),
-      predictor_(NULL) {
+      predictor_(NULL),
+      session_restore_enabled_(false) {
   DCHECK(!path.empty()) << "Using an empty path will attempt to write " <<
                             "profile files to the root directory!";
 
   create_session_service_timer_.Start(FROM_HERE,
       TimeDelta::FromMilliseconds(kCreateSessionServiceDelayMS), this,
       &ProfileImpl::EnsureSessionServiceCreated);
 
   // Determine if prefetch is enabled for this profile.
   // If not profile_manager is present, it means we are in a unittest.
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   predictor_ = chrome_browser_net::Predictor::CreatePredictor(
       !command_line->HasSwitch(switches::kDisablePreconnect),
       g_browser_process->profile_manager() == NULL);
 
+  session_restore_enabled_ =
+      command_line->HasSwitch(switches::kEnableRestoreSessionState);
   if (delegate_) {
     prefs_.reset(PrefService::CreatePrefService(
         GetPrefFilePath(),
         new ExtensionPrefStore(GetExtensionPrefValueMap(), false),
         true));
     // Wait for the notification that prefs has been loaded (successfully or
     // not).
     registrar_.Add(this, chrome::NOTIFICATION_PREF_INITIALIZATION_COMPLETED,
                    content::Source<PrefService>(prefs_.get()));
   } else {
@@ skipping 93 matching lines @@
   int media_cache_max_size;
   GetCacheParameters(true, &media_cache_path, &media_cache_max_size);
   media_cache_path = GetMediaCachePath(media_cache_path);
 
   FilePath extensions_cookie_path = GetPath();
   extensions_cookie_path =
       extensions_cookie_path.Append(chrome::kExtensionsCookieFilename);
 
   FilePath app_path = GetPath().Append(chrome::kIsolatedAppStateDirname);
 
+  bool restore_old_session_cookies =
+      session_restore_enabled_ &&
+      (!DidLastSessionExitCleanly() ||
+       CommandLine::ForCurrentProcess()->HasSwitch(
+           switches::kRestoreLastSession));
+
   // Make sure we initialize the ProfileIOData after everything else has been
   // initialized that we might be reading from the IO thread.
 
   io_data_.Init(cookie_path, origin_bound_cert_path, cache_path,
                 cache_max_size, media_cache_path, media_cache_max_size,
                 extensions_cookie_path, app_path, predictor_,
                 g_browser_process->local_state(),
-                g_browser_process->io_thread());
+                g_browser_process->io_thread(),
+                restore_old_session_cookies);
 
   ChromePluginServiceFilter::GetInstance()->RegisterResourceContext(
       PluginPrefs::GetForProfile(this), &GetResourceContext());
 
   // Creation has been finished.
   if (delegate_)
     delegate_->OnProfileCreated(this, true);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_CREATED,
@@ skipping 1166 matching lines @@
     return GURL(chrome::kChromeUINewTabURL);
   return home_page;
 }
 
 NetworkActionPredictor* ProfileImpl::GetNetworkActionPredictor() {
   if (!network_action_predictor_.get())
     network_action_predictor_.reset(new NetworkActionPredictor(this));
   return network_action_predictor_.get();
 }
 
+void ProfileImpl::SaveSessionState() {
+  if (!session_restore_enabled_)
+    return;
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::Bind(&SaveSessionStateOnIOThread,
+                 make_scoped_refptr(GetRequestContext())));

[erikwright (departed), 2011/11/29 13:43:22]

I'm under the impression that Bind automatically increments reference counted
objects passed via raw pointers. Try removing make_scoped_refptr.

[marja, 2011/11/29 14:58:21]

If I remove it, the compile-time assert
p1_is_refcounted_type_and_needs_scoped_refptr fires.

+}
+
 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() {
   if (!spellcheck_profile_.get())
     spellcheck_profile_.reset(new SpellCheckProfile(path_));
   return spellcheck_profile_.get();
 }
 
 void ProfileImpl::UpdateProfileUserNameCache() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
   size_t index = cache.GetIndexOfProfileWithPath(GetPath());
@@ skipping 13 matching lines @@
                                      FilePath* cache_path,
                                      int* max_size) {
   DCHECK(cache_path);
   DCHECK(max_size);
   FilePath path(prefs_->GetFilePath(prefs::kDiskCacheDir));
   if (!path.empty())
     *cache_path = path;
   *max_size = is_media_context ? prefs_->GetInteger(prefs::kMediaCacheSize) :
                                  prefs_->GetInteger(prefs::kDiskCacheSize);
 }