Merge PluginGroups for Adobe Reader

This patch introduces general support in PluginGroup for multiple version ranges with one minimum secure version each, to be used e.g. for multiple major versions currently supported by their manufacturer.

BUG=65207
TEST=test_shell_tests: PluginGroupTest*

Review URL: http://codereview.chromium.org/5621006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68726 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 12 insertions, 17 deletions

diff --git a/chrome/browser/dom_ui/plugins_ui.cc b/chrome/browser/dom_ui/plugins_ui.cc
index 94e12b1..62564bd 100644
--- a/chrome/browser/dom_ui/plugins_ui.cc
+++ b/chrome/browser/dom_ui/plugins_ui.cc
@@ -223,14 +223,12 @@ void PluginsDOMHandler::HandleEnablePluginMessage(const ListValue* args) {
     plugin_updater->EnablePluginGroup(enable, group_name);
     if (enable) {
       // See http://crbug.com/50105 for background.
-      string16 reader8 = ASCIIToUTF16(PluginGroup::kAdobeReader8GroupName);
-      string16 reader9 = ASCIIToUTF16(PluginGroup::kAdobeReader9GroupName);
+      string16 adobereader = ASCIIToUTF16(PluginGroup::kAdobeReaderGroupName);
       string16 internalpdf = ASCIIToUTF16(PepperPluginRegistry::kPDFPluginName);
-      if (group_name == reader8 || group_name == reader9) {
+      if (group_name == adobereader) {
         plugin_updater->EnablePluginGroup(false, internalpdf);
       } else if (group_name == internalpdf) {
-        plugin_updater->EnablePluginGroup(false, reader8);
-        plugin_updater->EnablePluginGroup(false, reader9);
+        plugin_updater->EnablePluginGroup(false, adobereader);
       }
     }
   } else {
diff --git a/chrome/browser/plugin_exceptions_table_model.h b/chrome/browser/plugin_exceptions_table_model.h
index 6e8f00b..d9f8e40 100644
--- a/chrome/browser/plugin_exceptions_table_model.h
+++ b/chrome/browser/plugin_exceptions_table_model.h
@@ -15,9 +15,6 @@
 #include "chrome/common/notification_observer.h"
 #include "webkit/glue/plugins/plugin_list.h"
 
-namespace plugin_test_internal {
-class PluginExceptionsTableModelTest;
-}
 struct WebPluginInfo;
 
 class PluginExceptionsTableModel : public RemoveRowsTableModel,
@@ -54,7 +51,7 @@ class PluginExceptionsTableModel : public RemoveRowsTableModel,
   virtual void GetPlugins(std::vector<PluginGroup>* plugin_groups);
 
  private:
-  friend class plugin_test_internal::PluginExceptionsTableModelTest;
+  friend class PluginExceptionsTableModelTest;
 
   struct SettingsEntry {
    ContentSettingsPattern pattern;
diff --git a/chrome/browser/plugin_exceptions_table_model_unittest.cc b/chrome/browser/plugin_exceptions_table_model_unittest.cc
index 9540893..b96f3fb 100644
--- a/chrome/browser/plugin_exceptions_table_model_unittest.cc
+++ b/chrome/browser/plugin_exceptions_table_model_unittest.cc
@@ -21,7 +21,6 @@
 namespace plugin_test_internal {
 
 using ::testing::_;
-using ::testing::InSequence;
 using ::testing::Invoke;
 
 class MockTableModelObserver : public TableModelObserver {
@@ -50,6 +49,10 @@ class MockTableModelObserver : public TableModelObserver {
   TableModel* model_;
 };
 
+}  // namespace plugin_test_internal
+
+using ::testing::InSequence;
+
 class PluginExceptionsTableModelTest : public testing::Test {
  public:
   PluginExceptionsTableModelTest()
@@ -154,7 +157,7 @@ TEST_F(PluginExceptionsTableModelTest, Basic) {
 }
 
 TEST_F(PluginExceptionsTableModelTest, RemoveOneRow) {
-  MockTableModelObserver observer(table_model_.get());
+  plugin_test_internal::MockTableModelObserver observer(table_model_.get());
   table_model_->SetObserver(&observer);
 
   EXPECT_CALL(observer, OnItemsRemoved(1, 1));
@@ -168,7 +171,7 @@ TEST_F(PluginExceptionsTableModelTest, RemoveOneRow) {
 }
 
 TEST_F(PluginExceptionsTableModelTest, RemoveLastRowInGroup) {
-  MockTableModelObserver observer(table_model_.get());
+  plugin_test_internal::MockTableModelObserver observer(table_model_.get());
   table_model_->SetObserver(&observer);
 
   EXPECT_CALL(observer, OnModelChanged());
@@ -202,7 +205,7 @@ TEST_F(PluginExceptionsTableModelTest, RemoveLastRowInGroup) {
 }
 
 TEST_F(PluginExceptionsTableModelTest, RemoveAllRows) {
-  MockTableModelObserver observer(table_model_.get());
+  plugin_test_internal::MockTableModelObserver observer(table_model_.get());
   table_model_->SetObserver(&observer);
 
   EXPECT_CALL(observer, OnModelChanged());
@@ -212,5 +215,3 @@ TEST_F(PluginExceptionsTableModelTest, RemoveAllRows) {
   CheckInvariants();
   table_model_->SetObserver(NULL);
 }
-
-}  // namespace plugin_test_internal
diff --git a/chrome/browser/plugin_updater.cc b/chrome/browser/plugin_updater.cc
index 338e09c..4eff704 100644
--- a/chrome/browser/plugin_updater.cc
+++ b/chrome/browser/plugin_updater.cc
@@ -219,8 +219,7 @@ void PluginUpdater::DisablePluginGroupsFromPrefs(Profile* profile) {
 
   if (force_enable_internal_pdf) {
     // See http://crbug.com/50105 for background.
-    EnablePluginGroup(false, ASCIIToUTF16(PluginGroup::kAdobeReader8GroupName));
-    EnablePluginGroup(false, ASCIIToUTF16(PluginGroup::kAdobeReader9GroupName));
+    EnablePluginGroup(false, ASCIIToUTF16(PluginGroup::kAdobeReaderGroupName));
 
     // We want to save this, but doing so requires loading the list of plugins,
     // so do it after a minute as to not impact startup performance.  Note that