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

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

Issue 10915294: Update libjingle 181:193 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
« no previous file with comments | « DEPS ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 } 165 }
166 166
167 class MockSessionDescription : public SessionDescriptionInterface { 167 class MockSessionDescription : public SessionDescriptionInterface {
168 public: 168 public:
169 MockSessionDescription(const std::string& type, 169 MockSessionDescription(const std::string& type,
170 const std::string& sdp) 170 const std::string& sdp)
171 : type_(type), 171 : type_(type),
172 sdp_(sdp) { 172 sdp_(sdp) {
173 } 173 }
174 virtual ~MockSessionDescription() {} 174 virtual ~MockSessionDescription() {}
175 virtual cricket::SessionDescription* description() OVERRIDE {
176 NOTIMPLEMENTED();
177 return NULL;
178 }
175 virtual const cricket::SessionDescription* description() const OVERRIDE { 179 virtual const cricket::SessionDescription* description() const OVERRIDE {
176 NOTIMPLEMENTED(); 180 NOTIMPLEMENTED();
177 return NULL; 181 return NULL;
178 } 182 }
179 virtual std::string session_id() const OVERRIDE { 183 virtual std::string session_id() const OVERRIDE {
180 NOTIMPLEMENTED(); 184 NOTIMPLEMENTED();
181 return ""; 185 return "";
182 } 186 }
183 virtual std::string session_version() const OVERRIDE { 187 virtual std::string session_version() const OVERRIDE {
184 NOTIMPLEMENTED(); 188 NOTIMPLEMENTED();
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 webrtc::IceCandidateInterface* 324 webrtc::IceCandidateInterface*
321 MockMediaStreamDependencyFactory::CreateIceCandidate( 325 MockMediaStreamDependencyFactory::CreateIceCandidate(
322 const std::string& sdp_mid, 326 const std::string& sdp_mid,
323 int sdp_mline_index, 327 int sdp_mline_index,
324 const std::string& sdp) { 328 const std::string& sdp) {
325 return new webrtc::MockIceCandidate(sdp_mid, sdp_mline_index, sdp); 329 return new webrtc::MockIceCandidate(sdp_mid, sdp_mline_index, sdp);
326 } 330 }
327 331
328 void MockMediaStreamDependencyFactory::SetAudioDeviceSessionId(int session_id) { 332 void MockMediaStreamDependencyFactory::SetAudioDeviceSessionId(int session_id) {
329 } 333 }
OLDNEW
« no previous file with comments | « DEPS ('k') | third_party/libjingle/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698