Rolling libjingle revison r163.

content/renderer/media/media_stream_dependency_factory.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.
 
 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 58 matching lines @@
                             int video_session_id);
 
   // Asks the PeerConnection factory to create a Local AudioTrack object.
   virtual talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface>
       CreateLocalAudioTrack(const std::string& label,
                             webrtc::AudioDeviceModule* audio_device);
 
   virtual webrtc::SessionDescriptionInterface* CreateSessionDescription(
       const std::string& sdp);
   virtual webrtc::IceCandidateInterface* CreateIceCandidate(
-      const std::string& label,
+      const std::string& media_id,
+      int m_line_index,

[Ronghua Wu (Left Chromium), 2012/07/30 18:09:10]

use sdp_mid and sdp_mline_index.

[Mallinath (Gone from Chromium), 2012/07/30 18:42:08]

Done.

       const std::string& sdp);
 
  private:
   talk_base::scoped_refptr<webrtc::PeerConnectionFactoryInterface> pc_factory_;
   scoped_refptr<VideoCaptureImplManager> vc_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory);
 };
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_