Uninstall a non-syncfs extension should not cause Token loss

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 482 matching lines @@
     pending_tasks_.push_back(base::Bind(
         &DriveFileSyncService::UninstallOrigin,
         AsWeakPtr(), origin, callback));
     return;
   }
 
   std::string resource_id = metadata_store_->GetResourceIdForOrigin(origin);
 
   // An empty resource_id indicates either one of following two cases:
   // 1) origin is not in metadata_store_ because the extension was never
-  //    run and thus no origin directory on the remote drive was created.
+  //    run or it's not managed by this service, and thus no
+  //    origin directory on the remote drive was created.
   // 2) origin or sync root folder is deleted on Drive.
   if (resource_id.empty()) {
+    token->ResetTask(FROM_HERE);
+    NotifyTaskDone(last_operation_status_, token.Pass());
     callback.Run(SYNC_STATUS_OK);
     return;
   }
 
   // Convert origin's directory GURL to ResourceID and delete it. Expected MD5
   // is empty to force delete (i.e. skip conflict resolution).
   sync_client_->DeleteFile(
       resource_id,
       std::string(),
       base::Bind(&DriveFileSyncService::DidUninstallOrigin,
@@ skipping 1955 matching lines @@
       pending_batch_sync_origins_.insert(origin);
   }
   callback.Run(status, resource_id);
 }
 
 std::string DriveFileSyncService::sync_root_resource_id() {
   return metadata_store_->sync_root_directory();
 }
 
 }  // namespace sync_file_system