Index: content/browser/compositor/gpu_process_transport_factory.cc |
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc |
index 841fea0e2f64be6d92b08702cd7ae212a0e29dbd..c6e4a9078b38da5d5a54c2b47496db06689aaaa3 100644 |
--- a/content/browser/compositor/gpu_process_transport_factory.cc |
+++ b/content/browser/compositor/gpu_process_transport_factory.cc |
@@ -218,14 +218,12 @@ CreateOverlayCandidateValidator(gfx::AcceleratedWidget widget) { |
std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator> |
validator; |
#if defined(USE_OZONE) |
- std::unique_ptr<ui::OverlayCandidatesOzone> overlay_candidates = |
- ui::OzonePlatform::GetInstance() |
- ->GetOverlayManager() |
- ->CreateOverlayCandidates(widget); |
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
- if (overlay_candidates && |
- (command_line->HasSwitch(switches::kEnableHardwareOverlays) || |
- command_line->HasSwitch(switches::kOzoneTestSingleOverlaySupport))) { |
+ if (command_line->HasSwitch(switches::kEnableHardwareOverlays)) { |
+ std::unique_ptr<ui::OverlayCandidatesOzone> overlay_candidates = |
+ ui::OzonePlatform::GetInstance() |
+ ->GetOverlayManager() |
+ ->CreateOverlayCandidates(widget); |
validator.reset( |
new display_compositor::CompositorOverlayCandidateValidatorOzone( |
std::move(overlay_candidates))); |