Updated patches for v89

   ]

   configs += [

@@ -3446,8 +3450,6 @@ static_library("browser") {

@@ -3442,8 +3446,6 @@ static_library("browser") {

       "badging/badge_manager_factory.h",

       "banners/app_banner_manager_desktop.cc",

       "banners/app_banner_manager_desktop.h",

+    {

+      subresource_filter::ActivationDecision ignored_decision;

+      mojom::ActivationState ad_filtering_state;

+      ad_filtering_state.activation_level = client_->OnPageActivationComputed(

+      ad_filtering_state.activation_level = client_->GetProfileInteractionManager()->OnPageActivationComputed(

+	      navigation_handle, mojom::ActivationLevel::kEnabled, &ignored_decision);

+      throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),

+                                                ad_filtering_state);

Subject: Disable media router and remoting by default

---

 chrome/browser/media/router/media_router_feature.cc | 1 +

 .../browser/media/router/media_router_feature.cc  | 15 +++------------

 chrome/browser/profiles/profile.cc                |  2 +-

 chrome/browser/profiles/profile_impl.cc           |  2 +-

 3 files changed, 3 insertions(+), 2 deletions(-)

 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc

--- a/chrome/browser/media/router/media_router_feature.cc

+++ b/chrome/browser/media/router/media_router_feature.cc

@@ -64,6 +64,7 @@ const PrefService::Preference* GetMediaRouterPref(

 #endif  // defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)

@@ -53,16 +53,6 @@ const base::Feature kAllowAllSitesToInitiateMirroring{

     "AllowAllSitesToInitiateMirroring", base::FEATURE_DISABLED_BY_DEFAULT};

 #endif  // !defined(OS_ANDROID)

-#if defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)

-namespace {

-const PrefService::Preference* GetMediaRouterPref(

-    content::BrowserContext* context) {

-  return user_prefs::UserPrefs::Get(context)->FindPreference(

-      ::prefs::kEnableMediaRouter);

-}

-}  // namespace

-#endif  // defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)

-

 bool MediaRouterEnabled(content::BrowserContext* context) {

+  return false;

 #if !defined(OFFICIAL_BUILD) && !defined(OS_ANDROID)

   if (!base::FeatureList::IsEnabled(kMediaRouter))

@@ -70,7 +60,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) {

 #endif  // !defined(OFFICIAL_BUILD) && !defined(OS_ANDROID)

 #if defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)

-  static base::NoDestructor<base::flat_map<content::BrowserContext*, bool>>

+/*  static base::NoDestructor<base::flat_map<content::BrowserContext*, bool>>

       stored_pref_values;

   // If the Media Router was already enabled or disabled for |context|, then it

@@ -91,7 +81,8 @@ bool MediaRouterEnabled(content::BrowserContext* context) {

   // The component extension cannot be loaded in guest sessions.

   // TODO(crbug.com/756243): Figure out why.

-  return !Profile::FromBrowserContext(context)->IsGuestSession();

+  return !Profile::FromBrowserContext(context)->IsGuestSession(); */

+  return false;

 #else   // !(defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS))

   return false;

 #endif  // defined(OS_ANDROID) || BUILDFLAG(ENABLE_EXTENSIONS)

diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc

--- a/chrome/browser/profiles/profile.cc

+++ b/chrome/browser/profiles/profile.cc

 chrome/browser/safe_browsing/BUILD.gn         |  3 +-

 chrome/browser/safe_browsing/android/BUILD.gn |  3 -

 .../safe_browsing/SafeBrowsingBridge.java     | 71 -------------------

 .../password_reuse_controller_android.h       |  6 ++

 .../android/safe_browsing_bridge.cc           | 51 -------------

 .../download_protection_service.cc            |  7 --

 .../download_protection_service.h             |  5 --

 .../native_file_system_file_writer_impl.cc    | 59 +--------------

 .../native_file_system_file_writer_impl.h     |  9 +--

 .../file_system_access_permission_context.h   |  6 --

 72 files changed, 186 insertions(+), 732 deletions(-)

 71 files changed, 180 insertions(+), 732 deletions(-)

diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml

--- a/chrome/android/java/res/xml/google_services_preferences.xml

-        boolean isSafeBrowsingManaged();

     }

 }

diff --git a/chrome/browser/safe_browsing/android/password_reuse_controller_android.h b/chrome/browser/safe_browsing/android/password_reuse_controller_android.h

--- a/chrome/browser/safe_browsing/android/password_reuse_controller_android.h

+++ b/chrome/browser/safe_browsing/android/password_reuse_controller_android.h

@@ -48,14 +48,18 @@ class PasswordReuseControllerAndroid

   // The following functions are called from |PasswordReuseDialogViewAndroid|,

   // to get text shown on the dialog.

   base::string16 GetButtonText() const;

+#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)

   // Get the detailed warning text that should show in the modal warning dialog.

   // |placeholder_offsets| are the start points/indices of the placeholders that

   // are passed into the resource string.

   base::string16 GetWarningDetailText(

       std::vector<size_t>* placeholder_offsets) const;

+#endif

   base::string16 GetTitle() const;

+#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)

   const std::vector<base::string16> GetPlaceholdersForSavedPasswordWarningText()

       const;

+#endif

   // ChromePasswordProtectionService::Observer:

   void OnGaiaPasswordChanged() override;

@@ -68,7 +72,9 @@ class PasswordReuseControllerAndroid

  private:

   std::unique_ptr<PasswordReuseDialogViewAndroid> dialog_view_;

+#if defined(SYNC_PASSWORD_REUSE_WARNING_ENABLED)

   ChromePasswordProtectionService* service_;

+#endif

   const GURL url_;

   const ReusedPasswordAccountType password_type_;

   ui::WindowAndroid* window_android_;

diff --git a/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc b/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc

--- a/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc

+++ b/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc

-      std::move(item), context().frame_id,

-      base::BindOnce(&NativeFileSystemFileWriterImpl::DidAfterWriteCheck,

-                     weak_factory_.GetWeakPtr()));

+  DidPassAfterWriteCheck(std::move(callback));

+  DidAfterWriteCheck(FileSystemAccessPermissionContext::AfterWriteCheckResult::kAllow);

 }

 void NativeFileSystemFileWriterImpl::DidAfterWriteCheck(

   "java/src/org/chromium/chrome/browser/settings/MainSettings.java",

   "java/src/org/chromium/chrome/browser/settings/SettingsActivity.java",

   "java/src/org/chromium/chrome/browser/settings/SettingsLauncherImpl.java",

@@ -1510,9 +1505,6 @@ chrome_java_sources = [

@@ -1509,9 +1504,6 @@ chrome_java_sources = [

   "java/src/org/chromium/chrome/browser/webapps/addtohomescreen/AddToHomescreenViewBinder.java",

   "java/src/org/chromium/chrome/browser/webauth/AuthenticatorFactory.java",

   "java/src/org/chromium/chrome/browser/webauth/AuthenticatorImpl.java",

diff --git a/chrome/browser/signin/services/android/BUILD.gn b/chrome/browser/signin/services/android/BUILD.gn

--- a/chrome/browser/signin/services/android/BUILD.gn

+++ b/chrome/browser/signin/services/android/BUILD.gn

@@ -27,7 +27,6 @@ android_library("java") {

@@ -28,7 +28,6 @@ android_library("java") {

   ]

   deps = [

     ":java_resources",