| Index: content/browser/wake_lock/wake_lock_service_context.cc
|
| diff --git a/content/browser/wake_lock/wake_lock_service_context.cc b/content/browser/wake_lock/wake_lock_service_context.cc
|
| index 1f0f0c56f80643d247c2a518d0982b14afe71474..48d3454e703236577b4a0d174b04041ca1b80dcf 100644
|
| --- a/content/browser/wake_lock/wake_lock_service_context.cc
|
| +++ b/content/browser/wake_lock/wake_lock_service_context.cc
|
| @@ -8,13 +8,13 @@
|
|
|
| #include "base/bind.h"
|
| #include "build/build_config.h"
|
| -#include "content/browser/power_save_blocker_impl.h"
|
| +#include "content/browser/power_save_blocker_factory.h"
|
| #include "content/public/browser/browser_thread.h"
|
| -#include "content/public/browser/power_save_blocker_factory.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_impl.h"
|
|
|
| namespace content {
|
|
|
| @@ -69,8 +69,8 @@ bool WakeLockServiceContext::HasWakeLockForTests() const {
|
| void WakeLockServiceContext::CreateWakeLock() {
|
| DCHECK(!wake_lock_);
|
| wake_lock_ = CreatePowerSaveBlocker(
|
| - PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
|
| - PowerSaveBlocker::kReasonOther, "Wake Lock API");
|
| + device::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
|
| + device::PowerSaveBlocker::kReasonOther, "Wake Lock API");
|
|
|
| #if defined(OS_ANDROID)
|
| // On Android, additionaly associate the blocker with this WebContents.
|
| @@ -79,7 +79,7 @@ void WakeLockServiceContext::CreateWakeLock() {
|
| if (web_contents()->GetNativeView()) {
|
| view_weak_factory_.reset(new base::WeakPtrFactory<ui::ViewAndroid>(
|
| web_contents()->GetNativeView()));
|
| - static_cast<PowerSaveBlockerImpl*>(wake_lock_.get())
|
| + static_cast<device::PowerSaveBlockerImpl*>(wake_lock_.get())
|
| ->InitDisplaySleepBlocker(view_weak_factory_->GetWeakPtr());
|
| }
|
| #endif
|
|
|