Merge 146819 - A small defect was introduced with the refactoring of this file.

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 <X11/Xlib.h>
 #include <X11/extensions/dpms.h>
 // Xlib #defines Status, but we can't have that for some of our headers.
 #ifdef Status
@@ skipping 259 matching lines @@
           kGnomeAPIServiceName,
           dbus::ObjectPath(kGnomeAPIObjectPath));
       method_call.reset(
           new dbus::MethodCall(kGnomeAPIInterfaceName, "Uninhibit"));
       break;
     case FREEDESKTOP_API:
       object_proxy = bus_->GetObjectProxy(
           kFreeDesktopAPIServiceName,
           dbus::ObjectPath(kFreeDesktopAPIObjectPath));
       method_call.reset(
-          new dbus::MethodCall(kFreeDesktopAPIInterfaceName, "Uninhibit"));
+          new dbus::MethodCall(kFreeDesktopAPIInterfaceName, "UnInhibit"));
       break;
   }
 
   dbus::MessageWriter message_writer(method_call.get());
   message_writer.AppendUint32(inhibit_cookie_);
   scoped_ptr<dbus::Response> response(object_proxy->CallMethodAndBlock(
       method_call.get(), dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
   if (!response.get())
     LOG(ERROR) << "No response to Uninhibit() request!";
   // We don't care about checking the result. We assume it works; we can't
@@ skipping 41 matching lines @@
     PowerSaveBlockerType type, const std::string& reason)
     : delegate_(new Delegate(type, reason)) {
   delegate_->Init();
 }
 
 PowerSaveBlocker::~PowerSaveBlocker() {
   delegate_->CleanUp();
 }
 
 }  // namespace content