Added function DeleteOriginDirectory to RemoteFileSyncService interface that removes the remote cop…

chrome/browser/sync_file_system/drive_file_sync_service.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/sync_file_system/drive_file_sync_service.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 63 matching lines @@
   if (!file_util::Delete(file_path, true))
     LOG(ERROR) << "Leaked temporary file for Sync FileSystem: "
                << file_path.value();
 }
 
 void EmptyStatusCallback(SyncStatusCode code) {}
 
 void DidRemoveOrigin(const GURL& origin, SyncStatusCode status) {
   // TODO(calvinlo): Disable syncing if status not ok (http://crbug.com/171611).
   DCHECK_EQ(SYNC_STATUS_OK, status);
-  LOG(WARNING) << "Remove origin failed for: " << origin.spec()
-               << " status=" << status;
+  if (status != SYNC_STATUS_OK) {
+    LOG(WARNING) << "Remove origin failed for: " << origin.spec()
+                 << " status=" << status;
+  }
 }
 
 FileChange CreateFileChange(bool is_deleted) {
   if (is_deleted) {
     return FileChange(FileChange::FILE_CHANGE_DELETE, SYNC_FILE_TYPE_UNKNOWN);
   }
   return FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE, SYNC_FILE_TYPE_FILE);
 }
 
 }  // namespace
@@ skipping 301 matching lines @@
       pending_changes_.erase(itr->second.position_in_queue);
     origin_to_changes_map_.erase(found);
   }
   pending_batch_sync_origins_.erase(origin);
 
   metadata_store_->RemoveOrigin(origin, base::Bind(
       &DriveFileSyncService::DidRemoveOriginOnMetadataStore,
       AsWeakPtr(), base::Passed(&token), callback));
 }
 
+void DriveFileSyncService::DeleteOriginDirectory(
+    const GURL& origin,
+    const SyncStatusCallback& callback) {
+  scoped_ptr<TaskToken> token(GetToken(
+      FROM_HERE, TASK_TYPE_DATABASE, "Delete Origin Directory"));
+  if (!token) {
+    pending_tasks_.push_back(base::Bind(
+        &DriveFileSyncService::DeleteOriginDirectory,
+        AsWeakPtr(), origin, callback));
+    return;
+  }
+
+  // Convert origin's directory GURL to ResourceID and delete it. Expected MD5
+  // is empty to force delete (i.e. skip conflict resolution).
+  std::string resource_id = metadata_store_->GetResourceIdForOrigin(origin);
+  sync_client_->DeleteFile(
+      resource_id,
+      std::string(),
+      base::Bind(&DriveFileSyncService::DidDeleteOriginDirectory,
+                 AsWeakPtr(), base::Passed(&token), callback));
+}
+
 void DriveFileSyncService::ProcessRemoteChange(
     RemoteChangeProcessor* processor,
     const SyncFileCallback& callback) {
   scoped_ptr<TaskToken> token(
       GetToken(FROM_HERE, TASK_TYPE_DRIVE, "Process remote change"));
   if (!token) {
     pending_tasks_.push_back(base::Bind(
         &DriveFileSyncService::ProcessRemoteChange, AsWeakPtr(),
         processor, callback));
     return;
@@ skipping 550 matching lines @@
     return;
   }
 
   metadata_store_->AddBatchSyncOrigin(origin, resource_id);
   pending_batch_sync_origins_.insert(origin);
 
   NotifyTaskDone(SYNC_STATUS_OK, token.Pass());
   callback.Run(SYNC_STATUS_OK);
 }
 
+void DriveFileSyncService::DidDeleteOriginDirectory(
+    scoped_ptr<TaskToken> token,
+    const SyncStatusCallback& callback,
+    google_apis::GDataErrorCode error) {
+  SyncStatusCode status = GDataErrorCodeToSyncStatusCodeWrapper(error);
+  NotifyTaskDone(status, token.Pass());
+  callback.Run(status);
+}
+
 void DriveFileSyncService::DidGetLargestChangeStampForBatchSync(
     scoped_ptr<TaskToken> token,
     const GURL& origin,
     const std::string& resource_id,
     google_apis::GDataErrorCode error,
     int64 largest_changestamp) {
   if (error != google_apis::HTTP_SUCCESS) {
     pending_batch_sync_origins_.insert(origin);
     // TODO(tzik): Refine this error code.
     NotifyTaskDone(GDataErrorCodeToSyncStatusCodeWrapper(error), token.Pass());
@@ skipping 1049 matching lines @@
     DCHECK_EQ(SYNC_ACTION_NONE, action_taken);
     DCHECK_EQ(SYNC_DIRECTION_NONE, direction);
   }
 
   FOR_EACH_OBSERVER(
       FileStatusObserver, file_status_observers_,
       OnFileStatusChanged(url, sync_status, action_taken, direction));
 }
 
 }  // namespace sync_file_system