Change ownership of OverlayCandidatesOzone object to compositor

We're going to keep per-compositor state in each object now, so sharing
a single object isn't going to work.

Review URL: https://codereview.chromium.org/1152363003

Cr-Commit-Position: refs/heads/master@{#332683}

2 files changed, 8 insertions, 8 deletions

diff --git a/ui/ozone/platform/drm/host/drm_overlay_manager.cc b/ui/ozone/platform/drm/host/drm_overlay_manager.cc
index 747c438..7143001 100644
--- a/ui/ozone/platform/drm/host/drm_overlay_manager.cc
+++ b/ui/ozone/platform/drm/host/drm_overlay_manager.cc
@@ -59,17 +59,18 @@ class SingleOverlay : public OverlayCandidatesOzone {
 
 DrmOverlayManager::DrmOverlayManager(bool allow_surfaceless)
     : allow_surfaceless_(allow_surfaceless) {
-  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kOzoneTestSingleOverlaySupport))
-    candidates_ = make_scoped_ptr(new SingleOverlay());
+  is_supported_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kOzoneTestSingleOverlaySupport);
 }
 
 DrmOverlayManager::~DrmOverlayManager() {
 }
 
-OverlayCandidatesOzone* DrmOverlayManager::GetOverlayCandidates(
+scoped_ptr<OverlayCandidatesOzone> DrmOverlayManager::CreateOverlayCandidates(
     gfx::AcceleratedWidget w) {
-  return candidates_.get();
+  if (!is_supported_)
+    return nullptr;
+  return make_scoped_ptr(new SingleOverlay());
 }
 
 bool DrmOverlayManager::CanShowPrimaryPlaneAsOverlay() {
diff --git a/ui/ozone/platform/drm/host/drm_overlay_manager.h b/ui/ozone/platform/drm/host/drm_overlay_manager.h
index e02ee30..91bdd51 100644
--- a/ui/ozone/platform/drm/host/drm_overlay_manager.h
+++ b/ui/ozone/platform/drm/host/drm_overlay_manager.h
@@ -16,14 +16,13 @@ class DrmOverlayManager : public OverlayManagerOzone {
   ~DrmOverlayManager() override;
 
   // OverlayManagerOzone:
-  OverlayCandidatesOzone* GetOverlayCandidates(
+  scoped_ptr<OverlayCandidatesOzone> CreateOverlayCandidates(
       gfx::AcceleratedWidget w) override;
   bool CanShowPrimaryPlaneAsOverlay() override;
 
  private:
   bool allow_surfaceless_;
-
-  scoped_ptr<OverlayCandidatesOzone> candidates_;
+  bool is_supported_;
 
   DISALLOW_COPY_AND_ASSIGN(DrmOverlayManager);
 };