Fix instant test on Mac: use cgi.parse_qs() instead of urlparse.urlparse()

chrome/test/functional/instant.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 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 cgi
 import os
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
-import urlparse
 
 
 class InstantTest(pyauto.PyUITest):
   """TestCase for Omnibox Instant feature."""
 
   def setUp(self):
     pyauto.PyUITest.setUp(self)
     self.SetPrefs(pyauto.kInstantEnabled, True)
 
   def _DoneLoading(self):
     info = self.GetInstantInfo()
     return info.get('current') and not info.get('loading')
 
   def _DoneLoadingGoogleQuery(self, query):
     """Wait for Omnibox Instant to load Google search result
        and verify location URL contains the specifed query.
 
        Args:
          query: Value of query parameter.
                 E.g., http://www.google.com?q=hi so query is 'hi'.
     """
     self.assertTrue(self.WaitUntil(self._DoneLoading))
     location = self.GetInstantInfo().get('location')
     if location is not None:
-      q = urlparse.parse_qs(location).get('q')
+      q = cgi.parse_qs(location).get('q')
       if q is not None and query in q:
         return True
     return False
 
   def testInstantNavigation(self):
     """Test that instant navigates based on omnibox input."""
     self.SetOmniboxText('google.com')
     self.assertTrue(self.WaitUntil(self._DoneLoading))
     location = self.GetInstantInfo()['location']
     self.assertTrue('google.com' in location,
@@ skipping 48 matching lines @@
 
   def testInstantLoadsFor100CharsLongQuery(self):
     """Test that instant loads for search query of 100 characters."""
     query = '#' * 100
     self.SetOmniboxText(query)
     self.assertTrue(self.WaitUntil(self._DoneLoadingGoogleQuery, args=[query]))
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()