summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-02 00:21:39 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-02 00:21:39 +0000
commitf4ebe772e28369908c70e2e79f052d043c6f8eeb (patch)
tree8abbccc21509118c1228bc116a6f0f250759a801 /gpu
parent11e45efce9cc17e1b2b76e6a636cc63b2c021324 (diff)
downloadchromium_src-f4ebe772e28369908c70e2e79f052d043c6f8eeb.zip
chromium_src-f4ebe772e28369908c70e2e79f052d043c6f8eeb.tar.gz
chromium_src-f4ebe772e28369908c70e2e79f052d043c6f8eeb.tar.bz2
Move string tokenizer to base/strings.
BUG= Review URL: https://codereview.chromium.org/12087091 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/test_helper.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/gpu/command_buffer/service/test_helper.cc b/gpu/command_buffer/service/test_helper.cc
index fadd17b..13cc469 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;