In local_change:remote_change conflict case we may have no data in metadata_store

chrome/browser/sync_file_system/drive_file_sync_service.h

Index: chrome/browser/sync_file_system/drive_file_sync_service.h
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service.h b/chrome/browser/sync_file_system/drive_file_sync_service.h
index b1ceb2a691fade2e76fa64cda4ffa9a115c18b81..8027b285f189a0b3c0596ff3a86b461d43eca60f 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service.h
+++ b/chrome/browser/sync_file_system/drive_file_sync_service.h
@@ -229,6 +229,10 @@ class DriveFileSyncService
                              int64 changestamp);
   void CancelRemoteChange(const fileapi::FileSystemURL& url);
 
+  // This returns false if no change is found for the |url|.
+  bool GetPendingChangeForFileSystemURL(const fileapi::FileSystemURL& url,
+                                        RemoteChange* change) const;
+
   scoped_ptr<DriveMetadataStore> metadata_store_;
   scoped_ptr<DriveFileSyncClient> sync_client_;