Revert 121920 - dbus: add ObjectPath type

chrome/browser/chromeos/dbus/cros_dbus_service.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/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"
 
 namespace chromeos {
 
 // The CrosDBusService implementation used in production, and unit tests.
 class CrosDBusServiceImpl : public CrosDBusService {
  public:
   explicit CrosDBusServiceImpl(dbus::Bus* bus)
       : service_started_(false),
         origin_thread_id_(base::PlatformThread::CurrentId()),
         bus_(bus) {
   }
 
   virtual ~CrosDBusServiceImpl() {
     STLDeleteElements(&service_providers_);
   }
 
   // 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;
 
     exported_object_ = bus_->GetExportedObject(
         kLibCrosServiceName,
-        dbus::ObjectPath(kLibCrosServicePath));
+        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().
@@ skipping 52 matching lines @@
   return service;
 }
 
 CrosDBusService::~CrosDBusService() {
 }
 
 CrosDBusService::ServiceProviderInterface::~ServiceProviderInterface() {
 }
 
 }  // namespace chromeos