Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/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/aura/screen_mojo.h"
 #include "mojo/aura/window_tree_host_mojo.h"
-#include "mojo/public/cpp/application/application.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/gles2/gles2.h"
+#include "mojo/public/cpp/shell/application.h"
 #include "mojo/public/cpp/system/core.h"
-#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
+#include "mojo/public/interfaces/shell/shell.mojom.h"
 #include "mojo/services/native_viewport/native_viewport.mojom.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/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/canvas.h"
 
 #if defined(WIN32)
@@ skipping 78 matching lines @@
  private:
   aura::Window* window_;
 
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
 
   DISALLOW_COPY_AND_ASSIGN(DemoWindowTreeClient);
 };
 
 class AuraDemo : public Application {
  public:
-  explicit AuraDemo(MojoHandle service_provider_handle)
-      : Application(service_provider_handle) {
+  explicit AuraDemo(MojoHandle shell_handle) : Application(shell_handle) {
     screen_.reset(ScreenMojo::Create());
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
 
     NativeViewportPtr native_viewport;
     ConnectTo("mojo:mojo_native_viewport_service", &native_viewport);
 
     window_tree_host_.reset(new WindowTreeHostMojo(
         native_viewport.Pass(),
         gfx::Rect(800, 600),
         base::Bind(&AuraDemo::HostContextCreated, base::Unretained(this))));
@@ skipping 42 matching lines @@
   aura::Window* window2_;
   aura::Window* window21_;
 
   scoped_ptr<aura::WindowTreeHost> window_tree_host_;
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 extern "C" AURA_DEMO_EXPORT MojoResult CDECL MojoMain(
-    MojoHandle service_provider_handle) {
+    MojoHandle shell_handle) {
   base::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(true);
-  mojo::examples::AuraDemo app(service_provider_handle);
+  mojo::examples::AuraDemo app(shell_handle);
   loop.Run();
 
   return MOJO_RESULT_OK;
 }