Shell / ShellClient -> ServiceProvider

mojo/dbus/dbus_external_service.cc

 // 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 "mojo/dbus/dbus_external_service.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "dbus/bus.h"
 #include "dbus/exported_object.h"
 #include "dbus/file_descriptor.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/cpp/bindings/error_handler.h"
-#include "mojo/public/cpp/shell/application.h"
-#include "mojo/public/interfaces/shell/shell.mojom.h"
+#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/shell/external_service.mojom.h"
 
 namespace mojo {
 
 DBusExternalServiceBase::DBusExternalServiceBase(
     const std::string& service_name)
     : service_name_(service_name),
       exported_object_(NULL) {
 }
 DBusExternalServiceBase::~DBusExternalServiceBase() {}
@@ skipping 50 matching lines @@
 }
 
 void DBusExternalServiceBase::TakeDBusServiceOwnership() {
   CHECK(bus_->RequestOwnershipAndBlock(
       service_name_,
       dbus::Bus::REQUIRE_PRIMARY_ALLOW_REPLACEMENT))
       << "Unable to take ownership of " << service_name_;
 }
 
 }  // namespace mojo