NOT FOR REVIEW: Aura Android: Content Shell compiles

ui/wm/test/wm_test_helper.h

Index: ui/wm/test/wm_test_helper.h
diff --git a/ui/wm/test/wm_test_helper.h b/ui/wm/test/wm_test_helper.h
index c0c09f606735b1d9166c330d12aca4d0d397ce3f..03045110205279f057d6aa5545c8a99abd3b2867 100644
--- a/ui/wm/test/wm_test_helper.h
+++ b/ui/wm/test/wm_test_helper.h
@@ -15,7 +15,9 @@ class Window;
 class WindowTreeHost;
 namespace client {
 class DefaultCaptureClient;
+class DispatcherClient;
 class FocusClient;
+class ScreenPositionClient;
 }
 }
 
@@ -43,6 +45,8 @@ class WMTestHelper : public aura::client::WindowTreeClient {
 
   aura::WindowTreeHost* host() { return host_.get(); }
 
+  void Init();
+
   // Overridden from client::WindowTreeClient:
   aura::Window* GetDefaultParent(aura::Window* context,
                                  aura::Window* window,
@@ -52,8 +56,10 @@ class WMTestHelper : public aura::client::WindowTreeClient {
   scoped_ptr<aura::WindowTreeHost> host_;
 
   scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_;
-  scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
-  scoped_ptr<aura::client::FocusClient> focus_client_;
+//  scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
+//  scoped_ptr<aura::client::FocusClient> focus_client_;
+//  scoped_ptr<aura::client::ScreenPositionClient> screen_position_client_;
+//  scoped_ptr<aura::client::DispatcherClient> dispatcher_client_;
 
   DISALLOW_COPY_AND_ASSIGN(WMTestHelper);
 };