Start and stop RTC event logs from private extension API.

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 261 matching lines @@
 
 #if defined(ENABLE_SPELLCHECK)
 #include "chrome/browser/spellchecker/spellcheck_message_filter.h"
 #endif
 
 #if defined(USE_BROWSER_SPELLCHECKER)
 #include "chrome/browser/spellchecker/spellcheck_message_filter_platform.h"
 #endif
 
 #if defined(ENABLE_WEBRTC)
+#include "chrome/browser/media/webrtc_internal_log_handler_host.h"
 #include "chrome/browser/media/webrtc_logging_handler_host.h"
 #endif
 
 #if defined(ENABLE_MEDIA_ROUTER)
 #include "chrome/browser/media/router/media_router_feature.h"
 #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
 #endif
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h"
@@ skipping 626 matching lines @@
   host->AddFilter(new TtsMessageFilter(host->GetBrowserContext()));
 #if defined(ENABLE_WEBRTC)
   WebRtcLoggingHandlerHost* webrtc_logging_handler_host =
       new WebRtcLoggingHandlerHost(
           profile, g_browser_process->webrtc_log_uploader());
   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));
+
+  WebRtcInternalLogHandlerHost* webrtc_internal_log_handler_host =
+      new WebRtcInternalLogHandlerHost(
+          profile /*, g_browser_process->webrtc_log_uploader()*/);

[tommi (sloooow) - chröme, 2016/02/05 11:09:00]

Something that's intended to be cleaned up?
(next lines too)

[terelius1, 2016/02/16 20:09:12]

Yes. Done.

+  // host->SetWebRtcLogMessageCallback(base::Bind(
+  //     &WebRtcLoggingHandlerHost::LogMessage, webrtc_logging_handler_host));
+  host->AddFilter(webrtc_internal_log_handler_host);
+  host->SetUserData(host,

[Henrik Grunell, 2016/02/03 08:37:32]

I think this will override the previous call above. (Same key |host|.)

[terelius-chromium, 2016/02/05 09:27:37]

Just a follow-up after our discussion. Do you have any suggestion on how I
should handle this? What should I use as key, or should some other object own
the handler?

[Henrik Grunell, 2016/02/05 10:05:44]

Yeah, the new class should not be a filter since it's not used for IPC. Thus it
should not be added as filter to the host, and ownership must be explicit
somewhere. (I think the host has references to filters.)

[terelius1, 2016/02/16 20:09:12]

Removed the filter. Added static const strings to each of the logging handlers
for use as keys.

According to the documentation for SetUserData:
// This object will TAKE OWNERSHIP of the given data pointer, and will
// delete the object if it is changed or the object is destroyed.
So apparently there is no need for an explicit ownership. 

[Henrik Grunell, 2016/02/23 15:29:10]

Acknowledged.

+                    new base::UserDataAdapter<WebRtcInternalLogHandlerHost>(
+                        webrtc_internal_log_handler_host));
 #endif
 #if !defined(DISABLE_NACL)
   host->AddFilter(new nacl::NaClHostMessageFilter(
       id, profile->IsOffTheRecord(),
       profile->GetPath(),
       context));
 #endif
 #if defined(OS_ANDROID)
   host->AddFilter(new cdm::CdmMessageFilterAndroid());
 #endif
@@ skipping 1951 matching lines @@
   if (channel <= kMaxDisableEncryptionChannel) {
     static const char* const kWebRtcDevSwitchNames[] = {
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)