Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / renderer / media / webrtc / peer_connection_dependency_factory.h

diff --git a/src/content/renderer/media/webrtc/peer_connection_dependency_factory.h b/src/content/renderer/media/webrtc/peer_connection_dependency_factory.h
index a8c96ca..67eae9d 100644 (file)
--- a/src/content/renderer/media/webrtc/peer_connection_dependency_factory.h
+++ b/src/content/renderer/media/webrtc/peer_connection_dependency_factory.h
@@ -123,20 +123,15 @@ class CONTENT_EXPORT PeerConnectionDependencyFactory
 
   WebRtcAudioDeviceImpl* GetWebRtcAudioDevice();
 
-  static void AddNativeAudioTrackToBlinkTrack(
-      webrtc::MediaStreamTrackInterface* native_track,
-      const blink::WebMediaStreamTrack& webkit_track,
-      bool is_local_track);
-
   scoped_refptr<base::MessageLoopProxy> GetWebRtcWorkerThread() const;
+  scoped_refptr<base::MessageLoopProxy> GetWebRtcSignalingThread() const;
 
   // AecDumpMessageFilter::AecDumpDelegate implementation.
   // TODO(xians): Remove when option to disable audio track processing is
   // removed.
-  virtual void OnAecDumpFile(
-      const IPC::PlatformFileForTransit& file_handle) OVERRIDE;
-  virtual void OnDisableAecDump() OVERRIDE;
-  virtual void OnIpcClosing() OVERRIDE;
+  void OnAecDumpFile(const IPC::PlatformFileForTransit& file_handle) override;
+  void OnDisableAecDump() override;
+  void OnIpcClosing() override;
 
  protected:
   // Asks the PeerConnection factory to create a Local Audio Source.
@@ -179,6 +174,10 @@ class CONTENT_EXPORT PeerConnectionDependencyFactory
   // creating PeerConnection objects.
   void CreatePeerConnectionFactory();
 
+  void InitializeSignalingThread(
+      const scoped_refptr<media::GpuVideoAcceleratorFactories>& gpu_factories,
+      base::WaitableEvent* event);
+
   void InitializeWorkerThread(rtc::Thread** thread,
                               base::WaitableEvent* event);
 
@@ -208,6 +207,7 @@ class CONTENT_EXPORT PeerConnectionDependencyFactory
   // "current" chrome thread.
   rtc::Thread* signaling_thread_;
   rtc::Thread* worker_thread_;
+  base::Thread chrome_signaling_thread_;
   base::Thread chrome_worker_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(PeerConnectionDependencyFactory);