Change mojo demo apps to use Application.

mojo/public/shell/application.h

Index: mojo/public/shell/application.h
diff --git a/mojo/public/shell/application.h b/mojo/public/shell/application.h
index 57bd2fdb015045331805c8915e215057ce8b3d5f..34aac68fb8310710a26b138a904c805290fc1f99 100644
--- a/mojo/public/shell/application.h
+++ b/mojo/public/shell/application.h
@@ -14,15 +14,13 @@
 
 namespace mojo {
 
-class Application : public internal::ServiceFactoryBase::Owner,
-                    public ShellClient {
+class Application : public internal::ServiceFactoryBase::Owner {
  public:
   explicit Application(ScopedShellHandle shell_handle);
   explicit Application(MojoHandle shell_handle);
   virtual ~Application();
 
   // internal::ServiceFactoryBase::Owner methods.
-  virtual Shell* GetShell() MOJO_OVERRIDE;
   // Takes ownership of |service_factory|.
   virtual void AddServiceFactory(internal::ServiceFactoryBase* service_factory)
       MOJO_OVERRIDE;
@@ -38,7 +36,6 @@ class Application : public internal::ServiceFactoryBase::Owner,
  private:
   typedef std::vector<internal::ServiceFactoryBase*> ServiceFactoryList;
   ServiceFactoryList service_factories_;
-  RemotePtr<Shell> shell_;
 };
 
 }  // namespace mojo