Removes the dependency to WMTestHelper from app shell.

Also ShellDesktopController has its own logic to initialize the
window manager, and its subclass (like Athena) can initialize
its own window management logic.

R=jamescook@chromium.org, oshima@chromium.org
TEST=no logic changes, confirmed athena_main running
BUG=

Review URL: https://codereview.chromium.org/308783002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274263 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 3 deletions

diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc
index 692f80d..347e9f8 100644
--- a/athena/main/athena_main.cc
+++ b/athena/main/athena_main.cc
@@ -19,15 +19,20 @@ 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();
     CreateTestPages(context);
   }
 
   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);
 };