Implement browser-side logging to WebRtc log

content/browser/renderer_host/media/media_stream_manager.h

 // 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.
 
 // MediaStreamManager is used to open/enumerate media capture devices (video
 // supported now). Call flow:
 // 1. GenerateStream is called when a render process wants to use a capture
 //    device.
 // 2. MediaStreamManager will ask MediaStreamUIController for permission to
 //    use devices and for which device to use.
@@ skipping 167 matching lines @@
   // This object gets deleted on the UI thread after the IO thread has been
   // destroyed. So we need to know when IO thread is being destroyed so that
   // we can delete VideoCaptureManager and AudioInputDeviceManager. Normally
   // this is handled by
   // base::MessageLoop::DestructionObserver::WillDestroyCurrentMessageLoop.
   // But for some tests which use TestBrowserThreadBundle, we need to call
   // WillDestroyCurrentMessageLoop explicitly because the notification happens
   // too late. (see http://crbug.com/247525#c14).
   virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
 
+  // Adds |message| to native logs for outstanding device requests, for use by
+  // render processes requesting logging from webrtcLoggingPrivate API.
+  void AddLogMessageOnUIThread(const std::string& message);
+  static void SendMessageToNativeLog(const std::string& message);

[perkj_chrome, 2014/01/24 09:15:10]

Can you add a comment that it is safe to call SendMessageToNativeLog on any
thread?
You are sending from an "unknown" thread in
VideoCaptureController::VideoCaptureDeviceClient::OnError".

[no longer working on chromium, 2014/01/24 09:54:38]

will this static API be used outside MediaStreamManager? if not, move it to
private.

[tommi (sloooow) - chröme, 2014/01/24 12:34:54]

+1 on documenting this function like the other methods.

[vrk (LEFT CHROMIUM), 2014/01/25 00:50:21]

Done.

[vrk (LEFT CHROMIUM), 2014/01/25 00:50:21]

Done.

[vrk (LEFT CHROMIUM), 2014/01/25 00:50:21]

Yes, it's already used in VideoCaptureController::VideoCaptureDeviceClient in
this CL. (Btw, an easy way to check is to view the raw patch (click [raw] link
next to Download) and search for ::SendMessageToNativeLog to search the whole
CL). Also, the point of this method is to allow logging from any class in the
browser process in chrome/ or content/.

+
  protected:
   // Used for testing.
   MediaStreamManager();
 
  private:
   // Contains all data needed to keep track of requests.
   class DeviceRequest;
 
   // Cache enumerated device list.
   struct EnumerationCache {
@@ skipping 115 matching lines @@
   // Finds and returns the device id corresponding to the given
   // |source_id|. Returns true if there was a raw device id that matched the
   // given |source_id|, false if nothing matched it.
   bool TranslateSourceIdToDeviceId(
       MediaStreamType stream_type,
       ResourceContext* rc,
       const GURL& security_origin,
       const std::string& source_id,
       std::string* device_id) const;
 
+  // Sends |stream_type| and the contents of |devices| to the
+  // webrtcLoggingPrivate API.
+  void LogDevicesToNativeLogs(MediaStreamType stream_type,
+                              const StreamDeviceInfoArray& devices);
+
   // Device thread shared by VideoCaptureManager and AudioInputDeviceManager.
   scoped_ptr<base::Thread> device_thread_;
 
   media::AudioManager* const audio_manager_;  // not owned
   scoped_refptr<AudioInputDeviceManager> audio_input_device_manager_;
   scoped_refptr<VideoCaptureManager> video_capture_manager_;
 
   // Indicator of device monitoring state.
   bool monitoring_started_;
 
@@ skipping 15 matching lines @@
 
   bool use_fake_ui_;
   scoped_ptr<FakeMediaStreamUIProxy> fake_ui_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_