Rolling libjingle revison r163.

content/renderer/media/mock_media_stream_dependency_factory.cc

 // 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.
 
 #include "base/logging.h"
 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
 #include "content/renderer/media/mock_peer_connection_impl.h"
 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
 #include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h"
 
@@ skipping 172 matching lines @@
     return NULL;
   }
   virtual std::string session_id() const OVERRIDE {
     NOTIMPLEMENTED();
     return "";
   }
   virtual std::string session_version() const OVERRIDE {
     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();
     return false;
   }
   virtual size_t number_of_mediasections() const OVERRIDE {
     NOTIMPLEMENTED();
     return 0;
   }
   virtual const IceCandidateCollection* candidates(
       size_t mediasection_index) const OVERRIDE {
     NOTIMPLEMENTED();
     return NULL;
   }
 
   virtual bool ToString(std::string* out) const OVERRIDE {
     *out = sdp_;
     return true;
   }
 
  private:
   std::string sdp_;
 };
 
 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.
     NOTREACHED();
     cricket::Candidate* candidate = NULL;
     return *candidate;
   }
   virtual bool ToString(std::string* out) const OVERRIDE {
     *out = sdp_;
     return true;
   }
 
  private:
-  std::string label_;
+  std::string sdp_mid_;
+  int sdp_mline_index_;
   std::string sdp_;
 };
 
 }  // namespace webrtc
 
 MockMediaStreamDependencyFactory::MockMediaStreamDependencyFactory(
     VideoCaptureImplManager* vc_manager)
     : MediaStreamDependencyFactory(vc_manager),
       mock_pc_factory_created_(false) {
 }
@@ skipping 53 matching lines @@
 }
 
 webrtc::SessionDescriptionInterface*
 MockMediaStreamDependencyFactory::CreateSessionDescription(
     const std::string& sdp) {
   return new webrtc::MockSessionDescription(sdp);
 }
 
 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);
 }