| Index: chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.cc
|
| diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.cc
|
| index 7398440d62aa5171068e790ee766c98981bc690c..724b6893fc8ff31d918f08d317765637b22bd97b 100644
|
| --- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.cc
|
| +++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.cc
|
| @@ -97,6 +97,9 @@ ConflictResolutionPolicyToExtensionEnum(
|
| return api::sync_file_system::CONFLICT_RESOLUTION_POLICY_LAST_WRITE_WIN;
|
| case sync_file_system::CONFLICT_RESOLUTION_POLICY_MANUAL:
|
| return api::sync_file_system::CONFLICT_RESOLUTION_POLICY_MANUAL;
|
| + case sync_file_system::CONFLICT_RESOLUTION_POLICY_MAX:
|
| + NOTREACHED();
|
| + return api::sync_file_system::CONFLICT_RESOLUTION_POLICY_NONE;
|
| }
|
| NOTREACHED() << "Invalid conflict resolution policy: " << policy;
|
| return api::sync_file_system::CONFLICT_RESOLUTION_POLICY_NONE;
|
|
|