Centralize all gbm ozone host IPC

ui/ozone/platform/drm/host/drm_overlay_candidates_host.h

Index: ui/ozone/platform/drm/host/drm_overlay_candidates_host.h
diff --git a/ui/ozone/platform/drm/host/drm_overlay_candidates_host.h b/ui/ozone/platform/drm/host/drm_overlay_candidates_host.h
index 113de504269f6f082adc478baa6d1c33eac950e9..2797c2b25a5dd8f849bb8f8516feb206450973e8 100644
--- a/ui/ozone/platform/drm/host/drm_overlay_candidates_host.h
+++ b/ui/ozone/platform/drm/host/drm_overlay_candidates_host.h
@@ -1,20 +1,25 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_OZONE_PLATFORM_DRM_HOST_OVERLAY_CANDIDATES_H_
-#define UI_OZONE_PLATFORM_DRM_HOST_OVERLAY_CANDIDATES_H_
+#ifndef UI_OZONE_PLATFORM_DRM_HOST_DRM_OVERLAY_CANDIDATES_HOST_H_
+#define UI_OZONE_PLATFORM_DRM_HOST_DRM_OVERLAY_CANDIDATES_HOST_H_
 
 #include <stdint.h>
 
+#include <deque>
+#include <map>
 #include <vector>
 
+#include "base/containers/mru_cache.h"
 #include "base/macros.h"
+#include "ui/ozone/platform/drm/host/gpu_thread_adapter.h"
+#include "ui/ozone/platform/drm/host/gpu_thread_observer.h"
 #include "ui/ozone/public/overlay_candidates_ozone.h"
 
 namespace ui {
 
-class DrmOverlayManagerCore;
+class DrmOverlayManager;
 
 // This is an implementation of OverlayCandidatesOzone where the driver is asked
 // about overlay capabilities via IPC. We have no way of querying abstract
@@ -29,14 +34,14 @@ class DrmOverlayManagerCore;
 // configurations stored in the overlay manager.
 class DrmOverlayCandidatesHost : public OverlayCandidatesOzone {
  public:
-  DrmOverlayCandidatesHost(DrmOverlayManagerCore* manager_core,
+  DrmOverlayCandidatesHost(DrmOverlayManager* manager_core,
                            gfx::AcceleratedWidget widget);
   ~DrmOverlayCandidatesHost() override;
 
   void CheckOverlaySupport(OverlaySurfaceCandidateList* candidates) override;
 
  private:
-  DrmOverlayManagerCore* overlay_manager_;  // Not owned.
+  DrmOverlayManager* overlay_manager_;  // Not owned.
   gfx::AcceleratedWidget widget_;
 
   DISALLOW_COPY_AND_ASSIGN(DrmOverlayCandidatesHost);
@@ -44,4 +49,4 @@ class DrmOverlayCandidatesHost : public OverlayCandidatesOzone {
 
 }  // namespace ui
 
-#endif  // UI_OZONE_PLATFORM_DRM_HOST_OVERLAY_CANDIDATES_H_
+#endif  // UI_OZONE_PLATFORM_DRM_HOST_DRM_OVERLAY_CANDIDATES_HOST_H_