| Index: content/browser/web_contents/web_contents_impl.cc
|
| diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
| index a03508a11e4c31482ab613edb89af2aca396dd6e..2e997cd3f499fb5663535c97191ea4c4b0f0cbc3 100644
|
| --- a/content/browser/web_contents/web_contents_impl.cc
|
| +++ b/content/browser/web_contents/web_contents_impl.cc
|
| @@ -71,7 +71,6 @@
|
| #include "content/browser/renderer_host/text_input_manager.h"
|
| #include "content/browser/screen_orientation/screen_orientation_dispatcher_host_impl.h"
|
| #include "content/browser/site_instance_impl.h"
|
| -#include "content/browser/wake_lock/wake_lock_service_context.h"
|
| #include "content/browser/web_contents/web_contents_view_child_frame.h"
|
| #include "content/browser/web_contents/web_contents_view_guest.h"
|
| #include "content/browser/webui/generic_handler.h"
|
| @@ -121,6 +120,7 @@
|
| #include "content/public/common/web_preferences.h"
|
| #include "device/geolocation/geolocation_service_context.h"
|
| #include "device/nfc/nfc.mojom.h"
|
| +#include "device/wake_lock/wake_lock_service_context.h"
|
| #include "net/base/url_util.h"
|
| #include "net/http/http_cache.h"
|
| #include "net/http/http_transaction_factory.h"
|
| @@ -463,7 +463,7 @@ WebContentsImpl::WebContentsImpl(BrowserContext* browser_context)
|
| pepper_playback_observer_.reset(new PepperPlaybackObserver(this));
|
| #endif
|
| loader_io_thread_notifier_.reset(new LoaderIOThreadNotifier(this));
|
| - wake_lock_service_context_.reset(new WakeLockServiceContext(
|
| + wake_lock_service_context_.reset(new device::WakeLockServiceContext(
|
| BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
|
| base::Bind(&WebContentsImpl::GetNativeView, base::Unretained(this))));
|
| }
|
| @@ -2422,7 +2422,7 @@ WebContentsImpl::GetGeolocationServiceContext() {
|
| return geolocation_service_context_.get();
|
| }
|
|
|
| -WakeLockServiceContext* WebContentsImpl::GetWakeLockServiceContext() {
|
| +device::WakeLockServiceContext* WebContentsImpl::GetWakeLockServiceContext() {
|
| return wake_lock_service_context_.get();
|
| }
|
|
|
|
|