| Index: content/browser/devtools/render_frame_devtools_agent_host.cc
|
| diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc
|
| index 41c4d7c824fb0226d33850acffb6d7cde3615269..47e3fb452a5eaa63d1fae619eaa61b2f345f1c0f 100644
|
| --- a/content/browser/devtools/render_frame_devtools_agent_host.cc
|
| +++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
|
| @@ -40,9 +40,9 @@
|
| #include "content/public/common/browser_side_navigation_policy.h"
|
|
|
| #if defined(OS_ANDROID)
|
| -#include "content/browser/power_save_blocker_impl.h"
|
| -#include "content/public/browser/power_save_blocker_factory.h"
|
| +#include "content/browser/power_save_blocker_factory.h"
|
| #include "content/public/browser/render_widget_host_view.h"
|
| +#include "device/power_save_blocker/power_save_blocker_impl.h"
|
| #endif
|
|
|
| namespace content {
|
| @@ -501,10 +501,10 @@ void RenderFrameDevToolsAgentHost::OnClientAttached() {
|
|
|
| frame_trace_recorder_.reset(new DevToolsFrameTraceRecorder());
|
| #if defined(OS_ANDROID)
|
| - power_save_blocker_.reset(static_cast<PowerSaveBlockerImpl*>(
|
| + power_save_blocker_.reset(static_cast<device::PowerSaveBlockerImpl*>(
|
| CreatePowerSaveBlocker(
|
| - PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
|
| - PowerSaveBlocker::kReasonOther, "DevTools")
|
| + device::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
|
| + device::PowerSaveBlocker::kReasonOther, "DevTools")
|
| .release()));
|
| if (web_contents()->GetNativeView()) {
|
| view_weak_factory_.reset(new base::WeakPtrFactory<ui::ViewAndroid>(
|
|
|