Replace some Tokenize calls with SplitString.

chrome/browser/chromeos/input_method/input_method_util.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/chromeos/input_method/input_method_util.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <utility>
@@ skipping 664 matching lines @@
     }
     ids.swap(new_ids);
   }
   return rewritten;
 }
 
 void InputMethodUtil::UpdateHardwareLayoutCache() {
   DCHECK(thread_checker_.CalledOnValidThread());
   hardware_layouts_.clear();
   hardware_login_layouts_.clear();
-  if (cached_hardware_layouts_.empty())
-    Tokenize(delegate_->GetHardwareKeyboardLayouts(), ",",
-             &cached_hardware_layouts_);
+  if (cached_hardware_layouts_.empty()) {
+    cached_hardware_layouts_ =
+        base::SplitString(delegate_->GetHardwareKeyboardLayouts(), ",",
+                          base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
+  }
   hardware_layouts_ = cached_hardware_layouts_;
   MigrateInputMethods(&hardware_layouts_);
 
   for (size_t i = 0; i < hardware_layouts_.size(); ++i) {
     if (IsLoginKeyboard(hardware_layouts_[i]))
       hardware_login_layouts_.push_back(hardware_layouts_[i]);
   }
 
   if (hardware_login_layouts_.empty()) {
     // This is totally fine if |hardware_layouts_| is empty. The hardware
@@ skipping 88 matching lines @@
       "US",
       layouts,
       languages,
       true,  // login keyboard.
       GURL(),  // options page, not available.
       GURL()); // input view page, not available.
 }
 
 }  // namespace input_method
 }  // namespace chromeos