Revert of Update SplitString calls to new form

ui/gfx/font_fallback_win.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_fallback_win.h"
 
 #include <usp10.h>
 
 #include <map>
 
@@ skipping 162 matching lines @@
   return 1;
 }
 
 }  // namespace
 
 namespace internal {
 
 void ParseFontLinkEntry(const std::string& entry,
                         std::string* filename,
                         std::string* font_name) {
-  std::vector<std::string> parts = base::SplitString(
-      entry, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  std::vector<std::string> parts;
+  base::SplitString(entry, ',', &parts);
   filename->clear();
   font_name->clear();
   if (parts.size() > 0)
     *filename = parts[0];
   // The second entry may be the font name or the first scaling factor, if the
   // entry does not contain a font name. If it contains only digits, assume it
   // is a scaling factor.
   if (parts.size() > 1 && !ContainsOnlyDigits(parts[1]))
     *font_name = parts[1];
 }
 
 void ParseFontFamilyString(const std::string& family,
                            std::vector<std::string>* font_names) {
   // The entry is comma separated, having the font filename as the first value
   // followed optionally by the font family name and a pair of integer scaling
   // factors.
   // TODO(asvitkine): Should we support these scaling factors?
-  *font_names = base::SplitString(
-      family, "&", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  base::SplitString(family, '&', font_names);
   if (!font_names->empty()) {
     const size_t index = font_names->back().find('(');
     if (index != std::string::npos) {
       font_names->back().resize(index);
       base::TrimWhitespace(font_names->back(), base::TRIM_TRAILING,
                            &font_names->back());
     }
   }
 }
 
@@ skipping 108 matching lines @@
                      font.GetFontSize());
       found_fallback = true;
     }
   }
   DeleteEnhMetaFile(meta_file);
 
   return found_fallback;
 }
 
 }  // namespace gfx