Index: chrome/browser/prefs/pref_service_builder.cc |
diff --git a/chrome/browser/prefs/pref_service_builder.cc b/chrome/browser/prefs/pref_service_builder.cc |
index daa1fd3c5dbf6b009ccf98ee69fea5ddacb9b113..64d86e1e45ff974cf46478a1f1c78b8aebc0e6e0 100644 |
--- a/chrome/browser/prefs/pref_service_builder.cc |
+++ b/chrome/browser/prefs/pref_service_builder.cc |
@@ -24,8 +24,7 @@ std::string DummyGetLocalizedString(int id) { |
} // namespace |
-PrefServiceBuilder::PrefServiceBuilder() |
- : sync_associator_(NULL) { |
+PrefServiceBuilder::PrefServiceBuilder() { |
ResetDefaultState(); |
} |
@@ -58,12 +57,6 @@ PrefServiceBuilder& PrefServiceBuilder::WithRecommendedPrefs(PrefStore* store) { |
return *this; |
} |
-PrefServiceBuilder& PrefServiceBuilder::WithSyncAssociator( |
- PrefModelAssociator* associator) { |
- sync_associator_ = associator; |
- return *this; |
-} |
- |
PrefServiceBuilder& PrefServiceBuilder::WithLocalizedStringMethod( |
const base::Callback<std::string(int)>& localized_string_method) { |
get_localized_string_method_ = localized_string_method; |
@@ -89,10 +82,10 @@ PrefServiceBuilder& PrefServiceBuilder::WithAsync(bool async) { |
return *this; |
} |
-PrefService* PrefServiceBuilder::Create() { |
+PrefService* PrefServiceBuilder::Build(PrefService* pref_service) { |
DefaultPrefStore* default_pref_store = new DefaultPrefStore(); |
PrefNotifierImpl* pref_notifier = new PrefNotifierImpl(); |
- PrefService* pref_service = |
+ pref_service->Initialize( |
new PrefService( |
pref_notifier, |
new PrefValueStore( |
@@ -102,11 +95,9 @@ PrefService* PrefServiceBuilder::Create() { |
user_prefs_.get(), |
recommended_prefs_.get(), |
default_pref_store, |
- sync_associator_, |
pref_notifier), |
user_prefs_.get(), |
default_pref_store, |
- sync_associator_, |
get_localized_string_method_, |
read_error_callback_, |
async_); |
@@ -115,7 +106,6 @@ PrefService* PrefServiceBuilder::Create() { |
command_line_prefs_ = NULL; |
user_prefs_ = NULL; |
recommended_prefs_ = NULL; |
- sync_associator_ = NULL; |
ResetDefaultState(); |
return pref_service; |