Upgrade patches from Chromium 77.0.3865.90 to Chromium 78.0.3904.44

browser/BUILD.gn

@@ -141,6 +141,8 @@ source_set("browser_process") {
     "//components/prefs",
     "//components/safe_browsing/common:safe_browsing_prefs",
     "//components/search_engines",
+    "//components/services/patch/content",
+    "//components/services/unzip/content",
     "//components/spellcheck/browser",
     "//components/unified_consent",
     "//components/update_client:patch_impl",

browser/brave_content_browser_client.cc

@@ -147,7 +147,7 @@ BraveContentBrowserClient::AllowWebBluetooth(
 
 bool BraveContentBrowserClient::HandleExternalProtocol(
     const GURL& url,
-    content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
+    content::WebContents::Getter web_contents_getter,
     int child_id,
     content::NavigationUIData* navigation_data,
     bool is_main_frame,
@@ -221,22 +221,21 @@ bool BraveContentBrowserClient::WillCreateURLLoaderFactory(
     content::BrowserContext* browser_context,
     content::RenderFrameHost* frame,
     int render_process_id,
-    bool is_navigation,
-    bool is_download,
+    URLLoaderFactoryType type,
     const url::Origin& request_initiator,
     mojo::PendingReceiver<network::mojom::URLLoaderFactory>* factory_receiver,
-    network::mojom::TrustedURLLoaderHeaderClientPtrInfo* header_client,
+    mojo::PendingRemote<network::mojom::TrustedURLLoaderHeaderClient>*
+        header_client,
     bool* bypass_redirect_checks) {
   bool use_proxy = false;
   // TODO(iefremov): Skip proxying for certain requests?
   use_proxy = BraveProxyingURLLoaderFactory::MaybeProxyRequest(
-      browser_context,
-      frame, is_navigation ? -1 : render_process_id,
+      browser_context, frame,
+      type == URLLoaderFactoryType::kNavigation ? -1 : render_process_id,
       factory_receiver);
 
   use_proxy |= ChromeContentBrowserClient::WillCreateURLLoaderFactory(
-      browser_context,
-      frame, render_process_id, is_navigation, is_download, request_initiator,
+      browser_context, frame, render_process_id, type, request_initiator,
       factory_receiver, header_client, bypass_redirect_checks);
 
   return use_proxy;
@@ -280,8 +279,8 @@ void BraveContentBrowserClient::MaybeHideReferrer(
     const GURL& request_url,
     const GURL& document_url,
     bool is_main_frame,
-    content::Referrer* referrer) {
-  DCHECK(referrer);
+    blink::mojom::ReferrerPtr* referrer) {
+  DCHECK(referrer && !referrer->is_null());
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   if (document_url.SchemeIs(kChromeExtensionScheme)) {
     return;
@@ -299,9 +298,13 @@ void BraveContentBrowserClient::MaybeHideReferrer(
     // But iframe navigations get spoofed instead (brave/brave-browser#3988).
     replacement_referrer_url = request_url.GetOrigin();
   }
-  brave_shields::ShouldSetReferrer(
-      allow_referrers, shields_up, referrer->url, document_url, request_url,
-      replacement_referrer_url, referrer->policy, referrer);
+  content::Referrer new_referrer;
+  if (brave_shields::ShouldSetReferrer(
+      allow_referrers, shields_up, (*referrer)->url, document_url, request_url,
+          replacement_referrer_url, (*referrer)->policy, &new_referrer)) {
+    (*referrer)->url = new_referrer.url;
+    (*referrer)->policy = new_referrer.policy;
+  }
 }
 
 GURL BraveContentBrowserClient::GetEffectiveURL(

browser/brave_content_browser_client.h

@@ -13,6 +13,7 @@
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
+#include "third_party/blink/public/mojom/referrer.mojom.h"
 
 class PrefChangeRegistrar;
 
@@ -32,7 +33,7 @@ class BraveContentBrowserClient : public ChromeContentBrowserClient {
 
   bool HandleExternalProtocol(
       const GURL& url,
-      content::ResourceRequestInfo::WebContentsGetter web_contents_getter,
+      content::WebContents::Getter web_contents_getter,
       int child_id,
       content::NavigationUIData* navigation_data,
       bool is_main_frame,
@@ -57,11 +58,11 @@ class BraveContentBrowserClient : public ChromeContentBrowserClient {
       content::BrowserContext* browser_context,
       content::RenderFrameHost* frame,
       int render_process_id,
-      bool is_navigation,
-      bool is_download,
+      URLLoaderFactoryType type,
       const url::Origin& request_initiator,
       mojo::PendingReceiver<network::mojom::URLLoaderFactory>* factory_receiver,
-      network::mojom::TrustedURLLoaderHeaderClientPtrInfo* header_client,
+      mojo::PendingRemote<network::mojom::TrustedURLLoaderHeaderClient>*
+          header_client,
       bool* bypass_redirect_checks) override;
 
   bool WillInterceptWebSocket(content::RenderFrameHost* frame) override;
@@ -77,7 +78,7 @@ class BraveContentBrowserClient : public ChromeContentBrowserClient {
                          const GURL& request_url,
                          const GURL& document_url,
                          bool is_main_frame,
-                         content::Referrer* referrer) override;
+                         blink::mojom::ReferrerPtr* referrer) override;
 
   GURL GetEffectiveURL(content::BrowserContext* browser_context,
                        const GURL& url) override;

browser/brave_content_browser_client_browsertest.cc

@@ -428,55 +428,55 @@ IN_PROC_BROWSER_TEST_F(BraveContentBrowserClientReferrerTest,
   const GURL kDocumentUrl("http://document.com/path?query");
   const GURL kSameOriginRequestUrl("http://document.com/different/path");
 
-  content::Referrer kReferrer(kDocumentUrl,
-                              network::mojom::ReferrerPolicy::kDefault);
+  blink::mojom::ReferrerPtr kReferrer = blink::mojom::Referrer::New(
+      kDocumentUrl, network::mojom::ReferrerPolicy::kDefault);
 
   // Cross-origin navigations don't get a referrer.
-  content::Referrer referrer = kReferrer;
+  blink::mojom::ReferrerPtr referrer = kReferrer.Clone();
   client()->MaybeHideReferrer(browser()->profile(),
                               kRequestUrl, kDocumentUrl, true,
                               &referrer);
-  EXPECT_EQ(referrer.url, GURL());
+  EXPECT_EQ(referrer->url, GURL());
 
   // Same-origin navigations get full referrers.
-  referrer = kReferrer;
+  referrer = kReferrer.Clone();
   client()->MaybeHideReferrer(browser()->profile(),
                               kSameOriginRequestUrl, kDocumentUrl, true,
                               &referrer);
-  EXPECT_EQ(referrer.url, kDocumentUrl);
+  EXPECT_EQ(referrer->url, kDocumentUrl);
 
   // Cross-origin iframe navigations get a spoofed referrer.
-  referrer = kReferrer;
+  referrer = kReferrer.Clone();
   client()->MaybeHideReferrer(browser()->profile(),
                               kRequestUrl, kDocumentUrl, false,
                               &referrer);
-  EXPECT_EQ(referrer.url, kRequestUrl.GetOrigin());
+  EXPECT_EQ(referrer->url, kRequestUrl.GetOrigin());
 
   // Same-origin iframe navigations get full referrers.
-  referrer = kReferrer;
+  referrer = kReferrer.Clone();
   client()->MaybeHideReferrer(browser()->profile(),
                               kSameOriginRequestUrl, kDocumentUrl, false,
                               &referrer);
-  EXPECT_EQ(referrer.url, kDocumentUrl);
+  EXPECT_EQ(referrer->url, kDocumentUrl);
 
   // Special rule for extensions.
   const GURL kExtensionUrl("chrome-extension://abc/path?query");
-  referrer = kReferrer;
-  referrer.url = kExtensionUrl;
+  referrer = kReferrer.Clone();
+  referrer->url = kExtensionUrl;
   client()->MaybeHideReferrer(browser()->profile(),
                               kRequestUrl, kExtensionUrl, true,
                               &referrer);
-  EXPECT_EQ(referrer.url, kExtensionUrl);
+  EXPECT_EQ(referrer->url, kExtensionUrl);
 
   // Allow referrers for certain URL.
   content_settings()->SetContentSettingCustomScope(
       ContentSettingsPattern::FromString(kDocumentUrl.GetOrigin().spec() + "*"),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_PLUGINS,
       brave_shields::kReferrers, CONTENT_SETTING_ALLOW);
-  referrer = kReferrer;
+  referrer = kReferrer.Clone();
   client()->MaybeHideReferrer(browser()->profile(),
                               kRequestUrl, kDocumentUrl, true,
                               &referrer);
-  EXPECT_EQ(referrer.url, kDocumentUrl);
+  EXPECT_EQ(referrer->url, kDocumentUrl);
 }

browser/component_updater/brave_component_updater_configurator.cc

@@ -20,6 +20,8 @@
 #include "components/component_updater/component_updater_command_line_config_policy.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
+#include "components/services/patch/content/patch_service.h"
+#include "components/services/unzip/content/unzip_service.h"
 #include "components/update_client/activity_data_service.h"
 #include "components/update_client/net/network_chromium.h"
 #include "components/update_client/patch/patch_impl.h"
@@ -28,9 +30,7 @@
 #include "components/update_client/unzipper.h"
 #include "components/update_client/update_query_params.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/common/service_manager_connection.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
-#include "services/service_manager/public/cpp/connector.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
@@ -126,9 +126,7 @@ BraveConfigurator::GetUnzipperFactory() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!unzip_factory_) {
     unzip_factory_ = base::MakeRefCounted<update_client::UnzipChromiumFactory>(
-        content::ServiceManagerConnection::GetForProcess()
-            ->GetConnector()
-            ->Clone());
+        base::BindRepeating(&unzip::LaunchUnzipper));
   }
   return unzip_factory_;
 }
@@ -138,9 +136,7 @@ BraveConfigurator::GetPatcherFactory() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (!patch_factory_) {
     patch_factory_ = base::MakeRefCounted<update_client::PatchChromiumFactory>(
-        content::ServiceManagerConnection::GetForProcess()
-            ->GetConnector()
-            ->Clone());
+        base::BindRepeating(&patch::LaunchFilePatcher));
   }
   return patch_factory_;
 }

browser/component_updater/brave_component_updater_delegate.cc

@@ -19,11 +19,10 @@ using brave_component_updater::BraveComponent;
 namespace brave {
 
 BraveComponentUpdaterDelegate::BraveComponentUpdaterDelegate()
-    : task_runner_(
-          base::CreateSequencedTaskRunnerWithTraits({base::MayBlock(),
-              base::TaskPriority::USER_VISIBLE,
-              base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN})) {
-}
+    : task_runner_(base::CreateSequencedTaskRunner(
+          {base::ThreadPool(), base::MayBlock(),
+           base::TaskPriority::USER_VISIBLE,
+           base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN})) {}
 
 BraveComponentUpdaterDelegate::~BraveComponentUpdaterDelegate() {}
 

browser/extensions/BUILD.gn

@@ -66,6 +66,8 @@ source_set("extensions") {
     "//components/gcm_driver:gcm_driver",
     "//components/gcm_driver:gcm_buildflags",
     "//components/prefs",
+    "//components/services/patch/content",
+    "//components/services/unzip/content",
     "//components/update_client:patch_impl",
     "//components/update_client:unzip_impl",
     "//content/public/browser",