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

webkit/glue/plugins/plugin_list.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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #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)
 #include "base/stl_util-inl.h"
 #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.
 // Plugins are listed here as soon as vulnerabilities and solutions
 // (new versions) are published.
 // TODO(panayiotis): Get the Real Player version on Mac, somehow.
 static const VersionRangeDefinition kQuicktimeVersionRange[] = {
     { "", "", "7.6.6" }
 };
 static const VersionRangeDefinition kJavaVersionRange[] = {
@@ skipping 28 matching lines @@
     "http://www.telestream.net/flip4mac-wmv/overview.htm" },
   { "shockwave", "Shockwave", "Shockwave for Director", kShockwaveVersionRange,
     arraysize(kShockwaveVersionRange),
     "http://www.adobe.com/shockwave/download/" }
 };
 
 #elif defined(OS_WIN)
 // 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.
 };
 static const VersionRangeDefinition kAdobeReaderVersionRange[] = {
     { "10", "11", "" },
     { "9", "10", "9.4.1" },
     { "0", "9", "8.2.5" }
 };
 static const VersionRangeDefinition kFlashVersionRange[] = {
     { "", "", "10.1.102" }
 };
 static const VersionRangeDefinition kSilverlightVersionRange[] = {
     { "0", "4", "3.0.50106.0" },
     { "4", "5", "" }
 };
 static const VersionRangeDefinition kShockwaveVersionRange[] = {
     { "", "", "11.5.9.615" }
 };
 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),
     "http://www.apple.com/quicktime/download/" },
   { "java-runtime-environment", "Java 6", "Java", kJavaVersionRange,
     arraysize(kJavaVersionRange), "http://www.java.com/" },
   { "adobe-reader", PluginGroup::kAdobeReaderGroupName, "Adobe Acrobat",
     kAdobeReaderVersionRange, arraysize(kAdobeReaderVersionRange),
     "http://get.adobe.com/reader/" },
   { "adobe-flash-player", "Flash", "Shockwave Flash", kFlashVersionRange,
     arraysize(kFlashVersionRange), "http://get.adobe.com/flashplayer/" },
   { "silverlight", "Silverlight", "Silverlight", kSilverlightVersionRange,
     arraysize(kSilverlightVersionRange),
     "http://www.microsoft.com/getsilverlight/" },
   { "shockwave", "Shockwave", "Shockwave for Director", kShockwaveVersionRange,
     arraysize(kShockwaveVersionRange),
     "http://www.adobe.com/shockwave/download/" },
   { "divx-player", "DivX Player", "DivX Web Player", kDivXVersionRange,
     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
 static const PluginGroupDefinition kGroupDefinitions[] = {};
 #endif
 
 // static
 const PluginGroupDefinition* PluginList::GetPluginGroupDefinitions() {
   return kGroupDefinitions;
 }
@@ skipping 629 matching lines @@
   // However, when running on Valgrind, we need to do the cleanup to keep the
   // memory tree green.
 #if defined(OS_POSIX)
   if (RUNNING_ON_VALGRIND) {
     STLDeleteContainerPairSecondPointers(plugin_groups_.begin(),
                                          plugin_groups_.end());
   }
 #endif
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI