GitLab

The GCMAccountTracker unittest currently plays fast-and-loose with the
notion of an "account ID", which can be either the Gaia ID or the
email address for a given account depending on the platform. This is a
blocker to porting GCMAccountTracker to use IdentityManager, as the
IdentityManager test infrastructure deliberately makes a much more
explicit and enforced separation between email address, Gaia ID, and
account ID. This CL paves the way for that porting by changing the
GCMAccountTracker unittest to be explicit about its usage of the
email address, Gaia ID, and account ID of a given account.

Interestingly, this change exposed an actual production bug
(https://crbug.com/856170).

Bug: 809923
Change-Id: I46e2f632bacd89ba55132255a95bcb089d4fb3c8
Reviewed-on: https://chromium-review.googlesource.com/1113548
Commit-Queue: Colin Blundell <blundell@chromium.org>
Reviewed-by: Peter Beverloo <peter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#571408}