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

Unified Diff: media/filters/frame_processor_unittest.cc

Issue 1278973003: Revert of Update SplitString calls to new form (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | media/filters/source_buffer_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/frame_processor_unittest.cc
diff --git a/media/filters/frame_processor_unittest.cc b/media/filters/frame_processor_unittest.cc
index 3a7f01cd848fffa49c50c9dd4c6761a0adc393a5..e0bd663b91ccfa9c8d0814c2e79665830f5465c5 100644
--- a/media/filters/frame_processor_unittest.cc
+++ b/media/filters/frame_processor_unittest.cc
@@ -99,8 +99,8 @@
BufferQueue StringToBufferQueue(const std::string& buffers_to_append,
const TrackId track_id,
const DemuxerStream::Type type) {
- std::vector<std::string> timestamps = base::SplitString(
- buffers_to_append, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+ std::vector<std::string> timestamps;
+ base::SplitString(buffers_to_append, ' ', &timestamps);
BufferQueue buffers;
for (size_t i = 0; i < timestamps.size(); i++) {
@@ -112,8 +112,8 @@
}
// Use custom decode timestamp if included.
- std::vector<std::string> buffer_timestamps = base::SplitString(
- timestamps[i], "|", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+ std::vector<std::string> buffer_timestamps;
+ base::SplitString(timestamps[i], '|', &buffer_timestamps);
if (buffer_timestamps.size() == 1)
buffer_timestamps.push_back(buffer_timestamps[0]);
CHECK_EQ(2u, buffer_timestamps.size());
@@ -193,8 +193,8 @@
// as timestamp_in_ms.
void CheckReadsThenReadStalls(ChunkDemuxerStream* stream,
const std::string& expected) {
- std::vector<std::string> timestamps = base::SplitString(
- expected, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+ std::vector<std::string> timestamps;
+ base::SplitString(expected, ' ', &timestamps);
std::stringstream ss;
for (size_t i = 0; i < timestamps.size(); ++i) {
int loop_count = 0;
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | media/filters/source_buffer_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698