Update SplitString calls in chrome.

chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.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 "chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.h"
 
 #include <fcntl.h>
 #include <algorithm>
 #include <vector>
 
@@ skipping 1814 matching lines @@
 base::FilePath MTPDeviceDelegateImplLinux::NextUncachedPathComponent(
     const base::FilePath& path,
     const base::FilePath& cached_path) const {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   DCHECK(cached_path.empty() || cached_path.IsParent(path));
 
   base::FilePath uncached_path;
   std::string device_relpath = GetDeviceRelativePath(device_path_, path);
   if (!device_relpath.empty() && device_relpath != kRootPath) {
     uncached_path = device_path_;
-    std::vector<std::string> device_relpath_components;
-    base::SplitString(device_relpath, '/', &device_relpath_components);
+    std::vector<std::string> device_relpath_components = base::SplitString(
+        device_relpath, "/", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     DCHECK(!device_relpath_components.empty());
     bool all_components_cached = true;
     const MTPFileNode* current_node = root_node_.get();
     for (size_t i = 0; i < device_relpath_components.size(); ++i) {
       current_node = current_node->GetChild(device_relpath_components[i]);
       if (!current_node) {
         // With a cache miss, check if it is a genuine failure. If so, pretend
         // the entire |path| is cached, so there is no further attempt to do
         // more caching. The actual operation will then fail.
         all_components_cached =
@@ skipping 25 matching lines @@
 
 
 bool MTPDeviceDelegateImplLinux::CachedPathToId(const base::FilePath& path,
                                                 uint32* id) const {
   DCHECK(id);
 
   std::string device_relpath = GetDeviceRelativePath(device_path_, path);
   if (device_relpath.empty())
     return false;
   std::vector<std::string> device_relpath_components;
-  if (device_relpath != kRootPath)
-    base::SplitString(device_relpath, '/', &device_relpath_components);
+  if (device_relpath != kRootPath) {
+    device_relpath_components = base::SplitString(
+        device_relpath, "/", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  }
   const MTPFileNode* current_node = root_node_.get();
   for (size_t i = 0; i < device_relpath_components.size(); ++i) {
     current_node = current_node->GetChild(device_relpath_components[i]);
     if (!current_node)
       return false;
   }
   *id = current_node->file_id();
   return true;
 }
 
 void MTPDeviceDelegateImplLinux::EvictCachedPathToId(const uint32 id) {
   FileIdToMTPFileNodeMap::iterator it = file_id_to_node_map_.find(id);
   if (it != file_id_to_node_map_.end()) {
     DCHECK(!it->second->HasChildren());
     MTPFileNode* parent = it->second->parent();
     if (parent) {
       const bool ret = parent->DeleteChild(id);
       DCHECK(ret);
     }
   }
 }
 
 void CreateMTPDeviceAsyncDelegate(
     const std::string& device_location,
     const bool read_only,
     const CreateMTPDeviceAsyncDelegateCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   callback.Run(new MTPDeviceDelegateImplLinux(device_location, read_only));
 }