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

Side by Side Diff: media/base/text_renderer_unittest.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef 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 | « media/base/text_renderer.cc ('k') | media/base/time_delta_interpolator.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 <vector> 7 #include <vector>
6 8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
11 #include "base/macros.h"
9 #include "base/memory/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
10 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
11 #include "media/base/audio_decoder_config.h" 14 #include "media/base/audio_decoder_config.h"
12 #include "media/base/decoder_buffer.h" 15 #include "media/base/decoder_buffer.h"
13 #include "media/base/demuxer_stream.h" 16 #include "media/base/demuxer_stream.h"
14 #include "media/base/fake_text_track_stream.h" 17 #include "media/base/fake_text_track_stream.h"
15 #include "media/base/text_renderer.h" 18 #include "media/base/text_renderer.h"
16 #include "media/base/text_track_config.h" 19 #include "media/base/text_track_config.h"
17 #include "media/base/video_decoder_config.h" 20 #include "media/base/video_decoder_config.h"
18 #include "media/filters/webvtt_util.h" 21 #include "media/filters/webvtt_util.h"
(...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after
1200 Play(); 1203 Play();
1201 AbortPendingRead(0); 1204 AbortPendingRead(0);
1202 RemoveTextTrack(0); 1205 RemoveTextTrack(0);
1203 EXPECT_TRUE(text_renderer_->HasTracks()); 1206 EXPECT_TRUE(text_renderer_->HasTracks());
1204 Pause(); 1207 Pause();
1205 EXPECT_CALL(*this, OnPause()); 1208 EXPECT_CALL(*this, OnPause());
1206 SendEosNotification(1); 1209 SendEosNotification(1);
1207 } 1210 }
1208 1211
1209 } // namespace media 1212 } // namespace media
OLDNEW
« no previous file with comments | « media/base/text_renderer.cc ('k') | media/base/time_delta_interpolator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698