Release PowerSaveBlock on PeerConnection stop instead of removal

content/browser/webrtc/webrtc_internals.h

 // Copyright (c) 2013 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_WEBRTC_WEBRTC_INTERNALS_H_
 #define CONTENT_BROWSER_WEBRTC_WEBRTC_INTERNALS_H_
 
 #include <memory>
 #include <queue>
+#include <string>
 
 #include "base/containers/hash_tables.h"
 #include "base/gtest_prod_util.h"
 #include "base/lazy_instance.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/process/process.h"
 #include "base/threading/thread_checker.h"
 #include "base/values.h"
 #include "content/common/content_export.h"
@@ skipping 81 matching lines @@
   bool IsAudioDebugRecordingsEnabled() const;
   const base::FilePath& GetAudioDebugRecordingsFilePath() const;
 
   // Enables or disables diagnostic event log.
   void EnableEventLogRecordings(content::WebContents* web_contents);
   void DisableEventLogRecordings();
 
   bool IsEventLogRecordingsEnabled() const;
   const base::FilePath& GetEventLogFilePath() const;
 
+  int num_open_connections() { return num_open_connections_; }

[tommi (sloooow) - chröme, 2016/11/17 18:27:04]

Make these const? 

+  bool IsPowerSavingBlocked() { return !!power_save_blocker_; }
+
  protected:
   // Constructor/Destructor are protected to allow tests to derive from the
   // class and do per-instance testing without having to use the global
   // instance.
   // The default ctor sets |aggregate_updates_ms| to 500ms.
   WebRTCInternals();
   WebRTCInternals(int aggregate_updates_ms, bool should_block_power_saving);
   ~WebRTCInternals() override;
 
  private:
@@ skipping 25 matching lines @@
 #if defined(ENABLE_WEBRTC)
   // Enables diagnostic audio recordings on all render process hosts using
   // |audio_debug_recordings_file_path_|.
   void EnableAudioDebugRecordingsOnAllRenderProcessHosts();
 
   // Enables event log recordings on all render process hosts using
   // |event_log_recordings_file_path_|.
   void EnableEventLogRecordingsOnAllRenderProcessHosts();
 #endif
 
-  // Called whenever an element is added to or removed from
-  // |peer_connection_data_| to impose/release a block on suspending the current
-  // application for power-saving.
+  // Updates the number of open PeerConnections. Called when a PeerConnection
+  // is stopped or removed.
+  void MaybeClosePeerConnection(base::DictionaryValue* record);
+
+  // Called whenever a PeerConnection is created or stopped in order to
+  // impose/release a block on suspending the current application for power
+  // saving.
   void CreateOrReleasePowerSaveBlocker();
 
   // Called on a timer to deliver updates to javascript.
   // We throttle and bulk together updates to avoid DOS like scenarios where
   // a page uses a lot of peerconnection instances with many event
   // notifications.
   void ProcessPendingUpdates();
 
   base::ObserverList<WebRTCInternalsUIObserver> observers_;
 
@@ skipping 27 matching lines @@
 
   // Diagnostic audio recording state.
   bool audio_debug_recordings_;
   base::FilePath audio_debug_recordings_file_path_;
 
   // Diagnostic event log recording state.
   bool event_log_recordings_;
   bool selecting_event_log_;
   base::FilePath event_log_recordings_file_path_;
 
-  // While |peer_connection_data_| is non-empty, hold an instance of
+  // While |num_open_connections_| is greater than zero, hold an instance of
   // PowerSaveBlocker.  This prevents the application from being suspended while
   // remoting.
+  int num_open_connections_;
   std::unique_ptr<device::PowerSaveBlocker> power_save_blocker_;
   const bool should_block_power_saving_;
 
   // Set of render process hosts that |this| is registered as an observer on.
   base::hash_set<int> render_process_id_set_;
 
   // Used to bulk up updates that we send to javascript.
   // The class owns the value/dictionary and command name of an update.
   // For each update, a PendingUpdate is stored in the |pending_updates_| queue
   // and deleted as soon as the update has been delivered.
@@ skipping 21 matching lines @@
   std::queue<PendingUpdate> pending_updates_;
   const int aggregate_updates_ms_;
 
   // Weak factory for this object that we use for bulking up updates.
   base::WeakPtrFactory<WebRTCInternals> weak_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEBRTC_WEBRTC_INTERNALS_H_