| Index: chrome/browser/profiles/profile_impl.cc
|
| diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
|
| index 0f2bf3c159bfffb084c1a0ccddee6a4ea69d0449..74d03d7c30dc02a104acf05f9f7c09582a7dc3c4 100644
|
| --- a/chrome/browser/profiles/profile_impl.cc
|
| +++ b/chrome/browser/profiles/profile_impl.cc
|
| @@ -658,10 +658,11 @@ net::TransportSecurityState*
|
|
|
| PrefService* ProfileImpl::GetPrefs() {
|
| if (!prefs_.get()) {
|
| - ExtensionPrefStore* extension_pref_store = new ExtensionPrefStore;
|
| - prefs_.reset(PrefService::CreatePrefService(GetPrefFilePath(),
|
| - extension_pref_store,
|
| - GetOriginalProfile()));
|
| + extension_pref_value_map_.reset(new ExtensionPrefValueMap);
|
| + prefs_.reset(PrefService::CreatePrefService(
|
| + GetPrefFilePath(),
|
| + new ExtensionPrefStore(extension_pref_value_map_.get(), false),
|
| + GetOriginalProfile()));
|
|
|
| // The Profile class and ProfileManager class may read some prefs so
|
| // register known prefs as soon as possible.
|
| @@ -682,7 +683,7 @@ PrefService* ProfileImpl::GetPrefs() {
|
| extension_prefs_.reset(new ExtensionPrefs(
|
| prefs_.get(),
|
| GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
|
| - extension_pref_store));
|
| + extension_pref_value_map_.get()));
|
|
|
| DCHECK(!net_pref_observer_.get());
|
| net_pref_observer_.reset(new NetPrefObserver(prefs_.get()));
|
| @@ -1171,6 +1172,10 @@ void ProfileImpl::SpellCheckHostInitialized() {
|
| Source<Profile>(this), NotificationService::NoDetails());
|
| }
|
|
|
| +ExtensionPrefValueMap* ProfileImpl::GetExtensionPrefValueMap() {
|
| + return extension_pref_value_map_.get();
|
| +}
|
| +
|
| WebKitContext* ProfileImpl::GetWebKitContext() {
|
| if (!webkit_context_.get())
|
| webkit_context_ = new WebKitContext(this, clear_local_state_on_exit_);
|
|
|