Remove ScopedVector from base::JSONValueConverter

chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc

 // Copyright 2013 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/sync_file_system/drive_backend/local_to_remote_syncer.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 192 matching lines @@
       if (retry_count++ > kRetryLimit)
         break;
       status = RunRemoteToLocalSyncer();
     } while (status == SYNC_STATUS_OK ||
              status == SYNC_STATUS_RETRY ||
              GetMetadataDatabase()->PromoteDemotedTrackers());
     EXPECT_EQ(SYNC_STATUS_NO_CHANGE_TO_SYNC, status);
     return status;
   }
 
-  ScopedVector<google_apis::FileResource>
+  std::vector<std::unique_ptr<google_apis::FileResource>>
   GetResourceEntriesForParentAndTitle(const std::string& parent_folder_id,
                                       const std::string& title) {
-    ScopedVector<google_apis::FileResource> entries;
+    std::vector<std::unique_ptr<google_apis::FileResource>> entries;
     EXPECT_EQ(google_apis::HTTP_SUCCESS,
               fake_drive_helper_->SearchByTitle(
                   parent_folder_id, title, &entries));
     return entries;
   }
 
   std::string GetFileIDForParentAndTitle(const std::string& parent_folder_id,
                                          const std::string& title) {
-    ScopedVector<google_apis::FileResource> entries =
+    std::vector<std::unique_ptr<google_apis::FileResource>> entries =
         GetResourceEntriesForParentAndTitle(parent_folder_id, title);
     if (entries.size() != 1)
       return std::string();
     return entries[0]->file_id();
   }
 
   void VerifyTitleUniqueness(
       const std::string& parent_folder_id,
       const std::string& title,
       test_util::FileResourceKind kind) {
-    ScopedVector<google_apis::FileResource> entries;
+    std::vector<std::unique_ptr<google_apis::FileResource>> entries;
     EXPECT_EQ(google_apis::HTTP_SUCCESS,
               fake_drive_helper_->SearchByTitle(
                   parent_folder_id, title, &entries));
     ASSERT_EQ(1u, entries.size());
     EXPECT_EQ(kind, test_util::GetFileResourceKind(*entries[0]));
   }
 
   void VerifyFileDeletion(const std::string& parent_folder_id,
                           const std::string& title) {
-    ScopedVector<google_apis::FileResource> entries;
+    std::vector<std::unique_ptr<google_apis::FileResource>> entries;
     EXPECT_EQ(google_apis::HTTP_SUCCESS,
               fake_drive_helper_->SearchByTitle(
                   parent_folder_id, title, &entries));
     EXPECT_TRUE(entries.empty());
   }
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
   base::ScopedTempDir database_dir_;
   std::unique_ptr<leveldb::Env> in_memory_env_;
@@ skipping 113 matching lines @@
   RegisterApp(kOrigin.host(), app_root);
 
   CreateRemoteFolder(app_root, "foo");
   EXPECT_EQ(SYNC_STATUS_OK, ListChanges());
   EXPECT_EQ(SYNC_STATUS_OK, RunLocalToRemoteSyncer(
       FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
                  SYNC_FILE_TYPE_FILE),
       URL(kOrigin, "foo")));
 
   // There should exist both file and folder on remote.
-  ScopedVector<google_apis::FileResource> entries =
+  std::vector<std::unique_ptr<google_apis::FileResource>> entries =
       GetResourceEntriesForParentAndTitle(app_root, "foo");
   ASSERT_EQ(2u, entries.size());
   EXPECT_EQ(test_util::RESOURCE_KIND_FOLDER,
             test_util::GetFileResourceKind(*entries[0]));
   EXPECT_EQ(test_util::RESOURCE_KIND_FILE,
             test_util::GetFileResourceKind(*entries[1]));
 }
 
 TEST_F(LocalToRemoteSyncerTest, Conflict_CreateFolderOnFile) {
   const GURL kOrigin("chrome-extension://example");
   const std::string sync_root = CreateSyncRoot();
   const std::string app_root = CreateRemoteFolder(sync_root, kOrigin.host());
   InitializeMetadataDatabase();
   RegisterApp(kOrigin.host(), app_root);
 
   CreateRemoteFile(app_root, "foo", "data");
   EXPECT_EQ(SYNC_STATUS_OK, ListChanges());
 
   EXPECT_EQ(SYNC_STATUS_OK, RunLocalToRemoteSyncer(
       FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
                  SYNC_FILE_TYPE_DIRECTORY),
       URL(kOrigin, "foo")));
 
   // There should exist both file and folder on remote.
-  ScopedVector<google_apis::FileResource> entries =
+  std::vector<std::unique_ptr<google_apis::FileResource>> entries =
       GetResourceEntriesForParentAndTitle(app_root, "foo");
   ASSERT_EQ(2u, entries.size());
   EXPECT_EQ(test_util::RESOURCE_KIND_FILE,
             test_util::GetFileResourceKind(*entries[0]));
   EXPECT_EQ(test_util::RESOURCE_KIND_FOLDER,
             test_util::GetFileResourceKind(*entries[1]));
 }
 
 TEST_F(LocalToRemoteSyncerTest, Conflict_CreateFileOnFile) {
   const GURL kOrigin("chrome-extension://example");
   const std::string sync_root = CreateSyncRoot();
   const std::string app_root = CreateRemoteFolder(sync_root, kOrigin.host());
   InitializeMetadataDatabase();
   RegisterApp(kOrigin.host(), app_root);
 
   CreateRemoteFile(app_root, "foo", "data");
   EXPECT_EQ(SYNC_STATUS_OK, ListChanges());
 
   EXPECT_EQ(SYNC_STATUS_OK, RunLocalToRemoteSyncer(
       FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
                  SYNC_FILE_TYPE_FILE),
       URL(kOrigin, "foo")));
 
   // There should exist both files on remote.
