| Index: chrome/browser/profiles/profile_impl.cc
|
| diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
|
| index c0bf8f68c707ed2af7ee342b61cb53c74960ed11..53914fa262d66ca3386ce46efdd04a9649f05d32 100644
|
| --- a/chrome/browser/profiles/profile_impl.cc
|
| +++ b/chrome/browser/profiles/profile_impl.cc
|
| @@ -659,9 +659,12 @@ net::TransportSecurityState*
|
| PrefService* ProfileImpl::GetPrefs() {
|
| if (!prefs_.get()) {
|
| ExtensionPrefStore* extension_pref_store = new ExtensionPrefStore;
|
| + ExtensionPrefStore* incognito_extension_pref_store = new ExtensionPrefStore;
|
| prefs_.reset(PrefService::CreatePrefService(GetPrefFilePath(),
|
| extension_pref_store,
|
| GetOriginalProfile()));
|
| + PrefService* incognito_prefs =
|
| + prefs_->CreateIncognitoPrefService(incognito_extension_pref_store);
|
|
|
| // The Profile class and ProfileManager class may read some prefs so
|
| // register known prefs as soon as possible.
|
| @@ -679,10 +682,13 @@ PrefService* ProfileImpl::GetPrefs() {
|
|
|
| // Ensure that preferences set by extensions are restored in the profile
|
| // as early as possible. The constructor takes care of that.
|
| +
|
| extension_prefs_.reset(new ExtensionPrefs(
|
| prefs_.get(),
|
| + incognito_prefs,
|
| GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
|
| - extension_pref_store));
|
| + extension_pref_store,
|
| + incognito_extension_pref_store));
|
|
|
| DCHECK(!net_pref_observer_.get());
|
| net_pref_observer_.reset(new NetPrefObserver(prefs_.get()));
|
|
|