Chromium Code Reviews| Index: chrome/browser/chrome_content_browser_client.cc |
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
| index bcbd7aac30edfa75a4784f95fe5c21ec6ac1d976..9e040eec9901367c0409114c5313ce5a0772a432 100644 |
| --- a/chrome/browser/chrome_content_browser_client.cc |
| +++ b/chrome/browser/chrome_content_browser_client.cc |
| @@ -279,6 +279,8 @@ |
| #endif |
| #if defined(ENABLE_WEBRTC) |
| +#include "chrome/browser/media/audio_debug_recordings_handler.h" |
| +#include "chrome/browser/media/rtc_event_log_handler.h" |
| #include "chrome/browser/media/webrtc_logging_handler_host.h" |
| #endif |
| @@ -923,8 +925,21 @@ void ChromeContentBrowserClient::RenderProcessWillLaunch( |
| host->SetWebRtcLogMessageCallback(base::Bind( |
| &WebRtcLoggingHandlerHost::LogMessage, webrtc_logging_handler_host)); |
| host->AddFilter(webrtc_logging_handler_host); |
| - host->SetUserData(host, new base::UserDataAdapter<WebRtcLoggingHandlerHost>( |
| - webrtc_logging_handler_host)); |
| + host->SetUserData(WebRtcLoggingHandlerHost::kWebRtcLoggingHandlerHostKey, |
| + new base::UserDataAdapter<WebRtcLoggingHandlerHost>( |
| + webrtc_logging_handler_host)); |
| + |
| + AudioDebugRecordingsHandler* audio_debug_recordings_handler = |
| + new AudioDebugRecordingsHandler(profile); |
| + host->SetUserData( |
| + AudioDebugRecordingsHandler::kAudioDebugRecordingsHandlerKey, |
|
Henrik Grunell
2016/02/23 15:29:10
Looks like different indentation than above. Run '
terelius-chromium
2016/03/02 10:01:09
Done, but I don't think 'git cl format' does what
Henrik Grunell
2016/03/10 21:33:34
I think it usually works well. If it messes up the
|
| + new base::UserDataAdapter<AudioDebugRecordingsHandler>( |
| + audio_debug_recordings_handler)); |
| + |
| + RtcEventLogHandler* rtc_event_log_handler = new RtcEventLogHandler(profile); |
| + host->SetUserData( |
| + RtcEventLogHandler::kRtcEventLogHandlerKey, |
| + new base::UserDataAdapter<RtcEventLogHandler>(rtc_event_log_handler)); |
| #endif |
| #if !defined(DISABLE_NACL) |
| host->AddFilter(new nacl::NaClHostMessageFilter( |