BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

4 files changed, 118 insertions, 0 deletions

diff --git a/chromium/chrome/browser/nearby_sharing/certificates/BUILD.gn b/chromium/chrome/browser/nearby_sharing/certificates/BUILD.gn
new file mode 100644
index 00000000000..0ecdcfb35f9
--- /dev/null
+++ b/chromium/chrome/browser/nearby_sharing/certificates/BUILD.gn
@@ -0,0 +1,61 @@
+# Copyright (c) 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("certificates") {
+  sources = [
+    "common.cc",
+    "common.h",
+    "constants.cc",
+    "constants.h",
+    "nearby_share_decrypted_public_certificate.cc",
+    "nearby_share_decrypted_public_certificate.h",
+    "nearby_share_encrypted_metadata_key.cc",
+    "nearby_share_encrypted_metadata_key.h",
+    "nearby_share_private_certificate.cc",
+    "nearby_share_private_certificate.h",
+    "nearby_share_visibility.h",
+  ]
+
+  deps = [
+    "//base",
+    "//chrome/browser/nearby_sharing/proto",
+    "//crypto",
+  ]
+}
+
+source_set("test_support") {
+  testonly = true
+
+  sources = [
+    "test_util.cc",
+    "test_util.h",
+  ]
+
+  deps = [
+    ":certificates",
+    "//base",
+    "//chrome/browser/nearby_sharing/proto",
+    "//crypto",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+
+  sources = [
+    "common_unittest.cc",
+    "nearby_share_decrypted_public_certificate_unittest.cc",
+    "nearby_share_private_certificate_unittest.cc",
+  ]
+
+  deps = [
+    ":certificates",
+    ":test_support",
+    "//base",
+    "//base/test:test_support",
+    "//chrome/browser/nearby_sharing/proto",
+    "//crypto",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/chrome/browser/nearby_sharing/logging/BUILD.gn b/chromium/chrome/browser/nearby_sharing/logging/BUILD.gn
new file mode 100644
index 00000000000..f8312772594
--- /dev/null
+++ b/chromium/chrome/browser/nearby_sharing/logging/BUILD.gn
@@ -0,0 +1,24 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+source_set("logging") {
+  sources = [
+    "log_buffer.cc",
+    "log_buffer.h",
+    "logging.cc",
+    "logging.h",
+  ]
+  deps = [ "//base" ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  sources = [ "logging_unittest.cc" ]
+
+  deps = [
+    ":logging",
+    "//base/test:test_support",
+    "//testing/gtest",
+  ]
+}
diff --git a/chromium/chrome/browser/nearby_sharing/proto/BUILD.gn b/chromium/chrome/browser/nearby_sharing/proto/BUILD.gn
new file mode 100644
index 00000000000..a5be23229fc
--- /dev/null
+++ b/chromium/chrome/browser/nearby_sharing/proto/BUILD.gn
@@ -0,0 +1,17 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//third_party/protobuf/proto_library.gni")
+
+proto_library("proto") {
+  sources = [
+    "certificate_rpc.proto",
+    "contact_rpc.proto",
+    "device_rpc.proto",
+    "encrypted_metadata.proto",
+    "field_mask.proto",
+    "rpc_resources.proto",
+    "timestamp.proto",
+  ]
+}
diff --git a/chromium/chrome/browser/nearby_sharing/tachyon/proto/BUILD.gn b/chromium/chrome/browser/nearby_sharing/tachyon/proto/BUILD.gn
new file mode 100644
index 00000000000..353a29773de
--- /dev/null
+++ b/chromium/chrome/browser/nearby_sharing/tachyon/proto/BUILD.gn
@@ -0,0 +1,16 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//third_party/protobuf/proto_library.gni")
+
+group("proto_lite") {
+  public_deps = [
+    ":proto",
+    "//third_party/protobuf:protobuf_lite",
+  ]
+}
+
+proto_library("proto") {
+  sources = [ "tachyon.proto" ]
+}