Revert of [Telemetry] Allow users to select TBMv1 metrics to run alongside TBMv2

Revert of [Telemetry] Allow users to select TBMv1 metrics to run alongside TBMv2 (patchset #2 id:20001 of https://codereview.chromium.org/2073303002/ )

Reason for revert:
Suspect making smoothness benchmarks failing, blocking catapult roll.
See https://github.com/catapult-project/catapult/issues/2418

Original issue's description:
> [Telemetry] Allow users to select TBMv1 metrics to run alongside TBMv2
> 
> This CL relaxes the restriction that users must choose either a list of TBMv1
> metrics, or a TBMv2 metric, to be run by a benchmark. It reconciles the legacy
> functionality that selects all TBMv1 metrics by default in the following way:
> 
> 1. If a TBMv2 metric is specified, any explicitly specified (using
>    SetLegacyTimelineBasedMetrics) v1 metrics will also be computed.
> 2. If a TBMv2 metric is not specified, but TBMv1 metrics are specified, only
>    the selected TBMv1 metrics will be computed.
> 3. If neither a TBMv2 metric nor any TBMv1 metrics are specified, all TBMv1
>    metrics will be computed and no TBMv2 metric will be computed.
> 
> BUG=chromium:621035
> 
> Committed: https://chromium.googlesource.com/external/github.com/catapult-project/catapult/+/054fe195c7bcf92dc42d2567492eb1e04281c0db

TBR=eakuefner@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:621035
Committed: https://chromium.googlesource.com/external/github.com/catapult-project/catapult/+/713623b3921722ef8eadde8369283cd7abaf3e72

[nednguyen, 2016-06-18 01:10:37]

The CQ bit was checked by nednguyen@google.com

[nednguyen, 2016-06-18 01:10:37]

Created Revert of [Telemetry] Allow users to select TBMv1 metrics to run
alongside TBMv2

[commit-bot: I haz the power, 2016-06-18 01:10:45]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/2073363002/1

[commit-bot: I haz the power, 2016-06-18 01:10:52]

Description was changed from

==========
Revert of [Telemetry] Allow users to select TBMv1 metrics to run alongside TBMv2
(patchset #2 id:20001 of https://codereview.chromium.org/2073303002/ )

Reason for revert:
Suspect making smoothness benchmarks failing, blocking catapult roll.
See https://github.com/catapult-project/catapult/issues/2418

Original issue's description:
> [Telemetry] Allow users to select TBMv1 metrics to run alongside TBMv2
> 
> This CL relaxes the restriction that users must choose either a list of TBMv1
> metrics, or a TBMv2 metric, to be run by a benchmark. It reconciles the legacy
> functionality that selects all TBMv1 metrics by default in the following way:
> 
> 1. If a TBMv2 metric is specified, any explicitly specified (using
>    SetLegacyTimelineBasedMetrics) v1 metrics will also be computed.
> 2. If a TBMv2 metric is not specified, but TBMv1 metrics are specified, only
>    the selected TBMv1 metrics will be computed.
> 3. If neither a TBMv2 metric nor any TBMv1 metrics are specified, all TBMv1
>    metrics will be computed and no TBMv2 metric will be computed.
> 
> BUG=chromium:621035
> 
> Committed:
https://chromium.googlesource.com/external/github.com/catapult-project/catapu...

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

to

==========
Revert of [Telemetry] Allow users to select TBMv1 metrics to run alongside TBMv2
(patchset #2 id:20001 of https://codereview.chromium.org/2073303002/ )

Reason for revert:
Suspect making smoothness benchmarks failing, blocking catapult roll.
See https://github.com/catapult-project/catapult/issues/2418

Original issue's description:
> [Telemetry] Allow users to select TBMv1 metrics to run alongside TBMv2
> 
> This CL relaxes the restriction that users must choose either a list of TBMv1
> metrics, or a TBMv2 metric, to be run by a benchmark. It reconciles the legacy
> functionality that selects all TBMv1 metrics by default in the following way:
> 
> 1. If a TBMv2 metric is specified, any explicitly specified (using
>    SetLegacyTimelineBasedMetrics) v1 metrics will also be computed.
> 2. If a TBMv2 metric is not specified, but TBMv1 metrics are specified, only
>    the selected TBMv1 metrics will be computed.
> 3. If neither a TBMv2 metric nor any TBMv1 metrics are specified, all TBMv1
>    metrics will be computed and no TBMv2 metric will be computed.
> 
> BUG=chromium:621035
> 
> Committed:
https://chromium.googlesource.com/external/github.com/catapult-project/catapu...

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

Committed:
https://chromium.googlesource.com/external/github.com/catapult-project/catapu...
==========

[commit-bot: I haz the power, 2016-06-18 01:10:52]

Committed patchset #1 (id:1) as
https://chromium.googlesource.com/external/github.com/catapult-project/catapu...