Revert of Update SplitString calls to new form

ui/gfx/font_list.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/font_list.h"
 
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 16 matching lines @@
 
 // static
 bool FontList::ParseDescription(const std::string& description,
                                 std::vector<std::string>* families_out,
                                 int* style_out,
                                 int* size_pixels_out) {
   DCHECK(families_out);
   DCHECK(style_out);
   DCHECK(size_pixels_out);
 
-  *families_out = base::SplitString(
-      description, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  base::SplitString(description, ',', families_out);
   if (families_out->empty())
     return false;
   for (auto& family : *families_out)
     base::TrimWhitespaceASCII(family, base::TRIM_ALL, &family);
 
   // The last item is "[STYLE1] [STYLE2] [...] SIZE".
-  std::vector<std::string> styles = base::SplitString(
-      families_out->back(), base::kWhitespaceASCII,
-      base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
+  std::vector<std::string> styles;
+  base::SplitStringAlongWhitespace(families_out->back(), &styles);
   families_out->pop_back();
   if (styles.empty())
     return false;
 
   // The size takes the form "<INT>px".
   std::string size_string = styles.back();
   styles.pop_back();
   if (!base::EndsWith(size_string, "px", base::CompareCase::SENSITIVE))
     return false;
   size_string.resize(size_string.size() - 2);
@@ skipping 129 matching lines @@
         g_default_font_description.Get().empty() ?
             new FontListImpl(Font()) :
             new FontListImpl(g_default_font_description.Get());
     g_default_impl_initialized = true;
   }
 
   return g_default_impl.Get();
 }
 
 }  // namespace gfx