[SyncFS] Drop manual conflict resolution policy support.

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

 // 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.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service.h"
@@ skipping 96 matching lines @@
       FROM_HERE, base::Bind(arg0,
                             sync_file_system::SYNC_STATUS_OK,
                             mock_url));
   mock_remote_service->NotifyFileStatusChanged(
       mock_url, sync_direction, sync_file_status, sync_action_taken);
 }
 
 }  // 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_;
 }
 
 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_;
 }
 
 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetUsageAndQuota) {
   ASSERT_TRUE(RunExtensionTest("sync_file_system/get_usage_and_quota"))
       << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, OnFileStatusChanged) {
@@ skipping 51 matching lines @@
   ASSERT_TRUE(RunPlatformAppTest("sync_file_system/conflict_resolution_policy"))
       << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(SyncFileSystemApiTest, GetServiceStatus) {
   mock_remote_service()->SetServiceState(
       sync_file_system::REMOTE_SERVICE_AUTHENTICATION_REQUIRED);
   ASSERT_TRUE(RunPlatformAppTest("sync_file_system/get_service_status"))
       << message_;
 }