Sync FileSystem: disable etag match on duplication recovery.

chrome/browser/sync_file_system/drive_file_sync_client.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_CLIENT_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_CLIENT_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
@@ skipping 273 matching lines @@
 
   void EnsureTitleUniqueness(const std::string& parent_resource_id,
                              const std::string& expected_title,
                              const ResourceEntryCallback& callback);
   void DidListEntriesToEnsureUniqueness(
       const std::string& parent_resource_id,
       const std::string& expected_title,
       const ResourceEntryCallback& callback,
       google_apis::GDataErrorCode error,
       scoped_ptr<google_apis::ResourceList> feed);
-  void DeleteEntries(ScopedVector<google_apis::ResourceEntry> entries,
-                     const GDataErrorCallback& callback);
-  void DidDeleteEntry(ScopedVector<google_apis::ResourceEntry> entries,
-                      const GDataErrorCallback& callback,
-                      google_apis::GDataErrorCode error);
+  void DeleteEntriesForEnsuringTitleUniqueness(
+      ScopedVector<google_apis::ResourceEntry> entries,
+      const GDataErrorCallback& callback);
+  void DidDeleteEntriesForEnsuringTitleUniqueness(
+      ScopedVector<google_apis::ResourceEntry> entries,
+      const GDataErrorCallback& callback,
+      google_apis::GDataErrorCode error);
 
   static std::string FormatTitleQuery(const std::string& title);
 
   scoped_ptr<google_apis::DriveServiceInterface> drive_service_;
   scoped_ptr<google_apis::DriveUploaderInterface> drive_uploader_;
   google_apis::GDataWapiUrlGenerator url_generator_;
 
   ObserverList<DriveFileSyncClientObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(DriveFileSyncClient);
 };
 
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_FILE_SYNC_CLIENT_H_