Fix functional tests notifications.NotificationsTest(s)

chrome/test/functional/notifications.py

 #!/usr/bin/python
-# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# 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.
 
 import os
 import urllib
 
 import pyauto_functional
 import pyauto
 
 
@@ skipping 16 matching lines @@
 
     This method will not run automatically.
     """
     while True:
       raw_input('Interact with the browser and hit <enter> to dump notification'
                 'state...')
       print '*' * 20
       import pprint
       pp = pprint.PrettyPrinter(indent=2)
       pp.pprint(self.GetActiveNotifications())
+      pp.pprint(self._GetDefaultPermissionSetting())
 
   def _SetDefaultPermissionSetting(self, setting):
     """Sets the default setting for whether sites are allowed to create
     notifications.
     """
-    self.SetPrefs(pyauto.kDesktopNotificationDefaultContentSetting, setting)
+    self.SetPrefs(pyauto.kDefaultContentSettings, {u'notifications': setting})
 
   def _GetDefaultPermissionSetting(self):
     """Gets the default setting for whether sites are allowed to create
     notifications.
     """
     return self.GetPrefsInfo().Prefs(
-        pyauto.kDesktopNotificationDefaultContentSetting)
+        pyauto.kDefaultContentSettings)[u'notifications']
 
   def _GetDeniedOrigins(self):
     """Gets the list of origins that are explicitly denied to create
     notifications.
     """
     return (self.GetPrefsInfo().Prefs(pyauto.kDesktopNotificationDeniedOrigins)
             or [])
 
   def _GetAllowedOrigins(self):
     """Gets the list of origins that are explicitly allowed to create
@@ skipping 470 matching lines @@
     # Since this notification has the same replaceId, 'chat', it should replace
     # the first notification.
     self._CreateHTMLNotification(self.NO_SUCH_URL, 'chat')
     notifications = self.GetActiveNotifications()
     self.assertEquals(1, len(notifications))
     self.assertEquals(self.NO_SUCH_URL, notifications[0]['content_url'])
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()