Index: content/common/gpu/media/video_encode_accelerator_unittest.cc |
diff --git a/content/common/gpu/media/video_encode_accelerator_unittest.cc b/content/common/gpu/media/video_encode_accelerator_unittest.cc |
index 0e1e863d6d05d5812c6faa3aabd8551cc75c276c..9c05514c3dd779e38147b385d6b14688e54c8036 100644 |
--- a/content/common/gpu/media/video_encode_accelerator_unittest.cc |
+++ b/content/common/gpu/media/video_encode_accelerator_unittest.cc |
@@ -324,14 +324,16 @@ static void CreateAlignedInputStreamFile(const gfx::Size& coded_size, |
static void ParseAndReadTestStreamData(const base::FilePath::StringType& data, |
ScopedVector<TestStream>* test_streams) { |
// Split the string to individual test stream data. |
- std::vector<base::FilePath::StringType> test_streams_data; |
- base::SplitString(data, ';', &test_streams_data); |
+ std::vector<base::FilePath::StringType> test_streams_data = base::SplitString( |
+ data, base::FilePath::StringType(1, ';'), |
+ base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); |
CHECK_GE(test_streams_data.size(), 1U) << data; |
// Parse each test stream data and read the input file. |
for (size_t index = 0; index < test_streams_data.size(); ++index) { |
- std::vector<base::FilePath::StringType> fields; |
- base::SplitString(test_streams_data[index], ':', &fields); |
+ std::vector<base::FilePath::StringType> fields = base::SplitString( |
+ test_streams_data[index], base::FilePath::StringType(1, ':'), |
+ base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); |
CHECK_GE(fields.size(), 4U) << data; |
CHECK_LE(fields.size(), 9U) << data; |
TestStream* test_stream = new TestStream(); |