exo: Replace pointer based stylus and replace with touch based stylus

components/exo/test/exo_test_helper.h

Index: components/exo/test/exo_test_helper.h
diff --git a/components/exo/test/exo_test_helper.h b/components/exo/test/exo_test_helper.h
index 2d00476488684d64fdd09f85e18f8a016ff9f330..11bc8d7885662e1dd0a17a9319b38c7b801e953c 100644
--- a/components/exo/test/exo_test_helper.h
+++ b/components/exo/test/exo_test_helper.h
@@ -9,6 +9,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
+#include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace gfx {
@@ -16,8 +17,29 @@ class GpuMemoryBuffer;
 }
 
 namespace exo {
+class Buffer;
+class Surface;
+class ShellSurface;
+
 namespace test {
 
+class ExoTestWindow {
+ public:
+  ExoTestWindow(std::unique_ptr<gfx::GpuMemoryBuffer> gpu_buffer,
+                bool is_modal);
+  ExoTestWindow(ExoTestWindow&& window);
+  virtual ~ExoTestWindow();
+
+  Surface* surface() { return surface_.get(); }
+  ShellSurface* shell_surface() { return shell_surface_.get(); }
+  gfx::Point origin();
+
+ private:
+  std::unique_ptr<Surface> surface_;
+  std::unique_ptr<Buffer> buffer_;
+  std::unique_ptr<ShellSurface> shell_surface_;
+};
+
 // A helper class that does common initialization required for Exosphere.
 class ExoTestHelper {
  public:
@@ -28,6 +50,9 @@ class ExoTestHelper {
   std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer(
       const gfx::Size& size);
 
+  // Creates window of size (width, height) at center of screen.
+  ExoTestWindow CreateWindow(int width, int height, bool is_modal);
+
  private:
   DISALLOW_COPY_AND_ASSIGN(ExoTestHelper);
 };