| Index: chrome/browser/prefs/chrome_pref_service_factory.cc
|
| diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
|
| index d2e0d02510603c09e7a298e5134bd467ab045a1d..bf7e5d0adc7fbe3b9acacb1223dbecbcc424ff46 100644
|
| --- a/chrome/browser/prefs/chrome_pref_service_factory.cc
|
| +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
|
| @@ -8,6 +8,7 @@
|
| #include <stddef.h>
|
|
|
| #include <string>
|
| +#include <utility>
|
| #include <vector>
|
|
|
| #include "base/bind.h"
|
| @@ -513,9 +514,9 @@ void DisableDomainCheckForTesting() {
|
|
|
| bool InitializePrefsFromMasterPrefs(
|
| const base::FilePath& profile_path,
|
| - const base::DictionaryValue& master_prefs) {
|
| + std::unique_ptr<base::DictionaryValue> master_prefs) {
|
| return CreateProfilePrefStoreManager(profile_path)
|
| - ->InitializePrefsFromMasterPrefs(master_prefs);
|
| + ->InitializePrefsFromMasterPrefs(std::move(master_prefs));
|
| }
|
|
|
| base::Time GetResetTime(Profile* profile) {
|
|
|