diff options
| author | brettw <brettw@chromium.org> | 2015-07-06 16:53:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-06 23:54:14 +0000 |
| commit | 8cc24ae2b51f9db4a16011eb1ab7dbfca0eb6d54 (patch) | |
| tree | 876a4d239206096f180630fc3657a1aa58a74630 /media/test/pipeline_integration_test.cc | |
| parent | f359166a9a5dc5c4ea15b0b718b643fc06d3c870 (diff) | |
| download | chromium_src-8cc24ae2b51f9db4a16011eb1ab7dbfca0eb6d54.zip chromium_src-8cc24ae2b51f9db4a16011eb1ab7dbfca0eb6d54.tar.gz chromium_src-8cc24ae2b51f9db4a16011eb1ab7dbfca0eb6d54.tar.bz2 | |
Replace remaining Tokenize calls to SplitString
SplitString is now more general and does the job of Tokenize with specific parameters.
The biggest change is in time_util.cc where the old return pattern better matched how the code was structured. With the new style the conditionals are more nested.
Some simple cases were changed to StringPieces when copies were not required.
BUG=506920, 506255
Review URL: https://codereview.chromium.org/1219263002
Cr-Commit-Position: refs/heads/master@{#337520}
Diffstat (limited to 'media/test/pipeline_integration_test.cc')
| -rw-r--r-- | media/test/pipeline_integration_test.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc index 71d0f3c..766afae 100644 --- a/media/test/pipeline_integration_test.cc +++ b/media/test/pipeline_integration_test.cc @@ -6,6 +6,7 @@ #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" +#include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "build/build_config.h" #include "media/base/cdm_callback_promise.h" @@ -566,7 +567,8 @@ class MockMediaSource { std::string codecs_param = mimetype_.substr(codecs_param_start, codecs_param_end - codecs_param_start); - Tokenize(codecs_param, ",", &codecs); + codecs = base::SplitString( + codecs_param, ",", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY); } CHECK_EQ(chunk_demuxer_->AddId(kSourceId, type, codecs), ChunkDemuxer::kOk); |