drive: Stop returning ResourceEntry from JobScheduler

chrome/browser/chromeos/drive/file_system/copy_operation.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/file_system/copy_operation.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/task_runner_util.h"
@@ skipping 145 matching lines @@
   if (error != FILE_ERROR_OK)
     return error;
 
   return cache->Store(local_id, std::string(), cache_file_path,
                       internal::FileCache::FILE_OPERATION_COPY);
 }
 
 // Stores the entry returned from the server and returns its path.
 FileError UpdateLocalStateForServerSideOperation(
     internal::ResourceMetadata* metadata,
-    scoped_ptr<google_apis::ResourceEntry> resource_entry,
+    scoped_ptr<google_apis::FileResource> file_resource,
     base::FilePath* file_path) {
-  DCHECK(resource_entry);
+  DCHECK(file_resource);
 
   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) ||
       parent_resource_id.empty())
     return FILE_ERROR_NOT_A_FILE;
 
   std::string parent_local_id;
   FileError error = metadata->GetIdByResourceId(parent_resource_id,
                                                 &parent_local_id);
   if (error != FILE_ERROR_OK)
     return error;
   entry.set_parent_local_id(parent_local_id);
 
@@ skipping 303 matching lines @@
   scheduler_->CopyResource(
       resource_id, parent_resource_id, new_title, last_modified,
       base::Bind(&CopyOperation::UpdateAfterServerSideOperation,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback));
 }
 
 void CopyOperation::UpdateAfterServerSideOperation(
     const FileOperationCallback& callback,
     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());
 
   FileError error = GDataToFileError(status);
   if (error != FILE_ERROR_OK) {
     callback.Run(error);
     return;
   }
 
   // The copy on the server side is completed successfully. Update the local
   // metadata.
   base::FilePath* file_path = new base::FilePath;
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_.get(),
       FROM_HERE,
       base::Bind(&UpdateLocalStateForServerSideOperation,
-                 metadata_, base::Passed(&resource_entry), file_path),
+                 metadata_, base::Passed(&entry), file_path),
       base::Bind(&CopyOperation::UpdateAfterLocalStateUpdate,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback, base::Owned(file_path)));
 }
 
 void CopyOperation::UpdateAfterLocalStateUpdate(
     const FileOperationCallback& callback,
     base::FilePath* file_path,
     FileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 56 matching lines @@
 
   if (error == FILE_ERROR_OK) {
     observer_->OnDirectoryChangedByOperation(remote_dest_path.DirName());
     observer_->OnEntryUpdatedByOperation(*local_id);
   }
   callback.Run(error);
 }
 
 }  // namespace file_system
 }  // namespace drive