From a4f6c4cf7b942f5f346eb00d89ca6e7dbb4a79a4 Mon Sep 17 00:00:00 2001
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Sun, 13 Feb 2022 19:21:51 +0100
Subject: [PATCH] Updated automated domain substitution patch
---
.../Automated-domain-substitution.patch | 4728 +++++++++--------
1 file changed, 2457 insertions(+), 2271 deletions(-)
diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch
index 229052c3..36592847 100644
--- a/build/patches/Automated-domain-substitution.patch
+++ b/build/patches/Automated-domain-substitution.patch
@@ -11,21 +11,30 @@ Subject: Automated domain substitution
android_webview/tools/update_cts.py | 4 +-
ash/accelerators/accelerator_notifications.cc | 2 +-
ash/app_list/PRESUBMIT.py | 2 +-
- ash/ash_strings.grd | 10 +-
+ ash/ash_strings.grd | 16 +-
ash/assistant/PRESUBMIT.py | 2 +-
ash/assistant/assistant_setup_controller.cc | 2 +-
ash/assistant/util/deep_link_util.cc | 16 +-
ash/components/drivefs/drivefs_auth.cc | 2 +-
+ .../simple_geolocation_provider.cc | 2 +-
.../translation_result_loader.cc | 2 +-
+ ash/components/timezone/timezone_request.cc | 2 +-
.../quick_answers_ui_controller.cc | 2 +-
.../fast_pair/device_metadata_fetcher.cc | 2 +-
.../fast_pair/footprints_fetcher.cc | 4 +-
ash/resources/PRESUBMIT.py | 4 +-
...pcie_peripheral_notification_controller.cc | 2 +-
+ ash/webui/camera_app_ui/camera_app_ui.cc | 2 +-
+ .../resources/js/lib/analytics.js | 14 +-
+ ash/webui/camera_app_ui/resources/js/util.js | 2 +-
+ .../resources/strings/camera_strings.grd | 2 +-
.../diagnostics_ui/resources/network_card.js | 4 +-
.../resources/routine_section.js | 2 +-
.../help_app_kids_magazine_untrusted_ui.cc | 2 +-
ash/webui/media_app_ui/media_app_guest_ui.cc | 2 +-
+ ...untrusted_personalization_app_ui_config.cc | 2 +-
+ .../projector_app/projector_xhr_sender.cc | 6 +-
+ .../untrusted_projector_ui_config.cc | 8 +-
.../scanning/resources/scanning_app.html | 2 +-
ash/webui/scanning/resources/scanning_app.js | 2 +-
.../reimaging_firmware_update_page.js | 2 +-
@@ -90,7 +99,7 @@ Subject: Automated domain substitution
.../manifest/maps_go_manifest_config.json | 10 +-
chrome/app/PRESUBMIT.py | 8 +-
chrome/app/chromium_strings.grd | 14 +-
- chrome/app/generated_resources.grd | 254 +-
+ chrome/app/generated_resources.grd | 252 +-
chrome/app/google_chrome_strings.grd | 14 +-
chrome/app/resources/locale_settings.grd | 10 +-
chrome/app/theme/PRESUBMIT.py | 4 +-
@@ -130,7 +139,6 @@ Subject: Automated domain substitution
.../ash/plugin_vm/plugin_vm_diagnostics.cc | 4 +-
.../plugin_vm/plugin_vm_license_checker.cc | 4 +-
.../browser/ash/plugin_vm/plugin_vm_util.cc | 6 +-
- .../dlp/dlp_clipboard_bubble_constants.h | 2 +-
.../account_status_check_fetcher.cc | 6 +-
.../powerwash_requirements_checker.cc | 2 +-
.../device_command_start_crd_session_job.cc | 6 +-
@@ -139,16 +147,16 @@ Subject: Automated domain substitution
.../ash/web_applications/terminal_source.cc | 4 +-
.../autofill/autofill_gstatic_reader.cc | 4 +-
.../browser_switcher_service.cc | 2 +-
- chrome/browser/buildflags.gni | 2 +-
chrome/browser/cart/cart_discount_fetcher.cc | 2 +-
.../cart/cart_discount_link_fetcher.cc | 2 +-
- chrome/browser/cart/cart_service.cc | 26 +-
+ chrome/browser/cart/cart_service.cc | 24 +-
chrome/browser/cart/fetch_discount_worker.cc | 2 +-
.../cart_domain_cart_url_mapping.json | 2 +-
.../resources/cart_domain_name_mapping.json | 2 +-
.../browser/chrome_browser_application_mac.mm | 2 +-
.../eche_app_notification_controller.cc | 2 +-
.../file_manager/private_api_misc.cc | 2 +-
+ .../dlp/dlp_clipboard_bubble_constants.h | 2 +-
.../protocol_handler_registry.cc | 4 +-
.../data_reduction_proxy_chrome_settings.cc | 4 +-
chrome/browser/devtools/url_constants.cc | 4 +-
@@ -202,6 +210,7 @@ Subject: Automated domain substitution
chrome/browser/resources/PRESUBMIT.py | 2 +-
.../browser/resources/about_sys/about_sys.js | 2 +-
.../resources/chromeos/about_os_credits.html | 6 +-
+ .../dictation/commands.js | 2 +-
.../magnifier/magnifier.js | 2 +-
.../chromevox/background/command_handler.js | 6 +-
.../chromevox/options/options.css | 2 +-
@@ -213,7 +222,7 @@ Subject: Automated domain substitution
.../select_to_speak/options.html | 2 +-
.../select_to_speak/select_to_speak.js | 8 +-
.../select_to_speak_manifest.json.jinja2 | 8 +-
- .../switch_access/switch_access.js | 2 +-
+ .../switch_access/switch_access.js | 4 +-
.../switch_access_manifest.json.jinja2 | 4 +-
.../add_supervision/add_supervision_ui.js | 16 +-
.../chromeos/arc_support/background.js | 12 +-
@@ -233,6 +242,8 @@ Subject: Automated domain substitution
.../login/screens/login/offline_login.html | 2 +-
.../login/screens/login/offline_login.js | 2 +-
.../browser_tabs_metadata_form.js | 2 +-
+ .../flows/local_web_approvals_after.html | 2 +-
+ .../parent_access/parent_access_ui.js | 8 +-
.../chromeos/wallpaper_manager/manifest.json | 2 +-
.../browser/resources/cryptotoken/enroller.js | 2 +-
.../default_apps/external_extensions.json | 14 +-
@@ -271,7 +282,6 @@ Subject: Automated domain substitution
.../resources/print_preview/ui/icons.html | 2 +-
chrome/browser/resources/proxy_config.html | 10 +-
.../settings/about_page/about_page.html | 4 +-
- .../resources/settings/chromeos/PRESUBMIT.py | 4 +-
.../crostini_disk_resize_dialog.html | 2 +-
.../settings/chromeos/device_page/stylus.js | 2 +-
.../os_a11y_page/manage_a11y_page.html | 2 +-
@@ -309,7 +319,7 @@ Subject: Automated domain substitution
.../supervised_user_block_interstitial.html | 2 +-
.../supervised_user_service.cc | 2 +-
.../supervised_user_url_filter.cc | 12 +-
- .../strings/android_chrome_strings.grd | 42 +-
+ .../strings/android_chrome_strings.grd | 46 +-
.../arc/arc_app_reinstall_app_result.cc | 2 +-
.../search/arc/recommend_apps_fetcher_impl.cc | 2 +-
.../search/files/item_suggest_cache.h | 2 +-
@@ -325,6 +335,7 @@ Subject: Automated domain substitution
chrome/browser/ui/chrome_pages.cc | 2 +-
.../browser/ui/cocoa/share_menu_controller.mm | 2 +-
.../ui/commander/open_url_command_source.cc | 2 +-
+ .../ui/dialogs/outdated_upgrade_bubble.cc | 2 +-
.../installation_error_infobar_delegate.cc | 2 +-
chrome/browser/ui/managed_ui.cc | 2 +-
chrome/browser/ui/signin_view_controller.cc | 2 +-
@@ -333,7 +344,6 @@ Subject: Automated domain substitution
.../ui/views/hats/hats_next_web_dialog.cc | 2 +-
...picker_bubble_view_browsertest_chromeos.cc | 30 +-
.../ui/views/network_profile_bubble_view.cc | 2 +-
- .../ui/views/outdated_upgrade_bubble_view.cc | 2 +-
.../plugin_vm/plugin_vm_installer_view.cc | 2 +-
.../ui/views/session_crashed_bubble_view.cc | 2 +-
...rofile_signin_confirmation_dialog_views.cc | 2 +-
@@ -374,7 +384,7 @@ Subject: Automated domain substitution
.../chrome_cleaner/logging/dummy_api_keys.cc | 4 +-
.../logging/reporter_logging_service.cc | 6 +-
.../apps/platform_apps/api/PRESUBMIT.py | 2 +-
- .../chromeos_system_extension_info.cc | 4 +-
+ .../chromeos_system_extension_info.cc | 2 +-
.../cloud_print/cloud_print_constants.cc | 2 +-
chrome/common/extensions/PRESUBMIT.py | 2 +-
chrome/common/extensions/api/PRESUBMIT.py | 2 +-
@@ -470,17 +480,10 @@ Subject: Automated domain substitution
chromecast/common/extensions_api/windows.json | 2 +-
chromecast/crash/linux/minidump_uploader.cc | 2 +-
chromecast/net/connectivity_checker_impl.h | 4 +-
- .../components/camera_app_ui/camera_app_ui.cc | 2 +-
- .../resources/js/lib/analytics.js | 14 +-
- .../camera_app_ui/resources/js/util.js | 2 +-
- .../resources/strings/camera_strings.grd | 2 +-
.../multidevice/stub_multidevice_util.cc | 2 +-
- ...untrusted_personalization_app_ui_config.cc | 2 +-
chromeos/components/phonehub/url_constants.cc | 2 +-
- .../untrusted_projector_ui_config.cc | 2 +-
.../trial_group/trial_group_checker.cc | 2 +-
chromeos/dbus/rmad/fake_rmad_client.cc | 2 +-
- .../simple_geolocation_provider.cc | 2 +-
chromeos/printing/ppd_provider.h | 2 +-
chromeos/printing/printer_config_cache.cc | 2 +-
.../printing/uri_fuzzer_seed_corpus/uri1.txt | 2 +-
@@ -502,7 +505,6 @@ Subject: Automated domain substitution
chromeos/services/assistant/service.cc | 2 +-
.../device_sync/cryptauth_client_impl.cc | 8 +-
chromeos/services/ime/constants.cc | 2 +-
- chromeos/timezone/timezone_request.cc | 2 +-
.../virtual_driver/win/install/setup.cc | 2 +-
.../virtual_driver_setup_resources.grd | 2 +-
.../win/port_monitor/port_monitor.cc | 2 +-
@@ -522,6 +524,7 @@ Subject: Automated domain substitution
.../autofill_assistant_onboarding_fetcher.cc | 2 +-
.../browser/service/server_url_fetcher.cc | 2 +-
.../safe_browsing_triggered_popup_blocker.h | 4 +-
+ .../core/breadcrumb_manager_tab_helper.cc | 2 +-
components/browser_sync/PRESUBMIT.py | 2 +-
.../strings/android/browser_ui_strings.grd | 6 +-
.../core/counters/history_counter.cc | 2 +-
@@ -584,7 +587,7 @@ Subject: Automated domain substitution
.../resources/omnibox_pedal_concepts_ja.json | 20 +-
.../omnibox_pedal_concepts_zh-CN.json | 20 +-
.../omnibox_pedal_concepts_zh-TW.json | 20 +-
- .../resources/omnibox_pedal_synonyms.grd | 60 +-
+ .../resources/omnibox_pedal_synonyms.grd | 86 +-
.../page_content_annotations_model_manager.cc | 2 +-
.../core/optimization_guide_constants.cc | 4 +-
.../ads_page_load_metrics_observer.cc | 2 +-
@@ -616,7 +619,7 @@ Subject: Automated domain substitution
.../core/browser/browser_policy_connector.cc | 10 +-
components/policy/core/browser/url_util.cc | 4 +-
.../core/common/policy_loader_common.cc | 2 +-
- .../policy/resources/policy_templates.json | 2126 ++++++++---------
+ .../policy/resources/policy_templates.json | 2154 ++++++++---------
.../policy/test_support/policy_testserver.py | 14 +-
.../request_handler_for_policy.cc | 2 +-
.../policy/test_support/signature_provider.h | 4 +-
@@ -686,6 +689,7 @@ Subject: Automated domain substitution
.../browser/db/v4_protocol_manager_util.cc | 4 +-
.../password_protection_service_base.cc | 2 +-
.../browser/realtime/url_lookup_service.cc | 2 +-
+ .../tailored_security_service.cc | 6 +-
.../safe_search_url_checker_client.cc | 2 +-
.../safe_search_api/stub_url_checker.cc | 2 +-
components/safety_check/url_constants.cc | 2 +-
@@ -767,7 +771,7 @@ Subject: Automated domain substitution
google_apis/drive/drive_api_url_generator.cc | 2 +-
google_apis/gaia/gaia_auth_fetcher.cc | 4 +-
google_apis/gaia/gaia_auth_util.cc | 6 +-
- google_apis/gaia/gaia_constants.cc | 76 +-
+ google_apis/gaia/gaia_constants.cc | 80 +-
google_apis/gaia/gaia_oauth_client.cc | 6 +-
google_apis/gaia/gaia_urls.cc | 10 +-
google_apis/gcm/base/mcs_util.cc | 2 +-
@@ -804,7 +808,6 @@ Subject: Automated domain substitution
.../autofill/automation/automation_action.mm | 2 +-
...chrome_browser_state_removal_controller.mm | 2 +-
ios/chrome/browser/chrome_url_constants.cc | 32 +-
- .../breadcrumb_manager_tab_helper.mm | 4 +-
ios/chrome/browser/flags/about_flags.mm | 4 +-
ios/chrome/browser/omaha/omaha_service.mm | 2 +-
.../search_engine_tab_helper.mm | 8 +-
@@ -846,6 +849,7 @@ Subject: Automated domain substitution
jingle/notifier/base/notifier_options_util.cc | 4 +-
media/PRESUBMIT.py | 4 +-
media/base/win/mf_initializer.cc | 2 +-
+ ...stable_video_decoder_types_mojom_traits.cc | 16 +-
mojo/PRESUBMIT.py | 2 +-
native_client_sdk/PRESUBMIT.py | 2 +-
.../src/build_tools/build_paths.py | 2 +-
@@ -1084,10 +1088,11 @@ Subject: Automated domain substitution
.../renderer/bindings/scripts/utilities.py | 2 +-
.../build/scripts/update_css_ranking.py | 4 +-
.../core/css/remote_font_face_source.cc | 2 +-
+ third_party/blink/renderer/core/css/svg.css | 2 +-
.../renderer/core/dom/events/event_target.cc | 4 +-
.../blink/renderer/core/events/touch_event.cc | 2 +-
.../blink/renderer/core/events/wheel_event.cc | 2 +-
- .../blink/renderer/core/frame/deprecation.cc | 50 +-
+ .../blink/renderer/core/frame/deprecation.cc | 18 +-
.../blink/renderer/core/frame/local_frame.cc | 4 +-
.../renderer/core/html/html_iframe_element.cc | 2 +-
.../core/html/media/autoplay_policy.cc | 4 +-
@@ -1145,6 +1150,7 @@ Subject: Automated domain substitution
third_party/crashpad/update.py | 2 +-
third_party/dav1d/generate_source.py | 2 +-
.../protoc_plugins/util/plugin_protos.py | 4 +-
+ .../closure-deps/lib/jsfile_parser.js | 46 +-
.../closure/bin/build/closurebuilder.py | 2 +-
.../closure/bin/build/depstree.py | 2 +-
.../closure/bin/build/depswriter.py | 2 +-
@@ -1154,37 +1160,28 @@ Subject: Automated domain substitution
.../closure/css/inlay/g-fixed.css | 4 +-
.../closure/css/inlay/g-ratio.css | 4 +-
.../closure/goog/css/bubble.css | 18 +-
- .../closure/goog/css/charpicker.css | 4 +-
- .../closure/goog/css/checkbox.css | 6 +-
+ .../closure/goog/css/checkbox.css | 4 +-
.../closure/goog/css/colorpalette.css | 2 +-
.../goog/css/colorpicker-simplegrid.css | 2 +-
.../closure/goog/css/combobox.css | 2 +-
- .../closure/goog/css/css3button.css | 4 +-
.../closure/goog/css/css3menubutton.css | 2 +-
.../closure/goog/css/custombutton.css | 2 +-
.../closure/goog/css/dialog.css | 2 +-
- .../closure/goog/css/dimensionpicker.css | 4 +-
.../closure/goog/css/dragdropdetector.css | 4 +-
.../closure/goog/css/editor/bubble.css | 2 +-
- .../goog/css/editor/equationeditor.css | 6 +-
+ .../goog/css/editor/equationeditor.css | 2 +-
.../closure/goog/css/editortoolbar.css | 2 +-
- .../closure/goog/css/filteredmenu.css | 2 +-
- .../goog/css/filterobservingmenuitem.css | 2 +-
.../closure/goog/css/flatmenubutton.css | 2 +-
- .../closure/goog/css/hovercard.css | 2 +-
.../closure/goog/css/hsvapalette.css | 8 +-
.../closure/goog/css/hsvpalette.css | 8 +-
.../closure/goog/css/imagelessmenubutton.css | 2 +-
- .../closure/goog/css/inputdatepicker.css | 2 +-
.../closure/goog/css/menubutton.css | 4 +-
.../closure/goog/css/menuitem.css | 2 +-
- .../closure/goog/css/multitestrunner.css | 2 +-
- .../closure/goog/css/roundedtab.css | 2 +-
- .../closure/goog/css/tablesorter.css | 2 +-
.../closure/goog/css/toolbar.css | 4 +-
- .../closure/goog/css/tree.css | 10 +-
- .../closure/goog/css/tristatemenuitem.css | 6 +-
+ .../closure/goog/css/tree.css | 4 +-
+ .../closure/goog/css/tristatemenuitem.css | 4 +-
.../goog/demos/autocompleterichremotedata.js | 16 +-
+ .../demos/autocompleterichremotedata.json | 16 +-
.../closure/goog/demos/css/demo.css | 2 +-
.../closure/goog/demos/css/emojipicker.css | 2 +-
.../closure/goog/demos/dialog.html | 4 +-
@@ -1198,6 +1195,7 @@ Subject: Automated domain substitution
.../closure/goog/demos/splitpane.html | 2 +-
.../closure/goog/html/safeurl_test_vectors.js | 8 +-
.../goog/html/sanitizer/html_test_vectors.js | 2 +-
+ .../goog/labs/net/webchannel/environment.js | 2 +-
.../goog/labs/net/webchannel/netutils.js | 2 +-
.../labs/net/webchannel/webchannelbase.js | 4 +-
.../closure/goog/net/browserchannel.js | 4 +-
@@ -1205,7 +1203,8 @@ Subject: Automated domain substitution
.../closure/goog/net/tmpnetwork.js | 2 +-
.../closure/goog/soy/soy_testhelper.js | 4 +-
.../closure/goog/testing/performancetable.css | 4 +-
- .../closure/goog/transpile.js | 158 +-
+ .../closure/goog/testing/testcase.js | 2 +-
+ .../closure/goog/transpile.js | 46 +-
.../closure/goog/ui/editor/linkdialog.js | 2 +-
.../closure/goog/ui/editor/messages.js | 2 +-
.../closure/goog/ui/media/googlevideo.js | 6 +-
@@ -1354,6 +1353,8 @@ Subject: Automated domain substitution
.../tcmalloc/vendor/src/windows/nm-pdb.c | 2 +-
.../tensorflow_text/core/ops/rouge_l_op.cc | 2 +-
.../metrics/text_similarity_metric_ops.py | 2 +-
+ .../updater/chromium_mac_amd64/3pp/fetch.py | 6 +-
+ .../updater/chromium_mac_arm64/3pp/fetch.py | 6 +-
third_party/wpt_tools/wpt/tools/lint/rules.py | 4 +-
.../tools/third_party/pywebsocket3/setup.py | 2 +-
.../wpt/tools/webdriver/webdriver/client.py | 2 +-
@@ -1478,9 +1479,9 @@ Subject: Automated domain substitution
tools/symsrc/source_index.py | 8 +-
tools/tracing/PRESUBMIT.py | 2 +-
tools/tracing/rename_breakpad.py | 2 +-
- .../good_partial_annotation.txt | 2 +-
.../sample_traffic_annotation.cc | 2 +-
.../scripts/auditor/auditor.py | 4 +-
+ .../good_partial_annotation.txt | 2 +-
.../scripts/update_annotations_doc.py | 4 +-
.../scripts/update_annotations_sheet.py | 6 +-
tools/typescript/PRESUBMIT.py | 2 +-
@@ -1515,6 +1516,7 @@ Subject: Automated domain substitution
ui/file_manager/audio_player/manifest.json | 2 +-
.../file_manager/common/js/mock_chrome.js | 6 +-
.../foreground/elements/icons.html | 2 +-
+ .../foreground/js/file_transfer_controller.js | 2 +-
ui/file_manager/file_manager/manifest.json | 10 +-
ui/file_manager/image_loader/piex/Makefile | 2 +-
ui/gl/gl_image_io_surface_egl.mm | 2 +-
@@ -1528,10 +1530,9 @@ Subject: Automated domain substitution
.../quick_unlock/pin_keyboard_icon.html | 2 +-
ui/webui/resources/cr_elements/icons.html | 4 +-
url/third_party/mozilla/LICENSE.txt | 4 +-
- weblayer/browser/default_search_engine.cc | 2 +-
...weblayer_security_blocking_page_factory.cc | 2 +-
weblayer/shell/app/shell_main_params.cc | 2 +-
- 1528 files changed, 4791 insertions(+), 4791 deletions(-)
+ 1529 files changed, 4790 insertions(+), 4790 deletions(-)
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
--- a/PRESUBMIT.py
@@ -1635,8 +1636,8 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
'security-tips-for-ipc')
_LONG_PATH_ERROR = (
-@@ -1191,9 +1191,9 @@ _KNOWN_ROBOTS = set(
- 'lacros-version-skew-roller', 'skylab-test-cros-roller')
+@@ -1192,9 +1192,9 @@ _KNOWN_ROBOTS = set(
+ 'infra-try-recipes-tester')
) | set('%s@skia-public.iam.gserviceaccount.com' % s
for s in ('chromium-autoroll', 'chromium-release-autoroll')
- ) | set('%s@skia-corp.google.com.iam.gserviceaccount.com' % s
@@ -1647,7 +1648,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
for s in ('swarming-tasks',))
_INVALID_GRD_FILE_LINE = [
-@@ -1568,7 +1568,7 @@ def CheckNoDEPSGIT(input_api, output_api):
+@@ -1569,7 +1569,7 @@ def CheckNoDEPSGIT(input_api, output_api):
'Never commit changes to .DEPS.git. This file is maintained by an\n'
'automated system based on what\'s in DEPS and your changes will be\n'
'overwritten.\n'
@@ -1656,7 +1657,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
'get-the-code#Rolling_DEPS\n'
'for more information')]
return []
-@@ -1779,7 +1779,7 @@ def CheckNoPragmaOnce(input_api, output_api):
+@@ -1780,7 +1780,7 @@ def CheckNoPragmaOnce(input_api, output_api):
if files:
return [output_api.PresubmitError(
'Do not use #pragma once in header files.\n'
@@ -1665,7 +1666,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
files)]
return []
-@@ -1994,7 +1994,7 @@ def CheckForVersionControlConflicts(input_api, output_api):
+@@ -1995,7 +1995,7 @@ def CheckForVersionControlConflicts(input_api, output_api):
def CheckGoogleSupportAnswerUrlOnUpload(input_api, output_api):
@@ -1674,7 +1675,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
errors = []
for f in input_api.AffectedFiles():
for line_num, line in f.ChangedContents():
-@@ -2103,7 +2103,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api):
+@@ -2104,7 +2104,7 @@ def CheckNoAbbreviationInPngFileName(input_api, output_api):
results.append(output_api.PresubmitError(
'The name of PNG files should not have abbreviations. \n'
'Use _hover.png, _center.png, instead of _h.png, _c.png.\n'
@@ -1683,7 +1684,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
return results
-@@ -2873,7 +2873,7 @@ def CheckSecurityOwners(input_api, output_api):
+@@ -2874,7 +2874,7 @@ def CheckSecurityOwners(input_api, output_api):
if to_check:
# If there are any OWNERS files to check, there are IPC-related changes in
# this CL. Auto-CC the review list.
@@ -1692,7 +1693,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
# Go through the OWNERS files to check, filtering out rules that are already
# present in that OWNERS file.
-@@ -3174,7 +3174,7 @@ def _CheckAndroidToastUsage(input_api, output_api):
+@@ -3175,7 +3175,7 @@ def _CheckAndroidToastUsage(input_api, output_api):
'android.widget.Toast usage is detected. Android toasts use hardware'
' acceleration, and can be\ncostly on low-end devices. Please use'
' org.chromium.ui.widget.Toast instead.\n'
@@ -1701,7 +1702,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
errors))
return results
-@@ -3308,7 +3308,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api):
+@@ -3309,7 +3309,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api):
if errors:
results.append(output_api.PresubmitError(
'APIs from junit.framework.* are deprecated, please use JUnit4 framework'
@@ -1710,7 +1711,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
' if you have any question.', errors))
return results
-@@ -3339,7 +3339,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api):
+@@ -3340,7 +3340,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api):
results.append(output_api.PresubmitPromptWarning(
'The newly created files include Test classes that inherits from base'
' class. Please do not use inheritance in JUnit4 tests or add new'
@@ -1719,7 +1720,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
' questions.', errors))
return results
-@@ -3363,7 +3363,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api):
+@@ -3364,7 +3364,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api):
'Annotations in android.test.suitebuilder.annotation have been'
' deprecated since API level 24. Please use android.support.test.filters'
' from //third_party/android_support_test_runner:runner_java instead.'
@@ -1728,7 +1729,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
return results
-@@ -3383,7 +3383,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api):
+@@ -3384,7 +3384,7 @@ def _CheckAndroidNewMdpiAssetLocation(input_api, output_api):
'MDPI assets should be placed in /res/drawable-mdpi/ or '
'/res/drawable-ldrtl-mdpi/\ninstead of /res/drawable/ and'
'/res/drawable-ldrtl/.\n'
@@ -1737,7 +1738,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
return results
-@@ -3918,7 +3918,7 @@ def CheckGnGlobForward(input_api, output_api):
+@@ -3919,7 +3919,7 @@ def CheckGnGlobForward(input_api, output_api):
long_text=('The variables "visibilty" and "test_only" should be '
'explicitly listed in forward_variables_from(). For more '
'details, see:\n'
@@ -1746,7 +1747,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
'build/docs/writing_gn_templates.md'
'#Using-forward_variables_from'))]
return []
-@@ -4080,7 +4080,7 @@ def CheckFuzzTargetsOnUpload(input_api, output_api):
+@@ -4081,7 +4081,7 @@ def CheckFuzzTargetsOnUpload(input_api, output_api):
'LLVMFuzzerInitialize should not be used, unless your fuzz target needs '
'to access command line arguments passed to the fuzzer. Instead, prefer '
'static initialization and shared resources as documented in '
@@ -1755,7 +1756,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
'libfuzzer/efficient_fuzzing.md#simplifying-initialization_cleanup.\n' % (
', '.join(EXPORTED_SYMBOLS), REQUIRED_HEADER)
)
-@@ -4115,7 +4115,7 @@ def _CheckNewImagesWarning(input_api, output_api):
+@@ -4116,7 +4116,7 @@ def _CheckNewImagesWarning(input_api, output_api):
errors.append(output_api.PresubmitPromptWarning(
'It looks like you are trying to commit some images. If these are '
'non-test-only images, please make sure to read and apply the tips in '
@@ -1764,7 +1765,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
'binary_size/optimization_advice.md#optimizing-images\nThis check is '
'FYI only and will not block your CL on the CQ.', image_paths))
return errors
-@@ -4209,7 +4209,7 @@ _NON_INCLUSIVE_TERMS = (
+@@ -4210,7 +4210,7 @@ _NON_INCLUSIVE_TERMS = (
'"# nocheck" or ""',
'at the end of the offending line will bypass this PRESUBMIT error',
'but avoid using this whenever possible. Reach out to',
@@ -1773,7 +1774,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
True),)
def ChecksCommon(input_api, output_api):
-@@ -4478,7 +4478,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api):
+@@ -4483,7 +4483,7 @@ def CheckForInvalidIfDefinedMacros(input_api, output_api):
def CheckForIPCRules(input_api, output_api):
"""Check for same IPC rules described in
@@ -1782,7 +1783,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
"""
base_pattern = r'IPC_ENUM_TRAITS\('
inclusion_pattern = input_api.re.compile(r'(%s)' % base_pattern)
-@@ -4731,9 +4731,9 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api):
+@@ -4736,9 +4736,9 @@ def CheckForUseOfChromeAppsDeprecations(input_api, output_api):
return [output_api.PresubmitPromptWarning('You are adding/modifying code'
'related to technologies which will soon be deprecated (Chrome Apps, NaCl,'
' PNaCl, PPAPI). See this blog post for more details:\n'
@@ -1794,7 +1795,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
'\n'.join(problems))]
return []
-@@ -4776,7 +4776,7 @@ def CheckChangeOnCommit(input_api, output_api):
+@@ -4781,7 +4781,7 @@ def CheckChangeOnCommit(input_api, output_api):
results.extend(input_api.canned_checks.CheckTreeIsOpen(
input_api,
output_api,
@@ -1803,7 +1804,7 @@ diff --git a/PRESUBMIT.py b/PRESUBMIT.py
results.extend(
input_api.canned_checks.CheckPatchFormatted(input_api, output_api))
-@@ -5108,7 +5108,7 @@ def CheckStrings(input_api, output_api):
+@@ -5113,7 +5113,7 @@ def CheckStrings(input_api, output_api):
if icu_syntax_errors:
results.append(output_api.PresubmitPromptWarning(
'ICU syntax errors were found in the following strings (problems or '
@@ -1908,7 +1909,7 @@ diff --git a/android_webview/tools/cts_config/webview_cts_gcs_path.json b/androi
diff --git a/android_webview/tools/generate_flag_labels.py b/android_webview/tools/generate_flag_labels.py
--- a/android_webview/tools/generate_flag_labels.py
+++ b/android_webview/tools/generate_flag_labels.py
-@@ -246,7 +246,7 @@ double-check this picked the correct labels for your new features (labels are
+@@ -247,7 +247,7 @@ double-check this picked the correct labels for your new features (labels are
case-sensitive!), add these to enums.xml, run `git-cl format`, and then follow
these steps as a final check:
@@ -2007,7 +2008,29 @@ diff --git a/ash/app_list/PRESUBMIT.py b/ash/app_list/PRESUBMIT.py
diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
--- a/ash/ash_strings.grd
+++ b/ash/ash_strings.grd
-@@ -683,7 +683,7 @@ This file contains the strings for ash.
+@@ -588,7 +588,7 @@ This file contains the strings for ash.
+ other {Update device within # seconds}}
+
+
+- $1google.com requires you to update this $2Chromebook before the deadline.
++ $19oo91e.qjz9zk requires you to update this $2Chromebook before the deadline.
+
+
+
+@@ -598,10 +598,10 @@ This file contains the strings for ash.
+ Update overdue
+
+
+- $1google.com recommends that you update this $2Chromebook.
++ $19oo91e.qjz9zk recommends that you update this $2Chromebook.
+
+
+- $1google.com requires you to update this $2Chromebook immediately.
++ $19oo91e.qjz9zk requires you to update this $2Chromebook immediately.
+
+
+
+@@ -723,7 +723,7 @@ This file contains the strings for ash.
@@ -2016,7 +2039,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
-@@ -1057,7 +1057,7 @@ This file contains the strings for ash.
+@@ -1219,7 +1219,7 @@ This file contains the strings for ash.
Supervised user
@@ -2025,7 +2048,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
Account managed by $1user@example.com
-@@ -1314,7 +1314,7 @@ This file contains the strings for ash.
+@@ -1494,7 +1494,7 @@ This file contains the strings for ash.
Tap to configure
@@ -2034,7 +2057,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
Connected devices settings
-@@ -2859,7 +2859,7 @@ This file contains the strings for ash.
+@@ -3113,7 +3113,7 @@ This file contains the strings for ash.
Multiple sign-in has been disabled
@@ -2043,7 +2066,7 @@ diff --git a/ash/ash_strings.grd b/ash/ash_strings.grd
Sign out
-@@ -3271,7 +3271,7 @@ Here are some things you can try to get started.
+@@ -3537,7 +3537,7 @@ Here are some things you can try to get started.
Unlock device to perform the notification action
@@ -2129,10 +2152,22 @@ diff --git a/ash/components/drivefs/drivefs_auth.cc b/ash/components/drivefs/dri
access_token_fetcher_ =
std::make_unique(
kIdentityConsumerId, identity_manager, scopes,
+diff --git a/ash/components/geolocation/simple_geolocation_provider.cc b/ash/components/geolocation/simple_geolocation_provider.cc
+--- a/ash/components/geolocation/simple_geolocation_provider.cc
++++ b/ash/components/geolocation/simple_geolocation_provider.cc
+@@ -20,7 +20,7 @@ namespace ash {
+ namespace {
+
+ const char kDefaultGeolocationProviderUrl[] =
+- "https://www.googleapis.com/geolocation/v1/geolocate?";
++ "https://www.9oo91eapis.qjz9zk/geolocation/v1/geolocate?";
+
+ } // namespace
+
diff --git a/ash/components/quick_answers/translation_result_loader.cc b/ash/components/quick_answers/translation_result_loader.cc
--- a/ash/components/quick_answers/translation_result_loader.cc
+++ b/ash/components/quick_answers/translation_result_loader.cc
-@@ -35,7 +35,7 @@ using network::mojom::URLLoaderFactory;
+@@ -35,7 +35,7 @@ using base::Value;
// }
constexpr char kTranslationAPIUrl[] =
@@ -2141,10 +2176,22 @@ diff --git a/ash/components/quick_answers/translation_result_loader.cc b/ash/com
constexpr char kAuthorizationHeaderFormat[] = "Bearer ";
constexpr base::StringPiece kQueryKey = "q";
+diff --git a/ash/components/timezone/timezone_request.cc b/ash/components/timezone/timezone_request.cc
+--- a/ash/components/timezone/timezone_request.cc
++++ b/ash/components/timezone/timezone_request.cc
+@@ -31,7 +31,7 @@ namespace ash {
+ namespace {
+
+ const char kDefaultTimezoneProviderUrl[] =
+- "https://maps.googleapis.com/maps/api/timezone/json?";
++ "https://maps.9oo91eapis.qjz9zk/maps/api/timezone/json?";
+
+ const char kKeyString[] = "key";
+ // Language parameter is unsupported for now.
diff --git a/ash/quick_answers/quick_answers_ui_controller.cc b/ash/quick_answers/quick_answers_ui_controller.cc
--- a/ash/quick_answers/quick_answers_ui_controller.cc
+++ b/ash/quick_answers/quick_answers_ui_controller.cc
-@@ -30,7 +30,7 @@ namespace {
+@@ -29,7 +29,7 @@ namespace {
using quick_answers::QuickAnswer;
using quick_answers::QuickAnswersExitPoint;
@@ -2209,6 +2256,85 @@ diff --git a/ash/system/pcie_peripheral/pcie_peripheral_notification_controller.
const int kNotificationsClicksThreshold = 3;
const char kPciePeripheralLimitedPerformanceNotificationId[] =
+diff --git a/ash/webui/camera_app_ui/camera_app_ui.cc b/ash/webui/camera_app_ui/camera_app_ui.cc
+--- a/ash/webui/camera_app_ui/camera_app_ui.cc
++++ b/ash/webui/camera_app_ui/camera_app_ui.cc
+@@ -85,7 +85,7 @@ content::WebUIDataSource* CreateUntrustedCameraAppUIHTMLSource() {
+
+ untrusted_source->OverrideContentSecurityPolicy(
+ network::mojom::CSPDirectiveName::ConnectSrc,
+- std::string("connect-src http://www.google-analytics.com/ 'self';"));
++ std::string("connect-src http://www.9oo91e-analytics.qjz9zk/ 'self';"));
+ untrusted_source->OverrideContentSecurityPolicy(
+ network::mojom::CSPDirectiveName::WorkerSrc,
+ std::string("worker-src 'self';"));
+diff --git a/ash/webui/camera_app_ui/resources/js/lib/analytics.js b/ash/webui/camera_app_ui/resources/js/lib/analytics.js
+--- a/ash/webui/camera_app_ui/resources/js/lib/analytics.js
++++ b/ash/webui/camera_app_ui/resources/js/lib/analytics.js
+@@ -27,14 +27,14 @@
+ K(b).replace(/([.*+?^=!:${}()|\[\]\/\\])/g,"\\$1")+"=([^]*)"))&&2==a.length?a[1]:""},xa=function(){var a=""+M.location.hostname;return 0==a.indexOf("www.")?a.substring(4):a},de=function(a,b){var c=a.indexOf(b);if(5==c||6==c)if(a=a.charAt(c+b.length),"/"==a||"?"==a||""==a||":"==a)return!0;return!1},ya=function(a,b){var c=M.referrer;if(/^(https?|android-app):\/\//i.test(c)){if(a)return c;a="//"+M.location.hostname;if(!de(c,a))return b&&(b=a.replace(/\./g,"-")+".cdn.ampproject.org",de(c,b))?void 0:
+ c}},za=function(a,b){if(1==b.length&&null!=b[0]&&"object"===typeof b[0])return b[0];for(var c={},d=Math.min(a.length+1,b.length),e=0;e=b.length)wc(a,b,c);else if(8192>=b.length)x(a,b,c)||wd(a,b,c)||wc(a,b,c);else throw ge("len",b.length),new Da(b.length);},pe=function(a,b,c,d){d=d||ua;wd(a+"?"+b,"",d,c)},wc=function(a,b,c){var d=ta(a+"?"+b);d.onload=d.onerror=function(){d.onload=null;d.onerror=null;c()}},wd=function(a,b,c,
++ c.indexOf("xn--")){c="";break b}(c=c.match(/(.*)\.cdn\.ampproject\.org\/?$/))&&2==c.length&&(d=c[1].replace(/-/g,".").replace(/\.\./g,"-"))}c=d?d.replace(Ue,""):""}(d=b===c)||(c="."+c,d=b.substring(b.length-c.length,b.length)===c);if(d){b=!0;break a}else J(78)}b=!1}return b&&!1!==a};var bd=function(a){return(a?"https:":Ba||"https:"==M.location.protocol?"https:":"http:")+"//www.9oo91e-analytics.qjz9zk"},Da=function(a){this.name="len";this.message=a+"-8192"},ba=function(a,b,c){c=c||ua;if(2036>=b.length)wc(a,b,c);else if(8192>=b.length)x(a,b,c)||wd(a,b,c)||wc(a,b,c);else throw ge("len",b.length),new Da(b.length);},pe=function(a,b,c,d){d=d||ua;wd(a+"?"+b,"",d,c)},wc=function(a,b,c){var d=ta(a+"?"+b);d.onload=d.onerror=function(){d.onload=null;d.onerror=null;c()}},wd=function(a,b,c,
+ d){var e=O.XMLHttpRequest;if(!e)return!1;var g=new e;if(!("withCredentials"in g))return!1;a=a.replace(/^http:/,"https:");g.open("POST",a,!0);g.withCredentials=!0;g.setRequestHeader("Content-Type","text/plain");g.onreadystatechange=function(){if(4==g.readyState){if(d)try{var ca=g.responseText;if(1>ca.length)ge("xhr","ver","0"),c();else if("1"!=ca.charAt(0))ge("xhr","ver",String(ca.length)),c();else if(3=100*R(a,Ka))throw"abort";}function Ma(a){if(G(P(a,Na)))throw"abort";}function Oa(){var a=M.location.protocol;if("http:"!=a&&"https:"!=a)throw"abort";}
+ function Pa(a){try{O.navigator.sendBeacon?J(42):O.XMLHttpRequest&&"withCredentials"in new O.XMLHttpRequest&&J(40)}catch(c){}a.set(ld,Td(a),!0);a.set(Ac,R(a,Ac)+1);var b=[];ue.map(function(c,d){d.F&&(c=a.get(c),void 0!=c&&c!=d.defaultValue&&("boolean"==typeof c&&(c*=1),b.push(d.F+"="+K(""+c))))});!1===a.get(xe)&&b.push("npa=1");b.push("z="+Bd());a.set(Ra,b.join("&"),!0)}
+ function Sa(a){var b=P(a,fa);!b&&a.get(Vd)&&(b="beacon");var c=P(a,gd),d=P(a,oe),e=c||(d?d+"/3":bd(!1)+"/collect");switch(P(a,ad)){case "d":e=c||(d?d+"/32":bd(!1)+"/j/collect");b=a.get(qe)||void 0;pe(e,P(a,Ra),b,a.Z(Ia));break;case "b":e=c||(d?d+"/31":bd(!1)+"/r/collect");default:b?(c=P(a,Ra),d=(d=a.Z(Ia))||ua,"image"==b?wc(e,c,d):"xhr"==b&&wd(e,c,d)||"beacon"==b&&x(e,c,d)||ba(e,c,d)):ba(e,P(a,Ra),a.Z(Ia))}e=P(a,Na);e=h(e);b=e.hitcount;e.hitcount=b?b+1:1;e=P(a,Na);delete h(e).pending_experiments;
+@@ -61,9 +61,9 @@
+ a[c].split("="),e=d[1];d=d[0];for(var g=b.childNodes||[],ca=!1,l=0;l\x3c/script>')):(e=M.createElement("script"),e.type="text/javascript",e.async=!0,e.src=ca,a&&e.setAttribute("nonce",a),ca=M.getElementsByTagName("script")[0],ca.parentNode.insertBefore(e,ca));$d.set(b,!0)}}}},v=function(a,b){var c=A.get(a)||
+- [];c.push(b);A.set(a,c)},C=function(a,b){Yd.set(a,b);b=A.get(a)||[];for(var c=0;ca.split("/")[0].indexOf(":")&&(a=ca+e[2].substring(0,e[2].lastIndexOf("/"))+"/"+a);c.href=a;
+ d=b(c);return{protocol:(c.protocol||"").toLowerCase(),host:d[0],port:d[1],path:d[2],query:c.search||"",url:a||""}};var Z={ga:function(){Z.f=[]}};Z.ga();Z.D=function(a){var b=Z.J.apply(Z,arguments);b=Z.f.concat(b);for(Z.f=[];0
+
+- Link detected. $1www.google.com
++ Link detected. $1www.9oo91e.qjz9zk
+
+
+ Text detected.
diff --git a/ash/webui/diagnostics_ui/resources/network_card.js b/ash/webui/diagnostics_ui/resources/network_card.js
--- a/ash/webui/diagnostics_ui/resources/network_card.js
+++ b/ash/webui/diagnostics_ui/resources/network_card.js
@@ -2221,7 +2347,7 @@ diff --git a/ash/webui/diagnostics_ui/resources/network_card.js b/ash/webui/diag
const SETTINGS_URL = 'chrome://os-settings/';
/**
-@@ -199,7 +199,7 @@ Polymer({
+@@ -203,7 +203,7 @@ Polymer({
/** @protected */
onTroubleConnectingClicked_() {
// TODO(michaelcheco): Add correct URL.
@@ -2233,7 +2359,7 @@ diff --git a/ash/webui/diagnostics_ui/resources/network_card.js b/ash/webui/diag
diff --git a/ash/webui/diagnostics_ui/resources/routine_section.js b/ash/webui/diagnostics_ui/resources/routine_section.js
--- a/ash/webui/diagnostics_ui/resources/routine_section.js
+++ b/ash/webui/diagnostics_ui/resources/routine_section.js
-@@ -430,7 +430,7 @@ Polymer({
+@@ -431,7 +431,7 @@ Polymer({
/** @protected */
onLearnMoreClicked_() {
const baseSupportUrl =
@@ -2257,7 +2383,7 @@ diff --git a/ash/webui/help_app_ui/help_app_kids_magazine_untrusted_ui.cc b/ash/
diff --git a/ash/webui/media_app_ui/media_app_guest_ui.cc b/ash/webui/media_app_ui/media_app_guest_ui.cc
--- a/ash/webui/media_app_ui/media_app_guest_ui.cc
+++ b/ash/webui/media_app_ui/media_app_guest_ui.cc
-@@ -80,7 +80,7 @@ content::WebUIDataSource* CreateMediaAppUntrustedDataSource(
+@@ -83,7 +83,7 @@ content::WebUIDataSource* CreateMediaAppUntrustedDataSource(
// Allow calls to Maps reverse geocoding API for loading metadata.
source->OverrideContentSecurityPolicy(
network::mojom::CSPDirectiveName::ConnectSrc,
@@ -2266,6 +2392,58 @@ diff --git a/ash/webui/media_app_ui/media_app_guest_ui.cc b/ash/webui/media_app_
// Allow use of SharedArrayBuffer (required by the wasm).
source->OverrideCrossOriginOpenerPolicy("same-origin");
+diff --git a/ash/webui/personalization_app/untrusted_personalization_app_ui_config.cc b/ash/webui/personalization_app/untrusted_personalization_app_ui_config.cc
+--- a/ash/webui/personalization_app/untrusted_personalization_app_ui_config.cc
++++ b/ash/webui/personalization_app/untrusted_personalization_app_ui_config.cc
+@@ -99,7 +99,7 @@ class UntrustedPersonalizationAppUI : public ui::UntrustedWebUIController {
+ // Allow images only from this url.
+ source->OverrideContentSecurityPolicy(
+ network::mojom::CSPDirectiveName::ImgSrc,
+- "img-src 'self' data: https://*.googleusercontent.com;");
++ "img-src 'self' data: https://*.9oo91eusercontent.qjz9zk;");
+
+ source->OverrideContentSecurityPolicy(
+ network::mojom::CSPDirectiveName::ScriptSrc, "script-src 'self';");
+diff --git a/ash/webui/projector_app/projector_xhr_sender.cc b/ash/webui/projector_app/projector_xhr_sender.cc
+--- a/ash/webui/projector_app/projector_xhr_sender.cc
++++ b/ash/webui/projector_app/projector_xhr_sender.cc
+@@ -37,9 +37,9 @@ constexpr char kAuthorizationHeaderPrefix[] = "Bearer ";
+
+ // List of URL prefix supported by `ProjectorXhrSender`.
+ const char* kUrlAllowlist[] = {
+- "https://www.googleapis.com/drive/v3/files/",
+- "https://drive.google.com/get_video_info",
+- "https://translation.googleapis.com/language/translate/v2"};
++ "https://www.9oo91eapis.qjz9zk/drive/v3/files/",
++ "https://drive.9oo91e.qjz9zk/get_video_info",
++ "https://translation.9oo91eapis.qjz9zk/language/translate/v2"};
+
+ // Return true if the url matches the allowed URL prefix.
+ bool IsUrlAllowlisted(const std::string& url) {
+diff --git a/ash/webui/projector_app/untrusted_projector_ui_config.cc b/ash/webui/projector_app/untrusted_projector_ui_config.cc
+--- a/ash/webui/projector_app/untrusted_projector_ui_config.cc
++++ b/ash/webui/projector_app/untrusted_projector_ui_config.cc
+@@ -51,16 +51,16 @@ content::WebUIDataSource* CreateProjectorHTMLSource() {
+ source->OverrideContentSecurityPolicy(
+ network::mojom::CSPDirectiveName::ImgSrc,
+ // Allows loading video file thumbnail.
+- "img-src https://*.googleusercontent.com;");
++ "img-src https://*.9oo91eusercontent.qjz9zk;");
+ source->OverrideContentSecurityPolicy(
+ network::mojom::CSPDirectiveName::MediaSrc,
+ // Allows streaming video.
+- "media-src https://*.drive.google.com;");
++ "media-src https://*.drive.9oo91e.qjz9zk;");
+
+ source->OverrideContentSecurityPolicy(
+ network::mojom::CSPDirectiveName::ConnectSrc,
+- "connect-src 'self' https://www.googleapis.com "
+- "https://drive.google.com;");
++ "connect-src 'self' https://www.9oo91eapis.qjz9zk "
++ "https://drive.9oo91e.qjz9zk;");
+
+ // TODO(b/197120695): re-enable trusted type after fixing the issue that icon
+ // template is setting innerHTML.
diff --git a/ash/webui/scanning/resources/scanning_app.html b/ash/webui/scanning/resources/scanning_app.html
--- a/ash/webui/scanning/resources/scanning_app.html
+++ b/ash/webui/scanning/resources/scanning_app.html
@@ -2300,7 +2478,7 @@ diff --git a/ash/webui/shimless_rma/resources/reimaging_firmware_update_page.js
- window.open('http://www.google.com');
+ window.open('http://www.9oo91e.qjz9zk');
}
- };
+ }
diff --git a/base/PRESUBMIT.py b/base/PRESUBMIT.py
--- a/base/PRESUBMIT.py
@@ -2464,7 +2642,7 @@ diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py
'android/docs/java_optimization.md#Debugging-common-failures')
base_has_imported_lib = False
-@@ -518,7 +518,7 @@ out/Release/apks/YourApk.apk > dex.txt
+@@ -524,7 +524,7 @@ out/Release/apks/YourApk.apk > dex.txt
stderr += """
You may need to update build configs to run FragmentActivityReplacer for
additional targets. See
@@ -2678,7 +2856,7 @@ diff --git a/build/android/pylib/utils/simpleperf.py b/build/android/pylib/utils
diff --git a/build/android/resource_sizes.py b/build/android/resource_sizes.py
--- a/build/android/resource_sizes.py
+++ b/build/android/resource_sizes.py
-@@ -150,7 +150,7 @@ def _ReadZipInfoExtraFieldLength(zip_file, zip_info):
+@@ -149,7 +149,7 @@ def _ReadZipInfoExtraFieldLength(zip_file, zip_info):
def _MeasureApkSignatureBlock(zip_file):
"""Measures the size of the v2 / v3 signing block.
@@ -2690,7 +2868,7 @@ diff --git a/build/android/resource_sizes.py b/build/android/resource_sizes.py
diff --git a/build/android/test_runner.py b/build/android/test_runner.py
--- a/build/android/test_runner.py
+++ b/build/android/test_runner.py
-@@ -1057,7 +1057,7 @@ def RunTestsInPlatformMode(args, result_sink_client=None):
+@@ -1083,7 +1083,7 @@ def RunTestsInPlatformMode(args, result_sink_client=None):
result_html_string, _, _ = test_results_presentation.result_details(
json_path=json_file.name,
test_name=args.command,
@@ -2750,7 +2928,7 @@ diff --git a/build/chromeos/PRESUBMIT.py b/build/chromeos/PRESUBMIT.py
diff --git a/build/chromeos/test_runner.py b/build/chromeos/test_runner.py
--- a/build/chromeos/test_runner.py
+++ b/build/chromeos/test_runner.py
-@@ -949,7 +949,7 @@ def main():
+@@ -948,7 +948,7 @@ def main():
tast_test_parser = subparsers.add_parser(
'tast',
help='Runs a device-side set of Tast tests. For more details, see: '
@@ -2762,7 +2940,7 @@ diff --git a/build/chromeos/test_runner.py b/build/chromeos/test_runner.py
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
-@@ -1713,7 +1713,7 @@ if (enable_java_templates) {
+@@ -1718,7 +1718,7 @@ if (enable_java_templates) {
# * public.txt
# * annotations.zip
# * assets/
@@ -2827,7 +3005,7 @@ diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler
enable_cet_shadow_stack = target_cpu == "x64"
}
-@@ -232,7 +232,7 @@ declare_args() {
+@@ -233,7 +233,7 @@ declare_args() {
# results independent of the checkout and build directory names, which
# in turn is important for goma compile hit rate.
# Setting this to true may make it harder to debug binaries on Linux, see
@@ -2899,7 +3077,7 @@ diff --git a/build/fuchsia/PRESUBMIT.py b/build/fuchsia/PRESUBMIT.py
diff --git a/build/fuchsia/binary_sizes.py b/build/fuchsia/binary_sizes.py
--- a/build/fuchsia/binary_sizes.py
+++ b/build/fuchsia/binary_sizes.py
-@@ -96,7 +96,7 @@ def CreateTestResults(test_status, timestamp):
+@@ -98,7 +98,7 @@ def CreateTestResults(test_status, timestamp):
"""Create test results data to write to JSON test results file.
The JSON data format is defined in
@@ -2983,7 +3161,7 @@ diff --git a/build/toolchain/cros_toolchain.gni b/build/toolchain/cros_toolchain
diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
--- a/build/toolchain/gcc_toolchain.gni
+++ b/build/toolchain/gcc_toolchain.gni
-@@ -673,7 +673,7 @@ template("gcc_toolchain") {
+@@ -674,7 +674,7 @@ template("gcc_toolchain") {
rustc += rust_prefix
rustc += "rustc"
@@ -3230,7 +3408,7 @@ diff --git a/chrome/app/PRESUBMIT.py b/chrome/app/PRESUBMIT.py
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
-@@ -331,7 +331,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
+@@ -417,7 +417,7 @@ If you update this file, be sure also to update google_chrome_strings.grd. -->
To send a number from here to your Android phone, sign in to Chromium on both devices.
@@ -3239,7 +3417,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
Make sure you are signed in to Chromium on your $1Pixel XL and then try sending again.
-@@ -582,7 +582,7 @@ Chromium is unable to recover your settings.
+@@ -663,7 +663,7 @@ Chromium is unable to recover your settings.
@@ -3248,7 +3426,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
-@@ -694,10 +694,10 @@ Chromium is unable to recover your settings.
+@@ -766,10 +766,10 @@ Chromium is unable to recover your settings.
You're signed in to Chromium!
@@ -3261,7 +3439,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
Someone previously signed in to Chromium on this computer as $1user@example.com. Please create a new Chromium user to keep your information separate.
-@@ -747,7 +747,7 @@ Chromium is unable to recover your settings.
+@@ -819,7 +819,7 @@ Chromium is unable to recover your settings.
@@ -3270,7 +3448,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
-@@ -766,10 +766,10 @@ Chromium is unable to recover your settings.
+@@ -838,10 +838,10 @@ Chromium is unable to recover your settings.
$1Elisa is already signed in to this Chromium profile. To keep your browsing separate, Chromium can create your own profile for you.
@@ -3307,7 +3485,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
This file
-@@ -600,7 +600,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -606,7 +606,7 @@ are declared in tools/grit/grit_rule.gni.
Open link as
@@ -3316,7 +3494,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Open link in $1Gmail App
-@@ -769,7 +769,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -775,7 +775,7 @@ are declared in tools/grit/grit_rule.gni.
Search images with $1Google Lens
@@ -3325,7 +3503,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Suggest password...
-@@ -844,7 +844,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -850,7 +850,7 @@ are declared in tools/grit/grit_rule.gni.
Open Link as
@@ -3334,7 +3512,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Open Link in $1Gmail App
-@@ -1025,7 +1025,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -1031,7 +1031,7 @@ are declared in tools/grit/grit_rule.gni.
Search Images with $1Google Lens
@@ -3343,7 +3521,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Suggest Password...
-@@ -1251,7 +1251,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -1257,7 +1257,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -3352,7 +3530,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -1388,7 +1388,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -1394,7 +1394,7 @@ are declared in tools/grit/grit_rule.gni.
Review
@@ -3361,7 +3539,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -2864,10 +2864,10 @@ are declared in tools/grit/grit_rule.gni.
+@@ -2870,10 +2870,10 @@ are declared in tools/grit/grit_rule.gni.
Images were blocked on this page.
@@ -3374,7 +3552,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Continue blocking cookies
-@@ -2876,7 +2876,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -2882,7 +2882,7 @@ are declared in tools/grit/grit_rule.gni.
Continue allowing cookies
@@ -3383,7 +3561,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Continue blocking images
-@@ -2888,28 +2888,28 @@ are declared in tools/grit/grit_rule.gni.
+@@ -2894,28 +2894,28 @@ are declared in tools/grit/grit_rule.gni.
Pop-ups blocked:
@@ -3419,7 +3597,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Always block camera and microphone access
-@@ -2930,19 +2930,19 @@ are declared in tools/grit/grit_rule.gni.
+@@ -2936,19 +2936,19 @@ are declared in tools/grit/grit_rule.gni.
Continue blocking camera access
@@ -3444,7 +3622,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Pop-up blocked
-@@ -2954,7 +2954,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -2960,7 +2960,7 @@ are declared in tools/grit/grit_rule.gni.
JavaScript was blocked on this page.
@@ -3453,7 +3631,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Continue blocking JavaScript
-@@ -2963,7 +2963,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -2969,7 +2969,7 @@ are declared in tools/grit/grit_rule.gni.
Sound was muted on this page
@@ -3462,7 +3640,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Continue muting sound
-@@ -3087,7 +3087,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3093,7 +3093,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -3471,7 +3649,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
&General
-@@ -3612,13 +3612,13 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3602,13 +3602,13 @@ are declared in tools/grit/grit_rule.gni.
@@ -3488,7 +3666,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Share this tab instead
-@@ -3627,7 +3627,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3617,7 +3617,7 @@ are declared in tools/grit/grit_rule.gni.
Stop sharing
@@ -3497,7 +3675,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Switch to capturing tab
-@@ -3833,16 +3833,16 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3823,16 +3823,16 @@ are declared in tools/grit/grit_rule.gni.
Incognito Tab: $1Google
@@ -3518,7 +3696,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Plugin: $1Unknown Plugin
-@@ -3851,7 +3851,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3841,7 +3841,7 @@ are declared in tools/grit/grit_rule.gni.
Plugin Broker: $1Unknown Plugin
@@ -3527,7 +3705,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Spare Renderer
-@@ -3887,22 +3887,22 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3877,22 +3877,22 @@ are declared in tools/grit/grit_rule.gni.
Print: $1Google Maps
@@ -3556,7 +3734,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
App: $1com.android.systemui
-@@ -4117,7 +4117,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -4107,7 +4107,7 @@ are declared in tools/grit/grit_rule.gni.
"$1Gmail Checker"
@@ -3565,7 +3743,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
The extension "$1Gmail Checker" was blocked by your administrator
-@@ -4129,10 +4129,10 @@ are declared in tools/grit/grit_rule.gni.
+@@ -4119,10 +4119,10 @@ are declared in tools/grit/grit_rule.gni.
@@ -3578,7 +3756,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
It can:
-@@ -4271,22 +4271,22 @@ are declared in tools/grit/grit_rule.gni.
+@@ -4261,22 +4261,22 @@ are declared in tools/grit/grit_rule.gni.
Change your home page to: $1home.page.com/home.html
@@ -3607,7 +3785,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Read and change your data on a number of websites
-@@ -4295,10 +4295,10 @@ are declared in tools/grit/grit_rule.gni.
+@@ -4285,10 +4285,10 @@ are declared in tools/grit/grit_rule.gni.
Read your data on a number of websites
@@ -3620,7 +3798,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Read and change anything you type
-@@ -4678,7 +4678,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -4668,7 +4668,7 @@ are declared in tools/grit/grit_rule.gni.
When you click the extension
@@ -3629,7 +3807,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
On all sites
-@@ -4722,7 +4722,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -4712,7 +4712,7 @@ are declared in tools/grit/grit_rule.gni.
When You Click the Extension
@@ -3638,7 +3816,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
On All Sites
-@@ -5015,7 +5015,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5005,7 +5005,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Change back to $1DuckDuckGo?
@@ -3647,7 +3825,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -5261,10 +5261,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5257,10 +5257,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
Update password for $1example.com?
@@ -3660,7 +3838,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Passwords are saved in your Google Account so you can use them on any device
-@@ -5588,7 +5588,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5584,7 +5584,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
@@ -3669,7 +3847,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Pa&ste and search for “$1flowers”
-@@ -5599,7 +5599,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5595,7 +5595,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
@@ -3678,7 +3856,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Pa&ste and Search for “$1flowers”
-@@ -5609,7 +5609,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5605,7 +5605,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
@@ -3687,7 +3865,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Press $1Tab to send commands to $2Google Talk
-@@ -5618,16 +5618,16 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5614,16 +5614,16 @@ Keep your key file in a safe place. You will need it to create new versions of y
Tab
@@ -3707,7 +3885,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Clear input
-@@ -6009,7 +6009,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -6005,7 +6005,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
You’re seeing your recent and suggested documents based on your previous activity using Google Drive.
<br>
<br>
@@ -3716,7 +3894,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
From your Google Photos
-@@ -6033,7 +6033,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -6029,7 +6029,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Your memories from Google Photos are shown here. They are visible only to you, whenever you’re signed in.
<br>
<br>
@@ -3725,7 +3903,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Explore more of your memories in Google Photos
-@@ -6063,10 +6063,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -6059,10 +6059,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
Why am I seeing this?
@@ -3738,7 +3916,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Close
-@@ -6349,7 +6349,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -6345,7 +6345,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Stay in Chrome
@@ -3747,7 +3925,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -6456,7 +6456,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -6452,7 +6452,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
This site has been blocked from seeing text and images copied to the clipboard
@@ -3756,7 +3934,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Continue blocking this site from seeing the clipboard
-@@ -6568,7 +6568,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -6573,7 +6573,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
The page has become unresponsive. You can wait for it to become responsive or close it.
@@ -3765,7 +3943,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Close
-@@ -6605,7 +6605,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -6610,7 +6610,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Automatically sign in to websites using stored credentials. When the feature is disabled, you will be asked for confirmation every time before signing in to a website.
@@ -3774,7 +3952,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -6780,13 +6780,13 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -6785,13 +6785,13 @@ Keep your key file in a safe place. You will need it to create new versions of y
Suggest strong password
@@ -3790,7 +3968,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -6970,7 +6970,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -6975,7 +6975,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Clear browsing data
@@ -3799,7 +3977,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Cleared Chrome data
-@@ -6980,7 +6980,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -6985,7 +6985,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
@@ -3808,7 +3986,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Some passwords were not deleted
-@@ -7204,7 +7204,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -7209,7 +7209,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Uploading ($127%)...
@@ -3817,7 +3995,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -7575,31 +7575,31 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -7592,31 +7592,31 @@ Keep your key file in a safe place. You will need it to create new versions of y
$1html5rocks.com is sharing your screen.
@@ -3854,7 +4032,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Hide
-@@ -7627,7 +7627,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -7644,7 +7644,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
@@ -3863,7 +4041,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -7635,10 +7635,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -7652,10 +7652,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
Sign in to Security Device
@@ -3876,7 +4054,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Please sign in to $1Software Security Device.
-@@ -7978,7 +7978,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -7995,7 +7995,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Sending link to $1Ted's Pixel2
@@ -3885,7 +4063,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -8747,7 +8747,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -8764,7 +8764,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Work
@@ -3894,7 +4072,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -8756,10 +8756,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -8773,10 +8773,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
Can't sign in
@@ -3907,7 +4085,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Close
-@@ -8784,13 +8784,13 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -8801,13 +8801,13 @@ Keep your key file in a safe place. You will need it to create new versions of y
This wasn't me.
@@ -3923,7 +4101,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Cancel
-@@ -8839,7 +8839,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -8856,7 +8856,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Open $1Adobe Acrobat?
@@ -3932,7 +4110,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
A website wants to open this application.
-@@ -8850,8 +8850,8 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -8867,8 +8867,8 @@ Keep your key file in a safe place. You will need it to create new versions of y
Cancel
@@ -3943,16 +4121,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -8876,7 +8876,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
- Date Modified
-
-
-- Oh, no! This server is sending data $1Google Chrome can't understand. Please <a href="http://code.google.com/p/chromium/issues/entry">report a bug</a></a>, and include the <a href="LOCATION">raw listing</a>.
-+ Oh, no! This server is sending data $1Google Chrome can't understand. Please <a href="http://code.9oo91e.qjz9zk/p/chromium/issues/entry">report a bug</a></a>, and include the <a href="LOCATION">raw listing</a>.
-
-
-
-@@ -9458,7 +9458,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -9475,7 +9475,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
Wrong index.
@@ -3961,7 +4130,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -9872,7 +9872,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -9889,7 +9889,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
This site has been blocked from accessing your location.
@@ -3970,7 +4139,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Continue blocking this site from accessing your location
-@@ -9915,7 +9915,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -9932,7 +9932,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
This site has been blocked from having full control of MIDI devices.
@@ -3979,7 +4148,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Continue blocking this site from having full control of MIDI devices
-@@ -10004,7 +10004,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10021,7 +10021,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
View and manage saved passwords in your $1Google Account
@@ -3988,7 +4157,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -10036,10 +10036,10 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10053,10 +10053,10 @@ Please help our engineers fix this problem. Tell us what happened right before y
Undo
@@ -4001,7 +4170,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -10150,19 +10150,19 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10167,19 +10167,19 @@ Please help our engineers fix this problem. Tell us what happened right before y
An extension triggered full screen.
@@ -4024,7 +4193,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
This page has disabled your mouse cursor.
-@@ -10183,10 +10183,10 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10200,10 +10200,10 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -4037,7 +4206,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Open $1search links
-@@ -10223,7 +10223,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10240,7 +10240,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
This site has been blocked from using motion sensors.
@@ -4046,7 +4215,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Continue blocking sensor access
-@@ -10250,7 +10250,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10267,7 +10267,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
Continue allowing sensor access
@@ -4055,7 +4224,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -10442,7 +10442,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10459,7 +10459,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
$1Google Hangouts wants to share the contents of your screen.
@@ -4064,7 +4233,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Share system audio
-@@ -10492,7 +10492,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10509,7 +10509,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -4073,7 +4242,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -10564,8 +10564,8 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10581,8 +10581,8 @@ Please help our engineers fix this problem. Tell us what happened right before y
$1Google Photos - Serial port connected
@@ -4084,7 +4253,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
$1Google Search - Crashed
-@@ -10773,7 +10773,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10790,7 +10790,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -4093,7 +4262,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
$1Nexus 5 detected
-@@ -10879,7 +10879,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10896,7 +10896,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -4102,7 +4271,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
"$1Chrome Extension Name" wants to connect to a serial port
-@@ -10919,7 +10919,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10936,7 +10936,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -4111,7 +4280,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
"$1Chrome Extension Name" wants to connect to a HID device
-@@ -10982,7 +10982,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10999,7 +10999,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -4120,7 +4289,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
No matching font found.
-@@ -11103,7 +11103,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11120,7 +11120,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -4129,7 +4298,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
wants to see the make and model of your Security Key
-@@ -11290,13 +11290,13 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11307,13 +11307,13 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -4145,7 +4314,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Pick an option
-@@ -11390,7 +11390,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11407,7 +11407,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -4154,7 +4323,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Didn't get it?
-@@ -11405,7 +11405,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11422,7 +11422,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
Security key request
@@ -4163,7 +4332,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -11498,7 +11498,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11515,7 +11515,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -4172,7 +4341,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Select an account to sign in
-@@ -11514,7 +11514,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11531,7 +11531,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
Your security key can't be used with this site
@@ -4181,7 +4350,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Your security key does not have enough space for any more accounts.
-@@ -11523,13 +11523,13 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11540,13 +11540,13 @@ Please help our engineers fix this problem. Tell us what happened right before y
Allow this site to see your security key?
@@ -4197,7 +4366,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Allow
-@@ -11809,7 +11809,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -11837,7 +11837,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -4209,7 +4378,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
-@@ -337,7 +337,7 @@ chromium_strings.grd. -->
+@@ -423,7 +423,7 @@ chromium_strings.grd. -->
To send a number from here to your Android phone, sign in to Chrome on both devices.
@@ -4218,7 +4387,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str
Make sure you are signed in to Chrome on your $1Pixel XL and then try sending again.
-@@ -590,7 +590,7 @@ Google Chrome is unable to recover your settings.
+@@ -671,7 +671,7 @@ Google Chrome is unable to recover your settings.
@@ -4227,7 +4396,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str
-@@ -702,10 +702,10 @@ Google Chrome is unable to recover your settings.
+@@ -774,10 +774,10 @@ Google Chrome is unable to recover your settings.
You're signed in to Chrome!
@@ -4240,7 +4409,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str
Someone previously signed in to Chrome on this computer as $1user@example.com. Please create a new Chrome user to keep your information separate.
-@@ -755,7 +755,7 @@ Google Chrome is unable to recover your settings.
+@@ -827,7 +827,7 @@ Google Chrome is unable to recover your settings.
@@ -4249,7 +4418,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str
-@@ -774,10 +774,10 @@ Google Chrome is unable to recover your settings.
+@@ -846,10 +846,10 @@ Google Chrome is unable to recover your settings.
$1Elisa is already signed in to this Chrome profile. To keep your browsing separate, Chrome can create your own profile for you.
@@ -4320,7 +4489,7 @@ diff --git a/chrome/app/theme/PRESUBMIT.py b/chrome/app/theme/PRESUBMIT.py
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
-@@ -3816,7 +3816,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3879,7 +3879,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSyncSandboxDescription, kOsAll,
SINGLE_VALUE_TYPE_AND_VALUE(
switches::kSyncServiceURL,
@@ -4329,7 +4498,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
#if !defined(OS_ANDROID)
{"media-router-cast-allow-all-ips",
flag_descriptions::kMediaRouterCastAllowAllIPsName,
-@@ -4048,7 +4048,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4115,7 +4115,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSetMarketUrlForTestingName,
flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid,
SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting,
@@ -4377,7 +4546,7 @@ diff --git a/chrome/browser/android/vr/PRESUBMIT.py b/chrome/browser/android/vr/
diff --git a/chrome/browser/apps/app_service/webapk/webapk_install_task.cc b/chrome/browser/apps/app_service/webapk/webapk_install_task.cc
--- a/chrome/browser/apps/app_service/webapk/webapk_install_task.cc
+++ b/chrome/browser/apps/app_service/webapk/webapk_install_task.cc
-@@ -61,7 +61,7 @@ const uint64_t kMurmur2HashSeed = 0;
+@@ -62,7 +62,7 @@ const uint64_t kMurmur2HashSeed = 0;
constexpr base::TimeDelta kMinterResponseTimeout = base::Seconds(60);
constexpr char kWebApkServerUrl[] =
@@ -4599,7 +4768,7 @@ diff --git a/chrome/browser/ash/crostini/crostini_util.cc b/chrome/browser/ash/c
diff --git a/chrome/browser/ash/customization/customization_document.cc b/chrome/browser/ash/customization/customization_document.cc
--- a/chrome/browser/ash/customization/customization_document.cc
+++ b/chrome/browser/ash/customization/customization_document.cc
-@@ -175,7 +175,7 @@ std::string ReadFileInBackground(const base::FilePath& file) {
+@@ -200,7 +200,7 @@ std::string ReadFileInBackground(const base::FilePath& file) {
// Template URL where to fetch OEM services customization manifest from.
const char ServicesCustomizationDocument::kManifestUrl[] =
@@ -4929,18 +5098,6 @@ diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc b/chrome/browser/ash
if (base::MatchPattern(spec, kViewUrlPatternWithDomain) ||
base::MatchPattern(spec, kViewUrlPatternWithoutDomain)) {
// e.g. https://drive.google.com/a/example.org/file/d/[ID]/view?usp=sharing
-diff --git a/chrome/browser/ash/policy/dlp/dlp_clipboard_bubble_constants.h b/chrome/browser/ash/policy/dlp/dlp_clipboard_bubble_constants.h
---- a/chrome/browser/ash/policy/dlp/dlp_clipboard_bubble_constants.h
-+++ b/chrome/browser/ash/policy/dlp/dlp_clipboard_bubble_constants.h
-@@ -38,7 +38,7 @@ constexpr int kClipboardDlpWarnDurationMs = 16000;
-
- // Link to the Help Center article about Data Leak Prevention.
- constexpr char kDlpLearnMoreUrl[] =
-- "https://support.google.com/chrome/a/?p=chromeos_datacontrols";
-+ "https://support.9oo91e.qjz9zk/chrome/a/?p=chromeos_datacontrols";
-
- } // namespace policy
-
diff --git a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc
--- a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc
+++ b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc
@@ -4980,7 +5137,7 @@ diff --git a/chrome/browser/ash/policy/handlers/powerwash_requirements_checker.c
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc
--- a/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc
+++ b/chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.cc
-@@ -33,11 +33,11 @@ namespace {
+@@ -32,11 +32,11 @@ namespace {
// OAuth2 Token scopes
constexpr char kCloudDevicesOAuth2Scope[] =
@@ -5065,18 +5222,6 @@ diff --git a/chrome/browser/browser_switcher/browser_switcher_service.cc b/chrom
"/what-is-enterprise-mode"
trigger:
"1 minute after browser startup, and then refreshes every 30 "
-diff --git a/chrome/browser/buildflags.gni b/chrome/browser/buildflags.gni
---- a/chrome/browser/buildflags.gni
-+++ b/chrome/browser/buildflags.gni
-@@ -16,7 +16,7 @@ declare_args() {
- # TODO(crbug.com/1054060)
- enable_chromium_updater = false
-
-- # TODO(stahon@microsoft.com) Remove this when app_session_service is enabled
-+ # TODO(stahon@m1cr050ft.qjz9zk) Remove this when app_session_service is enabled
- # across the board. Until then, this buildflag allows some platforms to use
- # app_session_service and some not.
- enable_app_session_service = !is_android && !is_chromecast
diff --git a/chrome/browser/cart/cart_discount_fetcher.cc b/chrome/browser/cart/cart_discount_fetcher.cc
--- a/chrome/browser/cart/cart_discount_fetcher.cc
+++ b/chrome/browser/cart/cart_discount_fetcher.cc
@@ -5104,18 +5249,9 @@ diff --git a/chrome/browser/cart/cart_discount_link_fetcher.cc b/chrome/browser/
diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_service.cc
--- a/chrome/browser/cart/cart_service.cc
+++ b/chrome/browser/cart/cart_service.cc
-@@ -489,7 +489,7 @@ void CartService::AddCartsWithFakeData() {
- // Polulate and add some carts with fake data.
- double time_now = base::Time::Now().ToDoubleT();
- cart_db::ChromeCartContentProto dummy_proto1;
-- GURL dummy_url1 = GURL("https://shopping.google.com");
-+ GURL dummy_url1 = GURL("https://shopping.9oo91e.qjz9zk");
- dummy_proto1.set_key(std::string(kFakeDataPrefix) + eTLDPlusOne(dummy_url1));
- dummy_proto1.set_merchant("Cart Foo");
- dummy_proto1.set_merchant_cart_url(dummy_url1.spec());
-@@ -498,17 +498,17 @@ void CartService::AddCartsWithFakeData() {
- l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT,
+@@ -497,17 +497,17 @@ void CartService::AddCartsWithFakeData() {
u"15%"));
+ dummy_proto1.mutable_discount_info()->set_has_coupons(true);
dummy_proto1.add_product_image_urls(
- "https://encrypted-tbn3.gstatic.com/"
+ "https://encrypted-tbn3.95tat1c.qjz9zk/"
@@ -5134,7 +5270,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv
"shopping?q=tbn:ANd9GcT2ew6Aydzu5VzRV756ORGha6fyjKp_On7iTlr_"
"tL9vODnlNtFo_xsxj6_lCop-3J0Vk44lHfk-AxoBJDABVHPVFN-"
"EiWLcZvzkdpHFqcurm7fBVmWtYKo2rg&usqp=CAY");
-@@ -526,12 +526,12 @@ void CartService::AddCartsWithFakeData() {
+@@ -538,12 +538,12 @@ void CartService::AddCartsWithFakeData() {
l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_AMOUNT,
u"20%"));
dummy_proto2.add_product_image_urls(
@@ -5149,7 +5285,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv
"shopping?q=tbn:ANd9GcQyMRYWeM2Yq095nOXTL0-"
"EUUnm79kh6hnw8yctJUNrAuse607KEr1CVxEa24r-"
"8XHBuhTwcuC4GXeN94h9Kn19DhdBGsXG0qrD74veYSDJNLrUP-sru0jH&usqp=CAY");
-@@ -549,7 +549,7 @@ void CartService::AddCartsWithFakeData() {
+@@ -561,7 +561,7 @@ void CartService::AddCartsWithFakeData() {
l10n_util::GetStringFUTF8(IDS_NTP_MODULES_CART_DISCOUNT_CHIP_UP_TO_AMOUNT,
u"$50"));
dummy_proto3.add_product_image_urls(
@@ -5158,7 +5294,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv
"shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_"
"ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_"
"DFNeumI-LMPJMYjW-BOSaA&usqp=CAY");
-@@ -564,12 +564,12 @@ void CartService::AddCartsWithFakeData() {
+@@ -576,12 +576,12 @@ void CartService::AddCartsWithFakeData() {
dummy_proto4.set_merchant_cart_url(dummy_url4.spec());
dummy_proto4.set_timestamp(time_now + 3);
dummy_proto4.add_product_image_urls(
@@ -5173,7 +5309,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv
"shopping?q=tbn:ANd9GcT2ew6Aydzu5VzRV756ORGha6fyjKp_On7iTlr_"
"tL9vODnlNtFo_xsxj6_lCop-3J0Vk44lHfk-AxoBJDABVHPVFN-"
"EiWLcZvzkdpHFqcurm7fBVmWtYKo2rg&usqp=CAY");
-@@ -584,7 +584,7 @@ void CartService::AddCartsWithFakeData() {
+@@ -596,7 +596,7 @@ void CartService::AddCartsWithFakeData() {
dummy_proto5.set_merchant_cart_url(dummy_url5.spec());
dummy_proto5.set_timestamp(time_now + 2);
dummy_proto5.add_product_image_urls(
@@ -5182,7 +5318,7 @@ diff --git a/chrome/browser/cart/cart_service.cc b/chrome/browser/cart/cart_serv
"shopping?q=tbn:ANd9GcQpn38jB2_BANnHUFa7kHJsf6SyubcgeU1lNYO_"
"ZxM1Q2ju_ZMjv2EwNh0Zx_zbqYy_mFg_aiIhWYnD5PQ7t-uFzLM5cN77s_2_"
"DFNeumI-LMPJMYjW-BOSaA&usqp=CAY");
-@@ -599,17 +599,17 @@ void CartService::AddCartsWithFakeData() {
+@@ -611,17 +611,17 @@ void CartService::AddCartsWithFakeData() {
dummy_proto6.set_merchant_cart_url(dummy_url6.spec());
dummy_proto6.set_timestamp(time_now + 1);
dummy_proto6.add_product_image_urls(
@@ -5275,6 +5411,18 @@ diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
// Thresholds for mountCrostini() API.
constexpr base::TimeDelta kMountCrostiniSlowOperationThreshold =
+diff --git a/chrome/browser/chromeos/policy/dlp/dlp_clipboard_bubble_constants.h b/chrome/browser/chromeos/policy/dlp/dlp_clipboard_bubble_constants.h
+--- a/chrome/browser/chromeos/policy/dlp/dlp_clipboard_bubble_constants.h
++++ b/chrome/browser/chromeos/policy/dlp/dlp_clipboard_bubble_constants.h
+@@ -38,7 +38,7 @@ constexpr int kClipboardDlpWarnDurationMs = 16000;
+
+ // Link to the Help Center article about Data Leak Prevention.
+ constexpr char kDlpLearnMoreUrl[] =
+- "https://support.google.com/chrome/a/?p=chromeos_datacontrols";
++ "https://support.9oo91e.qjz9zk/chrome/a/?p=chromeos_datacontrols";
+
+ } // namespace policy
+
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc
--- a/chrome/browser/custom_handlers/protocol_handler_registry.cc
+++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc
@@ -5504,7 +5652,7 @@ diff --git a/chrome/browser/extensions/api/identity/identity_launch_web_auth_flo
diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
--- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
+++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
-@@ -81,7 +81,7 @@ namespace {
+@@ -82,7 +82,7 @@ namespace {
#if BUILDFLAG(IS_CHROMEOS_ASH)
const char kPlayIntentPrefix[] =
@@ -5599,7 +5747,7 @@ diff --git a/chrome/browser/federated_learning/floc_remote_permission_service.cc
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
-@@ -205,7 +205,7 @@ const char kU2FPermissionPromptDescription[] =
+@@ -200,7 +200,7 @@ const char kU2FPermissionPromptDescription[] =
"Key API (CryptoToken). The U2F Security "
"Key API has been deprecated and will be removed soon. For more "
"information, refer to the deprecation announcement at "
@@ -5608,7 +5756,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
const char kWebFilterInterstitialRefreshName[] =
-@@ -220,7 +220,7 @@ const char kU2FSecurityKeyAPIDescription[] =
+@@ -215,7 +215,7 @@ const char kU2FSecurityKeyAPIDescription[] =
"Enable the legacy U2F Security Key API (CryptoToken). The U2F Security "
"Key API has been deprecated and will be removed soon. For more "
"information, refer to the deprecation announcement at "
@@ -5617,7 +5765,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
const char kUpcomingSharingFeaturesName[] = "Enable upcoming sharing features.";
const char kUpcomingSharingFeaturesDescription[] =
-@@ -667,7 +667,7 @@ const char kDetectTargetEmbeddingLookalikesName[] =
+@@ -660,7 +660,7 @@ const char kDetectTargetEmbeddingLookalikesName[] =
"Detect target embedding domains as lookalikes.";
const char kDetectTargetEmbeddingLookalikesDescription[] =
"Shows a lookalike interstitial when navigating to target embedding domains"
@@ -5626,7 +5774,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
const char kDisableProcessReuse[] = "Disable subframe process reuse";
const char kDisableProcessReuseDescription[] =
-@@ -2231,7 +2231,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header";
+@@ -2163,7 +2163,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header";
const char kReduceUserAgentDescription[] =
"Reduce (formerly, \"freeze\") the amount of information available in "
"the User-Agent request header. "
@@ -5635,7 +5783,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
const char kRestrictGamepadAccessName[] = "Restrict gamepad access";
const char kRestrictGamepadAccessDescription[] =
-@@ -2248,7 +2248,7 @@ const char kIntensiveWakeUpThrottlingName[] =
+@@ -2180,7 +2180,7 @@ const char kIntensiveWakeUpThrottlingName[] =
const char kIntensiveWakeUpThrottlingDescription[] =
"When enabled, wake ups from DOM Timers are limited to 1 per minute in a "
"page that has been hidden for 5 minutes. For additional details, see "
@@ -5816,7 +5964,7 @@ diff --git a/chrome/browser/media/router/providers/cast/cast_media_route_provide
diff --git a/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc b/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc
--- a/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc
+++ b/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc
-@@ -695,15 +695,15 @@ std::vector DialMediaRouteProvider::GetOrigins(
+@@ -689,15 +689,15 @@ std::vector DialMediaRouteProvider::GetOrigins(
base::flat_map>>
origin_allowlist(
{{"YouTube",
@@ -6104,19 +6252,19 @@ diff --git a/chrome/browser/platform_keys/extension_key_permissions_service.cc b
diff --git a/chrome/browser/platform_keys/extension_platform_keys_service.cc b/chrome/browser/platform_keys/extension_platform_keys_service.cc
--- a/chrome/browser/platform_keys/extension_platform_keys_service.cc
+++ b/chrome/browser/platform_keys/extension_platform_keys_service.cc
-@@ -165,7 +165,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService(
+@@ -162,7 +162,7 @@ crosapi::mojom::KeystoreService* GetKeystoreService(
// implemented for secondary profiles in Lacros.
CHECK(Profile::FromBrowserContext(browser_context)->IsMainProfile())
<< "Attempted to use an incorrect profile. Please file a bug at "
- "https://bugs.chromium.org/ if this happens.";
+ "https://bugs.ch40m1um.qjz9zk/ if this happens.";
- return chromeos::LacrosService::Get()
- ->GetRemote()
- .get();
+
+ chromeos::LacrosService* service = chromeos::LacrosService::Get();
+ if (!service || !service->IsAvailable()) {
diff --git a/chrome/browser/policy/extension_force_install_mixin.cc b/chrome/browser/policy/extension_force_install_mixin.cc
--- a/chrome/browser/policy/extension_force_install_mixin.cc
+++ b/chrome/browser/policy/extension_force_install_mixin.cc
-@@ -71,7 +71,7 @@ constexpr char kUpdateManifestFileNameTemplate[] = "%s.xml";
+@@ -78,7 +78,7 @@ constexpr char kUpdateManifestFileNameTemplate[] = "%s.xml";
// Template for the update manifest contents.
constexpr char kUpdateManifestTemplate[] =
R"(
@@ -6149,7 +6297,7 @@ diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc b/c
}
std::string PrefetchProxyProxyHeaderKey() {
-@@ -156,7 +156,7 @@ GURL PrefetchProxyTLSCanaryCheckURL() {
+@@ -165,7 +165,7 @@ GURL PrefetchProxyTLSCanaryCheckURL() {
if (url.is_valid()) {
return url;
}
@@ -6158,7 +6306,7 @@ diff --git a/chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_params.cc b/c
}
GURL PrefetchProxyDNSCanaryCheckURL() {
-@@ -165,7 +165,7 @@ GURL PrefetchProxyDNSCanaryCheckURL() {
+@@ -174,7 +174,7 @@ GURL PrefetchProxyDNSCanaryCheckURL() {
if (url.is_valid()) {
return url;
}
@@ -6257,6 +6405,18 @@ diff --git a/chrome/browser/resources/chromeos/about_os_credits.html b/chrome/br
The template is used to generate
a device-dependent about_os_credits.html when a CrOS image is built.