Convert Pass()→std::move() for CrOS extension code.

chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

 // Copyright 2014 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 <stddef.h>
-
 #include <map>
+#include <utility>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/onc/onc_constants.h"
@@ skipping 14 matching lines @@
 
 namespace {
 
 const char kFailure[] = "Failure";
 const char kSuccess[] = "Success";
 const char kGuid[] = "SOME_GUID";
 
 class TestDelegate : public NetworkingPrivateDelegate {
  public:
   explicit TestDelegate(scoped_ptr<VerifyDelegate> verify_delegate)
-      : NetworkingPrivateDelegate(verify_delegate.Pass()), fail_(false) {}
+      : NetworkingPrivateDelegate(std::move(verify_delegate)), fail_(false) {}
 
   ~TestDelegate() override {}
 
   // Asynchronous methods
   void GetProperties(const std::string& guid,
                      const DictionaryCallback& success_callback,
                      const FailureCallback& failure_callback) override {
     DictionaryResult(guid, success_callback, failure_callback);
   }
 
@@ skipping 37 matching lines @@
                    const FailureCallback& failure_callback) override {
     if (fail_) {
       failure_callback.Run(kFailure);
     } else {
       scoped_ptr<base::ListValue> result(new base::ListValue);
       scoped_ptr<base::DictionaryValue> network(new base::DictionaryValue);
       network->SetString(::onc::network_config::kType,
                          ::onc::network_config::kEthernet);
       network->SetString(::onc::network_config::kGUID, kGuid);
       result->Append(network.release());
-      success_callback.Run(result.Pass());
+      success_callback.Run(std::move(result));
     }
   }
 
   void StartConnect(const std::string& guid,
                     const VoidCallback& success_callback,
                     const FailureCallback& failure_callback) override {
     VoidResult(success_callback, failure_callback);
   }
 
   void StartDisconnect(const std::string& guid,
@@ skipping 47 matching lines @@
     VoidResult(success_callback, failure_callback);
   }
 
   // Synchronous methods
   scoped_ptr<base::ListValue> GetEnabledNetworkTypes() override {
     scoped_ptr<base::ListValue> result;
     if (!fail_) {
       result.reset(new base::ListValue);
       result->AppendString(::onc::network_config::kEthernet);
     }
-    return result.Pass();
+    return result;
   }
 
   scoped_ptr<DeviceStateList> GetDeviceStateList() override {
     scoped_ptr<DeviceStateList> result;
     if (fail_)
-      return result.Pass();
+      return result;
     result.reset(new DeviceStateList);
     scoped_ptr<api::networking_private::DeviceStateProperties> properties(
         new api::networking_private::DeviceStateProperties);
     properties->type = api::networking_private::NETWORK_TYPE_ETHERNET;
     properties->state = api::networking_private::DEVICE_STATE_TYPE_ENABLED;
-    result->push_back(properties.Pass());
-    return result.Pass();
+    result->push_back(std::move(properties));
+    return result;
   }
 
   bool EnableNetworkType(const std::string& type) override {
     enabled_[type] = true;
     return !fail_;
   }
 
   bool DisableNetworkType(const std::string& type) override {
     disabled_[type] = true;
     return !fail_;
@@ skipping 12 matching lines @@
   void DictionaryResult(const std::string& guid,
                         const DictionaryCallback& success_callback,
                         const FailureCallback& failure_callback) {
     if (fail_) {
       failure_callback.Run(kFailure);
     } else {
       scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue);
       result->SetString(::onc::network_config::kGUID, guid);
       result->SetString(::onc::network_config::kType,
                         ::onc::network_config::kWiFi);
-      success_callback.Run(result.Pass());
+      success_callback.Run(std::move(result));
     }
   }
 
   void StringResult(const StringCallback& success_callback,
                     const FailureCallback& failure_callback) {
     if (fail_) {
       failure_callback.Run(kFailure);
     } else {
       success_callback.Run(kSuccess);
     }
@@ skipping 61 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestVerifyDelegate);
 };
 
 class NetworkingPrivateApiTest : public ExtensionApiTest {
  public:
   NetworkingPrivateApiTest() {
     if (!s_test_delegate_) {
       TestVerifyDelegate* verify_delegate = new TestVerifyDelegate;
       scoped_ptr<NetworkingPrivateDelegate::VerifyDelegate> verify_delegate_ptr(
           verify_delegate);
-      s_test_delegate_ = new TestDelegate(verify_delegate_ptr.Pass());
+      s_test_delegate_ = new TestDelegate(std::move(verify_delegate_ptr));
       verify_delegate->set_owner(s_test_delegate_);
     }
   }
 
   static scoped_ptr<KeyedService> GetNetworkingPrivateDelegate(
       content::BrowserContext* profile) {
     CHECK(s_test_delegate_);
     return make_scoped_ptr(s_test_delegate_);
   }
 
@@ skipping 249 matching lines @@
   EXPECT_FALSE(RunNetworkingSubtest("unlockCellularSim")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(NetworkingPrivateApiTestFail, SetCellularSimState) {
   EXPECT_FALSE(RunNetworkingSubtest("setCellularSimState")) << message_;
 }
 
 #endif // defined(OS_WIN)
 
 }  // namespace extensions