Revert 121920 - dbus: add ObjectPath type

chrome/browser/chromeos/dbus/update_engine_client.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/update_engine_client.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
-#include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 namespace {
 
 // Returns UPDATE_STATUS_ERROR on error.
 UpdateEngineClient::UpdateStatusOperation UpdateStatusFromString(
     const std::string& str) {
   if (str == "UPDATE_STATUS_IDLE")
@@ skipping 24 matching lines @@
 
 // The UpdateEngineClient implementation used in production.
 class UpdateEngineClientImpl : public UpdateEngineClient {
  public:
   explicit UpdateEngineClientImpl(dbus::Bus* bus)
       : update_engine_proxy_(NULL),
         weak_ptr_factory_(this),
         last_status_() {
     update_engine_proxy_ = bus->GetObjectProxy(
         update_engine::kUpdateEngineServiceName,
-        dbus::ObjectPath(update_engine::kUpdateEngineServicePath));
+        update_engine::kUpdateEngineServicePath);
 
     // Monitor the D-Bus signal for brightness changes. Only the power
     // manager knows the actual brightness level. We don't cache the
     // brightness level in Chrome as it will make things less reliable.
     update_engine_proxy_->ConnectToSignal(
         update_engine::kUpdateEngineInterface,
         update_engine::kStatusUpdate,
         base::Bind(&UpdateEngineClientImpl::StatusUpdateReceived,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&UpdateEngineClientImpl::StatusUpdateConnected,
@@ skipping 212 matching lines @@
 // static
 UpdateEngineClient* UpdateEngineClient::Create(dbus::Bus* bus) {
   if (system::runtime_environment::IsRunningOnChromeOS()) {
     return new UpdateEngineClientImpl(bus);
   } else {
     return new UpdateEngineClientStubImpl();
   }
 }
 
 }  // namespace chromeos