Change Shell / ShellClient to ServiceProvider

mojo/examples/sample_view_manager_app/sample_view_manager_app.cc

Index: mojo/examples/sample_view_manager_app/sample_view_manager_app.cc
diff --git a/mojo/examples/sample_view_manager_app/sample_view_manager_app.cc b/mojo/examples/sample_view_manager_app/sample_view_manager_app.cc
index 10d16a8c83254e8d8751e19ba377dadc5afb5c76..0188fb299fab23a3f444407e5c0d062a7ebf71b3 100644
--- a/mojo/examples/sample_view_manager_app/sample_view_manager_app.cc
+++ b/mojo/examples/sample_view_manager_app/sample_view_manager_app.cc
@@ -6,8 +6,8 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
+#include "mojo/public/cpp/application/application.h"
 #include "mojo/public/cpp/environment/environment.h"
-#include "mojo/public/cpp/shell/application.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/cpp/utility/run_loop.h"
@@ -31,9 +31,9 @@ namespace examples {
 
 class SampleApp : public Application {
  public:
-  explicit SampleApp(MojoHandle shell_handle)
-      : Application(shell_handle) {
-    view_manager_.reset(new view_manager::ViewManager(shell()));
+  explicit SampleApp(MojoHandle service_provider_handle)
+      : Application(service_provider_handle) {
+    view_manager_.reset(new view_manager::ViewManager(service_provider()));
     view_manager_->Init();
     view_manager::ViewTreeNode* node1 =
         view_manager::ViewTreeNode::Create(view_manager_.get());
@@ -67,10 +67,10 @@ class SampleApp : public Application {
 }  // namespace mojo
 
 extern "C" SAMPLE_APP_EXPORT MojoResult CDECL MojoMain(
-    MojoHandle shell_handle) {
+    MojoHandle service_provider_handle) {
   base::MessageLoop loop;
 
-  mojo::examples::SampleApp app(shell_handle);
+  mojo::examples::SampleApp app(service_provider_handle);
   loop.Run();
   return MOJO_RESULT_OK;
 }