revert 128949 (and dependent 129252)

webkit/plugins/npapi/plugin_group_unittest.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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_group.h"
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/plugins/webplugininfo.h"
 
 namespace webkit {
 namespace npapi {
 
 static const VersionRangeDefinition kPluginVersionRange[] = {
-    { "", "", "3.0.44" }
+    { "", "", "3.0.44", false }
 };
 static const VersionRangeDefinition kPlugin3VersionRange[] = {
-    { "0", "4", "3.0.44" }
+    { "0", "4", "3.0.44", false }
 };
 static const VersionRangeDefinition kPlugin4VersionRange[] = {
-    { "4", "5", "4.0.44" }
+    { "4", "5", "4.0.44", false }
 };
 static const VersionRangeDefinition kPlugin34VersionRange[] = {
-    { "0", "4", "3.0.44" },
-    { "4", "5", "" }
+    { "0", "4", "3.0.44", false },
+    { "4", "5", "", false }
 };
 
 static const PluginGroupDefinition kPluginDef = {
     "myplugin", "MyPlugin", "MyPlugin", kPluginVersionRange,
-    arraysize(kPluginVersionRange) };
+    arraysize(kPluginVersionRange), "http://latest/" };
 static const PluginGroupDefinition kPluginDef3 = {
     "myplugin-3", "MyPlugin 3", "MyPlugin", kPlugin3VersionRange,
-    arraysize(kPlugin3VersionRange) };
+    arraysize(kPlugin3VersionRange), "http://latest" };
 static const PluginGroupDefinition kPluginDef4 = {
     "myplugin-4", "MyPlugin 4", "MyPlugin", kPlugin4VersionRange,
-    arraysize(kPlugin4VersionRange) };
+    arraysize(kPlugin4VersionRange), "http://latest" };
 static const PluginGroupDefinition kPluginDef34 = {
     "myplugin-34", "MyPlugin 3/4", "MyPlugin", kPlugin34VersionRange,
-    arraysize(kPlugin34VersionRange) };
+    arraysize(kPlugin34VersionRange), "http://latest" };
 static const PluginGroupDefinition kPluginDefNotVulnerable = {
-    "myplugin-latest", "MyPlugin", "MyPlugin", NULL, 0 };
+    "myplugin-latest", "MyPlugin", "MyPlugin", NULL, 0, "http://latest" };
 
 const PluginGroupDefinition kPluginDefinitions[] = {
   kPluginDef,
   kPluginDef3,
   kPluginDef4,
   kPluginDef34,
   kPluginDefNotVulnerable,
 };
 
 // name, path, version, desc.
@@ skipping 86 matching lines @@
   for (size_t i = 0; i < arraysize(versions); i++) {
     scoped_ptr<Version> version(PluginGroup::CreateVersionFromString(
         ASCIIToUTF16(versions[i][0])));
     EXPECT_STREQ(versions[i][1], version->GetString().c_str());
   }
 }
 
 TEST_F(PluginGroupTest, IsVulnerable) {
   // Adobe Reader 10
   VersionRangeDefinition adobe_reader_version_range[] = {
-      { "10", "11", "" },
-      { "9", "10", "9.4.1" },
-      { "0", "9", "8.2.5" }
+      { "10", "11", "", false },
+      { "9", "10", "9.4.1", false },
+      { "0", "9", "8.2.5", false }
   };
   PluginGroupDefinition adobe_reader_plugin_def = {
       "adobe-reader", "Adobe Reader", "Adobe Acrobat",
-      adobe_reader_version_range, arraysize(adobe_reader_version_range) };
+      adobe_reader_version_range, arraysize(adobe_reader_version_range),
+      "http://get.adobe.com/reader/" };
   WebPluginInfo adobe_reader_plugin(ASCIIToUTF16("Adobe Reader"),
                                     FilePath(FILE_PATH_LITERAL("/reader.so")),
                                     ASCIIToUTF16("10.0.0.396"),
                                     ASCIIToUTF16("adobe reader 10"));
   scoped_ptr<PluginGroup> group(PluginGroupTest::CreatePluginGroup(
       adobe_reader_plugin_def));
   group->AddPlugin(adobe_reader_plugin);
   PluginGroup group_copy(*group);  // Exercise the copy constructor.
   EXPECT_FALSE(group_copy.IsVulnerable(adobe_reader_plugin));
+  EXPECT_FALSE(group_copy.RequiresAuthorization(adobe_reader_plugin));
 
   // Silverlight 4
   VersionRangeDefinition silverlight_version_range[] = {
-      { "0", "4", "3.0.50106.0" },
-      { "4", "5", "" }
+      { "0", "4", "3.0.50106.0", false },
+      { "4", "5", "", true }
   };
   PluginGroupDefinition silverlight_plugin_def = {
       "silverlight", "Silverlight", "Silverlight", silverlight_version_range,
-      arraysize(silverlight_version_range) };
+      arraysize(silverlight_version_range),
+      "http://www.microsoft.com/getsilverlight/" };
   WebPluginInfo silverlight_plugin(ASCIIToUTF16("Silverlight"),
                                    FilePath(FILE_PATH_LITERAL("/silver.so")),
                                    ASCIIToUTF16("4.0.50917.0"),
                                    ASCIIToUTF16("silverlight 4"));
   group.reset(PluginGroupTest::CreatePluginGroup(silverlight_plugin_def));
   group->AddPlugin(silverlight_plugin);
   EXPECT_FALSE(PluginGroup(*group).IsVulnerable(silverlight_plugin));
+  EXPECT_TRUE(PluginGroup(*group).RequiresAuthorization(silverlight_plugin));
 }
 
 }  // namespace npapi
 }  // namespace webkit