Convert Pass()→std::move() in //ui (CrOS edition)

ui/display/chromeos/apply_content_protection_task_unittest.cc

Index: ui/display/chromeos/apply_content_protection_task_unittest.cc
diff --git a/ui/display/chromeos/apply_content_protection_task_unittest.cc b/ui/display/chromeos/apply_content_protection_task_unittest.cc
index 33695d73ef926dcf2b52102bd98c3873f4b5ddf3..61acee3ba1cfe43302b12f9ec98b5eff90a967ea 100644
--- a/ui/display/chromeos/apply_content_protection_task_unittest.cc
+++ b/ui/display/chromeos/apply_content_protection_task_unittest.cc
@@ -2,12 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ui/display/chromeos/apply_content_protection_task.h"
+
 #include <stdint.h>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/display/chromeos/apply_content_protection_task.h"
 #include "ui/display/chromeos/display_layout_manager.h"
 #include "ui/display/chromeos/test/action_logger_util.h"
 #include "ui/display/chromeos/test/test_display_layout_manager.h"
@@ -25,7 +27,7 @@ scoped_ptr<DisplaySnapshot> CreateDisplaySnapshot(int64_t id,
   display->set_display_id(id);
   display->set_type(type);
 
-  return display.Pass();
+  return std::move(display);
 }
 
 }  // namespace
@@ -57,7 +59,7 @@ TEST_F(ApplyContentProtectionTaskTest, ApplyWithNoHDCPCapableDisplay) {
   ScopedVector<DisplaySnapshot> displays;
   displays.push_back(
       CreateDisplaySnapshot(1, DISPLAY_CONNECTION_TYPE_INTERNAL));
-  TestDisplayLayoutManager layout_manager(displays.Pass(),
+  TestDisplayLayoutManager layout_manager(std::move(displays),
                                           MULTIPLE_DISPLAY_STATE_SINGLE);
 
   DisplayConfigurator::ContentProtections request;
@@ -75,7 +77,7 @@ TEST_F(ApplyContentProtectionTaskTest, ApplyWithNoHDCPCapableDisplay) {
 TEST_F(ApplyContentProtectionTaskTest, ApplyWithHDMIDisplay) {
   ScopedVector<DisplaySnapshot> displays;
   displays.push_back(CreateDisplaySnapshot(1, DISPLAY_CONNECTION_TYPE_HDMI));
-  TestDisplayLayoutManager layout_manager(displays.Pass(),
+  TestDisplayLayoutManager layout_manager(std::move(displays),
                                           MULTIPLE_DISPLAY_STATE_SINGLE);
 
   DisplayConfigurator::ContentProtections request;
@@ -97,7 +99,7 @@ TEST_F(ApplyContentProtectionTaskTest, ApplyWithHDMIDisplay) {
 TEST_F(ApplyContentProtectionTaskTest, ApplyWithUnknownDisplay) {
   ScopedVector<DisplaySnapshot> displays;
   displays.push_back(CreateDisplaySnapshot(1, DISPLAY_CONNECTION_TYPE_UNKNOWN));
-  TestDisplayLayoutManager layout_manager(displays.Pass(),
+  TestDisplayLayoutManager layout_manager(std::move(displays),
                                           MULTIPLE_DISPLAY_STATE_SINGLE);
 
   DisplayConfigurator::ContentProtections request;
@@ -115,7 +117,7 @@ TEST_F(ApplyContentProtectionTaskTest, ApplyWithUnknownDisplay) {
 TEST_F(ApplyContentProtectionTaskTest, FailGettingHDCPState) {
   ScopedVector<DisplaySnapshot> displays;
   displays.push_back(CreateDisplaySnapshot(1, DISPLAY_CONNECTION_TYPE_HDMI));
-  TestDisplayLayoutManager layout_manager(displays.Pass(),
+  TestDisplayLayoutManager layout_manager(std::move(displays),
                                           MULTIPLE_DISPLAY_STATE_SINGLE);
   display_delegate_.set_get_hdcp_state_expectation(false);
 
@@ -134,7 +136,7 @@ TEST_F(ApplyContentProtectionTaskTest, FailGettingHDCPState) {
 TEST_F(ApplyContentProtectionTaskTest, FailSettingHDCPState) {
   ScopedVector<DisplaySnapshot> displays;
   displays.push_back(CreateDisplaySnapshot(1, DISPLAY_CONNECTION_TYPE_HDMI));
-  TestDisplayLayoutManager layout_manager(displays.Pass(),
+  TestDisplayLayoutManager layout_manager(std::move(displays),
                                           MULTIPLE_DISPLAY_STATE_SINGLE);
   display_delegate_.set_set_hdcp_state_expectation(false);
 
@@ -157,7 +159,7 @@ TEST_F(ApplyContentProtectionTaskTest, FailSettingHDCPState) {
 TEST_F(ApplyContentProtectionTaskTest, ApplyNoopProtection) {
   ScopedVector<DisplaySnapshot> displays;
   displays.push_back(CreateDisplaySnapshot(1, DISPLAY_CONNECTION_TYPE_HDMI));
-  TestDisplayLayoutManager layout_manager(displays.Pass(),
+  TestDisplayLayoutManager layout_manager(std::move(displays),
                                           MULTIPLE_DISPLAY_STATE_SINGLE);
   display_delegate_.set_hdcp_state(HDCP_STATE_UNDESIRED);