Replace string16 with base::string16 in src/webkit

webkit/plugins/npapi/plugin_list_win.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/plugins/npapi/plugin_list.h"
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 52 matching lines @@
 // Path is an output parameter to receive the path.
 void GetExeDirectory(std::set<base::FilePath>* plugin_dirs) {
   base::FilePath exe_path;
   if (!PathService::Get(base::DIR_EXE, &exe_path))
     return;
   plugin_dirs->insert(AppendPluginsDir(exe_path));
 }
 
 // Gets the installed path for a registered app.
 bool GetInstalledPath(const char16* app, base::FilePath* out) {
-  string16 reg_path(kRegistryApps);
+  base::string16 reg_path(kRegistryApps);
   reg_path.append(L"\\");
   reg_path.append(app);
 
   base::win::RegKey hkcu_key(HKEY_CURRENT_USER, reg_path.c_str(), KEY_READ);
-  string16 path;
+  base::string16 path;
   // As of Win7 AppPaths can also be registered in HKCU: http://goo.gl/UgFOf.
   if (base::win::GetVersion() >= base::win::VERSION_WIN7 &&
       hkcu_key.ReadValue(kRegistryPath, &path) == ERROR_SUCCESS) {
     *out = base::FilePath(path);
     return true;
   } else {
     base::win::RegKey hklm_key(HKEY_LOCAL_MACHINE, reg_path.c_str(), KEY_READ);
     if (hklm_key.ReadValue(kRegistryPath, &path) == ERROR_SUCCESS) {
       *out = base::FilePath(path);
       return true;
     }
   }
 
   return false;
 }
 
 // Search the registry at the given path and detect plugin directories.
 void GetPluginsInRegistryDirectory(
     HKEY root_key,
-    const string16& registry_folder,
+    const base::string16& registry_folder,
     std::set<base::FilePath>* plugin_dirs) {
   for (base::win::RegistryKeyIterator iter(root_key, registry_folder.c_str());
        iter.Valid(); ++iter) {
     // Use the registry to gather plugin across the file system.
-    string16 reg_path = registry_folder;
+    base::string16 reg_path = registry_folder;
     reg_path.append(L"\\");
     reg_path.append(iter.Name());
     base::win::RegKey key(root_key, reg_path.c_str(), KEY_READ);
 
-    string16 path;
+    base::string16 path;
     if (key.ReadValue(kRegistryPath, &path) == ERROR_SUCCESS)
       plugin_dirs->insert(base::FilePath(path));
   }
 }
 
 // Enumerate through the registry key to find all installed FireFox paths.
 // FireFox 3 beta and version 2 can coexist. See bug: 1025003
 void GetFirefoxInstalledPaths(std::vector<base::FilePath>* out) {
   base::win::RegistryKeyIterator it(HKEY_LOCAL_MACHINE,
                                     kRegistryFirefoxInstalled);
   for (; it.Valid(); ++it) {
-    string16 full_path = string16(kRegistryFirefoxInstalled) + L"\\" +
-                            it.Name() + L"\\Main";
+    base::string16 full_path = base::string16(kRegistryFirefoxInstalled) +
+        L"\\" + it.Name() + L"\\Main";
     base::win::RegKey key(HKEY_LOCAL_MACHINE, full_path.c_str(), KEY_READ);
-    string16 install_dir;
+    base::string16 install_dir;
     if (key.ReadValue(L"Install Directory", &install_dir) != ERROR_SUCCESS)
       continue;
     out->push_back(base::FilePath(install_dir));
   }
 }
 
 // Get plugin directory locations from the Firefox install path.  This is kind
 // of a kludge, but it helps us locate the flash player for users that
 // already have it for firefox.  Not having to download yet-another-plugin
 // is a good thing.
@@ skipping 38 matching lines @@
 }
 
 // Hardcoded logic to detect Java plugin location.
 void GetJavaDirectory(std::set<base::FilePath>* plugin_dirs) {
   // Load the new NPAPI Java plugin
   // 1. Open the main JRE key under HKLM
   base::win::RegKey java_key(HKEY_LOCAL_MACHINE, kRegistryJava,
                              KEY_QUERY_VALUE);
 
   // 2. Read the current Java version
-  string16 java_version;
+  base::string16 java_version;
   if (java_key.ReadValue(kRegistryBrowserJavaVersion, &java_version) !=
       ERROR_SUCCESS) {
     java_key.ReadValue(kRegistryCurrentJavaVersion, &java_version);
   }
 
   if (!java_version.empty()) {
     java_key.OpenKey(java_version.c_str(), KEY_QUERY_VALUE);
 
     // 3. Install path of the JRE binaries is specified in "JavaHome"
     //    value under the Java version key.
-    string16 java_plugin_directory;
+    base::string16 java_plugin_directory;
     if (java_key.ReadValue(kRegistryJavaHome, &java_plugin_directory) ==
         ERROR_SUCCESS) {
       // 4. The new plugin resides under the 'bin/new_plugin'
       //    subdirectory.
       DCHECK(!java_plugin_directory.empty());
       java_plugin_directory.append(L"\\bin\\new_plugin");
 
       // 5. We don't know the exact name of the DLL but it's in the form
       //    NP*.dll so just invoke LoadPlugins on this path.
       plugin_dirs->insert(base::FilePath(java_plugin_directory));
@@ skipping 23 matching lines @@
       if (plugin1.mime_types[i].mime_type == plugin2.mime_types[j].mime_type)
         return true;
     }
   }
 
   return false;
 }
 
 // Compares Windows style version strings (i.e. 1,2,3,4).  Returns true if b's
 // version is newer than a's, or false if it's equal or older.
-bool IsNewerVersion(const string16& a, const string16& b) {
-  std::vector<string16> a_ver, b_ver;
+bool IsNewerVersion(const base::string16& a, const base::string16& b) {
+  std::vector<base::string16> a_ver, b_ver;
   base::SplitString(a, ',', &a_ver);
   base::SplitString(b, ',', &b_ver);
   if (a_ver.size() == 1 && b_ver.size() == 1) {
     base::SplitString(a, '.', &a_ver);
     base::SplitString(b, '.', &b_ver);
   }
   if (a_ver.size() != b_ver.size())
     return false;
   for (size_t i = 0; i < a_ver.size(); i++) {
     int cur_a, cur_b;
@@ skipping 43 matching lines @@
 
   for (std::set<base::FilePath>::iterator i = dirs.begin(); i != dirs.end(); ++i)
     plugin_dirs->push_back(*i);
 }
 
 void PluginList::GetPluginsInDir(
     const base::FilePath& path, std::vector<base::FilePath>* plugins) {
   WIN32_FIND_DATA find_file_data;
   HANDLE find_handle;
 
-  string16 dir = path.value();
+  base::string16 dir = path.value();
   // FindFirstFile requires that you specify a wildcard for directories.
   dir.append(L"\\NP*.DLL");
 
   find_handle = FindFirstFile(dir.c_str(), &find_file_data);
   if (find_handle == INVALID_HANDLE_VALUE)
     return;
 
   do {
     if (!(find_file_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
       base::FilePath filename = path.Append(find_file_data.cFileName);
@@ skipping 108 matching lines @@
   base::FilePath plugin_path(info.path);
   file_util::AbsolutePath(&plugin_path);
   if (!IsValid32BitImage(plugin_path))
     return false;
 #endif
   return true;
 }
 
 }  // namespace npapi
 }  // namespace webkit