BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 26 insertions, 5 deletions

diff --git a/chromium/chromecast/system/reboot/BUILD.gn b/chromium/chromecast/system/reboot/BUILD.gn
index a2bbb938a07..c36ba2a540a 100644
--- a/chromium/chromecast/system/reboot/BUILD.gn
+++ b/chromium/chromecast/system/reboot/BUILD.gn
@@ -13,10 +13,12 @@ cast_source_set("reboot_util") {
 
   deps = [ "//base" ]
 
-  if (chromecast_branding == "google" && !is_fuchsia) {
-    deps += [ "//chromecast/internal/system/reboot:reboot_util" ]
-  } else {
-    sources += [ "reboot_util_dummy.cc" ]
+  if (!is_fuchsia) {
+    if (chromecast_branding == "google") {
+      deps += [ "//chromecast/internal/system/reboot:reboot_util" ]
+    } else {
+      sources += [ "reboot_util_dummy.cc" ]
+    }
   }
 
   if (is_android && chromecast_branding != "public") {
@@ -41,6 +43,19 @@ test("cast_reboot_unittests") {
     "//testing/gmock",
     "//testing/gtest",
   ]
+
+  if (is_fuchsia) {
+    sources += [ "reboot_fuchsia_test.cc" ]
+    deps += [
+      ":fuchsia",
+      "//chromecast/public",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.feedback",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.hardware.power.statecontrol",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.io",
+      "//third_party/fuchsia-sdk/sdk/pkg/fidl_cpp",
+      "//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
+    ]
+  }
 }
 
 # Target for OEM partners to override reboot shared library, i.e.
@@ -53,13 +68,19 @@ cast_shared_library("libcast_reboot_1.0") {
 
 if (is_fuchsia) {
   cast_source_set("fuchsia") {
-    sources = [ "reboot_fuchsia.cc" ]
+    sources = [
+      "reboot_fuchsia.cc",
+      "reboot_fuchsia.h",
+      "reboot_util.h",
+    ]
     public_deps = [ "//chromecast/public" ]
     deps = [
       "//base",
+      "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.feedback",
       "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.hardware.power.statecontrol",
       "//third_party/fuchsia-sdk/sdk/pkg/fidl",
       "//third_party/fuchsia-sdk/sdk/pkg/fidl_cpp",
+      "//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
     ]
   }
 }