Fix for finding a disabled origin after it was already moved to enabled.

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 @@
     const GURL& origin,
     const SyncStatusCallback& callback) {
   remote_change_handler_.RemoveChangesForOrigin(origin);
   pending_batch_sync_origins_.erase(origin);
   metadata_store_->RemoveOrigin(origin, callback);
 }
 
 void DriveFileSyncService::DoEnableOriginForTrackingChanges(
     const GURL& origin,
     const SyncStatusCallback& callback) {
+  // If origin cannot be found in disabled list, then it's not a SyncFS app
+  // and should be ignored.
   if (!metadata_store_->IsOriginDisabled(origin)) {
     callback.Run(SYNC_STATUS_OK);
     return;
   }
 
-  metadata_store_->EnableOrigin(origin, callback);
   pending_batch_sync_origins_.insert(
       *metadata_store_->disabled_origins().find(origin));
+  metadata_store_->EnableOrigin(origin, callback);
 }
 
 void DriveFileSyncService::DoDisableOriginForTrackingChanges(
     const GURL& origin,
     const SyncStatusCallback& callback) {
   pending_batch_sync_origins_.erase(origin);
   if (!metadata_store_->IsIncrementalSyncOrigin(origin)) {
     callback.Run(SYNC_STATUS_OK);
     return;
   }
@@ skipping 1213 matching lines @@
     metadata_store_->SetOriginRootDirectory(origin, resource_id);
   }
   callback.Run(status, resource_id);
 }
 
 std::string DriveFileSyncService::sync_root_resource_id() {
   return metadata_store_->sync_root_directory();
 }
 
 }  // namespace sync_file_system