Move string tokenizer to base/strings.

chrome_frame/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/utils.h"
 
 #include <atlsafe.h>
 #include <atlsecurity.h>
 #include <htiframe.h>
 #include <mshtml.h>
 #include <shlobj.h>
 
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.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/threading/thread_local.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_bstr.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_variant.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/chrome_frame_distribution.h"
@@ skipping 1361 matching lines @@
   return ParseAttachExternalTabUrl();
 }
 
 bool ChromeFrameUrl::ParseAttachExternalTabUrl() {
   std::string query = parsed_url_.query();
   if (!StartsWithASCII(query, kAttachExternalTabPrefix, false)) {
     return parsed_url_.is_valid();
   }
 
   attach_to_external_tab_ = true;
-  StringTokenizer tokenizer(query, "&");
+  base::StringTokenizer tokenizer(query, "&");
   // Skip over kChromeAttachExternalTabPrefix
   tokenizer.GetNext();
   // Read the following items in order.
   // 1. cookie
   // 2. disposition
   // 3. dimension.x
   // 4. dimension.y
   // 5. dimension.width
   // 6. dimension.height.
   if (tokenizer.GetNext()) {
@@ skipping 256 matching lines @@
   wininet_connection_count_updated = true;
   return true;
 }
 
 void GetChromeFrameProfilePath(const string16& profile_name,
                                FilePath* profile_path) {
   chrome::GetChromeFrameUserDataDirectory(profile_path);
   *profile_path = profile_path->Append(profile_name);
   DVLOG(1) << __FUNCTION__ << ": " << profile_path->value();
 }