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

Unified Diff: chrome/common/extensions/manifest_handlers/automation.cc

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/common/extensions/manifest_handlers/automation.cc
diff --git a/chrome/common/extensions/manifest_handlers/automation.cc b/chrome/common/extensions/manifest_handlers/automation.cc
index d247b242ee410b39e23433e3756311d79a5bcdfb..dfdb72cb5923bb55536d030a985fd88e14e62e9e 100644
--- a/chrome/common/extensions/manifest_handlers/automation.cc
+++ b/chrome/common/extensions/manifest_handlers/automation.cc
@@ -4,6 +4,8 @@
#include "chrome/common/extensions/manifest_handlers/automation.h"
+#include <utility>
+
#include "base/strings/utf_string_conversions.h"
#include "chrome/common/extensions/api/manifest_types.h"
#include "chrome/grit/generated_resources.h"
@@ -40,7 +42,7 @@ class AutomationManifestPermission : public ManifestPermission {
public:
explicit AutomationManifestPermission(
scoped_ptr<const AutomationInfo> automation_info)
- : automation_info_(automation_info.Pass()) {}
+ : automation_info_(std::move(automation_info)) {}
// extensions::ManifestPermission overrides.
std::string name() const override;
@@ -108,7 +110,7 @@ bool AutomationManifestPermission::FromValue(const base::Value* value) {
}
scoped_ptr<base::Value> AutomationManifestPermission::ToValue() const {
- return AutomationInfo::ToValue(*automation_info_).Pass();
+ return AutomationInfo::ToValue(*automation_info_);
}
ManifestPermission* AutomationManifestPermission::Diff(
@@ -276,7 +278,7 @@ scoped_ptr<AutomationInfo> AutomationInfo::FromValue(
// static
scoped_ptr<base::Value> AutomationInfo::ToValue(const AutomationInfo& info) {
- return AsManifestType(info)->ToValue().Pass();
+ return AsManifestType(info)->ToValue();
}
// static
@@ -285,7 +287,7 @@ scoped_ptr<Automation> AutomationInfo::AsManifestType(
scoped_ptr<Automation> automation(new Automation);
if (!info.desktop && !info.interact && info.matches.size() == 0) {
automation->as_boolean.reset(new bool(true));
- return automation.Pass();
+ return automation;
}
Automation::Object* as_object = new Automation::Object;
@@ -295,7 +297,7 @@ scoped_ptr<Automation> AutomationInfo::AsManifestType(
as_object->matches.reset(info.matches.ToStringVector().release());
}
automation->as_object.reset(as_object);
- return automation.Pass();
+ return automation;
}
AutomationInfo::AutomationInfo() : desktop(false), interact(false) {

Powered by Google App Engine
This is Rietveld 408576698