Fixed the history.HistoryTest.testOneHistoryTabPerWindow pyauto.

chrome/test/functional/history.py

Index: chrome/test/functional/history.py
diff --git a/chrome/test/functional/history.py b/chrome/test/functional/history.py
index 7608ae409cca4e1a5cf47868845c3c5aa4be64cf..1a870ad668ca17b95279d26fcc8ea7bcc7dae661 100755
--- a/chrome/test/functional/history.py
+++ b/chrome/test/functional/history.py
@@ -326,6 +326,12 @@ class HistoryTest(pyauto.PyUITest):
 
     Also, make sure that existing history tab is activated.
     """
+    command_line = self.GetBrowserInfo()['properties']['command_line_string']
+    if '--disable-uber-page' in command_line.split():
+      history_url = 'chrome://history-frame/'
+    else:
+      history_url = 'chrome://chrome/history/'
+
     # Invoke History.
     self.RunCommand(pyauto.IDC_SHOW_HISTORY)
     self.assertEqual('History', self.GetActiveTabTitle(),
@@ -338,12 +344,12 @@ class HistoryTest(pyauto.PyUITest):
     # Verify there is only one history tab, and that it is activated.
     tab0url = self.GetBrowserInfo()['windows'][0]['tabs'][0]['url']
     self.assertEqual(
-        'chrome://history/', tab0url, msg='Tab 0: expected = %s, actual = %s.'
-            % ('chrome://history/',  tab0url))
+        history_url, tab0url, msg='Tab 0: expected = %s, actual = %s.'
+            % (history_url,  tab0url))
 
     tab1url = self.GetBrowserInfo()['windows'][0]['tabs'][1]['url']
     self.assertNotEqual(
-        'chrome://history/', tab1url,
+        history_url, tab1url,
         msg='Tab 1: History page not expected.')
 
     self.assertEqual('History', self.GetActiveTabTitle(),