| Index: chrome/browser/sxs_linux.cc
|
| diff --git a/chrome/browser/sxs_linux.cc b/chrome/browser/sxs_linux.cc
|
| index 299069366b2ae3bd37e6e632675644ff14a62bf1..5ab67ae6302442bdc4dcd28b04e6de65c538b4f7 100644
|
| --- a/chrome/browser/sxs_linux.cc
|
| +++ b/chrome/browser/sxs_linux.cc
|
| @@ -68,8 +68,10 @@ bool DoAddChannelMarkToUserDataDir(const base::FilePath& user_data_dir) {
|
| // 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(),
|
| @@ -126,8 +128,8 @@ int MigrateUserDataDir() {
|
| 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 "
|
|
|