diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-11 11:32:04 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-18 13:40:17 +0000 |
commit | 31ccca0778db85c159634478b4ec7997f6704860 (patch) | |
tree | 3d33fc3afd9d5ec95541e1bbe074a9cf8da12a0e /chromium/components/sync_sessions | |
parent | 248b70b82a40964d5594eb04feca0fa36716185d (diff) | |
download | qtwebengine-chromium-31ccca0778db85c159634478b4ec7997f6704860.tar.gz |
BASELINE: Update Chromium to 80.0.3987.136
Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'chromium/components/sync_sessions')
-rw-r--r-- | chromium/components/sync_sessions/BUILD.gn | 1 | ||||
-rw-r--r-- | chromium/components/sync_sessions/DEPS | 1 | ||||
-rw-r--r-- | chromium/components/sync_sessions/session_sync_bridge_unittest.cc | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/chromium/components/sync_sessions/BUILD.gn b/chromium/components/sync_sessions/BUILD.gn index 6ff3c2140d1..bef3d02494d 100644 --- a/chromium/components/sync_sessions/BUILD.gn +++ b/chromium/components/sync_sessions/BUILD.gn @@ -61,7 +61,6 @@ static_library("sync_sessions") { "//components/keyed_service/core", "//components/prefs", "//components/sync_user_events", - "//components/variations", "//components/version_info", "//google_apis", "//ui/base:base", diff --git a/chromium/components/sync_sessions/DEPS b/chromium/components/sync_sessions/DEPS index 7a0379d156a..2ea7c4f0d8a 100644 --- a/chromium/components/sync_sessions/DEPS +++ b/chromium/components/sync_sessions/DEPS @@ -9,7 +9,6 @@ include_rules = [ "+components/sync", "+components/sync_device_info", "+components/sync_user_events", - "+components/variations", "+components/version_info", "+google_apis", "+ui/base/page_transition_types.h", diff --git a/chromium/components/sync_sessions/session_sync_bridge_unittest.cc b/chromium/components/sync_sessions/session_sync_bridge_unittest.cc index af019fd5c37..fa5198e725c 100644 --- a/chromium/components/sync_sessions/session_sync_bridge_unittest.cc +++ b/chromium/components/sync_sessions/session_sync_bridge_unittest.cc @@ -212,7 +212,7 @@ class SessionSyncBridgeTest : public ::testing::Test { syncer::DataTypeActivationRequest request; request.error_handler = base::DoNothing(); request.cache_guid = "TestCacheGuid"; - request.authenticated_account_id = "SomeAccountId"; + request.authenticated_account_id = CoreAccountId("SomeAccountId"); base::RunLoop loop; real_processor_->OnSyncStarting( |