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

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

Issue 10382003: Changes needed to roll libjingle r141 (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 7 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 <string> 5 #include <string>
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "content/renderer/media/media_stream_extra_data.h" 9 #include "content/renderer/media/media_stream_extra_data.h"
10 #include "content/renderer/media/mock_media_stream_dependency_factory.h" 10 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
11 #include "content/renderer/media/mock_web_peer_connection_00_handler_client.h" 11 #include "content/renderer/media/mock_web_peer_connection_00_handler_client.h"
12 #include "content/renderer/media/mock_peer_connection_impl.h" 12 #include "content/renderer/media/mock_peer_connection_impl.h"
13 #include "content/renderer/media/peer_connection_handler_jsep.h" 13 #include "content/renderer/media/peer_connection_handler_jsep.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "third_party/libjingle/source/talk/app/webrtc/peerconnection.h" 15 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h "
16 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebICECandid ateDescriptor.h" 16 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebICECandid ateDescriptor.h"
17 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebICEOption s.h" 17 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebICEOption s.h"
18 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaHint s.h" 18 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaHint s.h"
19 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amDescriptor.h" 19 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amDescriptor.h"
20 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amSource.h" 20 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStre amSource.h"
21 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSessionDe scriptionDescriptor.h" 21 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSessionDe scriptionDescriptor.h"
22 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" 22 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
23 23
24 class PeerConnectionHandlerJsepUnderTest : public PeerConnectionHandlerJsep { 24 class PeerConnectionHandlerJsepUnderTest : public PeerConnectionHandlerJsep {
25 public: 25 public:
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 talk_base::scoped_refptr<webrtc::MediaStreamInterface> stream_2( 287 talk_base::scoped_refptr<webrtc::MediaStreamInterface> stream_2(
288 AddRemoteMockMediaStream(stream_label_2, video_track_label_2, 288 AddRemoteMockMediaStream(stream_label_2, video_track_label_2,
289 audio_track_label_2)); 289 audio_track_label_2));
290 290
291 pc_handler_->OnAddStream(stream_1); 291 pc_handler_->OnAddStream(stream_1);
292 EXPECT_EQ(stream_label_1, mock_client_->stream_label()); 292 EXPECT_EQ(stream_label_1, mock_client_->stream_label());
293 293
294 pc_handler_->OnAddStream(stream_2); 294 pc_handler_->OnAddStream(stream_2);
295 EXPECT_EQ(stream_label_2, mock_client_->stream_label()); 295 EXPECT_EQ(stream_label_2, mock_client_->stream_label());
296 } 296 }
OLDNEW
« no previous file with comments | « content/renderer/media/peer_connection_handler_base.h ('k') | content/renderer/media/peer_connection_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698