drive: Stop returning ResourceEntry from JobScheduler

chrome/browser/chromeos/drive/sync/entry_revert_performer.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/chromeos/drive/sync/entry_revert_performer.h"
 
 #include "chrome/browser/chromeos/drive/change_list_processor.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_observer.h"
 #include "chrome/browser/chromeos/drive/job_scheduler.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 "content/public/browser/browser_thread.h"
+#include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/gdata_wapi_parser.h"
 
 using content::BrowserThread;
 
 namespace drive {
 namespace internal {
 namespace {
 
 FileError FinishRevert(ResourceMetadata* metadata,
                        const std::string& local_id,
                        google_apis::GDataErrorCode status,
-                       scoped_ptr<google_apis::ResourceEntry> resource_entry,
+                       scoped_ptr<google_apis::FileResource> file_resource,
                        std::set<base::FilePath>* changed_directories) {
   ResourceEntry entry;
   std::string parent_resource_id;
   FileError error = GDataToFileError(status);
   switch (error) {
     case FILE_ERROR_OK:
-      if (!ConvertToResourceEntry(*resource_entry, &entry, &parent_resource_id))
+      if (!ConvertToResourceEntry(
+              *util::ConvertFileResourceToResourceEntry(*file_resource),
+              &entry, &parent_resource_id))
         return FILE_ERROR_NOT_A_FILE;
       break;
 
     case FILE_ERROR_NOT_FOUND:
       entry.set_deleted(true);
       break;
 
     default:
       return error;
   }
@@ skipping 76 matching lines @@
   DCHECK(!callback.is_null());
 
   if (error == FILE_ERROR_OK && entry->resource_id().empty())
     error = FILE_ERROR_INVALID_OPERATION;
 
   if (error != FILE_ERROR_OK) {
     callback.Run(error);
     return;
   }
 
-  scheduler_->GetResourceEntry(
+  scheduler_->GetFileResource(
       entry->resource_id(),
       context,
-      base::Bind(&EntryRevertPerformer::RevertEntryAfterGetResourceEntry,
+      base::Bind(&EntryRevertPerformer::RevertEntryAfterGetFileResource,
                  weak_ptr_factory_.GetWeakPtr(), callback, entry->local_id()));
 }
 
-void EntryRevertPerformer::RevertEntryAfterGetResourceEntry(
+void EntryRevertPerformer::RevertEntryAfterGetFileResource(
     const FileOperationCallback& callback,
     const std::string& local_id,
     google_apis::GDataErrorCode status,
-    scoped_ptr<google_apis::ResourceEntry> resource_entry) {
+    scoped_ptr<google_apis::FileResource> entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   std::set<base::FilePath>* changed_directories = new std::set<base::FilePath>;
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_.get(),
       FROM_HERE,
       base::Bind(&FinishRevert, metadata_, local_id, status,
-                 base::Passed(&resource_entry), changed_directories),
+                 base::Passed(&entry), changed_directories),
       base::Bind(&EntryRevertPerformer::RevertEntryAfterFinishRevert,
                  weak_ptr_factory_.GetWeakPtr(), callback,
                  base::Owned(changed_directories)));
 }
 
 void EntryRevertPerformer::RevertEntryAfterFinishRevert(
     const FileOperationCallback& callback,
     const std::set<base::FilePath>* changed_directories,
     FileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   for (std::set<base::FilePath>::const_iterator it =
            changed_directories->begin(); it != changed_directories->end(); ++it)
     observer_->OnDirectoryChangedByOperation(*it);
 
   callback.Run(error);
 }
 
 }  // namespace internal
 }  // namespace drive