1 files changed, 13 insertions, 10 deletions
diff --git a/chromium/fuchsia/base/BUILD.gn b/chromium/fuchsia/base/BUILD.gn
index 2dba9680aad..4e0d73dd164 100644
--- a/chromium/fuchsia/base/BUILD.gn
+++ b/chromium/fuchsia/base/BUILD.gn
@@ -4,30 +4,37 @@
 
 assert(is_fuchsia)
 
-import("//build/buildflag_header.gni")
 import("//build/config/fuchsia/generate_runner_scripts.gni")
-import("//fuchsia/release_channel.gni")
 import("//testing/test.gni")
 
 # Integration helpers for commonly used fuchsia.* APIs.
 source_set("base") {
   sources = [
     "config_reader.cc",
+    "feedback_registration.cc",
     "fuchsia_dir_scheme.cc",
     "init_logging.cc",
+    "inspect.cc",
     "mem_buffer_util.cc",
     "string_util.cc",
   ]
   public = [
     "config_reader.h",
+    "feedback_registration.h",
     "fuchsia_dir_scheme.h",
     "init_logging.h",
+    "inspect.h",
     "mem_buffer_util.h",
     "string_util.h",
   ]
   deps = [
     "//base",
+    "//components/version_info",
+    "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.feedback",
     "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.mem",
+    "//third_party/fuchsia-sdk/sdk/pkg/fdio",
+    "//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
+    "//third_party/fuchsia-sdk/sdk/pkg/sys_inspect_cpp",
     "//url",
   ]
 }
@@ -78,13 +85,6 @@ source_set("legacymetrics") {
   friend = [ ":*" ]
 }
 
-# Used to propagate release-qualified package names to integration test code.
-buildflag_header("release_channel_buildflags") {
-  header = "release_channel.h"
-  flags = [ "FUCHSIA_RELEASE_CHANNEL_SUFFIX=\"$release_channel_suffix\"" ]
-  visibility = [ "//fuchsia/*" ]
-}
-
 source_set("test_support") {
   testonly = true
   sources = [
@@ -106,7 +106,6 @@ source_set("test_support") {
   public_deps = [
     ":base",
     ":modular",
-    ":release_channel_buildflags",
     "//base",
     "//net",
     "//net:test_support",
@@ -120,6 +119,7 @@ source_set("test_support") {
 test("cr_fuchsia_base_unittests") {
   sources = [
     "agent_impl_unittests.cc",
+    "inspect_unittest.cc",
     "legacymetrics_client_unittest.cc",
     "legacymetrics_histogram_flattener_unittest.cc",
     "legacymetrics_user_event_recorder_unittest.cc",
@@ -132,6 +132,9 @@ test("cr_fuchsia_base_unittests") {
     "//base:testfidl",
     "//base/test:run_all_unittests",
     "//base/test:test_support",
+    "//components/version_info",
     "//testing/gtest",
+    "//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
+    "//third_party/fuchsia-sdk/sdk/pkg/sys_inspect_cpp",
   ]
 }