Valgrind/Heapchecker: Add content_browsertests to chrome_tests.py

tools/heapcheck/chrome_tests.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.
 
 ''' 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 64 matching lines @@
   '''
 
   def __init__(self, options, args, test):
     # The known list of tests.
     # Recognise the original abbreviations as well as full executable names.
     self._test_list = {
       "ash": self.TestAsh,              "ash_unittests": self.TestAsh,
       "aura": self.TestAura,            "aura_unittests": self.TestAura,
       "base": self.TestBase,            "base_unittests": self.TestBase,
       "browser": self.TestBrowser,      "browser_tests": self.TestBrowser,
+      "content": self.TestContent,      "content_unittests": self.TestContent,
+      "content_browsertests": self.TestContentBrowser,
+      "courgette": self.TestCourgette,
+      "courgette_unittests": self.TestCourgette,
       "crypto": self.TestCrypto,        "crypto_unittests": self.TestCrypto,
       "googleurl": self.TestGURL,       "googleurl_unittests": self.TestGURL,
-      "content": self.TestContent,      "content_unittests": self.TestContent,
-      "courgette": self.TestCourgette,
-      "courgette_unittests": self.TestCourgette,
       "ipc": self.TestIpc,              "ipc_tests": self.TestIpc,
       "layout": self.TestLayout,        "layout_tests": self.TestLayout,
       "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,
+      "sql": self.TestSql,              "sql_unittests": self.TestSql,
       "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_unit": self.TestUIUnit,       "ui_unittests": self.TestUIUnit,
       "unit": self.TestUnit,            "unit_tests": self.TestUnit,
       "views": self.TestViews,          "views_unittests": self.TestViews,
-      "sql": self.TestSql,              "sql_unittests": self.TestSql,
-      "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 135 matching lines @@
 
   def TestAura(self):
     return self.SimpleTest("aura", "aura_unittests")
 
   def TestBase(self):
     return self.SimpleTest("base", "base_unittests")
 
   def TestBrowser(self):
     return self.SimpleTest("chrome", "browser_tests")
 
+  def TestContent(self):
+    return self.SimpleTest("content", "content_unittests")
+
+  def TestContentBrowser(self):
+    return self.SimpleTest("content", "content_browsertests")
+
+  def TestCourgette(self):
+    return self.SimpleTest("courgette", "courgette_unittests")
+
   def TestCrypto(self):
     return self.SimpleTest("crypto", "crypto_unittests")
 
   def TestGURL(self):
     return self.SimpleTest("chrome", "googleurl_unittests")
 
-  def TestContent(self):
-    return self.SimpleTest("content", "content_unittests")
-
-  def TestCourgette(self):
-    return self.SimpleTest("courgette", "courgette_unittests")
+  def TestIpc(self):
+    return self.SimpleTest("ipc", "ipc_tests")
 
   def TestMedia(self):
     return self.SimpleTest("chrome", "media_unittests")
 
+  def TestNet(self):
+    return self.SimpleTest("net", "net_unittests")
+
   def TestPrinting(self):
     return self.SimpleTest("chrome", "printing_unittests")
 
   def TestRemoting(self):
     return self.SimpleTest("chrome", "remoting_unittests")
 
   def TestSync(self):
     return self.SimpleTest("chrome", "sync_unit_tests")
 
-  def TestIpc(self):
-    return self.SimpleTest("ipc", "ipc_tests")
-
-  def TestNet(self):
-    return self.SimpleTest("net", "net_unittests")
-
   def TestStartup(self):
     # We don't need the performance results, we're just looking for pointer
     # errors, so set number of iterations down to the minimum.
     os.putenv("STARTUP_TESTS_NUMCYCLES", "1")
     logging.info("export STARTUP_TESTS_NUMCYCLES=1");
     return self.SimpleTest("chrome", "startup_tests")
 
   def TestTestShell(self):
     return self.SimpleTest("webkit", "test_shell_tests")
 
+  def TestUIUnit(self):
+    return self.SimpleTest("chrome", "ui_unittests")
+
   def TestUnit(self):
     return self.SimpleTest("chrome", "unit_tests")
 
+  def TestSql(self):
+    return self.SimpleTest("chrome", "sql_unittests")
+
   def TestViews(self):
     return self.SimpleTest("views", "views_unittests")
 
-  def TestSql(self):
-    return self.SimpleTest("chrome", "sql_unittests")
-
-  def TestUIUnit(self):
-    return self.SimpleTest("chrome", "ui_unittests")
-
   def TestGfx(self):
     # Run ui_unittests, a successor of gfx_unittests, since gfx_unittests is
     # deprecated.
     # TODO(hbono): This is a band-aid fix. We need to change the master script
     # so our bots run ui_unittests.
     return self.SimpleTest("chrome", "ui_unittests")
 
   def TestLayoutChunk(self, chunk_num, chunk_size):
     '''Runs tests [chunk_num*chunk_size .. (chunk_num+1)*chunk_size).
 
@@ skipping 139 matching lines @@
   for t in options.test:
     tests = ChromeTests(options, args, t)
     ret = tests.Run()
     if ret:
       return ret
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())