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

Unified Diff: extensions/browser/extension_function.cc

Issue 1909773002: Convert //extensions/browser 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
« no previous file with comments | « extensions/browser/extension_function.h ('k') | extensions/browser/extension_function_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/extension_function.cc
diff --git a/extensions/browser/extension_function.cc b/extensions/browser/extension_function.cc
index b11621fa96e4f3a7d2d57e75ec829f9db0ee22b9..5c6319fabaa6c9eb20b6aa1aaa8fb2385e8167fb 100644
--- a/extensions/browser/extension_function.cc
+++ b/extensions/browser/extension_function.cc
@@ -8,6 +8,7 @@
#include "base/logging.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/singleton.h"
#include "base/synchronization/lock.h"
#include "content/public/browser/notification_source.h"
@@ -36,7 +37,7 @@ class ArgumentListResponseValue
ArgumentListResponseValue(const std::string& function_name,
const char* title,
ExtensionFunction* function,
- scoped_ptr<base::ListValue> result)
+ std::unique_ptr<base::ListValue> result)
: function_name_(function_name), title_(title) {
if (function->GetResultList()) {
DCHECK_EQ(function->GetResultList(), result.get())
@@ -67,7 +68,7 @@ class ErrorWithArgumentsResponseValue : public ArgumentListResponseValue {
ErrorWithArgumentsResponseValue(const std::string& function_name,
const char* title,
ExtensionFunction* function,
- scoped_ptr<base::ListValue> result,
+ std::unique_ptr<base::ListValue> result,
const std::string& error)
: ArgumentListResponseValue(function_name,
title,
@@ -262,12 +263,13 @@ void ExtensionFunction::SetResult(base::Value* result) {
results_->Append(result);
}
-void ExtensionFunction::SetResult(scoped_ptr<base::Value> result) {
+void ExtensionFunction::SetResult(std::unique_ptr<base::Value> result) {
results_.reset(new base::ListValue());
results_->Append(std::move(result));
}
-void ExtensionFunction::SetResultList(scoped_ptr<base::ListValue> results) {
+void ExtensionFunction::SetResultList(
+ std::unique_ptr<base::ListValue> results) {
results_ = std::move(results);
}
@@ -289,26 +291,26 @@ bool ExtensionFunction::user_gesture() const {
ExtensionFunction::ResponseValue ExtensionFunction::NoArguments() {
return ResponseValue(new ArgumentListResponseValue(
- name(), "NoArguments", this, make_scoped_ptr(new base::ListValue())));
+ name(), "NoArguments", this, base::WrapUnique(new base::ListValue())));
}
ExtensionFunction::ResponseValue ExtensionFunction::OneArgument(
base::Value* arg) {
- scoped_ptr<base::ListValue> args(new base::ListValue());
+ std::unique_ptr<base::ListValue> args(new base::ListValue());
args->Append(arg);
return ResponseValue(new ArgumentListResponseValue(name(), "OneArgument",
this, std::move(args)));
}
ExtensionFunction::ResponseValue ExtensionFunction::OneArgument(
- scoped_ptr<base::Value> arg) {
+ std::unique_ptr<base::Value> arg) {
return OneArgument(arg.release());
}
ExtensionFunction::ResponseValue ExtensionFunction::TwoArguments(
base::Value* arg1,
base::Value* arg2) {
- scoped_ptr<base::ListValue> args(new base::ListValue());
+ std::unique_ptr<base::ListValue> args(new base::ListValue());
args->Append(arg1);
args->Append(arg2);
return ResponseValue(new ArgumentListResponseValue(name(), "TwoArguments",
@@ -316,7 +318,7 @@ ExtensionFunction::ResponseValue ExtensionFunction::TwoArguments(
}
ExtensionFunction::ResponseValue ExtensionFunction::ArgumentList(
- scoped_ptr<base::ListValue> args) {
+ std::unique_ptr<base::ListValue> args) {
return ResponseValue(new ArgumentListResponseValue(name(), "ArgumentList",
this, std::move(args)));
}
@@ -351,7 +353,7 @@ ExtensionFunction::ResponseValue ExtensionFunction::Error(
}
ExtensionFunction::ResponseValue ExtensionFunction::ErrorWithArguments(
- scoped_ptr<base::ListValue> args,
+ std::unique_ptr<base::ListValue> args,
const std::string& error) {
return ResponseValue(new ErrorWithArgumentsResponseValue(
name(), "ErrorWithArguments", this, std::move(args), error));
« no previous file with comments | « extensions/browser/extension_function.h ('k') | extensions/browser/extension_function_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698