Revert "Remove linux_aura from CQ, merge aura tests onto linux_rel."

This reverts commit 706b8aa5feddd9c2d7523bac3901da895e83b380.

The reverted CL was part of an effort to bring down TryServer / CQ load after
Aura was being built on ToT, merging linux_rel and linux_aura since they were
essentially the same config. Building Aura by default is now being reverted, so
this CL is being reverted as well.

BUG=319075
R=cmp@chromium.org, dpranke@chromium.org, stip@chromium.org

Review URL: https://codereview.chromium.org/61593009

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/commit-queue@235270 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/projects.py b/projects.py
index ed06c07..0e4f62a 100644
--- a/projects.py
+++ b/projects.py
@@ -299,6 +299,19 @@
         'unit_tests',
         #'webkit_unit_tests',
     ]
+    # Use a smaller set of tests for *_aura, since there's a lot of overlap with
+    # the corresponding *_rel builders.
+    # Note: *_aura are Release builders even if their names convey otherwise.
+    linux_aura_tests = [
+      'app_list_unittests',
+      'aura_unittests',
+      'browser_tests',
+      'compositor_unittests',
+      'content_browsertests',
+      'content_unittests',
+      'interactive_ui_tests',
+      'unit_tests',
+    ]
     builders_and_tests = {
       # TODO(maruel): Figure out a way to run 'sizes' where people can
       # effectively update the perf expectation correctly.  This requires a
@@ -321,6 +334,7 @@
         'ui_unittests',
       ],
       'ios_rel_device': ['compile'],
+      'linux_aura': linux_aura_tests,
       'linux_clang': ['compile'],
       'linux_chromeos_clang': ['compile'],
       # Note: It is a Release builder even if its name convey otherwise.
@@ -335,12 +349,9 @@
         'sandbox_linux_unittests',
       ],
       'linux_rel': standard_tests + [
-        'app_list_unittests',
-        'aura_unittests',
         'cc_unittests',
         'chromedriver2_unittests',
         'components_unittests',
-        'compositor_unittests',
         'nacl_integration',
         'remoting_unittests',
         'sandbox_linux_unittests',