Delegating the "are images allowed" decision to renderer.

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 a2e532b24a3fcfec7f00c76ffb5ad2452f57866f..97fc91c92ebc94bf8f58acc80c43071ab7a83838 100644
--- a/chrome/browser/plugin_exceptions_table_model.cc
+++ b/chrome/browser/plugin_exceptions_table_model.cc
@@ -8,6 +8,7 @@
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/browser/content_settings/content_settings_provider.h"
 #include "content/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -148,18 +149,22 @@ void PluginExceptionsTableModel::LoadSettings() {
   GetPlugins(&plugins);
   for (size_t i = 0; i < plugins.size(); ++i) {
     std::string plugin = plugins[i].identifier();
-    HostContentSettingsMap::SettingsForOneType settings;
-    map_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
-                                plugin,
-                                &settings);
-    HostContentSettingsMap::SettingsForOneType otr_settings;
+    ContentSettingsForOneType settings;
+    map_->GetSettingsForOneType(
+        CONTENT_SETTINGS_TYPE_PLUGINS,
+        plugin,
+        content_settings::ProviderInterface::Rule::LexicographicalSort,
+        &settings);
+    ContentSettingsForOneType otr_settings;
     if (otr_map_) {
-      otr_map_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
-                                      plugin,
-                                      &otr_settings);
+      otr_map_->GetSettingsForOneType(
+          CONTENT_SETTINGS_TYPE_PLUGINS,
+          plugin,
+          content_settings::ProviderInterface::Rule::LexicographicalSort,
+          &otr_settings);
     }
     string16 title = plugins[i].GetGroupName();
-    for (HostContentSettingsMap::SettingsForOneType::iterator setting_it =
+    for (ContentSettingsForOneType::iterator setting_it =
              settings.begin();
          setting_it != settings.end(); ++setting_it) {
       SettingsEntry entry = {
@@ -170,7 +175,7 @@ void PluginExceptionsTableModel::LoadSettings() {
       };
       settings_.push_back(entry);
     }
-    for (HostContentSettingsMap::SettingsForOneType::iterator setting_it =
+    for (ContentSettingsForOneType::iterator setting_it =
              otr_settings.begin();
          setting_it != otr_settings.end(); ++setting_it) {
       SettingsEntry entry = {