Move string tokenizer to base/strings.

chrome/browser/shell_integration_linux.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/browser/shell_integration_linux.h"
 
 #include <fcntl.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include <string>
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/process_util.h"
 #include "base/string_number_conversions.h"
-#include "base/string_tokenizer.h"
+#include "base/strings/string_tokenizer.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/codec/png_codec.h"
 
@@ skipping 407 matching lines @@
 
   std::string xdg_data_home;
   if (env->GetVar("XDG_DATA_HOME", &xdg_data_home) &&
       !xdg_data_home.empty()) {
     search_paths.push_back(FilePath(xdg_data_home));
   }
 
   std::string xdg_data_dirs;
   if (env->GetVar("XDG_DATA_DIRS", &xdg_data_dirs) &&
       !xdg_data_dirs.empty()) {
-    StringTokenizer tokenizer(xdg_data_dirs, ":");
+    base::StringTokenizer tokenizer(xdg_data_dirs, ":");
     while (tokenizer.GetNext()) {
       FilePath data_dir(tokenizer.token());
       search_paths.push_back(data_dir);
       search_paths.push_back(data_dir.Append("applications"));
     }
   }
 
   // Add some fallback paths for systems which don't have XDG_DATA_DIRS or have
   // it incomplete.
   search_paths.push_back(FilePath("/usr/share/applications"));
@@ skipping 108 matching lines @@
     final_title = url.spec();
   }
   g_key_file_set_string(key_file, kDesktopEntry, "Name", final_title.c_str());
 
   // Set the "Exec" key.
   char* exec_c_string = g_key_file_get_string(key_file, kDesktopEntry, "Exec",
                                               NULL);
   if (exec_c_string) {
     std::string exec_string(exec_c_string);
     g_free(exec_c_string);
-    StringTokenizer exec_tokenizer(exec_string, " ");
+    base::StringTokenizer exec_tokenizer(exec_string, " ");
 
     std::string final_path;
     while (exec_tokenizer.GetNext() && exec_tokenizer.token() != "%U") {
       if (!final_path.empty())
         final_path += " ";
       final_path += exec_tokenizer.token();
     }
     CommandLine cmd_line(CommandLine::NO_PROGRAM);
     cmd_line = ShellIntegration::CommandLineArgsForLauncher(
         url, extension_id, profile_path);
@@ skipping 88 matching lines @@
 
   FilePath shortcut_filename = GetExtensionShortcutFilename(
       profile_path, extension_id);
   DCHECK(!shortcut_filename.empty());
 
   DeleteShortcutOnDesktop(shortcut_filename);
   DeleteShortcutInApplicationsMenu(shortcut_filename);
 }
 
 }  // namespace ShellIntegrationLinux