Merge PowerSaveBlockerImpl and PowerSaveBlocker

device/power_save_blocker/power_save_blocker_chromeos.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 <string>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "chromeos/dbus/power_policy_controller.h"
 
@@ skipping 11 matching lines @@
     case PowerSaveBlocker::kReasonVideoPlayback:
       return chromeos::PowerPolicyController::REASON_VIDEO_PLAYBACK;
     case PowerSaveBlocker::kReasonOther:
       return chromeos::PowerPolicyController::REASON_OTHER;
   }
   return chromeos::PowerPolicyController::REASON_OTHER;
 }
 
 }  // namespace
 
-class PowerSaveBlockerImpl::Delegate
-    : public base::RefCountedThreadSafe<PowerSaveBlockerImpl::Delegate> {
+class PowerSaveBlocker::Delegate
+    : public base::RefCountedThreadSafe<PowerSaveBlocker::Delegate> {
  public:
   Delegate(PowerSaveBlockerType type,
            Reason reason,
            const std::string& description,
            scoped_refptr<base::SequencedTaskRunner> ui_task_runner)
       : type_(type),
         reason_(reason),
         description_(description),
         block_id_(0),
         ui_task_runner_(ui_task_runner) {}
@@ skipping 35 matching lines @@
   std::string description_;
 
   // ID corresponding to the block request in PowerPolicyController.
   int block_id_;
 
   scoped_refptr<base::SequencedTaskRunner> ui_task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(Delegate);
 };
 
-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, reason, 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