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

chrome/browser/ui/webui/options2/content_settings_handler2.cc

Index: chrome/browser/ui/webui/options2/content_settings_handler2.cc
diff --git a/chrome/browser/ui/webui/options2/content_settings_handler2.cc b/chrome/browser/ui/webui/options2/content_settings_handler2.cc
index 17fda03b0c27ff9c7bfe955434dfcd752e1b4d86..2db3de7dec5b5baadb0e4f9a7b3f80726f507cfc 100644
--- a/chrome/browser/ui/webui/options2/content_settings_handler2.cc
+++ b/chrome/browser/ui/webui/options2/content_settings_handler2.cc
@@ -287,10 +287,10 @@ void ContentSettingsHandler::GetLocalizedValues(
                 IDS_CONTENT_SETTINGS_TITLE);
   localized_strings->SetBoolean("enable_web_intents",
                                 web_intents::IsWebIntentsEnabled());
+  // TODO(marja): clean up the options UI after the decision on the session
+  // restore changes has stabilized.
   localized_strings->SetBoolean(
-      "enable_restore_session_state",
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableRestoreSessionState));
+      "enable_restore_session_state", false);
 }
 
 void ContentSettingsHandler::InitializeHandler() {