Fix functional tests notifications.NotificationsTest(s)

chrome/browser/content_settings/content_settings_pref_provider.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_pref_provider.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 31 matching lines @@
                resource_type_names_incorrect_size);
 
 // The default setting for each content type.
 const ContentSetting kDefaultSettings[] = {
   CONTENT_SETTING_ALLOW,  // CONTENT_SETTINGS_TYPE_COOKIES
   CONTENT_SETTING_ALLOW,  // CONTENT_SETTINGS_TYPE_IMAGES
   CONTENT_SETTING_ALLOW,  // CONTENT_SETTINGS_TYPE_JAVASCRIPT
   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,
                default_settings_incorrect_size);
 
 // The names of the ContentSettingsType values, for use with dictionary prefs.
 const char* kTypeNames[] = {
   "cookies",
   "images",
   "javascript",
   "plugins",
   "popups",
   NULL,  // Not used for Geolocation
   // TODO(markusheintz): Refactoring in progress. Content settings exceptions
   // for notifications will be added next.
   "notifications",  // Only used for default Notifications settings.
   NULL,  // Not used for Prerender
 };
 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(std::string(kTypeNames[i]),

[kkania, 2011/04/12 16:42:42]

remove std::string

[markusheintz_, 2011/04/12 17:21:49]

Done.

+                                   kDefaultSettings[i]);
+    }
+  }
+}
+
 }  // namespace
 
 namespace content_settings {
 
 PrefDefaultProvider::PrefDefaultProvider(Profile* profile)
     : profile_(profile),
       is_incognito_(profile_->IsOffTheRecord()),
       updating_preferences_(false) {
   initializing_ = true;
   PrefService* prefs = profile->GetPrefs();
@@ skipping 193 matching lines @@
   if (prefs->HasPrefPath(prefs::kDesktopNotificationDefaultContentSetting)) {
     ContentSetting setting = IntToContentSetting(
         prefs->GetInteger(prefs::kDesktopNotificationDefaultContentSetting));
     UpdateDefaultSetting(CONTENT_SETTINGS_TYPE_NOTIFICATIONS, setting);
     prefs->ClearPref(prefs::kDesktopNotificationDefaultContentSetting);
   }
 }
 
 // static
 void PrefDefaultProvider::RegisterUserPrefs(PrefService* prefs) {
-  prefs->RegisterDictionaryPref(prefs::kDefaultContentSettings);
+  // If no default values are set explicitely for the
+  // prefs::kDefaultContentSettings preference an empty dictionary will be used
+  // as default value instead. This has some issues. For example pyauto tests
+  // can't get the default values for content settings as the default value of
+  // the preference prefs::kDefaultContentSettings is an empty dictionary. To
+  // prevent that functional tests need to know the default content settings
+  // expliciatly we set them here.

[kkania, 2011/04/12 16:42:42]

this comment is a bit wordy yet confusing; part of this is due to 'of' instead
of 'if' in line 301. Please revise

[markusheintz_, 2011/04/12 17:21:49]

Done.

+  // TODO(markusheintz): Write pyauto hooks for the content settings map, as the
+  // content settings map should be used as exclusive source for content
+  // settings.
+  DictionaryValue* default_content_settings = new DictionaryValue();
+  SetDefaultContentSettings(default_content_settings);
+  prefs->RegisterDictionaryPref(prefs::kDefaultContentSettings,
+                                default_content_settings);
 
   // Obsolete prefs, for migrations:
   prefs->RegisterIntegerPref(
       prefs::kDesktopNotificationDefaultContentSetting,
           kDefaultSettings[CONTENT_SETTINGS_TYPE_NOTIFICATIONS]);
 }
 
 // ////////////////////////////////////////////////////////////////////////////
 // PrefProvider:
 //
@@ skipping 500 matching lines @@
                         ContentSettingsPattern(host),
                         CONTENT_SETTINGS_TYPE_POPUPS,
                         "",
                         CONTENT_SETTING_ALLOW);
     }
     prefs->ClearPref(prefs::kPopupWhitelistedHosts);
   }
 }
 
 }  // namespace content_settings