Update some uses of char16 to use the base:: namespace.

content/common/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 "content/common/plugin_list.h"
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/file_version_info_win.h"
 #include "base/files/memory_mapped_file.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/win/pe_image.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/windows_version.h"
 #include "content/common/plugin_constants_win.h"
 
 namespace content {
 namespace {
 
-const char16 kRegistryApps[] =
+const base::char16 kRegistryApps[] =
     L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths";
-const char16 kRegistryFirefox[] = L"firefox.exe";
-const char16 kRegistryAcrobat[] = L"Acrobat.exe";
-const char16 kRegistryAcrobatReader[] = L"AcroRd32.exe";
-const char16 kRegistryWindowsMedia[] = L"wmplayer.exe";
-const char16 kRegistryQuickTime[] = L"QuickTimePlayer.exe";
-const char16 kRegistryPath[] = L"Path";
-const char16 kRegistryFirefoxInstalled[] =
+const base::char16 kRegistryFirefox[] = L"firefox.exe";
+const base::char16 kRegistryAcrobat[] = L"Acrobat.exe";
+const base::char16 kRegistryAcrobatReader[] = L"AcroRd32.exe";
+const base::char16 kRegistryWindowsMedia[] = L"wmplayer.exe";
+const base::char16 kRegistryQuickTime[] = L"QuickTimePlayer.exe";
+const base::char16 kRegistryPath[] = L"Path";
+const base::char16 kRegistryFirefoxInstalled[] =
     L"SOFTWARE\\Mozilla\\Mozilla Firefox";
-const char16 kRegistryJava[] =
+const base::char16 kRegistryJava[] =
     L"Software\\JavaSoft\\Java Runtime Environment";
-const char16 kRegistryBrowserJavaVersion[] = L"BrowserJavaVersion";
-const char16 kRegistryCurrentJavaVersion[] = L"CurrentVersion";
-const char16 kRegistryJavaHome[] = L"JavaHome";
-const char16 kJavaDeploy1[] = L"npdeploytk.dll";
-const char16 kJavaDeploy2[] = L"npdeployjava1.dll";
+const base::char16 kRegistryBrowserJavaVersion[] = L"BrowserJavaVersion";
+const base::char16 kRegistryCurrentJavaVersion[] = L"CurrentVersion";
+const base::char16 kRegistryJavaHome[] = L"JavaHome";
+const base::char16 kJavaDeploy1[] = L"npdeploytk.dll";
+const base::char16 kJavaDeploy2[] = L"npdeployjava1.dll";
 
 base::FilePath AppendPluginsDir(const base::FilePath& path) {
   return path.AppendASCII("plugins");
 }
 
 // Gets the directory where the application data and libraries exist.  This
 // may be a versioned subdirectory, or it may be the same directory as the
 // GetExeDirectory(), depending on the embedder's implementation.
 // Path is an output parameter to receive the path.
 void GetAppDirectory(std::set<base::FilePath>* plugin_dirs) {
   base::FilePath app_path;
   if (!PathService::Get(base::DIR_MODULE, &app_path))
     return;
   plugin_dirs->insert(AppendPluginsDir(app_path));
 }
 
 // Gets the directory where the launching executable resides on disk.
 // 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) {
+bool GetInstalledPath(const base::char16* app, base::FilePath* out) {
   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);
   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);
@@ skipping 383 matching lines @@
 #if !defined(ARCH_CPU_X86_64)
   // The plugin in question could be a 64 bit plugin which we cannot load.
   base::FilePath plugin_path(info.path);
   if (!IsValid32BitImage(base::MakeAbsoluteFilePath(plugin_path)))
     return false;
 #endif
   return true;
 }
 
 }  // namespace content