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

Unified Diff: ui/app_list/search/dictionary_data_store.cc

Issue 855023003: Add presubmit check for scoped_ptr usage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE Created 5 years, 11 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 | « no previous file | ui/app_list/search/history_data_store.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/search/dictionary_data_store.cc
diff --git a/ui/app_list/search/dictionary_data_store.cc b/ui/app_list/search/dictionary_data_store.cc
index 41ac884709acc80eca1cc41da0539263694dabd7..b867be4d743468fb2de5ccb81fc96dbcaf25e8c6 100644
--- a/ui/app_list/search/dictionary_data_store.cc
+++ b/ui/app_list/search/dictionary_data_store.cc
@@ -71,12 +71,12 @@ scoped_ptr<base::DictionaryValue> DictionaryDataStore::LoadOnBlockingPool() {
base::DictionaryValue* dict_value = NULL;
if (error_code != JSONFileValueSerializer::JSON_NO_ERROR || !value ||
!value->GetAsDictionary(&dict_value) || !dict_value) {
- return scoped_ptr<base::DictionaryValue>();
+ return nullptr;
}
base::DictionaryValue* return_dict = dict_value->DeepCopy();
cached_dict_.reset(dict_value);
- return make_scoped_ptr(return_dict).Pass();
+ return make_scoped_ptr(return_dict);
}
bool DictionaryDataStore::SerializeData(std::string* data) {
« no previous file with comments | « no previous file | ui/app_list/search/history_data_store.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698