Shell / ShellClient -> ServiceProvider

mojo/examples/dbus_echo/dbus_echo_app.cc

Index: mojo/examples/dbus_echo/dbus_echo_app.cc
diff --git a/mojo/examples/dbus_echo/dbus_echo_app.cc b/mojo/examples/dbus_echo/dbus_echo_app.cc
index 13bf8e02499d8cbe17d547c33216e04f0e835240..f9b94332d639a92d9eb0ab48df7bc7577ca84848 100644
--- a/mojo/examples/dbus_echo/dbus_echo_app.cc
+++ b/mojo/examples/dbus_echo/dbus_echo_app.cc
@@ -7,13 +7,13 @@
 
 #include "base/bind.h"
 #include "base/logging.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/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"
-#include "mojo/public/interfaces/shell/shell.mojom.h"
+#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/services/dbus_echo/echo.mojom.h"
 
 #if defined(WIN32)
@@ -31,7 +31,8 @@ namespace examples {
 
 class DBusEchoApp : public Application {
  public:
-  explicit DBusEchoApp(MojoHandle shell_handle) : Application(shell_handle) {
+  explicit DBusEchoApp(MojoHandle service_provider_handle)
+      : Application(service_provider_handle) {
     ConnectTo("dbus:org.chromium.EchoService/org/chromium/MojoImpl",
               &echo_service_);
 
@@ -55,11 +56,11 @@ class DBusEchoApp : public Application {
 }  // namespace mojo
 
 extern "C" DBUS_ECHO_APP_EXPORT MojoResult CDECL MojoMain(
-    MojoHandle shell_handle) {
+    MojoHandle service_provider_handle) {
   mojo::Environment env;
   mojo::RunLoop loop;
 
-  mojo::examples::DBusEchoApp app(shell_handle);
+  mojo::examples::DBusEchoApp app(service_provider_handle);
   loop.Run();
   return MOJO_RESULT_OK;
 }