Revert 272983 "Change Shell / ShellClient to ServiceProvider"

> Change Shell / ShellClient to ServiceProvider
> 
> BUG=
> R=darin@chromium.org
> 
> Review URL: https://codereview.chromium.org/298653010

TBR=davemoore@chromium.org

Review URL: https://codereview.chromium.org/304593002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272984 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 6 deletions

diff --git a/mojo/examples/compositor_app/compositor_app.cc b/mojo/examples/compositor_app/compositor_app.cc
index c225fae..f927cc2 100644
--- a/mojo/examples/compositor_app/compositor_app.cc
+++ b/mojo/examples/compositor_app/compositor_app.cc
@@ -9,11 +9,11 @@
 #include "base/message_loop/message_loop.h"
 #include "mojo/examples/compositor_app/compositor_host.h"
 #include "mojo/geometry/geometry_type_converters.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/gfx/rect.h"
 
@@ -32,8 +32,7 @@ namespace examples {
 
 class SampleApp : public Application, public NativeViewportClient {
  public:
-  explicit SampleApp(MojoHandle service_provider_handle)
-      : Application(service_provider_handle) {
+  explicit SampleApp(MojoHandle shell_handle) : Application(shell_handle) {
     AllocationScope scope;
 
     ConnectTo("mojo:mojo_native_viewport_service", &viewport_);
@@ -72,11 +71,11 @@ class SampleApp : public Application, public NativeViewportClient {
 }  // namespace mojo
 
 extern "C" SAMPLE_APP_EXPORT MojoResult CDECL MojoMain(
-    MojoHandle service_provider_handle) {
+    MojoHandle shell_handle) {
   base::MessageLoop loop;
   mojo::GLES2Initializer gles2;
 
-  mojo::examples::SampleApp app(service_provider_handle);
+  mojo::examples::SampleApp app(shell_handle);
   loop.Run();
   return MOJO_RESULT_OK;
 }