Merge PowerSaveBlockerImpl and PowerSaveBlocker

extensions/browser/api/power/power_api.cc

 // Copyright 2014 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 "extensions/browser/api/power/power_api.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "content/public/browser/browser_thread.h"
 #include "device/power_save_blocker/power_save_blocker.h"
@@ skipping 16 matching lines @@
     case api::power::LEVEL_NONE:
       return device::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep;
   }
   NOTREACHED() << "Unhandled level " << level;
   return device::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep;
 }
 
 base::LazyInstance<BrowserContextKeyedAPIFactory<PowerAPI>> g_factory =
     LAZY_INSTANCE_INITIALIZER;
 
+std::unique_ptr<device::PowerSaveBlocker> CreatePowerSaveBlocker(
+    device::PowerSaveBlocker::PowerSaveBlockerType type,
+    device::PowerSaveBlocker::Reason reason,
+    const std::string& description,
+    scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
+    scoped_refptr<base::SingleThreadTaskRunner> file_task_runner) {
+  return std::unique_ptr<device::PowerSaveBlocker>(new device::PowerSaveBlocker(
+      type, reason, description, ui_task_runner, file_task_runner));
+}
+
 }  // namespace
 
 bool PowerRequestKeepAwakeFunction::RunSync() {
   std::unique_ptr<api::power::RequestKeepAwake::Params> params(
       api::power::RequestKeepAwake::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
   EXTENSION_FUNCTION_VALIDATE(params->level != api::power::LEVEL_NONE);
   PowerAPI::Get(browser_context())->AddRequest(extension_id(), params->level);
   return true;
 }
@@ skipping 20 matching lines @@
 }
 
 void PowerAPI::RemoveRequest(const std::string& extension_id) {
   extension_levels_.erase(extension_id);
   UpdatePowerSaveBlocker();
 }
 
 void PowerAPI::SetCreateBlockerFunctionForTesting(
     CreateBlockerFunction function) {
   create_blocker_function_ =
-      !function.is_null()
-          ? function
-          : base::Bind(&device::PowerSaveBlocker::CreateWithTaskRunners);
+      !function.is_null() ? function : base::Bind(&CreatePowerSaveBlocker);
 }
 
 void PowerAPI::OnExtensionUnloaded(content::BrowserContext* browser_context,
                                    const Extension* extension,
                                    UnloadedExtensionInfo::Reason reason) {
   RemoveRequest(extension->id());
   UpdatePowerSaveBlocker();
 }
 
 PowerAPI::PowerAPI(content::BrowserContext* context)
     : browser_context_(context),
-      create_blocker_function_(
-          base::Bind(&device::PowerSaveBlocker::CreateWithTaskRunners)),
+      create_blocker_function_(base::Bind(&CreatePowerSaveBlocker)),
       current_level_(api::power::LEVEL_SYSTEM) {
   ExtensionRegistry::Get(browser_context_)->AddObserver(this);
 }
 
 PowerAPI::~PowerAPI() {
 }
 
 void PowerAPI::UpdatePowerSaveBlocker() {
   if (extension_levels_.empty()) {
     power_save_blocker_.reset();
@@ skipping 27 matching lines @@
 }
 
 void PowerAPI::Shutdown() {
   // Unregister here rather than in the d'tor; otherwise this call will recreate
   // the already-deleted ExtensionRegistry.
   ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
   power_save_blocker_.reset();
 }
 
 }  // namespace extensions