Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / drive / sync / remove_performer.cc

diff --git a/src/chrome/browser/chromeos/drive/sync/remove_performer.cc b/src/chrome/browser/chromeos/drive/sync/remove_performer.cc
index 0a0f44c..c79a720 100644 (file)
--- a/src/chrome/browser/chromeos/drive/sync/remove_performer.cc
+++ b/src/chrome/browser/chromeos/drive/sync/remove_performer.cc
@@ -6,12 +6,15 @@
 
 #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/operation_delegate.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"
 
 using content::BrowserThread;
 
@@ -48,15 +51,15 @@ void RemoveEntryOnUIThread(base::SequencedTaskRunner* blocking_task_runner,
 
 RemovePerformer::RemovePerformer(
     base::SequencedTaskRunner* blocking_task_runner,
-    file_system::OperationObserver* observer,
+    file_system::OperationDelegate* delegate,
     JobScheduler* scheduler,
     ResourceMetadata* metadata)
     : blocking_task_runner_(blocking_task_runner),
-      observer_(observer),
+      delegate_(delegate),
       scheduler_(scheduler),
       metadata_(metadata),
       entry_revert_performer_(new EntryRevertPerformer(blocking_task_runner,
-                                                       observer,
+                                                       delegate,
                                                        scheduler,
                                                        metadata)),
       weak_ptr_factory_(this) {
@@ -150,7 +153,7 @@ void RemovePerformer::TrashResourceAfterUpdateRemoteState(
   if (status == google_apis::HTTP_FORBIDDEN) {
     // Editing this entry is not allowed, revert local changes.
     entry_revert_performer_->RevertEntry(local_id, context, callback);
-    observer_->OnDriveSyncError(
+    delegate_->OnDriveSyncError(
         file_system::DRIVE_SYNC_ERROR_DELETE_WITHOUT_PERMISSION, local_id);
     return;
   }
@@ -174,19 +177,19 @@ void RemovePerformer::UnparentResource(const ClientContext& context,
   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());
 
@@ -204,7 +207,8 @@ void RemovePerformer::UnparentResourceAfterGetResourceEntry(
 
   ResourceEntry entry;
   std::string parent_resource_id;
-  if (!ConvertToResourceEntry(*resource_entry, &entry, &parent_resource_id)) {
+  if (!ConvertFileResourceToResourceEntry(*file_resource, &entry,
+                                          &parent_resource_id)) {
     callback.Run(FILE_ERROR_NOT_A_FILE);
     return;
   }