Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/mojo/dbus/dbus_external_service.h

 // 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/memory/scoped_ptr.h"
 #include "dbus/bus.h"
 #include "dbus/exported_object.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "mojo/common/channel_init.h"
-#include "mojo/public/cpp/application/application.h"
-#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
+#include "mojo/public/cpp/shell/application.h"
+#include "mojo/public/interfaces/shell/shell.mojom.h"
 #include "mojo/shell/external_service.mojom.h"
 
 namespace mojo {
 const char kMojoDBusImplPath[] = "/org/chromium/MojoImpl";
 const char kMojoDBusInterface[] = "org.chromium.Mojo";
 const char kMojoDBusConnectMethod[] = "ConnectChannel";
 
 class DBusExternalServiceBase {
  public:
   explicit DBusExternalServiceBase(const std::string& service_name);
@@ skipping 42 matching lines @@
   }
 
  private:
   class Impl : public InterfaceImpl<ExternalService> {
    public:
     explicit Impl(DBusExternalService* service) : service_(service) {
     }
     virtual void OnConnectionError() OVERRIDE {
       service_->Disconnect();
     }
-    virtual void Activate(ScopedMessagePipeHandle service_provider_handle)
-        OVERRIDE {
-      app_.reset(new Application(service_provider_handle.Pass()));
+    virtual void Activate(ScopedMessagePipeHandle shell_handle) OVERRIDE {
+      app_.reset(new Application(shell_handle.Pass()));
       app_->AddService<ServiceImpl>();
     }
    private:
     DBusExternalService* service_;
     scoped_ptr<Application> app_;
   };
 
   scoped_ptr<Impl> external_service_;
 };
 
 }  // namespace mojo