Update SplitString calls in chrome.

chrome/browser/ui/elide_url.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 "chrome/browser/ui/elide_url.h"
 
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/escape.h"
@@ skipping 138 matching lines @@
   base::string16 url_host;
   base::string16 url_domain;
   base::string16 url_subdomain;
   SplitHost(url, &url_host, &url_domain, &url_subdomain);
 
   // If this is a file type, the path is now defined as everything after ":".
   // For example, "C:/aa/aa/bb", the path is "/aa/bb/cc". Interesting, the
   // domain is now C: - this is a nice hack for eliding to work pleasantly.
   if (url.SchemeIsFile()) {
     // Split the path string using ":"
-    std::vector<base::string16> file_path_split;
-    base::SplitString(url_path, ':', &file_path_split);
+    const base::string16 kColon(1, ':');
+    std::vector<base::string16> file_path_split = base::SplitString(
+        url_path, kColon, base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     if (file_path_split.size() > 1) {  // File is of type "file:///C:/.."
       url_host.clear();
       url_domain.clear();
       url_subdomain.clear();
 
-      const base::string16 kColon = UTF8ToUTF16(":");
       url_host = url_domain = file_path_split.at(0).substr(1) + kColon;
       url_path_query_etc = url_path = file_path_split.at(1);
     }
   }
 
   // Second Pass - remove scheme - the rest fits.
   const float pixel_width_url_host = GetStringWidthF(url_host, font_list);
   const float pixel_width_url_path = GetStringWidthF(url_path_query_etc,
                                                      font_list);
   if (available_pixel_width >=
@@ skipping 17 matching lines @@
     url_query = UTF8ToUTF16("?") + url_string.substr(parsed.query.begin);
     if (available_pixel_width >=
         (pixel_width_url_subdomain + pixel_width_url_domain +
          pixel_width_url_path - GetStringWidthF(url_query, font_list))) {
       return ElideText(url_subdomain + url_domain + url_path_query_etc,
                        font_list, available_pixel_width, gfx::ELIDE_TAIL);
     }
   }
 
   // Parse url_path using '/'.
-  std::vector<base::string16> url_path_elements;
-  base::SplitString(url_path, kForwardSlash, &url_path_elements);
+  std::vector<base::string16> url_path_elements = base::SplitString(
+      url_path, base::string16(1, kForwardSlash),
+      base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
   // Get filename - note that for a path ending with /
   // such as www.google.com/intl/ads/, the file name is ads/.
   base::string16 url_filename(
       url_path_elements.empty() ? base::string16() : url_path_elements.back());
   size_t url_path_number_of_elements = url_path_elements.size();
   if (url_filename.empty() && (url_path_number_of_elements > 1)) {
     // Path ends with a '/'.
     --url_path_number_of_elements;
     url_filename = url_path_elements[url_path_number_of_elements - 1] +
@@ skipping 121 matching lines @@
   result += base::UTF8ToUTF16(host);
 
   const int port = origin.IntPort();
   const int default_port = url::DefaultPortForScheme(origin.scheme().c_str(),
                                                      origin.scheme().length());
   if (port != url::PORT_UNSPECIFIED && port != default_port)
     result += colon + base::UTF8ToUTF16(origin.port());
 
   return result;
 }