Removes the dependency to WMTestHelper from app shell.

athena/main/athena_main.cc

Index: athena/main/athena_main.cc
diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc
index 6ee8ee4a8c748ebbd75089187239ee6da3f413a1..000a3432b1a6e16b1539f98d60aa43291a83f426 100644
--- a/athena/main/athena_main.cc
+++ b/athena/main/athena_main.cc
@@ -18,14 +18,19 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
 
   // apps::ShellBrowserMainDelegate:
   virtual void Start(content::BrowserContext* context) OVERRIDE {
-    athena::StartAthena(apps::ShellDesktopController::instance()
-                            ->GetWindowTreeHost()
-                            ->window());
+    athena::StartAthena(
+        apps::ShellDesktopController::instance()->host()->window());
     CreateTestWindows();
   }
 
   virtual void Shutdown() OVERRIDE { athena::ShutdownAthena(); }
 
+  virtual apps::ShellDesktopController* CreateDesktopController() OVERRIDE {
+    // TODO(mukai): create Athena's own ShellDesktopController subclass so that
+    // it can initialize its own window manager logic.
+    return new apps::ShellDesktopController();
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(AthenaBrowserMainDelegate);
 };