New new versions of Starts/EndsWith and SplitString in net

net/tools/gdig/gdig.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 <stdio.h>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 115 matching lines @@
             file_path.MaybeAsASCII().c_str());
     return false;
   }
 
   // Strip out \r characters for Windows files. This isn't as efficient as a
   // smarter line splitter, but this particular use does not need to target
   // efficiency.
   std::string replay_log_contents;
   base::RemoveChars(original_replay_log_contents, "\r", &replay_log_contents);
 
-  std::vector<std::string> lines;
-  base::SplitString(replay_log_contents, '\n', &lines);
+  std::vector<std::string> lines = base::SplitString(
+      replay_log_contents, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   base::TimeDelta previous_delta;
   bool bad_parse = false;
   for (unsigned i = 0; i < lines.size(); ++i) {
     if (lines[i].empty())
       continue;
-    std::vector<std::string> time_and_name;
-    base::SplitString(lines[i], ' ', &time_and_name);
+    std::vector<std::string> time_and_name = base::SplitString(
+        lines[i], " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     if (time_and_name.size() != 2) {
       fprintf(
           stderr,
           "[%s %u] replay log should have format 'timestamp domain_name\\n'\n",
           file_path.MaybeAsASCII().c_str(),
           i + 1);
       bad_parse = true;
       continue;
     }
 
@@ skipping 357 matching lines @@
 }
 
 }  // empty namespace
 
 }  // namespace net
 
 int main(int argc, const char* argv[]) {
   net::GDig dig;
   return dig.Main(argc, argv);
 }