Make components_browsertests swarmable and add to main waterfall. (2nd try)

components/components_browsertests.isolate

Index: components/components_browsertests.isolate
diff --git a/base/base_unittests.isolate b/components/components_browsertests.isolate
similarity index 68%
copy from base/base_unittests.isolate
copy to components/components_browsertests.isolate
index f561d209cf5920b95b36562e9edc01f0db678469..cb5b41c6f1f0a2d8ba50776d94f4212784122ae9 100644
--- a/base/base_unittests.isolate
+++ b/components/components_browsertests.isolate
@@ -1,12 +1,20 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2015 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.
 {
+  'includes': [
+    '../base/base.isolate',
+    '../gin/v8.isolate',
+  ],
   'conditions': [
-    ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
+    ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'files': [
           'test/data/',
+          '../testing/test_env.py',
+          '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/components_resources.pak',
+          '<(PRODUCT_DIR)/content_shell.pak',
         ],
       },
     }],
@@ -15,7 +23,7 @@
         'command': [
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)',
-          '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/components_browsertests',
           '--brave-new-test-launcher',
           '--test-launcher-bot-mode',
           '--asan=<(asan)',
@@ -23,6 +31,7 @@
         ],
         'files': [
           '../testing/xvfb.py',
+          '<(PRODUCT_DIR)/libosmesa.so',
         ],
       },
     }],
@@ -33,20 +42,11 @@
         ],
       },
     }],
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'files': [
-          '../testing/test_env.py',
-          '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-        'read_only': 1,
-      },
-    }],
     ['OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
           '../testing/test_env.py',
-          '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
+          '<(PRODUCT_DIR)/components_browsertests<(EXECUTABLE_SUFFIX)',
           '--brave-new-test-launcher',
           '--test-launcher-bot-mode',
           '--asan=<(asan)',
@@ -54,15 +54,12 @@
         ],
       },
     }],
-    ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
+    ['OS=="mac"', {
       'variables': {
         'files': [
-          '<(PRODUCT_DIR)/base_unittests.exe.pdb',
+          '<(PRODUCT_DIR)/Content Shell.app/',
         ],
       },
     }],
   ],
-  'includes': [
-    'base.isolate',
-  ],
 }