diff options
| author | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 09:14:01 +0000 |
|---|---|---|
| committer | markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-13 09:14:01 +0000 |
| commit | 25ce0a01eec41c211e8995a44c4527f3a36b7a7d (patch) | |
| tree | 740adbb747db332edc7861f4f2627faa6168da2c /chrome/browser/content_settings | |
| parent | f3feb226ef91ab40a937c425a21b9575509fac57 (diff) | |
| download | chromium_src-25ce0a01eec41c211e8995a44c4527f3a36b7a7d.zip chromium_src-25ce0a01eec41c211e8995a44c4527f3a36b7a7d.tar.gz chromium_src-25ce0a01eec41c211e8995a44c4527f3a36b7a7d.tar.bz2 | |
Fix functional tests:
notifications.NotificationsTest.testAllowNotificationsFromAllSites
notifications.NotificationsTest.testCrashRendererNotificationRemain
notifications.NotificationsTest.testCreateDenyCloseNotifications
notifications.NotificationsTest.testCreateHTMLNotification
notifications.NotificationsTest.testCreateSimpleNotification
BUG=76693
TEST=none
Review URL: http://codereview.chromium.org/6823076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81383 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings')
| -rw-r--r-- | chrome/browser/content_settings/content_settings_pref_provider.cc | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc index 7c09a6b..e73ed18 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider.cc @@ -49,7 +49,7 @@ const ContentSetting kDefaultSettings[] = { CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_PLUGINS CONTENT_SETTING_BLOCK, // CONTENT_SETTINGS_TYPE_POPUPS CONTENT_SETTING_ASK, // Not used for Geolocation - CONTENT_SETTING_ASK, // Not used for Notifications + CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_NOTIFICATIONS CONTENT_SETTING_ALLOW, // CONTENT_SETTINGS_TYPE_PRERENDER }; COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES, @@ -71,6 +71,17 @@ const char* kTypeNames[] = { COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES, type_names_incorrect_size); +void SetDefaultContentSettings(DictionaryValue* default_settings) { + default_settings->Clear(); + + for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) { + if (kTypeNames[i] != NULL) { + default_settings->SetInteger(kTypeNames[i], + kDefaultSettings[i]); + } + } +} + } // namespace namespace content_settings { @@ -284,7 +295,16 @@ void PrefDefaultProvider::MigrateObsoleteNotificationPref(PrefService* prefs) { // static void PrefDefaultProvider::RegisterUserPrefs(PrefService* prefs) { - prefs->RegisterDictionaryPref(prefs::kDefaultContentSettings); + // The registration of the preference prefs::kDefaultContentSettings should + // also include the default values for default content settings. This allows + // functional tests to get default content settings by reading the preference + // prefs::kDefaultContentSettings via pyauto. + // TODO(markusheintz): Write pyauto hooks for the content settings map as + // content settings should be read from the host content settings map. + DictionaryValue* default_content_settings = new DictionaryValue(); + SetDefaultContentSettings(default_content_settings); + prefs->RegisterDictionaryPref(prefs::kDefaultContentSettings, + default_content_settings); // Obsolete prefs, for migrations: prefs->RegisterIntegerPref( |