New new versions of Starts/EndsWith and SplitString in net

net/base/host_mapping_rules.cc

 // Copyright (c) 2010 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 "net/base/host_mapping_rules.h"
 
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
@@ skipping 48 matching lines @@
     host_port->set_host(rule.replacement_hostname);
     if (rule.replacement_port != -1)
       host_port->set_port(static_cast<uint16_t>(rule.replacement_port));
     return true;
   }
 
   return false;
 }
 
 bool HostMappingRules::AddRuleFromString(const std::string& rule_string) {
-  std::string trimmed;
-  base::TrimWhitespaceASCII(rule_string, base::TRIM_ALL, &trimmed);
-  std::vector<std::string> parts;
-  base::SplitString(trimmed, ' ', &parts);
+  std::vector<std::string> parts =
+      base::SplitString(base::TrimWhitespaceASCII(rule_string, base::TRIM_ALL),
+                        " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
   // Test for EXCLUSION rule.
   if (parts.size() == 2 && base::LowerCaseEqualsASCII(parts[0], "exclude")) {
     ExclusionRule rule;
     rule.hostname_pattern = base::StringToLowerASCII(parts[1]);
     exclusion_rules_.push_back(rule);
     return true;
   }
 
   // Test for MAP rule.
@@ skipping 18 matching lines @@
   map_rules_.clear();
 
   base::StringTokenizer rules(rules_string, ",");
   while (rules.GetNext()) {
     bool ok = AddRuleFromString(rules.token());
     LOG_IF(ERROR, !ok) << "Failed parsing rule: " << rules.token();
   }
 }
 
 }  // namespace net