v91.diff

diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
index 1e896e34c0..392db03c2b 100644
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -1190,9 +1190,9 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardMetrics.java",
   "java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java",
   "java/src/org/chromium/chrome/browser/sharing/sms_fetcher/SmsFetcherMessageHandler.java",
-  "java/src/org/chromium/chrome/browser/signin/SyncConsentActivity.java",
-  "java/src/org/chromium/chrome/browser/signin/SyncConsentFragment.java",
-  "java/src/org/chromium/chrome/browser/signin/SyncConsentFragmentBase.java",
+  # "java/src/org/chromium/chrome/browser/signin/SyncConsentActivity.java",
+  # "java/src/org/chromium/chrome/browser/signin/SyncConsentFragment.java",
+  # "java/src/org/chromium/chrome/browser/signin/SyncConsentFragmentBase.java",
   "java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate.java",
   "java/src/org/chromium/chrome/browser/site_settings/CookieControlsServiceBridge.java",
   "java/src/org/chromium/chrome/browser/site_settings/ManageSpaceActivity.java",
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
index a3a65a1101..be6a24e1bc 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationDelegateImpl.java
@@ -219,8 +219,6 @@ public class ExternalNavigationDelegateImpl implements ExternalNavigationDelegat
 
     @Override
     public void maybeAdjustInstantAppExtras(Intent intent, boolean isIntentToInstantApp) {
-        // Always remove this extra
-        intent.removeExtra(InstantAppsHandler.IS_GOOGLE_SEARCH_REFERRER);
     }
 
     @Override
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java b/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java
index d082bf41b4..c4f5dceffd 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/StartupTabPreloader.java
@@ -205,7 +205,7 @@ public class StartupTabPreloader implements ProfileManager.Observer, Destroyable
                 (ChromeTabCreator) mTabCreatorManager.getTabCreator(isIncognito);
         WebContents webContents =
                 WebContentsFactory.createWebContents(
-                    isIncognito ? profile.getPrimaryOTRProfile() : profile, 
+                    isIncognito ? profile.getPrimaryOTRProfile(/*createIfNeeded=*/true) : profile,
                     false);
 
         mLoadUrlParams = new LoadUrlParams(url.getValidSpecOrEmpty());
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsNavigationDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsNavigationDelegate.java
index 29448c9bf4..74714225c4 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsNavigationDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/SuggestionsNavigationDelegate.java
@@ -19,16 +19,21 @@ import org.chromium.ui.mojom.WindowOpenDisposition;
 import org.chromium.chrome.browser.bookmarks.BookmarkUtils;
 import org.chromium.chrome.browser.download.DownloadUtils;
 import org.chromium.chrome.browser.download.DownloadOpenSource;
