[Ozone-DRI] Removing MockDriSurface implementation

ui/ozone/platform/dri/test/mock_surface_generator.h

Index: ui/ozone/platform/dri/test/mock_surface_generator.h
diff --git a/ui/ozone/platform/dri/test/mock_surface_generator.h b/ui/ozone/platform/dri/test/mock_surface_generator.h
index d9b77f8620db503b39400766cb2a823f600d714b..e1092db4154d2a590fcb2c380a151b11b957f630 100644
--- a/ui/ozone/platform/dri/test/mock_surface_generator.h
+++ b/ui/ozone/platform/dri/test/mock_surface_generator.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "ui/ozone/platform/dri/test/mock_dri_surface.h"
+#include "ui/ozone/platform/dri/dri_surface.h"
 
 namespace gfx {
 class Size;
@@ -22,7 +22,7 @@ class MockSurfaceGenerator : public ScanoutSurfaceGenerator {
   MockSurfaceGenerator(DriWrapper* dri);
   virtual ~MockSurfaceGenerator();
 
-  std::vector<MockDriSurface*> surfaces() const { return surfaces_; }
+  std::vector<DriSurface*> surfaces() const { return surfaces_; }
 
   // ScanoutSurfaceGenerator:
   virtual ScanoutSurface* Create(const gfx::Size& size) OVERRIDE;
@@ -30,7 +30,7 @@ class MockSurfaceGenerator : public ScanoutSurfaceGenerator {
  private:
   DriWrapper* dri_;  // Not owned.
 
-  std::vector<MockDriSurface*> surfaces_;
+  std::vector<DriSurface*> surfaces_;
 
   DISALLOW_COPY_AND_ASSIGN(MockSurfaceGenerator);
 };