Change mojo demo apps to use Application.

mojo/examples/aura_demo/aura_demo.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdio.h>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/examples/aura_demo/demo_screen.h"
 #include "mojo/examples/aura_demo/root_window_host_mojo.h"
 #include "mojo/public/bindings/allocation_scope.h"
-#include "mojo/public/bindings/remote_ptr.h"
 #include "mojo/public/gles2/gles2_cpp.h"
+#include "mojo/public/shell/application.h"
 #include "mojo/public/system/core.h"
 #include "mojo/public/system/macros.h"
 #include "mojom/native_viewport.h"
 #include "mojom/shell.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
@@ skipping 82 matching lines @@
   }
 
  private:
   aura::Window* window_;
 
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
 
   DISALLOW_COPY_AND_ASSIGN(DemoWindowTreeClient);
 };
 
-class AuraDemo : public ShellClient {
+class AuraDemo : public Application {
  public:
-  explicit AuraDemo(ScopedShellHandle shell_handle)
-      : shell_(shell_handle.Pass(), this) {
+  explicit AuraDemo(MojoHandle shell_handle) : Application(shell_handle) {
     screen_.reset(DemoScreen::Create());
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
 
     InterfacePipe<NativeViewport, AnyInterface> pipe;
 
     mojo::AllocationScope scope;
-    shell_->Connect("mojo:mojo_native_viewport_service",
-                    pipe.handle_to_peer.Pass());
+    GetShell()->Connect("mojo:mojo_native_viewport_service",
+                        pipe.handle_to_peer.Pass());
     root_window_host_.reset(new WindowTreeHostMojo(
         pipe.handle_to_self.Pass(),
         gfx::Rect(800, 600),
         base::Bind(&AuraDemo::HostContextCreated, base::Unretained(this))));
   }
 
-  virtual void AcceptConnection(const mojo::String& url,
-                                ScopedMessagePipeHandle handle) MOJO_OVERRIDE {
-    NOTREACHED() << "AuraDemo can't be connected to.";
-  }
-
  private:
   void HostContextCreated() {
     aura::RootWindow::CreateParams params(
         gfx::Rect(root_window_host_->bounds().size()));
     params.host = root_window_host_.get();
     root_window_.reset(new aura::RootWindow(params));
     root_window_host_->set_delegate(root_window_.get());
     root_window_->Init();
 
     window_tree_client_.reset(new DemoWindowTreeClient(root_window_->window()));
@@ skipping 27 matching lines @@
   scoped_ptr<DemoWindowTreeClient> window_tree_client_;
 
   scoped_ptr<DemoWindowDelegate> delegate1_;
   scoped_ptr<DemoWindowDelegate> delegate2_;
   scoped_ptr<DemoWindowDelegate> delegate21_;
 
   aura::Window* window1_;
   aura::Window* window2_;
   aura::Window* window21_;
 
-  RemotePtr<Shell> shell_;
   scoped_ptr<WindowTreeHostMojo> root_window_host_;
   scoped_ptr<aura::RootWindow> root_window_;
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 extern "C" AURA_DEMO_EXPORT MojoResult CDECL MojoMain(
     MojoHandle shell_handle) {
   CommandLine::Init(0, NULL);
   base::AtExitManager at_exit;
   base::MessageLoop loop;
   mojo::GLES2Initializer gles2;
 
   // TODO(beng): This crashes in a DCHECK on X11 because this thread's
   //             MessageLoop is not of TYPE_UI. I think we need a way to build
   //             Aura that doesn't define platform-specific stuff.
   aura::Env::CreateInstance();
-  mojo::examples::AuraDemo app(
-      mojo::MakeScopedHandle(mojo::ShellHandle(shell_handle)).Pass());
+  mojo::examples::AuraDemo app(shell_handle);
   loop.Run();
 
   return MOJO_RESULT_OK;
 }