drive: Stop returning ResourceList from JobScheduler

chrome/browser/chromeos/drive/job_scheduler_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/chromeos/drive/job_scheduler.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/file_util.h"
@@ skipping 199 matching lines @@
   scoped_ptr<google_apis::AppList> app_list;
 
   scheduler_->GetAppList(
       google_apis::test_util::CreateCopyResultCallback(&error, &app_list));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
   ASSERT_TRUE(app_list);
 }
 
-TEST_F(JobSchedulerTest, GetAllResourceList) {
+TEST_F(JobSchedulerTest, GetAllFileList) {
   ConnectToWifi();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
-  scoped_ptr<google_apis::ResourceList> resource_list;
+  scoped_ptr<google_apis::FileList> file_list;
 
-  scheduler_->GetAllResourceList(
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &resource_list));
+  scheduler_->GetAllFileList(
+      google_apis::test_util::CreateCopyResultCallback(&error, &file_list));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
-  ASSERT_TRUE(resource_list);
+  ASSERT_TRUE(file_list);
 }
 
-TEST_F(JobSchedulerTest, GetResourceListInDirectory) {
+TEST_F(JobSchedulerTest, GetFileListInDirectory) {
   ConnectToWifi();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
-  scoped_ptr<google_apis::ResourceList> resource_list;
+  scoped_ptr<google_apis::FileList> file_list;
 
-  scheduler_->GetResourceListInDirectory(
+  scheduler_->GetFileListInDirectory(
       fake_drive_service_->GetRootResourceId(),
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &resource_list));
+      google_apis::test_util::CreateCopyResultCallback(&error, &file_list));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
-  ASSERT_TRUE(resource_list);
+  ASSERT_TRUE(file_list);
 }
 
 TEST_F(JobSchedulerTest, Search) {
   ConnectToWifi();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
-  scoped_ptr<google_apis::ResourceList> resource_list;
+  scoped_ptr<google_apis::FileList> file_list;
 
   scheduler_->Search(
       "File",  // search query
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &resource_list));
+      google_apis::test_util::CreateCopyResultCallback(&error, &file_list));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
-  ASSERT_TRUE(resource_list);
+  ASSERT_TRUE(file_list);
 }
 
 TEST_F(JobSchedulerTest, GetChangeList) {
   ConnectToWifi();
 
   int64 old_largest_change_id =
       fake_drive_service_->about_resource().largest_change_id();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
 
   // Create a new directory.
   {
     scoped_ptr<google_apis::FileResource> entry;
     fake_drive_service_->AddNewDirectory(
         fake_drive_service_->GetRootResourceId(),
         "new directory",
         DriveServiceInterface::AddNewDirectoryOptions(),
         google_apis::test_util::CreateCopyResultCallback(
             &error, &entry));
     base::RunLoop().RunUntilIdle();
     ASSERT_EQ(google_apis::HTTP_CREATED, error);
   }
 
   error = google_apis::GDATA_OTHER_ERROR;
-  scoped_ptr<google_apis::ResourceList> resource_list;
+  scoped_ptr<google_apis::ChangeList> change_list;
   scheduler_->GetChangeList(
       old_largest_change_id + 1,
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &resource_list));
+      google_apis::test_util::CreateCopyResultCallback(&error, &change_list));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
-  ASSERT_TRUE(resource_list);
+  ASSERT_TRUE(change_list);
 }
 
 TEST_F(JobSchedulerTest, GetRemainingChangeList) {
   ConnectToWifi();
   fake_drive_service_->set_default_max_results(2);
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
-  scoped_ptr<google_apis::ResourceList> resource_list;
+  scoped_ptr<google_apis::ChangeList> change_list;
 
-  scheduler_->GetAllResourceList(
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &resource_list));
+  scheduler_->GetChangeList(
+      0,
+      google_apis::test_util::CreateCopyResultCallback(&error, &change_list));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
-  ASSERT_TRUE(resource_list);
+  ASSERT_TRUE(change_list);
 
-  const google_apis::Link* next_link =
-      resource_list->GetLinkByType(google_apis::Link::LINK_NEXT);
-  ASSERT_TRUE(next_link);
-  // Keep the next url before releasing the |resource_list|.
-  GURL next_url(next_link->href());
+  // Keep the next url before releasing the |change_list|.
+  GURL next_url(change_list->next_link());
 
   error = google_apis::GDATA_OTHER_ERROR;
-  resource_list.reset();
+  change_list.reset();
 
   scheduler_->GetRemainingChangeList(
       next_url,
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &resource_list));
+      google_apis::test_util::CreateCopyResultCallback(&error, &change_list));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
-  ASSERT_TRUE(resource_list);
+  ASSERT_TRUE(change_list);
 }
 
 TEST_F(JobSchedulerTest, GetRemainingFileList) {
   ConnectToWifi();
   fake_drive_service_->set_default_max_results(2);
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
-  scoped_ptr<google_apis::ResourceList> resource_list;
+  scoped_ptr<google_apis::FileList> file_list;
 
-  scheduler_->GetResourceListInDirectory(
+  scheduler_->GetFileListInDirectory(
       fake_drive_service_->GetRootResourceId(),
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &resource_list));
+      google_apis::test_util::CreateCopyResultCallback(&error, &file_list));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
-  ASSERT_TRUE(resource_list);
+  ASSERT_TRUE(file_list);
 
-  const google_apis::Link* next_link =
-      resource_list->GetLinkByType(google_apis::Link::LINK_NEXT);
-  ASSERT_TRUE(next_link);
-  // Keep the next url before releasing the |resource_list|.
-  GURL next_url(next_link->href());
+  // Keep the next url before releasing the |file_list|.
+  GURL next_url(file_list->next_link());
 
   error = google_apis::GDATA_OTHER_ERROR;
-  resource_list.reset();
+  file_list.reset();
 
   scheduler_->GetRemainingFileList(
       next_url,
-      google_apis::test_util::CreateCopyResultCallback(
-          &error, &resource_list));
+      google_apis::test_util::CreateCopyResultCallback(&error, &file_list));
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(google_apis::HTTP_SUCCESS, error);
-  ASSERT_TRUE(resource_list);
+  ASSERT_TRUE(file_list);
 }
 
 TEST_F(JobSchedulerTest, GetResourceEntry) {
   ConnectToWifi();
 
   google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
   scoped_ptr<google_apis::ResourceEntry> entry;
 
   scheduler_->GetResourceEntry(
       "file:2_file_resource_id",  // resource ID
@@ skipping 698 matching lines @@
   scheduler_->CancelJob(first_job_id);
 
   // Only the first job should be cancelled.
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(google_apis::GDATA_CANCELLED, error1);
   EXPECT_EQ(google_apis::HTTP_SUCCESS, error2);
   EXPECT_TRUE(scheduler_->GetJobInfoList().empty());
 }
 
 }  // namespace drive