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 542 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_) {
+  // Honor the "clear local state" setting. If it's not set, keep the session
+  // data if we're going to continue the session upon startup.
+  if (clear_local_state_on_exit_)
     BrowserContext::ClearLocalOnDestruction(this);
-  }
+  else if (session_restore_enabled_ && pref.type == SessionStartupPref::LAST)
+    BrowserContext::SaveSessionState(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);
 }