| Index: chrome/browser/prefs/pref_service_mock_builder.cc
|
| diff --git a/chrome/browser/prefs/pref_service_mock_builder.cc b/chrome/browser/prefs/pref_service_mock_builder.cc
|
| index c4916cbc97e265b9152884a002e49c72c1b802bf..d6c2ca6858ee64d7b2491aefb21455a0289e33a0 100644
|
| --- a/chrome/browser/prefs/pref_service_mock_builder.cc
|
| +++ b/chrome/browser/prefs/pref_service_mock_builder.cc
|
| @@ -7,7 +7,10 @@
|
| #include "chrome/browser/policy/configuration_policy_pref_store.h"
|
| #include "chrome/browser/prefs/command_line_pref_store.h"
|
| #include "chrome/browser/prefs/default_pref_store.h"
|
| +#include "chrome/browser/prefs/pref_model_associator.h"
|
| +#include "chrome/browser/prefs/pref_notifier_impl.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| +#include "chrome/browser/prefs/pref_value_store.h"
|
| #include "chrome/browser/prefs/testing_pref_store.h"
|
| #include "chrome/common/json_pref_store.h"
|
| #include "content/public/browser/browser_thread.h"
|
| @@ -109,16 +112,18 @@ PrefServiceMockBuilder::WithUserFilePrefs(const FilePath& prefs_file) {
|
| }
|
|
|
| PrefService* PrefServiceMockBuilder::Create() {
|
| - PrefService* pref_service =
|
| - new PrefService(managed_platform_prefs_.get(),
|
| - managed_cloud_prefs_.get(),
|
| - extension_prefs_.get(),
|
| - command_line_prefs_.get(),
|
| - user_prefs_.get(),
|
| - recommended_platform_prefs_.get(),
|
| - recommended_cloud_prefs_.get(),
|
| - new DefaultPrefStore(),
|
| - false);
|
| + PrefService* pref_service = new PrefService(
|
| + new PrefValueStore(managed_platform_prefs_.get(),
|
| + managed_cloud_prefs_.get(),
|
| + extension_prefs_.get(),
|
| + command_line_prefs_.get(),
|
| + user_prefs_.get(),
|
| + recommended_platform_prefs_.get(),
|
| + recommended_cloud_prefs_.get(),
|
| + new DefaultPrefStore(),
|
| + new PrefModelAssociator(),
|
| + new PrefNotifierImpl()),
|
| + false);
|
| managed_platform_prefs_ = NULL;
|
| managed_cloud_prefs_ = NULL;
|
| extension_prefs_ = NULL;
|
|
|