--- a/gpu/ipc/common/context_result.mojom 2019-11-11 13:31:52.516596344 -0800 +++ b/gpu/ipc/common/context_result.mojom 2019-11-11 13:29:01.260608297 -0800 @@ -6,7 +6,7 @@ // gpu::ContextResult enum ContextResult { - Success, + GPUMojSuccess, TransientFailure, FatalFailure, SurfaceFailure --- a/gpu/ipc/common/context_result_struct_traits.h 2019-11-11 13:32:01.669595705 -0800 +++ b/gpu/ipc/common/context_result_struct_traits.h 2019-11-11 13:29:36.170605861 -0800 @@ -15,7 +15,7 @@ static gpu::mojom::ContextResult ToMojom(gpu::ContextResult context_result) { switch (context_result) { case gpu::ContextResult::kSuccess: - return gpu::mojom::ContextResult::Success; + return gpu::mojom::ContextResult::GPUMojSuccess; case gpu::ContextResult::kTransientFailure: return gpu::mojom::ContextResult::TransientFailure; case gpu::ContextResult::kFatalFailure: @@ -30,7 +30,7 @@ static bool FromMojom(gpu::mojom::ContextResult input, gpu::ContextResult* out) { switch (input) { - case gpu::mojom::ContextResult::Success: + case gpu::mojom::ContextResult::GPUMojSuccess: *out = gpu::ContextResult::kSuccess; return true; case gpu::mojom::ContextResult::TransientFailure: