Honor session content settings even if "continue where I left off" is selected.

chrome/browser/profiles/profile_impl.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/profiles/profile_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
@@ skipping 344 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 = false;

[sail, 2012/03/30 15:50:01]

Hi Marja. Since this is getting a bit complicated can you move it into its own
function. Personally I find the following format easier to read:
bool xzy() {
  if (!session_restore_enabled_)
    return false;

  // Restore old session cookies after crashes.
  if (!DidLastSessionExitCleanly())
    return true.

  // Also restore after updates.
  if (BrowserInit::WasRestarted())
    return true;

  ...
}

[marja, 2012/03/30 16:26:42]

This got reverted back to the original version.

+  if (session_restore_enabled_) {
+    // Restore old session cookies
+    // - after crashes
+    // - after updates
+    // - when the user has the "continue where I left off" startup option
+    // selected, and hasn't selected to clear cookies on exit or restricted them
+    // to session only.
+    const CommandLine* command_line = CommandLine::ForCurrentProcess();
 #if defined(OS_ANDROID)
-  SessionStartupPref::Type startup_pref_type =
-      SessionStartupPref::GetDefaultStartupType();
+    SessionStartupPref::Type startup_pref_type =
+        SessionStartupPref::GetDefaultStartupType();
 #else
-  SessionStartupPref::Type startup_pref_type =
-      BrowserInit::GetSessionStartupPref(*CommandLine::ForCurrentProcess(),
-                                         this).type;
+    SessionStartupPref::Type startup_pref_type =
+        BrowserInit::GetSessionStartupPref(*command_line, this).type;
 #endif
-  bool restore_old_session_cookies =
-      session_restore_enabled_ &&
-      (!DidLastSessionExitCleanly() ||
-       startup_pref_type == SessionStartupPref::LAST);
+    CookieSettings* cookie_settings =
+        CookieSettings::Factory::GetForProfile(this);
+
+    restore_old_session_cookies =
+        !DidLastSessionExitCleanly() ||
+        command_line->HasSwitch(switches::kRestoreLastSession) ||
+        BrowserInit::WasRestarted() ||
+        (startup_pref_type == SessionStartupPref::LAST &&
+         !clear_local_state_on_exit_ &&
+         cookie_settings->GetDefaultCookieSetting(NULL) !=
+             CONTENT_SETTING_SESSION_ONLY);
+  }
 
   InitHostZoomMap();
 
   // 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, server_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(),
@@ skipping 166 matching lines @@
 
 void ProfileImpl::set_last_selected_directory(const FilePath& path) {
   GetPrefs()->SetFilePath(prefs::kSelectFileLastDirectory, path);
 }
 
 ProfileImpl::~ProfileImpl() {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_DESTROYED,
       content::Source<Profile>(this),
       content::NotificationService::NoDetails());
-  // Save the session state if we're going to restore the session during the
-  // next startup.
-  SessionStartupPref pref = SessionStartupPref::GetStartupPref(this);
-  if (pref.type == SessionStartupPref::LAST) {
-    if (session_restore_enabled_)
-      BrowserContext::SaveSessionState(this);
-  } else if (clear_local_state_on_exit_) {
+  if (clear_local_state_on_exit_)
     BrowserContext::ClearLocalOnDestruction(this);
-  }
 
   StopCreateSessionServiceTimer();
 
   // Remove pref observers
   pref_change_registrar_.RemoveAll();
 
   ChromePluginServiceFilter::GetInstance()->UnregisterResourceContext(
       io_data_.GetResourceContextNoInit());
 
   if (io_data_.HasMainRequestContext() &&
@@ skipping 764 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);
 }