Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/mojo/examples/pepper_container_app/pepper_container_app.cc

 // Copyright 2014 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 "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "build/build_config.h"
 #include "mojo/examples/pepper_container_app/mojo_ppapi_globals.h"
 #include "mojo/examples/pepper_container_app/plugin_instance.h"
 #include "mojo/examples/pepper_container_app/plugin_module.h"
 #include "mojo/examples/pepper_container_app/type_converters.h"
-#include "mojo/public/cpp/application/application.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/environment/environment.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 "ppapi/c/pp_rect.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 
 #if defined(OS_WIN)
 #if !defined(CDECL)
 #define CDECL __cdecl
 #endif
 #define PEPPER_CONTAINER_APP_EXPORT __declspec(dllexport)
 #else
 #define CDECL
 #define PEPPER_CONTAINER_APP_EXPORT __attribute__((visibility("default")))
 #endif
 
 namespace mojo {
 namespace examples {
 
 class PepperContainerApp: public Application,
                           public NativeViewportClient,
                           public MojoPpapiGlobals::Delegate {
  public:
-  explicit PepperContainerApp(MojoHandle service_provider_handle)
-      : Application(service_provider_handle),
+  explicit PepperContainerApp(MojoHandle shell_handle)
+      : Application(shell_handle),
         ppapi_globals_(this),
         plugin_module_(new PluginModule) {
     mojo::AllocationScope scope;
 
     ConnectTo("mojo:mojo_native_viewport_service", &viewport_);
     viewport_.set_client(this);
 
     Rect::Builder rect;
     Point::Builder point;
     point.set_x(10);
@@ skipping 60 matching lines @@
   scoped_refptr<PluginModule> plugin_module_;
   scoped_ptr<PluginInstance> plugin_instance_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperContainerApp);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 extern "C" PEPPER_CONTAINER_APP_EXPORT MojoResult CDECL MojoMain(
-    MojoHandle service_provider_handle) {
+    MojoHandle shell_handle) {
   mojo::Environment env;
   mojo::GLES2Initializer gles2;
   base::MessageLoop run_loop;
-  mojo::examples::PepperContainerApp app(service_provider_handle);
+  mojo::examples::PepperContainerApp app(shell_handle);
 
   run_loop.Run();
   return MOJO_RESULT_OK;
 }