Reland "Change PGO recipe to use MB now that it supports multiple phases."

scripts/slave/recipe_modules/pgo/api.py

Index: scripts/slave/recipe_modules/pgo/api.py
diff --git a/scripts/slave/recipe_modules/pgo/api.py b/scripts/slave/recipe_modules/pgo/api.py
index 3574aa1f6a41cab29ac55d84f6cb593248cb0ff3..95fda9fab58fef83ca1f784e3cb5922a7352cdac 100644
--- a/scripts/slave/recipe_modules/pgo/api.py
+++ b/scripts/slave/recipe_modules/pgo/api.py
@@ -52,7 +52,11 @@ class PGOApi(recipe_api.RecipeApi):
     self.m.chromium.set_config(bot_config['chromium_config_instrument'],
                                **bot_config.get('chromium_config_kwargs'))
     self.m.chromium.runhooks(name='Runhooks: Instrumentation phase.')
-    self.m.chromium.run_gyp_chromium()
+    self.m.chromium.run_mb(
+        self.m.properties['mastername'],
+        self.m.properties['buildername'],
+        use_goma=False,
+        phase=1)
     # Remove the profile files from the previous builds.
     self.m.file.rmwildcard('*.pg[cd]', str(self.m.chromium.output_dir))
     self.m.chromium.compile(name='Compile: Instrumentation phase.')
@@ -87,7 +91,11 @@ class PGOApi(recipe_api.RecipeApi):
     self.m.chromium.set_config(bot_config['chromium_config_optimize'],
                                **bot_config.get('chromium_config_kwargs'))
     self.m.chromium.runhooks(name='Runhooks: Optimization phase.')
-    self.m.chromium.run_gyp_chromium()
+    self.m.chromium.run_mb(
+        self.m.properties['mastername'],
+        self.m.properties['buildername'],
+        use_goma=False,
+        phase=2)
     self.m.chromium.compile(name='Compile: Optimization phase.')
 
   def compile_pgo(self, bot_config):