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

commit d175dec0587b7cabf70295721fc4a7e5f9c951e7
Author: Tanja Gornak <melandory@chromium.org>
Date: Fri Dec 14 14:32:52 2018

[Tango->FCM] Fix reflection blocking.

GetID is called before AddAppHandler. This results into generation of the
ID which has nothing to do with Token, which is generated.
This behavior breaks the reflection blocking.

Bug:  915152 
Change-Id: I3b3c37d47773b69400c7e3234b1265b4b9cc35fc
Reviewed-on: https://chromium-review.googlesource.com/c/1377733
Commit-Queue: Tatiana Gornak <melandory@chromium.org>
Reviewed-by: Jan Krcal <jkrcal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#616666}
[modify] https://crrev.com/d175dec0587b7cabf70295721fc4a7e5f9c951e7/components/invalidation/impl/fcm_invalidation_service.cc

This bug requires manual review: M72 has already been promoted to the beta branch, so this requires manual review
Please contact the milestone owner if you have questions.
Owners: govind@(Android), kariahda@(iOS), djmm@(ChromeOS), abdulsyed@(Desktop)

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

Have you verified this in canary? How safe is the merge?

It's safe to merge. Yes, it's verified.

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

commit 10429bf2edd7f2c39a177782bc7244640f19f6e3
Author: Tanja Gornak <melandory@chromium.org>
Date: Wed Dec 19 09:37:10 2018

[Tango->FCM] Repopulate client id on change

Currently if the client id has changed sync machinery will discover that only after
restart. This is bad, because for such clients reflection blocking won't work.
This Cl introduce the mechanism to update the client id.

Bug:  915152 
Change-Id: Idf031aa23bb5a8a4cac7f9a30421e9b636711089
Reviewed-on: https://chromium-review.googlesource.com/c/1379954
Reviewed-by: Marc Treib <treib@chromium.org>
Reviewed-by: Sergey Poromov <poromov@chromium.org>
Commit-Queue: Tatiana Gornak <melandory@chromium.org>
Cr-Commit-Position: refs/heads/master@{#617778}
[modify] https://crrev.com/10429bf2edd7f2c39a177782bc7244640f19f6e3/components/invalidation/impl/fcm_invalidation_service.cc
[modify] https://crrev.com/10429bf2edd7f2c39a177782bc7244640f19f6e3/components/invalidation/impl/invalidator_registrar.cc
[modify] https://crrev.com/10429bf2edd7f2c39a177782bc7244640f19f6e3/components/invalidation/impl/invalidator_registrar.h
[modify] https://crrev.com/10429bf2edd7f2c39a177782bc7244640f19f6e3/components/invalidation/public/invalidation_handler.h
[modify] https://crrev.com/10429bf2edd7f2c39a177782bc7244640f19f6e3/components/sync/driver/glue/sync_backend_host_core.cc
[modify] https://crrev.com/10429bf2edd7f2c39a177782bc7244640f19f6e3/components/sync/driver/glue/sync_backend_host_core.h
[modify] https://crrev.com/10429bf2edd7f2c39a177782bc7244640f19f6e3/components/sync/driver/glue/sync_backend_host_impl.cc
[modify] https://crrev.com/10429bf2edd7f2c39a177782bc7244640f19f6e3/components/sync/driver/glue/sync_backend_host_impl.h
[modify] https://crrev.com/10429bf2edd7f2c39a177782bc7244640f19f6e3/components/sync/engine/fake_sync_manager.cc
[modify] https://crrev.com/10429bf2edd7f2c39a177782bc7244640f19f6e3/components/sync/engine/fake_sync_manager.h
[modify] https://crrev.com/10429bf2edd7f2c39a177782bc7244640f19f6e3/components/sync/engine/sync_manager.h
[modify] https://crrev.com/10429bf2edd7f2c39a177782bc7244640f19f6e3/components/sync/engine_impl/cycle/sync_cycle_context.h
[modify] https://crrev.com/10429bf2edd7f2c39a177782bc7244640f19f6e3/components/sync/engine_impl/sync_manager_impl.cc
[modify] https://crrev.com/10429bf2edd7f2c39a177782bc7244640f19f6e3/components/sync/engine_impl/sync_manager_impl.h

This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot

This issue has been approved for a merge. Please merge the fix to any appropriate branches as soon as possible!

If all merges have been completed, please remove any remaining Merge-Approved labels from this issue.

Thanks for your time! To disable nags, add the Disable-Nags label.

For more details visit https://www.chromium.org/issue-tracking/autotriage - Your friendly Sheriffbot