commit f435c1e84c2fb1cdfe7b68739cfd05ff8c49dee4
author ke.he <ke.he@intel.com> Thu May 11 04:09:10 2017
committer Commit bot <commit-bot@chromium.org> Thu May 11 04:09:10 2017
tree ea449dc3c70c471e8de887a170a11bb355cf1ad9
parent 081e4c81bb3c3a10b7e6921954dbe1e234e469c1

Generalize the API of WakeLockContext mojo interface.

Generalize the API of WakeLockContext mojo interface, so client can pass
type, reason and description as they want to create the WakeLockService.

BUG=689410

Review-Url: https://codereview.chromium.org/2867303003
Cr-Commit-Position: refs/heads/master@{#470801}

content/browser/wake_lock/wake_lock_context_host.cc

diff --git a/content/browser/wake_lock/wake_lock_context_host.cc b/content/browser/wake_lock/wake_lock_context_host.cc
index 7376d05..411a436 100644
--- a/content/browser/wake_lock/wake_lock_context_host.cc
+++ b/content/browser/wake_lock/wake_lock_context_host.cc
@@ -41,7 +41,8 @@
     device::mojom::WakeLockContextProviderPtr context_provider;
     connector->BindInterface(device::mojom::kServiceName,
                              mojo::MakeRequest(&context_provider));
-    context_provider->GetContext(id_, mojo::MakeRequest(&wake_lock_context_));
+    context_provider->GetWakeLockContextForID(
+        id_, mojo::MakeRequest(&wake_lock_context_));
   }
 }
 

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 3f5f76d9..ebbb7ef5 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2637,7 +2637,10 @@
     if (!wake_lock_context) {
       return nullptr;
     }
-    wake_lock_context->GetWakeLock(mojo::MakeRequest(&renderer_wake_lock_));
+    wake_lock_context->GetWakeLock(
+        device::mojom::WakeLockType::PreventDisplaySleep,
+        device::mojom::WakeLockReason::ReasonOther, "Wake Lock API",
+        mojo::MakeRequest(&renderer_wake_lock_));
   }
   return renderer_wake_lock_.get();
 }