New new versions of Starts/EndsWith and SplitString in net

net/tools/flip_server/flip_in_mem_edsm_server.cc

 // Copyright (c) 2011 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 <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 
@@ skipping 268 matching lines @@
 
   // Proxy Acceptors
   while (true) {
     i += 1;
     std::stringstream name;
     name << "proxy" << i;
     if (!cl.HasSwitch(name.str())) {
       break;
     }
     std::string value = cl.GetSwitchValueASCII(name.str());
-    std::vector<std::string> valueArgs;
-    base::SplitString(value, ',', &valueArgs);
+    std::vector<std::string> valueArgs = base::SplitString(
+        value, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     CHECK_EQ((unsigned int)9, valueArgs.size());
     int spdy_only = atoi(valueArgs[8].c_str());
     // If wait_for_iface is enabled, then this call will block
     // indefinitely until the interface is raised.
     g_proxy_config.AddAcceptor(net::FLIP_HANDLER_PROXY,
                                valueArgs[0],
                                valueArgs[1],
                                valueArgs[2],
                                valueArgs[3],
                                valueArgs[4],
                                valueArgs[5],
                                valueArgs[6],
                                valueArgs[7],
                                spdy_only,
                                FLAGS_accept_backlog_size,
                                FLAGS_disable_nagle,
                                FLAGS_accepts_per_wake,
                                FLAGS_reuseport,
                                wait_for_iface,
                                NULL);
   }
 
   // Spdy Server Acceptor
   net::MemoryCache spdy_memory_cache;
   if (cl.HasSwitch("spdy-server")) {
     spdy_memory_cache.AddFiles();
     std::string value = cl.GetSwitchValueASCII("spdy-server");
-    std::vector<std::string> valueArgs;
-    base::SplitString(value, ',', &valueArgs);
+    std::vector<std::string> valueArgs = base::SplitString(
+        value, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     while (valueArgs.size() < 4)
       valueArgs.push_back(std::string());
     g_proxy_config.AddAcceptor(net::FLIP_HANDLER_SPDY_SERVER,
                                valueArgs[0],
                                valueArgs[1],
                                valueArgs[2],
                                valueArgs[3],
                                std::string(),
                                std::string(),
                                std::string(),
                                std::string(),
                                0,
                                FLAGS_accept_backlog_size,
                                FLAGS_disable_nagle,
                                FLAGS_accepts_per_wake,
                                FLAGS_reuseport,
                                wait_for_iface,
                                &spdy_memory_cache);
   }
 
   // Spdy Server Acceptor
   net::MemoryCache http_memory_cache;
   if (cl.HasSwitch("http-server")) {
     http_memory_cache.AddFiles();
     std::string value = cl.GetSwitchValueASCII("http-server");
-    std::vector<std::string> valueArgs;
-    base::SplitString(value, ',', &valueArgs);
+    std::vector<std::string> valueArgs = base::SplitString(
+        value, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     while (valueArgs.size() < 4)
       valueArgs.push_back(std::string());
     g_proxy_config.AddAcceptor(net::FLIP_HANDLER_HTTP_SERVER,
                                valueArgs[0],
                                valueArgs[1],
                                valueArgs[2],
                                valueArgs[3],
                                std::string(),
                                std::string(),
                                std::string(),
@@ skipping 43 matching lines @@
       }
       break;
     }
     usleep(1000 * 10);  // 10 ms
   }
 
   unlink(PIDFILE);
   close(pidfile_fd);
   return 0;
 }