[SyncFS] Drop manual conflict resolution policy support.

chrome/test/data/extensions/api_test/sync_file_system/get_file_statuses/test.js

Index: chrome/test/data/extensions/api_test/sync_file_system/get_file_statuses/test.js
diff --git a/chrome/test/data/extensions/api_test/sync_file_system/get_file_statuses/test.js b/chrome/test/data/extensions/api_test/sync_file_system/get_file_statuses/test.js
index c7abfe4b2bd365f325042a4dd176a6229b5a4c40..8bcad9e6ed61a03dc318d02bdbf4ee091e23e014 100644
--- a/chrome/test/data/extensions/api_test/sync_file_system/get_file_statuses/test.js
+++ b/chrome/test/data/extensions/api_test/sync_file_system/get_file_statuses/test.js
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 var fileSystem;
-var testFiles = ['Test1', 'Test2', 'Conflicting'];
+var testFiles = ['Test1', 'Test2'];
 
 var testStep = [
   function() {
@@ -38,8 +38,7 @@ var testStep = [
                            fileStatuses[i].fileEntry.fullPath);
       chrome.test.assertTrue(fileStatuses[i].fileEntry.isFile);
       chrome.test.assertTrue(!fileStatuses[i].error);
-      var expectedStatus =
-          (testFiles[i] == 'Conflicting') ? 'conflicting' : 'pending';
+      var expectedStatus = 'pending';
       chrome.test.assertEq(expectedStatus, fileStatuses[i].status);
     }
     chrome.test.succeed();