Rationalize WakeLock naming conventions

content/browser/media/media_web_contents_observer.h

 // 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.
 
 #ifndef CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_
 #define CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <set>
 
 #include "base/macros.h"
 #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"
 #endif  // OS_ANDROID
 
 namespace media {
 enum class MediaContentType;
 }  // namespace media
 
 namespace content {
@@ skipping 55 matching lines @@
                       bool has_audio,
                       bool is_remote,
                       media::MediaContentType media_content_type);
   void OnMediaEffectivelyFullscreenChange(RenderFrameHost* render_frame_host,
                                           int delegate_id,
                                           bool is_fullscreen);
 
   // 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();
 
   void CancelAudioLock();
   void CancelVideoLock();
   void MaybeCancelVideoLock();
 
   // Helper methods for adding or removing player entries in |player_map|.
   using PlayerSet = std::set<int>;
   using ActiveMediaPlayerMap = std::map<RenderFrameHost*, PlayerSet>;
   void AddMediaPlayerEntry(const MediaPlayerId& id,
                            ActiveMediaPlayerMap* player_map);
   // Returns true if an entry is actually removed.
   bool RemoveMediaPlayerEntry(const MediaPlayerId& id,
                               ActiveMediaPlayerMap* player_map);
   // Removes all entries from |player_map| for |render_frame_host|. Removed
   // entries are added to |removed_players|.
   void RemoveAllMediaPlayerEntries(RenderFrameHost* render_frame_host,
                                    ActiveMediaPlayerMap* player_map,
                                    std::set<MediaPlayerId>* removed_players);
 
   // 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_;
 
   MediaSessionControllersManager session_controllers_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserver);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_