Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/web_resource/notification_promo.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/web_resource/notification_promo.h"
 
 #include <cmath>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/sys_info.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_registry_simple.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
 #include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/web_resource/promo_resource_service.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/user_metrics.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/url_util.h"
 
 #if defined(OS_ANDROID)
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 276 matching lines @@
   group_ = base::RandInt(0, num_groups_ - 1);
   WritePrefs();
 }
 
 // static
 void NotificationPromo::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterDictionaryPref(kPrefPromoObject);
 }
 
 // static
-void NotificationPromo::RegisterUserPrefs(PrefServiceSyncable* prefs) {
+void NotificationPromo::RegisterUserPrefs(PrefService* prefs,
+                                          PrefRegistrySyncable* registry) {
   // TODO(dbeam): Remove in M28 when we're reasonably sure all prefs are gone.
   // http://crbug.com/168887
-  prefs->RegisterDictionaryPref(kPrefPromoObject,
-                                PrefServiceSyncable::UNSYNCABLE_PREF);
+  // TODO(joi): Remove PrefService parameter; move this to migration code.
+  registry->RegisterDictionaryPref(kPrefPromoObject,
+                                   PrefRegistrySyncable::UNSYNCABLE_PREF);
   prefs->ClearPref(kPrefPromoObject);
 }
 
 void NotificationPromo::WritePrefs() {
   base::DictionaryValue* ntp_promo = new base::DictionaryValue;
   ntp_promo->SetString(kPrefPromoText, promo_text_);
   ntp_promo->Set(kPrefPromoPayload, promo_payload_->DeepCopy());
   ntp_promo->SetDouble(kPrefPromoStart, start_);
   ntp_promo->SetDouble(kPrefPromoEnd, end_);
 
@@ skipping 111 matching lines @@
   if (group_ < initial_segment_)
     return start_;
   return start_ +
       std::ceil(static_cast<float>(group_ - initial_segment_ + 1) / increment_)
       * time_slice_;
 }
 
 double NotificationPromo::EndTime() const {
   return end_;
 }