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

commit 32e7d7f494aa67aa95c8cc43242816a7697b25d4
Author: Tanja Gornak <melandory@chromium.org>
Date: Fri Aug 31 10:33:26 2018

Use the sync account for invalidations.

Allow Sync to directly access the ProfileIdentityProvider so it can
change the account used for invalidations.

This way, when we enable Sync for DICe signed-in accounts,
invalidations will be using the right account.

Bug:  879455 
TBR=mnissler@chromium.org

Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: Ibaecce6f46a01201fdaaf29ddec6e4ca24b06d38
Reviewed-on: https://chromium-review.googlesource.com/1164954
Commit-Queue: Florian Uunk <feuunk@chromium.org>
Reviewed-by: Pavel Yatsuk <pavely@chromium.org>
Reviewed-by: Kush Sinha <sinhak@chromium.org>
Reviewed-by: Mike Dougherty <michaeldo@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Reviewed-by: Sergey Poromov <poromov@chromium.org>
Reviewed-by: Tatiana Gornak <melandory@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587983}
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.h
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/chrome/browser/chromeos/settings/device_identity_provider.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/chrome/browser/chromeos/settings/device_identity_provider.h
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/chrome/browser/sync/profile_sync_service_factory.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/chrome/browser/sync/profile_sync_test_util.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/chrome/browser/sync/test/integration/sync_test.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/chrome/browser/sync/test/integration/sync_test.h
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/browser_sync/profile_sync_service.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/browser_sync/profile_sync_service.h
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/browser_sync/profile_sync_service_unittest.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/browser_sync/profile_sync_test_util.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/browser_sync/profile_sync_test_util.h
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/invalidation/impl/fcm_invalidation_service.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/invalidation/impl/fcm_invalidation_service.h
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/invalidation/impl/fcm_invalidation_service_unittest.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/invalidation/impl/gcm_invalidation_bridge_unittest.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/invalidation/impl/per_user_topic_registration_manager_unittest.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/invalidation/impl/profile_identity_provider.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/invalidation/impl/profile_identity_provider.h
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/invalidation/impl/profile_invalidation_provider.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/invalidation/impl/profile_invalidation_provider.h
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/invalidation/impl/ticl_invalidation_service.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/invalidation/impl/ticl_invalidation_service.h
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/invalidation/impl/ticl_invalidation_service_unittest.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/invalidation/impl/ticl_profile_settings_provider_unittest.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/invalidation/public/identity_provider.h
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/components/signin/core/browser/fake_signin_manager.cc
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.mm
[modify] https://crrev.com/32e7d7f494aa67aa95c8cc43242816a7697b25d4/ios/web_view/internal/sync/web_view_profile_invalidation_provider_factory.mm

Requesting merge to M70 for this bug that's blocking the Butter experiment.

Full automated unit test coverage: included in CL.
Deployed in Canary for at least 24 hours: yes.
Safe Merge: Yes.

Note: This isn't tested in Canary for 24h yet, but I'll make sure to have it soaked for 24h before doing the actual merge.

Your change meets the bar and is auto-approved for M70. Please go ahead and merge the CL to branch 3538 manually. Please contact milestone owner if you have questions.
Owners: benmason@(Android), kariahda@(iOS), geohsu@(ChromeOS), abdulsyed@(Desktop)

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

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

commit 6702d8136775066240888551144c595a0bdc38b8
Author: Florian Uunk <feuunk@chromium.org>
Date: Thu Sep 06 15:04:35 2018

M70-merge: Use the sync account for invalidations.

Allow Sync to directly access the ProfileIdentityProvider so it can
change the account used for invalidations.

This way, when we enable Sync for DICe signed-in accounts,
invalidations will be using the right account.

Bug:  879455 
TBR=melandory@chromium.org, mnissler@chromium.org

(cherry picked from commit 32e7d7f494aa67aa95c8cc43242816a7697b25d4)

Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: Ibaecce6f46a01201fdaaf29ddec6e4ca24b06d38
Reviewed-on: https://chromium-review.googlesource.com/1164954
Commit-Queue: Florian Uunk <feuunk@chromium.org>
Reviewed-by: Pavel Yatsuk <pavely@chromium.org>
Reviewed-by: Kush Sinha <sinhak@chromium.org>
Reviewed-by: Mike Dougherty <michaeldo@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Reviewed-by: Marc Treib <treib@chromium.org>
Reviewed-by: Sergey Poromov <poromov@chromium.org>
Reviewed-by: Tatiana Gornak <melandory@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#587983}
Reviewed-on: https://chromium-review.googlesource.com/1210522
Cr-Commit-Position: refs/branch-heads/3538@{#89}
Cr-Branched-From: 79f7c91a2b2a2932cd447fa6f865cb6662fa8fa6-refs/heads/master@{#587811}
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.h
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl_unittest.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/chrome/browser/chromeos/settings/device_identity_provider.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/chrome/browser/chromeos/settings/device_identity_provider.h
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/chrome/browser/invalidation/deprecated_profile_invalidation_provider_factory.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/chrome/browser/sync/profile_sync_service_factory.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/chrome/browser/sync/profile_sync_test_util.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/chrome/browser/sync/test/integration/sync_test.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/chrome/browser/sync/test/integration/sync_test.h
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/browser_sync/profile_sync_service.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/browser_sync/profile_sync_service.h
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/browser_sync/profile_sync_service_unittest.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/browser_sync/profile_sync_test_util.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/browser_sync/profile_sync_test_util.h
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/invalidation/impl/fcm_invalidation_service.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/invalidation/impl/fcm_invalidation_service.h
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/invalidation/impl/fcm_invalidation_service_unittest.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/invalidation/impl/gcm_invalidation_bridge_unittest.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/invalidation/impl/per_user_topic_registration_manager_unittest.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/invalidation/impl/profile_identity_provider.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/invalidation/impl/profile_identity_provider.h
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/invalidation/impl/profile_invalidation_provider.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/invalidation/impl/profile_invalidation_provider.h
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/invalidation/impl/ticl_invalidation_service.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/invalidation/impl/ticl_invalidation_service.h
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/invalidation/impl/ticl_invalidation_service_unittest.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/invalidation/impl/ticl_profile_settings_provider_unittest.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/invalidation/public/identity_provider.h
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/components/signin/core/browser/fake_signin_manager.cc
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/ios/chrome/browser/invalidation/ios_chrome_profile_invalidation_provider_factory.mm
[modify] https://crrev.com/6702d8136775066240888551144c595a0bdc38b8/ios/web_view/internal/sync/web_view_profile_invalidation_provider_factory.mm