Fixed crash when account.brav.com is loaded

fix brave/brave-browser#35395 When VPN feature flag is disabled, SkusJSHandler should not try to bind to vpn service handler as BraveVpnService is not instantiated.
brave · Jan 22, 2024 · 793f769 · 793f769
1 parent 5a81c91
commit 793f769
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/browser/brave_vpn/brave_vpn_service_factory.cc b/browser/brave_vpn/brave_vpn_service_factory.cc
@@ -111,6 +111,7 @@ BraveVpnService* BraveVpnServiceFactory::GetForProfile(Profile* profile) {
 void BraveVpnServiceFactory::BindForContext(
     content::BrowserContext* context,
     mojo::PendingReceiver<brave_vpn::mojom::ServiceHandler> receiver) {
+  CHECK(GetInstance());
   auto* service = static_cast<BraveVpnService*>(
       GetInstance()->GetServiceForBrowserContext(context, true));
   if (service) {

diff --git a/components/skus/renderer/BUILD.gn b/components/skus/renderer/BUILD.gn
@@ -20,7 +20,6 @@ source_set("renderer") {
   deps = [
     "//base",
     "//brave/components/brave_vpn/common/buildflags",
-    "//brave/components/brave_vpn/common/mojom",
     "//brave/components/skus/common",
     "//brave/components/skus/common:mojom",
     "//content/public/renderer",
@@ -31,6 +30,13 @@ source_set("renderer") {
     "//third_party/blink/public/strings",
     "//v8",
   ]
+
+  if (enable_brave_vpn) {
+    deps += [
+      "//brave/components/brave_vpn/common",
+      "//brave/components/brave_vpn/common/mojom",
+    ]
+  }
 }
 
 source_set("unit_tests") {

diff --git a/components/skus/renderer/skus_js_handler.cc b/components/skus/renderer/skus_js_handler.cc
@@ -28,6 +28,10 @@
 #include "third_party/blink/public/web/web_local_frame.h"
 #include "third_party/blink/public/web/web_script_source.h"
 
+#if BUILDFLAG(ENABLE_BRAVE_VPN)
+#include "brave/components/brave_vpn/common/brave_vpn_utils.h"
+#endif
+
 namespace skus {
 
 gin::WrapperInfo SkusJSHandler::kWrapperInfo = {gin::kEmbedderNativeGin};
@@ -44,7 +48,7 @@ bool SkusJSHandler::EnsureConnected() {
   }
   bool result = skus_service_.is_bound();
 #if BUILDFLAG(ENABLE_BRAVE_VPN)
-  if (!vpn_service_.is_bound()) {
+  if (brave_vpn::IsBraveVPNFeatureEnabled() && vpn_service_.is_bound()) {
     render_frame_->GetBrowserInterfaceBroker()->GetInterface(
         vpn_service_.BindNewPipeAndPassReceiver());
   }