Merge PowerSaveBlockerImpl and PowerSaveBlocker

device/power_save_blocker/power_save_blocker_mac.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 "device/power_save_blocker/power_save_blocker_impl.h"
+#include "device/power_save_blocker/power_save_blocker.h"
 
 #include <IOKit/pwr_mgt/IOPMLib.h>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread.h"
 
@@ skipping 16 matching lines @@
     thread->Start();
     return thread;
   }
   static void Delete(base::Thread* instance) {}
 };
 base::LazyInstance<base::Thread, PowerSaveBlockerLazyInstanceTraits>
     g_power_thread = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
-class PowerSaveBlockerImpl::Delegate
-    : public base::RefCountedThreadSafe<PowerSaveBlockerImpl::Delegate> {
+class PowerSaveBlocker::Delegate
+    : public base::RefCountedThreadSafe<PowerSaveBlocker::Delegate> {
  public:
   Delegate(PowerSaveBlockerType type, const std::string& description)
       : type_(type),
         description_(description),
         assertion_(kIOPMNullAssertionID) {}
 
   // Does the actual work to apply or remove the desired power save block.
   void ApplyBlock();
   void RemoveBlock();
 
  private:
   friend class base::RefCountedThreadSafe<Delegate>;
   ~Delegate() {}
   PowerSaveBlockerType type_;
   std::string description_;
   IOPMAssertionID assertion_;
 };
 
-void PowerSaveBlockerImpl::Delegate::ApplyBlock() {
+void PowerSaveBlocker::Delegate::ApplyBlock() {
   DCHECK_EQ(base::PlatformThread::CurrentId(),
             g_power_thread.Pointer()->GetThreadId());
 
   CFStringRef level = NULL;
   // See QA1340 <http://developer.apple.com/library/mac/#qa/qa1340/> for more
   // details.
   switch (type_) {
     case PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension:
       level = kIOPMAssertionTypeNoIdleSleep;
       break;
     case PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep:
       level = kIOPMAssertionTypeNoDisplaySleep;
       break;
     default:
       NOTREACHED();
       break;
   }
   if (level) {
     base::ScopedCFTypeRef<CFStringRef> cf_description(
         base::SysUTF8ToCFStringRef(description_));
     IOReturn result = IOPMAssertionCreateWithName(level, kIOPMAssertionLevelOn,
                                                   cf_description, &assertion_);
     LOG_IF(ERROR, result != kIOReturnSuccess) << "IOPMAssertionCreate: "
                                               << result;
   }
 }
 
-void PowerSaveBlockerImpl::Delegate::RemoveBlock() {
+void PowerSaveBlocker::Delegate::RemoveBlock() {
   DCHECK_EQ(base::PlatformThread::CurrentId(),
             g_power_thread.Pointer()->GetThreadId());
 
   if (assertion_ != kIOPMNullAssertionID) {
     IOReturn result = IOPMAssertionRelease(assertion_);
     LOG_IF(ERROR, result != kIOReturnSuccess) << "IOPMAssertionRelease: "
                                               << result;
   }
 }
 
-PowerSaveBlockerImpl::PowerSaveBlockerImpl(
+PowerSaveBlocker::PowerSaveBlocker(
     PowerSaveBlockerType type,
     Reason reason,
     const std::string& description,
     scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> blocking_task_runner)
     : delegate_(new Delegate(type, description)),
       ui_task_runner_(ui_task_runner),
       blocking_task_runner_(blocking_task_runner) {
   g_power_thread.Pointer()->message_loop()->PostTask(
       FROM_HERE, base::Bind(&Delegate::ApplyBlock, delegate_));
 }
 
-PowerSaveBlockerImpl::~PowerSaveBlockerImpl() {
+PowerSaveBlocker::~PowerSaveBlocker() {
   g_power_thread.Pointer()->message_loop()->PostTask(
       FROM_HERE, base::Bind(&Delegate::RemoveBlock, delegate_));
 }
 
 }  // namespace device