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

chrome/browser/sync_file_system/drive_file_sync_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 132 matching lines @@
   static base::FilePath TitleToPath(const std::string& title);
   static DriveMetadata::ResourceType SyncFileTypeToDriveMetadataResourceType(
       SyncFileType file_type);
 
  private:
   friend class DriveFileSyncTaskManager;
   friend class drive::LocalChangeProcessorDelegate;
 
   friend class DriveFileSyncServiceMockTest;
   friend class DriveFileSyncServiceSyncTest;
+  friend class DriveFileSyncServiceTest;
   struct ApplyLocalChangeParam;
   struct ProcessRemoteChangeParam;
 
   typedef base::Callback<void(const base::Time& time,
                               SyncFileType remote_file_type,
                               SyncStatusCode status)> UpdatedTimeCallback;
   typedef base::Callback<
       void(SyncStatusCode status,
            const std::string& resource_id)> ResourceIdCallback;
 
@@ skipping 260 matching lines @@
   RemoteChangeProcessor* remote_change_processor_;
 
   ConflictResolutionPolicy conflict_resolution_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveFileSyncService);
 };
 
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_SERVICE_H_