Rationalize WakeLock naming conventions

content/browser/webrtc/webrtc_internals.h

Index: content/browser/webrtc/webrtc_internals.h
diff --git a/content/browser/webrtc/webrtc_internals.h b/content/browser/webrtc/webrtc_internals.h
index c6dbb32142722aa82d0b3195f804dfe3a84677b8..411a0deb43d528390dd7aab6a7c14a431068d498 100644
--- a/content/browser/webrtc/webrtc_internals.h
+++ b/content/browser/webrtc/webrtc_internals.h
@@ -19,7 +19,7 @@
 #include "base/values.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/render_process_host_observer.h"
-#include "device/wake_lock/public/interfaces/wake_lock_service.mojom.h"
+#include "device/wake_lock/public/interfaces/wake_lock.mojom.h"
 #include "media/media_features.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
@@ -118,7 +118,7 @@ class CONTENT_EXPORT WebRTCInternals : public RenderProcessHostObserver,
   WebRTCInternals(int aggregate_updates_ms, bool should_block_power_saving);
   ~WebRTCInternals() override;
 
-  device::mojom::WakeLockServicePtr wake_lock_service_;
+  device::mojom::WakeLockPtr wake_lock_service_;
 
  private:
   friend struct base::LazyInstanceTraitsBase<WebRTCInternals>;
@@ -167,7 +167,7 @@ class CONTENT_EXPORT WebRTCInternals : public RenderProcessHostObserver,
   // saving.
   void UpdateWakeLock();
 
-  device::mojom::WakeLockService* GetWakeLockService();
+  device::mojom::WakeLock* GetWakeLockService();

[blundell, 2017/06/05 11:48:11]

nit: GetWakeLock()

[juncai, 2017/06/05 18:58:25]

Done.

 
   // Called on a timer to deliver updates to javascript.
   // We throttle and bulk together updates to avoid DOS like scenarios where