drive: Stop returning ResourceEntry from JobScheduler

chrome/browser/chromeos/drive/sync/remove_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/remove_performer.h"
 
 #include "base/sequenced_task_runner.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_observer.h"
 #include "chrome/browser/chromeos/drive/file_system_util.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/chromeos/drive/sync/entry_revert_performer.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 {
 
 // Updates local metadata and after remote unparenting.
@@ skipping 143 matching lines @@
   callback.Run(error);
 }
 
 void RemovePerformer::UnparentResource(const ClientContext& context,
                                        const FileOperationCallback& callback,
                                        const std::string& resource_id,
                                        const std::string& local_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
-  scheduler_->GetResourceEntry(
+  scheduler_->GetFileResource(
       resource_id,
       context,
-      base::Bind(&RemovePerformer::UnparentResourceAfterGetResourceEntry,
+      base::Bind(&RemovePerformer::UnparentResourceAfterGetFileResource,
                  weak_ptr_factory_.GetWeakPtr(), context, callback, local_id));
 }
 
-void RemovePerformer::UnparentResourceAfterGetResourceEntry(
+void RemovePerformer::UnparentResourceAfterGetFileResource(
     const ClientContext& context,
     const FileOperationCallback& callback,
     const std::string& local_id,
     google_apis::GDataErrorCode status,
-    scoped_ptr<google_apis::ResourceEntry> resource_entry) {
+    scoped_ptr<google_apis::FileResource> file_resource) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   FileError error = GDataToFileError(status);
   if (error == FILE_ERROR_NOT_FOUND) {  // Remove local entry when not found.
     RemoveEntryOnUIThread(blocking_task_runner_.get(), metadata_, local_id,
                           callback);
     return;
   }
 
   if (error != FILE_ERROR_OK) {
     callback.Run(error);
     return;
   }
 
   ResourceEntry entry;
   std::string parent_resource_id;
-  if (!ConvertToResourceEntry(*resource_entry, &entry, &parent_resource_id)) {
+  if (!ConvertToResourceEntry(
+          *util::ConvertFileResourceToResourceEntry(*file_resource),
+          &entry, &parent_resource_id)) {
     callback.Run(FILE_ERROR_NOT_A_FILE);
     return;
   }
 
   if (!entry.shared_with_me()) {
     // shared_with_me() has changed on the server.
     UnparentResourceAfterUpdateRemoteState(callback, local_id,
                                            google_apis::HTTP_CONFLICT);
     return;
   }
@@ skipping 28 matching lines @@
 
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_.get(),
       FROM_HERE,
       base::Bind(&UpdateLocalStateAfterUnparent, metadata_, local_id),
       callback);
 }
 
 }  // namespace internal
 }  // namespace drive