Update SplitString calls in chrome.

chrome/common/extensions/command.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/common/extensions/command.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 56 matching lines @@
       platform_key != values::kKeybindingPlatformChromeOs &&
       platform_key != values::kKeybindingPlatformLinux &&
       platform_key != values::kKeybindingPlatformDefault) {
     *error = ErrorUtils::FormatErrorMessageUTF16(
         errors::kInvalidKeyBindingUnknownPlatform,
         base::IntToString(index),
         platform_key);
     return ui::Accelerator();
   }
 
-  std::vector<std::string> tokens;
-  base::SplitString(accelerator, '+', &tokens);
+  std::vector<std::string> tokens = base::SplitString(
+      accelerator, "+", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   if (tokens.size() == 0 ||
       (tokens.size() == 1 && DoesRequireModifier(accelerator)) ||
       tokens.size() > kMaxTokenSize) {
     *error = ErrorUtils::FormatErrorMessageUTF16(
         errors::kInvalidKeyBinding,
         base::IntToString(index),
         platform_key,
         accelerator);
     return ui::Accelerator();
   }
@@ skipping 168 matching lines @@
     normalize = true;
   } else if (platform == values::kKeybindingPlatformDefault) {
 #if defined(OS_MACOSX)
     normalize = true;
 #endif
   }
 
   if (!normalize)
     return suggestion;
 
-  std::vector<std::string> tokens;
-  base::SplitString(suggestion, '+', &tokens);
+  std::vector<std::string> tokens = base::SplitString(
+      suggestion, "+", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   for (size_t i = 0; i < tokens.size(); i++) {
     if (tokens[i] == values::kKeyCtrl)
       tokens[i] = values::kKeyCommand;
     else if (tokens[i] == values::kKeyMacCtrl)
       tokens[i] = values::kKeyCtrl;
   }
   return base::JoinString(tokens, "+");
 }
 
 }  // namespace
@@ skipping 267 matching lines @@
       accelerator_ = accelerator;
       command_name_ = command_name;
       description_ = description;
       global_ = global;
     }
   }
   return true;
 }
 
 }  // namespace extensions