Move string tokenizer to base/strings.

chrome_frame/html_utils.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 "chrome_frame/html_utils.h"
 
 #include <atlbase.h>
 #include <urlmon.h>
 
 #include "base/string_util.h"
-#include "base/string_tokenizer.h"
 #include "base/stringprintf.h"
+#include "base/strings/string_tokenizer.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome_frame/utils.h"
 #include "net/base/net_util.h"
 #include "webkit/user_agent/user_agent_util.h"
 
 const wchar_t kQuotes[] = L"\"'";
 const char kXFrameOptionsHeader[] = "X-Frame-Options";
 const char kXFrameOptionsValueAllowAll[] = "allowall";
 
 HTMLScanner::StringRange::StringRange() {
@@ skipping 52 matching lines @@
     StringRange* attribute_value) const {
   if (NULL == attribute_name || NULL == attribute_value) {
     NOTREACHED();
     return false;
   }
 
   // Use this so we can use the convenience method LowerCaseEqualsASCII()
   // from string_util.h.
   std::string search_name_ascii(WideToASCII(attribute_name));
 
-  WStringTokenizer tokenizer(start_, end_, L" =/");
-  tokenizer.set_options(WStringTokenizer::RETURN_DELIMS);
+  base::WStringTokenizer tokenizer(start_, end_, L" =/");
+  tokenizer.set_options(base::WStringTokenizer::RETURN_DELIMS);
 
   // Set up the quote chars so that we get quoted attribute values as single
   // tokens.
   tokenizer.set_quote_chars(L"\"'");
 
   const bool PARSE_STATE_NAME = true;
   const bool PARSE_STATE_VALUE = false;
   bool parse_state = PARSE_STATE_NAME;
 
   // Used to skip the first token, which is the tag name.
@@ skipping 369 matching lines @@
                                         const std::string& headers) {
   net::HttpUtil::HeadersIterator it(headers.begin(), headers.end(), "\r\n");
   while (it.GetNext()) {
     if (!lstrcmpiA(it.name().c_str(), header.c_str()))
       return std::string(it.values_begin(), it.values_end());
   }
   return std::string();
 }
 
 }  // namespace http_utils