Refactor WebRTC master configs.

masters/master.client.webrtc/master_mac_cfg.py

Index: masters/master.client.webrtc/master_mac_cfg.py
diff --git a/masters/master.client.webrtc/master_mac_cfg.py b/masters/master.client.webrtc/master_mac_cfg.py
index 3af87396a4fc5bf4ff108511d027cefd1b12d6a9..181778b918226bdb181e75da012b4ec61fac30cf 100644
--- a/masters/master.client.webrtc/master_mac_cfg.py
+++ b/masters/master.client.webrtc/master_mac_cfg.py
@@ -8,87 +8,86 @@ from master.factory import webrtc_factory
 defaults = {}
 
 
-def ConfigureBuilders(c, svn_url, branch, custom_deps_list=None):
-  def mac():
-    return webrtc_factory.WebRTCFactory('src/xcodebuild', 'darwin', svn_url,
-                                        branch, custom_deps_list)
-  def macIos():
-    return webrtc_factory.WebRTCFactory('', 'darwin', svn_url, branch,
-                                        nohooks_on_update=True)
-
-  helper = master_config.Helper(defaults)
-  B = helper.Builder
-  F = helper.Factory
-  S = helper.Scheduler
-
-  scheduler = 'webrtc_mac_scheduler'
-  S(scheduler, branch=branch, treeStableTimer=0)
-
-  tests = [
-      'audio_decoder_unittests',
-      'common_audio_unittests',
-      'common_video_unittests',
-      'metrics_unittests',
-      'modules_integrationtests',
-      'modules_unittests',
-      'neteq_unittests',
-      'system_wrappers_unittests',
-      'test_support_unittests',
-      'tools_unittests',
-      'video_engine_core_unittests',
-      'voice_engine_unittests',
-  ]
-
-  options = ['--', '-project', '../webrtc.xcodeproj']
-
-  defaults['category'] = 'mac'
-
-  B('Mac32 Debug', 'mac_debug_factory', scheduler=scheduler)
-  F('mac_debug_factory', mac().WebRTCFactory(
-      target='Debug',
-      options=options,
-      tests=tests))
-
-  B('Mac32 Release', 'mac_release_factory', scheduler=scheduler)
-  F('mac_release_factory', mac().WebRTCFactory(
-      target='Release',
-      options=options,
-      tests=tests))
-
-  B('Mac64 Debug', 'mac64_debug_factory', scheduler=scheduler)
-  F('mac64_debug_factory', mac().WebRTCFactory(
-      target='Debug',
-      options=options,
-      tests=tests,
-      factory_properties={
-          'gclient_env': {'GYP_DEFINES': 'host_arch=x64 target_arch=x64'}
-      }))
-
-  B('Mac64 Release', 'mac64_release_factory', scheduler=scheduler)
-  F('mac64_release_factory', mac().WebRTCFactory(
-      target='Release',
-      options=options,
-      tests=tests,
-      factory_properties={
-          'gclient_env': {'GYP_DEFINES': 'host_arch=x64 target_arch=x64'}
-      }))
-
-  B('Mac Asan', 'mac_asan_factory', scheduler=scheduler)
-  F('mac_asan_factory', mac().WebRTCFactory(
-      target='Release',
-      options=options,
-      tests=tests,
-      factory_properties={'asan': True,
-                          'gclient_env':
-                          {'GYP_DEFINES': ('asan=1'
-                                           ' release_extra_cflags=-g '
-                                           ' linux_use_tcmalloc=0 ')}}))
-
-  # iOS.
-  B('iOS Device', 'ios_release_factory', scheduler=scheduler)
-  F('ios_release_factory', macIos().ChromiumAnnotationFactory(
-      target='Release',
-      slave_type='AnnotatedBuilderTester',
-      annotation_script='src/webrtc/build/ios-webrtc.sh'))
-
+def mac():
+  return webrtc_factory.WebRTCFactory('src/xcodebuild', 'darwin')
+def macIos():
+  return webrtc_factory.WebRTCFactory('', 'darwin', nohooks_on_update=True)
+
+helper = master_config.Helper(defaults)
+B = helper.Builder
+F = helper.Factory
+S = helper.Scheduler
+
+scheduler = 'webrtc_mac_scheduler'
+S(scheduler, branch='trunk', treeStableTimer=0)
+
+tests = [
+    'audio_decoder_unittests',
+    'common_audio_unittests',
+    'common_video_unittests',
+    'metrics_unittests',
+    'modules_integrationtests',
+    'modules_unittests',
+    'neteq_unittests',
+    'system_wrappers_unittests',
+    'test_support_unittests',
+    'tools_unittests',
+    'video_engine_core_unittests',
+    'voice_engine_unittests',
+]
+
+options = ['--', '-project', '../webrtc.xcodeproj']
+
+defaults['category'] = 'mac'
+
+B('Mac32 Debug', 'mac_debug_factory', scheduler=scheduler)
+F('mac_debug_factory', mac().WebRTCFactory(
+    target='Debug',
+    options=options,
+    tests=tests))
+
+B('Mac32 Release', 'mac_release_factory', scheduler=scheduler)
+F('mac_release_factory', mac().WebRTCFactory(
+    target='Release',
+    options=options,
+    tests=tests))
+
+B('Mac64 Debug', 'mac64_debug_factory', scheduler=scheduler)
+F('mac64_debug_factory', mac().WebRTCFactory(
+    target='Debug',
+    options=options,
+    tests=tests,
+    factory_properties={
+        'gclient_env': {'GYP_DEFINES': 'host_arch=x64 target_arch=x64'}
+    }))
+
+B('Mac64 Release', 'mac64_release_factory', scheduler=scheduler)
+F('mac64_release_factory', mac().WebRTCFactory(
+    target='Release',
+    options=options,
+    tests=tests,
+    factory_properties={
+        'gclient_env': {'GYP_DEFINES': 'host_arch=x64 target_arch=x64'}
+    }))
+
+B('Mac Asan', 'mac_asan_factory', scheduler=scheduler)
+F('mac_asan_factory', mac().WebRTCFactory(
+    target='Release',
+    options=options,
+    tests=tests,
+    factory_properties={'asan': True,
+                        'gclient_env':
+                        {'GYP_DEFINES': ('asan=1'
+                                         ' release_extra_cflags=-g '
+                                         ' linux_use_tcmalloc=0 ')}}))
+
+# iOS.
+B('iOS Device', 'ios_release_factory', scheduler=scheduler)
+F('ios_release_factory', macIos().ChromiumAnnotationFactory(
+    target='Release',
+    slave_type='AnnotatedBuilderTester',
+    annotation_script='src/webrtc/build/ios-webrtc.sh'))
+
+
+def Update(c):
   helper.Update(c)