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

ui/display/chromeos/query_content_protection_task_unittest.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 "ui/display/chromeos/query_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/display_layout_manager.h"
-#include "ui/display/chromeos/query_content_protection_task.h"
 #include "ui/display/chromeos/test/action_logger_util.h"
 #include "ui/display/chromeos/test/test_display_layout_manager.h"
 #include "ui/display/chromeos/test/test_display_snapshot.h"
 #include "ui/display/chromeos/test/test_native_display_delegate.h"
 
 namespace ui {
 namespace test {
 
 namespace {
 
 scoped_ptr<DisplaySnapshot> CreateDisplaySnapshot(int64_t id,
                                                   DisplayConnectionType type) {
   scoped_ptr<TestDisplaySnapshot> display(new TestDisplaySnapshot());
   display->set_display_id(id);
   display->set_type(type);
 
-  return display.Pass();
+  return std::move(display);
 }
 
 }  // namespace
 
 class QueryContentProtectionTaskTest : public testing::Test {
  public:
   QueryContentProtectionTaskTest()
       : display_delegate_(&log_), has_response_(false) {}
   ~QueryContentProtectionTaskTest() override {}
 
@@ skipping 10 matching lines @@
   QueryContentProtectionTask::Response response_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(QueryContentProtectionTaskTest);
 };
 
 TEST_F(QueryContentProtectionTaskTest, QueryWithNoHDCPCapableDisplay) {
   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);
 
   QueryContentProtectionTask task(
       &layout_manager, &display_delegate_, 1,
       base::Bind(&QueryContentProtectionTaskTest::ResponseCallback,
                  base::Unretained(this)));
   task.Run();
 
   EXPECT_TRUE(has_response_);
   EXPECT_TRUE(response_.success);
   EXPECT_EQ(DISPLAY_CONNECTION_TYPE_INTERNAL, response_.link_mask);
   EXPECT_EQ(0u, response_.enabled);
   EXPECT_EQ(0u, response_.unfulfilled);
 }
 
 TEST_F(QueryContentProtectionTaskTest, QueryWithUnknownDisplay) {
   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);
 
   QueryContentProtectionTask task(
       &layout_manager, &display_delegate_, 1,
       base::Bind(&QueryContentProtectionTaskTest::ResponseCallback,
                  base::Unretained(this)));
   task.Run();
 
   EXPECT_TRUE(has_response_);
   EXPECT_FALSE(response_.success);
   EXPECT_EQ(DISPLAY_CONNECTION_TYPE_UNKNOWN, response_.link_mask);
   EXPECT_EQ(0u, response_.enabled);
   EXPECT_EQ(0u, response_.unfulfilled);
 }
 
 TEST_F(QueryContentProtectionTaskTest, FailQueryWithHDMIDisplay) {
   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);
 
   QueryContentProtectionTask task(
       &layout_manager, &display_delegate_, 1,
       base::Bind(&QueryContentProtectionTaskTest::ResponseCallback,
                  base::Unretained(this)));
   task.Run();
 
   EXPECT_TRUE(has_response_);
   EXPECT_FALSE(response_.success);
   EXPECT_EQ(DISPLAY_CONNECTION_TYPE_HDMI, response_.link_mask);
 }
 
 TEST_F(QueryContentProtectionTaskTest, QueryWithHDMIDisplayAndUnfulfilled) {
   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);
 
   QueryContentProtectionTask task(
       &layout_manager, &display_delegate_, 1,
       base::Bind(&QueryContentProtectionTaskTest::ResponseCallback,
                  base::Unretained(this)));
   task.Run();
 
   EXPECT_TRUE(has_response_);
   EXPECT_TRUE(response_.success);
   EXPECT_EQ(DISPLAY_CONNECTION_TYPE_HDMI, response_.link_mask);
   EXPECT_EQ(0u, response_.enabled);
   EXPECT_EQ(CONTENT_PROTECTION_METHOD_HDCP, response_.unfulfilled);
 }
 
 TEST_F(QueryContentProtectionTaskTest, QueryWithHDMIDisplayAndFulfilled) {
   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_ENABLED);
 
   QueryContentProtectionTask task(
       &layout_manager, &display_delegate_, 1,
       base::Bind(&QueryContentProtectionTaskTest::ResponseCallback,
                  base::Unretained(this)));
   task.Run();
 
   EXPECT_TRUE(has_response_);
   EXPECT_TRUE(response_.success);
   EXPECT_EQ(DISPLAY_CONNECTION_TYPE_HDMI, response_.link_mask);
   EXPECT_EQ(CONTENT_PROTECTION_METHOD_HDCP, response_.enabled);
   EXPECT_EQ(0u, response_.unfulfilled);
 }
 
 TEST_F(QueryContentProtectionTaskTest, QueryWith2HDCPDisplays) {
   ScopedVector<DisplaySnapshot> displays;
   displays.push_back(CreateDisplaySnapshot(1, DISPLAY_CONNECTION_TYPE_HDMI));
   displays.push_back(CreateDisplaySnapshot(2, DISPLAY_CONNECTION_TYPE_DVI));
-  TestDisplayLayoutManager layout_manager(displays.Pass(),
+  TestDisplayLayoutManager layout_manager(std::move(displays),
                                           MULTIPLE_DISPLAY_STATE_DUAL_EXTENDED);
 
   QueryContentProtectionTask task(
       &layout_manager, &display_delegate_, 1,
       base::Bind(&QueryContentProtectionTaskTest::ResponseCallback,
                  base::Unretained(this)));
   task.Run();
 
   EXPECT_TRUE(has_response_);
   EXPECT_TRUE(response_.success);
   EXPECT_EQ(DISPLAY_CONNECTION_TYPE_HDMI, response_.link_mask);
   EXPECT_EQ(0u, response_.enabled);
   EXPECT_EQ(CONTENT_PROTECTION_METHOD_HDCP, response_.unfulfilled);
 }
 
 TEST_F(QueryContentProtectionTaskTest, QueryWithMirrorHDCPDisplays) {
   ScopedVector<DisplaySnapshot> displays;
   displays.push_back(CreateDisplaySnapshot(1, DISPLAY_CONNECTION_TYPE_HDMI));
   displays.push_back(CreateDisplaySnapshot(2, DISPLAY_CONNECTION_TYPE_DVI));
-  TestDisplayLayoutManager layout_manager(displays.Pass(),
+  TestDisplayLayoutManager layout_manager(std::move(displays),
                                           MULTIPLE_DISPLAY_STATE_DUAL_MIRROR);
 
   QueryContentProtectionTask task(
       &layout_manager, &display_delegate_, 1,
       base::Bind(&QueryContentProtectionTaskTest::ResponseCallback,
                  base::Unretained(this)));
   task.Run();
 
   EXPECT_TRUE(has_response_);
   EXPECT_TRUE(response_.success);
   EXPECT_EQ(static_cast<uint32_t>(DISPLAY_CONNECTION_TYPE_HDMI |
                                   DISPLAY_CONNECTION_TYPE_DVI),
             response_.link_mask);
   EXPECT_EQ(0u, response_.enabled);
   EXPECT_EQ(CONTENT_PROTECTION_METHOD_HDCP, response_.unfulfilled);
 }
 
 }  // namespace test
 }  // namespace ui