Update pyauto tests to work with the uber page.

chrome/test/functional/special_tabs.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 logging
 import os
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
@@ skipping 29 matching lines @@
     'chrome://about': { 'title': 'Chrome URLs' },
     'chrome://appcache-internals': { 'title': 'AppCache Internals' },
     'chrome://blob-internals': { 'title': 'Blob Storage Internals' },
     'chrome://feedback': {},
     'chrome://feedback/#0': { 'title': 'Feedback' },
     'chrome://chrome-urls': { 'title': 'Chrome URLs' },
     'chrome://crashes': { 'title': 'Crashes' },
     'chrome://credits': { 'title': 'Credits' },
     'chrome://downloads': { 'title': 'Downloads' },
     'chrome://dns': { 'title': 'About DNS' },
-    'chrome://settings/extensions': { 'title': 'Settings - Extensions' },
+    'chrome://extensions': { 'title': 'Extensions' },
     'chrome://flags': {},
     'chrome://flash': {},
     'chrome://gpu-internals': {},
+    'chrome://help': { 'title': 'Help' },
     'chrome://histograms': { 'title': 'About Histograms' },
     'chrome://history': { 'title': 'History' },
     'chrome://media-internals': { 'title': 'Media Internals' },
     'chrome://memory-redirect': { 'title': 'About Memory' },
     'chrome://net-internals': {},
     'chrome://net-internals/help.html': {},
     'chrome://newtab': { 'title': 'New Tab', 'CSP': False },
     'chrome://plugins': { 'title': 'Plug-ins' },
     'chrome://sessions': { 'title': 'Sessions' },
-    'chrome://settings': { 'title': 'Settings - Basics' },
+    'chrome://settings': { 'title': 'Settings' },
+    'chrome://settings/autofill': { 'title': 'Settings - Autofill Settings' },
+    'chrome://settings/clearBrowserData':
+      { 'title': 'Settings - Clear Browsing Data' },
+    'chrome://settings/content': { 'title': 'Settings - Content Settings' },
+    'chrome://settings/languages':
+      { 'title': 'Settings - Languages and Input' },
+    'chrome://settings/passwords': { 'title': 'Settings - Passwords' },
     'chrome://stats': {},
     'chrome://sync': { 'title': 'Sync Internals' },
     'chrome://sync-internals': { 'title': 'Sync Internals' },
     'chrome://tasks': { 'title': 'Task Manager - Chromium' },
     'chrome://terms': {},
     'chrome://version': { 'title': 'About Version' },
     'chrome://view-http-cache': {},
     'chrome://workers': { 'title': 'Workers' },
   }
   broken_special_url_tabs = {
@@ skipping 21 matching lines @@
     'chrome://os-credits': { 'title': 'Credits', 'CSP': False },
     'chrome://proxy-settings': { 'CSP': False },
     'chrome://register': { 'CSP': False },
     'chrome://sim-unlock': { 'title': 'Enter SIM Card PIN', 'CSP': False },
     'chrome://system': { 'title': 'About System', 'CSP': False },
 
     # OVERRIDE - usually a warning page without CSP (so far).
     'chrome://flags': { 'CSP': False },
 
     # OVERRIDE - title and page different on CrOS
-    'chrome://settings/about': { 'title': 'Settings - About' },
     'chrome://settings/accounts': { 'title': 'Settings - Users' },
-    'chrome://settings/advanced': { 'title': 'Settings - Under the Hood' },
-    'chrome://settings/autofill': { 'title': 'Settings - Autofill Settings' },
-    'chrome://settings/browser': { 'title': 'Settings - Basics' },
-    'chrome://settings/clearBrowserData':
-      { 'title': 'Settings - Clear Browsing Data' },
-    'chrome://settings/content': { 'title': 'Settings - Content Settings' },
-    'chrome://settings/extensions': { 'title': 'Settings - Extensions' },
-    'chrome://settings/internet': { 'title': 'Settings - Internet' },
-    'chrome://settings/languages':
-      { 'title': 'Settings - Languages and Input' },
-    'chrome://settings/passwords': { 'title': 'Settings - Passwords' },
-    'chrome://settings/personal': { 'title': 'Settings - Personal Stuff' },
     'chrome://settings/proxy': { 'title': 'Proxy' },
-    'chrome://settings/system': { 'title': 'Settings - System' },
   }
   broken_chromeos_special_url_tabs = {
     # returns "not available" page on chromeos=1 linux but has an URL constant.
     'chrome://activationmessage': { 'CSP': False },
     'chrome://cloudprintresources': { 'CSP': False },
     'chrome://cloudprintsetup': { 'CSP': False },
     'chrome://collected-cookies': { 'CSP': False },
     'chrome://constrained-test': { 'CSP': False },
     'chrome://enterprise-enrollment': { 'CSP': False },
     'chrome://http-auth': { 'CSP': False },
@@ skipping 11 matching lines @@
     'chrome://tasks': {},
   }
 
   linux_special_url_tabs = {
     'chrome://linux-proxy-config': { 'title': 'Proxy Configuration Help' },
     'chrome://tcmalloc': { 'title': 'About tcmalloc' },
     'chrome://sandbox': { 'title': 'Sandbox Status' },
   }
   broken_linux_special_url_tabs = {}
 
-  mac_special_url_tabs = {}
+  mac_special_url_tabs = {
+    'chrome://settings/languages': { 'title': 'Settings - Languages' },
+  }
   broken_mac_special_url_tabs = {}
 
   win_special_url_tabs = {
     'chrome://conflicts': {},
   }
   broken_win_special_url_tabs = {
     # Sync on windows badly broken at the moment.
     'chrome://sync': {},
   }
 
@@ skipping 163 matching lines @@
        IDC_SHOW_DOWNLOADS."""
     for accel, title in self.GetSpecialAcceleratorTabs().iteritems():
       self.RunCommand(accel)
       self.assertTrue(self.WaitUntil(
             self.GetActiveTabTitle, expect_retval=title),
           msg='Expected "%s"' % title)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()