Revert of Update SplitString calls to new form

ui/gfx/render_text_unittest.cc

Index: ui/gfx/render_text_unittest.cc
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index bad1262cc52c6995fe2eba8e5a5d915b586c8b96..849f5303b6b5a5c55dc0d241ff5aceffd0f782e3 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -2313,9 +2313,8 @@
       EXPECT_EQ(0, render_text.GetAlignmentOffset(0).x());
       EXPECT_EQ(0, render_text.GetAlignmentOffset(1).x());
     } else {
-      std::vector<base::string16> lines = base::SplitString(
-          base::WideToUTF16(kTestStrings[i].text),
-          base::string16(1, '\n'), base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+      std::vector<base::string16> lines;
+      base::SplitString(base::WideToUTF16(kTestStrings[i].text), '\n', &lines);
       ASSERT_EQ(2u, lines.size());
       int difference = (lines[0].length() - lines[1].length()) * kGlyphSize;
       EXPECT_EQ(render_text.GetAlignmentOffset(0).x() + difference,