Fixing omnibox continues search (pyauto) problem on non-mac machine

functional/omnibox.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 glob
 import os
 import re
 import shutil
 import tempfile
@@ skipping 262 matching lines @@
     partial_url = self._GetOmniboxMatchesFor(split_url.scheme, windex=windex)
     self._VerifyHasBookmarkResult(partial_url)
     # Check if the partial title would get the bookmark.
     split_title = title.split()
     search_term = split_title[len(split_title) - 1]
     partial_title = self._GetOmniboxMatchesFor(search_term, windex=windex)
     self._VerifyHasBookmarkResult(partial_title)
 
   def _GotNewMatches(self, old_matches_len, search_text):
     """Determines if omnibox has any new matches"""
     # On Windows, omnibox doesn't change results if searching the same text

[Nirnimesh, 2011/01/07 22:05:51]

and fix this comment

     # repeatedly. So setting '' in omnibox before any search for non-Mac
     # platforms.
     if not self.IsMac():

[sunandt, 2011/01/07 21:41:51]

To be consistent, I think you should remove the check here as well.

[Nirnimesh, 2011/01/07 22:05:51]

+1

       self.SetOmniboxText('')
     new_matches = self._GetOmniboxMatchesFor(search_text)
     if len(new_matches) > old_matches_len:
       return True
     return False
 
   def testContentHistory(self):
     """Verify omnibox results when entering page content
 
     Test verifies that visited page shows up in omnibox on entering page
     content.
     """
     search_text = 'British throne'
     old_matches = self._GetOmniboxMatchesFor(search_text)
     url = self.GetFileURLForPath(
         os.path.join(self.DataDir(), 'find_in_page', 'largepage.html'))
     self.AppendTab(pyauto.GURL(url))
     self.assertTrue(self.WaitUntil(lambda: self._GotNewMatches(len(old_matches),
                                    search_text), timeout=1))
     matches = self._GetOmniboxMatchesFor(search_text)
     matches_description = [x for x in matches if x['destination_url'] == url]
     self.assertEqual(1, len(matches_description))
 
   def _GotHistoryPageOption(self, search_text):
     """Determines if omnibox returns an 'open history page' option for given
        search text"""
+    if not self.IsMac():

[Nirnimesh, 2011/01/07 21:03:03]

why not do this even on Mac?

+      self.SetOmniboxText('')

[Nirnimesh, 2011/01/07 22:05:51]

add a comment here

     matches = self._GetOmniboxMatchesFor(search_text)
     matches_description = [x for x in matches if x['type'] ==
                            'open-history-page']
     return len(matches_description) != 0
 
   def testRecentPageHistory(self):
     """Verify that omnibox shows recent history option in the visited
        url list."""
     search_text = 'file'
     sites = glob.glob(os.path.join(self.DataDir(), 'find_in_page', '*.html'))
@@ skipping 31 matching lines @@
     self.NavigateToURL(url, 1, 0)
     self._CheckBookmarkResultForVariousInputs(url, title, windex=1)
     self.RunCommand(pyauto.IDC_NEW_INCOGNITO_WINDOW)
     self.assertEqual(3, self.GetBrowserWindowCount())
     self.NavigateToURL(url, 2, 0)
     self._CheckBookmarkResultForVariousInputs(url, title, windex=2)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()