Merge PluginGroups for Adobe Reader

chrome/browser/plugin_exceptions_table_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_PLUGIN_EXCEPTIONS_TABLE_MODEL_H_
 #define CHROME_BROWSER_PLUGIN_EXCEPTIONS_TABLE_MODEL_H_
 #pragma once
 
 #include <deque>
 #include <string>
 #include <vector>
 
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/remove_rows_table_model.h"
 #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,
                                    public NotificationObserver {
  public:
   PluginExceptionsTableModel(HostContentSettingsMap* content_settings_map,
                              HostContentSettingsMap* otr_content_settings_map);
   virtual ~PluginExceptionsTableModel();
 
   // Load plugin exceptions from the HostContentSettingsMaps. You should call
@@ skipping 16 matching lines @@
   // NotificationObserver methods:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
  protected:
   // Subclasses can override this method for testing.
   virtual void GetPlugins(std::vector<PluginGroup>* plugin_groups);
 
  private:
-  friend class plugin_test_internal::PluginExceptionsTableModelTest;
+  friend class PluginExceptionsTableModelTest;
 
   struct SettingsEntry {
    ContentSettingsPattern pattern;
    int plugin_id;
    ContentSetting setting;
    bool is_otr;
   };
 
   void ClearSettings();
   void ReloadSettings();
 
   scoped_refptr<HostContentSettingsMap> map_;
   scoped_refptr<HostContentSettingsMap> otr_map_;
 
   std::deque<SettingsEntry> settings_;
   std::deque<int> row_counts_;
   std::deque<std::string> resources_;
   TableModel::Groups groups_;
 
   NotificationRegistrar registrar_;
   bool updates_disabled_;
   TableModelObserver* observer_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginExceptionsTableModel);
 };
 
 #endif  // CHROME_BROWSER_PLUGIN_EXCEPTIONS_TABLE_MODEL_H_