      }, {
        "internal": true,
        "channel": "stable",
-@@ -554,6 +557,7 @@
+@@ -555,6 +558,7 @@
      "internal": true,
      "contexts": ["webui"],
      "matches": [
 +      "chrome://brave/*",
        "chrome://chrome-signin/*",
        "chrome://media-router/*",
-       "chrome://oobe/*"
-@@ -572,6 +576,13 @@
-       "chrome://media-router/*",
+       "chrome://mobilesetup/*",
+@@ -575,6 +579,13 @@
+       "chrome://mobilesetup/*",
        "chrome://oobe/*"
      ]
 +  }, {

   }],
   "webViewRequest": [{
     "dependencies": ["permission:webview"],
@@ -580,6 +591,7 @@
     "channel": "stable",
     "contexts": ["webui"],
     "matches": [
+      "chrome://brave/*",
       "chrome://chrome-signin/*",
       "chrome://media-router/*",
       "chrome://oobe/*"
diff --git a/extensions/renderer/module_system.cc b/extensions/renderer/module_system.cc
index 07ec45a5ad851875fc8cbf7cbc69023f97e9225a..ac1ccee6f99e9e10b7eed10a60faf774a09a49ba 100644
--- a/extensions/renderer/module_system.cc

     if (delegate_)
       delegate_->PreSandboxStartup();
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index c73f9f0c640d0b155109115d74f2b81bfb58627a..6497890b574bc092936dba562ea7bccf0b6da7f6 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -873,6 +873,8 @@ void BrowserPluginGuest::OnDetach(int browser_plugin_instance_id) {
     rwhv->UnregisterFrameSinkId();
 
   delegate_->DidDetach();
