summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-08 16:27:10 +0000
committermarkusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-08 16:27:10 +0000
commitbb6baaba7ebacd655bf3dc4b3634b8b8cf070eac (patch)
treeeb224d57cfb1bfe227442c726b07067425f13ae3
parentc6c989f794d3b6a5f00cc86b6dfd58747e710bb4 (diff)
downloadchromium_src-bb6baaba7ebacd655bf3dc4b3634b8b8cf070eac.zip
chromium_src-bb6baaba7ebacd655bf3dc4b3634b8b8cf070eac.tar.gz
chromium_src-bb6baaba7ebacd655bf3dc4b3634b8b8cf070eac.tar.bz2
- Remove unused includes
- Add missing includes - Inline function. BUG=63656 TEST=HostContentSettingsMapTest*, ContentSettingsProviderTest* Review URL: http://codereview.chromium.org/8804016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113610 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/content_settings/content_settings_details.h1
-rw-r--r--chrome/browser/content_settings/content_settings_mock_provider.cc13
-rw-r--r--chrome/browser/content_settings/content_settings_mock_provider.h9
-rw-r--r--chrome/browser/content_settings/content_settings_provider.h2
-rw-r--r--chrome/browser/content_settings/content_settings_provider_unittest.cc8
-rw-r--r--chrome/browser/content_settings/content_settings_rule.h1
-rw-r--r--chrome/browser/content_settings/content_settings_utils.cc4
-rw-r--r--chrome/browser/content_settings/content_settings_utils.h4
-rw-r--r--chrome/browser/content_settings/host_content_settings_map.cc38
-rw-r--r--chrome/browser/content_settings/host_content_settings_map.h1
10 files changed, 31 insertions, 50 deletions
diff --git a/chrome/browser/content_settings/content_settings_details.h b/chrome/browser/content_settings/content_settings_details.h
index 3b46ad3..667ebf2 100644
--- a/chrome/browser/content_settings/content_settings_details.h
+++ b/chrome/browser/content_settings/content_settings_details.h
@@ -10,6 +10,7 @@
#include "base/basictypes.h"
#include "chrome/common/content_settings.h"
+#include "chrome/common/content_settings_types.h"
#include "chrome/common/content_settings_pattern.h"
// Details for the CONTENT_SETTINGS_CHANGED notification. This is sent when
diff --git a/chrome/browser/content_settings/content_settings_mock_provider.cc b/chrome/browser/content_settings/content_settings_mock_provider.cc
index 02d3db0..ab7c4d9 100644
--- a/chrome/browser/content_settings/content_settings_mock_provider.cc
+++ b/chrome/browser/content_settings/content_settings_mock_provider.cc
@@ -9,19 +9,8 @@ namespace content_settings {
MockProvider::MockProvider()
: read_only_(false) {}
-MockProvider::MockProvider(ContentSettingsPattern requesting_url_pattern,
- ContentSettingsPattern embedding_url_pattern,
- ContentSettingsType content_type,
- ResourceIdentifier resource_identifier,
- ContentSetting setting,
- bool read_only,
- bool is_managed)
+MockProvider::MockProvider(bool read_only)
: read_only_(read_only) {
- value_map_.SetValue(requesting_url_pattern,
- embedding_url_pattern,
- content_type,
- resource_identifier,
- Value::CreateIntegerValue(setting));
}
MockProvider::~MockProvider() {}
diff --git a/chrome/browser/content_settings/content_settings_mock_provider.h b/chrome/browser/content_settings/content_settings_mock_provider.h
index 1ad4912..807c0b1 100644
--- a/chrome/browser/content_settings/content_settings_mock_provider.h
+++ b/chrome/browser/content_settings/content_settings_mock_provider.h
@@ -12,6 +12,7 @@
#include "chrome/browser/content_settings/content_settings_observable_provider.h"
#include "chrome/browser/content_settings/content_settings_origin_identifier_value_map.h"
#include "chrome/common/content_settings_pattern.h"
+#include "chrome/common/content_settings_types.h"
namespace content_settings {
@@ -19,13 +20,7 @@ namespace content_settings {
class MockProvider : public ObservableProvider {
public:
MockProvider();
- MockProvider(ContentSettingsPattern requesting_url_pattern,
- ContentSettingsPattern embedding_url_pattern,
- ContentSettingsType content_type,
- ResourceIdentifier resource_identifier,
- ContentSetting setting,
- bool read_only,
- bool is_managed);
+ explicit MockProvider(bool read_only);
virtual ~MockProvider();
virtual RuleIterator* GetRuleIterator(
diff --git a/chrome/browser/content_settings/content_settings_provider.h b/chrome/browser/content_settings/content_settings_provider.h
index 0b0a64e..ef41ad4 100644
--- a/chrome/browser/content_settings/content_settings_provider.h
+++ b/chrome/browser/content_settings/content_settings_provider.h
@@ -14,7 +14,7 @@
#include <vector>
#include "base/values.h"
-#include "chrome/common/content_settings.h"
+#include "chrome/common/content_settings_types.h"
class ContentSettingsPattern;
diff --git a/chrome/browser/content_settings/content_settings_provider_unittest.cc b/chrome/browser/content_settings/content_settings_provider_unittest.cc
index 438d276..e0857b3 100644
--- a/chrome/browser/content_settings/content_settings_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_provider_unittest.cc
@@ -16,14 +16,14 @@ TEST(ContentSettingsProviderTest, Mock) {
ContentSettingsPattern::FromString("[*.]youtube.com");
GURL url("http://www.youtube.com");
- MockProvider mock_provider(
+ MockProvider mock_provider(false);
+ mock_provider.SetWebsiteSetting(
pattern,
pattern,
CONTENT_SETTINGS_TYPE_PLUGINS,
"java_plugin",
- CONTENT_SETTING_BLOCK,
- false,
- false);
+ Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
+
EXPECT_EQ(CONTENT_SETTING_BLOCK,
GetContentSetting(&mock_provider, url, url,
diff --git a/chrome/browser/content_settings/content_settings_rule.h b/chrome/browser/content_settings/content_settings_rule.h
index f480bc8..3af9991 100644
--- a/chrome/browser/content_settings/content_settings_rule.h
+++ b/chrome/browser/content_settings/content_settings_rule.h
@@ -14,7 +14,6 @@
#include "base/memory/scoped_vector.h"
#include "base/synchronization/lock.h"
#include "base/values.h"
-#include "chrome/common/content_settings.h"
#include "chrome/common/content_settings_pattern.h"
namespace content_settings {
diff --git a/chrome/browser/content_settings/content_settings_utils.cc b/chrome/browser/content_settings/content_settings_utils.cc
index de814d9..dce7aa7 100644
--- a/chrome/browser/content_settings/content_settings_utils.cc
+++ b/chrome/browser/content_settings/content_settings_utils.cc
@@ -49,10 +49,6 @@ std::string GetTypeName(ContentSettingsType type) {
return std::string(kTypeNames[type]);
}
-bool SupportsResourceIdentifier(ContentSettingsType content_type) {
- return content_type == CONTENT_SETTINGS_TYPE_PLUGINS;
-}
-
ContentSetting ClickToPlayFixup(ContentSettingsType content_type,
ContentSetting setting) {
if (setting == CONTENT_SETTING_ASK &&
diff --git a/chrome/browser/content_settings/content_settings_utils.h b/chrome/browser/content_settings/content_settings_utils.h
index 4b0e81b..2b264c7 100644
--- a/chrome/browser/content_settings/content_settings_utils.h
+++ b/chrome/browser/content_settings/content_settings_utils.h
@@ -28,10 +28,6 @@ typedef std::pair<ContentSettingsPattern, ContentSettingsPattern> PatternPair;
std::string GetTypeName(ContentSettingsType type);
-// Returns true if the |content_type| supports a resource identifier.
-// Resource identifiers are supported (but not required) for plug-ins.
-bool SupportsResourceIdentifier(ContentSettingsType content_type);
-
// Maps CONTENT_SETTING_ASK for the CONTENT_SETTINGS_TYPE_PLUGINS to
// CONTENT_SETTING_BLOCK if click-to-play is not enabled.
ContentSetting ClickToPlayFixup(ContentSettingsType content_type,
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
index 82815fc..ddd7eb7 100644
--- a/chrome/browser/content_settings/host_content_settings_map.cc
+++ b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -68,17 +68,10 @@ bool ContentTypeHasCompoundValue(ContentSettingsType type) {
return type == CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE;
}
-ContentSetting GetDefaultSetting(
- content_settings::RuleIterator* rule_iterator) {
- ContentSettingsPattern wildcard = ContentSettingsPattern::Wildcard();
- while (rule_iterator->HasNext()) {
- content_settings::Rule rule = rule_iterator->Next();
- if (rule.primary_pattern == wildcard &&
- rule.secondary_pattern == wildcard) {
- return content_settings::ValueToContentSetting(rule.value.get());
- }
- }
- return CONTENT_SETTING_DEFAULT;
+// Returns true if the |content_type| supports a resource identifier.
+// Resource identifiers are supported (but not required) for plug-ins.
+bool SupportsResourceIdentifier(ContentSettingsType content_type) {
+ return content_type == CONTENT_SETTINGS_TYPE_PLUGINS;
}
} // namespace
@@ -132,7 +125,16 @@ ContentSetting HostContentSettingsMap::GetDefaultContentSettingFromProvider(
content_settings::ProviderInterface* provider) const {
scoped_ptr<content_settings::RuleIterator> rule_iterator(
provider->GetRuleIterator(content_type, "", false));
- return GetDefaultSetting(rule_iterator.get());
+
+ ContentSettingsPattern wildcard = ContentSettingsPattern::Wildcard();
+ while (rule_iterator->HasNext()) {
+ content_settings::Rule rule = rule_iterator->Next();
+ if (rule.primary_pattern == wildcard &&
+ rule.secondary_pattern == wildcard) {
+ return content_settings::ValueToContentSetting(rule.value.get());
+ }
+ }
+ return CONTENT_SETTING_DEFAULT;
}
ContentSetting HostContentSettingsMap::GetDefaultContentSetting(
@@ -168,6 +170,7 @@ ContentSetting HostContentSettingsMap::GetContentSetting(
const GURL& secondary_url,
ContentSettingsType content_type,
const std::string& resource_identifier) const {
+ DCHECK(!ContentTypeHasCompoundValue(content_type));
scoped_ptr<base::Value> value(GetWebsiteSetting(
primary_url, secondary_url, content_type, resource_identifier, NULL));
return content_settings::ValueToContentSetting(value.get());
@@ -177,7 +180,7 @@ void HostContentSettingsMap::GetSettingsForOneType(
ContentSettingsType content_type,
const std::string& resource_identifier,
ContentSettingsForOneType* settings) const {
- DCHECK(content_settings::SupportsResourceIdentifier(content_type) ||
+ DCHECK(SupportsResourceIdentifier(content_type) ||
resource_identifier.empty());
DCHECK(settings);
@@ -207,7 +210,7 @@ void HostContentSettingsMap::GetSettingsForOneType(
void HostContentSettingsMap::SetDefaultContentSetting(
ContentSettingsType content_type,
ContentSetting setting) {
- DCHECK_NE(content_type, CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE);
+ DCHECK(!ContentTypeHasCompoundValue(content_type));
DCHECK(IsSettingAllowedForType(setting, content_type));
base::Value* value = NULL;
@@ -228,7 +231,7 @@ void HostContentSettingsMap::SetWebsiteSetting(
const std::string& resource_identifier,
base::Value* value) {
DCHECK(IsValueAllowedForType(value, content_type));
- DCHECK(content_settings::SupportsResourceIdentifier(content_type) ||
+ DCHECK(SupportsResourceIdentifier(content_type) ||
resource_identifier.empty());
for (ProviderIterator provider = content_settings_providers_.begin();
provider != content_settings_providers_.end();
@@ -250,7 +253,7 @@ void HostContentSettingsMap::SetContentSetting(
ContentSettingsType content_type,
const std::string& resource_identifier,
ContentSetting setting) {
- DCHECK_NE(content_type, CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE);
+ DCHECK(!ContentTypeHasCompoundValue(content_type));
base::Value* value = NULL;
if (setting != CONTENT_SETTING_DEFAULT)
value = Value::CreateIntegerValue(setting);
@@ -270,6 +273,7 @@ void HostContentSettingsMap::AddExceptionForURL(
// TODO(markusheintz): Until the UI supports pattern pairs, both urls must
// match.
DCHECK(primary_url == secondary_url);
+ DCHECK(!ContentTypeHasCompoundValue(content_type));
// Make sure there is no entry that would override the pattern we are about
// to insert for exactly this URL.
@@ -415,7 +419,7 @@ base::Value* HostContentSettingsMap::GetWebsiteSetting(
ContentSettingsType content_type,
const std::string& resource_identifier,
content_settings::SettingInfo* info) const {
- DCHECK(content_settings::SupportsResourceIdentifier(content_type) ||
+ DCHECK(SupportsResourceIdentifier(content_type) ||
resource_identifier.empty());
// Check if the scheme of the requesting url is whitelisted.
diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h
index 8d538b2..e02c751 100644
--- a/chrome/browser/content_settings/host_content_settings_map.h
+++ b/chrome/browser/content_settings/host_content_settings_map.h
@@ -20,6 +20,7 @@
#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_types.h"
#include "chrome/common/content_settings_pattern.h"
namespace base {