Add callback list to PrefModelAssociator after sync data is loaded

components/syncable_prefs/pref_model_associator.h

Index: components/syncable_prefs/pref_model_associator.h
diff --git a/components/syncable_prefs/pref_model_associator.h b/components/syncable_prefs/pref_model_associator.h
index 6eaab7ef7bdb17f5a7db3008d0d824323531adfa..b7fed27248464c41950fe466e881794866fe9642 100644
--- a/components/syncable_prefs/pref_model_associator.h
+++ b/components/syncable_prefs/pref_model_associator.h
@@ -5,11 +5,13 @@
 #ifndef COMPONENTS_SYNCABLE_PREFS_PREF_MODEL_ASSOCIATOR_H_
 #define COMPONENTS_SYNCABLE_PREFS_PREF_MODEL_ASSOCIATOR_H_
 
+#include <list>
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 
+#include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
@@ -120,6 +122,10 @@ class PrefModelAssociator
   void SetPrefModelAssociatorClientForTesting(
       const PrefModelAssociatorClient* client);
 
+  // Register callback method which will get called at the end of
+  // PrefModelAssociator::MergeDataAndStartSyncing().
+  void RegisterMergeDataFinishedCallback(const base::Closure& callback);
+
  protected:
   friend class PrefServiceSyncableTest;
 
@@ -193,6 +199,8 @@ class PrefModelAssociator
   SyncedPrefObserverMap synced_pref_observers_;
   const PrefModelAssociatorClient* client_;  // Weak.
 
+  std::list<base::Closure> callback_list_;

[raymes, 2016/06/29 03:50:01]

std::vector is usually preferable

[lshang, 2016/06/30 05:03:36]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(PrefModelAssociator);
 };