Remove content/browser/power_save_blocker_factory.*

content/browser/wake_lock/wake_lock_service_context.cc

 // Copyright 2015 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/wake_lock/wake_lock_service_context.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "build/build_config.h"
-#include "content/browser/power_save_blocker_factory.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/service_registry.h"
+#include "device/power_save_blocker/power_save_blocker.h"
 #include "device/power_save_blocker/power_save_blocker_impl.h"
 
 namespace content {
 
 WakeLockServiceContext::WakeLockServiceContext(WebContents* web_contents)
     : WebContentsObserver(web_contents), weak_factory_(this) {}
 
 WakeLockServiceContext::~WakeLockServiceContext() {}
 
 void WakeLockServiceContext::CreateService(
@@ skipping 34 matching lines @@
       std::pair<int, int>(render_process_id, render_frame_id));
   UpdateWakeLock();
 }
 
 bool WakeLockServiceContext::HasWakeLockForTests() const {
   return !!wake_lock_;
 }
 
 void WakeLockServiceContext::CreateWakeLock() {
   DCHECK(!wake_lock_);
-  wake_lock_ = CreatePowerSaveBlocker(
+  wake_lock_ = device::PowerSaveBlocker::CreateWithTaskRunners(

[jam, 2016/06/17 22:11:57]

can we also get rid of this method?

what about the interface and impl as well? we only had that separation because
of the content api. we don't need that anymore.

       device::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
-      device::PowerSaveBlocker::kReasonOther, "Wake Lock API");
+      device::PowerSaveBlocker::kReasonOther, "Wake Lock API",
+      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
+      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
 
 #if defined(OS_ANDROID)
   // On Android, additionaly associate the blocker with this WebContents.
   DCHECK(web_contents());
 
   if (web_contents()->GetNativeView()) {
     view_weak_factory_.reset(new base::WeakPtrFactory<ui::ViewAndroid>(
         web_contents()->GetNativeView()));
     static_cast<device::PowerSaveBlockerImpl*>(wake_lock_.get())
         ->InitDisplaySleepBlocker(view_weak_factory_->GetWeakPtr());
@@ skipping 10 matching lines @@
   if (!frames_requesting_lock_.empty()) {
     if (!wake_lock_)
       CreateWakeLock();
   } else {
     if (wake_lock_)
       RemoveWakeLock();
   }
 }
 
 }  // namespace content