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

components/drive/change_list_processor_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 "components/drive/change_list_processor.h"
 
 #include <stddef.h>
 #include <stdint.h>
+#include <utility>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "components/drive/drive.pb.h"
 #include "components/drive/drive_test_util.h"
 #include "components/drive/fake_free_disk_space_getter.h"
 #include "components/drive/file_cache.h"
@@ skipping 72 matching lines @@
   change_lists[0]->mutable_entries()->push_back(file);
   change_lists[0]->mutable_parent_resource_ids()->push_back(
       "1_folder_resource_id");
 
   file.set_title("Orphan File 1.txt");
   file.set_resource_id("1_orphanfile_resource_id");
   change_lists[0]->mutable_entries()->push_back(file);
   change_lists[0]->mutable_parent_resource_ids()->push_back("");
 
   change_lists[0]->set_largest_changestamp(kBaseResourceListChangestamp);
-  return change_lists.Pass();
+  return change_lists;
 }
 
 class ChangeListProcessorTest : public testing::Test {
  protected:
   void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     metadata_storage_.reset(new ResourceMetadataStorage(
         temp_dir_.path(), base::ThreadTaskRunnerHandle::Get().get()));
     ASSERT_TRUE(metadata_storage_->Initialize());
@@ skipping 13 matching lines @@
 
   // Applies the |changes| to |metadata_| as a full resource list of changestamp
   // |kBaseResourceListChangestamp|.
   FileError ApplyFullResourceList(ScopedVector<ChangeList> changes) {
     scoped_ptr<google_apis::AboutResource> about_resource(
         new google_apis::AboutResource);
     about_resource->set_largest_change_id(kBaseResourceListChangestamp);
     about_resource->set_root_folder_id(kRootId);
 
     ChangeListProcessor processor(metadata_.get(), nullptr);
-    return processor.Apply(about_resource.Pass(),
-                           changes.Pass(),
+    return processor.Apply(std::move(about_resource), std::move(changes),
                            false /* is_delta_update */);
   }
 
   // Applies the |changes| to |metadata_| as a delta update. Delta changelists
   // should contain their changestamp in themselves.
   FileError ApplyChangeList(ScopedVector<ChangeList> changes,
                             FileChange* changed_files) {
     scoped_ptr<google_apis::AboutResource> about_resource(
         new google_apis::AboutResource);
     about_resource->set_largest_change_id(kBaseResourceListChangestamp);
     about_resource->set_root_folder_id(kRootId);
 
     ChangeListProcessor processor(metadata_.get(), nullptr);
-    FileError error = processor.Apply(about_resource.Pass(),
-                                      changes.Pass(),
-                                      true /* is_delta_update */);
+    FileError error =
+        processor.Apply(std::move(about_resource), std::move(changes),
+                        true /* is_delta_update */);
     *changed_files = processor.changed_files();
     return error;
   }
 
   // Gets the resource entry for the path from |metadata_| synchronously.
   // Returns null if the entry does not exist.
   scoped_ptr<ResourceEntry> GetResourceEntry(const std::string& path) {
     scoped_ptr<ResourceEntry> entry(new ResourceEntry);
     FileError error = metadata_->GetResourceEntryByPath(
         base::FilePath::FromUTF8Unsafe(path), entry.get());
     if (error != FILE_ERROR_OK)
       entry.reset();
-    return entry.Pass();
+    return entry;
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   base::ScopedTempDir temp_dir_;
   scoped_ptr<ResourceMetadataStorage,
              test_util::DestroyHelperForTests> metadata_storage_;
   scoped_ptr<FakeFreeDiskSpaceGetter> fake_free_disk_space_getter_;
   scoped_ptr<FileCache, test_util::DestroyHelperForTests> cache_;
   scoped_ptr<ResourceMetadata, test_util::DestroyHelperForTests> metadata_;
 };
@@ skipping 63 matching lines @@
   change_lists[0]->mutable_parent_resource_ids()->push_back(
       new_folder.resource_id());
 
   change_lists[0]->set_largest_changestamp(16730);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
 
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
-            ApplyChangeList(change_lists.Pass(), &changed_files));
+            ApplyChangeList(std::move(change_lists), &changed_files));
 
   int64_t changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16730, changestamp);
   EXPECT_TRUE(GetResourceEntry("drive/root/New Directory"));
   EXPECT_TRUE(GetResourceEntry(
       "drive/root/New Directory/File in new dir.txt"));
 
   EXPECT_EQ(2U, changed_files.size());
   EXPECT_TRUE(changed_files.count(base::FilePath::FromUTF8Unsafe(
@@ skipping 14 matching lines @@
   change_lists[0]->mutable_parent_resource_ids()->push_back(
       "sub_dir_folder_2_self_link");
 
   change_lists[0]->set_largest_changestamp(16809);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
 
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
-            ApplyChangeList(change_lists.Pass(), &changed_files));
+            ApplyChangeList(std::move(change_lists), &changed_files));
 
   int64_t changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16809, changestamp);
   EXPECT_FALSE(GetResourceEntry("drive/root/Directory 1"));
   EXPECT_TRUE(GetResourceEntry(
       "drive/root/Directory 2 excludeDir-test/Directory 1"));
 
   EXPECT_EQ(2U, changed_files.size());
   EXPECT_TRUE(changed_files.CountDirectory(
@@ skipping 15 matching lines @@
   entry.set_title("SubDirectory File 1.txt");
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   change_lists[0]->set_largest_changestamp(16815);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
-            ApplyChangeList(change_lists.Pass(), &changed_files));
+            ApplyChangeList(std::move(change_lists), &changed_files));
 
   int64_t changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16815, changestamp);
   EXPECT_FALSE(GetResourceEntry(
       "drive/root/Directory 1/SubDirectory File 1.txt"));
   EXPECT_TRUE(GetResourceEntry("drive/root/SubDirectory File 1.txt"));
 
   EXPECT_EQ(2U, changed_files.size());
   EXPECT_TRUE(changed_files.count(
@@ skipping 12 matching lines @@
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(
       "1_folder_resource_id");
 
   change_lists[0]->set_largest_changestamp(16767);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
-            ApplyChangeList(change_lists.Pass(), &changed_files));
+            ApplyChangeList(std::move(change_lists), &changed_files));
   EXPECT_EQ(2U, changed_files.size());
   EXPECT_TRUE(changed_files.count(base::FilePath::FromUTF8Unsafe(
       "drive/root/Directory 1/SubDirectory File 1.txt")));
   EXPECT_TRUE(changed_files.count(base::FilePath::FromUTF8Unsafe(
       "drive/root/Directory 1/New SubDirectory File 1.txt")));
 
   int64_t changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16767, changestamp);
   EXPECT_FALSE(GetResourceEntry(
@@ skipping 18 matching lines @@
   entry.set_title("Added file.txt");
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   change_lists[0]->set_largest_changestamp(16683);
 
   // Apply.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
-            ApplyChangeList(change_lists.Pass(), &changed_files));
+            ApplyChangeList(std::move(change_lists), &changed_files));
 
   int64_t changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16683, changestamp);
   EXPECT_TRUE(GetResourceEntry("drive/root/Added file.txt"));
   EXPECT_EQ(1U, changed_files.size());
   EXPECT_TRUE(changed_files.count(
       base::FilePath::FromUTF8Unsafe("drive/root/Added file.txt")));
 
   // Create ChangeList to delete the file.
   change_lists.push_back(new ChangeList);
 
   entry.set_deleted(true);
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   change_lists[0]->set_largest_changestamp(16687);
 
   // Apply.
   EXPECT_EQ(FILE_ERROR_OK,
-            ApplyChangeList(change_lists.Pass(), &changed_files));
+            ApplyChangeList(std::move(change_lists), &changed_files));
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16687, changestamp);
   EXPECT_FALSE(GetResourceEntry("drive/root/Added file.txt"));
   EXPECT_EQ(1U, changed_files.size());
   EXPECT_TRUE(changed_files.count(
       base::FilePath::FromUTF8Unsafe("drive/root/Added file.txt")));
 }
 
 
 TEST_F(ChangeListProcessorTest, DeltaAddAndDeleteFileFromExistingDirectory) {
   // Create ChangeList to add a file.
   ScopedVector<ChangeList> change_lists;
   change_lists.push_back(new ChangeList);
 
   ResourceEntry entry;
   entry.set_resource_id("added_in_root_id");
   entry.set_title("Added file.txt");
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(
       "1_folder_resource_id");
 
   change_lists[0]->set_largest_changestamp(16730);
 
   // Apply.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
-            ApplyChangeList(change_lists.Pass(), &changed_files));
+            ApplyChangeList(std::move(change_lists), &changed_files));
   int64_t changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16730, changestamp);
   EXPECT_TRUE(GetResourceEntry("drive/root/Directory 1/Added file.txt"));
 
   EXPECT_EQ(1U, changed_files.size());
   EXPECT_TRUE(changed_files.count(
       base::FilePath::FromUTF8Unsafe("drive/root/Directory 1/Added file.txt")));
 
   // Create ChangeList to delete the file.
   change_lists.push_back(new ChangeList);
 
   entry.set_deleted(true);
   change_lists[0]->mutable_entries()->push_back(entry);
   change_lists[0]->mutable_parent_resource_ids()->push_back(
       "1_folder_resource_id");
 
   change_lists[0]->set_largest_changestamp(16770);
 
   // Apply.
   EXPECT_EQ(FILE_ERROR_OK,
-            ApplyChangeList(change_lists.Pass(), &changed_files));
+            ApplyChangeList(std::move(change_lists), &changed_files));
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16770, changestamp);
   EXPECT_FALSE(GetResourceEntry("drive/root/Directory 1/Added file.txt"));
 
   EXPECT_EQ(1U, changed_files.size());
   EXPECT_TRUE(changed_files.count(
       base::FilePath::FromUTF8Unsafe("drive/root/Directory 1/Added file.txt")));
 }
 
 TEST_F(ChangeListProcessorTest, DeltaAddFileToNewButDeletedDirectory) {
@@ skipping 19 matching lines @@
   directory.set_deleted(true);
   change_lists[0]->mutable_entries()->push_back(directory);
   change_lists[0]->mutable_parent_resource_ids()->push_back(kRootId);
 
   change_lists[0]->set_largest_changestamp(16730);
 
   // Apply the changelist and check the effect.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
-            ApplyChangeList(change_lists.Pass(), &changed_files));
+            ApplyChangeList(std::move(change_lists), &changed_files));
 
   int64_t changestamp = 0;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetLargestChangestamp(&changestamp));
   EXPECT_EQ(16730, changestamp);
   EXPECT_FALSE(GetResourceEntry("drive/root/New Directory/new_pdf_file.pdf"));
 
   EXPECT_TRUE(changed_files.empty());
 }
 
 TEST_F(ChangeListProcessorTest, RefreshDirectory) {
@@ skipping 17 matching lines @@
   dir1.set_title(dir1.title() + " (renamed)");
   change_list->mutable_entries()->push_back(dir1);
   change_list->mutable_parent_resource_ids()->push_back(kRootId);
 
   // Update the directory with the map.
   ResourceEntry root;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryByPath(
       util::GetDriveMyDriveRootPath(), &root));
   const int64_t kNewChangestamp = 12345;
   ResourceEntryVector refreshed_entries;
