Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(511)

Unified Diff: content/browser/media/webrtc/webrtc_internals.cc

Issue 1855193002: Move the call to enable the WebRTC event log from PeerConnectionFactory to PeerConnection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comments from Tommi. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/media/webrtc/webrtc_internals.cc
diff --git a/content/browser/media/webrtc/webrtc_internals.cc b/content/browser/media/webrtc/webrtc_internals.cc
index 1ebc884a5cb0a7816f607c31ddd38dc9ebedd0b0..e3c7947dcea184c728a5b9240b9d4f9632264272 100644
--- a/content/browser/media/webrtc/webrtc_internals.cc
+++ b/content/browser/media/webrtc/webrtc_internals.cc
@@ -9,12 +9,19 @@
#include "base/strings/string_number_conversions.h"
#include "build/build_config.h"
#include "content/browser/media/webrtc/webrtc_internals_ui_observer.h"
+#include "content/browser/renderer_host/render_process_host_impl.h"
#include "content/browser/web_contents/web_contents_view.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/content_browser_client.h"
#include "content/public/browser/power_save_blocker.h"
-#include "content/public/browser/render_process_host.h"
#include "content/public/browser/web_contents.h"
+#include "ipc/ipc_platform_file.h"
+
+#if defined(OS_WIN)
+#define IntToStringType base::IntToString16
+#else
+#define IntToStringType base::IntToString
+#endif
using base::ProcessId;
using std::string;
@@ -252,10 +259,12 @@ void WebRTCInternals::RemoveObserver(WebRTCInternalsUIObserver* observer) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
observers_.RemoveObserver(observer);
- // Disables audio debug recordings if it is enabled and the last
+ // Disables audio debug recordings and event log if enabled and the last
// webrtc-internals page is going away.
- if (audio_debug_recordings_ && !observers_.might_have_observers())
+ if (audio_debug_recordings_ && !observers_.might_have_observers()) {
DisableAudioDebugRecordings();
+ SetEventLogRecordings(false, nullptr);
+ }
}
void WebRTCInternals::UpdateObserver(WebRTCInternalsUIObserver* observer) {
@@ -342,14 +351,13 @@ void WebRTCInternals::SetEventLogRecordings(
event_log_recordings_ = false;
// Tear down the dialog since the user has unchecked the audio debug
// recordings box.
- select_file_dialog_ = nullptr;
DCHECK(select_file_dialog_->HasOneRef());
+ select_file_dialog_ = nullptr;
for (RenderProcessHost::iterator i(
content::RenderProcessHost::AllHostsIterator());
- !i.IsAtEnd(); i.Advance()) {
- i.GetCurrentValue()->DisableEventLogRecordings();
- }
+ !i.IsAtEnd(); i.Advance())
+ i.GetCurrentValue()->StopWebRTCEventLog();
}
#endif
}
@@ -359,11 +367,6 @@ bool WebRTCInternals::IsEventLogRecordingsEnabled() const {
return event_log_recordings_;
}
-const base::FilePath& WebRTCInternals::GetEventLogRecordingsFilePath() const {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
- return event_log_recordings_file_path_;
-}
-
void WebRTCInternals::SendUpdate(const string& command,
std::unique_ptr<base::Value> value) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -485,10 +488,8 @@ void WebRTCInternals::EnableEventLogRecordingsOnAllRenderProcessHosts() {
event_log_recordings_ = true;
for (RenderProcessHost::iterator i(
content::RenderProcessHost::AllHostsIterator());
- !i.IsAtEnd(); i.Advance()) {
- i.GetCurrentValue()->EnableEventLogRecordings(
- event_log_recordings_file_path_);
- }
+ !i.IsAtEnd(); i.Advance())
+ i.GetCurrentValue()->StartWebRTCEventLog(event_log_recordings_file_path_);
}
#endif

Powered by Google App Engine
This is Rietveld 408576698