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

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

Issue 660873002: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/prefs/proxy_policy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 31ed6f502745c583fea7048977600d94d8f622ca..04f4b773ec9377da49f915581a4bb1a10074726a 100644
--- a/chrome/browser/prefs/profile_pref_store_manager.cc
+++ b/chrome/browser/prefs/profile_pref_store_manager.cc
@@ -133,14 +133,14 @@ PersistentPrefStore* ProfilePrefStoreManager::CreateProfilePrefStore(
scoped_refptr<JsonPrefStore> unprotected_pref_store(
new JsonPrefStore(GetPrefFilePathFromProfilePath(profile_path_),
io_task_runner.get(),
- unprotected_pref_hash_filter.PassAs<PrefFilter>()));
+ unprotected_pref_hash_filter.Pass()));
// 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.get(),
- protected_pref_hash_filter.PassAs<PrefFilter>()));
+ protected_pref_hash_filter.Pass()));
SetupTrackedPreferencesMigration(
unprotected_pref_names,
@@ -211,13 +211,12 @@ ProfilePrefStoreManager::CreateDeprecatedCombinedProfilePrefStore(
pref_hash_store_impl->set_legacy_hash_store_contents(
scoped_ptr<HashStoreContents>(new PrefServiceHashStoreContents(
profile_path_.AsUTF8Unsafe(), local_state_)));
- pref_filter.reset(
- new PrefHashFilter(pref_hash_store_impl.PassAs<PrefHashStore>(),
- tracking_configuration_,
- base::Closure(),
- NULL,
- reporting_ids_count_,
- false));
+ pref_filter.reset(new PrefHashFilter(pref_hash_store_impl.Pass(),
+ tracking_configuration_,
+ base::Closure(),
+ NULL,
+ reporting_ids_count_,
+ false));
}
return new JsonPrefStore(GetPrefFilePathFromProfilePath(profile_path_),
io_task_runner.get(),
« no previous file with comments | « chrome/browser/policy/policy_browsertest.cc ('k') | chrome/browser/prefs/proxy_policy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698