Replace SetContentSetting method of the content_settings::Provider interface with GetWebsiteSetting

chrome/browser/extensions/extension_content_settings_api.cc

Index: chrome/browser/extensions/extension_content_settings_api.cc
diff --git a/chrome/browser/extensions/extension_content_settings_api.cc b/chrome/browser/extensions/extension_content_settings_api.cc
index 859306f25d6c78ce9534ad94df8f8e59a3f657f2..fbab528a9fb8b0888095d17897f57cd9d99b5211 100644
--- a/chrome/browser/extensions/extension_content_settings_api.cc
+++ b/chrome/browser/extensions/extension_content_settings_api.cc
@@ -10,6 +10,7 @@
 #include "base/command_line.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
+#include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/extension_content_settings_api_constants.h"
 #include "chrome/browser/extensions/extension_content_settings_helpers.h"
@@ -154,8 +155,10 @@ bool GetContentSettingFunction::RunImpl() {
     setting = cookie_settings->GetCookieSetting(primary_url, secondary_url,
                                                 setting_cookie, NULL);
   } else {
-    setting = map->GetContentSetting(primary_url, secondary_url, content_type,
-                                     resource_identifier);
+    scoped_ptr<base::Value> value(

[Bernhard Bauer, 2011/11/11 14:00:40]

Why this change? GetContentSetting is still available.

[markusheintz_, 2011/11/14 11:15:10]

Originally I planed to rm the SetContentSetting method. This is obsolete. sry

+        map->GetWebsiteSetting(primary_url, secondary_url, content_type,
+                               resource_identifier, NULL));
+    setting = content_settings::ValueToContentSetting(value.get());
   }
 
   DictionaryValue* result = new DictionaryValue();