Global conversion of Pass()→std::move(): CrOS edition

chrome/browser/signin/easy_unlock_service_unittest_chromeos.cc

 // Copyright 2015 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 "chrome/browser/signin/easy_unlock_service.h"
+
 #include <stddef.h>
-
 #include <map>
 #include <string>
+#include <utility>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/login/users/mock_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/signin/easy_unlock_app_manager.h"
-#include "chrome/browser/signin/easy_unlock_service.h"
 #include "chrome/browser/signin/easy_unlock_service_factory.h"
 #include "chrome/browser/signin/easy_unlock_service_regular.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "components/syncable_prefs/testing_pref_service_syncable.h"
@@ skipping 109 matching lines @@
   TestAppManagerFactory() {}
   ~TestAppManagerFactory() {}
 
   // Creates a TestAppManager for the provided browser context. If a
   // TestAppManager was already created for the context, returns NULL.
   scoped_ptr<TestAppManager> Create(content::BrowserContext* context) {
     if (Find(context))
       return scoped_ptr<TestAppManager>();
     scoped_ptr<TestAppManager> app_manager(new TestAppManager());
     mapping_[context] = app_manager.get();
-    return app_manager.Pass();
+    return app_manager;
   }
 
   // Finds a TestAppManager created for |context|. Returns NULL if no
   // TestAppManagers have been created for the context.
   TestAppManager* Find(content::BrowserContext* context) {
     std::map<content::BrowserContext*, TestAppManager*>::iterator it =
         mapping_.find(context);
     if (it == mapping_.end())
       return NULL;
     return it->second;
@@ skipping 21 matching lines @@
     return nullptr;
 
   scoped_ptr<EasyUnlockAppManager> app_manager =
       app_manager_factory->Create(context);
   EXPECT_TRUE(app_manager.get());
   if (!app_manager.get())
     return nullptr;
 
   scoped_ptr<EasyUnlockServiceRegular> service(
       new EasyUnlockServiceRegular(Profile::FromBrowserContext(context)));
-  service->Initialize(app_manager.Pass());
-  return service.Pass();
+  service->Initialize(std::move(app_manager));
+  return std::move(service);
 }
 
 class EasyUnlockServiceTest : public testing::Test {
  public:
   EasyUnlockServiceTest()
       : mock_user_manager_(new testing::NiceMock<chromeos::MockUserManager>()),
         scoped_user_manager_(mock_user_manager_),
         is_bluetooth_adapter_present_(true) {}
 
   ~EasyUnlockServiceTest() override {}
@@ skipping 166 matching lines @@
   ON_CALL(*mock_user_manager_, IsCurrentUserNonCryptohomeDataEphemeral())
       .WillByDefault(Return(true));
 
   SetAppManagerReady(profile_.get());
   EXPECT_FALSE(EasyUnlockService::Get(profile_.get())->IsAllowed());
   EXPECT_TRUE(
       EasyUnlockAppInState(profile_.get(), TestAppManager::STATE_NOT_LOADED));
 }
 
 }  // namespace