Rolling libjingle revison r163.

content/renderer/media/mock_media_stream_dependency_factory.cc

Index: content/renderer/media/mock_media_stream_dependency_factory.cc
===================================================================
--- content/renderer/media/mock_media_stream_dependency_factory.cc	(revision 148953)
+++ content/renderer/media/mock_media_stream_dependency_factory.cc	(working copy)
@@ -190,9 +190,9 @@
     NOTIMPLEMENTED();
     return "";
   }
-  virtual SdpType type() const OVERRIDE {
+  virtual std::string type() const OVERRIDE {
     NOTIMPLEMENTED();
-    return kOffer;
+    return "";
   }
   virtual bool AddCandidate(const IceCandidateInterface* candidate) OVERRIDE {
     NOTIMPLEMENTED();
@@ -219,14 +219,20 @@
 
 class MockIceCandidate : public IceCandidateInterface {
  public:
-  MockIceCandidate(const std::string& label, const std::string& sdp)
-      : label_(label),
+  MockIceCandidate(const std::string& sdp_mid,
+                   int sdp_mline_index,
+                   const std::string& sdp)
+      : sdp_mid_(sdp_mid),
+        sdp_mline_index_(sdp_mline_index),
         sdp_(sdp) {
   }
   virtual ~MockIceCandidate() {}
-  virtual std::string label() const OVERRIDE {
-    return label_;
+  virtual std::string sdp_mid() const OVERRIDE {
+    return sdp_mid_;
   }
+  virtual int sdp_mline_index() const OVERRIDE {
+    return sdp_mline_index_;
+  }
   virtual const cricket::Candidate& candidate() const OVERRIDE {
     // This function should never be called. It will intentionally crash. The
     // base class forces us to return a reference.
@@ -240,7 +246,8 @@
   }
 
  private:
-  std::string label_;
+  std::string sdp_mid_;
+  int sdp_mline_index_;
   std::string sdp_;
 };
 
@@ -314,7 +321,8 @@
 
 webrtc::IceCandidateInterface*
 MockMediaStreamDependencyFactory::CreateIceCandidate(
-    const std::string& label,
+    const std::string& media_id,
+    int m_line_index,
     const std::string& sdp) {
-  return new webrtc::MockIceCandidate(label, sdp);
+  return new webrtc::MockIceCandidate(media_id, m_line_index, sdp);
 }