Move string tokenizer to base/strings.

gpu/command_buffer/service/test_helper.cc

Index: gpu/command_buffer/service/test_helper.cc
diff --git a/gpu/command_buffer/service/test_helper.cc b/gpu/command_buffer/service/test_helper.cc
index fadd17bc56444f567a2c27cfa0e46fabb423c672..13cc4698d00a7316a6bc376440d8adf07aece353 100644
--- a/gpu/command_buffer/service/test_helper.cc
+++ b/gpu/command_buffer/service/test_helper.cc
@@ -4,11 +4,11 @@
 
 #include "gpu/command_buffer/service/test_helper.h"
 
-#include <string>
 #include <algorithm>
+#include <string>
 
 #include "base/string_number_conversions.h"
-#include "base/string_tokenizer.h"
+#include "base/strings/string_tokenizer.h"
 #include "gpu/command_buffer/common/types.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/program_manager.h"
@@ -143,7 +143,7 @@ void TestHelper::SetupTextureManagerInitExpectations(
 
   bool ext_image_external = false;
   bool arb_texture_rectangle = false;
-  CStringTokenizer t(extensions, extensions + strlen(extensions), " ");
+  base::CStringTokenizer t(extensions, extensions + strlen(extensions), " ");
   while (t.GetNext()) {
     if (t.token() == "GL_OES_EGL_image_external") {
       ext_image_external = true;
@@ -196,7 +196,7 @@ void TestHelper::SetupTextureManagerDestructionExpectations(
 
   bool ext_image_external = false;
   bool arb_texture_rectangle = false;
-  CStringTokenizer t(extensions, extensions + strlen(extensions), " ");
+  base::CStringTokenizer t(extensions, extensions + strlen(extensions), " ");
   while (t.GetNext()) {
     if (t.token() == "GL_OES_EGL_image_external") {
       ext_image_external = true;