Revert 175826

This change appears to be breaking the ChromeOS(x86) and ChromeOS(amd64) bots.
http://build.chromium.org/p/chromium.chromiumos/builders/ChromiumOS%20%28x86%29/builds/11010

> Clean up: remove unnecessary if-branches on initialization of the a11y prefs.
> 
> According to the comment at preferences.cc:96, some accessibility prefs may be already registered in WizardController::RegisterPrefs. But the magnifier prefs are never registered there, hence we can remove if statements.
> 
> BUG=none
> TEST=launch ChromeOS, and login.
> 
> Review URL: https://chromiumcodereview.appspot.com/11820018

TBR=yoshiki@chromium.org
Review URL: https://codereview.chromium.org/11817029

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

chrome/browser/chromeos/preferences.cc

@@ -93,9 +93,9 @@ void Preferences::RegisterUserPrefs(PrefServiceSyncable* prefs) {
   prefs->RegisterBooleanPref(prefs::kLabsAdvancedFilesystemEnabled,
                              false,
                              PrefServiceSyncable::UNSYNCABLE_PREF);
-  // Check if the accessibility prefs are already registered, which can happen
+  // Check if the accessibility pref is already registered, which can happen
   // in WizardController::RegisterPrefs. We still want to try to register
-  // the prefs here in case of Chrome/Linux with ChromeOS=1.
+  // the pref here in case of Chrome/Linux with ChromeOS=1.
   if (prefs->FindPreference(prefs::kSpokenFeedbackEnabled) == NULL) {
     prefs->RegisterBooleanPref(prefs::kSpokenFeedbackEnabled,
                                false,
@@ -106,20 +106,27 @@ void Preferences::RegisterUserPrefs(PrefServiceSyncable* prefs) {
                                false,
                                PrefServiceSyncable::UNSYNCABLE_PREF);
   }
+  if (prefs->FindPreference(prefs::kScreenMagnifierEnabled) == NULL) {
+    prefs->RegisterBooleanPref(prefs::kScreenMagnifierEnabled,
+                               false,
+                               PrefServiceSyncable::SYNCABLE_PREF);
+  }
+  if (prefs->FindPreference(prefs::kScreenMagnifierScale) == NULL) {
+    prefs->RegisterDoublePref(prefs::kScreenMagnifierScale,
+                              std::numeric_limits<double>::min(),
+                              PrefServiceSyncable::UNSYNCABLE_PREF);
+  }
+  if (prefs->FindPreference(prefs::kShouldAlwaysShowAccessibilityMenu) ==
+      NULL) {
+    prefs->RegisterBooleanPref(prefs::kShouldAlwaysShowAccessibilityMenu,
+                               false,
+                               PrefServiceSyncable::UNSYNCABLE_PREF);
+  }
   if (prefs->FindPreference(prefs::kVirtualKeyboardEnabled) == NULL) {
     prefs->RegisterBooleanPref(prefs::kVirtualKeyboardEnabled,
                                false,
                                PrefServiceSyncable::UNSYNCABLE_PREF);
   }
-  prefs->RegisterBooleanPref(prefs::kScreenMagnifierEnabled,
-                             false,
-                             PrefServiceSyncable::SYNCABLE_PREF);
-  prefs->RegisterDoublePref(prefs::kScreenMagnifierScale,
-                            std::numeric_limits<double>::min(),
-                            PrefServiceSyncable::UNSYNCABLE_PREF);
-  prefs->RegisterBooleanPref(prefs::kShouldAlwaysShowAccessibilityMenu,
-                             false,
-                             PrefServiceSyncable::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kMouseSensitivity,
                              3,
                              PrefServiceSyncable::SYNCABLE_PREF);