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

chrome/browser/download/download_history_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 "chrome/browser/download/download_history.h"
+
 #include <stddef.h>
 #include <stdint.h>
-
+#include <utility>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
-#include "chrome/browser/download/download_history.h"
 #include "components/history/content/browser/download_constants_utils.h"
 #include "components/history/core/browser/download_constants.h"
 #include "components/history/core/browser/download_row.h"
 #include "components/history/core/browser/history_service.h"
 #include "content/public/test/mock_download_item.h"
 #include "content/public/test/mock_download_manager.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 57 matching lines @@
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
         base::Bind(&FakeHistoryAdapter::QueryDownloadsDone,
             base::Unretained(this), callback));
   }
 
   void QueryDownloadsDone(
       const history::HistoryService::DownloadQueryCallback& callback) {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     CHECK(expect_query_downloads_.get());
-    callback.Run(expect_query_downloads_.Pass());
+    callback.Run(std::move(expect_query_downloads_));
   }
 
   void set_slow_create_download(bool slow) { slow_create_download_ = slow; }
 
   void CreateDownload(const history::DownloadRow& info,
                       const history::HistoryService::DownloadCreateCallback&
                           callback) override {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     create_download_info_ = info;
     // Must not call CreateDownload() again before FinishCreateDownload()!
@@ skipping 18 matching lines @@
   void RemoveDownloads(const IdSet& ids) override {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     for (IdSet::const_iterator it = ids.begin();
          it != ids.end(); ++it) {
       remove_downloads_.insert(*it);
     }
   }
 
   void ExpectWillQueryDownloads(scoped_ptr<InfoVector> infos) {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-    expect_query_downloads_ = infos.Pass();
+    expect_query_downloads_ = std::move(infos);
   }
 
   void ExpectQueryDownloadsDone() {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     EXPECT_TRUE(NULL == expect_query_downloads_.get());
   }
 
   void FailCreateDownload() {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     fail_create_download_ = true;
@@ skipping 111 matching lines @@
           history::ToContentDownloadInterruptReason(row.interrupt_reason),
           row.opened);
       EXPECT_CALL(manager(), MockCreateDownloadItem(adapter))
         .WillOnce(DoAll(
             InvokeWithoutArgs(
                 this, &DownloadHistoryTest::CallOnDownloadCreatedInOrder),
             Return(&item(index))));
     }
     EXPECT_CALL(manager(), CheckForHistoryFilesRemoval());
     history_ = new FakeHistoryAdapter();
-    history_->ExpectWillQueryDownloads(infos.Pass());
+    history_->ExpectWillQueryDownloads(std::move(infos));
     EXPECT_CALL(*manager_.get(), GetAllDownloads(_)).WillRepeatedly(Return());
     download_history_.reset(new DownloadHistory(
         &manager(), scoped_ptr<DownloadHistory::HistoryAdapter>(history_)));
     content::RunAllPendingInMessageLoop(content::BrowserThread::UI);
     history_->ExpectQueryDownloadsDone();
   }
 
   void CallOnDownloadCreated(size_t index) {
     DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     if (!pre_on_create_handler_.is_null())
@@ skipping 210 matching lines @@
   // Load a download from history, create the item, OnDownloadCreated,
   // OnDownloadUpdated, OnDownloadRemoved.
   history::DownloadRow info;
   InitBasicItem(FILE_PATH_LITERAL("/foo/bar.pdf"),
                 "http://example.com/bar.pdf",
                 "http://example.com/referrer.html",
                 &info);
   {
     scoped_ptr<InfoVector> infos(new InfoVector());
     infos->push_back(info);
-    CreateDownloadHistory(infos.Pass());
+    CreateDownloadHistory(std::move(infos));
     ExpectNoDownloadCreated();
   }
   EXPECT_TRUE(DownloadHistory::IsPersisted(&item(0)));
 
   // Pretend that something changed on the item.
   EXPECT_CALL(item(0), GetOpened()).WillRepeatedly(Return(true));
   item(0).NotifyObserversDownloadUpdated();
   info.opened = true;
   ExpectDownloadUpdated(info);
 
@@ skipping 17 matching lines @@
   // DownloadManager::CreateDownload() being called for the restored download.
   // The above test expectation should verify that the value of
   // WasRestoredFromHistory is correct for this download.
   history::DownloadRow info;
   InitBasicItem(FILE_PATH_LITERAL("/foo/bar.pdf"),
                 "http://example.com/bar.pdf",
                 "http://example.com/referrer.html",
                 &info);
   scoped_ptr<InfoVector> infos(new InfoVector());
   infos->push_back(info);
-  CreateDownloadHistory(infos.Pass());
+  CreateDownloadHistory(std::move(infos));
 
   EXPECT_TRUE(DownloadHistory::IsPersisted(&item(0)));
 }
 
 // Test that WasRestoredFromHistory accurately identifies downloads that were
 // not created from history.
 TEST_F(DownloadHistoryTest, DownloadHistoryTest_WasRestoredFromHistory_False) {
   // This sets DownloadHistoryTest to call DH::WasRestoredFromHistory() both
   // before and after DH::OnDownloadCreated() is called. At each call, the
   // expected return value is |true| since the download was restored from
@@ skipping 235 matching lines @@
                 "http://example.com/referrer.html",
                 &info0);
   InitBasicItem(FILE_PATH_LITERAL("/foo/qux.pdf"),
                 "http://example.com/qux.pdf",
                 "http://example.com/referrer1.html",
                 &info1);
   {
     scoped_ptr<InfoVector> infos(new InfoVector());
     infos->push_back(info0);
     infos->push_back(info1);
-    CreateDownloadHistory(infos.Pass());
+    CreateDownloadHistory(std::move(infos));
     ExpectNoDownloadCreated();
   }
 
   EXPECT_TRUE(DownloadHistory::IsPersisted(&item(0)));
   EXPECT_TRUE(DownloadHistory::IsPersisted(&item(1)));
 
   // Pretend that the user removed both items.
   IdSet ids;
   ids.insert(info0.id);
   ids.insert(info1.id);
@@ skipping 54 matching lines @@
   FinishCreateDownload();
   EXPECT_TRUE(DownloadHistory::IsPersisted(&item(0)));
 
   // ItemAdded should call OnDownloadUpdated, which should detect that the item
   // changed while it was being added and call UpdateDownload immediately.
   info.opened = true;
   ExpectDownloadUpdated(info);
 }
 
 }  // anonymous namespace