Cleanup: better session restore UI.

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

Index: chrome/browser/ui/webui/options2/content_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options2/content_settings_handler.cc b/chrome/browser/ui/webui/options2/content_settings_handler.cc
index cbcdb80dbf36f70f17d7603cf934da43b3a6b9aa..176b0eba6403379979fc5219a03e48c0a88e6d70 100644
--- a/chrome/browser/ui/webui/options2/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options2/content_settings_handler.cc
@@ -476,10 +476,6 @@ void ContentSettingsHandler::GetLocalizedValues(
   localized_strings->SetBoolean(
       "enable_web_intents",
       web_intents::IsWebIntentsEnabledForProfile(profile));
-  // TODO(marja): clean up the options UI after the decision on the session
-  // restore changes has stabilized.
-  localized_strings->SetBoolean(
-      "enable_restore_session_state", false);
 }
 
 void ContentSettingsHandler::InitializeHandler() {
@@ -620,8 +616,6 @@ void ContentSettingsHandler::UpdateSettingDefaultFromModel(
 
   web_ui()->CallJavascriptFunction(
       "ContentSettings.setContentFilterSettingsValue", filter_settings);
-  web_ui()->CallJavascriptFunction(
-      "BrowserOptions.setContentFilterSettingsValue", filter_settings);
 }
 
 std::string ContentSettingsHandler::GetSettingDefaultFromModel(