Separate mojo/shell into a runner and the application manager (shell)

mojo/shell/application_manager.h

Index: mojo/shell/application_manager.h
diff --git a/mojo/shell/application_manager/application_manager.h b/mojo/shell/application_manager.h
similarity index 97%
rename from mojo/shell/application_manager/application_manager.h
rename to mojo/shell/application_manager.h
index 3ce1599b5d14137ea9f094a445eb2f1e1c4cd376..7830e95f9c738f53a19d6e61bdd07c42fd7328c3 100644
--- a/mojo/shell/application_manager/application_manager.h
+++ b/mojo/shell/application_manager.h
@@ -14,11 +14,11 @@
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/interfaces/application/application.mojom.h"
 #include "mojo/public/interfaces/application/service_provider.mojom.h"
+#include "mojo/runner/native_application_support.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
-#include "mojo/shell/application_manager/application_loader.h"
-#include "mojo/shell/application_manager/identity.h"
-#include "mojo/shell/application_manager/native_runner.h"
-#include "mojo/shell/native_application_support.h"
+#include "mojo/shell/application_loader.h"
+#include "mojo/shell/identity.h"
+#include "mojo/shell/native_runner.h"
 #include "url/gurl.h"
 
 namespace base {
@@ -36,15 +36,15 @@ class ApplicationManager {
  public:
   class Delegate {
    public:
-    // Gives the delegate a chance to apply any mappings for the specified url.
-    // This should not resolve 'mojo' urls, that is done by ResolveMojoURL().
-    virtual GURL ResolveMappings(const GURL& url) = 0;
-
-    // Used to map a url with the scheme 'mojo' to the appropriate url. Return
-    // |url| if the scheme is not 'mojo'.
-    virtual GURL ResolveMojoURL(const GURL& url) = 0;
-
-   protected:
+    // Gives the delegate a chance to apply any mappings for the specified url.
+    // This should not resolve 'mojo' urls, that is done by ResolveMojoURL().
+    virtual GURL ResolveMappings(const GURL& url) = 0;
+
+    // Used to map a url with the scheme 'mojo' to the appropriate url. Return
+    // |url| if the scheme is not 'mojo'.
+    virtual GURL ResolveMojoURL(const GURL& url) = 0;
+
+   protected:
     virtual ~Delegate() {}
   };