From 4c4dd71824c189a446f72ae5474739866f9de2d8 Mon Sep 17 00:00:00 2001
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Sat, 16 May 2020 17:42:56 +0200
Subject: [PATCH] Updated domain substitution patch to run before text
 replacements

---
 build/bromite_patches_list.txt                |  2 +-
 .../Automated-domain-substitution.patch       | 85 ++++++++++++++-----
 2 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt
index 4f9caf90..9f8b6ca5 100644
--- a/build/bromite_patches_list.txt
+++ b/build/bromite_patches_list.txt
@@ -141,5 +141,5 @@ Disable-AImageReader-for-ARM64-P-and-ARM64-Q.patch
 Restore-GPU-bug-blacklist-for-AImageReader-on-ARM-CPUs.patch
 Update-i18n-zh_CN-support.patch
 Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch
-Automated-domain-substitution.patch
 Workaround-for-startup-crash.patch
+Automated-domain-substitution.patch
diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch
index 634f0ce2..c8c3821e 100644
--- a/build/patches/Automated-domain-substitution.patch
+++ b/build/patches/Automated-domain-substitution.patch
@@ -87,6 +87,7 @@ Subject: Automated domain substitution
  .../chrome/browser/IntentHandler.java         |    6 +-
  .../customtabs/CustomButtonParams.java        |    2 +-
  .../browser/feedback/ConnectivityChecker.java |    4 +-
+ .../chrome/browser/help/HelpAndFeedback.java  |    2 +-
  .../indicator/ConnectivityDetector.java       |    4 +-
  .../browser/omaha/RequestGenerator.java       |    2 +-
  .../geo/partner_location_descriptor.proto     |    2 +-
@@ -299,7 +300,7 @@ Subject: Automated domain substitution
  .../supervised_user_service.cc                |    2 +-
  .../supervised_user_url_filter.cc             |   10 +-
  .../browser/tracing/crash_service_uploader.cc |    2 +-
- .../strings/android_chrome_strings.grd        |   50 +-
+ .../strings/android_chrome_strings.grd        |   52 +-
  .../arc/arc_app_reinstall_app_result.cc       |    2 +-
  .../ash/ambient/backdrop/photo_client_impl.cc |    2 +-
  .../ui/ash/assistant/assistant_test_mixin.cc  |    2 +-
@@ -795,7 +796,7 @@ Subject: Automated domain substitution
  .../ntp_snippets/ntp_snippets_constants.cc    |   16 +-
  components/ntp_snippets/remote/fetch.py       |    8 +-
  components/ntp_tiles/popular_sites_impl.cc    |    2 +-
- .../resources/default_popular_sites.json      |    4 +-
+ .../resources/default_popular_sites.json      |   16 +-
  .../core/prefetch/prefetch_proto_utils.cc     |    2 +-
  .../core/prefetch/prefetch_server_urls.cc     |    2 +-
  .../omnibox/browser/document_provider.cc      |   10 +-
@@ -1989,7 +1990,7 @@ Subject: Automated domain substitution
  ...weblayer_security_blocking_page_factory.cc |    2 +-
  .../weblayer/shell/WebLayerShellActivity.java |    2 +-
  weblayer/shell/app/shell_main_params.cc       |    2 +-
- 1986 files changed, 8779 insertions(+), 8779 deletions(-)
+ 1987 files changed, 8787 insertions(+), 8787 deletions(-)
 
 diff --git a/.gn b/.gn
 --- a/.gn
