Change Shell / ShellClient to ServiceProvider

mojo/dbus/dbus_external_service.h

Index: mojo/dbus/dbus_external_service.h
diff --git a/mojo/dbus/dbus_external_service.h b/mojo/dbus/dbus_external_service.h
index ea722223fc83b31bbebaa9e2485eddcf2b851398..54af5e97058e6e9b9b8eeb7681027eac50e462d0 100644
--- a/mojo/dbus/dbus_external_service.h
+++ b/mojo/dbus/dbus_external_service.h
@@ -8,8 +8,8 @@
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "mojo/common/channel_init.h"
-#include "mojo/public/cpp/shell/application.h"
-#include "mojo/public/interfaces/shell/shell.mojom.h"
+#include "mojo/public/cpp/application/application.h"
+#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/shell/external_service.mojom.h"
 
 namespace mojo {
@@ -72,8 +72,9 @@ class DBusExternalService : public DBusExternalServiceBase {
     virtual void OnConnectionError() OVERRIDE {
       service_->Disconnect();
     }
-    virtual void Activate(ScopedMessagePipeHandle shell_handle) OVERRIDE {
-      app_.reset(new Application(shell_handle.Pass()));
+    virtual void Activate(ScopedMessagePipeHandle service_provider_handle)
+        OVERRIDE {
+      app_.reset(new Application(service_provider_handle.Pass()));
       app_->AddService<ServiceImpl>();
     }
    private: