patches/inox: Update for 70

2026-04-14 00:14:20 +09:00 · 2018-10-04 21:54:26 +02:00
parent 6729aa83d4
commit ecb7b49e1a
19 changed files with 198 additions and 404 deletions
--- a/patches/inox-patchset/0001-fix-building-without-safebrowsing.patch
+++ b/patches/inox-patchset/0001-fix-building-without-safebrowsing.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -778,30 +778,6 @@ void SetApplicationLocaleOnIOThread(cons
+@@ -797,30 +797,6 @@ void SetApplicationLocaleOnIOThread(cons
   g_io_thread_application_locale.Get() = locale;
 }
 
@@ -40,7 +40,7 @@
         command_line->AppendSwitch(
             switches::kDisableClientSidePhishingDetection);
       }
-@@ -2653,7 +2629,7 @@ void ChromeContentBrowserClient::AllowCe
+@@ -2657,7 +2633,7 @@ void ChromeContentBrowserClient::AllowCe
   SSLErrorHandler::HandleSSLError(
       web_contents, cert_error, ssl_info, request_url,
       expired_previous_decision,
@@ -49,7 +49,7 @@
       callback, SSLErrorHandler::BlockingPageReadyCallback());
 }
 
-@@ -2923,8 +2899,6 @@ bool ChromeContentBrowserClient::CanCrea
+@@ -2927,8 +2903,6 @@ bool ChromeContentBrowserClient::CanCrea
 void ChromeContentBrowserClient::ResourceDispatcherHostCreated() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
@@ -58,8 +58,8 @@
   for (size_t i = 0; i < extra_parts_.size(); ++i)
     extra_parts_[i]->ResourceDispatcherHostCreated();
 
-@@ -3961,7 +3935,7 @@ ChromeContentBrowserClient::CreateThrott
-           switches::kCommittedInterstitials)) {
+@@ -4074,7 +4048,7 @@ ChromeContentBrowserClient::CreateThrott
+   if (base::FeatureList::IsEnabled(features::kSSLCommittedInterstitials)) {
     throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
         handle,
 -        std::make_unique<CertificateReportingServiceCertReporter>(web_contents),
@@ -69,7 +69,7 @@
 
 --- a/chrome/browser/profiles/profile_impl.cc
 +++ b/chrome/browser/profiles/profile_impl.cc
-@@ -518,18 +518,6 @@ ProfileImpl::ProfileImpl(
+@@ -541,18 +541,6 @@ ProfileImpl::ProfileImpl(
                                  create_mode == CREATE_MODE_SYNCHRONOUS);
 #endif
 
@@ -88,7 +88,7 @@
   content::BrowserContext::Initialize(this, path_);
 
   {
-@@ -538,7 +526,7 @@ ProfileImpl::ProfileImpl(
+@@ -561,7 +549,7 @@ ProfileImpl::ProfileImpl(
             ->CreateDelegate();
     delegate->InitPrefRegistry(pref_registry_.get());
     prefs_ = chrome_prefs::CreateProfilePrefs(
@@ -99,17 +99,17 @@
         GetIOTaskRunner(), std::move(delegate));
 --- a/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
 +++ b/chrome/browser/loader/chrome_resource_dispatcher_host_delegate.cc
-@@ -344,8 +344,7 @@ void LogCommittedPreviewsDecision(
+@@ -330,8 +330,7 @@ void LogCommittedPreviewsDecision(
 }  // namespace
 
 ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate()
 -    : download_request_limiter_(g_browser_process->download_request_limiter()),
-      safe_browsing_(g_browser_process->safe_browsing_service())
-+    : download_request_limiter_(g_browser_process->download_request_limiter())
+-      safe_browsing_(g_browser_process->safe_browsing_service()) {}
+    : download_request_limiter_(g_browser_process->download_request_limiter()) {}
+ 
+ ChromeResourceDispatcherHostDelegate::~ChromeResourceDispatcherHostDelegate() {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-       , user_script_listener_(new extensions::UserScriptListener())
- #endif
-@@ -369,8 +368,6 @@ void ChromeResourceDispatcherHostDelegat
+@@ -345,8 +344,6 @@ void ChromeResourceDispatcherHostDelegat
     content::AppCacheService* appcache_service,
     ResourceType resource_type,
     std::vector<std::unique_ptr<content::ResourceThrottle>>* throttles) {
@@ -118,7 +118,7 @@
   ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
   client_hints::RequestBeginning(request, io_data->GetCookieSettings());
 
-@@ -499,7 +496,7 @@ void ChromeResourceDispatcherHostDelegat
+@@ -470,7 +467,7 @@ void ChromeResourceDispatcherHostDelegat
   content::ResourceThrottle* first_throttle = NULL;
 #if defined(OS_ANDROID)
   first_throttle = DataReductionProxyResourceThrottle::MaybeCreate(
@@ -129,7 +129,7 @@
 #if defined(SAFE_BROWSING_DB_LOCAL) || defined(SAFE_BROWSING_DB_REMOTE)
 --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
 +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
-@@ -251,110 +251,6 @@ BadClockBlockingPage* CreateBadClockBloc
+@@ -251,115 +251,6 @@ BadClockBlockingPage* CreateBadClockBloc
       base::Callback<void(content::CertificateRequestResultType)>());
 }
 
@@ -153,15 +153,18 @@
 -  if (net::GetValueForKeyInQuery(web_contents->GetURL(),
 -                                 "type",
 -                                 &type_param)) {
-    // TODO(mattm): add param for SB_THREAT_TYPE_URL_UNWANTED.
 -    if (type_param == "malware") {
 -      threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
 -    } else if (type_param == "phishing") {
 -      threat_type = safe_browsing::SB_THREAT_TYPE_URL_PHISHING;
+-    } else if (type_param == "unwanted") {
+-      threat_type = safe_browsing::SB_THREAT_TYPE_URL_UNWANTED;
 -    } else if (type_param == "clientside_malware") {
 -      threat_type = safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE;
 -    } else if (type_param == "clientside_phishing") {
 -      threat_type = safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING;
+-    } else if (type_param == "billing") {
+-      threat_type = safe_browsing::SB_THREAT_TYPE_BILLING;
 -    }
 -  }
 -  safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource;
@@ -207,6 +210,8 @@
 -      threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
 -    } else if (type_param == "phishing") {
 -      threat_type = safe_browsing::SB_THREAT_TYPE_URL_PHISHING;
+-    } else if (type_param == "unwanted") {
+-      threat_type = safe_browsing::SB_THREAT_TYPE_URL_UNWANTED;
 -    } else if (type_param == "giant") {
 -      threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE;
 -      is_giant_webview = true;
@@ -240,7 +245,7 @@
 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
 CaptivePortalBlockingPage* CreateCaptivePortalBlockingPage(
     content::WebContents* web_contents) {
-@@ -458,8 +354,6 @@ void InterstitialHTMLSource::StartDataRe
+@@ -464,8 +355,6 @@ void InterstitialHTMLSource::StartDataRe
         CreateSSLBlockingPage(web_contents, true /* is superfish */));
   } else if (path_without_query == "/mitm-software-ssl") {
     interstitial_delegate.reset(CreateMITMSoftwareBlockingPage(web_contents));
@@ -249,7 +254,7 @@
   } else if (path_without_query == "/clock") {
     interstitial_delegate.reset(CreateBadClockBlockingPage(web_contents));
 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
-@@ -470,11 +364,6 @@ void InterstitialHTMLSource::StartDataRe
+@@ -476,11 +365,6 @@ void InterstitialHTMLSource::StartDataRe
 
   if (path_without_query == "/supervised_user") {
     html = GetSupervisedUserInterstitialHTML(path);
@@ -263,92 +268,83 @@
   } else {
 --- a/chrome/browser/extensions/blacklist_state_fetcher.cc
 +++ b/chrome/browser/extensions/blacklist_state_fetcher.cc
-@@ -31,10 +31,10 @@ BlacklistStateFetcher::~BlacklistStateFe
+@@ -31,28 +31,9 @@ BlacklistStateFetcher::~BlacklistStateFe
 void BlacklistStateFetcher::Request(const std::string& id,
                                     const RequestCallback& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 -  if (!safe_browsing_config_) {
 -    if (g_browser_process && g_browser_process->safe_browsing_service()) {
 -      SetSafeBrowsingConfig(
-          g_browser_process->safe_browsing_service()->GetProtocolConfig());
-+  if (true) {
-+    if (false) {
-+      //SetSafeBrowsingConfig(
-+      //    g_browser_process->safe_browsing_service()->GetProtocolConfig());
-     } else {
-       base::ThreadTaskRunnerHandle::Get()->PostTask(
-           FROM_HERE, base::BindOnce(callback, BLACKLISTED_UNKNOWN));
-@@ -47,10 +47,10 @@ void BlacklistStateFetcher::Request(cons
-   if (request_already_sent)
-     return;
- 
+-          g_browser_process->safe_browsing_service()->GetV4ProtocolConfig());
+-    } else {
+-      base::ThreadTaskRunnerHandle::Get()->PostTask(
+-          FROM_HERE, base::BindOnce(callback, BLACKLISTED_UNKNOWN));
+-      return;
+-    }
+-  }
+-
+-  bool request_already_sent = base::ContainsKey(callbacks_, id);
+-  callbacks_.insert(std::make_pair(id, callback));
+-  if (request_already_sent)
+-    return;
+-
 -  if (g_browser_process && g_browser_process->safe_browsing_service()) {
 -    url_loader_factory_ =
 -        g_browser_process->safe_browsing_service()->GetURLLoaderFactory();
 -  }
-+  //if (g_browser_process && g_browser_process->safe_browsing_service()) {
-+  //  url_loader_factory_ =
-+  //      g_browser_process->safe_browsing_service()->GetURLLoaderFactory();
-+  //}
- 
-   SendRequest(id);
+-
+-  SendRequest(id);
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE, base::BindOnce(callback, BLACKLISTED_UNKNOWN));
+  return;
 }
-@@ -110,13 +110,14 @@ void BlacklistStateFetcher::SendRequest(
+ 
+ void BlacklistStateFetcher::SendRequest(const std::string& id) {
+@@ -63,8 +44,7 @@ void BlacklistStateFetcher::SendRequest(
+   std::string request_str;
+   request.SerializeToString(&request_str);
+ 
+-  GURL request_url = GURL(safe_browsing::GetReportUrl(
+-      *safe_browsing_config_, "clientreport/crx-list-info"));
+  GURL request_url = GURL();
+   net::NetworkTrafficAnnotationTag traffic_annotation =
+       net::DefineNetworkTrafficAnnotation("extension_blacklist", R"(
+         semantics {
+@@ -111,12 +91,6 @@ void BlacklistStateFetcher::SendRequest(
                      base::Unretained(this), fetcher));
 }
 
 -void BlacklistStateFetcher::SetSafeBrowsingConfig(
-    const safe_browsing::SafeBrowsingProtocolConfig& config) {
-  safe_browsing_config_.reset(
-      new safe_browsing::SafeBrowsingProtocolConfig(config));
+-    const safe_browsing::V4ProtocolConfig& config) {
+-  safe_browsing_config_ =
+-      std::make_unique<safe_browsing::V4ProtocolConfig>(config);
 -}
-+//void BlacklistStateFetcher::SetSafeBrowsingConfig(
-+//    const safe_browsing::SafeBrowsingProtocolConfig& config) {
-+//  safe_browsing_config_.reset(
-+//      new safe_browsing::SafeBrowsingProtocolConfig(config));
-+//}
- 
- GURL BlacklistStateFetcher::RequestUrl() const {
-+  /*
-   std::string url = base::StringPrintf(
-       "%s/%s?client=%s&appver=%s&pver=2.2",
-       safe_browsing_config_->url_prefix.c_str(),
-@@ -129,6 +130,8 @@ GURL BlacklistStateFetcher::RequestUrl()
-                         net::EscapeQueryParamValue(api_key, true).c_str());
-   }
-   return GURL(url);
-+  */
-+  return GURL();
- }
- 
+-
 void BlacklistStateFetcher::OnURLLoaderComplete(
+     network::SimpleURLLoader* url_loader,
+     std::unique_ptr<std::string> response_body) {
 --- a/chrome/browser/extensions/blacklist_state_fetcher.h
 +++ b/chrome/browser/extensions/blacklist_state_fetcher.h
-@@ -34,8 +34,8 @@ class BlacklistStateFetcher {
+@@ -34,8 +34,6 @@ class BlacklistStateFetcher {
 
   virtual void Request(const std::string& id, const RequestCallback& callback);
 
-  void SetSafeBrowsingConfig(
-      const safe_browsing::SafeBrowsingProtocolConfig& config);
-+  //void SetSafeBrowsingConfig(
-+  //    const safe_browsing::SafeBrowsingProtocolConfig& config);
- 
+-  void SetSafeBrowsingConfig(const safe_browsing::V4ProtocolConfig& config);
+-
  protected:
   void OnURLLoaderComplete(network::SimpleURLLoader* url_loader,
-@@ -55,8 +55,8 @@ class BlacklistStateFetcher {
+                            std::unique_ptr<std::string> response_body);
+@@ -54,7 +52,6 @@ class BlacklistStateFetcher {
 
   void SendRequest(const std::string& id);
 
-  std::unique_ptr<safe_browsing::SafeBrowsingProtocolConfig>
-      safe_browsing_config_;
-+  //std::unique_ptr<safe_browsing::SafeBrowsingProtocolConfig>
-+  //    safe_browsing_config_;
+-  std::unique_ptr<safe_browsing::V4ProtocolConfig> safe_browsing_config_;
   scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
 
   // SimpleURLLoader -> (owned loader, extension id).
 --- a/chrome/browser/download/chrome_download_manager_delegate.cc
 +++ b/chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -313,13 +313,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
+@@ -314,13 +314,6 @@ ChromeDownloadManagerDelegate::~ChromeDo
 
 void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
   download_manager_ = dm;
@@ -362,7 +358,7 @@
 }
 
 #if defined(OS_ANDROID)
-@@ -610,16 +603,6 @@ void ChromeDownloadManagerDelegate::Choo
+@@ -611,16 +604,6 @@ void ChromeDownloadManagerDelegate::Choo
 
 void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
     base::FilePath* filename) {
@@ -389,7 +385,7 @@
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/browser/ui/browser_dialogs.h"
-@@ -363,8 +362,6 @@ void BrowserProcessImpl::StartTearDown()
+@@ -362,8 +361,6 @@ void BrowserProcessImpl::StartTearDown()
   // that URLFetcher operation before going away.)
   metrics_services_manager_.reset();
   intranet_redirect_detector_.reset();
@@ -398,7 +394,7 @@
   network_time_tracker_.reset();
 #if BUILDFLAG(ENABLE_PLUGINS)
   plugins_resource_service_.reset();
-@@ -975,22 +972,6 @@ StatusTray* BrowserProcessImpl::status_t
+@@ -976,22 +973,6 @@ StatusTray* BrowserProcessImpl::status_t
   return status_tray_.get();
 }
 
@@ -421,7 +417,7 @@
 subresource_filter::ContentRulesetService*
 BrowserProcessImpl::subresource_filter_ruleset_service() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-@@ -1278,16 +1259,6 @@ void BrowserProcessImpl::CreateBackgroun
+@@ -1279,16 +1260,6 @@ void BrowserProcessImpl::CreateBackgroun
 #endif
 }
 
@@ -440,7 +436,7 @@
   created_subresource_filter_ruleset_service_ = true;
 --- a/chrome/browser/browser_process_impl.h
 +++ b/chrome/browser/browser_process_impl.h
-@@ -157,9 +157,6 @@ class BrowserProcessImpl : public Browse
+@@ -161,9 +161,6 @@ class BrowserProcessImpl : public Browse
   void set_background_mode_manager_for_test(
       std::unique_ptr<BackgroundModeManager> manager) override;
   StatusTray* status_tray() override;
@@ -450,7 +446,7 @@
   subresource_filter::ContentRulesetService*
   subresource_filter_ruleset_service() override;
   optimization_guide::OptimizationGuideService* optimization_guide_service()
-@@ -296,9 +293,6 @@ class BrowserProcessImpl : public Browse
+@@ -299,9 +296,6 @@ class BrowserProcessImpl : public Browse
   std::unique_ptr<BackgroundModeManager> background_mode_manager_;
 #endif
 
@@ -462,7 +458,7 @@
       subresource_filter_ruleset_service_;
 --- a/chrome/browser/browser_process.h
 +++ b/chrome/browser/browser_process.h
-@@ -48,10 +48,6 @@ class NetworkQualityTracker;
+@@ -44,10 +44,6 @@ class NetworkQualityTracker;
 class SharedURLLoaderFactory;
 }
 
@@ -473,7 +469,7 @@
 namespace subresource_filter {
 class ContentRulesetService;
 }
-@@ -120,10 +116,6 @@ namespace resource_coordinator {
+@@ -116,10 +112,6 @@ namespace resource_coordinator {
 class TabManager;
 }
 
@@ -484,7 +480,7 @@
 // NOT THREAD SAFE, call only from the main thread.
 // These functions shouldn't return NULL unless otherwise noted.
 class BrowserProcess {
-@@ -242,14 +234,6 @@ class BrowserProcess {
+@@ -234,14 +226,6 @@ class BrowserProcess {
   // on this platform (or this is a unit test).
   virtual StatusTray* status_tray() = 0;
 
@@ -605,7 +601,7 @@
 #include "chrome/browser/download/download_file_icon_extractor.h"
 #include "chrome/browser/download/download_open_prompt.h"
 #include "chrome/browser/download/download_prefs.h"
-@@ -1316,9 +1315,6 @@ DownloadsAcceptDangerFunction::Downloads
+@@ -1311,9 +1310,6 @@ DownloadsAcceptDangerFunction::Downloads
 
 DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {}
 
@@ -615,7 +611,7 @@
 bool DownloadsAcceptDangerFunction::RunAsync() {
   std::unique_ptr<downloads::AcceptDanger::Params> params(
       downloads::AcceptDanger::Params::Create(*args_));
-@@ -1356,40 +1352,7 @@ void DownloadsAcceptDangerFunction::Prom
+@@ -1351,40 +1347,7 @@ void DownloadsAcceptDangerFunction::Prom
     return;
   }
   RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER);
@@ -792,7 +788,7 @@
       return !download_item_->IsDone();
 --- a/chrome/browser/BUILD.gn
 +++ b/chrome/browser/BUILD.gn
-@@ -2510,8 +2510,6 @@ jumbo_split_static_library("browser") {
+@@ -2568,8 +2568,6 @@ jumbo_split_static_library("browser") {
       "download/download_commands.h",
       "download/download_crx_util.cc",
       "download/download_crx_util.h",
@@ -803,15 +799,7 @@
       "download/download_dir_util.cc",
 --- a/chrome/browser/ui/BUILD.gn
 +++ b/chrome/browser/ui/BUILD.gn
-@@ -2599,7 +2599,6 @@ split_static_library("ui") {
-         "cocoa/content_settings/cookie_tree_node.mm",
-         "cocoa/content_settings/cookies_tree_controller_bridge.h",
-         "cocoa/content_settings/cookies_tree_controller_bridge.mm",
-        "cocoa/download/download_danger_prompt_impl.cc",
-         "cocoa/extensions/chooser_dialog_cocoa.h",
-         "cocoa/extensions/chooser_dialog_cocoa.mm",
-         "cocoa/extensions/chooser_dialog_cocoa_controller.h",
-@@ -2903,7 +2902,6 @@ split_static_library("ui") {
+@@ -2840,7 +2840,6 @@ jumbo_split_static_library("ui") {
       "views/cookie_info_view.h",
       "views/device_chooser_content_view.cc",
       "views/device_chooser_content_view.h",
@@ -821,7 +809,7 @@
       "views/exclusive_access_bubble_views.cc",
 --- a/chrome/browser/ssl/security_state_tab_helper.cc
 +++ b/chrome/browser/ssl/security_state_tab_helper.cc
-@@ -271,75 +271,6 @@ bool SecurityStateTabHelper::UsedPolicyI
+@@ -269,78 +269,6 @@ bool SecurityStateTabHelper::UsedPolicyI
 
 security_state::MaliciousContentStatus
 SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -840,7 +828,6 @@
 -    switch (threat_type) {
 -      case safe_browsing::SB_THREAT_TYPE_UNUSED:
 -      case safe_browsing::SB_THREAT_TYPE_SAFE:
-        break;
 -      case safe_browsing::SB_THREAT_TYPE_URL_PHISHING:
 -      case safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING:
 -        return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
@@ -877,6 +864,10 @@
 -        // social engineering content status.
 -        return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING;
 -#endif
+-      case safe_browsing::SB_THREAT_TYPE_BILLING:
+-        return base::FeatureList::IsEnabled(safe_browsing::kBillingInterstitial)
+-                   ? security_state::MALICIOUS_CONTENT_STATUS_BILLING
+-                   : security_state::MALICIOUS_CONTENT_STATUS_NONE;
 -      case safe_browsing::
 -          DEPRECATED_SB_THREAT_TYPE_URL_PASSWORD_PROTECTION_PHISHING:
 -      case safe_browsing::SB_THREAT_TYPE_URL_BINARY_MALWARE:
@@ -937,7 +928,7 @@
 
 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc
 +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -716,9 +716,6 @@ void ChromeMetricsServiceClient::Registe
+@@ -712,9 +712,6 @@ void ChromeMetricsServiceClient::Registe
   metrics_service_->RegisterMetricsProvider(
       std::make_unique<HttpsEngagementMetricsProvider>());
 
@@ -949,7 +940,7 @@
       std::make_unique<UpgradeMetricsProvider>());
 --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
 +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -220,7 +220,6 @@ void ChromeBrowserMainExtraPartsProfiles
+@@ -228,7 +228,6 @@ void ChromeBrowserMainExtraPartsProfiles
 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
   CaptivePortalServiceFactory::GetInstance();
 #endif
@@ -960,7 +951,7 @@
 --- a/chrome/browser/ssl/captive_portal_blocking_page.cc
 +++ b/chrome/browser/ssl/captive_portal_blocking_page.cc
@@ -211,10 +211,7 @@ void CaptivePortalBlockingPage::Populate
-   load_time_data->SetString("recurrentErrorParagraph", base::string16());
+   load_time_data->SetString("recurrentErrorParagraph", "");
   load_time_data->SetBoolean("show_recurrent_error_paragraph", false);
 
 -  if (cert_report_helper())
@@ -993,8 +984,8 @@
 bool CertReportHelper::ShouldShowCertificateReporterCheckbox() {
 --- a/chrome/browser/ui/tab_helpers.cc
 +++ b/chrome/browser/ui/tab_helpers.cc
-@@ -242,8 +242,6 @@ void TabHelpers::AttachTabHelpers(WebCon
-   PreviewsInfoBarTabHelper::CreateForWebContents(web_contents);
+@@ -243,8 +243,6 @@ void TabHelpers::AttachTabHelpers(WebCon
+   PreviewsUITabHelper::CreateForWebContents(web_contents);
   RecentlyAudibleHelper::CreateForWebContents(web_contents);
   ResourceLoadingHintsWebContentsObserver::CreateForWebContents(web_contents);
 -  safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents(
@@ -1002,7 +993,7 @@
   SearchEngineTabHelper::CreateForWebContents(web_contents);
   SecurityStateTabHelper::CreateForWebContents(web_contents);
   if (SiteEngagementService::IsEnabled())
-@@ -293,9 +291,6 @@ void TabHelpers::AttachTabHelpers(WebCon
+@@ -298,9 +296,6 @@ void TabHelpers::AttachTabHelpers(WebCon
                         new ChromePDFWebContentsHelperClient()));
   PluginObserver::CreateForWebContents(web_contents);
   SadTabHelper::CreateForWebContents(web_contents);
@@ -1014,7 +1005,7 @@
   ThumbnailTabHelper::CreateForWebContents(web_contents);
 --- a/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
 +++ b/chrome/browser/subresource_filter/chrome_subresource_filter_client.cc
-@@ -71,20 +71,6 @@ void ChromeSubresourceFilterClient::DidS
+@@ -69,20 +69,6 @@ void ChromeSubresourceFilterClient::DidS
 void ChromeSubresourceFilterClient::MaybeAppendNavigationThrottles(
     content::NavigationHandle* navigation_handle,
     std::vector<std::unique_ptr<content::NavigationThrottle>>* throttles) {
@@ -1087,15 +1078,15 @@
 bool WebstoreInlineInstaller::CheckRequestorAlive() const {
 --- a/chrome/browser/safe_browsing/BUILD.gn
 +++ b/chrome/browser/safe_browsing/BUILD.gn
-@@ -12,6 +12,7 @@ proto_library("chunk_proto") {
- }
+@@ -6,6 +6,7 @@ import("//extensions/buildflags/buildfla
+ import("//third_party/protobuf/proto_library.gni")
 
 static_library("safe_browsing") {
 +  if (false) {
   sources = [
     "chrome_cleaner/chrome_cleaner_controller_impl_win.cc",
     "chrome_cleaner/chrome_cleaner_controller_impl_win.h",
-@@ -80,6 +81,7 @@ static_library("safe_browsing") {
+@@ -74,6 +75,7 @@ static_library("safe_browsing") {
   } else {
     sources += [ "chrome_cleaner/chrome_cleaner_extension_util_win_noop.cc" ]
   }
@@ -1110,70 +1101,12 @@
 #include "components/network_hints/renderer/prescient_networking_dispatcher.h"
 #include "components/pdf/renderer/pepper_pdf_host.h"
 -#include "components/safe_browsing/renderer/threat_dom_details.h"
- #include "components/safe_browsing/renderer/websocket_sb_handshake_throttle.h"
 #include "components/services/heap_profiling/public/cpp/allocator_shim.h"
 #include "components/spellcheck/spellcheck_buildflags.h"
-@@ -1383,11 +1382,7 @@ void ChromeContentRendererClient::InitSp
- // default (https://crbug.com/825740).
- std::unique_ptr<blink::WebSocketHandshakeThrottle>
- ChromeContentRendererClient::CreateWebSocketHandshakeThrottle() {
-  InitSafeBrowsingIfNecessary();
-  // This is called only for Shared Worker and Service Worker that don't have a
-  // real frame, so we specify MSG_ROUTING_NONE here.
-  return std::make_unique<safe_browsing::WebSocketSBHandshakeThrottle>(
-      safe_browsing_.get(), MSG_ROUTING_NONE);
-+  return std::unique_ptr<blink::WebSocketHandshakeThrottle>(nullptr);
- }
- 
- std::unique_ptr<content::WebSocketHandshakeThrottleProvider>
-@@ -1678,15 +1673,6 @@ ChromeContentRendererClient::GetTaskSche
-   return task_scheduler_util::GetTaskSchedulerInitParamsForRenderer();
- }
- 
-// TODO(nhiroki): Remove this once the off-main-thread WebSocket is enabled by
-// default (https://crbug.com/825740).
-void ChromeContentRendererClient::InitSafeBrowsingIfNecessary() {
-  if (safe_browsing_)
-    return;
-  RenderThread::Get()->GetConnector()->BindInterface(
-      content::mojom::kBrowserServiceName, &safe_browsing_);
-}
-
- bool ChromeContentRendererClient::OverrideLegacySymantecCertConsoleMessage(
-     const GURL& url,
-     std::string* console_message) {
--- a/chrome/renderer/chrome_content_renderer_client.h
-+++ b/chrome/renderer/chrome_content_renderer_client.h
-@@ -20,7 +20,6 @@
- #include "chrome/renderer/media/chrome_key_systems_provider.h"
- #include "components/nacl/common/buildflags.h"
- #include "components/rappor/public/interfaces/rappor_recorder.mojom.h"
-#include "components/safe_browsing/common/safe_browsing.mojom.h"
- #include "components/spellcheck/spellcheck_buildflags.h"
- #include "content/public/renderer/content_renderer_client.h"
- #include "content/public/renderer/render_thread.h"
-@@ -274,9 +273,6 @@ class ChromeContentRendererClient
-   void GetInterface(const std::string& name,
-                     mojo::ScopedMessagePipeHandle request_handle) override;
- 
-  // Initialises |safe_browsing_| if it is not already initialised.
-  void InitSafeBrowsingIfNecessary();
-
-   void PrepareErrorPageInternal(content::RenderFrame* render_frame,
-                                 const blink::WebURLRequest& failed_request,
-                                 const error_page::Error& error,
-@@ -316,8 +312,6 @@ class ChromeContentRendererClient
- 
-   ChromeKeySystemsProvider key_systems_provider_;
- 
-  safe_browsing::mojom::SafeBrowsingPtr safe_browsing_;
-
- #if BUILDFLAG(ENABLE_SPELLCHECK)
-   std::unique_ptr<SpellCheck> spellcheck_;
- #endif
+ #include "components/startup_metric_utils/common/startup_metric.mojom.h"
 --- a/chrome/browser/net/trial_comparison_cert_verifier.cc
 +++ b/chrome/browser/net/trial_comparison_cert_verifier.cc
-@@ -99,9 +99,6 @@ void SendTrialVerificationReport(void* p
+@@ -79,9 +79,6 @@ void SendTrialVerificationReport(void* p
   std::string serialized_report;
   if (!report.Serialize(&serialized_report))
     return;
@@ -1274,12 +1207,12 @@
 }
 --- a/components/safe_browsing/features.cc
 +++ b/components/safe_browsing/features.cc
-@@ -36,7 +36,7 @@ const base::Feature kThreatDomDetailsTag
-     "ThreatDomDetailsTagAttributes", base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -49,7 +49,7 @@ const base::Feature kInspectDownloadedRa
+     "InspectDownloadedRarFiles", base::FEATURE_DISABLED_BY_DEFAULT};
 
 const base::Feature kSuspiciousSiteTriggerQuotaFeature{
 -    "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_ENABLED_BY_DEFAULT};
 +    "SafeBrowsingSuspiciousSiteTriggerQuota", base::FEATURE_DISABLED_BY_DEFAULT};
 
- const base::Feature kTriggerThrottlerDailyQuotaFeature{
-     "SafeBrowsingTriggerThrottlerDailyQuota",
+ const base::Feature kThreatDomDetailsTagAndAttributeFeature{
+     "ThreatDomDetailsTagAttributes", base::FEATURE_DISABLED_BY_DEFAULT};
--- a/patches/inox-patchset/0003-disable-autofill-download-manager.patch
+++ b/patches/inox-patchset/0003-disable-autofill-download-manager.patch
@@ -1,6 +1,6 @@
 --- a/components/autofill/core/browser/autofill_download_manager.cc
 +++ b/components/autofill/core/browser/autofill_download_manager.cc
-@@ -391,45 +391,6 @@ std::tuple<GURL, std::string> AutofillDo
+@@ -441,45 +441,6 @@ std::tuple<GURL, std::string> AutofillDo
 }
 
 bool AutofillDownloadManager::StartRequest(FormRequestData request_data) {
@@ -42,7 +42,7 @@
 -      url_loader_factory.get(),
 -      base::BindOnce(&AutofillDownloadManager::OnSimpleLoaderComplete,
 -                     base::Unretained(this), std::move(--url_loaders_.end()),
-                     std::move(request_data)));
+-                     std::move(request_data), base::TimeTicks::Now()));
   return true;
 }
 
--- a/patches/inox-patchset/0004-disable-google-url-tracker.patch
+++ b/patches/inox-patchset/0004-disable-google-url-tracker.patch
@@ -12,7 +12,7 @@
 const base::Feature GoogleURLTracker::kNoSearchDomainCheck{
     "NoSearchDomainCheck", base::FEATURE_DISABLED_BY_DEFAULT};
 
-@@ -146,83 +146,4 @@ void GoogleURLTracker::FinishSleep() {
+@@ -148,83 +148,4 @@ void GoogleURLTracker::FinishSleep() {
 }
 
 void GoogleURLTracker::StartLoadIfDesirable() {
--- a/patches/inox-patchset/0005-disable-default-extensions.patch
+++ b/patches/inox-patchset/0005-disable-default-extensions.patch
@@ -52,7 +52,7 @@
   {
 --- a/chrome/browser/extensions/webstore_installer.cc
 +++ b/chrome/browser/extensions/webstore_installer.cc
-@@ -577,28 +577,6 @@ void WebstoreInstaller::DownloadNextPend
+@@ -578,28 +578,6 @@ void WebstoreInstaller::DownloadNextPend
 void WebstoreInstaller::DownloadCrx(
     const std::string& extension_id,
     InstallSource source) {
@@ -81,7 +81,7 @@
 }
 
 // http://crbug.com/165634
-@@ -751,28 +729,6 @@ void WebstoreInstaller::UpdateDownloadPr
+@@ -748,28 +726,6 @@ void WebstoreInstaller::UpdateDownloadPr
 }
 
 void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) {
--- a/patches/inox-patchset/0006-modify-default-prefs.patch
+++ b/patches/inox-patchset/0006-modify-default-prefs.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/chrome_content_browser_client.cc
 +++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1029,7 +1029,7 @@ void ChromeContentBrowserClient::Registe
+@@ -1017,7 +1017,7 @@ void ChromeContentBrowserClient::Registe
 void ChromeContentBrowserClient::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -11,7 +11,7 @@
   // user policy in addition to the same named ones in Local State (which are
 --- a/chrome/browser/ui/browser_ui_prefs.cc
 +++ b/chrome/browser/ui/browser_ui_prefs.cc
-@@ -70,11 +70,11 @@ void RegisterBrowserUserPrefs(user_prefs
+@@ -68,11 +68,11 @@ void RegisterBrowserUserPrefs(user_prefs
   registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
   registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
   registry->RegisterBooleanPref(
@@ -71,7 +71,7 @@
 
 --- a/chrome/browser/ui/navigation_correction_tab_observer.cc
 +++ b/chrome/browser/ui/navigation_correction_tab_observer.cc
-@@ -58,7 +58,7 @@ NavigationCorrectionTabObserver::~Naviga
+@@ -56,7 +56,7 @@ NavigationCorrectionTabObserver::~Naviga
 void NavigationCorrectionTabObserver::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* prefs) {
   prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,
@@ -80,17 +80,30 @@
                              user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
--- a/components/autofill/core/browser/autofill_manager.cc
-+++ b/components/autofill/core/browser/autofill_manager.cc
-@@ -189,7 +189,7 @@ void AutofillManager::RegisterProfilePre
-   registry->RegisterIntegerPref(
-       prefs::kAutofillCreditCardSigninPromoImpressionCount, 0);
+--- a/components/autofill/core/common/autofill_prefs.cc
+++ b/components/autofill/core/common/autofill_prefs.cc
+@@ -75,10 +75,10 @@ void RegisterProfilePrefs(user_prefs::Pr
+       prefs::kAutofillBillingCustomerNumber, 0.0,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF);
   registry->RegisterBooleanPref(
-      prefs::kAutofillEnabled, true,
-+      prefs::kAutofillEnabled, false,
+-      prefs::kAutofillEnabledDeprecated, true,
+      prefs::kAutofillEnabledDeprecated, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
-       prefs::kAutofillProfileEnabled, true,
+-      prefs::kAutofillProfileEnabled, true,
+      prefs::kAutofillProfileEnabled, false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterIntegerPref(
+       prefs::kAutofillLastVersionDeduped, 0,
+@@ -87,7 +87,7 @@ void RegisterProfilePrefs(user_prefs::Pr
+       prefs::kAutofillLastVersionDisusedAddressesDeleted, 0,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterBooleanPref(
+-      prefs::kAutofillCreditCardEnabled, true,
+      prefs::kAutofillCreditCardEnabled, false,
+       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
+   registry->RegisterStringPref(
+       prefs::kAutofillProfileValidity, "",
 --- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
 +++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
@@ -45,7 +45,7 @@
@@ -186,7 +199,7 @@
   // functionality that are only available in chrome://extensions/ but which
 --- a/components/safe_browsing/common/safe_browsing_prefs.cc
 +++ b/components/safe_browsing/common/safe_browsing_prefs.cc
-@@ -278,9 +278,9 @@ void RegisterProfilePrefs(PrefRegistrySi
+@@ -282,9 +282,9 @@ void RegisterProfilePrefs(PrefRegistrySi
   registry->RegisterBooleanPref(
       prefs::kSafeBrowsingSawInterstitialScoutReporting, false);
   registry->RegisterBooleanPref(
@@ -200,7 +213,7 @@
                                 false);
 --- a/components/password_manager/core/browser/password_manager.cc
 +++ b/components/password_manager/core/browser/password_manager.cc
-@@ -278,10 +278,10 @@ bool ShouldPromptUserToSavePassword(cons
+@@ -266,10 +266,10 @@ bool IsThereVisiblePasswordField(const F
 void PasswordManager::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
--- a/patches/inox-patchset/0007-disable-web-resource-service.patch
+++ b/patches/inox-patchset/0007-disable-web-resource-service.patch
@@ -1,6 +1,6 @@
 --- a/components/web_resource/web_resource_service.cc
 +++ b/components/web_resource/web_resource_service.cc
-@@ -123,48 +123,7 @@ bool WebResourceService::GetFetchSchedul
+@@ -124,48 +124,7 @@ bool WebResourceService::GetFetchSchedul
 // Initializes the fetching of data from the resource server.  Data
 // load calls OnSimpleLoaderComplete.
 void WebResourceService::StartFetch() {
--- a/patches/inox-patchset/0008-restore-classic-ntp.patch
+++ b/patches/inox-patchset/0008-restore-classic-ntp.patch
@@ -33,7 +33,7 @@
   const GURL url;
 --- a/components/ntp_snippets/features.cc
 +++ b/components/ntp_snippets/features.cc
-@@ -38,13 +38,13 @@ const base::Feature kArticleSuggestionsE
+@@ -39,13 +39,13 @@ const base::Feature kArticleSuggestionsE
     "NTPArticleSuggestionsExpandableHeader", base::FEATURE_ENABLED_BY_DEFAULT};
 
 const base::Feature kArticleSuggestionsFeature{
--- a/patches/inox-patchset/0009-disable-google-ipv6-probes.patch
+++ b/patches/inox-patchset/0009-disable-google-ipv6-probes.patch
@@ -1,6 +1,6 @@
 --- a/net/dns/host_resolver_impl.cc
 +++ b/net/dns/host_resolver_impl.cc
-@@ -108,10 +108,10 @@ const unsigned kMinimumTTLSeconds = kCac
+@@ -110,10 +110,10 @@ const unsigned kMinimumTTLSeconds = kCac
 // cached.
 const int kIPv6ProbePeriodMs = 1000;
 
--- a/patches/inox-patchset/0016-chromium-sandbox-pie.patch
+++ b/patches/inox-patchset/0016-chromium-sandbox-pie.patch
@@ -11,5 +11,5 @@
 +    ldflags = [
 +      "-pie",
     ]
- 
-     import("//build/config/compiler/compiler.gni")
+   }
+ }
--- a/patches/inox-patchset/0017-disable-new-avatar-menu.patch
+++ b/patches/inox-patchset/0017-disable-new-avatar-menu.patch
@@ -1,6 +1,6 @@
 --- a/components/signin/core/browser/signin_manager.cc
 +++ b/components/signin/core/browser/signin_manager.cc
-@@ -317,7 +317,7 @@ void SigninManager::OnGoogleServicesUser
+@@ -321,7 +321,7 @@ void SigninManager::OnGoogleServicesUser
 }
 
 bool SigninManager::IsSigninAllowed() const {
--- a/patches/inox-patchset/0018-disable-first-run-behaviour.patch
+++ b/patches/inox-patchset/0018-disable-first-run-behaviour.patch
@@ -1,6 +1,6 @@
 --- a/chrome/browser/ui/startup/startup_tab_provider.cc
 +++ b/chrome/browser/ui/startup/startup_tab_provider.cc
-@@ -62,7 +62,7 @@ bool ProfileHasOtherTabbedBrowser(Profil
+@@ -66,7 +66,7 @@ StartupTabProviderImpl::StandardOnboardi
 
 StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const {
 // Onboarding content has not been launched on Chrome OS.
--- a/patches/inox-patchset/chromium-arflags.patch
+++ b/patches/inox-patchset/chromium-arflags.patch
@@ -1,67 +0,0 @@
-From 2a6309e504376b3f6890df0c1f4d47a1b66866c5 Mon Sep 17 00:00:00 2001
-From: Tom Anderson <thomasanderson@chromium.org>
-Date: Wed, 07 Mar 2018 16:10:40 -0800
-Subject: [PATCH] Format flags for llvm-ar
-
-We're planning on passing -T to llvm-ar as part of regular builds on Linux.
-However, llvm-ar is very particular in its syntax.  It requires the operation to
-be specified all in one go like "rcsDT", and forbids "-r -c -s -D -T", "rcsD T",
-or anything else that has any spaces or dashes.  This makes specifying multiple
-flags like arflags=['D', 'T'] difficult since gn will add spaces between them.
-This CL fixes the issue in our ar wrapper script to correctly format the flags
-for llvm-ar.  This issue was never seen because arflags is not set anywhere in a
-Linux build.
-
-BUG=801925
-R=thakis
-
-Change-Id: Idb710052f54487011d6dabc5f30448f78a765515
---
-
--- a/build/toolchain/gcc_ar_wrapper.py
-+++ b/build/toolchain/gcc_ar_wrapper.py
-@@ -25,6 +25,9 @@ def main():
-                       required=True,
-                       help='The ar binary to run',
-                       metavar='PATH')
-+  parser.add_argument('--arflags',
-+                      required=True,
-+                      help='Flags to pass to ar')
-   parser.add_argument('--output',
-                       required=True,
-                       help='Output archive file',
-@@ -34,8 +37,6 @@ def main():
-   parser.add_argument('--resource-whitelist',
-                       help='Merge all resource whitelists into a single file.',
-                       metavar='PATH')
-  parser.add_argument('operation',
-                      help='Operation on the archive')
-   parser.add_argument('inputs', nargs='+',
-                       help='Input files')
-   args = parser.parse_args()
-@@ -57,7 +58,13 @@ def main():
-       wrapper_utils.CombineResourceWhitelists(
-           whitelist_candidates, args.resource_whitelist)
- 
-  command = [args.ar] + object_mode + args.operation.split()
-+  # GNU ar is forgiving with how it handles flags, but llvm-ar is more strict.
-+  # Something like "ar -r -c -s -D -T libfoo.a foo.o" would work on GNU, but
-+  # llvm requires "llvm-ar rcsDT libfoo.a foo.o".  The latter works on GNU too,
-+  # so strip spaces and dashes from arflags to handle both cases.
-+  operation = args.arflags.replace(' ', '').replace('-', '')
-+
-+  command = [args.ar] + object_mode + [operation]
-   if args.plugin is not None:
-     command += ['--plugin', args.plugin]
-   command.append(args.output)
--- a/build/toolchain/gcc_toolchain.gni
-+++ b/build/toolchain/gcc_toolchain.gni
-@@ -344,7 +344,7 @@ template("gcc_toolchain") {
- 
-       # Almost all targets build with //build/config/compiler:thin_archive which
-       # adds -T to arflags.
-      command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" \"{{arflags}} $extra_arflags\" @\"$rspfile\""
-+      command = "$python_path \"$ar_wrapper\"$whitelist_flag --output={{output}} --ar=\"$ar\" --arflags=\"{{arflags}} $extra_arflags\" @\"$rspfile\""
-       description = "AR {{output}}"
-       rspfile_content = "{{inputs}}"
-       outputs = [
--- a/patches/inox-patchset/chromium-clang-compiler-flags.patch
+++ b/patches/inox-patchset/chromium-clang-compiler-flags.patch
@@ -1,15 +0,0 @@
-# Remove flags not yet implemented in the system compiler's version.
-
--- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -1477,10 +1477,6 @@ config("default_warnings") {
-         cflags += [
-           # TODO(thakis): https://crbug.com/753973
-           "-Wno-enum-compare-switch",
-
-          # Ignore warnings about MSVC optimization pragmas.
-          # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
-          "-Wno-ignored-pragma-optimize",
-         ]
-       }
-     }
--- a/patches/inox-patchset/chromium-exclude_unwind_tables.patch
+++ b/patches/inox-patchset/chromium-exclude_unwind_tables.patch
@@ -1,6 +1,6 @@
 --- a/build/config/compiler/compiler.gni
 +++ b/build/config/compiler/compiler.gni
-@@ -63,19 +63,19 @@ declare_args() {
+@@ -66,19 +66,19 @@ declare_args() {
   # It's currently not possible to collect AFDO profiles on anything but
   # x86{,_64}.
   using_mismatched_sample_profile = current_cpu != "x64" && current_cpu != "x86"
--- a/patches/inox-patchset/chromium-skia-harmony.patch
+++ b/patches/inox-patchset/chromium-skia-harmony.patch
@@ -1,6 +1,6 @@
 --- a/third_party/skia/src/ports/SkFontHost_FreeType.cpp
 +++ b/third_party/skia/src/ports/SkFontHost_FreeType.cpp
-@@ -112,8 +112,6 @@ public:
+@@ -115,8 +115,6 @@ public:
         : fGetVarDesignCoordinates(nullptr)
         , fGetVarAxisFlags(nullptr)
         , fLibrary(nullptr)
@@ -9,7 +9,7 @@
     {
         if (FT_New_Library(&gFTMemory, &fLibrary)) {
             return;
-@@ -173,12 +171,7 @@ public:
+@@ -176,12 +174,7 @@ public:
         }
 #endif
 
@@ -23,7 +23,7 @@
     }
     ~FreeTypeLibrary() {
         if (fLibrary) {
-@@ -187,8 +180,6 @@ public:
+@@ -190,8 +183,6 @@ public:
     }
 
     FT_Library library() { return fLibrary; }
@@ -32,7 +32,7 @@
 
     // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1.
     // Prior to this there was no way to get the coordinates out of the FT_Face.
-@@ -205,8 +196,6 @@ public:
+@@ -208,8 +199,6 @@ public:
 
 private:
     FT_Library fLibrary;
@@ -41,7 +41,7 @@
 
     // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0.
     // The following platforms provide FreeType of at least 2.4.0.
-@@ -704,17 +693,6 @@ void SkTypeface_FreeType::onFilterRec(Sk
+@@ -707,17 +696,6 @@ void SkTypeface_FreeType::onFilterRec(Sk
         rec->fTextSize = SkIntToScalar(1 << 14);
     }
 
@@ -59,9 +59,9 @@
     SkPaint::Hinting h = rec->getHinting();
     if (SkPaint::kFull_Hinting == h && !isLCD(*rec)) {
         // collapse full->normal hinting if we're not doing LCD
-@@ -1109,11 +1087,11 @@ bool SkScalerContext_FreeType::getCBoxFo
+@@ -1117,11 +1095,11 @@ bool SkScalerContext_FreeType::getCBoxFo
 void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) {
-     if (isLCD(fRec)) {
+     if (glyph->fMaskFormat == SkMask::kLCD16_Format) {
         if (fLCDIsVert) {
 -            glyph->fHeight += gFTLibrary->lcdExtra();
 -            glyph->fTop -= gFTLibrary->lcdExtra() >> 1;
--- a/patches/inox-patchset/chromium-vaapi-r18.patch
+++ b/patches/inox-patchset/chromium-vaapi-r18.patch
@@ -36,7 +36,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>

 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
-@@ -1282,12 +1282,14 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1429,12 +1429,14 @@ const FeatureEntry kFeatureEntries[] = {
     {"ui-disable-partial-swap", flag_descriptions::kUiPartialSwapName,
      flag_descriptions::kUiPartialSwapDescription, kOsAll,
      SINGLE_DISABLE_VALUE_TYPE(switches::kUIDisablePartialSwap)},
@@ -51,7 +51,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
     {"enable-webrtc-hw-h264-encoding",
      flag_descriptions::kWebrtcHwH264EncodingName,
      flag_descriptions::kWebrtcHwH264EncodingDescription, kOsAndroid | kOsCrOS,
-@@ -1656,6 +1658,13 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1815,6 +1817,13 @@ const FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kShowTouchHudDescription, kOsCrOS,
      SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)},
 #endif  // OS_CHROMEOS
@@ -65,7 +65,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
     {
         "disable-accelerated-video-decode",
         flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -1663,6 +1672,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -1822,6 +1831,7 @@ const FeatureEntry kFeatureEntries[] = {
         kOsMac | kOsWin | kOsCrOS | kOsAndroid,
         SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode),
     },
@@ -73,7 +73,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 #if defined(OS_WIN)
     {"enable-hdr", flag_descriptions::kEnableHDRName,
      flag_descriptions::kEnableHDRDescription, kOsWin,
-@@ -2335,12 +2345,17 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2501,12 +2511,17 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_VALUE_TYPE(features::kOpenVR)},
 #endif  // ENABLE_OPENVR
 #endif  // ENABLE_VR
@@ -145,15 +145,15 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 const char kAcceleratedVideoDecodeName[] = "Hardware-accelerated video decode";
 const char kAcceleratedVideoDecodeDescription[] =
     "Hardware-accelerated video decode where available.";
-@@ -1990,6 +1997,7 @@ const char kWebrtcEchoCanceller3Name[] =
- const char kWebrtcEchoCanceller3Description[] =
-     "Experimental WebRTC echo canceller (AEC3).";
+@@ -2121,6 +2128,7 @@ const char kWebrtcHybridAgcName[] = "Web
+ const char kWebrtcHybridAgcDescription[] =
+     "WebRTC Agc2 digital adaptation with Agc1 analog adaptation.";
 
 +#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
 const char kWebrtcHwDecodingName[] = "WebRTC hardware video decoding";
 const char kWebrtcHwDecodingDescription[] =
     "Support in WebRTC for decoding video streams using platform hardware.";
-@@ -1997,6 +2005,7 @@ const char kWebrtcHwDecodingDescription[
+@@ -2128,6 +2136,7 @@ const char kWebrtcHwDecodingDescription[
 const char kWebrtcHwEncodingName[] = "WebRTC hardware video encoding";
 const char kWebrtcHwEncodingDescription[] =
     "Support in WebRTC for encoding video streams using platform hardware.";
@@ -161,7 +161,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 
 const char kWebrtcHwH264EncodingName[] = "WebRTC hardware h264 video encoding";
 const char kWebrtcHwH264EncodingDescription[] =
-@@ -2896,14 +2905,16 @@ const char kTabStripKeyboardFocusDescrip
+@@ -3059,14 +3068,16 @@ const char kTextSuggestionsTouchBarDescr
 
 // Chrome OS -------------------------------------------------------------------
 
@@ -192,7 +192,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 extern const char kAcceleratedVideoDecodeName[];
 extern const char kAcceleratedVideoDecodeDescription[];
 
-@@ -1765,13 +1769,17 @@ extern const char kPermissionPromptPersi
+@@ -1849,13 +1853,17 @@ extern const char kPermissionPromptPersi
 
 #endif  // defined(OS_MACOSX)
 
@@ -215,7 +215,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 
 --- a/content/browser/gpu/compositor_util.cc
 +++ b/content/browser/gpu/compositor_util.cc
-@@ -149,7 +149,11 @@ const GpuFeatureData GetGpuFeatureData(
+@@ -150,7 +150,11 @@ const GpuFeatureData GetGpuFeatureData(
       {"video_decode",
        SafeGetFeatureStatus(gpu_feature_info,
                             gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE),
@@ -229,7 +229,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
        true, true},
 --- a/content/browser/gpu/gpu_process_host.cc
 +++ b/content/browser/gpu/gpu_process_host.cc
-@@ -209,7 +209,9 @@ static const char* const kSwitchNames[]
+@@ -210,7 +210,9 @@ static const char* const kSwitchNames[]
     switches::kDisableLogging,
     switches::kDisableShaderNameHashing,
     switches::kDisableSkiaRuntimeOpts,
@@ -241,7 +241,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 #endif
 --- a/content/browser/renderer_host/media/video_capture_browsertest.cc
 +++ b/content/browser/renderer_host/media/video_capture_browsertest.cc
-@@ -165,8 +165,13 @@ class VideoCaptureBrowserTest : public C
+@@ -166,8 +166,13 @@ class VideoCaptureBrowserTest : public C
       base::CommandLine::ForCurrentProcess()->AppendSwitch(
           switches::kUseFakeJpegDecodeAccelerator);
     } else {
@@ -257,7 +257,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 
 --- a/content/browser/renderer_host/render_process_host_impl.cc
 +++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -2799,7 +2799,11 @@ void RenderProcessHostImpl::PropagateBro
+@@ -2932,7 +2932,11 @@ void RenderProcessHostImpl::PropagateBro
     switches::kDefaultTileHeight,
     switches::kDisable2dCanvasImageChromium,
     switches::kDisableAcceleratedJpegDecoding,
@@ -269,7 +269,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
     switches::kDisableBackgroundTasks,
     switches::kDisableBackgroundTimerThrottling,
     switches::kDisableBreakpad,
-@@ -2937,8 +2941,10 @@ void RenderProcessHostImpl::PropagateBro
+@@ -3072,8 +3076,10 @@ void RenderProcessHostImpl::PropagateBro
 #if BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
     switches::kDisableMojoRenderer,
 #endif
@@ -298,7 +298,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
  private:
 --- a/content/gpu/BUILD.gn
 +++ b/content/gpu/BUILD.gn
-@@ -133,4 +133,8 @@ target(link_target_type, "gpu_sources")
+@@ -134,4 +134,8 @@ target(link_target_type, "gpu_sources")
       (!is_chromecast || is_cast_desktop_build)) {
     configs += [ "//build/config/linux/dri" ]
   }
@@ -309,7 +309,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 }
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
-@@ -284,7 +284,7 @@ int GpuMain(const MainFunctionParams& pa
+@@ -283,7 +283,7 @@ int GpuMain(const MainFunctionParams& pa
 
   base::PlatformThread::SetName("CrGpuMain");
 
@@ -318,7 +318,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
   // Set thread priority before sandbox initialization.
   base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
 #endif
-@@ -317,7 +317,7 @@ int GpuMain(const MainFunctionParams& pa
+@@ -316,7 +316,7 @@ int GpuMain(const MainFunctionParams& pa
   GetContentClient()->SetGpuInfo(gpu_init->gpu_info());
 
   base::ThreadPriority io_thread_priority = base::ThreadPriority::NORMAL;
@@ -329,7 +329,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 
 --- a/content/public/browser/gpu_utils.cc
 +++ b/content/public/browser/gpu_utils.cc
-@@ -57,9 +57,17 @@ const gpu::GpuPreferences GetGpuPreferen
+@@ -58,9 +58,17 @@ const gpu::GpuPreferences GetGpuPreferen
   gpu_preferences.in_process_gpu =
       command_line->HasSwitch(switches::kInProcessGPU);
   gpu_preferences.disable_accelerated_video_decode =
@@ -349,7 +349,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
       gpu::GpuPreferences::VPX_VENDOR_MICROSOFT;
 --- a/content/public/common/content_switches.cc
 +++ b/content/public/common/content_switches.cc
-@@ -79,6 +79,11 @@ const char kDisable3DAPIs[]
+@@ -64,6 +64,11 @@ const char kDisable3DAPIs[]
 // Disable gpu-accelerated 2d canvas.
 const char kDisableAccelerated2dCanvas[]    = "disable-accelerated-2d-canvas";
 
@@ -361,7 +361,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 // Disables hardware acceleration of video decode, where available.
 const char kDisableAcceleratedVideoDecode[] =
     "disable-accelerated-video-decode";
-@@ -868,11 +873,13 @@ const char kWaitForDebuggerChildren[]
+@@ -853,11 +858,13 @@ const char kWaitForDebuggerChildren[]
 // ignores this switch on its stable and beta channels.
 const char kDisableWebRtcEncryption[]      = "disable-webrtc-encryption";
 
@@ -377,7 +377,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 // See https://tools.ietf.org/html/rfc7714 for further information.
 --- a/content/public/common/content_switches.h
 +++ b/content/public/common/content_switches.h
-@@ -104,6 +104,9 @@ CONTENT_EXPORT extern const char kDisabl
+@@ -102,6 +102,9 @@ CONTENT_EXPORT extern const char kDisabl
 CONTENT_EXPORT extern const char kDomAutomationController[];
 extern const char kDisable2dCanvasClipAntialiasing[];
 CONTENT_EXPORT extern const char kDumpBlinkRuntimeCallStats[];
@@ -387,7 +387,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 CONTENT_EXPORT extern const char kEnableAccessibilityObjectModel[];
 CONTENT_EXPORT extern const char kEnableAggressiveDOMStorageFlushing[];
 CONTENT_EXPORT extern const char kEnableAutomation[];
-@@ -241,8 +244,10 @@ CONTENT_EXPORT extern const char kValida
+@@ -239,8 +242,10 @@ CONTENT_EXPORT extern const char kValida
 CONTENT_EXPORT extern const char kWaitForDebuggerChildren[];
 
 CONTENT_EXPORT extern const char kDisableWebRtcEncryption[];
@@ -398,30 +398,34 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 CONTENT_EXPORT extern const char kEnableWebRtcSrtpAesGcm[];
 CONTENT_EXPORT extern const char kEnableWebRtcSrtpEncryptedHeaders[];
 CONTENT_EXPORT extern const char kEnableWebRtcStunOrigin[];
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
-+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
-@@ -276,10 +276,18 @@ void PeerConnectionDependencyFactory::In
+--- a/content/renderer/media/webrtc/video_codec_factory.cc
+++ b/content/renderer/media/webrtc/video_codec_factory.cc
+@@ -183,7 +183,11 @@ std::unique_ptr<webrtc::VideoEncoderFact
 
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-   if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled()) {
+   if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
 +#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+    if (cmd_line->HasSwitch(switches::kEnableAcceleratedVideo))
+      cmd_line->HasSwitch(switches::kEnableAcceleratedVideo)) {
 +#else
-     if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding))
+       !cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding)) {
 +#endif
-       decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
- 
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+    if (cmd_line->HasSwitch(switches::kEnableAcceleratedVideo))
-+#else
-     if (!cmd_line->HasSwitch(switches::kDisableWebRtcHWEncoding))
-+#endif
-       encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
+     encoder_factory.reset(new RTCVideoEncoderFactory(gpu_factories));
   }
 
+@@ -201,7 +205,11 @@ std::unique_ptr<webrtc::VideoDecoderFact
+ 
+   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
+   if (gpu_factories && gpu_factories->IsGpuVideoAcceleratorEnabled() &&
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+      cmd_line->HasSwitch(switches::kEnableAcceleratedVideo)) {
+#else
+       !cmd_line->HasSwitch(switches::kDisableWebRtcHWDecoding)) {
+#endif
+     decoder_factory.reset(new RTCVideoDecoderFactory(gpu_factories));
+   }
 --- a/content/renderer/render_thread_impl.cc
 +++ b/content/renderer/render_thread_impl.cc
-@@ -1441,7 +1441,11 @@ media::GpuVideoAcceleratorFactories* Ren
+@@ -1415,7 +1415,11 @@ media::GpuVideoAcceleratorFactories* Ren
           kGpuStreamPriorityMedia);
 
   const bool enable_video_accelerator =
@@ -435,7 +439,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
        gpu::kGpuFeatureStatusEnabled);
 --- a/gpu/config/software_rendering_list.json
 +++ b/gpu/config/software_rendering_list.json
-@@ -377,17 +377,6 @@
+@@ -374,17 +374,6 @@
       ]
     },
     {
@@ -455,7 +459,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
       "cr_bugs": [145531, 332596, 571899, 629434],
 --- a/media/gpu/BUILD.gn
 +++ b/media/gpu/BUILD.gn
-@@ -495,6 +495,14 @@ if (use_v4l2_codec || use_vaapi || is_ma
+@@ -499,6 +499,14 @@ if (use_v4l2_codec || use_vaapi || is_ma
   }
 }
 
@@ -470,7 +474,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 if (use_vaapi) {
   test("jpeg_encode_accelerator_unittest") {
     deps = [
-@@ -559,6 +567,10 @@ if (use_v4l2_codec || use_vaapi) {
+@@ -569,6 +577,10 @@ if (use_v4l2_codec || use_vaapi) {
     if (use_ozone) {
       deps += [ "//ui/ozone" ]
     }
@@ -483,7 +487,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 
 --- a/media/base/media_switches.cc
 +++ b/media/base/media_switches.cc
-@@ -117,10 +117,15 @@ const char kUseFileForFakeAudioCapture[]
+@@ -108,10 +108,15 @@ const char kUseFileForFakeAudioCapture[]
 // accelerator hardware to be present.
 const char kUseFakeJpegDecodeAccelerator[] = "use-fake-jpeg-decode-accelerator";
 
@@ -499,7 +503,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 
 // When running tests on a system without the required hardware or libraries,
 // this flag will cause the tests to fail. Otherwise, they silently succeed.
-@@ -462,15 +467,22 @@ const base::Feature kPreloadMediaEngagem
+@@ -460,15 +465,22 @@ const base::Feature kPreloadMediaEngagem
 #endif
 
 bool IsVideoCaptureAcceleratedJpegDecodingEnabled() {
@@ -526,7 +530,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
   return false;
 --- a/media/base/media_switches.h
 +++ b/media/base/media_switches.h
-@@ -66,7 +66,11 @@ MEDIA_EXPORT extern const char kUseFakeD
+@@ -64,7 +64,11 @@ MEDIA_EXPORT extern const char kUseFakeD
 MEDIA_EXPORT extern const char kUseFileForFakeVideoCapture[];
 MEDIA_EXPORT extern const char kUseFileForFakeAudioCapture[];
 MEDIA_EXPORT extern const char kUseFakeJpegDecodeAccelerator[];
@@ -540,7 +544,7 @@ Signed-off-by: Daniel Charles <daniel.charles@intel.com>
 MEDIA_EXPORT extern const char kMuteAudio[];
 --- a/content/browser/utility_process_host.cc
 +++ b/content/browser/utility_process_host.cc
-@@ -296,7 +296,11 @@ bool UtilityProcessHost::StartProcess()
+@@ -298,7 +298,11 @@ bool UtilityProcessHost::StartProcess()
       switches::kOverrideUseSoftwareGLForTests,
       switches::kOverrideEnabledCdmInterfaceVersion,
       switches::kProxyServer,
--- a/patches/inox-patchset/disable-cfi-icall-for-va_stubs.patch
+++ b/patches/inox-patchset/disable-cfi-icall-for-va_stubs.patch
@@ -18,7 +18,7 @@ Cr-Commit-Position: refs/heads/master@{#589034}

 --- a/tools/cfi/blacklist.txt
 +++ b/tools/cfi/blacklist.txt
-@@ -146,6 +146,7 @@ fun:*FunctorTraits*
+@@ -143,6 +143,7 @@ fun:*FunctorTraits*
 
 # Calls to auto-generated stubs by generate_stubs.py
 src:*audio/pulse/pulse_stubs.cc
--- a/patches/inox-patchset/fix-cfi-icall-failure-with-use_system_libjpeg-true.patch
+++ b/patches/inox-patchset/fix-cfi-icall-failure-with-use_system_libjpeg-true.patch
@@ -1,45 +0,0 @@
-From db82db1b609f30d144d45477f55697818bcd363c Mon Sep 17 00:00:00 2001
-From: Vlad Tsyrklevich <vtsyrklevich@chromium.org>
-Date: Tue, 31 Jul 2018 01:03:22 +0000
-Subject: [PATCH] Fix cfi-icall failure with use_system_libjpeg=true
-
-JPEGImageReader::AllocateSampleArray() can call the function pointer
-(*info_.mem->alloc_sarray) which can be set by the systems non-CFI
-enabled libjpeg DSO when chromium is built with use_system_libjpeg=true.
-Disable cfi-icall for that method.
-
-Bug: 866290
-Change-Id: I6d9bbf08c514d6d5f48ad34c3802c63419ed1223
-Reviewed-on: https://chromium-review.googlesource.com/1155927
-Reviewed-by: Kentaro Hara <haraken@chromium.org>
-Commit-Queue: Vlad Tsyrklevich <vtsyrklevich@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#579270}
---
- .../renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc | 2 +-
- third_party/blink/renderer/platform/wtf/compiler.h              | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
--- a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
-+++ b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
-@@ -643,7 +643,7 @@ class JPEGImageReader final {
-   IntSize UvSize() const { return uv_size_; }
- 
-  private:
-  JSAMPARRAY AllocateSampleArray() {
-+  NO_SANITIZE_CFI_ICALL JSAMPARRAY AllocateSampleArray() {
- // Some output color spaces don't need the sample array: don't allocate in that
- // case.
- #if defined(TURBO_JPEG_RGB_SWIZZLE)
--- a/third_party/blink/renderer/platform/wtf/compiler.h
-+++ b/third_party/blink/renderer/platform/wtf/compiler.h
-@@ -57,8 +57,10 @@
- #if defined(__clang__)
- #define NO_SANITIZE_UNRELATED_CAST \
-   __attribute__((no_sanitize("cfi-unrelated-cast", "vptr")))
-+#define NO_SANITIZE_CFI_ICALL __attribute__((no_sanitize("cfi-icall")))
- #else
- #define NO_SANITIZE_UNRELATED_CAST
-+#define NO_SANITIZE_CFI_ICALL
- #endif
- 
- #endif /* WTF_Compiler_h */
--- a/patches/inox-patchset/only-disable-cfi-icall-when-use_system_libjpeg-true.patch
+++ b/patches/inox-patchset/only-disable-cfi-icall-when-use_system_libjpeg-true.patch
@@ -1,29 +0,0 @@
-From 20f81a066ffdf6bd30fb4b696b8b3e101368e2f6 Mon Sep 17 00:00:00 2001
-From: Vlad Tsyrklevich <vtsyrklevich@chromium.org>
-Date: Tue, 31 Jul 2018 23:21:09 +0000
-Subject: [PATCH] Only disable cfi-icall when use_system_libjpeg=true
-
-Bug: 866290
-Change-Id: Ic5d175b3b854665f50781650406d599d09ee9849
-Reviewed-on: https://chromium-review.googlesource.com/1157136
-Reviewed-by: Kentaro Hara <haraken@chromium.org>
-Commit-Queue: Vlad Tsyrklevich <vtsyrklevich@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#579614}
---
- .../platform/image-decoders/jpeg/jpeg_image_decoder.cc       | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
--- a/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
-+++ b/third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc
-@@ -643,7 +643,10 @@ class JPEGImageReader final {
-   IntSize UvSize() const { return uv_size_; }
- 
-  private:
-  NO_SANITIZE_CFI_ICALL JSAMPARRAY AllocateSampleArray() {
-+#if defined(USE_SYSTEM_LIBJPEG)
-+  NO_SANITIZE_CFI_ICALL
-+#endif
-+  JSAMPARRAY AllocateSampleArray() {
- // Some output color spaces don't need the sample array: don't allocate in that
- // case.
- #if defined(TURBO_JPEG_RGB_SWIZZLE)