Rationalize WakeLock naming conventions

content/browser/media/media_web_contents_observer.h

Index: content/browser/media/media_web_contents_observer.h
diff --git a/content/browser/media/media_web_contents_observer.h b/content/browser/media/media_web_contents_observer.h
index 0e61ecffbc80b73aaa3d6ce210fb727e3cfe7eb3..6e4ce5a58b1d45daa14913c0b85fbba1d342bd99 100644
--- a/content/browser/media/media_web_contents_observer.h
+++ b/content/browser/media/media_web_contents_observer.h
@@ -15,7 +15,7 @@
 #include "content/browser/media/session/media_session_controllers_manager.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "device/wake_lock/public/interfaces/wake_lock_service.mojom.h"
+#include "device/wake_lock/public/interfaces/wake_lock.mojom.h"
 
 #if defined(OS_ANDROID)
 #include "ui/android/view_android.h"
@@ -91,8 +91,8 @@ class CONTENT_EXPORT MediaWebContentsObserver : public WebContentsObserver {
   // Clear |render_frame_host|'s tracking entry for its WakeLocks.
   void ClearWakeLocks(RenderFrameHost* render_frame_host);
 
-  device::mojom::WakeLockService* GetAudioWakeLock();
-  device::mojom::WakeLockService* GetVideoWakeLock();
+  device::mojom::WakeLock* GetAudioWakeLock();
+  device::mojom::WakeLock* GetVideoWakeLock();
 
   void LockAudio();
   void LockVideo();
@@ -118,8 +118,8 @@ class CONTENT_EXPORT MediaWebContentsObserver : public WebContentsObserver {
   // Tracking variables and associated wake locks for media playback.
   ActiveMediaPlayerMap active_audio_players_;
   ActiveMediaPlayerMap active_video_players_;
-  device::mojom::WakeLockServicePtr audio_wake_lock_;
-  device::mojom::WakeLockServicePtr video_wake_lock_;
+  device::mojom::WakeLockPtr audio_wake_lock_;
+  device::mojom::WakeLockPtr video_wake_lock_;
   base::Optional<MediaPlayerId> fullscreen_player_;
   bool has_audio_wake_lock_for_testing_;
   bool has_video_wake_lock_for_testing_;