Remove app_unittests and add sql_unittests.

masters/master.chromium.memory/master.cfg

Index: masters/master.chromium.memory/master.cfg
diff --git a/masters/master.chromium.memory/master.cfg b/masters/master.chromium.memory/master.cfg
index aed270f783145a34d1b2d75ed8fd2e4dddf7fde5..6c7ea6517a823aba408769558ca610af223fc49d 100644
--- a/masters/master.chromium.memory/master.cfg
+++ b/masters/master.chromium.memory/master.cfg
@@ -232,13 +232,13 @@ f_chromium_rel_linux_valgrind_tests_4 = F_LINUX(
     target='Release',
     slave_type='Tester',
     build_url=chromium_linux_valgrind_archive,
-    tests=['valgrind_app',
-           'valgrind_googleurl',
+    tests=['valgrind_googleurl',
            'valgrind_ipc',
            'valgrind_media',
            'valgrind_printing',
            'valgrind_remoting',
            'valgrind_safe_browsing',
+           'valgrind_sql',
            'valgrind_ui_7_of_10',
            'valgrind_ui_8_of_10',
            ],
@@ -264,8 +264,7 @@ f_chromium_rel_linux_tsan = F_LINUX(
     build_url=chromium_linux_valgrind_archive,
     # New tests must first update src/tools/valgrind/chrome_tests.py to
     # handle the test name, without the 'tsan_' prefix.
-    tests=['tsan_app',
-           'tsan_base',
+    tests=['tsan_base',
            'tsan_crypto',
            'tsan_googleurl',
            'tsan_net',
@@ -275,6 +274,7 @@ f_chromium_rel_linux_tsan = F_LINUX(
            'tsan_remoting',
            'tsan_gfx',
            'tsan_sync',
+           'tsan_sql',
            'tsan_unit_1_of_2',
            'tsan_unit_2_of_2',
            ],
@@ -307,8 +307,7 @@ f_chromium_rel_linux_tsan_ui_2 = F_LINUX(
 f_chromium_rel_linux_valgrind_builder = F_LINUX(
     target='Release',
     slave_type='Builder',
-    options=['app_unittests',
-             'base_unittests',
+    options=['base_unittests',
              'crypto_unittests',
              'googleurl_unittests',
              'ipc_tests',
@@ -318,6 +317,7 @@ f_chromium_rel_linux_valgrind_builder = F_LINUX(
              'printing_unittests',
              'remoting_unittests',
              'safe_browsing_tests',
+             'sql_unittests',
              'sync_unit_tests',
              'ui_tests',
              'unit_tests',
@@ -336,7 +336,7 @@ f_chromium_dbg_linux_heapcheck = F_LINUX(
              'media_unittests',
              'courgette_unittests',
              'remoting_unittests',
-             'app_unittests',
+             'sql_unittests',
              'sync_unit_tests',
              'ipc_tests',
              'base_unittests',
@@ -354,7 +354,7 @@ f_chromium_dbg_linux_heapcheck = F_LINUX(
            'heapcheck_media',
            'heapcheck_courgette',
            'heapcheck_remoting',
-           'heapcheck_app',
+           'heapcheck_sql',
            'heapcheck_sync',
            'heapcheck_ipc',
            'heapcheck_base',
@@ -407,8 +407,7 @@ f_cr_dbg_mac_valgrind_1 = F_MAC(
     # 'chromium_builder_dbg_valgrind_mac' target in src/build/all.gyp, then
     # src/tools/valgrind/chrome_tests.py must be updated to handle the test
     # name, without the 'valgrind_' prefix.
-    tests=['valgrind_app',
-           'valgrind_base',
+    tests=['valgrind_base',
            'valgrind_crypto',
            'valgrind_googleurl',
            'valgrind_ipc',
@@ -416,6 +415,7 @@ f_cr_dbg_mac_valgrind_1 = F_MAC(
            'valgrind_printing',
            'valgrind_remoting',
            'valgrind_safe_browsing',
+           'valgrind_sql',
            'valgrind_gfx',
            'valgrind_unit_1_of_4',
            'valgrind_unit_2_of_4',
@@ -446,16 +446,16 @@ f_cr_dbg_mac_tsan = F_MAC(
     # 'chromium_builder_dbg_valgrind_mac' target in src/build/all.gyp, then
     # src/tools/valgrind/chrome_tests.py must be updated to handle the test
     # name, without the 'tsan_' prefix.
-    tests=['tsan_app',
-           'tsan_base',
+    tests=['tsan_base',
            'tsan_crypto',
+           'tsan_gfx',
            'tsan_googleurl',
            'tsan_net',
            'tsan_ipc',
            'tsan_media',
            'tsan_printing',
            'tsan_remoting',
-           'tsan_gfx',
+           'tsan_sql',
            'tsan_sync'])
 
 f_cr_rel_mac_valgrind_ui_1 = F_MAC(
@@ -509,8 +509,7 @@ f_webkit_rel_mac_valgrind = F_MAC(
 f_chromium_rel_chromeos_valgrind_builder = F_CR_OS(
     target='Release',
     slave_type='Builder',
-    options=['app_unittests',
-             'base_unittests',
+    options=['base_unittests',
              'crypto_unittests',
              'googleurl_unittests',
              'ipc_tests',
@@ -520,6 +519,7 @@ f_chromium_rel_chromeos_valgrind_builder = F_CR_OS(
              'printing_unittests',
              'remoting_unittests',
              'safe_browsing_tests',
+             'sql_unittests',
              'sync_unit_tests',
              'ui_tests',
              'unit_tests',
@@ -569,12 +569,12 @@ f_chromium_rel_chromeos_valgrind_tests_4 = F_CR_OS(
     target='Release',
     slave_type='Tester',
     build_url=chromium_chromeos_valgrind_archive,
-    tests=['valgrind_app',
-           'valgrind_googleurl',
+    tests=['valgrind_googleurl',
            'valgrind_ipc',
            'valgrind_media',
            'valgrind_printing',
            'valgrind_remoting',
+           'valgrind_sql',
            'valgrind_ui_7_of_10',
            'valgrind_ui_8_of_10',
            ],
@@ -606,7 +606,7 @@ f_chromium_dbg_win_tsan = F_WIN(
       'tsan_googleurl',
       'tsan_printing',
       'tsan_remoting',
-      'tsan_app',
+      'tsan_sql',
       'tsan_media',
       'tsan_ipc',
       'tsan_base',