Merge "cros: Fix multiple LoadCredentials on network change"

Merge "cros: Fix multiple LoadCredentials on network change"

> TokenService::LoadCredentials does not handle multiple concurrent
> load requests. However, OAuth2LoginManager::ContinueSessionRestore
> calls it when there is a network change and could end up having
> multiple load requests in fly. This would cause the token of the
> primary account being wrongly revoked. Adding a bool flag in
> OAuth2LoginManager to prevent overlapping LoadCredentials calls.
>
> BUG=682695
>
> Review-Url: https://codereview.chromium.org/2650653007
> Cr-Commit-Position: refs/heads/master@{#446180}
> (cherry picked from commit 29db500ff5473c212ebe3f1cebbc00ec87a023b8)

Review-Url: https://codereview.chromium.org/2663033002 .
Cr-Commit-Position: refs/branch-heads/2987@{#196}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Committed: https://chromium.googlesource.com/chromium/src/+/975ff3d0e39313b373256c7d4b87291beac2e5e1

[xiyuan, 2017-01-30 22:08:17]

Description was changed from

==========
Merge "cros: Fix multiple LoadCredentials on network change"

> TokenService::LoadCredentials does not handle multiple concurrent
> load requests. However, OAuth2LoginManager::ContinueSessionRestore
> calls it when there is a network change and could end up having
> multiple load requests in fly. This would cause the token of the
> primary account being wrongly revoked. Adding a bool flag in
> OAuth2LoginManager to prevent overlapping LoadCredentials calls.
>
> BUG=682695
>
> Review-Url: https://codereview.chromium.org/2650653007
> Cr-Commit-Position: refs/heads/master@{#446180}
> (cherry picked from commit 29db500ff5473c212ebe3f1cebbc00ec87a023b8)
==========

to

==========
Merge "cros: Fix multiple LoadCredentials on network change"

> TokenService::LoadCredentials does not handle multiple concurrent
> load requests. However, OAuth2LoginManager::ContinueSessionRestore
> calls it when there is a network change and could end up having
> multiple load requests in fly. This would cause the token of the
> primary account being wrongly revoked. Adding a bool flag in
> OAuth2LoginManager to prevent overlapping LoadCredentials calls.
>
> BUG=682695
>
> Review-Url: https://codereview.chromium.org/2650653007
> Cr-Commit-Position: refs/heads/master@{#446180}
> (cherry picked from commit 29db500ff5473c212ebe3f1cebbc00ec87a023b8)

Review-Url: https://codereview.chromium.org/2663033002 .
Cr-Commit-Position: refs/branch-heads/2987@{#196}
Cr-Branched-From:
ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Committed:
https://chromium.googlesource.com/chromium/src/+/975ff3d0e39313b373256c7d4b87...
==========

[xiyuan, 2017-01-30 22:08:20]

Committed patchset #1 (id:1) manually as
975ff3d0e39313b373256c7d4b87291beac2e5e1.