Index: chrome/browser/extensions/api/extension_action/extension_action_api.cc |
diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc |
index b53d9232c2ee9fa4eaf8fd30460d9b4962483963..dbd8832c823b5fc1ff33752a791c9113f773f2f8 100644 |
--- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc |
+++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc |
@@ -10,6 +10,7 @@ |
#include "base/lazy_instance.h" |
#include "base/location.h" |
#include "base/macros.h" |
+#include "base/memory/ptr_util.h" |
#include "base/single_thread_task_runner.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/threading/thread_task_runner_handle.h" |
@@ -530,23 +531,25 @@ bool ExtensionActionSetBadgeBackgroundColorFunction::RunExtensionAction() { |
} |
bool ExtensionActionGetTitleFunction::RunExtensionAction() { |
- SetResult(new base::StringValue(extension_action_->GetTitle(tab_id_))); |
+ SetResult(base::MakeUnique<base::StringValue>( |
+ extension_action_->GetTitle(tab_id_))); |
return true; |
} |
bool ExtensionActionGetPopupFunction::RunExtensionAction() { |
- SetResult( |
- new base::StringValue(extension_action_->GetPopupUrl(tab_id_).spec())); |
+ SetResult(base::MakeUnique<base::StringValue>( |
+ extension_action_->GetPopupUrl(tab_id_).spec())); |
return true; |
} |
bool ExtensionActionGetBadgeTextFunction::RunExtensionAction() { |
- SetResult(new base::StringValue(extension_action_->GetBadgeText(tab_id_))); |
+ SetResult(base::MakeUnique<base::StringValue>( |
+ extension_action_->GetBadgeText(tab_id_))); |
return true; |
} |
bool ExtensionActionGetBadgeBackgroundColorFunction::RunExtensionAction() { |
- base::ListValue* list = new base::ListValue(); |
+ std::unique_ptr<base::ListValue> list(new base::ListValue()); |
SkColor color = extension_action_->GetBadgeBackgroundColor(tab_id_); |
list->Append( |
new base::FundamentalValue(static_cast<int>(SkColorGetR(color)))); |
Devlin
2016/05/20 17:56:54
ditto
|
@@ -556,7 +559,7 @@ bool ExtensionActionGetBadgeBackgroundColorFunction::RunExtensionAction() { |
new base::FundamentalValue(static_cast<int>(SkColorGetB(color)))); |
list->Append( |
new base::FundamentalValue(static_cast<int>(SkColorGetA(color)))); |
- SetResult(list); |
+ SetResult(std::move(list)); |
return true; |
} |