Handle mojo disconnect events properly.

fix brave/brave-browser#16964

Author: aseren

components/brave_ads/common/features.cc

@@ -153,11 +153,11 @@ int AdNotificationInsetY() {
       kDefaultAdNotificationInsetY);
 }
 
+#endif  // !defined(OS_ANDROID)
+
 bool IsRequestAdsEnabledApiEnabled() {
   return base::FeatureList::IsEnabled(kRequestAdsEnabledApi);
 }
 
-#endif  // !defined(OS_ANDROID)
-
 }  // namespace features
 }  // namespace brave_ads

components/brave_ads/common/features.h

@@ -17,8 +17,6 @@ namespace features {
 
 extern const base::Feature kAdNotifications;
 
-extern const base::Feature kRequestAdsEnabledApi;
-
 bool IsAdNotificationsEnabled();
 int AdNotificationTimeout();
 
@@ -33,10 +31,11 @@ double AdNotificationNormalizedDisplayCoordinateX();
 int AdNotificationInsetX();
 double AdNotificationNormalizedDisplayCoordinateY();
 int AdNotificationInsetY();
+#endif  // !defined(OS_ANDROID)
 
-bool IsRequestAdsEnabledApiEnabled();
+extern const base::Feature kRequestAdsEnabledApi;
 
-#endif  // !defined(OS_ANDROID)
+bool IsRequestAdsEnabledApiEnabled();
 
 }  // namespace features
 }  // namespace brave_ads

components/brave_ads/renderer/brave_ads_js_handler.cc

@@ -24,33 +24,19 @@ BraveAdsJSHandler::BraveAdsJSHandler(content::RenderFrame* render_frame)
 
 BraveAdsJSHandler::~BraveAdsJSHandler() = default;
 
-bool BraveAdsJSHandler::EnsureConnected() {
-  if (!brave_ads_.is_bound()) {
-    render_frame_->GetBrowserInterfaceBroker()->GetInterface(
-        brave_ads_.BindNewPipeAndPassReceiver());
-  }
-
-  return brave_ads_.is_bound();
-}
-
 void BraveAdsJSHandler::AddJavaScriptObjectToFrame(
     v8::Local<v8::Context> context) {
   v8::Isolate* isolate = blink::MainThreadIsolate();
   v8::HandleScope handle_scope(isolate);
-  if (context.IsEmpty())
+  if (context.IsEmpty()) {
     return;
+  }
 
   v8::Context::Scope context_scope(context);
 
   BindFunctionsToObject(isolate, context);
 }
 
-void BraveAdsJSHandler::ResetRemote(content::RenderFrame* render_frame) {
-  render_frame_ = render_frame;
-  brave_ads_.reset();
-  EnsureConnected();
-}
-
 void BraveAdsJSHandler::BindFunctionsToObject(v8::Isolate* isolate,
                                               v8::Local<v8::Context> context) {
   v8::Local<v8::Object> global = context->Global();
@@ -87,10 +73,27 @@ void BraveAdsJSHandler::BindFunctionToObject(
       .Check();
 }
 
+bool BraveAdsJSHandler::EnsureConnected() {
+  if (!brave_ads_.is_bound()) {
+    render_frame_->GetBrowserInterfaceBroker()->GetInterface(
+        brave_ads_.BindNewPipeAndPassReceiver());
+    brave_ads_.set_disconnect_handler(base::BindOnce(
+        &BraveAdsJSHandler::OnRemoteDisconnect, base::Unretained(this)));
+  }
+
+  return brave_ads_.is_bound();
+}
+
+void BraveAdsJSHandler::OnRemoteDisconnect() {
+  brave_ads_.reset();
+  EnsureConnected();
+}
+
 v8::Local<v8::Promise> BraveAdsJSHandler::RequestAdsEnabled(
     v8::Isolate* isolate) {
-  if (!EnsureConnected())
+  if (!EnsureConnected()) {
     return v8::Local<v8::Promise>();
+  }
 
   v8::MaybeLocal<v8::Promise::Resolver> resolver =
       v8::Promise::Resolver::New(isolate->GetCurrentContext());

components/brave_ads/renderer/brave_ads_js_handler.h

@@ -28,7 +28,6 @@ class BraveAdsJSHandler final {
   ~BraveAdsJSHandler();
 
   void AddJavaScriptObjectToFrame(v8::Local<v8::Context> context);
-  void ResetRemote(content::RenderFrame* render_frame);
 
  private:
   // Adds a function to the provided object.
@@ -40,6 +39,7 @@ class BraveAdsJSHandler final {
   void BindFunctionsToObject(v8::Isolate* isolate,
                              v8::Local<v8::Context> context);
   bool EnsureConnected();
+  void OnRemoteDisconnect();
 
   // A function to be called from JS
   v8::Local<v8::Promise> RequestAdsEnabled(v8::Isolate* isolate);

components/brave_ads/renderer/brave_ads_render_frame_observer.cc

@@ -35,7 +35,9 @@ bool IsAllowedHost(const GURL& url) {
 BraveAdsRenderFrameObserver::BraveAdsRenderFrameObserver(
     content::RenderFrame* render_frame,
     int32_t world_id)
-    : RenderFrameObserver(render_frame), world_id_(world_id) {}
+    : RenderFrameObserver(render_frame), world_id_(world_id) {
+  native_javascript_handle_ = std::make_unique<BraveAdsJSHandler>(render_frame);
+}
 
 BraveAdsRenderFrameObserver::~BraveAdsRenderFrameObserver() {}
 
@@ -51,13 +53,6 @@ void BraveAdsRenderFrameObserver::DidCreateScriptContext(
   if (!IsAllowedHost(url))
     return;
 
-  if (!native_javascript_handle_) {
-    native_javascript_handle_ =
-        std::make_unique<BraveAdsJSHandler>(render_frame());
-  } else {
-    native_javascript_handle_->ResetRemote(render_frame());
-  }
-
   native_javascript_handle_->AddJavaScriptObjectToFrame(context);
 }
 

components/brave_rewards/resources/extension/brave_rewards/request_ads_enabled_panel.tsx

@@ -9,7 +9,6 @@ import { Store } from 'webext-redux'
 
 import Theme from 'brave-ui/theme/brave-default'
 import { ThemeProvider } from 'styled-components'
-import { initLocale } from 'brave-ui/helpers'
 require('emptykit.css')
 require('../../../../../ui/webui/resources/fonts/muli.css')
 require('../../../../../ui/webui/resources/fonts/poppins.css')
@@ -21,25 +20,19 @@ import { WithThemeVariables } from '../../shared/components/with_theme_variables
 import AdsEnablePanel from './components/ads_enable'
 
 // Utils
-import { getMessage, getUIMessages } from './background/api/locale_api'
+import { getMessage } from './background/api/locale_api'
 
 const store: Store<RewardsExtension.State> = new Store({
   portName: 'REWARDSPANEL'
 })
 
 const localeContext = {
   getString: (key: string) => {
-    // In order to normalize messages across extensions and WebUI, replace all
-    // chrome.i18n message placeholders with $N marker patterns. UI components
-    // are responsible for replacing these markers with appropriate text or
-    // using the markers to build HTML.
     const subsitutions = ['$1', '$2', '$3', '$4', '$5', '$6', '$7', '$8', '$9']
     return getMessage(key, subsitutions)
   }
 }
 
-initLocale(getUIMessages())
-
 store.ready().then(
   () => {
     render(