[Ozone-Dri] Rename DriWrapper to DrmDevice

ui/ozone/platform/dri/native_display_delegate_dri.cc

 // Copyright 2014 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.
 
 #include "ui/ozone/platform/dri/native_display_delegate_dri.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_descriptor_posix.h"
 #include "base/files/file.h"
 #include "base/single_thread_task_runner.h"
 #include "ui/display/types/native_display_observer.h"
 #include "ui/events/ozone/device/device_event.h"
 #include "ui/ozone/common/display_util.h"
 #include "ui/ozone/platform/dri/display_mode_dri.h"
 #include "ui/ozone/platform/dri/display_snapshot_dri.h"
 #include "ui/ozone/platform/dri/dri_util.h"
-#include "ui/ozone/platform/dri/dri_wrapper.h"
+#include "ui/ozone/platform/dri/drm_device.h"
 #include "ui/ozone/platform/dri/drm_device_generator.h"
 #include "ui/ozone/platform/dri/screen_manager.h"
 #include "ui/ozone/public/ozone_switches.h"
 
 namespace ui {
 
 namespace {
 
 const char kContentProtection[] = "Content Protection";
 
@@ skipping 25 matching lines @@
   return 0;
 }
 
 class DisplaySnapshotComparator {
  public:
   explicit DisplaySnapshotComparator(const DisplaySnapshotDri* snapshot)
       : drm_(snapshot->drm()),
         crtc_(snapshot->crtc()),
         connector_(snapshot->connector()) {}
 
-  DisplaySnapshotComparator(const scoped_refptr<DriWrapper>& drm,
+  DisplaySnapshotComparator(const scoped_refptr<DrmDevice>& drm,
                             uint32_t crtc,
                             uint32_t connector)
       : drm_(drm), crtc_(crtc), connector_(connector) {}
 
   bool operator()(const DisplaySnapshotDri* other) const {
     return drm_ == other->drm() && connector_ == other->connector() &&
            crtc_ == other->crtc();
   }
 
  private:
-  scoped_refptr<DriWrapper> drm_;
+  scoped_refptr<DrmDevice> drm_;
   uint32_t crtc_;
   uint32_t connector_;
 };
 
 class FindByDevicePath {
  public:
   explicit FindByDevicePath(const base::FilePath& path) : path_(path) {}
 
-  bool operator()(const scoped_refptr<DriWrapper>& device) {
+  bool operator()(const scoped_refptr<DrmDevice>& device) {
     return device->device_path() == path_;
   }
 
  private:
   base::FilePath path_;
 };
 
 }  // namespace
 
 NativeDisplayDelegateDri::NativeDisplayDelegateDri(
     ScreenManager* screen_manager,
-    const scoped_refptr<DriWrapper>& primary_device,
+    const scoped_refptr<DrmDevice>& primary_device,
     scoped_ptr<DrmDeviceGenerator> drm_device_generator)
     : screen_manager_(screen_manager),
       drm_device_generator_(drm_device_generator.Pass()) {
   devices_.push_back(primary_device);
 }
 
 NativeDisplayDelegateDri::~NativeDisplayDelegateDri() {
 }
 
 void NativeDisplayDelegateDri::InitializeIOTaskRunner(
@@ skipping 99 matching lines @@
     const base::FilePath& path,
     const base::FileDescriptor& fd) {
   base::File file(fd.fd);
   auto it =
       std::find_if(devices_.begin(), devices_.end(), FindByDevicePath(path));
   if (it != devices_.end()) {
     VLOG(2) << "Got request to add existing device '" << path.value() << "'";
     return;
   }
 
-  scoped_refptr<DriWrapper> device =
+  scoped_refptr<DrmDevice> device =
       drm_device_generator_->CreateDevice(path, file.Pass());
   if (!device) {
     VLOG(2) << "Could not initialize DRM device for '" << path.value() << "'";
     return;
   }
 
   devices_.push_back(device);
   if (io_task_runner_)
     device->InitializeTaskRunner(io_task_runner_);
 }
@@ skipping 181 matching lines @@
 
     if (it == old_displays.end()) {
       screen_manager_->AddDisplayController(new_displays[i]->drm(),
                                             new_displays[i]->crtc(),
                                             new_displays[i]->connector());
     }
   }
 }
 
 }  // namespace ui