Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

base/test/test_reg_util_win.cc

 // Copyright (c) 2011 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 "base/test/test_reg_util_win.h"
 
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace registry_util {
 
 namespace {
 
 const wchar_t kTimestampDelimiter[] = L"$";
 const wchar_t kTempTestKeyPath[] = L"Software\\Chromium\\TempTestKeys";
 
 void DeleteStaleTestKeys(const base::Time& now,
                          const base::string16& test_key_root) {
   base::win::RegKey test_root_key;
   if (test_root_key.Open(HKEY_CURRENT_USER,
                          test_key_root.c_str(),
                          KEY_ALL_ACCESS) != ERROR_SUCCESS) {
     // This will occur on first-run, but is harmless.
     return;
   }
 
   base::win::RegistryKeyIterator iterator_test_root_key(HKEY_CURRENT_USER,
                                                         test_key_root.c_str());
   for (; iterator_test_root_key.Valid(); ++iterator_test_root_key) {
     base::string16 key_name = iterator_test_root_key.Name();
-    std::vector<base::string16> tokens;
-    if (!Tokenize(key_name, base::string16(kTimestampDelimiter), &tokens))
+    std::vector<base::string16> tokens =
+        base::SplitString(key_name, kTimestampDelimiter, base::KEEP_WHITESPACE,
+                          base::SPLIT_WANT_NONEMPTY);
+    if (tokens.empty())
       continue;
     int64 key_name_as_number = 0;
 
     if (!base::StringToInt64(tokens[0], &key_name_as_number)) {
       test_root_key.DeleteKey(key_name.c_str());
       continue;
     }
 
     base::Time key_time = base::Time::FromInternalValue(key_name_as_number);
     base::TimeDelta age = now - key_time;
@@ skipping 49 matching lines @@
   base::string16 key_path = GenerateTempKeyPath(test_key_root_, timestamp_);
   overrides_.push_back(new ScopedRegistryKeyOverride(override, key_path));
 }
 
 base::string16 GenerateTempKeyPath() {
   return GenerateTempKeyPath(base::string16(kTempTestKeyPath),
                              base::Time::Now());
 }
 
 }  // namespace registry_util