Move string tokenizer to base/strings.

content/gpu/gpu_info_collector_linux.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 "content/gpu/gpu_info_collector.h"
 
 #include <X11/Xlib.h>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string_piece.h"
 #include "base/string_split.h"
-#include "base/string_tokenizer.h"
 #include "base/string_util.h"
+#include "base/strings/string_tokenizer.h"
 #include "library_loaders/libpci.h"
 #include "third_party/libXNVCtrl/NVCtrl.h"
 #include "third_party/libXNVCtrl/NVCtrlLib.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gl_switches.h"
 
 namespace {
@@ skipping 11 matching lines @@
 // Return empty string on failing.
 std::string CollectDriverVersionATI() {
   const FilePath::CharType kATIFileName[] =
       FILE_PATH_LITERAL("/etc/ati/amdpcsdb.default");
   FilePath ati_file_path(kATIFileName);
   if (!file_util::PathExists(ati_file_path))
     return std::string();
   std::string contents;
   if (!file_util::ReadFileToString(ati_file_path, &contents))
     return std::string();
-  StringTokenizer t(contents, "\r\n");
+  base::StringTokenizer t(contents, "\r\n");
   while (t.GetNext()) {
     std::string line = t.token();
     if (StartsWithASCII(line, "ReleaseVersion=", true)) {
       size_t begin = line.find_first_of("0123456789");
       if (begin != std::string::npos) {
         size_t end = line.find_first_not_of("0123456789.", begin);
         if (end == std::string::npos)
           return line.substr(begin);
         else
           return line.substr(begin, end - begin);
@@ skipping 217 matching lines @@
   gpu_info->driver_version = driver_version;
   return true;
 }
 
 void MergeGPUInfo(content::GPUInfo* basic_gpu_info,
                   const content::GPUInfo& context_gpu_info) {
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 }
 
 }  // namespace gpu_info_collector