Revert of Update SplitString calls to new form

content/renderer/manifest/manifest_parser.cc

 // Copyright 2014 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 "content/renderer/manifest/manifest_parser.h"
 
 #include "base/json/json_reader.h"
 #include "base/strings/nullable_string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ skipping 30 matching lines @@
 // TODO(mlamouri): this is implemented as a separate function because it should
 // be refactored with the other icon sizes parsing implementations, see
 // http://crbug.com/416477
 std::vector<gfx::Size> ParseIconSizesHTML(const base::string16& sizes_str16) {
   if (!base::IsStringASCII(sizes_str16))
     return std::vector<gfx::Size>();
 
   std::vector<gfx::Size> sizes;
   std::string sizes_str =
       base::StringToLowerASCII(base::UTF16ToUTF8(sizes_str16));
-  std::vector<std::string> sizes_str_list = base::SplitString(
-      sizes_str, base::kWhitespaceASCII, base::KEEP_WHITESPACE,
-      base::SPLIT_WANT_NONEMPTY);
+  std::vector<std::string> sizes_str_list;
+  base::SplitStringAlongWhitespace(sizes_str, &sizes_str_list);
 
   for (size_t i = 0; i < sizes_str_list.size(); ++i) {
     std::string& size_str = sizes_str_list[i];
     if (size_str == "any") {
       sizes.push_back(gfx::Size(0, 0));
       continue;
     }
 
     // It is expected that [0] => width and [1] => height after the split.
-    std::vector<std::string> size_list = base::SplitString(
-        size_str, "x", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);
+    std::vector<std::string> size_list;
+    base::SplitStringDontTrim(size_str, L'x', &size_list);
     if (size_list.size() != 2)
       continue;
     if (!IsValidIconWidthOrHeight(size_list[0]) ||
         !IsValidIconWidthOrHeight(size_list[1])) {
       continue;
     }
 
     int width, height;
     if (!base::StringToInt(size_list[0], &width) ||
         !base::StringToInt(size_list[1], &height)) {
@@ skipping 355 matching lines @@
 
   return static_cast<int64_t>(color);
 }
 
 base::NullableString16 ManifestParser::ParseGCMSenderID(
     const base::DictionaryValue& dictionary)  {
   return ParseString(dictionary, "gcm_sender_id", Trim);
 }
 
 } // namespace content