Add 7 small gtests to the amd64-generic CrOS simplechrome CQ bot.

Also add a couple not-so-small gtests (base_unittests and net_unittests)
to the fyi test bot.

Current test pool has 20 bots. Will bump more if needed, but given how
rarely I think analyze would trigger these specific tests, maybe not
needed?

Bug: 840967
Change-Id: Id71c7f0899790da95a8c3ff60ea62d3f831511ee
Reviewed-on: https://chromium-review.googlesource.com/1053235Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Commit-Queue: Ben Pastene <bpastene@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557562}

testing/buildbot/chromium.chromiumos.json

@@ -403,6 +403,99 @@
   "chromeos-amd64-generic-rel": {
     "additional_compile_targets": [
       "chromiumos_preflight"
+    ],
+    "gtest_tests": [
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "kvm": "1",
+              "os": "Ubuntu-14.04",
+              "pool": "Chrome-CrOS-VM"
+            }
+          ]
+        },
+        "test": "cacheinvalidation_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "kvm": "1",
+              "os": "Ubuntu-14.04",
+              "pool": "Chrome-CrOS-VM"
+            }
+          ]
+        },
+        "test": "capture_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "kvm": "1",
+              "os": "Ubuntu-14.04",
+              "pool": "Chrome-CrOS-VM"
+            }
+          ]
+        },
+        "test": "crypto_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "kvm": "1",
+              "os": "Ubuntu-14.04",
+              "pool": "Chrome-CrOS-VM"
+            }
+          ]
+        },
+        "test": "google_apis_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "kvm": "1",
+              "os": "Ubuntu-14.04",
+              "pool": "Chrome-CrOS-VM"
+            }
+          ]
+        },
+        "test": "midi_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "kvm": "1",
+              "os": "Ubuntu-14.04",
+              "pool": "Chrome-CrOS-VM"
+            }
+          ]
+        },
+        "test": "sql_unittests"
+      },
+      {
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "kvm": "1",
+              "os": "Ubuntu-14.04",
+              "pool": "Chrome-CrOS-VM"
+            }
+          ]
+        },
+        "test": "url_unittests"
+      }
     ]
   },
   "chromeos-daisy-rel": {

testing/buildbot/chromium.fyi.json

@@ -8085,73 +8085,7 @@
             }
           ]
         },
-        "test": "cacheinvalidation_unittests"
-      },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "kvm": "1",
-              "os": "Ubuntu-14.04",
-              "pool": "Chrome-CrOS-VM"
-            }
-          ]
-        },
-        "test": "capture_unittests"
-      },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "kvm": "1",
-              "os": "Ubuntu-14.04",
-              "pool": "Chrome-CrOS-VM"
-            }
-          ],
-          "shards": 2
-        },
-        "test": "crypto_unittests"
-      },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "kvm": "1",
-              "os": "Ubuntu-14.04",
-              "pool": "Chrome-CrOS-VM"
-            }
-          ]
-        },
-        "test": "google_apis_unittests"
-      },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "kvm": "1",
-              "os": "Ubuntu-14.04",
-              "pool": "Chrome-CrOS-VM"
-            }
-          ]
-        },
-        "test": "midi_unittests"
-      },
-      {
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "kvm": "1",
-              "os": "Ubuntu-14.04",
-              "pool": "Chrome-CrOS-VM"
-            }
-          ]
-        },
-        "test": "sql_unittests"
+        "test": "base_unittests"
       },
       {
         "swarming": {
@@ -8164,7 +8098,7 @@
             }
           ]
         },
-        "test": "url_unittests"
+        "test": "net_unittests"
       }
     ],
     "isolated_scripts": [

testing/buildbot/test_suites.pyl

@@ -362,17 +362,18 @@
   'chromeos_gtests': {
     'cacheinvalidation_unittests': {},
     'capture_unittests': {},
-    'crypto_unittests': {
-       'swarming': {
-         'shards': 2,
-       },
-    },
+    'crypto_unittests': {},
     'midi_unittests': {},
     'google_apis_unittests': {},
     'sql_unittests': {},
     'url_unittests': {},
   },
 
+  'chromeos_gtests_experimental': {
+    'base_unittests': {},
+    'net_unittests': {},
+  },
+
   'chromeos_isolated_scripts': {
     'telemetry_perf_unittests': {
       'args': [

testing/buildbot/waterfalls.pyl

@@ -586,6 +586,18 @@
         'additional_compile_targets': [
           'chromiumos_preflight',
         ],
+        'test_suites': {
+          'gtest_tests': 'chromeos_gtests',
+        },
+        'swarming': {
+          'dimension_sets': [
+            {
+              'kvm': '1',
+              'os': 'Ubuntu-14.04',
+              'pool': 'Chrome-CrOS-VM',
+            },
+          ],
+        },
       },
       'chromeos-daisy-rel': {
         'additional_compile_targets': [
@@ -1430,7 +1442,7 @@
           'chromiumos_preflight',
         ],
         'test_suites': {
-          'gtest_tests': 'chromeos_gtests',
+          'gtest_tests': 'chromeos_gtests_experimental',
           'isolated_scripts': 'chromeos_isolated_scripts',
         },
         'swarming': {