Add callback list to PrefModelAssociator after sync data is loaded

chrome/browser/content_settings/host_content_settings_map_factory.cc

Index: chrome/browser/content_settings/host_content_settings_map_factory.cc
diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.cc b/chrome/browser/content_settings/host_content_settings_map_factory.cc
index a96b421a0b5b60922df8ae6d707b64ec12aa304b..4eaf1c3e6447016f70ae772c818b9be0f645f542 100644
--- a/chrome/browser/content_settings/host_content_settings_map_factory.cc
+++ b/chrome/browser/content_settings/host_content_settings_map_factory.cc
@@ -6,6 +6,7 @@
 
 #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"
@@ -72,6 +73,14 @@ scoped_refptr<RefcountedKeyedService>
       profile->GetProfileType() == Profile::INCOGNITO_PROFILE,
       profile->GetProfileType() == Profile::GUEST_PROFILE));
 
+// TODO(lshang): Make this not a comment when we change scoping type and hook up

[Bernhard Bauer, 2016/07/07 08:50:08]

The comment should be indented at the same level as the surrounding code, which
is two spaces here.

[lshang, 2016/07/13 06:27:28]

I moved this code block to the following CL, so this comment is deleted there.

+// the migration code.
+/*  syncable_prefs::PrefServiceSyncable* pref_service =

[Bernhard Bauer, 2016/07/07 08:50:08]

And this comment should use the regular double-slash style.

[lshang, 2016/07/13 06:27:28]

Also with this comment sign.

+      PrefServiceSyncableFromProfile(profile);
+  if (pref_service)

[Bernhard Bauer, 2016/07/07 08:50:08]

Add braces, as the body spans more than a single line.

[lshang, 2016/07/13 06:27:28]

Done in the following CL.

+    pref_service->RegisterMergeDataFinishedCallback(base::Bind(
+        &HostContentSettingsMap::MigrateDomainScopedSettings, settings_map));*/

[Bernhard Bauer, 2016/07/07 08:50:08]

You are going to have to figure out the lifetime story here with regards to
|settings_map|. Can you guarantee that |settings_map| is alive when the callback
runs? If so, you can use base::Unretained(). If not, you'll have to find some
other way.

[raymes, 2016/07/13 03:20:20]

I don't think we can make that guarantee (that I know of). I think we should get
a weak pointer from the HostContentSettingsMap.

[lshang, 2016/07/13 06:27:28]

Done.

+
 #if defined(ENABLE_EXTENSIONS)
   ExtensionService *ext_service =
       extensions::ExtensionSystem::Get(profile)->extension_service();