Revert 121920 - dbus: add ObjectPath type

content/browser/power_save_blocker_linux.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 "content/browser/power_save_blocker.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop_proxy.h"
 #include "base/nix/xdg_util.h"
 #include "base/threading/platform_thread.h"
 #include "content/public/browser/browser_thread.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
-#include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // This class is used to inhibit Power Management on Linux systems
 // using D-Bus interfaces. Mainly, there are two interfaces that
 // make this possible.
 // org.freedesktop.PowerManagement[.Inhibit] is considered to be
@@ skipping 96 matching lines @@
         return;
       }
     } else if ((pending_inhibit_call_ && !postponed_uninhibit_call_) ||
                 inhibit_cookie_ > 0) {
         return;
     }
 
     scoped_refptr<dbus::ObjectProxy> object_proxy =
         DBusPowerSaveBlocker::GetInstance()->bus()->GetObjectProxy(
             "org.freedesktop.PowerManagement",
-            dbus::ObjectPath("/org/freedesktop/PowerManagement/Inhibit"));
+            "/org/freedesktop/PowerManagement/Inhibit");
     dbus::MethodCall method_call("org.freedesktop.PowerManagement.Inhibit",
                                  "Inhibit");
     dbus::MessageWriter message_writer(&method_call);
     base::Callback<void(dbus::Response*)> bus_callback;
 
     switch (type) {
       case PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep:
       case PowerSaveBlocker::kPowerSaveBlockPreventSystemSleep:
         // The org.freedesktop.PowerManagement.Inhibit interface offers only one
         // Inhibit() method, that temporarily disables all power management
@@ skipping 127 matching lines @@
     // we make an uninhibit request to cancel it now.
     if (type != PowerSaveBlocker::kPowerSaveBlockPreventNone &&
         pending_inhibit_calls_ == 0 &&
         inhibit_cookie_ > 0) {
       ApplyBlock(PowerSaveBlocker::kPowerSaveBlockPreventNone);
     }
 
     scoped_refptr<dbus::ObjectProxy> object_proxy =
         DBusPowerSaveBlocker::GetInstance()->bus()->GetObjectProxy(
             "org.gnome.SessionManager",
-            dbus::ObjectPath("/org/gnome/SessionManager"));
+            "/org/gnome/SessionManager");
     dbus::MethodCall method_call("org.gnome.SessionManager", "Inhibit");
     dbus::MessageWriter message_writer(&method_call);
     base::Callback<void(dbus::Response*)> bus_callback;
 
     unsigned int flags = 0;
     switch (type) {
       case PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep:
         flags |= kInhibitMarkSessionAsIdle;
         break;
       case PowerSaveBlocker::kPowerSaveBlockPreventSystemSleep:
@@ skipping 158 matching lines @@
 }
 
 }  // namespace
 
 // Called only from UI thread.
 // static
 void PowerSaveBlocker::ApplyBlock(PowerSaveBlockerType type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DBusPowerSaveBlocker::GetInstance()->ApplyBlock(type);
 }