Merge to 3071 "[DevTools] Fix telemetry flakiness based on target type"

Merge to 3071 "[DevTools] Fix telemetry flakiness based on target type"

For some unknown reason, crrev.com/468815 caused multiple
telemetry tests to timeout. This patch partially reverts
that revision, applying another fix to original bug by
re-requesting target type on demand.

BUG=718952, 717003
Review-Url: https://codereview.chromium.org/2873393002
Cr-Commit-Position: refs/heads/master@{#471102}
(cherry picked from commit 8e75b1bc9944bfe1a4a1a006e212418243e96abd)

TBR=pfeldman

Review-Url: https://codereview.chromium.org/2886583002 .
Cr-Commit-Position: refs/branch-heads/3071@{#571}
Cr-Branched-From: a106f0abbf69dad349d4aaf4bcc4f5d376dd2377-refs/heads/master@{#464641}
Committed: https://chromium.googlesource.com/chromium/src/+/cadfb3115e3b20f61e342523a12325a94ded2786

[dgozman, 2017-05-15 22:38:57]

Description was changed from

==========
Merge to 3071 "[DevTools] Fix telemetry flakiness based on target type"

For some unknown reason, crrev.com/468815 caused multiple
telemetry tests to timeout. This patch partially reverts
that revision, applying another fix to original bug by
re-requesting target type on demand.

BUG=718952,717003

Review-Url: https://codereview.chromium.org/2873393002
Cr-Commit-Position: refs/heads/master@{#471102}
(cherry picked from commit 8e75b1bc9944bfe1a4a1a006e212418243e96abd)

TBR=pfeldman
==========

to

==========
Merge to 3071 "[DevTools] Fix telemetry flakiness based on target type"

For some unknown reason, crrev.com/468815 caused multiple
telemetry tests to timeout. This patch partially reverts
that revision, applying another fix to original bug by
re-requesting target type on demand.

BUG=718952,717003

Review-Url: https://codereview.chromium.org/2873393002
Cr-Commit-Position: refs/heads/master@{#471102}
(cherry picked from commit 8e75b1bc9944bfe1a4a1a006e212418243e96abd)

TBR=pfeldman

Review-Url: https://codereview.chromium.org/2886583002 .
Cr-Commit-Position: refs/branch-heads/3071@{#571}
Cr-Branched-From:
a106f0abbf69dad349d4aaf4bcc4f5d376dd2377-refs/heads/master@{#464641}
Committed:
https://chromium.googlesource.com/chromium/src/+/cadfb3115e3b20f61e342523a123...
==========

[dgozman, 2017-05-15 22:38:59]

Committed patchset #1 (id:1) manually as
cadfb3115e3b20f61e342523a12325a94ded2786.