3 files changed, 33 insertions, 2 deletions
diff --git a/chromium/chromecast/browser/BUILD.gn b/chromium/chromecast/browser/BUILD.gn
index da6347ebb27..60d96dae593 100644
--- a/chromium/chromecast/browser/BUILD.gn
+++ b/chromium/chromecast/browser/BUILD.gn
@@ -177,6 +177,7 @@ cast_source_set("browser") {
     "//chromecast/media:libcast_media",
     "//chromecast/media/base:media_codec_support",
     "//chromecast/media/base:video_plane_controller",
+    "//chromecast/media/cdm:cdm_origin_provider",
     "//chromecast/media/service",
     "//chromecast/media/service/mojom",
     "//chromecast/net",
@@ -186,7 +187,7 @@ cast_source_set("browser") {
     "//components/download/public/common:public",
     "//components/media_control/browser",
     "//components/metrics",
-    "//components/metrics:gpu",
+    "//components/metrics:content",
     "//components/metrics:net",
     "//components/variations/net",
 
@@ -208,6 +209,7 @@ cast_source_set("browser") {
     "//gpu",
     "//ipc",
     "//media",
+    "//media/mojo/mojom:remoting",
     "//media/mojo/services",
     "//net",
     "//services/media_session/public/mojom",
@@ -589,6 +591,14 @@ cast_source_set("unittests") {
       "//ui/events:test_support",
     ]
   }
+
+  if (is_linux && use_ozone) {
+    sources += [ "webview/webview_window_manager_unittest.cc" ]
+    deps += [
+      "//chromecast/graphics",
+      "//components/exo",
+    ]
+  }
 }
 
 if (is_android) {
@@ -610,6 +620,22 @@ if (is_android) {
   }
 }
 
+# Could be used in the internal build if the internal implementation won't be
+# included, for example, some unit tests.
+cast_source_set("simple_browser") {
+  sources = [
+    "cast_browser_main_parts_simple.cc",
+    "cast_content_browser_client_simple.cc",
+    "pref_service_helper_simple.cc",
+  ]
+
+  deps = [
+    ":browser",
+    ":prefs",
+    "//chromecast/base:default_create_sys_info",
+  ]
+}
+
 cast_source_set("web_contents_provider") {
   sources = [ "webview/web_contents_provider.h" ]
 
diff --git a/chromium/chromecast/browser/android/BUILD.gn b/chromium/chromecast/browser/android/BUILD.gn
index 67d171d0447..94e4d35d53f 100644
--- a/chromium/chromecast/browser/android/BUILD.gn
+++ b/chromium/chromecast/browser/android/BUILD.gn
@@ -237,13 +237,18 @@ junit_binary("cast_shell_junit_tests") {
   srcjar_deps = [ ":cast_shell_build_config_gen" ]
 
   deps = [
+    ":cast_audio_manager_java",
     ":cast_intents_java",
     ":cast_shell_java",
+    ":reactive_android_java",
+    "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
+    "//chromecast/base:base_java",
     "//chromecast/base:cast_base_test_utils_java",
     "//content/public/android:content_java",
     "//third_party/android_deps:androidx_legacy_legacy_support_core_utils_java",
+    "//third_party/android_deps:androidx_localbroadcastmanager_localbroadcastmanager_java",
     "//third_party/hamcrest:hamcrest_java",
   ]
 }
diff --git a/chromium/chromecast/browser/metrics/BUILD.gn b/chromium/chromecast/browser/metrics/BUILD.gn
index c02974504ff..1ac7d15b428 100644
--- a/chromium/chromecast/browser/metrics/BUILD.gn
+++ b/chromium/chromecast/browser/metrics/BUILD.gn
@@ -22,7 +22,7 @@ cast_source_set("metrics") {
     "//chromecast/base:cast_version",
     "//chromecast/metrics",
     "//components/metrics",
-    "//components/metrics:gpu",
+    "//components/metrics:content",
     "//components/metrics:net",
     "//components/metrics:ui",
     "//components/prefs",