Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1853)

Unified Diff: chrome/browser/prefs/profile_pref_store_manager.cc

Issue 506153002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/prefs/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prefs/profile_pref_store_manager.cc
diff --git a/chrome/browser/prefs/profile_pref_store_manager.cc b/chrome/browser/prefs/profile_pref_store_manager.cc
index 4747e1651adc23297593643c3db579548cd0d9f7..6cf987c79e21cbe03d8e36277dfbe4040a802c53 100644
--- a/chrome/browser/prefs/profile_pref_store_manager.cc
+++ b/chrome/browser/prefs/profile_pref_store_manager.cc
@@ -87,7 +87,7 @@ PersistentPrefStore* ProfilePrefStoreManager::CreateProfilePrefStore(
scoped_ptr<PrefFilter> pref_filter;
if (!kPlatformSupportsPreferenceTracking) {
return new JsonPrefStore(GetPrefFilePathFromProfilePath(profile_path_),
- io_task_runner,
+ io_task_runner.get(),
gab 2014/08/26 19:29:56 JsonPrefStore's constructor should take a scoped_r
scoped_ptr<PrefFilter>());
}
@@ -132,14 +132,14 @@ PersistentPrefStore* ProfilePrefStoreManager::CreateProfilePrefStore(
scoped_refptr<JsonPrefStore> unprotected_pref_store(
new JsonPrefStore(GetPrefFilePathFromProfilePath(profile_path_),
- io_task_runner,
+ io_task_runner.get(),
gab 2014/08/26 19:29:56 Same as above.
unprotected_pref_hash_filter.PassAs<PrefFilter>()));
// TODO(gab): Remove kDeprecatedProtectedPreferencesFilename as an alternate
// file in M40+.
scoped_refptr<JsonPrefStore> protected_pref_store(new JsonPrefStore(
profile_path_.Append(chrome::kSecurePreferencesFilename),
profile_path_.Append(chrome::kProtectedPreferencesFilenameDeprecated),
- io_task_runner,
+ io_task_runner.get(),
gab 2014/08/26 19:29:56 Same as above.
protected_pref_hash_filter.PassAs<PrefFilter>()));
SetupTrackedPreferencesMigration(
@@ -220,7 +220,7 @@ ProfilePrefStoreManager::CreateDeprecatedCombinedProfilePrefStore(
false));
}
return new JsonPrefStore(GetPrefFilePathFromProfilePath(profile_path_),
- io_task_runner,
+ io_task_runner.get(),
gab 2014/08/26 19:29:55 Same as above.
pref_filter.Pass());
}

Powered by Google App Engine
This is Rietveld 408576698