Valgrind / Heapcheck: Remove ui_tests from test harness.

BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10382193

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137472 0039d316-1c4b-4281-b951-d872f2087c98

tools/heapcheck/chrome_tests.py

@@ -96,7 +96,6 @@ class ChromeTests(object):
       "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,
       "views": self.TestViews,          "views_unittests": self.TestViews,
       "sql": self.TestSql,              "sql_unittests": self.TestSql,
@@ -311,12 +310,6 @@ class ChromeTests(object):
   def TestGfx(self):
     return self.SimpleTest("chrome", "gfx_unittests")
 
-  def TestUI(self):
-    return self.SimpleTest("chrome", "ui_tests",
-                           cmd_args=[
-                            "--ui-test-action-timeout=80000",
-                            "--ui-test-action-max-timeout=180000"])
-
   def TestLayoutChunk(self, chunk_num, chunk_size):
     '''Runs tests [chunk_num*chunk_size .. (chunk_num+1)*chunk_size).
 

tools/valgrind/chrome_tests.py

@@ -345,11 +345,6 @@ class ChromeTests:
                            valgrind_test_args=self.UI_VALGRIND_ARGS,
                            cmd_args=(["--ui-test-action-max-timeout=450000"]))
 
-  def TestUI(self):
-    return self.SimpleTest("chrome", "ui_tests",
-                           valgrind_test_args=self.UI_VALGRIND_ARGS,
-                           cmd_args=self.UI_TEST_ARGS)
-
   def TestLayoutChunk(self, chunk_num, chunk_size):
     # Run tests [chunk_num*chunk_size .. (chunk_num+1)*chunk_size) from the
     # list of tests.  Wrap around to beginning of list at end.
@@ -494,7 +489,6 @@ class ChromeTests:
     "sync_integration_tests": TestSyncIntegration,
     "sync_integration": TestSyncIntegration,
     "test_shell": TestTestShell, "test_shell_tests": TestTestShell,
-    "ui": TestUI,                "ui_tests": TestUI,
     "unit": TestUnit,            "unit_tests": TestUnit,
     "sql": TestSql,              "sql_unittests": TestSql,
     "ui_unit": TestUIUnit,       "ui_unittests": TestUIUnit,