BASELINE: Update Chromium to 85.0.4183.14085-based

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

3 files changed, 52 insertions, 0 deletions

diff --git a/chromium/chromeos/lacros/browser/BUILD.gn b/chromium/chromeos/lacros/browser/BUILD.gn
new file mode 100644
index 00000000000..7b9b731bd45
--- /dev/null
+++ b/chromium/chromeos/lacros/browser/BUILD.gn
@@ -0,0 +1,21 @@
+# 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.
+
+# Reset sources_assignment_filter for the BUILD.gn file to prevent
+# regression during the migration of Chromium away from the feature.
+# See docs/no_sources_assignment_filter.md for more information.
+# TODO(crbug.com/1018739): remove this when migration is done.
+set_sources_assignment_filter([])
+
+component("browser") {
+  defines = [ "IS_CHROMEOS_LACROS_IMPL" ]
+  deps = [
+    "//base",
+    "//chromeos/lacros/mojom",
+  ]
+  sources = [
+    "lacros_chrome_service_impl.cc",
+    "lacros_chrome_service_impl.h",
+  ]
+}
diff --git a/chromium/chromeos/lacros/mojom/BUILD.gn b/chromium/chromeos/lacros/mojom/BUILD.gn
new file mode 100644
index 00000000000..567f9a9dd03
--- /dev/null
+++ b/chromium/chromeos/lacros/mojom/BUILD.gn
@@ -0,0 +1,9 @@
+# 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("//mojo/public/tools/bindings/mojom.gni")
+
+mojom("mojom") {
+  sources = [ "lacros.mojom" ]
+}
diff --git a/chromium/chromeos/lacros/mojom/lacros.mojom b/chromium/chromeos/lacros/mojom/lacros.mojom
new file mode 100644
index 00000000000..5a8360c01c5
--- /dev/null
+++ b/chromium/chromeos/lacros/mojom/lacros.mojom
@@ -0,0 +1,22 @@
+// 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.
+
+module lacros.mojom;
+
+// AshChromeService defines the APIs that live in ash-chrome and are
+// accessed from lacros-chrome.
+interface AshChromeService {
+};
+
+// LacrosChromeService defines the APIs that live in lacros-chrome and
+// are accessed from ash-chrome.
+interface LacrosChromeService {
+    // Returns the pending_receiver of AshChromeService.
+    // Ash-chrome is expected to call this method on initialization.
+    // Lacros-chrome may call AshChromeService APIs earlier than this
+    // invocation. In the case, the calls are queued, and processed
+    // sequentially, when ash-chrome binds the receiver to the service.
+    RequestAshChromeServiceReceiver@0() => (
+        pending_receiver<AshChromeService> receiver);
+};