drive: Make sync performers aware of locally created files

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"
@@ skipping 49 matching lines @@
                                                        scheduler,
                                                        metadata)),
       weak_ptr_factory_(this) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 RemovePerformer::~RemovePerformer() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
+// Returns |entry| corresponding to |local_id|.
+// Adding to that, removes the entry when it does not exist on the server.
+FileError TryToRemoveLocally(ResourceMetadata* metadata,
+                             const std::string& local_id,
+                             ResourceEntry* entry) {
+  FileError error = metadata->GetResourceEntryById(local_id, entry);
+  if (error != FILE_ERROR_OK || !entry->resource_id().empty())
+    return error;
+  return metadata->RemoveEntry(local_id);
+}
+
 void RemovePerformer::Remove(const std::string& local_id,
                              const ClientContext& context,
                              const FileOperationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   ResourceEntry* entry = new ResourceEntry;
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_.get(),
       FROM_HERE,
-      base::Bind(&ResourceMetadata::GetResourceEntryById,
-                 base::Unretained(metadata_),
-                 local_id,
-                 entry),
+      base::Bind(&TryToRemoveLocally, metadata_, local_id, entry),
       base::Bind(&RemovePerformer::RemoveAfterGetResourceEntry,
                  weak_ptr_factory_.GetWeakPtr(),
                  context,
                  callback,
                  base::Owned(entry)));
 }
 
 void RemovePerformer::RemoveAfterGetResourceEntry(
     const ClientContext& context,
     const FileOperationCallback& callback,
     const ResourceEntry* entry,
     FileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
-  if (error != FILE_ERROR_OK) {
+  if (error != FILE_ERROR_OK || entry->resource_id().empty()) {
     callback.Run(error);
     return;
   }
 
   // To match with the behavior of drive.google.com:
   // Removal of shared entries under MyDrive is just removing from the parent.
   // The entry will stay in shared-with-me (in other words, in "drive/other".)
   //
   // TODO(kinaba): to be more precise, we might be better to branch by whether
   // or not the current account is an owner of the file. The code below is
@@ skipping 128 matching lines @@
 
   base::PostTaskAndReplyWithResult(
       blocking_task_runner_.get(),
       FROM_HERE,
       base::Bind(&UpdateLocalStateAfterUnparent, metadata_, local_id),
       callback);
 }
 
 }  // namespace internal
 }  // namespace drive