Revert of tryserver.chromium.win: convert chromium_trybot builders to remote_run

masters/master.tryserver.chromium.win/master.cfg

Index: masters/master.tryserver.chromium.win/master.cfg
diff --git a/masters/master.tryserver.chromium.win/master.cfg b/masters/master.tryserver.chromium.win/master.cfg
index 0160365122bcf258db08856fa950d708e7d96429..0585c233d28aabbebb613a49a69852da1aea6187 100644
--- a/masters/master.tryserver.chromium.win/master.cfg
+++ b/masters/master.tryserver.chromium.win/master.cfg
@@ -17,7 +17,6 @@
 from master import slaves_list
 from master.builders_pools import BuildersPools
 from master.factory import annotator_factory
-from master.factory import remote_run_factory
 from master.try_job_http import TryJobHTTP
 from master.try_job_svn import TryJobSubversion
 
@@ -60,68 +59,61 @@
   })
   return m_annotator.BaseFactory(recipe, factory_properties=fp, **kwargs)
 
-
-def m_remote_run(recipe, **kwargs):
-  return remote_run_factory.RemoteRunFactory(
-      active_master=ActiveMaster,
-      repository='https://chromium.googlesource.com/chromium/tools/build.git',
-      recipe=recipe,
-      factory_properties={'path_config': 'kitchen'},
-      **kwargs)
-
-
 for targ in ('_rel', '_dbg'):
   chromium_builders.extend([{
     'name': 'win_chromium%s_ng' % targ,
-    'factory': m_remote_run(
+    'factory': baseFactory(
         'chromium_trybot', timeout=3600, max_time=master_utils.CQ_MAX_TIME_WIN),
-    'slavebuilddir': 'remote_run'
+    # Share build directory with compatible existing builders to save space.
+    'slavebuilddir': 'win'
   }, {
     'name': 'win_chromium_compile%s_ng' % targ,
-    'factory': m_remote_run(
+    'factory': baseFactory(
         'chromium_trybot', timeout=3600, max_time=master_utils.CQ_MAX_TIME_WIN),
-    'slavebuilddir': 'remote_run'
+    # Share build directory with compatible existing builders to save space.
+    'slavebuilddir': 'win'
   }])
 
 chromium_builders.append({
   'name': 'win10_chromium_x64_rel_ng',
-  'factory': m_remote_run('chromium_trybot', timeout=3600),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot', timeout=3600),
+  # Share build directory with compatible existing builders to save space.
+  'slavebuilddir': 'win',
 })
 
 chromium_builders.append({
   'name': 'win10_chromium_x64_rel_ng_exp',
-  'factory': m_remote_run('chromium_trybot', timeout=3600),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot', timeout=3600),
+  # Share build directory with compatible existing builders to save space.
+  'slavebuilddir': 'win',
 })
 
 chromium_builders.append({
   'name': 'win_archive',
-  'factory': m_remote_run('chromium_trybot', timeout=3600),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot', timeout=3600),
 })
 
 chromium_builders.append({
   'name': 'win_x64_archive',
-  'factory': m_remote_run('chromium_trybot', timeout=3600),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot', timeout=3600),
 })
 
 chromium_builders.append({
   'name': 'win_chromium_x64_rel_ng',
-  'factory': m_remote_run(
+  'factory': baseFactory(
       'chromium_trybot', timeout=3600, max_time=master_utils.CQ_MAX_TIME_WIN),
-  'slavebuilddir': 'remote_run'
+  # Share build directory with compatible existing builders to save space.
+  'slavebuilddir': 'win'
 })
 
 chromium_builders.extend([{
     'name': 'win8_chromium_gyp_rel',
-    'factory': m_remote_run('chromium_trybot'),
-    'slavebuilddir': 'remote_run',
+    'factory': baseFactory('chromium_trybot'),
+    'slavebuilddir': 'win_gyp',
   },{
     'name': 'win8_chromium_gyp_dbg',
-    'factory': m_remote_run('chromium_trybot'),
-    'slavebuilddir': 'remote_run',
+    'factory': baseFactory('chromium_trybot'),
+    'slavebuilddir': 'win_gyp',
   },{
     'name': 'win8_chromium_gn_upload',
     'factory': baseFactory('chromium_gn_upload'),
@@ -143,48 +135,49 @@
 
 chromium_builders.append({
     'name': 'win_chrome_official',
-    'factory': m_remote_run('chromium_trybot', timeout=4800),
-    'slavebuilddir': 'remote_run',
+    'factory': baseFactory('chromium', timeout=4800),
+    'slavebuilddir': 'win_chrome',
 })
 
 chromium_builders.append({
   'name': 'win_chromium_syzyasan_rel',
-  'factory': m_remote_run('chromium_trybot'),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot'),
+  'slavebuilddir': 'win',
 })
 
 # Experimental clang/win bots
 chromium_builders.append({
   'name': 'win_clang',
-  'factory': m_remote_run('chromium_trybot'),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot'),
+  'slavebuilddir': 'win_clang',
 })
 chromium_builders.append({
   'name': 'win_clang_dbg',
-  'factory': m_remote_run('chromium_trybot'),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot'),
+  'slavebuilddir': 'win_clang',
 })
 chromium_builders.append({
   'name': 'win_clang_rel',
-  'factory': m_remote_run('chromium_trybot'),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot'),
+  'slavebuilddir': 'win_clang',
 })
 chromium_builders.append({
   'name': 'win_clang_x64_dbg',
-  'factory': m_remote_run('chromium_trybot'),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot'),
+  'slavebuilddir': 'win_clang',
 })
 chromium_builders.append({
   'name': 'win_clang_x64_rel',
-  'factory': m_remote_run('chromium_trybot'),
-  'slavebuilddir': 'remote_run',
+  'factory': baseFactory('chromium_trybot'),
+  'slavebuilddir': 'win_clang',
 })
 
 # Optional GPU tryserver.
 chromium_builders.append({
   'name': 'win_optional_gpu_tests_rel',
-  'factory': m_remote_run('chromium_trybot', timeout=3600),
-  'slavebuilddir': 'remote_run'
+  'factory': baseFactory('chromium_trybot', timeout=3600),
+  # Share build directory with compatible existing builders to save space.
+  'slavebuilddir': 'win'
 })
 
 # NaCl SDK try bots