Unwire the clear on exit preference from the storage systems.

chrome/test/functional/cookies.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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 logging
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
@@ skipping 125 matching lines @@
     self.assertEquals({u'cookies': 2},
         self.GetPrefsInfo().Prefs(pyauto.kDefaultContentSettings),
         msg='Cookie setting did not persist after restarting session.')
     self.assertFalse(self.GetCookie(pyauto.GURL(file_url)),
                      msg='Cookies are not blocked.')
     self.assertFalse(self.GetCookie(pyauto.GURL(http_url)),
                      msg='Cookies are not blocked.')
     self.assertFalse(self.GetCookie(pyauto.GURL(https_url)),
                      msg='Cookies are not blocked.')
 
-  def testClearCookiesOnEndingSession(self):
-    """Verify that cookies are cleared when the browsing session is closed."""
-
-    # This test fails on ChromeOS because kRestoreOnStartup is ignored and
-    # the startup preference is always "continue where I left off."
-    if self.IsChromeOS():
-      logging.info('Skipping testClearCookiesOnEndingSession on ChromeOS')
-      return
-
-    file_url = self.GetFileURLForDataPath('setcookie.html')
-    self.assertFalse(self.GetCookie(pyauto.GURL(file_url)),
-                     msg='There should be no cookies on %s' % file_url)
-
-    # Set the option to clear cookies when the browser session is closed.
-    self.SetPrefs(pyauto.kClearSiteDataOnExit, True)
-
-    self.NavigateToURL(file_url)
-    self.assertEqual('name=Good', self.GetCookie(pyauto.GURL(file_url)),
-                     msg='Unable to retrieve the cookie name=Good')
-
-    # Restart and verify that cookie does not persist
-    self.RestartBrowser(clear_profile=False)
-    self.assertFalse(self.GetCookie(pyauto.GURL(file_url)),
-                     msg='Cookie persisted after restarting session.')
-
   def testAllowCookiesUsingExceptions(self):
     """Verify that cookies can be allowed and set using exceptions for
     particular website(s) when all others are blocked."""
     http_url = 'http://%s' % self.test_host
     self.assertFalse(self.GetCookie(pyauto.GURL(http_url)),
                      msg='There should be no cookies on %s' % http_url)
 
     # Set the preference to block all cookies.
     self.SetPrefs(pyauto.kDefaultContentSettings, {u'cookies': 2})
 
@@ skipping 60 matching lines @@
     # Restart the browser to check that the cookie doesn't persist.
     # (This fails on ChromeOS because kRestoreOnStartup is ignored and
     # the startup preference is always "continue where I left off.")
     if not self.IsChromeOS():
       self.RestartBrowser(clear_profile=False)
       self.assertFalse(self.GetCookie(pyauto.GURL(http_url)),
                        msg='Cookie persisted after restarting session.')
 
 if __name__ == '__main__':
   pyauto_functional.Main()