Merge PowerSaveBlockerImpl and PowerSaveBlocker

device/power_save_blocker/power_save_blocker_win.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.h"
+
 #include <windows.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
-#include "device/power_save_blocker/power_save_blocker_impl.h"
 
 namespace device {
 namespace {
 
 int g_blocker_count[2];
 
 HANDLE CreatePowerRequest(POWER_REQUEST_TYPE type,
                           const std::string& description) {
   if (type == PowerRequestExecutionRequired &&
       base::win::GetVersion() < base::win::VERSION_WIN8) {
@@ skipping 52 matching lines @@
   if (!g_blocker_count[type])
     flags &= ~this_flag;
   else
     flags |= this_flag;
 
   SetThreadExecutionState(flags);
 }
 
 }  // 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,
            scoped_refptr<base::SequencedTaskRunner> ui_task_runner)
       : type_(type),
         description_(description),
         ui_task_runner_(ui_task_runner) {}
 
   // Does the actual work to apply or remove the desired power save block.
   void ApplyBlock();
   void RemoveBlock();
 
   // Returns the equivalent POWER_REQUEST_TYPE for this request.
   POWER_REQUEST_TYPE RequestType();
 
  private:
   friend class base::RefCountedThreadSafe<Delegate>;
   ~Delegate() {}
 
   PowerSaveBlockerType type_;
   const std::string description_;
   base::win::ScopedHandle handle_;
   scoped_refptr<base::SequencedTaskRunner> ui_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(Delegate);
 };
 
-void PowerSaveBlockerImpl::Delegate::ApplyBlock() {
+void PowerSaveBlocker::Delegate::ApplyBlock() {
   DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return ApplySimpleBlock(type_, 1);
 
   handle_.Set(CreatePowerRequest(RequestType(), description_));
 }
 
-void PowerSaveBlockerImpl::Delegate::RemoveBlock() {
+void PowerSaveBlocker::Delegate::RemoveBlock() {
   DCHECK(ui_task_runner_->RunsTasksOnCurrentThread());
   if (base::win::GetVersion() < base::win::VERSION_WIN7)
     return ApplySimpleBlock(type_, -1);
 
   DeletePowerRequest(RequestType(), handle_.Take());
 }
 
-POWER_REQUEST_TYPE PowerSaveBlockerImpl::Delegate::RequestType() {
+POWER_REQUEST_TYPE PowerSaveBlocker::Delegate::RequestType() {
   if (type_ == kPowerSaveBlockPreventDisplaySleep)
     return PowerRequestDisplayRequired;
 
   if (base::win::GetVersion() < base::win::VERSION_WIN8)
     return PowerRequestSystemRequired;
 
   return PowerRequestExecutionRequired;
 }
 
-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_(ui_task_runner),
       blocking_task_runner_(blocking_task_runner) {
   ui_task_runner_->PostTask(FROM_HERE,
                             base::Bind(&Delegate::ApplyBlock, delegate_));
 }
 
-PowerSaveBlockerImpl::~PowerSaveBlockerImpl() {
+PowerSaveBlocker::~PowerSaveBlocker() {
   ui_task_runner_->PostTask(FROM_HERE,
                             base::Bind(&Delegate::RemoveBlock, delegate_));
 }
 
 }  // namespace device