Normalize the top-level ui/ module.

tools/heapcheck/chrome_tests.py

 #!/usr/bin/python
 
 # Copyright (c) 2009 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.
 
 ''' Runs various chrome tests through heapcheck_test.py.
 
 Most of this code is copied from ../valgrind/chrome_tests.py.
 TODO(glider): put common functions to a standalone module.
@@ skipping 78 matching lines @@
       "media": self.TestMedia,          "media_unittests": self.TestMedia,
       "net": self.TestNet,              "net_unittests": self.TestNet,
       "printing": self.TestPrinting,    "printing_unittests": self.TestPrinting,
       "remoting": self.TestRemoting,    "remoting_unittests": self.TestRemoting,
       "startup": self.TestStartup,      "startup_tests": self.TestStartup,
       "sync": self.TestSync,            "sync_unit_tests": self.TestSync,
       "test_shell": self.TestTestShell, "test_shell_tests": self.TestTestShell,
       "ui": self.TestUI,                "ui_tests": self.TestUI,
       "unit": self.TestUnit,            "unit_tests": self.TestUnit,
       "app": self.TestApp,              "app_unittests": self.TestApp,
-      "ui_base": self.TestUIBase,       "ui_base_unittests": self.TestUIBase,
+      "ui_unit": self.TestUIUnit,       "ui_unittests": self.TestUIUnit,
       "gfx": self.TestGfx,              "gfx_unittests": self.TestGfx,
     }
 
     if test not in self._test_list:
       raise TestNotFound("Unknown test: %s" % test)
 
     self._options = options
     self._args = args
     self._test = test
 
@@ skipping 177 matching lines @@
 
   def TestTestShell(self):
     return self.SimpleTest("webkit", "test_shell_tests")
 
   def TestUnit(self):
     return self.SimpleTest("chrome", "unit_tests")
 
   def TestApp(self):
     return self.SimpleTest("chrome", "app_unittests")
 
-  def TestUIBase(self):
-    return self.SimpleTest("chrome", "ui_base_unittests")
+  def TestUIUnit(self):
+    return self.SimpleTest("chrome", "ui_unittests")
 
   def TestGfx(self):
     return self.SimpleTest("chrome", "gfx_unittests")
 
   def TestUI(self):
     return self.SimpleTest("chrome", "ui_tests",
                            cmd_args=[
                             "--ui-test-timeout=120000",
                             "--ui-test-action-timeout=80000",
                             "--ui-test-action-max-timeout=180000",
@@ skipping 145 matching lines @@
   return 0
 
 
 if __name__ == "__main__":
   if sys.platform == 'linux2':
     ret = _main(sys.argv)
   else:
     logging.error("Heap checking works only on Linux at the moment.")
     ret = 1
   sys.exit(ret)