Cleanup Protector switches and prefs.

*) Removed temporary 'protector.enabled' pref.
*) Renamed --disable-protector back to --no-protector ("bad flag" on platforms other than ChromeOS).


BUG=None
TEST=Manual with and without --no-protector


Review URL: http://codereview.chromium.org/9270041

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118728 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 16 deletions

diff --git a/chrome/browser/protector/protector_service.cc b/chrome/browser/protector/protector_service.cc
index 6df0f38..2464c0e 100644
--- a/chrome/browser/protector/protector_service.cc
+++ b/chrome/browser/protector/protector_service.cc
@@ -125,20 +125,8 @@ bool IsSettingValid(const std::string& value, const std::string& signature) {
   return hmac.Verify(value, signature);
 }
 
-void RegisterPrefs(PrefService* prefs) {
-  prefs->RegisterBooleanPref(prefs::kProtectorEnabled, false);
-}
-
 bool IsEnabled() {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableProtector))
-    return false;
-#if !defined(OS_CHROMEOS)
-  // Protector is always enabled on platforms other than ChromeOS.
-  return true;
-#else
-  PrefService* local_state = g_browser_process->local_state();
-  return local_state->GetBoolean(prefs::kProtectorEnabled);
-#endif
+  return !CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoProtector);
 }
 
 }  // namespace protector
diff --git a/chrome/browser/protector/protector_service.h b/chrome/browser/protector/protector_service.h
index 7d56166..28e1b6f 100644
--- a/chrome/browser/protector/protector_service.h
+++ b/chrome/browser/protector/protector_service.h
@@ -86,9 +86,6 @@ std::string SignSetting(const std::string& value);
 // Returns true if the signature is valid for the specified key.
 bool IsSettingValid(const std::string& value, const std::string& signature);
 
-// Register related preferences in Local State.
-void RegisterPrefs(PrefService* prefs);
-
 // Whether the Protector feature is enabled.
 bool IsEnabled();