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

chrome/browser/extensions/extension_content_settings_api.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/extensions/extension_content_settings_api.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #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"
 #include "chrome/browser/extensions/extension_content_settings_store.h"
 #include "chrome/browser/extensions/extension_preference_api_constants.h"
 #include "chrome/browser/extensions/extension_preference_helpers.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_error_utils.h"
@@ skipping 124 matching lines @@
     cookie_settings = CookieSettings::GetForProfile(profile());
   }
 
   ContentSetting setting;
   if (content_type == CONTENT_SETTINGS_TYPE_COOKIES) {
     // TODO(jochen): Do we return the value for setting or for reading cookies?
     bool setting_cookie = false;
     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();
   result->SetString(keys::kContentSettingKey,
                     helpers::ContentSettingToString(setting));
 
   result_.reset(result);
 
   return true;
 }
@@ skipping 129 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, base::Bind(
           &GetResourceIdentifiersFunction::SendResponse, this, true));
 }
 
 // static
 void GetResourceIdentifiersFunction::SetPluginGroupsForTesting(
     const std::vector<webkit::npapi::PluginGroup>* plugin_groups) {
   g_testing_plugin_groups_ = plugin_groups;
 }