Refactor WebRTC master configs.

masters/master.client.webrtc/master_win_cfg.py

Index: masters/master.client.webrtc/master_win_cfg.py
diff --git a/masters/master.client.webrtc/master_win_cfg.py b/masters/master.client.webrtc/master_win_cfg.py
index 13367cfc1e81c8de5974be70e9172125b34ba059..acabb89f4b851fad981e90761895e5618356e9e9 100644
--- a/masters/master.client.webrtc/master_win_cfg.py
+++ b/masters/master.client.webrtc/master_win_cfg.py
@@ -8,70 +8,71 @@ from master.factory import webrtc_factory
 defaults = {}
 
 
-def ConfigureBuilders(c, svn_url, branch, custom_deps_list=None):
-  def win():
-    return webrtc_factory.WebRTCFactory('src/out', 'win32', svn_url,
-                                        branch, custom_deps_list)
-  helper = master_config.Helper(defaults)
-  B = helper.Builder
-  F = helper.Factory
-  S = helper.Scheduler
+def win():

[kjellander_chromium, 2013/06/19 09:52:48]

It's just indent changes below (except the 'trunk' branch for the Scheduler).

+  return webrtc_factory.WebRTCFactory('src/out', 'win32')
 
-  scheduler = 'webrtc_win_scheduler'
-  S(scheduler, branch=branch, treeStableTimer=0)
+helper = master_config.Helper(defaults)
+B = helper.Builder
+F = helper.Factory
+S = helper.Scheduler
 
-  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',
-  ]
-  ninja_options = ['--build-tool=ninja']
+scheduler = 'webrtc_win_scheduler'
+S(scheduler, branch='trunk', treeStableTimer=0)
 
-  defaults['category'] = 'win'
+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',
+]
+ninja_options = ['--build-tool=ninja']
 
-  B('Win32 Debug', 'win32_debug_factory', scheduler=scheduler)
-  F('win32_debug_factory', win().WebRTCFactory(
-      target='Debug',
-      options=ninja_options,
-      tests=tests))
+defaults['category'] = 'win'
 
-  B('Win32 Release', 'win32_release_factory', scheduler=scheduler)
-  F('win32_release_factory', win().WebRTCFactory(
-      target='Release',
-      options=ninja_options,
-      tests=tests,
-      # No point having more than one bot complaining about missing sources.
-      factory_properties={
-          'gclient_env': {
-              'GYP_GENERATOR_FLAGS': 'msvs_error_on_missing_sources=1',
-          },
-      }))
+B('Win32 Debug', 'win32_debug_factory', scheduler=scheduler)
+F('win32_debug_factory', win().WebRTCFactory(
+    target='Debug',
+    options=ninja_options,
+    tests=tests))
 
-  B('Win64 Debug', 'win64_debug_factory', scheduler=scheduler)
-  F('win64_debug_factory', win().WebRTCFactory(
-      target='Debug_x64',
-      options=ninja_options,
-      tests=tests,
-      factory_properties={
-          'gclient_env': {'GYP_DEFINES': 'target_arch=x64'},
-      }))
+B('Win32 Release', 'win32_release_factory', scheduler=scheduler)
+F('win32_release_factory', win().WebRTCFactory(
+    target='Release',
+    options=ninja_options,
+    tests=tests,
+    # No point having more than one bot complaining about missing sources.
+    factory_properties={
+        'gclient_env': {
+            'GYP_GENERATOR_FLAGS': 'msvs_error_on_missing_sources=1',
+        },
+    }))
 
-  B('Win64 Release', 'win64_release_factory', scheduler=scheduler)
-  F('win64_release_factory', win().WebRTCFactory(
-      target='Release_x64',
-      options=ninja_options,
-      tests=tests,
-      factory_properties={
-          'gclient_env': {'GYP_DEFINES': 'target_arch=x64'},
-      }))
+B('Win64 Debug', 'win64_debug_factory', scheduler=scheduler)
+F('win64_debug_factory', win().WebRTCFactory(
+    target='Debug_x64',
+    options=ninja_options,
+    tests=tests,
+    factory_properties={
+        'gclient_env': {'GYP_DEFINES': 'target_arch=x64'},
+    }))
 
+B('Win64 Release', 'win64_release_factory', scheduler=scheduler)
+F('win64_release_factory', win().WebRTCFactory(
+    target='Release_x64',
+    options=ninja_options,
+    tests=tests,
+    factory_properties={
+        'gclient_env': {'GYP_DEFINES': 'target_arch=x64'},
+    }))
+
+
+def Update(c):
   helper.Update(c)