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

webkit/glue/plugins/plugin_list.cc

Index: webkit/glue/plugins/plugin_list.cc
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc
similarity index 97%
rename from webkit/plugins/npapi/plugin_list.cc
rename to webkit/glue/plugins/plugin_list.cc
index a92373e6e5738e8cf80e820cffb381b9a69bd1ef..a2b4cf5cb73f6c545a7ff0e35116056d79974d2f 100644
--- a/webkit/plugins/npapi/plugin_list.cc
+++ b/webkit/glue/plugins/plugin_list.cc
@@ -2,7 +2,7 @@
 // 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 <algorithm>
 
@@ -15,9 +15,9 @@
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/mime_util.h"
+#include "webkit/glue/plugins/plugin_constants_win.h"
+#include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/plugins/npapi/plugin_constants_win.h"
-#include "webkit/plugins/npapi/plugin_lib.h"
 #include "webkit/plugins/plugin_switches.h"
 
 #if defined(OS_POSIX)
@@ -25,11 +25,7 @@
 #include "base/third_party/valgrind/valgrind.h"
 #endif  // defined(OS_POSIX)
 
-namespace webkit {
-namespace npapi {
-
-FilePath::CharType kDefaultPluginLibraryName[] =
-    FILE_PATH_LITERAL("default_plugin");
+namespace NPAPI {
 
 #if defined(OS_MACOSX)
 // Plugin Groups for Mac.
@@ -78,7 +74,7 @@ static const PluginGroupDefinition kGroupDefinitions[] = {
 // TODO(panayiotis): We should group "RealJukebox NS Plugin" with the rest of
 // the RealPlayer files.
 static const VersionRangeDefinition kQuicktimeVersionRange[] = {
-    { "", "", "7.6.8" }
+    { "", "", "7.6.9" }
 };
 static const VersionRangeDefinition kJavaVersionRange[] = {
     { "0", "7", "6.0.220" }  // "220" is not a typo.
@@ -101,6 +97,9 @@ static const VersionRangeDefinition kShockwaveVersionRange[] = {
 static const VersionRangeDefinition kDivXVersionRange[] = {
     { "", "", "1.4.3.4" }
 };
+static const VersionRangeDefinition kRealPlayerVersionRange[] = {
+    { "", "", "12.0.1.609" }
+};
 static const PluginGroupDefinition kGroupDefinitions[] = {
   { "apple-quicktime", "Quicktime", "QuickTime Plug-in", kQuicktimeVersionRange,
     arraysize(kQuicktimeVersionRange),
@@ -122,16 +121,14 @@ static const PluginGroupDefinition kGroupDefinitions[] = {
     arraysize(kDivXVersionRange),
     "http://download.divx.com/divx/autoupdate/player/"
     "DivXWebPlayerInstaller.exe" },
+  { "realplayer", "RealPlayer", "RealPlayer", kRealPlayerVersionRange,
+    arraysize(kRealPlayerVersionRange),
+    "http://www.real.com/realplayer" },
   // These are here for grouping, no vulnerabilities known.
   { "windows-media-player", "Windows Media Player", "Windows Media Player",
     NULL, 0, "" },
   { "microsoft-office", "Microsoft Office", "Microsoft Office",
     NULL, 0, "" },
-  // TODO(panayiotis): The vulnerable versions are
-  //  (v >=  6.0.12.1040 && v <= 6.0.12.1663)
-  //  || v == 6.0.12.1698  || v == 6.0.12.1741
-  { "realplayer", "RealPlayer", "RealPlayer", NULL, 0,
-    "www.real.com/realplayer/downloads" },
 };
 
 #else
@@ -781,5 +778,4 @@ void PluginList::Shutdown() {
 #endif
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI