dbus: remove service name from ExportedObject

chrome/browser/chromeos/dbus/cros_dbus_service.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/dbus/cros_dbus_service.h"
 
+#include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/threading/platform_thread.h"
 #include "chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "content/public/browser/browser_thread.h"
 #include "dbus/bus.h"
 #include "dbus/exported_object.h"
 #include "dbus/object_path.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
@@ skipping 15 matching lines @@
   // CrosDBusService override.
   virtual void Start() {
     // Make sure we're running on the origin thread (i.e. the UI thread in
     // production).
     DCHECK(OnOriginThread());
 
     // Return if the service has been already started.
     if (service_started_)
       return;
 
+    bus_->RequestOwnership(kLibCrosServiceName,
+                           base::Bind(&CrosDBusServiceImpl::OnOwnership,
+                                      base::Unretained(this)));
+
     exported_object_ = bus_->GetExportedObject(
-        kLibCrosServiceName,
         dbus::ObjectPath(kLibCrosServicePath));
 
     for (size_t i = 0; i < service_providers_.size(); ++i)
       service_providers_[i]->Start(exported_object_);
 
     service_started_ = true;
 
     VLOG(1) << "CrosDBusServiceImpl started.";
   }
 
   // Registers a service provider. This must be done before Start().
   // |provider| will be owned by CrosDBusService.
   void RegisterServiceProvider(ServiceProviderInterface* provider) {
     service_providers_.push_back(provider);
   }
 
  private:
   // Returns true if the current thread is on the origin thread.
   bool OnOriginThread() {
     return base::PlatformThread::CurrentId() == origin_thread_id_;
   }
 
+  // Called when an ownership request is completed.
+  void OnOwnership(const std::string& service_name,
+                   bool success) {
+    LOG_IF(ERROR, !success) << "Failed to own: " << service_name;
+  }
+
   bool service_started_;
   base::PlatformThreadId origin_thread_id_;
   dbus::Bus* bus_;
   scoped_refptr<dbus::ExportedObject> exported_object_;
 
   // Service providers that form CrosDBusService.
   std::vector<ServiceProviderInterface*> service_providers_;
 };
 
 // The stub CrosDBusService implementation used on Linux desktop,
@@ skipping 31 matching lines @@
   return service;
 }
 
 CrosDBusService::~CrosDBusService() {
 }
 
 CrosDBusService::ServiceProviderInterface::~ServiceProviderInterface() {
 }
 
 }  // namespace chromeos