The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/3d3317a6e0dde5de7effb4406c4b60bb7aa91bb5

commit 3d3317a6e0dde5de7effb4406c4b60bb7aa91bb5
Author: lhchavez <lhchavez@chromium.org>
Date: Fri Sep 09 23:51:41 2016

arc: Add a global 5 minute timeout for ARC opt-in

This should be a safety net for *all* boot failures we have (or might
have). This change replaces the flag |waiting_for_reply_| with a
base::OneShotTimeout that will log the situation and report a timeout
error to the user.

BUG= 645233 
TEST=Intentionally make ARC not send the reply, see the UI, ARC is still
     running.

Review-Url: https://codereview.chromium.org/2323043003
Cr-Commit-Position: refs/heads/master@{#417770}

[modify] https://crrev.com/3d3317a6e0dde5de7effb4406c4b60bb7aa91bb5/chrome/browser/chromeos/arc/arc_auth_service.cc
[modify] https://crrev.com/3d3317a6e0dde5de7effb4406c4b60bb7aa91bb5/chrome/browser/chromeos/arc/arc_auth_service.h
[modify] https://crrev.com/3d3317a6e0dde5de7effb4406c4b60bb7aa91bb5/chrome/browser/chromeos/arc/arc_optin_uma.h
[modify] https://crrev.com/3d3317a6e0dde5de7effb4406c4b60bb7aa91bb5/tools/metrics/histograms/histograms.xml

[Automated comment] Request affecting a post-stable build (M53), manual review required.

Your change meets the bar and is auto-approved for M54 (branch: 2840)

[Automated comment] Request affecting a post-stable build (M53), manual review required.

Seems like this is specific to Chrome OS. 
ketakid@ (Chrome OS TPM) for M53 review.

Fix has been validated on M55. Approving merge to M53 cros.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/bb3ec13c84a856dfc36d80b51fc6455626b1ad4e

commit bb3ec13c84a856dfc36d80b51fc6455626b1ad4e
Author: Luis Hector Chavez <lhchavez@google.com>
Date: Tue Sep 13 23:57:19 2016

[Merge to M54] arc: Add a global 5 minute timeout for ARC opt-in

This should be a safety net for *all* boot failures we have (or might
have). This change replaces the flag |waiting_for_reply_| with a
base::OneShotTimeout that will log the situation and report a timeout
error to the user.

BUG= 645233 
TEST=Intentionally make ARC not send the reply, see the UI, ARC is still
     running.

Review-Url: https://codereview.chromium.org/2323043003
Cr-Commit-Position: refs/heads/master@{#417770}
(cherry picked from commit 3d3317a6e0dde5de7effb4406c4b60bb7aa91bb5)

R=holte@chromium.org, yusukes@chromium.org

Review URL: https://codereview.chromium.org/2332093002 .

Cr-Commit-Position: refs/branch-heads/2840@{#348}
Cr-Branched-From: 1ae106dbab4bddd85132d5b75c670794311f4c57-refs/heads/master@{#414607}

[modify] https://crrev.com/bb3ec13c84a856dfc36d80b51fc6455626b1ad4e/chrome/browser/chromeos/arc/arc_auth_service.cc
[modify] https://crrev.com/bb3ec13c84a856dfc36d80b51fc6455626b1ad4e/chrome/browser/chromeos/arc/arc_auth_service.h
[modify] https://crrev.com/bb3ec13c84a856dfc36d80b51fc6455626b1ad4e/chrome/browser/chromeos/arc/arc_optin_uma.h
[modify] https://crrev.com/bb3ec13c84a856dfc36d80b51fc6455626b1ad4e/tools/metrics/histograms/histograms.xml