Move pref names and default value into WebsiteSettingsInfo

chrome/browser/prefs/pref_model_associator.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/prefs/pref_model_associator.h"
 
 #include "base/auto_reset.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/common/pref_names.h"
-#include "components/content_settings/core/browser/content_settings_pref_provider.h"
+#include "components/content_settings/core/browser/website_settings_registry.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_error_factory.h"
 #include "sync/protocol/preference_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 
 using syncer::PREFERENCES;
 using syncer::PRIORITY_PREFERENCES;
 
 namespace {
 
@@ skipping 287 matching lines @@
     const base::Value& local_value,
     const base::Value& server_value) {
   // This function special cases preferences individually, so don't attempt
   // to merge for all migrated values.
   if (name == prefs::kURLsToRestoreOnStartup ||
       name == prefs::kURLsToRestoreOnStartupOld) {
     return scoped_ptr<base::Value>(
         MergeListValues(local_value, server_value)).Pass();
   }
 
-  if (content_settings::PrefProvider::IsContentSettingsExceptionsPref(name)) {
-    return scoped_ptr<base::Value>(
-        MergeDictionaryValues(local_value, server_value)).Pass();
+  content_settings::WebsiteSettingsRegistry* registry =
+      content_settings::WebsiteSettingsRegistry::GetInstance();
+  for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
+    ContentSettingsType type = static_cast<ContentSettingsType>(i);
+    if (registry->Get(type)->pref_name() == name) {
+      return scoped_ptr<base::Value>(

[Bernhard Bauer, 2015/07/29 10:12:38]

Can you use make_scoped_ptr()?

[raymes, 2015/07/30 05:25:03]

Done.

+                 MergeDictionaryValues(local_value, server_value))
+          .Pass();

[Bernhard Bauer, 2015/07/29 10:12:38]

The .Pass() is only necessary to pass ownership from a scoped_ptr on the stack.
If it's the return value of a function, it already is an rvalue.

[raymes, 2015/07/30 05:25:03]

Thanks - I wasn't really thinking about this as I was just blindly converting
the code but good catch :)

+    }
   }
 
   // If this is not a specially handled preference, server wins.
   return scoped_ptr<base::Value>(server_value.DeepCopy()).Pass();

[Bernhard Bauer, 2015/07/29 10:12:38]

Same here.

[raymes, 2015/07/30 05:25:03]

Done.

 }
 
 bool PrefModelAssociator::CreatePrefSyncData(
     const std::string& name,
     const base::Value& value,
     syncer::SyncData* sync_data) const {
   if (value.IsType(base::Value::TYPE_NULL)) {
     LOG(ERROR) << "Attempting to sync a null pref value for " << name;
     return false;
   }
@@ skipping 303 matching lines @@
 void PrefModelAssociator::NotifySyncedPrefObservers(const std::string& path,
                                                     bool from_sync) const {
   SyncedPrefObserverMap::const_iterator observer_iter =
       synced_pref_observers_.find(path);
   if (observer_iter == synced_pref_observers_.end())
     return;
   SyncedPrefObserverList* observers = observer_iter->second;
   FOR_EACH_OBSERVER(SyncedPrefObserver, *observers,
                     OnSyncedPrefChanged(path, from_sync));
 }