[Ozone-Dri] Rename DriWrapper to DrmDevice

ui/ozone/platform/dri/gbm_surface.cc

Index: ui/ozone/platform/dri/gbm_surface.cc
diff --git a/ui/ozone/platform/dri/gbm_surface.cc b/ui/ozone/platform/dri/gbm_surface.cc
index e3b62521a7d7f6ded40457ff8b9c2f3a0a33bdbf..ab8e5e389f6b9051cedbf3db54b0a4ef1cc95b60 100644
--- a/ui/ozone/platform/dri/gbm_surface.cc
+++ b/ui/ozone/platform/dri/gbm_surface.cc
@@ -11,7 +11,7 @@
 #include "ui/ozone/platform/dri/dri_buffer.h"
 #include "ui/ozone/platform/dri/dri_window_delegate.h"
 #include "ui/ozone/platform/dri/gbm_buffer_base.h"
-#include "ui/ozone/platform/dri/gbm_wrapper.h"
+#include "ui/ozone/platform/dri/gbm_device.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
 #include "ui/ozone/platform/dri/scanout_buffer.h"
 
@@ -22,12 +22,12 @@ namespace {
 class GbmSurfaceBuffer : public GbmBufferBase {
  public:
   static scoped_refptr<GbmSurfaceBuffer> CreateBuffer(
-      const scoped_refptr<DriWrapper>& dri,
+      const scoped_refptr<DrmDevice>& drm,
       gbm_bo* buffer);
   static scoped_refptr<GbmSurfaceBuffer> GetBuffer(gbm_bo* buffer);
 
  private:
-  GbmSurfaceBuffer(const scoped_refptr<DriWrapper>& dri, gbm_bo* bo);
+  GbmSurfaceBuffer(const scoped_refptr<DrmDevice>& drm, gbm_bo* bo);
   ~GbmSurfaceBuffer() override;
 
   static void Destroy(gbm_bo* buffer, void* data);
@@ -42,9 +42,9 @@ class GbmSurfaceBuffer : public GbmBufferBase {
   DISALLOW_COPY_AND_ASSIGN(GbmSurfaceBuffer);
 };
 
-GbmSurfaceBuffer::GbmSurfaceBuffer(const scoped_refptr<DriWrapper>& dri,
+GbmSurfaceBuffer::GbmSurfaceBuffer(const scoped_refptr<DrmDevice>& drm,
                                    gbm_bo* bo)
-    : GbmBufferBase(dri, bo, true) {
+    : GbmBufferBase(drm, bo, true) {
   if (GetFramebufferId()) {
     self_ = this;
     gbm_bo_set_user_data(bo, this, GbmSurfaceBuffer::Destroy);
@@ -55,10 +55,10 @@ GbmSurfaceBuffer::~GbmSurfaceBuffer() {}
 
 // static
 scoped_refptr<GbmSurfaceBuffer> GbmSurfaceBuffer::CreateBuffer(
-    const scoped_refptr<DriWrapper>& dri,
+    const scoped_refptr<DrmDevice>& drm,
     gbm_bo* buffer) {
-  scoped_refptr<GbmSurfaceBuffer> scoped_buffer(new GbmSurfaceBuffer(dri,
-                                                                     buffer));
+  scoped_refptr<GbmSurfaceBuffer> scoped_buffer(
+      new GbmSurfaceBuffer(drm, buffer));
   if (!scoped_buffer->GetFramebufferId())
     return NULL;
 
@@ -80,7 +80,7 @@ void GbmSurfaceBuffer::Destroy(gbm_bo* buffer, void* data) {
 }  // namespace
 
 GbmSurface::GbmSurface(DriWindowDelegate* window_delegate,
-                       const scoped_refptr<GbmWrapper>& gbm)
+                       const scoped_refptr<GbmDevice>& gbm)
     : GbmSurfaceless(window_delegate, NULL),
       gbm_(gbm),
       native_surface_(NULL),