@@ -3534,6 +3535,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/feedback/Connec
  
      private static String sHttpNoContentUrl = DEFAULT_HTTP_NO_CONTENT_URL;
      private static String sHttpsNoContentUrl = DEFAULT_HTTPS_NO_CONTENT_URL;
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/help/HelpAndFeedback.java b/chrome/android/java/src/org/chromium/chrome/browser/help/HelpAndFeedback.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/help/HelpAndFeedback.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/help/HelpAndFeedback.java
+@@ -32,7 +32,7 @@ import javax.annotation.Nonnull;
+  */
+ public class HelpAndFeedback {
+     protected static final String FALLBACK_SUPPORT_URL =
+-            "https://support.google.com/chrome/topic/6069782";
++            "https://support.9oo91e.qjz9zk/chrome/topic/6069782";
+     private static final String TAG = "HelpAndFeedback";
+ 
+     private static HelpAndFeedback sInstance;
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/ConnectivityDetector.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/ConnectivityDetector.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/ConnectivityDetector.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/indicator/ConnectivityDetector.java
@@ -9490,7 +9503,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_DATA_REDUCTION_ENABLE_BUTTON_LITE_MODE" desc="Button the user presses if they want to enable Lite mode" >
          Turn on Lite mode
-@@ -1480,7 +1480,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1483,7 +1483,7 @@ Your Google account may have other forms of browsing history like searches and a
          Signed in to Google as
        </message>
        <message name="IDS_ACCOUNT_MANAGEMENT_SYNC_SUMMARY" desc="Description for which account the data is being synced to">
@@ -9499,7 +9512,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_ACCOUNT_MANAGEMENT_SIGN_OUT" desc="Button text for signing out of Chrome">
          Sign out of Chrome
-@@ -1494,10 +1494,10 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1497,10 +1497,10 @@ Your Google account may have other forms of browsing history like searches and a
          Waiting for details of parents.
        </message>
        <message name="IDS_ACCOUNT_MANAGEMENT_ONE_PARENT_NAME" desc="String for name of single parent for child account.">
@@ -9512,7 +9525,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_ACCOUNT_MANAGEMENT_CHILD_CONTENT_TITLE" desc="Title of the Content setting, which controls which websites a child is allowed to visit.">
          Content
-@@ -1547,16 +1547,16 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1553,22 +1553,22 @@ Your Google account may have other forms of browsing history like searches and a
          Google Terms of Service
        </message>
        <message name="IDS_GOOGLE_TERMS_OF_SERVICE_URL" desc="URL for Google terms of service" translateable="false">
@@ -9525,6 +9538,13 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_CHROME_ADDITIONAL_TERMS_OF_SERVICE_URL" desc="URL for Chrome and Chrome OS additional terms of service" translateable="false">
 -        https://www.google.com/chrome/terms/
 +        https://www.9oo91e.qjz9zk/chrome/terms/
+       </message>
+       <message name="IDS_PRIVACY_NOTICE_TITLE" desc="Title for the Chrome privacy notice">
+         Chrome Privacy Notice
+       </message>
+       <message name="IDS_CHROME_PRIVACY_NOTICE_URL" desc="URL for the Chrome privacy notice" translateable="false">
+-        https://www.google.com/intl/$LOCALE/chrome/browser/privacy/
++        https://www.9oo91e.qjz9zk/intl/$LOCALE/chrome/browser/privacy/
        </message>
        <message name="IDS_FAMILY_LINK_PRIVACY_POLICY_URL" desc="URL for the Family Link privacy policy" translateable="false">
 -        https://families.google.com/intl/$LOCALE/familylink/privacy/child-policy/
@@ -9532,7 +9552,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
  
        <!-- Certificate viewer -->
-@@ -1578,7 +1578,7 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -1590,7 +1590,7 @@ Your Google account may have other forms of browsing history like searches and a
          Also clear your Chrome data from this device
        </message>
        <message name="IDS_SIGNOUT_MANAGED_ACCOUNT_MESSAGE" desc="Message to display for sign out of Chrome dialog when the account has enterprise management, and all user data will be erased">
@@ -9541,7 +9561,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_SIGN_IN_GETTING_ACCOUNT_MANAGEMENT_POLICY" desc="Title of progress bar dialog for getting management policy">
          Contacting Google. This may take a minute…
-@@ -1726,7 +1726,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -1738,7 +1738,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
  
        <!-- Bluetooth Picker UI strings -->
        <message name="IDS_BLUETOOTH_DIALOG_TITLE" desc="The header message shown on top of the dialog that lets the user pick a Bluetooth device for the site to pair with. Shown above a list of Bluetooth devices discovered. ">
@@ -9550,7 +9570,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        <message name="IDS_BLUETOOTH_SEARCHING" desc="The message shown in the Bluetooth picker dialog while scanning for devices.">
          <ph name="BEGIN_LINK">&lt;link&gt;</ph>Get help<ph name="END_LINK">&lt;/link&gt;</ph> while scanning for devices…
        </message>
-@@ -1771,7 +1771,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -1783,7 +1783,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
  
        <!-- Bluetooth Scanning Prompt strings -->
        <message name="IDS_BLUETOOTH_SCANNING_PROMPT_ORIGIN" desc="The label that is used to introduce Bluetooth scanning prompt details to the user when it is from a website.">
@@ -9559,7 +9579,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_BLUETOOTH_SCANNING_DEVICE_UNKNOWN" desc="Text to identify Bluetooth devices of unknown or unsupported class.">
          Unknown or unsupported device (<ph name="DEVICE_ID">%1$s<ex>A1:B2:C3:D4:E5:F6</ex></ph>)
-@@ -1966,7 +1966,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -1978,7 +1978,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        <message name="IDS_TRANSLATE_BUTTON" desc="Possible texts to display on the translate infobar buttons. [CHAR-LIMIT=24]">
          Translate
        </message>
@@ -9568,7 +9588,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
          Never translate this site
        </message>
  
-@@ -2228,7 +2228,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -2240,7 +2240,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
          This page may differ from the online version.
        </message>
        <message name="IDS_PAGE_INFO_DOMAIN_HIDDEN" desc="Message to display in the page info bubble when the domain is hidden.">
@@ -9577,7 +9597,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_PAGE_INFO_OPEN_ONLINE_BUTTON" desc="Text in the button that attempts to open an online version of the offline website displayed in the tab.">
          Open Online
-@@ -2237,7 +2237,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -2249,7 +2249,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
          Lite page provided by Google
        </message>
        <message name="IDS_PAGE_INFO_PREVIEW_LOAD_ORIGINAL" desc="This text, when clicked, loads the original page from its origin without any treatments. This text is shown in the page info bubble when the currently viewed page has been modified to be a lighter and faster version of the original page.">
@@ -9586,7 +9606,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
  
        <!-- Sad tab page -->
-@@ -3188,7 +3188,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3203,7 +3203,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
        </message>
  
        <message name="IDS_MEDIA_NOTIFICATION_LINK_TEXT" desc="Url of the current tab. The notification will display this text for the user to identify the tab to return to.">
@@ -9595,7 +9615,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_MEDIA_NOTIFICATION_LINK_TEXT_INCOGNITO" desc="The notification will display this text for the user to return to the incognito tab which has created the notification.">
          Tap to go to site
-@@ -3200,7 +3200,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3215,7 +3215,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
          Incognito tab
        </message>
        <message name="IDS_SCREEN_CAPTURE_NOTIFICATION_TEXT" desc="Text to be shown as a notification when screen capture is in progress.">
@@ -9604,7 +9624,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_SCREEN_CAPTURE_INCOGNITO_NOTIFICATION_TEXT" desc="Text to be shown as a notification when screen capture is in progress in incognito mode.">
          A site is sharing your screen
-@@ -3400,7 +3400,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3415,7 +3415,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
  
        <!-- WebUsb Picker UI strings -->
        <message name="IDS_USB_CHOOSER_DIALOG_PROMPT" desc="The text that is used to introduce the USB chooser dialog to the user.">
@@ -9613,7 +9633,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
        <message name="IDS_USB_CHOOSER_DIALOG_NO_DEVICES_FOUND_PROMPT" desc="The label shown to the user to inform them that no USB devices were found matching the requirements that the application provided.">
          No compatible devices found
-@@ -3449,7 +3449,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
+@@ -3464,7 +3464,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
            other {(+ # more)}}
        </message>
        <message name="IDS_DISCLAIMER_SHARING_CONTACT_DETAILS" desc="Label describing what will happen with the contact details that are being shared.">
@@ -9622,7 +9642,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
        </message>
  
        <!-- Photo Picker strings -->
-@@ -3753,7 +3753,7 @@ Only you can see what your camera is looking at. The site can't see your camera'
+@@ -3768,7 +3768,7 @@ Only you can see what your camera is looking at. The site can't see your camera'
          Sending to <ph name="device_name">%1$s<ex>Tanya's Pixel 2</ex></ph>...
        </message>
        <message name="IDS_SEND_TAB_TO_SELF_NOTIFICATION_CONTEXT_TEXT" desc="Text displayed as the second line of a notification indicating the domain and the device the tab is shared from.">
@@ -21486,17 +21506,38 @@ diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/p
 diff --git a/components/ntp_tiles/resources/default_popular_sites.json b/components/ntp_tiles/resources/default_popular_sites.json
 --- a/components/ntp_tiles/resources/default_popular_sites.json
 +++ b/components/ntp_tiles/resources/default_popular_sites.json
-@@ -1,8 +1,8 @@
+@@ -1,23 +1,23 @@
  [
      {
 -        "large_icon_url": "https://www.chromium.org/_/rsrc/1484148948583/apple-touch-icon.png",
 +        "large_icon_url": "https://www.ch40m1um.qjz9zk/_/rsrc/1484148948583/apple-touch-icon.png",
-         "title": "Chromium - The Chromium Projects",
--        "url": "https://www.chromium.org/Home"
-+        "url": "https://www.ch40m1um.qjz9zk/Home"
+         "title": "The Chromium Projects `",
+-        "url": "https://www.chromium.org/"
++        "url": "https://www.ch40m1um.qjz9zk/"
      },
      {
-         "large_icon_url": "https://www.bromite.org/android-icon-192x192.png",
+-        "favicon_url": "https://codereview.chromium.org/static/favicon.ico",
++        "favicon_url": "https://codereview.ch40m1um.qjz9zk/static/favicon.ico",
+         "title": "Chromium Code Reviews",
+-        "url": "https://codereview.chromium.org/"
++        "url": "https://codereview.ch40m1um.qjz9zk/"
+     },
+     {
+-        "large_icon_url": "https://www.chromium.org/_/rsrc/1484148948583/apple-touch-icon.png",
++        "large_icon_url": "https://www.ch40m1um.qjz9zk/_/rsrc/1484148948583/apple-touch-icon.png",
+         "title": "Git Repositories on chromium",
+-        "url": "https://chromium.googlesource.com/"
++        "url": "https://chromium.9oo91esource.qjz9zk/"
+     },
+     {
+-        "large_icon_url": "https://developers.google.com/_static/9bce7b6017/images/touch-icon.png",
++        "large_icon_url": "https://developers.9oo91e.qjz9zk/_static/9bce7b6017/images/touch-icon.png",
+         "title": "Google Open Source Programs Office",
+-        "url": "https://developers.google.com/open-source/"
++        "url": "https://developers.9oo91e.qjz9zk/open-source/"
+     },
+     {
+         "large_icon_url": "https://freenode.net/static/img/logos/coloured-alphabg-sq-120.png",
 diff --git a/components/offline_pages/core/prefetch/prefetch_proto_utils.cc b/components/offline_pages/core/prefetch/prefetch_proto_utils.cc
 --- a/components/offline_pages/core/prefetch/prefetch_proto_utils.cc
 +++ b/components/offline_pages/core/prefetch/prefetch_proto_utils.cc