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

chrome/browser/content_settings/host_content_settings_map.h

 // 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.
 
 // Maps hostnames to custom content settings.  Written on the UI thread and read
 // on any thread.  One instance per profile.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "base/tuple.h"
+#include "base/values.h"

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

Why do you need this header? base::Value is already forward-declared.

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

Done.

 #include "chrome/browser/content_settings/content_settings_observer.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_pattern.h"
 
 namespace base {
 class Value;
 }  // namespace base
 
 namespace content_settings {
@@ skipping 98 matching lines @@
   // ContentSettingsTypes that require an resource identifier to be specified,
   // the |resource_identifier| must be non-empty.
   //
   // This should only be called on the UI thread.
   void SetContentSetting(const ContentSettingsPattern& primary_pattern,
                          const ContentSettingsPattern& secondary_pattern,
                          ContentSettingsType content_type,
                          const std::string& resource_identifier,
                          ContentSetting setting);
 
+  // Sets the |value| for the given patterns and content type.  Setting the
+  // value to NULL causes the default value for that type to be used when
+  // loading pages matching this pattern. For ContentSettingsTypes that require

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

Urgh, that comment is outdated :( If you're suffering from acute shortage of
yak-wool, you could remove the comment from the method above.

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

Done.

+  // an resource identifier to be specified, the |resource_identifier| must be
+  // non-empty.
+  //
+  // Takes ownership of the passed value.
+  void SetWebsiteSetting(const ContentSettingsPattern& primary_pattern,
+                         const ContentSettingsPattern& secondary_pattern,
+                         ContentSettingsType content_type,
+                         const std::string& resource_identifier,
+                         base::Value* value);
+
   // Convenience method to add a content setting for the given URLs, making sure
   // that there is no setting overriding it. For ContentSettingsTypes that
   // require an resource identifier to be specified, the |resource_identifier|
   // must be non-empty.
   //
   // This should only be called on the UI thread.
   void AddExceptionForURL(const GURL& primary_url,
                           const GURL& secondary_url,
                           ContentSettingsType content_type,
                           const std::string& resource_identifier,
                           ContentSetting setting);
 
   // Clears all host-specific settings for one content type.
   //
   // This should only be called on the UI thread.
   void ClearSettingsForOneType(ContentSettingsType content_type);
 
+  static bool IsValueAllowedForType(const base::Value* value,
+                                    ContentSettingsType content_type);
   static bool IsSettingAllowedForType(ContentSetting setting,
                                       ContentSettingsType content_type);
 
   // Detaches the HostContentSettingsMap from all Profile-related objects like
   // PrefService. This methods needs to be called before destroying the Profile.
   // Afterwards, none of the methods above that should only be called on the UI
   // thread should be called anymore.
   void ShutdownOnUIThread();
 
   // content_settings::Observer implementation.
@@ skipping 55 matching lines @@
   // Content setting providers.
   ProviderMap content_settings_providers_;
 
   // Used around accesses to the following objects to guarantee thread safety.
   mutable base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(HostContentSettingsMap);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_HOST_CONTENT_SETTINGS_MAP_H_