Index: chrome/browser/sync_file_system/mock_remote_file_sync_service.cc |
diff --git a/chrome/browser/sync_file_system/mock_remote_file_sync_service.cc b/chrome/browser/sync_file_system/mock_remote_file_sync_service.cc |
index 50bb377406e6a63e3fe5004376c655f352af5851..25d9d2d18d2729265fb3a3381b06677dc4f0df1a 100644 |
--- a/chrome/browser/sync_file_system/mock_remote_file_sync_service.cc |
+++ b/chrome/browser/sync_file_system/mock_remote_file_sync_service.cc |
@@ -20,8 +20,7 @@ using ::testing::Return; |
namespace sync_file_system { |
MockRemoteFileSyncService::MockRemoteFileSyncService() |
- : conflict_resolution_policy_(CONFLICT_RESOLUTION_POLICY_MANUAL), |
- state_(REMOTE_SERVICE_OK) { |
+ : state_(REMOTE_SERVICE_OK) { |
typedef MockRemoteFileSyncService self; |
ON_CALL(*this, AddServiceObserver(_)) |
.WillByDefault(Invoke(this, &self::AddServiceObserverStub)); |