+import org.chromium.chrome.browser.profiles.OTRProfileID;
 
 /**
  * Extension of {@link NativePageNavigationDelegate} with suggestions-specific methods.
  */
 public class SuggestionsNavigationDelegate extends NativePageNavigationDelegateImpl {
     private static final String NEW_TAB_URL_HELP = "https://support.google.com/chrome/?p=new_tab";
+    final Profile mProfile;
+    final Tab mTab;
 
     public SuggestionsNavigationDelegate(Activity activity, Profile profile, NativePageHost host,
             TabModelSelector tabModelSelector, Tab tab) {
         super(activity, profile, host, tabModelSelector, tab);
+        mProfile = profile;
+        mTab = tab;
     }
 
     @Override
@@ -41,12 +46,16 @@ public class SuggestionsNavigationDelegate extends NativePageNavigationDelegateI
 
     public void navigateToBookmarks() {
         //RecordUserAction.record("MobileNTPSwitchToBookmarks");
-        BookmarkUtils.showBookmarkManager(mActivity);
+        BookmarkUtils.showBookmarkManager(mActivity, mTab.isIncognito());
     }
 
     public void navigateToDownloadManager() {
+        OTRProfileID otrProfileID = null;
+        if (mTab != null && mTab.getWebContents() != null) {
+            otrProfileID = mProfile != null ? mProfile.getOTRProfileID() : null;
+        }
         //RecordUserAction.record("MobileNTPSwitchToDownloadManager");
-        DownloadUtils.showDownloadManager(mActivity, null, DownloadOpenSource.NEW_TAB_PAGE);
+        DownloadUtils.showDownloadManager(mActivity, null, otrProfileID, DownloadOpenSource.NEW_TAB_PAGE);
     }
 
     /**
diff --git a/chrome/browser/android/bookmarks/bookmark_bridge.cc b/chrome/browser/android/bookmarks/bookmark_bridge.cc
index 65f934a544..f2a4ec40ba 100644
--- a/chrome/browser/android/bookmarks/bookmark_bridge.cc
+++ b/chrome/browser/android/bookmarks/bookmark_bridge.cc
@@ -680,15 +680,15 @@ void BookmarkBridge::ImportBookmarks(JNIEnv* env,
   //NOTE: extension and description are not used on Android, thus not set
   ui::SelectFileDialog::FileTypeInfo file_type_info;
 
-  const std::vector<base::string16> v_accept_types = { base::UTF8ToUTF16("text/html") };
+  const std::vector<std::u16string> v_accept_types = { base::UTF8ToUTF16("text/html") };
 
   // Android needs the original MIME types and an additional capture value.
-  std::pair<std::vector<base::string16>, bool> accept_types =
+  std::pair<std::vector<std::u16string>, bool> accept_types =
       std::make_pair(v_accept_types, /* use_media_capture */ false);
 
   select_file_dialog_->SelectFile(
         ui::SelectFileDialog::SELECT_OPEN_FILE,
-        base::string16(),
+        std::u16string(),
         export_path_,
         &file_type_info,
         0,
@@ -709,7 +709,7 @@ void BookmarkBridge::ExportBookmarks(JNIEnv* env,
       ui::WindowAndroid::FromJavaWindowAndroid(java_window);
   CHECK(window);
 
-  base::string16 export_path =
+  std::u16string export_path =
     base::android::ConvertJavaStringToUTF16(env, j_export_path);
 
   export_path_ = base::FilePath::FromUTF16Unsafe(export_path);
@@ -728,9 +728,9 @@ void BookmarkBridge::ExportBookmarks(JNIEnv* env,
 
 // Attempts to create a TemplateURL from the provided data. |title| is optional.
 // If TemplateURL creation fails, returns null.
-std::unique_ptr<TemplateURL> CreateTemplateURL(const base::string16& url,
-                                               const base::string16& keyword,
-                                               const base::string16& title) {
+std::unique_ptr<TemplateURL> CreateTemplateURL(const std::u16string& url,
+                                               const std::u16string& keyword,
+                                               const std::u16string& title) {
   if (url.empty() || keyword.empty())
     return nullptr;
   TemplateURLData data;
diff --git a/chrome/browser/android/preferences/browser_prefs_android.cc b/chrome/browser/android/preferences/browser_prefs_android.cc
index 0443076237..d17ab74f5f 100644
--- a/chrome/browser/android/preferences/browser_prefs_android.cc
+++ b/chrome/browser/android/preferences/browser_prefs_android.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/webauthn/android/cable_module_android.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_registry_simple.h"
+#include "chrome/common/pref_names.h"
 
 namespace android {
 
diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
index c19b3741b4..a1ff45882f 100644
--- a/chrome/browser/importer/profile_writer.cc
+++ b/chrome/browser/importer/profile_writer.cc
@@ -139,7 +139,7 @@ void ProfileWriter::AddBookmarks(
 void ProfileWriter::AddBookmarksWithModel(
     BookmarkModel* model,
     const std::vector<ImportedBookmarkEntry>& bookmarks,
-    const base::string16& top_level_folder_name) {
+    const std::u16string& top_level_folder_name) {
   if (bookmarks.empty())
     return;
 
diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/profile_writer.h
index 239ba889ca..53ffcc12e0 100644
--- a/chrome/browser/importer/profile_writer.h
+++ b/chrome/browser/importer/profile_writer.h
@@ -73,7 +73,7 @@ class ProfileWriter : public base::RefCountedThreadSafe<ProfileWriter> {
   virtual void AddBookmarksWithModel(
       bookmarks::BookmarkModel* model,
       const std::vector<ImportedBookmarkEntry>& bookmarks,
-      const base::string16& top_level_folder_name);
+      const std::u16string& top_level_folder_name);
 
   virtual void AddFavicons(const favicon_base::FaviconUsageDataList& favicons);
 
diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java
index 783fd3f291..1eac7f30f8 100644
--- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java
+++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/AppLanguagePreferenceDelegate.java
@@ -90,14 +90,6 @@ public class AppLanguagePreferenceDelegate {
 
         // Disable preference so a second downloaded cannot be started while one is in progress.
         mPreference.setEnabled(false);
-
-        AppLocaleUtils.setAppLanguagePref(code, (success) -> {
-            if (success) {
-                languageSplitDownloadComplete();
-            } else {
-                languageSplitDownloadFailed();
-            }
-        });
     }
 
     /**
diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
index 5a7bc87f20..4d1f981540 100644
--- a/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
+++ b/chrome/browser/language/android/java/src/org/chromium/chrome/browser/language/settings/LanguageSettings.java
@@ -18,7 +18,6 @@ import org.chromium.base.BuildInfo;
 import org.chromium.base.Log;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
 import org.chromium.chrome.browser.language.AppLocaleUtils;
-import org.chromium.chrome.browser.language.LanguageSplitInstaller;
 import org.chromium.chrome.browser.language.R;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
@@ -88,11 +87,6 @@ public class LanguageSettings extends PreferenceFragmentCompat
      * translate target language, and detailed translate preferences.
      */
     private void createDetailedPreferences(Bundle savedInstanceState, String rootKey) {
-        // Log currently installed language splits.
-        String installedLanguages =
-                TextUtils.join(",", LanguageSplitInstaller.getInstance().getInstalledLanguages());
-        Log.i(TAG, TextUtils.concat("Installed Languages: ", installedLanguages).toString());
-
         SettingsUtils.addPreferencesFromResource(this, R.xml.languages_detailed_preferences);
 
         setupAppLanguageSection();
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java
index 27f5af4a60..8ebac804da 100644
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ContentSettingsResources.java
@@ -121,7 +121,7 @@ public class ContentSettingsResources {
                             R.string.automatic_downloads_permission_title, ContentSettingValues.ASK,
                             ContentSettingValues.BLOCK, R.string.website_settings_category_ask, 0));
             localMap.put(ContentSettingsType.AUTOPLAY,
-                    new ResourceItem(R.drawable.settings_autoplay, R.string.autoplay_title,
+                    new ResourceItem(R.drawable.settings_autoplay, 0, R.string.autoplay_title,
                             ContentSettingValues.ALLOW, ContentSettingValues.BLOCK,
                             R.string.website_settings_category_autoplay_allowed, 0));
             localMap.put(ContentSettingsType.BACKGROUND_SYNC,
@@ -251,7 +251,7 @@ public class ContentSettingsResources {
                             R.string.website_settings_category_vr_ask,
                             R.string.website_settings_category_vr_blocked));
             localMap.put(ContentSettingsType.TIMEZONE_OVERRIDE,
-                    new ResourceItem(R.drawable.web_asset, R.string.timezone_override_permission_title,
+                    new ResourceItem(R.drawable.web_asset, 0, R.string.timezone_override_permission_title,
                             ContentSettingValues.ALLOW, ContentSettingValues.BLOCK,
                             R.string.website_settings_category_timezone_override_custom,
                             R.string.website_settings_category_timezone_override_random));
diff --git a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
index e526583870..e5c16481b8 100644
--- a/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
+++ b/components/subresource_filter/content/browser/content_subresource_filter_throttle_manager.cc
@@ -562,14 +562,14 @@ ContentSubresourceFilterThrottleManager::
     }
 
     //TODO: could use same logic as in SubresourceFilterSafeBrowsingActivationThrottle::NotifyResult()
-    {
-      subresource_filter::ActivationDecision ignored_decision;
-      mojom::ActivationState ad_filtering_state;
-      ad_filtering_state.activation_level = client_->GetProfileInteractionManager()->OnPageActivationComputed(
-	      navigation_handle, mojom::ActivationLevel::kEnabled, &ignored_decision);
-      throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
-                                                ad_filtering_state);
-    }
+    // {
+    //   subresource_filter::ActivationDecision ignored_decision;
+    //   mojom::ActivationState ad_filtering_state;
+    //   ad_filtering_state.activation_level = client_->GetProfileInteractionManager()->OnPageActivationComputed(
+	  //     navigation_handle, mojom::ActivationLevel::kEnabled, &ignored_decision);
+    //   throttle->NotifyPageActivationWithRuleset(EnsureRulesetHandle(),
+    //                                             ad_filtering_state);
+    // }
 
     return throttle;
   }
diff --git a/components/subresource_filter/content/browser/verified_ruleset_dealer.cc b/components/subresource_filter/content/browser/verified_ruleset_dealer.cc
index 590316209b..e53bb49853 100644
--- a/components/subresource_filter/content/browser/verified_ruleset_dealer.cc
+++ b/components/subresource_filter/content/browser/verified_ruleset_dealer.cc
@@ -41,7 +41,7 @@ RulesetFilePtr VerifiedRulesetDealer::OpenAndSetRulesetFile(
                "VerifiedRulesetDealer::OpenAndSetRulesetFile", "file_valid",
                file->IsValid());
 
-  LOG(INFO) << "OpenAndSetRulesetFile: " << file_path << " is valid: " << file.IsValid();
+  LOG(INFO) << "OpenAndSetRulesetFile: " << file_path << " is valid: " << file->IsValid();
 
   if (file->IsValid()) {
     SetRulesetFile(file->Duplicate());
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 4f2974698f..b92aa85a36 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2488,7 +2488,8 @@ const blink::web_pref::WebPreferences WebContentsImpl::ComputeWebPreferences() {
       prefs.viewport_meta_enabled = false;
   }
 
-  if (IsOverridingUserAgent() &&
+  if (GetController().GetVisibleEntry() &&
+      GetController().GetVisibleEntry()->GetIsOverridingUserAgent() &&
       !command_line.HasSwitch(switches::kDesktopModeViewportMetaEnabled)) {
     prefs.viewport_meta_enabled = false;
   }