[protector] Refactoring of --no-protector code.

chrome/browser/protector/protected_prefs_watcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/protector/protected_prefs_watcher.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/stringprintf.h"
@@ skipping 68 matching lines @@
 }
 
 ProtectedPrefsWatcher::~ProtectedPrefsWatcher() {
 }
 
 // static
 void ProtectedPrefsWatcher::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterStringPref(kBackupHomePage, "",
                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(kBackupHomePageIsNewTabPage, false,
-                            PrefService::UNSYNCABLE_PREF);
+                             PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(kBackupShowHomeButton, false,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(kBackupRestoreOnStartup, 0,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterListPref(kBackupURLsToRestoreOnStartup,
                           PrefService::UNSYNCABLE_PREF);
   prefs->RegisterListPref(kBackupPinnedTabs,
                           PrefService::UNSYNCABLE_PREF);
   prefs->RegisterListPref(kBackupExtensionsIDs,
                           PrefService::UNSYNCABLE_PREF);
@@ skipping 24 matching lines @@
   std::string backup_path = std::string(kBackupPrefsPrefix) + path;
   const PrefService::Preference* backup_pref =
       profile_->GetPrefs()->FindPreference(backup_path.c_str());
   DCHECK(backup_pref &&
          // These do not directly correspond to any real preference.
          backup_path != kBackupExtensionsIDs &&
          backup_path != kBackupSignature);
   return backup_pref->GetValue();
 }
 
+void ProtectedPrefsWatcher::ForceUpdateBackup() {
+  UMA_HISTOGRAM_ENUMERATION(
+      kProtectorHistogramPrefs,
+      kProtectorErrorForcedUpdate,
+      kProtectorErrorCount);
+  InitBackup();
+}
+
 void ProtectedPrefsWatcher::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_PREF_CHANGED);
   const std::string* pref_name = content::Details<std::string>(details).ptr();
   DCHECK(pref_name && pref_observer_->IsObserved(*pref_name));
   if (UpdateBackupEntry(*pref_name))
     UpdateBackupSignature();
 }
@@ skipping 180 matching lines @@
         NOTREACHED();
         continue;
       }
       StringAppendStringDictionary(tab, &data);
     }
   }
   return data;
 }
 
 }  // namespace protector