Rationalize WakeLock naming conventions

content/browser/media/media_web_contents_observer.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/media/media_web_contents_observer.h"
 
 #include <memory>
 
 #include "build/build_config.h"
 #include "content/browser/media/audible_metrics.h"
@@ skipping 204 matching lines @@
   // Notify all observers the player has been "paused".
   WebContentsImpl* wci = static_cast<WebContentsImpl*>(web_contents());
   for (const auto& id : removed_players) {
     auto it = video_players.find(id);
     bool was_video = (it != video_players.end());
     wci->MediaStoppedPlaying(WebContentsObserver::MediaPlayerInfo(was_video),
                              id);
   }
 }
 
-device::mojom::WakeLockService* MediaWebContentsObserver::GetAudioWakeLock() {
+device::mojom::WakeLock* MediaWebContentsObserver::GetAudioWakeLock() {
   // Here is a lazy binding, and will not reconnect after connection error.
   if (!audio_wake_lock_) {
-    device::mojom::WakeLockServiceRequest request =
+    device::mojom::WakeLockRequest request =
         mojo::MakeRequest(&audio_wake_lock_);
     device::mojom::WakeLockContext* wake_lock_context =
         web_contents()->GetWakeLockContext();
     if (wake_lock_context) {
       wake_lock_context->GetWakeLock(
           device::mojom::WakeLockType::PreventAppSuspension,
           device::mojom::WakeLockReason::ReasonAudioPlayback, "Playing audio",
           std::move(request));
     }
   }
   return audio_wake_lock_.get();
 }
 
-device::mojom::WakeLockService* MediaWebContentsObserver::GetVideoWakeLock() {
+device::mojom::WakeLock* MediaWebContentsObserver::GetVideoWakeLock() {
   // Here is a lazy binding, and will not reconnect after connection error.
   if (!video_wake_lock_) {
-    device::mojom::WakeLockServiceRequest request =
+    device::mojom::WakeLockRequest request =
         mojo::MakeRequest(&video_wake_lock_);
     device::mojom::WakeLockContext* wake_lock_context =
         web_contents()->GetWakeLockContext();
     if (wake_lock_context) {
       wake_lock_context->GetWakeLock(
           device::mojom::WakeLockType::PreventDisplaySleep,
           device::mojom::WakeLockReason::ReasonVideoPlayback, "Playing video",
           std::move(request));
     }
   }
@@ skipping 60 matching lines @@
   if (it == player_map->end())
     return;
 
   for (int delegate_id : it->second)
     removed_players->insert(MediaPlayerId(render_frame_host, delegate_id));
 
   player_map->erase(it);
 }
 
 }  // namespace content