diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 10:22:43 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 12:36:28 +0000 |
commit | 271a6c3487a14599023a9106329505597638d793 (patch) | |
tree | e040d58ffc86c1480b79ca8528020ca9ec919bf8 /chromium/components/gcm_driver | |
parent | 7b2ffa587235a47d4094787d72f38102089f402a (diff) | |
download | qtwebengine-chromium-271a6c3487a14599023a9106329505597638d793.tar.gz |
BASELINE: Update Chromium to 77.0.3865.59
Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/components/gcm_driver')
-rw-r--r-- | chromium/components/gcm_driver/BUILD.gn | 22 | ||||
-rw-r--r-- | chromium/components/gcm_driver/android/BUILD.gn | 1 | ||||
-rw-r--r-- | chromium/components/gcm_driver/common/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/components/gcm_driver/crypto/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/components/gcm_driver/instance_id/android/BUILD.gn | 2 |
5 files changed, 25 insertions, 8 deletions
diff --git a/chromium/components/gcm_driver/BUILD.gn b/chromium/components/gcm_driver/BUILD.gn index fe711178cef..7fe0e26c3e3 100644 --- a/chromium/components/gcm_driver/BUILD.gn +++ b/chromium/components/gcm_driver/BUILD.gn @@ -40,6 +40,10 @@ static_library("gcm_driver") { "registration_info.h", "system_encryptor.cc", "system_encryptor.h", + "web_push_metrics.cc", + "web_push_metrics.h", + "web_push_sender.cc", + "web_push_sender.h", ] public_deps = [ @@ -58,12 +62,12 @@ static_library("gcm_driver") { "//components/os_crypt", "//components/pref_registry", "//components/prefs", + "//components/signin/public/identity_manager", "//components/sync", "//components/version_info", "//google_apis", "//google_apis/gcm", "//net", - "//services/identity/public/cpp", "//services/network/public/cpp", "//services/network/public/mojom", "//url:url", @@ -194,6 +198,15 @@ source_set("unit_tests") { "//third_party/protobuf:protobuf_lite", ] + if (!is_ios) { + sources += [ "web_push_sender_unittest.cc" ] + + deps += [ + "//content/test:test_support", + "//third_party/re2", + ] + } + if (!use_gcm_from_platform) { sources += [ "account_tracker_unittest.cc", @@ -202,11 +215,10 @@ source_set("unit_tests") { "gcm_channel_status_request_unittest.cc", "gcm_client_impl_unittest.cc", "gcm_driver_desktop_unittest.cc", + "gcm_driver_unittest.cc", "gcm_stats_recorder_impl_unittest.cc", ] + + deps += [ "//components/signin/public/identity_manager:test_support" ] } - deps += [ - "//services/identity/public/cpp", - "//services/identity/public/cpp:test_support", - ] } diff --git a/chromium/components/gcm_driver/android/BUILD.gn b/chromium/components/gcm_driver/android/BUILD.gn index 9617228bb66..81aa2f8a7c4 100644 --- a/chromium/components/gcm_driver/android/BUILD.gn +++ b/chromium/components/gcm_driver/android/BUILD.gn @@ -8,7 +8,6 @@ generate_jni("jni_headers") { sources = [ "java/src/org/chromium/components/gcm_driver/GCMDriver.java", ] - jni_package = "components/gcm_driver" } android_library("gcm_driver_java") { diff --git a/chromium/components/gcm_driver/common/BUILD.gn b/chromium/components/gcm_driver/common/BUILD.gn index ec7530f0d45..9f367163a34 100644 --- a/chromium/components/gcm_driver/common/BUILD.gn +++ b/chromium/components/gcm_driver/common/BUILD.gn @@ -10,4 +10,8 @@ component("common") { ] defines = [ "GCM_DRIVER_IMPLEMENTATION" ] + + deps = [ + "//base", + ] } diff --git a/chromium/components/gcm_driver/crypto/BUILD.gn b/chromium/components/gcm_driver/crypto/BUILD.gn index 30cda558f01..8aa1574baea 100644 --- a/chromium/components/gcm_driver/crypto/BUILD.gn +++ b/chromium/components/gcm_driver/crypto/BUILD.gn @@ -12,10 +12,13 @@ static_library("crypto") { "gcm_decryption_result.h", "gcm_encryption_provider.cc", "gcm_encryption_provider.h", + "gcm_encryption_result.h", "gcm_key_store.cc", "gcm_key_store.h", "gcm_message_cryptographer.cc", "gcm_message_cryptographer.h", + "json_web_token_util.cc", + "json_web_token_util.h", "message_payload_parser.cc", "message_payload_parser.h", "p256_key_util.cc", @@ -56,6 +59,7 @@ source_set("unit_tests") { "gcm_encryption_provider_unittest.cc", "gcm_key_store_unittest.cc", "gcm_message_cryptographer_unittest.cc", + "json_web_token_util_unittest.cc", "message_payload_parser_unittest.cc", "p256_key_util_unittest.cc", ] diff --git a/chromium/components/gcm_driver/instance_id/android/BUILD.gn b/chromium/components/gcm_driver/instance_id/android/BUILD.gn index ca773e2fa83..e5b2483fa3b 100644 --- a/chromium/components/gcm_driver/instance_id/android/BUILD.gn +++ b/chromium/components/gcm_driver/instance_id/android/BUILD.gn @@ -8,14 +8,12 @@ generate_jni("jni_headers") { sources = [ "java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java", ] - jni_package = "components/gcm_driver/instance_id" } generate_jni("test_support_jni_headers") { sources = [ "javatests/src/org/chromium/components/gcm_driver/instance_id/FakeInstanceIDWithSubtype.java", ] - jni_package = "components/gcm_driver/instance_id" } android_library("instance_id_driver_java") { |