[Mac] Add per-plugin exceptions to content settings.

chrome/browser/plugin_exceptions_table_model.cc

Index: chrome/browser/plugin_exceptions_table_model.cc
diff --git a/chrome/browser/plugin_exceptions_table_model.cc b/chrome/browser/plugin_exceptions_table_model.cc
index f61043208e211b554c5b3b644688e682c88a3f0b..18d76a647f2427997195099766383b922db676c8 100644
--- a/chrome/browser/plugin_exceptions_table_model.cc
+++ b/chrome/browser/plugin_exceptions_table_model.cc
@@ -34,6 +34,7 @@ void PluginExceptionsTableModel::RemoveRows(const Rows& rows) {
   // Iterate in reverse over the rows to get the indexes right.
   for (Rows::const_reverse_iterator it = rows.rbegin();
        it != rows.rend(); ++it) {
+    DCHECK_LT(*it, settings_.size());
     SettingsEntry& entry = settings_[*it];
     HostContentSettingsMap* map = entry.is_otr ? otr_map_ : map_;
     map->SetContentSetting(entry.pattern,
@@ -59,16 +60,14 @@ void PluginExceptionsTableModel::RemoveRows(const Rows& rows) {
 }
 
 void PluginExceptionsTableModel::RemoveAll() {
-  int old_row_count = RowCount();
-  {
-    AutoReset<bool> tmp(&updates_disabled_, true);
-    map_->ClearSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS);
-    if (otr_map_)
-      otr_map_->ClearSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS);
-  }
+  AutoReset<bool> tmp(&updates_disabled_, true);
+  map_->ClearSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS);
+  if (otr_map_)
+    otr_map_->ClearSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS);
+
   ClearSettings();
   if (observer_)
-    observer_->OnItemsRemoved(0, old_row_count);
+    observer_->OnModelChanged();
 }
 
 int PluginExceptionsTableModel::RowCount() {