Change mojo demo apps to use Application.

mojo/public/shell/lib/application.cc

Index: mojo/public/shell/lib/application.cc
diff --git a/mojo/public/shell/lib/application.cc b/mojo/public/shell/lib/application.cc
index dde322762c7b364bac886bdfc700c3e5d37fc7f5..1baff5226dccc5ce0ccd195470435556a9d8cf39 100644
--- a/mojo/public/shell/lib/application.cc
+++ b/mojo/public/shell/lib/application.cc
@@ -7,11 +7,12 @@
 namespace mojo {
 
 Application::Application(ScopedShellHandle shell_handle)
-    : shell_(shell_handle.Pass(), this) {
+    : internal::ServiceFactoryBase::Owner(shell_handle.Pass()) {
 }
 
 Application::Application(MojoHandle shell_handle)
-    : shell_(mojo::MakeScopedHandle(ShellHandle(shell_handle)).Pass()) {}
+    : internal::ServiceFactoryBase::Owner(
+          mojo::MakeScopedHandle(ShellHandle(shell_handle)).Pass()) {}
 
 Application::~Application() {
   for (ServiceFactoryList::iterator it = service_factories_.begin();
@@ -20,10 +21,6 @@ Application::~Application() {
   }
 }
 
-Shell* Application::GetShell() {
-  return shell_.get();
-}
-
 void Application::AddServiceFactory(
     internal::ServiceFactoryBase* service_factory) {
   service_factories_.push_back(service_factory);