Update //base to chromium 9659b08ea5a34f889dc4166217f438095ddc10d2

gpu/command_buffer/service/feature_info.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 "gpu/command_buffer/service/feature_info.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 33 matching lines @@
   StringSet(const std::string& str) {
     Init(str);
   }
 
   void Init(const char* s) {
     std::string str(s ? s : "");
     Init(str);
   }
 
   void Init(const std::string& str) {
-    std::vector<std::string> tokens;
-    Tokenize(str, " ", &tokens);
+    std::vector<std::string> tokens = base::SplitString(
+        str, " ", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
     string_set_.insert(tokens.begin(), tokens.end());
   }
 
   bool Contains(const char* s) {
     return string_set_.find(s) != string_set_.end();
   }
 
   bool Contains(const std::string& s) {
     return string_set_.find(s) != string_set_.end();
   }
@@ skipping 1087 matching lines @@
   if (pos == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 FeatureInfo::~FeatureInfo() {
 }
 
 }  // namespace gles2
 }  // namespace gpu