Convert Pass()→std::move() in //chrome

chrome/common/extensions/manifest_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/common/manifest.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
+#include <utility>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/features/feature.h"
 #include "extensions/common/features/simple_feature.h"
 #include "extensions/common/install_warning.h"
 #include "extensions/common/manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 26 matching lines @@
   // instead be deleted.
   void MutateManifest(scoped_ptr<Manifest>* manifest,
                       const std::string& key,
                       base::Value* value) {
     scoped_ptr<base::DictionaryValue> manifest_value(
         manifest->get()->value()->DeepCopy());
     if (value)
       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_;
 };
 
 // Verifies that extensions can access the correct keys.
 TEST_F(ManifestUnitTest, Extension) {
   scoped_ptr<base::DictionaryValue> manifest_value(new base::DictionaryValue());
   manifest_value->SetString(keys::kName, "extension");
   manifest_value->SetString(keys::kVersion, "1");
   // Only supported in manifest_version=1.
   manifest_value->SetString(keys::kBackgroundPageLegacy, "bg.html");
   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));
   EXPECT_TRUE(error.empty());
   ASSERT_EQ(1u, warnings.size());
   AssertType(manifest.get(), Manifest::TYPE_EXTENSION);
 
   // The known key 'background_page' should be accessible.
   std::string value;
   EXPECT_TRUE(manifest->GetString(keys::kBackgroundPageLegacy, &value));
@@ skipping 34 matching lines @@
   EXPECT_FALSE(manifest->Equals(manifest2.get()));
 }
 
 // Verifies that key restriction based on type works.
 TEST_F(ManifestUnitTest, ExtensionTypes) {
   scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   value->SetString(keys::kName, "extension");
   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));
   EXPECT_TRUE(error.empty());
   EXPECT_TRUE(warnings.empty());
 
   // By default, the type is Extension.
   AssertType(manifest.get(), Manifest::TYPE_EXTENSION);
 
   // Theme.
@@ skipping 35 matching lines @@
       &manifest, keys::kLaunchWebURL, NULL);
 };
 
 // Verifies that the getters filter restricted keys.
 TEST_F(ManifestUnitTest, RestrictedKeys) {
   scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   value->SetString(keys::kName, "extension");
   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));
   EXPECT_TRUE(error.empty());
   EXPECT_TRUE(warnings.empty());
 
   // "Commands" requires manifest version 2.
   const base::Value* output = NULL;
   MutateManifest(
       &manifest, keys::kCommands, new base::DictionaryValue());
@@ skipping 19 matching lines @@
   EXPECT_FALSE(manifest->Get(keys::kPageAction, &output));
   MutateManifest(
       &manifest, keys::kPlatformAppBackground, NULL);
 
   // Platform apps also can't have a "Commands" key.
   EXPECT_FALSE(manifest->HasKey(keys::kCommands));
   EXPECT_FALSE(manifest->Get(keys::kCommands, &output));
 };
 
 }  // namespace extensions