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

chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 893 matching lines @@
       base::Bind(&TabSpecificContentSettings::CookieChanged, render_process_id,
                  render_view_id, url, cookie_line, *options, !allow));
   return allow;
 }
 
 bool ChromeContentBrowserClient::AllowSaveLocalState(
     content::ResourceContext* context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   ProfileIOData* io_data = ProfileIOData::FromResourceContext(context);
 
-  if (!io_data->clear_local_state_on_exit()->GetValue())
-    return true;
-
-  // Disable clearing the local state on exit if the browsing session is going
-  // to be restored on the next startup.
-  SessionStartupPref::Type startup_pref =
-      SessionStartupPref::PrefValueToType(
-          io_data->session_startup_pref()->GetValue());
-  return (startup_pref == SessionStartupPref::LAST &&
-          !CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kDisableRestoreSessionState));
+  return !io_data->clear_local_state_on_exit()->GetValue();
 }
 
 bool ChromeContentBrowserClient::AllowWorkerDatabase(
     const GURL& url,
     const string16& name,
     const string16& display_name,
     unsigned long estimated_size,
     content::ResourceContext* context,
     const std::vector<std::pair<int, int> >& render_views) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 709 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome