[SyncFS] Drop manual conflict resolution policy support.

chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc

Index: chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc
diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc
index 03fcb22a36e2490d26a15d6bb0456654f720cb5e..efd758870c4d583846eb93e053cfa0c16c723eea 100644
--- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc
+++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_apitest.cc
@@ -114,7 +114,6 @@ ACTION_P5(ReturnWithFakeFileAddedStatus,
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetFileStatus) {
-  EXPECT_CALL(*mock_remote_service(), IsConflicting(_)).WillOnce(Return(true));
   ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_file_status"))
       << message_;
 }
@@ -122,13 +121,6 @@ IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetFileStatus) {
 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetFileStatuses) {
   // Mocking to return IsConflicting() == true only for the path "Conflicting".
   base::FilePath conflicting = base::FilePath::FromUTF8Unsafe("Conflicting");
-  EXPECT_CALL(*mock_remote_service(),
-              IsConflicting(Property(&FileSystemURL::path, Eq(conflicting))))
-      .WillOnce(Return(true));
-  EXPECT_CALL(*mock_remote_service(),
-              IsConflicting(Property(&FileSystemURL::path, Ne(conflicting))))
-      .WillRepeatedly(Return(false));
-
   ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_file_statuses"))
       << message_;
 }