drive: Stop returning ResourceList from JobScheduler

chrome/browser/chromeos/drive/change_list_processor.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/change_list_processor.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
 #include "chrome/browser/chromeos/drive/resource_metadata.h"
+#include "chrome/browser/drive/drive_api_util.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/gdata_wapi_parser.h"
 
 namespace drive {
 namespace internal {
 
 namespace {
 
 class ChangeListToEntryMapUMAStats {
  public:
@@ skipping 42 matching lines @@
 }  // namespace
 
 std::string DirectoryFetchInfo::ToString() const {
   return ("local_id: " + local_id_ +
           ", resource_id: " + resource_id_ +
           ", changestamp: " + base::Int64ToString(changestamp_));
 }
 
 ChangeList::ChangeList() {}
 
-ChangeList::ChangeList(const google_apis::ResourceList& resource_list)
-    : largest_changestamp_(resource_list.largest_changestamp()) {
-  resource_list.GetNextFeedURL(&next_url_);
-
-  entries_.resize(resource_list.entries().size());
-  parent_resource_ids_.resize(resource_list.entries().size());
+ChangeList::ChangeList(const google_apis::ChangeList& change_list)
+    : next_url_(change_list.next_link()),
+      largest_changestamp_(change_list.largest_change_id()) {
+  const ScopedVector<google_apis::ChangeResource>& items = change_list.items();
+  entries_.resize(items.size());
+  parent_resource_ids_.resize(items.size());
   size_t entries_index = 0;
-  for (size_t i = 0; i < resource_list.entries().size(); ++i) {
-    if (ConvertToResourceEntry(*resource_list.entries()[i],
-                               &entries_[entries_index],
-                               &parent_resource_ids_[entries_index])) {
+  for (size_t i = 0; i < items.size(); ++i) {
+    if (ConvertToResourceEntry(
+            *util::ConvertChangeResourceToResourceEntry(*items[i]),
+            &entries_[entries_index],
+            &parent_resource_ids_[entries_index])) {
       ++entries_index;
     }
   }
+  entries_.resize(entries_index);
+  parent_resource_ids_.resize(entries_index);
+}
+
+ChangeList::ChangeList(const google_apis::FileList& file_list)
+    : next_url_(file_list.next_link()),
+      largest_changestamp_(0) {
+  const ScopedVector<google_apis::FileResource>& items = file_list.items();
+  entries_.resize(items.size());
+  parent_resource_ids_.resize(items.size());
+  size_t entries_index = 0;
+  for (size_t i = 0; i < items.size(); ++i) {
+    if (ConvertToResourceEntry(
+            *util::ConvertFileResourceToResourceEntry(*items[i]),
+            &entries_[entries_index],
+            &parent_resource_ids_[entries_index])) {
+      ++entries_index;
+    }
+  }
   entries_.resize(entries_index);
   parent_resource_ids_.resize(entries_index);
 }
 
 ChangeList::~ChangeList() {}
 
 ChangeListProcessor::ChangeListProcessor(ResourceMetadata* resource_metadata)
   : resource_metadata_(resource_metadata) {
 }
 
@@ skipping 374 matching lines @@
         resource_metadata_->GetSubDirectoriesRecursively(local_id,
                                                          &sub_directories);
         changed_dirs_.insert(sub_directories.begin(), sub_directories.end());
       }
     }
   }
 }
 
 }  // namespace internal
 }  // namespace drive