BASELINE: Update Chromium to 85.0.4183.14085-based

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

2 files changed, 63 insertions, 0 deletions

diff --git a/chromium/chrome/services/sharing/nearby_decoder/BUILD.gn b/chromium/chrome/services/sharing/nearby_decoder/BUILD.gn
new file mode 100644
index 00000000000..6b7666f303d
--- /dev/null
+++ b/chromium/chrome/services/sharing/nearby_decoder/BUILD.gn
@@ -0,0 +1,47 @@
+# 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("//testing/libfuzzer/fuzzer_test.gni")
+
+source_set("nearby_decoder") {
+  sources = [
+    "advertisement.cc",
+    "advertisement.h",
+    "nearby_decoder.cc",
+    "nearby_decoder.h",
+  ]
+
+  deps = [ "//chrome/services/sharing/nearby_decoder/proto" ]
+
+  public_deps = [
+    "//base",
+    "//chrome/services/sharing/public/mojom",
+    "//mojo/public/cpp/bindings",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+
+  sources = [
+    "advertisement_unittest.cc",
+    "nearby_decoder_unittest.cc",
+  ]
+
+  deps = [
+    ":nearby_decoder",
+    "//base/test:test_support",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
+}
+
+fuzzer_test("nearby_decoder_fuzzer") {
+  sources = [ "nearby_decoder_fuzzer.cc" ]
+  deps = [
+    ":nearby_decoder",
+    "//base",
+    "//mojo/core/embedder",
+  ]
+}
diff --git a/chromium/chrome/services/sharing/nearby_decoder/proto/BUILD.gn b/chromium/chrome/services/sharing/nearby_decoder/proto/BUILD.gn
new file mode 100644
index 00000000000..eccfabf7f61
--- /dev/null
+++ b/chromium/chrome/services/sharing/nearby_decoder/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 = [ "wire_format.proto" ]
+}