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..c64a983942564fa863cb7b6fc4b7b42ecc3848fb 100644 |
--- a/components/syncable_prefs/pref_model_associator.h |
+++ b/components/syncable_prefs/pref_model_associator.h |
@@ -120,6 +120,9 @@ class PrefModelAssociator |
void SetPrefModelAssociatorClientForTesting( |
const PrefModelAssociatorClient* client); |
+ static void SetMergeDataFinishedCallback(const base::Closure& callback); |
raymes
2016/06/16 03:23:51
I don't think we will want these to be static. Ins
|
+ static void ResetMergeDataFinishedCallback(); |
+ |
protected: |
friend class PrefServiceSyncableTest; |
@@ -193,6 +196,8 @@ class PrefModelAssociator |
SyncedPrefObserverMap synced_pref_observers_; |
const PrefModelAssociatorClient* client_; // Weak. |
+ static base::Closure migrate_call_back_; |
+ |
DISALLOW_COPY_AND_ASSIGN(PrefModelAssociator); |
}; |