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

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 69969fda602a686b7a44f785e9a825099f0c9a37..40df6d2465de1e7e9b2563ae9d9870dd05c7b4de 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -911,17 +911,7 @@ bool ChromeContentBrowserClient::AllowSaveLocalState(
   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());

[Bernhard Bauer, 2012/03/30 12:58:21]

Do we still need |io_data->session_startup_pref()|? If not, you could add a TODO
to clean it up (no need to do it in this CL though, to keep it more easily
mergeable).

[marja, 2012/03/30 13:08:32]

Yes, it won't be needed if we go this way (honor the content settings)
permanently. I added a TODO in profile_io_data.h.

-  return (startup_pref == SessionStartupPref::LAST &&
-          !CommandLine::ForCurrentProcess()->HasSwitch(
-              switches::kDisableRestoreSessionState));
+  return !io_data->clear_local_state_on_exit()->GetValue();
 }
 
 bool ChromeContentBrowserClient::AllowWorkerDatabase(