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

Unified Diff: chrome/browser/prefs/tracked/segregated_pref_store.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/tracked/segregated_pref_store.cc
diff --git a/chrome/browser/prefs/tracked/segregated_pref_store.cc b/chrome/browser/prefs/tracked/segregated_pref_store.cc
index 3a50b407788aff00c04a1a7a4ee55ac71748827d..2b41830944e05f2022e46900b8fb4237a5c0ba9e 100644
--- a/chrome/browser/prefs/tracked/segregated_pref_store.cc
+++ b/chrome/browser/prefs/tracked/segregated_pref_store.cc
@@ -152,12 +152,14 @@ SegregatedPrefStore::~SegregatedPrefStore() {
}
PersistentPrefStore* SegregatedPrefStore::StoreForKey(const std::string& key) {
- return ContainsKey(selected_preference_names_, key) ? selected_pref_store_
- : default_pref_store_;
+ return (ContainsKey(selected_preference_names_, key)
+ ? selected_pref_store_
+ : default_pref_store_).get();
}
const PersistentPrefStore* SegregatedPrefStore::StoreForKey(
const std::string& key) const {
- return ContainsKey(selected_preference_names_, key) ? selected_pref_store_
- : default_pref_store_;
+ return (ContainsKey(selected_preference_names_, key)
+ ? selected_pref_store_
+ : default_pref_store_).get();
}

Powered by Google App Engine
This is Rietveld 408576698