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

chrome/common/chrome_plugin_lib.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 "chrome/common/chrome_plugin_lib.h"
 
 #include "base/command_line.h"
 #include "base/hash_tables.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/perftimer.h"
 #include "base/thread.h"
 #if defined(OS_WIN)
 #include "base/win/registry.h"
 #endif
 #include "base/string_util.h"
 #include "chrome/common/chrome_counters.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/chrome_paths.h"
-#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/plugins/npapi/plugin_list.h"
 
 using base::TimeDelta;
 
 // TODO(port): revisit when plugins happier
 #if defined(OS_WIN)
 const wchar_t ChromePluginLib::kRegistryChromePlugins[] =
     L"Software\\Google\\Chrome\\Plugins";
 static const wchar_t kRegistryLoadOnStartup[] = L"LoadOnStartup";
 static const wchar_t kRegistryPath[] = L"Path";
 #endif
@@ skipping 74 matching lines @@
 
 // static
 void ChromePluginLib::RegisterPluginsWithNPAPI() {
   // We don't support ChromePlugins in single-process mode.
   if (IsSingleProcessMode())
     return;
 
   FilePath path;
   // Register Gears, if available.
   if (PathService::Get(chrome::FILE_GEARS_PLUGIN, &path))
-    NPAPI::PluginList::Singleton()->AddExtraPluginPath(path);
+    webkit::npapi::PluginList::Singleton()->AddExtraPluginPath(path);
 }
 
 static void LogPluginLoadTime(const TimeDelta &time) {
   UMA_HISTOGRAM_TIMES("Gears.LoadTime", time);
 }
 
 // static
 void ChromePluginLib::LoadChromePlugins(const CPBrowserFuncs* bfuncs) {
   static bool loaded = false;
   if (loaded)
@@ skipping 153 matching lines @@
   if (initialized_)
     CP_Shutdown();
 
 #if defined(OS_WIN)
   if (module_) {
     FreeLibrary(module_);
     module_ = 0;
   }
 #endif
 }