Connect webrtc MediaSourceInterface ready states with webkit WebMediaStreamSource

content/renderer/media/media_stream_source_extra_data.h

Index: content/renderer/media/media_stream_source_extra_data.h
diff --git a/content/renderer/media/media_stream_source_extra_data.h b/content/renderer/media/media_stream_source_extra_data.h
index a5fb9ad2d53e6a72ad697e0820faf97e1eaa1b44..b854e4edcb07bb288751b0dc6b67496b2121a389 100644
--- a/content/renderer/media/media_stream_source_extra_data.h
+++ b/content/renderer/media/media_stream_source_extra_data.h
@@ -8,6 +8,7 @@
 #include "base/compiler_specific.h"
 #include "content/common/content_export.h"
 #include "content/common/media/media_stream_options.h"
+#include "content/renderer/media/media_stream_source_observer.h"
 #include "media/base/audio_capturer_source.h"
 #include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSource.h"
@@ -37,6 +38,10 @@ class CONTENT_EXPORT MediaStreamSourceExtraData
     local_audio_source_ = source;
   }
 
+  void SetSourceObserver(MediaStreamSourceObserver* observer) {
+    source_observer_.reset(observer);

[tommi (sloooow) - chröme, 2013/04/23 09:50:55]

If the observer interface is implemented by an owner of the
MediaStreamSourceExtraData (indirectly), then don't we have a problem?

(i.e. is this the cause of the circular dependency?)

+  }
+
   webrtc::VideoSourceInterface* video_source() { return video_source_; }
   media::AudioCapturerSource* audio_source() { return audio_source_; }
   webrtc::AudioSourceInterface* local_audio_source() {
@@ -53,6 +58,7 @@ class CONTENT_EXPORT MediaStreamSourceExtraData
   // TODO(hclam): This should be merged with |audio_source_| such that it
   // carries audio options.
   scoped_refptr<webrtc::AudioSourceInterface> local_audio_source_;
+  scoped_ptr<MediaStreamSourceObserver> source_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamSourceExtraData);
 };