Changes needed to roll libjingle r141

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 167 matching lines @@
     return "";
   }
   virtual bool AddCandidate(const IceCandidateInterface* candidate) OVERRIDE {
     NOTIMPLEMENTED();
     return false;
   }
   virtual size_t number_of_mediasections() const OVERRIDE {
     NOTIMPLEMENTED();
     return 0;
   }
-  virtual const IceCandidateColletion* candidates(
+  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 {
@@ skipping 98 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);
 }