Separate athena's startup process from AppShell's

extensions/shell/browser/api/shell/shell_api.cc

Index: extensions/shell/browser/api/shell/shell_api.cc
diff --git a/extensions/shell/browser/api/shell/shell_api.cc b/extensions/shell/browser/api/shell/shell_api.cc
index afc58ddd1ebb3612378ac9fec6e874b1bcbcd296..91584d6afa01fb6f7fa920cbea853df4082ad4f5 100644
--- a/extensions/shell/browser/api/shell/shell_api.cc
+++ b/extensions/shell/browser/api/shell/shell_api.cc
@@ -7,8 +7,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "extensions/common/extension.h"
+#include "extensions/shell/browser/desktop_controller.h"
 #include "extensions/shell/browser/shell_app_window.h"
-#include "extensions/shell/browser/shell_desktop_controller.h"
 #include "extensions/shell/common/api/shell.h"
 
 using base::DictionaryValue;
@@ -48,9 +48,8 @@ ExtensionFunction::ResponseAction ShellCreateWindowFunction::Run() {
     return RespondNow(Error(kInvalidArguments));
 
   // The desktop keeps ownership of the window.
-  ShellAppWindow* app_window =
-      ShellDesktopController::instance()->CreateAppWindow(browser_context(),
-                                                          extension());
+  ShellAppWindow* app_window = DesktopController::instance()->CreateAppWindow(
+      browser_context(), extension());
   app_window->LoadURL(url);
 
   // Create the reply to send to the renderer.