drive: Replace GetResourceListCallback in DriveServiceInterface with FileListCallback

chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.cc

 // Copyright 2014 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/fake_drive_service_helper.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/sequenced_worker_pool.h"
+#include "chrome/browser/drive/drive_api_util.h"
 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h"
 #include "chrome/browser/sync_file_system/sync_status_code.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/gdata_wapi_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 
 #define FPL(path) FILE_PATH_LITERAL(path)
 
 using google_apis::AboutResource;
+using google_apis::FileList;
+using google_apis::FileResource;
 using google_apis::GDataErrorCode;
 using google_apis::ResourceEntry;
-using google_apis::ResourceList;
 
 namespace sync_file_system {
 namespace drive_backend {
 
 namespace {
 
 void UploadResultCallback(GDataErrorCode* error_out,
                           scoped_ptr<ResourceEntry>* entry_out,
                           GDataErrorCode error,
                           const GURL& upload_location,
@@ skipping 167 matching lines @@
   fake_drive_service_->RemoveResourceFromDirectory(
       parent_folder_id, file_id,
       CreateResultReceiver(&error));
   base::RunLoop().RunUntilIdle();
   return error;
 }
 
 GDataErrorCode FakeDriveServiceHelper::GetSyncRootFolderID(
     std::string* sync_root_folder_id) {
   GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
-  scoped_ptr<ResourceList> resource_list;
+  scoped_ptr<FileList> resource_list;
   fake_drive_service_->SearchByTitle(
       sync_root_folder_title_, std::string(),
       CreateResultReceiver(&error, &resource_list));
   base::RunLoop().RunUntilIdle();
   if (error != google_apis::HTTP_SUCCESS)
     return error;
 
-  const ScopedVector<ResourceEntry>& entries = resource_list->entries();
-  for (ScopedVector<ResourceEntry>::const_iterator itr = entries.begin();
-       itr != entries.end(); ++itr) {
-    const ResourceEntry& entry = **itr;
-    if (!entry.GetLinkByType(google_apis::Link::LINK_PARENT)) {
-      *sync_root_folder_id = entry.resource_id();
+  const ScopedVector<FileResource>& items = resource_list->items();
+  for (ScopedVector<FileResource>::const_iterator itr = items.begin();
+       itr != items.end(); ++itr) {
+    const FileResource& item = **itr;
+    if (item.parents().empty()) {
+      *sync_root_folder_id = item.file_id();
       return google_apis::HTTP_SUCCESS;
     }
   }
   return google_apis::HTTP_NOT_FOUND;
 }
 
 GDataErrorCode FakeDriveServiceHelper::ListFilesInFolder(
     const std::string& folder_id,
     ScopedVector<ResourceEntry>* entries) {
   GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
-  scoped_ptr<ResourceList> list;
-  fake_drive_service_->GetResourceListInDirectory(
+  scoped_ptr<FileList> list;
+  fake_drive_service_->GetFileListInDirectory(
       folder_id,
       CreateResultReceiver(&error, &list));
   base::RunLoop().RunUntilIdle();
   if (error != google_apis::HTTP_SUCCESS)
     return error;
 
   return CompleteListing(list.Pass(), entries);
 }
 
 GDataErrorCode FakeDriveServiceHelper::SearchByTitle(
     const std::string& folder_id,
     const std::string& title,
     ScopedVector<ResourceEntry>* entries) {
   GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
-  scoped_ptr<ResourceList> list;
+  scoped_ptr<FileList> list;
   fake_drive_service_->SearchByTitle(
       title, folder_id,
       CreateResultReceiver(&error, &list));
   base::RunLoop().RunUntilIdle();
   if (error != google_apis::HTTP_SUCCESS)
     return error;
 
   return CompleteListing(list.Pass(), entries);
 }
 
@@ skipping 37 matching lines @@
 GDataErrorCode FakeDriveServiceHelper::GetAboutResource(
     scoped_ptr<AboutResource>* about_resource) {
   GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
   fake_drive_service_->GetAboutResource(
       CreateResultReceiver(&error, about_resource));
   base::RunLoop().RunUntilIdle();
   return error;
 }
 
 GDataErrorCode FakeDriveServiceHelper::CompleteListing(
-    scoped_ptr<ResourceList> list,
+    scoped_ptr<FileList> list,
     ScopedVector<ResourceEntry>* entries) {
   while (true) {
-    entries->reserve(entries->size() + list->entries().size());
-    for (ScopedVector<ResourceEntry>::iterator itr =
-         list->mutable_entries()->begin();
-         itr != list->mutable_entries()->end(); ++itr) {
-      entries->push_back(*itr);
-      *itr = NULL;
+    entries->reserve(entries->size() + list->items().size());
+    for (ScopedVector<FileResource>::const_iterator itr =
+             list->items().begin(); itr != list->items().end(); ++itr) {
+      entries->push_back(
+          drive::util::ConvertFileResourceToResourceEntry(**itr).release());
     }
 
-    GURL next_feed;
-    if (!list->GetNextFeedURL(&next_feed))
+    GURL next_feed = list->next_link();
+    if (next_feed.is_empty())
       return google_apis::HTTP_SUCCESS;
 
     GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
     list.reset();
     fake_drive_service_->GetRemainingFileList(
         next_feed,
         CreateResultReceiver(&error, &list));
     base::RunLoop().RunUntilIdle();
     if (error != google_apis::HTTP_SUCCESS)
       return error;
@@ skipping 10 matching lines @@
     const std::string& content) {
   base::FilePath temp_file;
   EXPECT_TRUE(base::CreateTemporaryFileInDir(temp_dir_, &temp_file));
   EXPECT_EQ(static_cast<int>(content.size()),
             base::WriteFile(temp_file, content.data(), content.size()));
   return temp_file;
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system