-  ScopedVector<google_apis::FileResource> entries =
+  std::vector<std::unique_ptr<google_apis::FileResource>> entries =
       GetResourceEntriesForParentAndTitle(app_root, "foo");
   ASSERT_EQ(2u, entries.size());
   EXPECT_EQ(test_util::RESOURCE_KIND_FILE,
             test_util::GetFileResourceKind(*entries[0]));
   EXPECT_EQ(test_util::RESOURCE_KIND_FILE,
             test_util::GetFileResourceKind(*entries[1]));
 }
 
 TEST_F(LocalToRemoteSyncerTest, Conflict_UpdateDeleteOnFile) {
   const GURL kOrigin("chrome-extension://example");
@@ skipping 11 matching lines @@
 
   EXPECT_EQ(SYNC_STATUS_FILE_BUSY, RunLocalToRemoteSyncer(
       FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
                  SYNC_FILE_TYPE_FILE),
       URL(kOrigin, "foo")));
   EXPECT_EQ(SYNC_STATUS_OK, RunLocalToRemoteSyncer(
       FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
                  SYNC_FILE_TYPE_FILE),
       URL(kOrigin, "foo")));
 
-  ScopedVector<google_apis::FileResource> entries =
+  std::vector<std::unique_ptr<google_apis::FileResource>> entries =
       GetResourceEntriesForParentAndTitle(app_root, "foo");
   ASSERT_EQ(1u, entries.size());
   EXPECT_EQ(test_util::RESOURCE_KIND_FILE,
             test_util::GetFileResourceKind(*entries[0]));
   EXPECT_TRUE(!entries[0]->labels().is_trashed());
   EXPECT_NE(file_id, entries[0]->file_id());
 }
 
 TEST_F(LocalToRemoteSyncerTest, Conflict_CreateDeleteOnFile) {
   const GURL kOrigin("chrome-extension://example");
   const std::string sync_root = CreateSyncRoot();
   const std::string app_root = CreateRemoteFolder(sync_root, kOrigin.host());
   InitializeMetadataDatabase();
   RegisterApp(kOrigin.host(), app_root);
 
   const std::string file_id = CreateRemoteFile(app_root, "foo", "data");
   EXPECT_EQ(SYNC_STATUS_OK, ListChanges());
   EXPECT_EQ(SYNC_STATUS_NO_CHANGE_TO_SYNC,
             RunRemoteToLocalSyncerUntilIdle());
 
   DeleteResource(file_id);
 
   EXPECT_EQ(SYNC_STATUS_OK, ListChanges());
 
   EXPECT_EQ(SYNC_STATUS_OK, RunLocalToRemoteSyncer(
       FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
                  SYNC_FILE_TYPE_FILE),
       URL(kOrigin, "foo")));
 
-  ScopedVector<google_apis::FileResource> entries =
+  std::vector<std::unique_ptr<google_apis::FileResource>> entries =
       GetResourceEntriesForParentAndTitle(app_root, "foo");
   ASSERT_EQ(1u, entries.size());
   EXPECT_EQ(test_util::RESOURCE_KIND_FILE,
             test_util::GetFileResourceKind(*entries[0]));
   EXPECT_TRUE(!entries[0]->labels().is_trashed());
   EXPECT_NE(file_id, entries[0]->file_id());
 }
 
 TEST_F(LocalToRemoteSyncerTest, Conflict_CreateFolderOnFolder) {
   const GURL kOrigin("chrome-extension://example");
   const std::string sync_root = CreateSyncRoot();
   const std::string app_root = CreateRemoteFolder(sync_root, kOrigin.host());
   InitializeMetadataDatabase();
   RegisterApp(kOrigin.host(), app_root);
 
   const std::string folder_id = CreateRemoteFolder(app_root, "foo");
 
   EXPECT_EQ(SYNC_STATUS_OK, RunLocalToRemoteSyncer(
       FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
                  SYNC_FILE_TYPE_DIRECTORY),
       URL(kOrigin, "foo")));
 
-  ScopedVector<google_apis::FileResource> entries =
+  std::vector<std::unique_ptr<google_apis::FileResource>> entries =
       GetResourceEntriesForParentAndTitle(app_root, "foo");
   ASSERT_EQ(2u, entries.size());
   EXPECT_EQ(test_util::RESOURCE_KIND_FOLDER,
             test_util::GetFileResourceKind(*entries[0]));
   EXPECT_EQ(test_util::RESOURCE_KIND_FOLDER,
             test_util::GetFileResourceKind(*entries[1]));
   EXPECT_TRUE(!entries[0]->labels().is_trashed());
   EXPECT_TRUE(!entries[1]->labels().is_trashed());
   EXPECT_TRUE(folder_id == entries[0]->file_id() ||
               folder_id == entries[1]->file_id());
@@ skipping 20 matching lines @@
   EXPECT_EQ(SYNC_STATUS_UNKNOWN_ORIGIN, RunLocalToRemoteSyncer(
       FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
                  SYNC_FILE_TYPE_DIRECTORY),
       URL(kOrigin, "foo")));
 
   // SyncEngine will re-register the app and resurrect the app root later.
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system