Don't force non-session only cookies to be session only cookies, instead delete on shutdown

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
 
 
 class CookiesTest(pyauto.PyUITest):
   """Tests for Cookies."""
 
   def __init__(self, methodName='runTest'):
     super(CookiesTest, self).__init__(methodName)
-    self.test_host = os.environ.get('COOKIES_TEST_HOST', 'www.google.com')
+    self.test_host = os.environ.get('COOKIES_TEST_HOST', 'google.com')
 
   def setUp(self):
     pyauto.PyUITest.setUp(self);
     # Set the startup preference to "open the new tab page", if the startup
     # preference is "continue where I left off", session cookies will be saved.
     self.SetPrefs(pyauto.kRestoreOnStartup, 5);
 
   def _CookieCheckIncognitoWindow(self, url, cookies_enabled=True):
     """Check the cookie for the given URL in an incognito window."""
     # Navigate to the URL in an incognito window and verify no cookie is set.
@@ skipping 212 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()