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

Unified Diff: extensions/browser/api/declarative/declarative_api.cc

Issue 1902873002: Convert //extensions/browser/api from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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: extensions/browser/api/declarative/declarative_api.cc
diff --git a/extensions/browser/api/declarative/declarative_api.cc b/extensions/browser/api/declarative/declarative_api.cc
index 183ca3e9cd80a5743390e74b6fa5d254edc2444e..5ac56a4da0b335a0748a8569d6b2d358c1ba0df3 100644
--- a/extensions/browser/api/declarative/declarative_api.cc
+++ b/extensions/browser/api/declarative/declarative_api.cc
@@ -41,11 +41,12 @@ void ConvertBinaryDictionaryValuesToBase64(base::DictionaryValue* dict);
// Encodes |binary| as base64 and returns a new StringValue populated with the
// encoded string.
-scoped_ptr<base::StringValue> ConvertBinaryToBase64(base::BinaryValue* binary) {
+std::unique_ptr<base::StringValue> ConvertBinaryToBase64(
+ base::BinaryValue* binary) {
std::string binary_data = std::string(binary->GetBuffer(), binary->GetSize());
std::string data64;
base::Base64Encode(binary_data, &data64);
- return scoped_ptr<base::StringValue>(new base::StringValue(data64));
+ return std::unique_ptr<base::StringValue>(new base::StringValue(data64));
}
// Parses through |args| replacing any BinaryValues with base64 encoded
@@ -168,7 +169,7 @@ bool RulesFunction::RunAsync() {
bool EventsEventAddRulesFunction::RunAsyncOnCorrectThread() {
ConvertBinaryListElementsToBase64(args_.get());
- scoped_ptr<AddRules::Params> params(AddRules::Params::Create(*args_));
+ std::unique_ptr<AddRules::Params> params(AddRules::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params.get());
// TODO(devlin): Remove the dependency on linked_ptr here.
@@ -180,7 +181,7 @@ bool EventsEventAddRulesFunction::RunAsyncOnCorrectThread() {
error_ = rules_registry_->AddRules(extension_id(), linked_rules);
if (error_.empty()) {
- scoped_ptr<base::ListValue> rules_value(new base::ListValue());
+ std::unique_ptr<base::ListValue> rules_value(new base::ListValue());
for (const auto& rule : linked_rules)
rules_value->Append(rule->ToValue());
SetResult(std::move(rules_value));
@@ -190,7 +191,8 @@ bool EventsEventAddRulesFunction::RunAsyncOnCorrectThread() {
}
bool EventsEventRemoveRulesFunction::RunAsyncOnCorrectThread() {
- scoped_ptr<RemoveRules::Params> params(RemoveRules::Params::Create(*args_));
+ std::unique_ptr<RemoveRules::Params> params(
+ RemoveRules::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params.get());
if (params->rule_identifiers.get()) {
@@ -204,7 +206,7 @@ bool EventsEventRemoveRulesFunction::RunAsyncOnCorrectThread() {
}
bool EventsEventGetRulesFunction::RunAsyncOnCorrectThread() {
- scoped_ptr<GetRules::Params> params(GetRules::Params::Create(*args_));
+ std::unique_ptr<GetRules::Params> params(GetRules::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params.get());
std::vector<linked_ptr<Rule> > rules;
@@ -215,7 +217,7 @@ bool EventsEventGetRulesFunction::RunAsyncOnCorrectThread() {
rules_registry_->GetAllRules(extension_id(), &rules);
}
- scoped_ptr<base::ListValue> rules_value(new base::ListValue());
+ std::unique_ptr<base::ListValue> rules_value(new base::ListValue());
for (const auto& rule : rules)
rules_value->Append(rule->ToValue());
SetResult(std::move(rules_value));
« no previous file with comments | « extensions/browser/api/cast_channel/logger_unittest.cc ('k') | extensions/browser/api/declarative/declarative_rule.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698