Move the call to enable the WebRTC event log from PeerConnectionFactory to PeerConnection.

content/browser/media/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_MEDIA_WEBRTC_WEBRTC_INTERNALS_H_
 #define CONTENT_BROWSER_MEDIA_WEBRTC_WEBRTC_INTERNALS_H_
 
+#include <map>
 #include <memory>
 #include <queue>
 
+#include "base/callback_forward.h"
 #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"
 #include "content/public/browser/render_process_host_observer.h"
@@ skipping 74 matching lines @@
   void EnableAudioDebugRecordings(content::WebContents* web_contents);
   void DisableAudioDebugRecordings();
 
   bool IsAudioDebugRecordingsEnabled() const;
   const base::FilePath& GetAudioDebugRecordingsFilePath() const;
 
   // Enables or disables diagnostic event log.
   void SetEventLogRecordings(bool enable, content::WebContents* web_contents);
 
   bool IsEventLogRecordingsEnabled() const;
-  const base::FilePath& GetEventLogRecordingsFilePath() const;
+
+  // Register functions to handle starting and stopping the WebRTC event log
+  // functionality from the chrome://webrtc-internals page.
+  typedef base::Callback<void(const base::FilePath&)> event_log_start_func;
+  typedef base::Callback<void()> event_log_stop_func;

[dcheng, 2016/05/10 06:48:17]

Nit: Prefer using to typedef. Also TypeNamesAreWrittenLikeThis.

[Ivo-OOO until feb 6, 2016/05/12 13:23:24]

Done.

+  void RegisterEventLogHandler(int render_process_id,
+                               event_log_start_func start_logging_callback,
+                               event_log_stop_func stop_logging_callback);
 
  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();
   explicit WebRTCInternals(int aggregate_updates_ms);
   ~WebRTCInternals() override;
 
@@ skipping 74 matching lines @@
   // For managing select file dialog.
   scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
 
   // 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_;
+  int number_event_log_files_;
   base::FilePath event_log_recordings_file_path_;
+  std::map<int, std::pair<event_log_start_func, event_log_stop_func>>
+      event_log_handlers;

[Henrik Grunell, 2016/05/10 08:44:56]

Trailing _.

[Ivo-OOO until feb 6, 2016/05/12 13:23:24]

Done.

 
   // While |peer_connection_data_| is non-empty, hold an instance of
   // PowerSaveBlocker.  This prevents the application from being suspended while
   // remoting.
   std::unique_ptr<PowerSaveBlocker> power_save_blocker_;
 
   // 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.
@@ skipping 24 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_MEDIA_WEBRTC_WEBRTC_INTERNALS_H_