Rolling libjingle to 158:159

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 72 matching lines @@
 }
 
 void MockLocalVideoTrack::SetRenderer(VideoRendererWrapperInterface* renderer) {
   renderer_ = renderer;
 }
 
 VideoRendererWrapperInterface* MockLocalVideoTrack::GetRenderer() {
   return renderer_;
 }
 
+void MockLocalVideoTrack::AddRenderer(VideoRendererInterface* renderer) {
+  NOTIMPLEMENTED();
+}
+
+void MockLocalVideoTrack::RemoveRenderer(VideoRendererInterface* renderer) {
+  NOTIMPLEMENTED();
+}
+
+cricket::VideoRenderer* MockLocalVideoTrack::FrameInput() {
+  NOTIMPLEMENTED();
+  return NULL;
+}
+
 std::string MockLocalVideoTrack::kind() const {
   NOTIMPLEMENTED();
   return "";
 }
 
 std::string MockLocalVideoTrack::label() const { return label_; }
 
 bool MockLocalVideoTrack::enabled() const { return enabled_; }
 
 MockLocalVideoTrack::TrackState MockLocalVideoTrack::state() const {
@@ skipping 67 matching lines @@
     return NULL;
   }
   virtual std::string session_id() const OVERRIDE {
     NOTIMPLEMENTED();
     return "";
   }
   virtual std::string session_version() const OVERRIDE {
     NOTIMPLEMENTED();
     return "";
   }
+  // TODO(perkj): Implement type().
+  virtual SdpType type() const OVERRIDE {
+    NOTIMPLEMENTED();
+    return kOffer;
+  }
   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 {
@@ skipping 112 matching lines @@
     const std::string& sdp) {
   return new webrtc::MockSessionDescription(sdp);
 }
 
 webrtc::IceCandidateInterface*
 MockMediaStreamDependencyFactory::CreateIceCandidate(
     const std::string& label,
     const std::string& sdp) {
   return new webrtc::MockIceCandidate(label, sdp);
 }