Punt touch UGI deprecation to M56

Punt touch UGI deprecation to M56

BUG=654978
Review-Url: https://codereview.chromium.org/2408203004
Cr-Commit-Position: refs/heads/master@{#424739}
(cherry picked from commit 5228ba9c95482de8e3615f189bcf822806e99010)

Committed: https://chromium.googlesource.com/chromium/src/+/33d95c3c0e29e1263bd81aacbbaa15906abdd278

[Rick Byers, 2016-10-13 18:57:12]

Description was changed from

==========
Punt touch UGI deprecation to M56

BUG=654978

Review-Url: https://codereview.chromium.org/2408203004
Cr-Commit-Position: refs/heads/master@{#424739}
(cherry picked from commit 5228ba9c95482de8e3615f189bcf822806e99010)
==========

to

==========
Punt touch UGI deprecation to M56

BUG=654978

Review-Url: https://codereview.chromium.org/2408203004
Cr-Commit-Position: refs/heads/master@{#424739}
(cherry picked from commit 5228ba9c95482de8e3615f189bcf822806e99010)

Committed:
https://chromium.googlesource.com/chromium/src/+/33d95c3c0e29e1263bd81aacbbaa...
==========

[Rick Byers, 2016-10-13 18:57:13]

Committed patchset #1 (id:1) manually as
33d95c3c0e29e1263bd81aacbbaa15906abdd278.

[johnme, 2016-10-14 14:09:40]

A revert of this CL (patchset #1 id:1) has been created in
https://codereview.chromium.org/2419563004/ by johnme@chromium.org.

The reason for reverting is: This patch breaks compile on the branch, since the
"M55" enum value is still used with dopplerWillBeRemoved (note that
https://chromium.googlesource.com/chromium/src/+/9848564877f0057f4dcbc98bce06...
removes dopplerWillBeRemoved on master, but that patch is not on the branch).

[Rick Byers, 2016-10-14 16:07:35]

Description was changed from

==========
Punt touch UGI deprecation to M56

BUG=654978

Review-Url: https://codereview.chromium.org/2408203004
Cr-Commit-Position: refs/heads/master@{#424739}
(cherry picked from commit 5228ba9c95482de8e3615f189bcf822806e99010)

Committed:
https://chromium.googlesource.com/chromium/src/+/33d95c3c0e29e1263bd81aacbbaa...
==========

to

==========
Punt touch UGI deprecation to M56

BUG=654978

Review-Url: https://codereview.chromium.org/2408203004
Cr-Commit-Position: refs/heads/master@{#424739}
(cherry picked from commit 5228ba9c95482de8e3615f189bcf822806e99010)

Committed:
https://chromium.googlesource.com/chromium/src/+/33d95c3c0e29e1263bd81aacbbaa...
==========

[Rick Byers, 2016-10-14 16:12:12]

On 2016/10/14 14:09:40, johnme wrote:
> A revert of this CL (patchset #1 id:1) has been created in
> https://codereview.chromium.org/2419563004/ by mailto:johnme@chromium.org.
> 
> The reason for reverting is: This patch breaks compile on the branch, since
the
> "M55" enum value is still used with dopplerWillBeRemoved (note that
>
https://chromium.googlesource.com/chromium/src/+/9848564877f0057f4dcbc98bce06...
> removes dopplerWillBeRemoved on master, but that patch is not on the branch).

Ah damn, sorry.  I should have verified that there weren't other users of M55 on
the branch.  I'll do a partial merge.

But we shouldn't be saying in 55 that something "will be removed" in 55 - that's
just confusing.  Filed
https://bugs.chromium.org/p/chromium/issues/detail?id=656030 for rtoy@