Add 2 config names for builder 'Blimp Android Tester'

tools/mb/mb_config.pyl

Index: tools/mb/mb_config.pyl
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index f614bc3fd2a4061fe1263b85bde0a5cad84dcb3b..6d47acefcddc4b4b78d72ca52a230679bd315851 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -83,6 +83,10 @@
         '//build/args/bots/chromium.fyi/blimp_client_rel.gn',
       'Blimp Linux Engine':
         '//build/args/bots/chromium.fyi/blimp_engine_rel.gn',
+      'Blimp Client Engine Integration': {
+        'client': '//build/args/bots/chromium.fyi/blimp_client_rel.gn',
+        'engine': '//build/args/bots/chromium.fyi/blimp_engine_rel.gn',
+      },
       'Browser Side Navigation Linux': 'release_bot',
       'CFI Linux CF': 'cfi_full_cfi_diag_release_static',
       'CFI Linux ToT': 'cfi_full_clang_tot_release_static',
@@ -99,8 +103,14 @@
       'Chromium Mac 10.9 Goma Canary (clobber)': 'release_bot',
       'Chromium Mac 10.9 Goma Canary (dbg)': 'debug_bot',
       'Chromium Mac 10.9 Goma Canary (dbg)(clobber)': 'debug_bot',
-      'Chromium Win PGO Builder': [ 'official_optimize_chrome_pgo_phase_1_x86', 'official_optimize_chrome_pgo_phase_2_x86' ],
-      'Chromium Win x64 PGO Builder': [ 'official_optimize_chrome_pgo_phase_1', 'official_optimize_chrome_pgo_phase_2' ],
+      'Chromium Win PGO Builder': {
+        '0': 'official_optimize_chrome_pgo_phase_1_x86',
+        '1': 'official_optimize_chrome_pgo_phase_2_x86',

[Dirk Pranke, 2016/10/11 00:14:05]

Whoops, these need to be '1' and '2' instead, here and below (see my other
comment).

[shenghuazhang, 2016/10/11 01:09:27]

Done.

+      },
+      'Chromium Win x64 PGO Builder': {
+        '0': 'official_optimize_chrome_pgo_phase_1',
+        '1': 'official_optimize_chrome_pgo_phase_2',
+      },
       'Chromium Windows Analyze': 'windows_analyze',
       'CrWin7Goma': 'release_bot_x86',
       'CrWin7Goma(clbr)': 'shared_release_bot_x86',
@@ -397,10 +407,16 @@
       'win': 'official_x86',
       'win-asan': 'official_syzyasan_x86',
       'win-clang': 'official_clang_x86',
-      'win-pgo': [ 'official_chrome_pgo_phase_1_x86', 'official_chrome_pgo_phase_2_x86' ],
+      'win-pgo': {

[shenghuazhang, 2016/10/08 00:21:19]

Have to change these builder configs as well, due to 'list' type of 'config' is
removed.

+        '0': 'official_chrome_pgo_phase_1_x86',
+        '1': 'official_chrome_pgo_phase_2_x86',
+      },
       'win64': 'official',
       'win64-clang': 'official_clang',
-      'win64-pgo': [ 'official_chrome_pgo_phase_1', 'official_chrome_pgo_phase_2' ],
+      'win64-pgo': {
+        '0': 'official_chrome_pgo_phase_1',
+        '1': 'official_chrome_pgo_phase_2',
+      },
     },
 
     'official.desktop.continuous': {
@@ -630,7 +646,10 @@
       'win_nacl_sdk': 'release_bot_x86',
       'win_nacl_sdk_build': 'release_bot_x86',
       'win_optional_gpu_tests_rel': 'gpu_tests_deqp_gles_release_trybot_x86',
-      'win_pgo': [ 'official_optimize_chrome_pgo_phase_1_x86', 'official_optimize_chrome_pgo_phase_2_x86' ],
+      'win_pgo': {
+        '0': 'official_optimize_chrome_pgo_phase_1_x86',
+        '1': 'official_optimize_chrome_pgo_phase_2_x86',
+      },
       'win_upload_clang': 'release_bot',
       'win_chrome_official': 'official_goma_x86',
     },