Convert MediaWebContentsObsever to be the client of WakeLock mojo interface.

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"
 
 #if defined(OS_ANDROID)
 #include "ui/android/view_android.h"
 #endif  // OS_ANDROID
 
-namespace device {
-class PowerSaveBlocker;
-}  // namespace device
-
 namespace media {
 enum class MediaContentType;
 }  // namespace media
 
 namespace content {
 
 // This class manages all RenderFrame based media related managers at the
 // browser side. It receives IPC messages from media RenderFrameObservers and
 // forwards them to the corresponding managers. The managers are responsible
 // for sending IPCs back to the RenderFrameObservers at the render side.
@@ skipping 19 matching lines @@
                          RenderFrameHost* render_frame_host) override;
   void WasShown() override;
   void WasHidden() override;
 
   // TODO(zqzhang): this method is temporarily in MediaWebContentsObserver as
   // the effectively fullscreen video code is also here. We need to consider
   // merging the logic of effectively fullscreen, hiding media controls and
   // fullscreening video element to the same place.
   void RequestPersistentVideo(bool value);
 
-  bool has_audio_power_save_blocker_for_testing() const {
-    return !!audio_power_save_blocker_;
+  bool has_audio_wake_lock_for_testing() const {
+    return has_audio_wake_lock_for_testing_;

[DaleCurtis, 2017/05/02 17:08:42]

Why change this? YOu don't need the bool variables if you keep the
!!audio_wake_lock_, etc.

[ke.he, 2017/05/04 11:58:24]

The "mojo::MakeRequest(&audio_wake_lock_)" is always called, so
"audio_wake_lock_.get()" is always non-nullptr.

   }
 
-  bool has_video_power_save_blocker_for_testing() const {
-    return !!video_power_save_blocker_;
+  bool has_video_wake_lock_for_testing() const {
+    return has_video_wake_lock_for_testing_;
   }
 
  protected:
   MediaSessionControllersManager* session_controllers_manager() {
     return &session_controllers_manager_;
   }
 
  private:
   void OnMediaDestroyed(RenderFrameHost* render_frame_host, int delegate_id);
   void OnMediaPaused(RenderFrameHost* render_frame_host,
                      int delegate_id,
                      bool reached_end_of_stream);
   void OnMediaPlaying(RenderFrameHost* render_frame_host,
                       int delegate_id,
                       bool has_video,
                       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 power save blockers.
-  void ClearPowerSaveBlockers(RenderFrameHost* render_frame_host);
+  // Clear |render_frame_host|'s tracking entry for its WakeLocks.
+  void ClearWakeLocks(RenderFrameHost* render_frame_host);
 
-  // Creates an audio or video power save blocker respectively.
-  void CreateAudioPowerSaveBlocker();
-  void CreateVideoPowerSaveBlocker();
+  device::mojom::WakeLockServicePtr& GetAudioWakeLock();

[DaleCurtis, 2017/05/02 17:08:42]

Return device::mojom::WakeLockService* instead? Per-style we don't return
non-const &.

[ke.he, 2017/05/04 11:58:23]

Done.

+  device::mojom::WakeLockServicePtr& GetVideoWakeLock();
+  bool has_audio_wake_lock_for_testing_;

[DaleCurtis, 2017/05/02 17:08:42]

Variables below functions.

[ke.he, 2017/05/04 11:58:23]

Done.

+  bool has_video_wake_lock_for_testing_;
 
-  // Releases the audio power save blockers if |active_audio_players_| is empty.
-  // Likewise, releases the video power save blockers if |active_video_players_|
-  // is empty.
-  void MaybeReleasePowerSaveBlockers();
+  // Try to request audio wake lock.

[DaleCurtis, 2017/05/02 17:08:42]

These comments aren't really useful, so no need for them.

[ke.he, 2017/05/04 11:58:23]

Done.

+  void LockAudio();
+  // Try to request video wake lock.
+  void LockVideo();
+
+  // Cancel the video wake lock if |active_video_players_| is empty.
+  void MaybeCancelVideoLock();
+
+  // Cancel the audio wake lock.
+  void CancelAudioLock();
 
   // 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 power save blockers for media playback.
+  // Tracking variables and associated wake locks for media playback.
   ActiveMediaPlayerMap active_audio_players_;
   ActiveMediaPlayerMap active_video_players_;
-  std::unique_ptr<device::PowerSaveBlocker> audio_power_save_blocker_;
-  std::unique_ptr<device::PowerSaveBlocker> video_power_save_blocker_;
+  device::mojom::WakeLockServicePtr audio_wake_lock_;
+  device::mojom::WakeLockServicePtr video_wake_lock_;
   base::Optional<MediaPlayerId> fullscreen_player_;
 
   MediaSessionControllersManager session_controllers_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserver);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_