Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(316)

Side by Side Diff: content/renderer/media/mock_media_stream_dependency_factory.cc

Issue 10689180: Rolling libjingle to 158:159 (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/logging.h" 5 #include "base/logging.h"
6 #include "content/renderer/media/mock_media_stream_dependency_factory.h" 6 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
7 #include "content/renderer/media/mock_peer_connection_impl.h" 7 #include "content/renderer/media/mock_peer_connection_impl.h"
8 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 8 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
9 #include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h" 9 #include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h"
10 10
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 return NULL; 170 return NULL;
171 } 171 }
172 virtual std::string session_id() const OVERRIDE { 172 virtual std::string session_id() const OVERRIDE {
173 NOTIMPLEMENTED(); 173 NOTIMPLEMENTED();
174 return ""; 174 return "";
175 } 175 }
176 virtual std::string session_version() const OVERRIDE { 176 virtual std::string session_version() const OVERRIDE {
177 NOTIMPLEMENTED(); 177 NOTIMPLEMENTED();
178 return ""; 178 return "";
179 } 179 }
180 // TODO(perkj): Implement type().
Sergey Ulanov 2012/07/13 01:22:48 Many other methods in this class are marked as NOT
Ronghua Wu (Left Chromium) 2012/07/13 18:26:35 Not sure about the history, those may not needed b
Sergey Ulanov 2012/07/13 21:06:24 Ok, maybe need to open a bug for this?
Ronghua Wu (Left Chromium) 2012/07/14 00:06:41 Created crbug/137318 for Per.
181 virtual SdpType type() const OVERRIDE {
182 return kOffer;
Sergey Ulanov 2012/07/13 01:22:48 add NOTIMPLEMENTED().
Ronghua Wu (Left Chromium) 2012/07/14 00:06:41 NOTIMPLEMENTED is already added in the last patch.
183 }
180 virtual bool AddCandidate(const IceCandidateInterface* candidate) OVERRIDE { 184 virtual bool AddCandidate(const IceCandidateInterface* candidate) OVERRIDE {
181 NOTIMPLEMENTED(); 185 NOTIMPLEMENTED();
182 return false; 186 return false;
183 } 187 }
184 virtual size_t number_of_mediasections() const OVERRIDE { 188 virtual size_t number_of_mediasections() const OVERRIDE {
185 NOTIMPLEMENTED(); 189 NOTIMPLEMENTED();
186 return 0; 190 return 0;
187 } 191 }
188 virtual const IceCandidateCollection* candidates( 192 virtual const IceCandidateCollection* candidates(
189 size_t mediasection_index) const OVERRIDE { 193 size_t mediasection_index) const OVERRIDE {
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 const std::string& sdp) { 306 const std::string& sdp) {
303 return new webrtc::MockSessionDescription(sdp); 307 return new webrtc::MockSessionDescription(sdp);
304 } 308 }
305 309
306 webrtc::IceCandidateInterface* 310 webrtc::IceCandidateInterface*
307 MockMediaStreamDependencyFactory::CreateIceCandidate( 311 MockMediaStreamDependencyFactory::CreateIceCandidate(
308 const std::string& label, 312 const std::string& label,
309 const std::string& sdp) { 313 const std::string& sdp) {
310 return new webrtc::MockIceCandidate(label, sdp); 314 return new webrtc::MockIceCandidate(label, sdp);
311 } 315 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698