Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

webkit/glue/plugins/plugin_list_win.cc

 // Copyright (c) 2010 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 "webkit/glue/plugins/plugin_list.h"
 
 #include <tchar.h>
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/win/registry.h"
-#include "webkit/plugins/npapi/plugin_constants_win.h"
-#include "webkit/plugins/npapi/plugin_lib.h"
-#include "webkit/plugins/plugin_switches.h"
+#include "webkit/glue/plugins/plugin_constants_win.h"
+#include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/webkit_glue.h"
 
-namespace webkit {
-namespace npapi {
-
 namespace {
 
-const 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[] =
-    L"SOFTWARE\\Mozilla\\Mozilla Firefox";
-const 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 TCHAR kRegistryApps[] =
+    _T("Software\\Microsoft\\Windows\\CurrentVersion\\App Paths");
+const TCHAR kRegistryFirefox[] = _T("firefox.exe");
+const TCHAR kRegistryAcrobat[] = _T("Acrobat.exe");
+const TCHAR kRegistryAcrobatReader[] = _T("AcroRd32.exe");
+const TCHAR kRegistryWindowsMedia[] = _T("wmplayer.exe");
+const TCHAR kRegistryQuickTime[] = _T("QuickTimePlayer.exe");
+const TCHAR kRegistryPath[] = _T("Path");
+const TCHAR kRegistryFirefoxInstalled[] =
+    _T("SOFTWARE\\Mozilla\\Mozilla Firefox");
+const TCHAR kRegistryJava[] =
+    _T("Software\\JavaSoft\\Java Runtime Environment");
+const TCHAR kRegistryBrowserJavaVersion[] = _T("BrowserJavaVersion");
+const TCHAR kRegistryCurrentJavaVersion[] = _T("CurrentVersion");
+const TCHAR kRegistryJavaHome[] = _T("JavaHome");
+const TCHAR kJavaDeploy1[] = _T("npdeploytk.dll");
+const TCHAR kJavaDeploy2[] = _T("npdeployjava1.dll");
 
 // The application path where we expect to find plugins.
 void GetAppDirectory(std::set<FilePath>* plugin_dirs) {
   FilePath app_path;
   if (!webkit_glue::GetApplicationDirectory(&app_path))
     return;
 
   app_path = app_path.AppendASCII("plugins");
   plugin_dirs->insert(app_path);
 }
 
 // The executable path where we expect to find plugins.
 void GetExeDirectory(std::set<FilePath>* plugin_dirs) {
   FilePath exe_path;
   if (!webkit_glue::GetExeDirectory(&exe_path))
     return;
 
   exe_path = exe_path.AppendASCII("plugins");
   plugin_dirs->insert(exe_path);
 }
 
 // Gets the installed path for a registered app.
-bool GetInstalledPath(const char16* app, FilePath* out) {
+bool GetInstalledPath(const TCHAR* app, FilePath* out) {
   std::wstring reg_path(kRegistryApps);
   reg_path.append(L"\\");
   reg_path.append(app);
 
   base::win::RegKey key(HKEY_LOCAL_MACHINE, reg_path.c_str(), KEY_READ);
   std::wstring path;
   if (key.ReadValue(kRegistryPath, &path)) {
     *out = FilePath(path);
     return true;
   }
@@ skipping 127 matching lines @@
 
       // 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(FilePath(java_plugin_directory));
     }
   }
 }
 
 }  // anonymous namespace
 
+namespace NPAPI {
+
 void PluginList::PlatformInit() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  dont_load_new_wmp_ = command_line.HasSwitch(switches::kUseOldWMPPlugin);
+  dont_load_new_wmp_ = command_line.HasSwitch(kUseOldWMPPluginSwitch);
 }
 
 void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
   // We use a set for uniqueness, which we require, over order, which we do not.
   std::set<FilePath> dirs;
 
   // Load from the application-specific area
   GetAppDirectory(&dirs);
 
   // Load from the executable area
@@ skipping 172 matching lines @@
   } else if (filename == kOldWMPPlugin) {
     for (size_t i = 0; i < plugins->size(); ++i) {
       if ((*plugins)[i].path.BaseName().value() == kNewWMPPlugin)
         return false;
     }
   }
 
   return true;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI