content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc - Issue 1547073003: Switch to standard integer types in content/renderer/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc

Issue 1547073003: Switch to standard integer types in content/renderer/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 12 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

« no previous file with comments | « content/renderer/media/webrtc/webrtc_local_audio_track_adapter_unittest.cc ('k') | content/renderer/media/webrtc/webrtc_video_capturer_adapter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 <stddef.h>

	6

5 #include "base/memory/scoped_ptr.h"	7 #include "base/memory/scoped_ptr.h"

6 #include "base/message_loop/message_loop.h"	8 #include "base/message_loop/message_loop.h"

7 #include "content/child/child_process.h"	9 #include "content/child/child_process.h"

8 #include "content/renderer/media/media_stream.h"	10 #include "content/renderer/media/media_stream.h"

9 #include "content/renderer/media/media_stream_audio_source.h"	11 #include "content/renderer/media/media_stream_audio_source.h"

10 #include "content/renderer/media/media_stream_video_source.h"	12 #include "content/renderer/media/media_stream_video_source.h"

11 #include "content/renderer/media/media_stream_video_track.h"	13 #include "content/renderer/media/media_stream_video_track.h"

12 #include "content/renderer/media/mock_media_constraint_factory.h"	14 #include "content/renderer/media/mock_media_constraint_factory.h"

13 #include "content/renderer/media/mock_media_stream_video_source.h"	15 #include "content/renderer/media/mock_media_stream_video_source.h"

14 #include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory. h"	16 #include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory. h"

(...skipping 149 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
164 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty());	166 EXPECT_TRUE(webrtc_stream()->GetVideoTracks().empty());

165	167

166 native_stream->AddTrack(audio_tracks[0]);	168 native_stream->AddTrack(audio_tracks[0]);

167 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size());	169 EXPECT_EQ(1u, webrtc_stream()->GetAudioTracks().size());

168	170

169 native_stream->AddTrack(video_tracks[0]);	171 native_stream->AddTrack(video_tracks[0]);

170 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size());	172 EXPECT_EQ(1u, webrtc_stream()->GetVideoTracks().size());

171 }	173 }

172	174

173 } // namespace content	175 } // namespace content

OLD	NEW