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

Unified Diff: chrome/common/extensions/manifest_unittest.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_unittest.cc
diff --git a/chrome/common/extensions/manifest_unittest.cc b/chrome/common/extensions/manifest_unittest.cc
index 6bf35e6b9079beeb07e6b966481ca0919c66e75b..b11c9dea8533d3d4b339ce56216038c6e5849e74 100644
--- a/chrome/common/extensions/manifest_unittest.cc
+++ b/chrome/common/extensions/manifest_unittest.cc
@@ -7,6 +7,7 @@
#include <algorithm>
#include <set>
#include <string>
+#include <utility>
#include "base/memory/scoped_ptr.h"
#include "base/strings/utf_string_conversions.h"
@@ -53,7 +54,8 @@ class ManifestUnitTest : public testing::Test {
manifest_value->Set(key, value);
else
manifest_value->Remove(key, NULL);
- manifest->reset(new Manifest(Manifest::INTERNAL, manifest_value.Pass()));
+ manifest->reset(
+ new Manifest(Manifest::INTERNAL, std::move(manifest_value)));
}
std::string default_value_;
@@ -69,7 +71,7 @@ TEST_F(ManifestUnitTest, Extension) {
manifest_value->SetString("unknown_key", "foo");
scoped_ptr<Manifest> manifest(
- new Manifest(Manifest::INTERNAL, manifest_value.Pass()));
+ new Manifest(Manifest::INTERNAL, std::move(manifest_value)));
std::string error;
std::vector<InstallWarning> warnings;
EXPECT_TRUE(manifest->ValidateManifest(&error, &warnings));
@@ -124,7 +126,7 @@ TEST_F(ManifestUnitTest, ExtensionTypes) {
value->SetString(keys::kVersion, "1");
scoped_ptr<Manifest> manifest(
- new Manifest(Manifest::INTERNAL, value.Pass()));
+ new Manifest(Manifest::INTERNAL, std::move(value)));
std::string error;
std::vector<InstallWarning> warnings;
EXPECT_TRUE(manifest->ValidateManifest(&error, &warnings));
@@ -180,7 +182,7 @@ TEST_F(ManifestUnitTest, RestrictedKeys) {
value->SetString(keys::kVersion, "1");
scoped_ptr<Manifest> manifest(
- new Manifest(Manifest::INTERNAL, value.Pass()));
+ new Manifest(Manifest::INTERNAL, std::move(value)));
std::string error;
std::vector<InstallWarning> warnings;
EXPECT_TRUE(manifest->ValidateManifest(&error, &warnings));

Powered by Google App Engine
This is Rietveld 408576698