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

chrome/browser/content_settings/content_settings_utils.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/content_settings/content_settings_utils.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 103 matching lines @@
     *setting = CONTENT_SETTING_DEFAULT;
     return true;
   }
   int int_value = -1;
   if (!value->GetAsInteger(&int_value))
     return false;
   *setting = IntToContentSetting(int_value);
   return *setting != CONTENT_SETTING_DEFAULT;
 }
 
+bool ValueEqualsContentSetting(const base::Value* value,
+                               ContentSetting setting) {

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

Couldn't you just implement this in terms of |ValueToContentSetting|?

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

I removed this method again. Since using ValueToContentSettings solves all
use-cases.

+  if (value) {
+    DCHECK(value->GetType() == base::Value::TYPE_INTEGER);

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

This method DCHECKS if |value| is not an integer FundamentalValue. That's not
what the comment says.

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

Ahhh... these last minute code changes. Anyway this is obsolete now after
removing the method.

+    int int_value;
+    bool success = value->GetAsInteger(&int_value);
+    if (success)
+      return ContentSetting(int_value == setting);

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

Ooooooh. I'm going to pretend I didn't see this line, okay? ;-)

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

No No No I did not write this :(. This was a change in the Matrix. :,(

+    NOTREACHED();
+  }
+  return false;
+}
+
 base::Value* GetContentSettingValueAndPatterns(
     const ProviderInterface* provider,
     const GURL& primary_url,
     const GURL& secondary_url,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
     bool include_incognito,
     ContentSettingsPattern* primary_pattern,
     ContentSettingsPattern* secondary_pattern) {
   if (include_incognito) {
@@ skipping 54 matching lines @@
                                  const std::string& resource_identifier,
                                  bool include_incognito) {
   scoped_ptr<base::Value> value(
       GetContentSettingValue(provider, primary_url, secondary_url,
                              content_type, resource_identifier,
                              include_incognito));
   return ValueToContentSetting(value.get());
 }
 
 }  // namespace content_settings