Revert of Change PGO recipe to use MB now that it supports multiple phases.

Revert of Change PGO recipe to use MB now that it supports multiple phases. (patchset #1 id:1 of https://codereview.chromium.org/2165643005/ )

Reason for revert:
breaks official builder, which doesn't find the MB change on the older branches.

Original issue's description:
> Change PGO recipe to use MB now that it supports multiple phases.
> 
> R=sebmarchand@chromium.org
> BUG=595947
> 
> Committed: https://chromium.googlesource.com/chromium/tools/build/+/be09b8b990b15e9a6945a8a43aa9fead0c0f1457

TBR=sebmarchand@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=595947
Committed: https://chromium.googlesource.com/chromium/tools/build/+/1b1b142b8f929f0885ce28985365a813210d6da0

[Dirk Pranke, 2016-07-23 00:39:36]

The CQ bit was checked by dpranke@chromium.org

[Dirk Pranke, 2016-07-23 00:39:37]

Created Revert of Change PGO recipe to use MB now that it supports multiple
phases.

[commit-bot: I haz the power, 2016-07-23 00:39:46]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-23 00:39:58]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-07-23 00:39:59]

Failed to apply patch for scripts/slave/recipe_modules/chromium/api.py:
While running git apply --index -3 -p1;
  error: patch failed: scripts/slave/recipe_modules/chromium/api.py:515
  Falling back to three-way merge...
  Applied patch to 'scripts/slave/recipe_modules/chromium/api.py' with
conflicts.
  U scripts/slave/recipe_modules/chromium/api.py

Patch:       scripts/slave/recipe_modules/chromium/api.py
Index: scripts/slave/recipe_modules/chromium/api.py
diff --git a/scripts/slave/recipe_modules/chromium/api.py
b/scripts/slave/recipe_modules/chromium/api.py
index
fa94a7ea657a0040b2c677b7e4e9c6ee2d56541f..e2dd85330c9271baf4da27a7f4aa41ff43a9c880
100644
--- a/scripts/slave/recipe_modules/chromium/api.py
+++ b/scripts/slave/recipe_modules/chromium/api.py
@@ -515,6 +515,12 @@
       kwargs['wrapper'] = self.get_cros_chrome_sdk_wrapper(clean=True)
     self.m.gclient.runhooks(**kwargs)
 
+  def run_gyp_chromium(self):
+    gyp_chromium_path = self.m.path['checkout'].join('build',
'gyp_chromium.py')
+    env = self.get_env()
+    env.update(self.c.gyp_env.as_jsonish())
+    self.m.python(name='gyp_chromium', script=gyp_chromium_path, env=env);
+
   def run_gn(self, use_goma=False, gn_path=None, build_dir=None, **kwargs):
     if not gn_path:
       gn_path = self.m.path['depot_tools'].join('gn.py')
@@ -571,8 +577,7 @@
   def run_mb(self, mastername, buildername, use_goma=True,
              mb_config_path=None, isolated_targets=None, name=None,
              build_dir=None, android_version_code=None,
-             android_version_name=None, gyp_script=None, phase=None,
-             **kwargs):
+             android_version_name=None, gyp_script=None, **kwargs):
     mb_config_path = (mb_config_path or
                       self.m.path['checkout'].join('tools', 'mb',
                                                    'mb_config.pyl'))
@@ -590,9 +595,6 @@
         '-b', buildername,
         '--config-file', mb_config_path,
     ]
-
-    if phase is not None:
-      args += [ '--phase', str(phase) ]
 
     if use_goma:
       goma_dir = self.c.compile_py.goma_dir

[Dirk Pranke, 2016-07-23 00:43:36]

The CQ bit was checked by dpranke@chromium.org

[commit-bot: I haz the power, 2016-07-23 00:43:43]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-07-23 00:44:00]

Description was changed from

==========
Revert of Change PGO recipe to use MB now that it supports multiple phases.
(patchset #1 id:1 of https://codereview.chromium.org/2165643005/ )

Reason for revert:
breaks official builder, which doesn't find the MB change on the older branches.

Original issue's description:
> Change PGO recipe to use MB now that it supports multiple phases.
> 
> R=sebmarchand@chromium.org
> BUG=595947
> 
> Committed:
https://chromium.googlesource.com/chromium/tools/build/+/be09b8b990b15e9a6945...

TBR=sebmarchand@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=595947
==========

to

==========
Revert of Change PGO recipe to use MB now that it supports multiple phases.
(patchset #1 id:1 of https://codereview.chromium.org/2165643005/ )

Reason for revert:
breaks official builder, which doesn't find the MB change on the older branches.

Original issue's description:
> Change PGO recipe to use MB now that it supports multiple phases.
> 
> R=sebmarchand@chromium.org
> BUG=595947
> 
> Committed:
https://chromium.googlesource.com/chromium/tools/build/+/be09b8b990b15e9a6945...

TBR=sebmarchand@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=595947

Committed:
https://chromium.googlesource.com/chromium/tools/build/+/1b1b142b8f929f0885ce...
==========

[commit-bot: I haz the power, 2016-07-23 00:44:01]

Committed patchset #2 (id:180001) as
https://chromium.googlesource.com/chromium/tools/build/+/1b1b142b8f929f0885ce...