Rename GbmSurfaceFactory::drm_thread_ to GbmSurfaceFactory::drm_thread_proxy_

R=rjkroege@chromium.org
BUG=none

Review-Url: https://codereview.chromium.org/2393913002
Cr-Commit-Position: refs/heads/master@{#423812}

ui/ozone/platform/drm/gpu/gbm_surface_factory.cc

@@ -33,20 +33,24 @@ namespace {
 
 class GLOzoneEGLGbm : public GLOzoneEGL {
  public:
-  GLOzoneEGLGbm(GbmSurfaceFactory* surface_factory, DrmThreadProxy* drm_thread)
-      : surface_factory_(surface_factory), drm_thread_(drm_thread) {}
+  GLOzoneEGLGbm(GbmSurfaceFactory* surface_factory,
+                DrmThreadProxy* drm_thread_proxy)
+      : surface_factory_(surface_factory),
+        drm_thread_proxy_(drm_thread_proxy) {}
   ~GLOzoneEGLGbm() override {}
 
   scoped_refptr<gl::GLSurface> CreateViewGLSurface(
       gfx::AcceleratedWidget window) override {
     return gl::InitializeGLSurface(new GbmSurface(
-        surface_factory_, drm_thread_->CreateDrmWindowProxy(window), window));
+        surface_factory_, drm_thread_proxy_->CreateDrmWindowProxy(window),
+        window));
   }
 
   scoped_refptr<gl::GLSurface> CreateSurfacelessViewGLSurface(
       gfx::AcceleratedWidget window) override {
     return gl::InitializeGLSurface(new GbmSurfaceless(
-        surface_factory_, drm_thread_->CreateDrmWindowProxy(window), window));
+        surface_factory_, drm_thread_proxy_->CreateDrmWindowProxy(window),
+        window));
   }
 
   scoped_refptr<gl::GLSurface> CreateOffscreenGLSurface(
@@ -63,16 +67,16 @@ class GLOzoneEGLGbm : public GLOzoneEGL {
 
  private:
   GbmSurfaceFactory* surface_factory_;
-  DrmThreadProxy* drm_thread_;
+  DrmThreadProxy* drm_thread_proxy_;
 
   DISALLOW_COPY_AND_ASSIGN(GLOzoneEGLGbm);
 };
 
 }  // namespace
 
-GbmSurfaceFactory::GbmSurfaceFactory(DrmThreadProxy* drm_thread)
-    : egl_implementation_(new GLOzoneEGLGbm(this, drm_thread)),
-      drm_thread_(drm_thread) {}
+GbmSurfaceFactory::GbmSurfaceFactory(DrmThreadProxy* drm_thread_proxy)
+    : egl_implementation_(new GLOzoneEGLGbm(this, drm_thread_proxy)),
+      drm_thread_proxy_(drm_thread_proxy) {}
 
 GbmSurfaceFactory::~GbmSurfaceFactory() {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ -126,7 +130,7 @@ std::unique_ptr<SurfaceOzoneCanvas> GbmSurfaceFactory::CreateCanvasForWidget(
 std::vector<gfx::BufferFormat> GbmSurfaceFactory::GetScanoutFormats(
     gfx::AcceleratedWidget widget) {
   std::vector<gfx::BufferFormat> scanout_formats;
-  drm_thread_->GetScanoutFormats(widget, &scanout_formats);
+  drm_thread_proxy_->GetScanoutFormats(widget, &scanout_formats);
   return scanout_formats;
 }
 
@@ -142,7 +146,7 @@ scoped_refptr<ui::NativePixmap> GbmSurfaceFactory::CreateNativePixmap(
 #endif
 
   scoped_refptr<GbmBuffer> buffer =
-      drm_thread_->CreateBuffer(widget, size, format, usage);
+      drm_thread_proxy_->CreateBuffer(widget, size, format, usage);
   if (!buffer.get())
     return nullptr;
 
@@ -170,7 +174,7 @@ scoped_refptr<ui::NativePixmap> GbmSurfaceFactory::CreateNativePixmapFromHandle(
     planes.push_back(plane);
   }
 
-  scoped_refptr<GbmBuffer> buffer = drm_thread_->CreateBufferFromFds(
+  scoped_refptr<GbmBuffer> buffer = drm_thread_proxy_->CreateBufferFromFds(
       widget, size, format, std::move(scoped_fds), planes);
   if (!buffer)
     return nullptr;

ui/ozone/platform/drm/gpu/gbm_surface_factory.h

@@ -26,7 +26,7 @@ class GbmSurfaceless;
 
 class GbmSurfaceFactory : public SurfaceFactoryOzone {
  public:
-  explicit GbmSurfaceFactory(DrmThreadProxy* drm_thread);
+  explicit GbmSurfaceFactory(DrmThreadProxy* drm_thread_proxy);
   ~GbmSurfaceFactory() override;
 
   void RegisterSurface(gfx::AcceleratedWidget widget, GbmSurfaceless* surface);
@@ -57,7 +57,7 @@ class GbmSurfaceFactory : public SurfaceFactoryOzone {
 
   base::ThreadChecker thread_checker_;
 
-  DrmThreadProxy* drm_thread_;
+  DrmThreadProxy* drm_thread_proxy_;
 
   std::map<gfx::AcceleratedWidget, GbmSurfaceless*> widget_to_surface_map_;