Change ContentSettingsType's scoping type and hookup migration code

chrome/browser/content_settings/host_content_settings_map_factory.cc

 // Copyright 2015 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/content_settings/host_content_settings_map_factory.h"
 
 #include <utility>
 
+#include "chrome/browser/prefs/pref_service_syncable_util.h"
 #include "chrome/browser/profiles/off_the_record_profile_impl.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
+#include "components/syncable_prefs/pref_service_syncable.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/extension_service.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_system_provider.h"
 #include "extensions/browser/extensions_browser_client.h"
 #endif
 
 #if defined(ENABLE_SUPERVISED_USERS)
@@ skipping 42 matching lines @@
   // If off the record, retrieve the host content settings map of the parent
   // profile in order to ensure the preferences have been migrated.
   if (profile->GetProfileType() == Profile::INCOGNITO_PROFILE)
     GetForProfile(profile->GetOriginalProfile());
 
   scoped_refptr<HostContentSettingsMap> settings_map(new HostContentSettingsMap(
       profile->GetPrefs(),
       profile->GetProfileType() == Profile::INCOGNITO_PROFILE,
       profile->GetProfileType() == Profile::GUEST_PROFILE));
 
+  syncable_prefs::PrefServiceSyncable* pref_service =
+      PrefServiceSyncableFromProfile(profile);
+  if (pref_service) {
+    pref_service->RegisterMergeDataFinishedCallback(
+        base::Bind(&HostContentSettingsMap::MigrateDomainScopedSettings,
+                   settings_map->GetWeakPtr(), true /* after_sync */));
+  }
+
 #if defined(ENABLE_EXTENSIONS)
   ExtensionService *ext_service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   // This may be null in testing or when the extenion_service hasn't been
   // initialized, in which case it will be registered then.
   if (ext_service)
     ext_service->RegisterContentSettings(settings_map.get());
 #endif // defined(ENABLE_EXTENSIONS)
 #if defined(ENABLE_SUPERVISED_USERS)
   SupervisedUserSettingsService* supervised_service =
       SupervisedUserSettingsServiceFactory::GetForProfile(profile);
   // This may be null in testing.
   if (supervised_service) {
     std::unique_ptr<content_settings::SupervisedProvider> supervised_provider(
         new content_settings::SupervisedProvider(supervised_service));
     settings_map->RegisterProvider(HostContentSettingsMap::SUPERVISED_PROVIDER,
                                    std::move(supervised_provider));
   }
 #endif // defined(ENABLE_SUPERVISED_USERS)
 
   return settings_map;
 }
 
 content::BrowserContext* HostContentSettingsMapFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return context;
 }