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

Unified Diff: chrome/browser/extensions/api/feedback_private/feedback_private_api.cc

Issue 1991083002: Remove ExtensionFunction::SetResult(T*) overload. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: IWYU Created 4 years, 7 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/extensions/api/feedback_private/feedback_private_api.cc
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
index 2ff360aff42491f1bea5daaa2405cc3640057126..6e570edb81d076bbc183e29356e4369d0cca2a41 100644
--- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
+++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
@@ -136,8 +136,7 @@ void FeedbackPrivateAPI::RequestFeedbackForFlow(
base::Closure* FeedbackPrivateGetStringsFunction::test_callback_ = NULL;
bool FeedbackPrivateGetStringsFunction::RunSync() {
- base::DictionaryValue* dict = new base::DictionaryValue();
- SetResult(dict);
+ std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
#define SET_STRING(id, idr) \
dict->SetString(id, l10n_util::GetStringUTF16(idr))
@@ -178,7 +177,9 @@ bool FeedbackPrivateGetStringsFunction::RunSync() {
#undef SET_STRING
const std::string& app_locale = g_browser_process->GetApplicationLocale();
- webui::SetLoadTimeDataDefaults(app_locale, dict);
+ webui::SetLoadTimeDataDefaults(app_locale, dict.get());
+
+ SetResult(std::move(dict));
if (test_callback_ && !test_callback_->is_null())
test_callback_->Run();
@@ -189,7 +190,7 @@ bool FeedbackPrivateGetStringsFunction::RunSync() {
bool FeedbackPrivateGetUserEmailFunction::RunSync() {
SigninManagerBase* signin_manager =
SigninManagerFactory::GetForProfile(GetProfile());
- SetResult(new base::StringValue(
+ SetResult(base::MakeUnique<base::StringValue>(
signin_manager ? signin_manager->GetAuthenticatedAccountInfo().email
: std::string()));
return true;

Powered by Google App Engine
This is Rietveld 408576698