ozone: Remove InitializeHardware / ShutdownHardware

ui/ozone/platform/dri/dri_surface_factory.h

 // 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.
 
 #ifndef UI_OZONE_PLATFORM_DRI_DRI_SURFACE_FACTORY_H_
 #define UI_OZONE_PLATFORM_DRI_DRI_SURFACE_FACTORY_H_
 
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 13 matching lines @@
 // This implementation is used in conjunction with the software rendering
 // path.
 class DriSurfaceFactory : public ui::SurfaceFactoryOzone,
                           public HardwareCursorDelegate {
  public:
   static const gfx::AcceleratedWidget kDefaultWidgetHandle;
 
   DriSurfaceFactory(DriWrapper* drm, ScreenManager* screen_manager);
   virtual ~DriSurfaceFactory();
 
+  // Describes the state of the hardware after initialization.
+  enum HardwareState {
+    UNINITIALIZED,
+    INITIALIZED,
+    FAILED,
+  };
+
   // SurfaceFactoryOzone overrides:

[Ken Russell (switch to Gerrit), 2014/07/18 22:01:01]

These aren't SurfaceFactoryOzone overrides any more. Also, please add tests for
these entry points.

[spang, 2014/07/18 22:11:11]

There's some already:

DriSurfaceFactoryTest.FailInitialization
DriSurfaceFactoryTest.SuccessfulInitialization

anything in particular you're worried about coverage for?

[Ken Russell (switch to Gerrit), 2014/07/18 22:37:45]

OK, thanks for confirming that tests exist for these already.

-  virtual HardwareState InitializeHardware() OVERRIDE;
-  virtual void ShutdownHardware() OVERRIDE;
+  virtual HardwareState InitializeHardware();
+  virtual void ShutdownHardware();
 
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
 
   virtual scoped_ptr<ui::SurfaceOzoneCanvas> CreateCanvasForWidget(
       gfx::AcceleratedWidget w) OVERRIDE;
 
   virtual bool LoadEGLGLES2Bindings(
       AddGLLibraryCallback add_gl_library,
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) OVERRIDE;
 
@@ skipping 23 matching lines @@
 
   SkBitmap cursor_bitmap_;
   gfx::Point cursor_location_;
 
   DISALLOW_COPY_AND_ASSIGN(DriSurfaceFactory);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRI_DRI_SURFACE_FACTORY_H_