-  EXPECT_EQ(FILE_ERROR_OK, ChangeListProcessor::RefreshDirectory(
-      metadata_.get(),
-      DirectoryFetchInfo(root.local_id(), kRootId, kNewChangestamp),
-      change_list.Pass(),
-      &refreshed_entries));
+  EXPECT_EQ(FILE_ERROR_OK,
+            ChangeListProcessor::RefreshDirectory(
+                metadata_.get(),
+                DirectoryFetchInfo(root.local_id(), kRootId, kNewChangestamp),
+                std::move(change_list), &refreshed_entries));
 
   // "new_file" should be added.
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryByPath(
       util::GetDriveMyDriveRootPath().AppendASCII(new_file.title()), &entry));
 
   // "Directory 1" should be renamed.
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryByPath(
       util::GetDriveMyDriveRootPath().AppendASCII(dir1.title()), &entry));
 }
@@ skipping 12 matching lines @@
       "some-random-resource-id");
   change_list->mutable_entries()->push_back(new_file);
 
 
   // Update the directory.
   ResourceEntry root;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryByPath(
       util::GetDriveMyDriveRootPath(), &root));
   const int64_t kNewChangestamp = 12345;
   ResourceEntryVector refreshed_entries;
-  EXPECT_EQ(FILE_ERROR_OK, ChangeListProcessor::RefreshDirectory(
-      metadata_.get(),
-      DirectoryFetchInfo(root.local_id(), kRootId, kNewChangestamp),
-      change_list.Pass(),
-      &refreshed_entries));
+  EXPECT_EQ(FILE_ERROR_OK,
+            ChangeListProcessor::RefreshDirectory(
+                metadata_.get(),
+                DirectoryFetchInfo(root.local_id(), kRootId, kNewChangestamp),
+                std::move(change_list), &refreshed_entries));
 
   // "new_file" should not be added.
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, metadata_->GetResourceEntryByPath(
       util::GetDriveMyDriveRootPath().AppendASCII(new_file.title()), &entry));
 }
 
 TEST_F(ChangeListProcessorTest, SharedFilesWithNoParentInFeed) {
   // Prepare metadata.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
 
   // Create change lists.
   ScopedVector<ChangeList> change_lists;
   change_lists.push_back(new ChangeList);
 
   // Add a new file with non-existing parent resource id to the change lists.
   ResourceEntry new_file;
   new_file.set_title("new_file");
   new_file.set_resource_id("new_file_id");
   change_lists[0]->mutable_entries()->push_back(new_file);
   change_lists[0]->mutable_parent_resource_ids()->push_back("nonexisting");
   change_lists[0]->set_largest_changestamp(kBaseResourceListChangestamp + 1);
 
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
-            ApplyChangeList(change_lists.Pass(), &changed_files));
+            ApplyChangeList(std::move(change_lists), &changed_files));
 
   // "new_file" should be added under drive/other.
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryByPath(
       util::GetDriveGrandRootPath().AppendASCII("other/new_file"), &entry));
 }
 
 TEST_F(ChangeListProcessorTest, ModificationDate) {
   // Prepare metadata.
   EXPECT_EQ(FILE_ERROR_OK, ApplyFullResourceList(CreateBaseChangeList()));
@@ skipping 24 matching lines @@
   new_file_local.set_title("new_file_local");
   new_file_local.set_metadata_edit_state(ResourceEntry::DIRTY);
   new_file_local.set_modification_date(
       (now + base::TimeDelta::FromSeconds(1)).ToInternalValue());
   std::string local_id;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->AddEntry(new_file_local, &local_id));
 
   // Apply the change.
   FileChange changed_files;
   EXPECT_EQ(FILE_ERROR_OK,
-            ApplyChangeList(change_lists.Pass(), &changed_files));
+            ApplyChangeList(std::move(change_lists), &changed_files));
 
   // The change is rejected due to the old modification date.
   ResourceEntry entry;
   EXPECT_EQ(FILE_ERROR_OK, metadata_->GetResourceEntryById(local_id, &entry));
   EXPECT_EQ(new_file_local.title(), entry.title());
 }
 
 }  // namespace internal
 }  // namespace drive