Update SplitString calls in chrome.

chrome/browser/sxs_linux.cc

 // Copyright 2013 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/sxs_linux.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 50 matching lines @@
 
 bool DoAddChannelMarkToUserDataDir(const base::FilePath& user_data_dir) {
   std::string product_channel_name(GetChannelMarkForThisExecutable());
   base::FilePath channels_path(user_data_dir.AppendASCII(kChannelsFileName));
   std::vector<std::string> user_data_dir_channels;
 
   // Note: failure to read the channels file is not fatal. It's possible
   // and legitimate that it doesn't exist, e.g. for new profile or for profile
   // existing before channel marks have been introduced.
   std::string channels_contents;
-  if (base::ReadFileToString(channels_path, &channels_contents))
-    base::SplitString(channels_contents, '\n', &user_data_dir_channels);
+  if (base::ReadFileToString(channels_path, &channels_contents)) {
+    base::SplitString(channels_contents, "\n",
+                      base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  }
 
   if (std::find(user_data_dir_channels.begin(),
                 user_data_dir_channels.end(),
                 product_channel_name) != user_data_dir_channels.end()) {
     // No need to do further disk writes if our channel mark is already present.
     return true;
   }
 
   user_data_dir_channels.push_back(product_channel_name);
   return base::ImportantFileWriter::WriteFileAtomically(
@@ skipping 36 matching lines @@
   }
 
   base::FilePath channels_path(source_path.AppendASCII(kChannelsFileName));
 
   std::string channels_contents;
   if (!base::ReadFileToString(channels_path, &channels_contents)) {
     LOG(WARNING) << "Failed to read channels file.";
     return chrome::RESULT_CODE_SXS_MIGRATION_FAILED;
   }
 
-  std::vector<std::string> user_data_dir_channels;
-  base::SplitString(channels_contents, '\n', &user_data_dir_channels);
+  std::vector<std::string> user_data_dir_channels = base::SplitString(
+      channels_contents, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
   if (user_data_dir_channels.size() != 1) {
     LOG(WARNING) << "User data dir migration is only possible when the profile "
                  << "is only used with a single channel.";
     return chrome::RESULT_CODE_SXS_MIGRATION_FAILED;
   }
 
   if (user_data_dir_channels[0] != GetChannelMarkForThisExecutable()) {
     LOG(WARNING) << "User data dir migration is only possible when the profile "
                  << "is used with the same channel.";
     return chrome::RESULT_CODE_SXS_MIGRATION_FAILED;
   }
 
   base::FilePath target_path =
       base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
           switches::kMigrateDataDirForSxS);
 
   if (!base::Move(source_path, target_path)) {
     LOG(ERROR) << "Failed to rename '" << source_path.value()
                << "' to '" << target_path.value() << "'";
     return chrome::RESULT_CODE_SXS_MIGRATION_FAILED;
   }
 
   return content::RESULT_CODE_NORMAL_EXIT;
 }
 
 }  // namespace sxs_linux