Move string tokenizer to base/strings.

webkit/glue/webkit_glue.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 "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
+#include <mlang.h>
 #include <objidl.h>
-#include <mlang.h>
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <sys/utsname.h>
 #endif
 
 #if defined(OS_LINUX)
 #include <malloc.h>
 #endif
 
 #include <limits>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_piece.h"
-#include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
+#include "base/strings/string_tokenizer.h"
 #include "base/sys_info.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request.h"
 #include "skia/ext/platform_canvas.h"
 #if defined(OS_MACOSX)
 #include "skia/ext/skia_utils_mac.h"
 #endif
 #include "third_party/WebKit/Source/Platform/chromium/public/WebData.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h"
@@ skipping 52 matching lines @@
 
 void SetJavaScriptFlags(const std::string& str) {
 #if WEBKIT_USING_V8
   v8::V8::SetFlagsFromString(str.data(), static_cast<int>(str.size()));
 #endif
 }
 
 void EnableWebCoreLogChannels(const std::string& channels) {
   if (channels.empty())
     return;
-  StringTokenizer t(channels, ", ");
+  base::StringTokenizer t(channels, ", ");
   while (t.GetNext()) {
     WebKit::enableLogChannel(t.token().c_str());
   }
 }
 
 string16 DumpDocumentText(WebFrame* web_frame) {
   // We use the document element's text instead of the body text here because
   // not all documents have a body, such as XML documents.
   WebElement document_element = web_frame->document().documentElement();
   if (document_element.isNull())
@@ skipping 255 matching lines @@
 #else
 size_t MemoryUsageKB() {
   scoped_ptr<base::ProcessMetrics> process_metrics(
       base::ProcessMetrics::CreateProcessMetrics(
           base::GetCurrentProcessHandle()));
   return process_metrics->GetPagefileUsage() >> 10;
 }
 #endif
 
 } // namespace webkit_glue