* When relying on this method, be familiar with the expected life cycle state
* transitions:
@@ -5381,7 +5186,7 @@ diff --git a/base/android/java/src/org/chromium/base/ApplicationStatus.java b/ba
diff --git a/base/android/java/src/org/chromium/base/LocaleUtils.java b/base/android/java/src/org/chromium/base/LocaleUtils.java
--- a/base/android/java/src/org/chromium/base/LocaleUtils.java
+++ b/base/android/java/src/org/chromium/base/LocaleUtils.java
-@@ -28,7 +28,7 @@ public class LocaleUtils {
+@@ -30,7 +30,7 @@ public class LocaleUtils {
* Java keeps deprecated language codes for Hebrew, Yiddish and Indonesian but Chromium uses
* updated ones. Similarly, Android uses "tl" while Chromium uses "fil" for Tagalog/Filipino.
* So apply a mapping here.
@@ -5390,7 +5195,7 @@ diff --git a/base/android/java/src/org/chromium/base/LocaleUtils.java b/base/and
* @return a updated language code for Chromium with given language string.
*/
public static String getUpdatedLanguageForChromium(String language) {
-@@ -66,7 +66,7 @@ public class LocaleUtils {
+@@ -68,7 +68,7 @@ public class LocaleUtils {
/**
* Android uses "tl" while Chromium uses "fil" for Tagalog/Filipino.
* So apply a mapping here.
@@ -5423,10 +5228,19 @@ diff --git a/base/android/java/src/org/chromium/base/StrictModeContext.java b/ba
*/
public static StrictModeContext allowAllVmPolicies() {
StrictMode.VmPolicy oldPolicy = StrictMode.getVmPolicy();
+@@ -52,7 +52,7 @@ public final class StrictModeContext implements Closeable {
+ /**
+ * Convenience method for disabling all thread-level StrictMode checks with try-with-resources.
+ * Includes everything listed here:
+- * https://developer.android.com/reference/android/os/StrictMode.ThreadPolicy.Builder.html
++ * https://developer.8n6r01d.qjz9zk/reference/android/os/StrictMode.ThreadPolicy.Builder.html
+ */
+ public static StrictModeContext allowAllThreadPolicies() {
+ StrictMode.ThreadPolicy oldPolicy = StrictMode.getThreadPolicy();
diff --git a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
--- a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
+++ b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
-@@ -417,7 +417,7 @@ public class LibraryLoader {
+@@ -472,7 +472,7 @@ public class LibraryLoader {
public static String makeLibraryPathInZipFile(
String library, boolean crazyPrefix, boolean is64Bit) {
// Determine the ABI string that Android uses to find native libraries. Values are described
@@ -5498,7 +5312,7 @@ diff --git a/base/atomicops.h b/base/atomicops.h
diff --git a/base/base_paths_win.cc b/base/base_paths_win.cc
--- a/base/base_paths_win.cc
+++ b/base/base_paths_win.cc
-@@ -77,7 +77,7 @@ bool PathProviderWin(int key, FilePath* result) {
+@@ -76,7 +76,7 @@ bool PathProviderWin(int key, FilePath* result) {
std::string programfiles_w6432;
// 32-bit process running in WOW64 sets ProgramW6432 environment
// variable. See
@@ -5507,7 +5321,7 @@ diff --git a/base/base_paths_win.cc b/base/base_paths_win.cc
if (!env->GetVar("ProgramW6432", &programfiles_w6432))
return false;
// GetVar returns UTF8 - convert back to Wide.
-@@ -168,7 +168,7 @@ bool PathProviderWin(int key, FilePath* result) {
+@@ -167,7 +167,7 @@ bool PathProviderWin(int key, FilePath* result) {
// reliable way to get the quick launch folder across all versions of
// Windows.
// http://stackoverflow.com/questions/76080/how-do-you-reliably-get-the-quick-
@@ -5519,13 +5333,13 @@ diff --git a/base/base_paths_win.cc b/base/base_paths_win.cc
diff --git a/base/command_line.cc b/base/command_line.cc
--- a/base/command_line.cc
+++ b/base/command_line.cc
-@@ -120,7 +120,7 @@ void AppendSwitchesAndArguments(CommandLine* command_line,
- string16 QuoteForCommandLineToArgvW(const string16& arg,
- bool quote_placeholders) {
+@@ -121,7 +121,7 @@ void AppendSwitchesAndArguments(CommandLine* command_line,
+ std::wstring QuoteForCommandLineToArgvW(const std::wstring& arg,
+ bool quote_placeholders) {
// We follow the quoting rules of CommandLineToArgvW.
- // http://msdn.microsoft.com/en-us/library/17w5ykft.aspx
+ // http://msdn.m1cr050ft.qjz9zk/en-us/library/17w5ykft.aspx
- string16 quotable_chars(FILE_PATH_LITERAL(" \\\""));
+ std::wstring quotable_chars(L" \\\"");
// We may also be required to quote '%', which is commonly used in a command
// line as a placeholder. (It may be substituted for a string with spaces.)
diff --git a/base/compiler_specific.h b/base/compiler_specific.h
@@ -5593,7 +5407,7 @@ diff --git a/base/debug/proc_maps_linux.cc b/base/debug/proc_maps_linux.cc
diff --git a/base/debug/stack_trace_fuchsia.cc b/base/debug/stack_trace_fuchsia.cc
--- a/base/debug/stack_trace_fuchsia.cc
+++ b/base/debug/stack_trace_fuchsia.cc
-@@ -246,7 +246,7 @@ void StackTrace::PrintWithPrefix(const char* prefix_string) const {
+@@ -250,7 +250,7 @@ void StackTrace::PrintWithPrefix(const char* prefix_string) const {
}
// Emits stack trace data using the symbolizer markup format specified at:
@@ -5662,7 +5476,7 @@ diff --git a/base/files/file_enumerator_posix.cc b/base/files/file_enumerator_po
diff --git a/base/files/file_util_posix.cc b/base/files/file_util_posix.cc
--- a/base/files/file_util_posix.cc
+++ b/base/files/file_util_posix.cc
-@@ -778,7 +778,7 @@ bool NormalizeFilePath(const FilePath& path, FilePath* normalized_path) {
+@@ -754,7 +754,7 @@ bool NormalizeFilePath(const FilePath& path, FilePath* normalized_path) {
}
// TODO(rkc): Refactor GetFileInfo and FileEnumerator to handle symlinks
@@ -5671,7 +5485,7 @@ diff --git a/base/files/file_util_posix.cc b/base/files/file_util_posix.cc
bool IsLink(const FilePath& file_path) {
stat_wrapper_t st;
// If we can't lstat the file, it's safe to assume that the file won't at
-@@ -921,7 +921,7 @@ bool AllocateFileRegion(File* file, int64_t offset, size_t size) {
+@@ -897,7 +897,7 @@ bool AllocateFileRegion(File* file, int64_t offset, size_t size) {
// MacOS doesn't support fallocate even though their new APFS filesystem
// does support sparse files. It does, however, have the functionality
// available via fcntl.
@@ -5683,15 +5497,15 @@ diff --git a/base/files/file_util_posix.cc b/base/files/file_util_posix.cc
diff --git a/base/files/file_util_win.cc b/base/files/file_util_win.cc
--- a/base/files/file_util_win.cc
+++ b/base/files/file_util_win.cc
-@@ -161,7 +161,7 @@ DWORD DeleteFileRecursive(const FilePath& path,
+@@ -162,7 +162,7 @@ DWORD DeleteFileRecursive(const FilePath& path,
}
// Appends |mode_char| to |mode| before the optional character set encoding; see
-// https://msdn.microsoft.com/library/yeby3zcb.aspx for details.
+// https://msdn.m1cr050ft.qjz9zk/library/yeby3zcb.aspx for details.
- void AppendModeCharacter(char16 mode_char, string16* mode) {
+ void AppendModeCharacter(wchar_t mode_char, std::wstring* mode) {
size_t comma_pos = mode->find(L',');
- mode->insert(comma_pos == string16::npos ? mode->length() : comma_pos, 1,
+ mode->insert(comma_pos == std::wstring::npos ? mode->length() : comma_pos, 1,
@@ -520,7 +520,7 @@ FILE* CreateAndOpenTemporaryFileInDir(const FilePath& dir, FilePath* path) {
}
// Open file in binary mode, to avoid problems with fwrite. On Windows
@@ -5725,13 +5539,13 @@ diff --git a/base/files/file_win.cc b/base/files/file_win.cc
diff --git a/base/hash/hash.cc b/base/hash/hash.cc
--- a/base/hash/hash.cc
+++ b/base/hash/hash.cc
-@@ -72,7 +72,7 @@ uint32_t PersistentHash(const std::string& str) {
+@@ -37,7 +37,7 @@ size_t FastHashImpl(base::span data) {
//
// h32(x32, y32) = (h64(x32, y32) * rand_odd64 + rand16 * 2^16) % 2^64 / 2^32
//
-// Contact danakj@chromium.org for any questions.
+// Contact danakj@ch40m1um.qjz9zk for any questions.
- size_t HashInts32(uint32_t value1, uint32_t value2) {
+ size_t HashInts32Impl(uint32_t value1, uint32_t value2) {
uint64_t value1_64 = value1;
uint64_t hash64 = (value1_64 << 32) | value2;
diff --git a/base/i18n/file_util_icu.cc b/base/i18n/file_util_icu.cc
@@ -5783,7 +5597,7 @@ diff --git a/base/logging.cc b/base/logging.cc
- // https://msdn.microsoft.com/en-us/library/windows/desktop/aa363858(v=vs.85).aspx
+ // https://msdn.m1cr050ft.qjz9zk/en-us/library/windows/desktop/aa364399(v=vs.85).aspx
+ // https://msdn.m1cr050ft.qjz9zk/en-us/library/windows/desktop/aa363858(v=vs.85).aspx
- g_log_file = CreateFile(base::as_wcstr(*g_log_file_name), FILE_APPEND_DATA,
+ g_log_file = CreateFile(g_log_file_name->c_str(), FILE_APPEND_DATA,
FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr,
OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
diff --git a/base/mac/close_nocancel.cc b/base/mac/close_nocancel.cc
@@ -5813,7 +5627,7 @@ diff --git a/base/memory/aligned_memory.cc b/base/memory/aligned_memory.cc
diff --git a/base/memory/discardable_shared_memory.cc b/base/memory/discardable_shared_memory.cc
--- a/base/memory/discardable_shared_memory.cc
+++ b/base/memory/discardable_shared_memory.cc
-@@ -269,7 +269,7 @@ DiscardableSharedMemory::LockResult DiscardableSharedMemory::Lock(
+@@ -287,7 +287,7 @@ DiscardableSharedMemory::LockResult DiscardableSharedMemory::Lock(
// is a no-op on macOS.
//
// For more information, see
@@ -5901,8 +5715,8 @@ diff --git a/base/metrics/histogram_macros.h b/base/metrics/histogram_macros.h
-// https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/metrics/histograms/README.md
+// https://chromium.9oo91esource.qjz9zk/chromium/src.git/+/HEAD/tools/metrics/histograms/README.md
- // TODO(rkaplow): Link to proper documentation on metric creation once we have
- // it in a good state.
+ // All of these macros must be called with |name| as a runtime constant - it
+ // doesn't have to literally be a constant, but it must be the same string on
diff --git a/base/metrics/user_metrics.h b/base/metrics/user_metrics.h
--- a/base/metrics/user_metrics.h
+++ b/base/metrics/user_metrics.h
@@ -5951,7 +5765,7 @@ diff --git a/base/optional.h b/base/optional.h
diff --git a/base/process/launch.h b/base/process/launch.h
--- a/base/process/launch.h
+++ b/base/process/launch.h
-@@ -96,7 +96,7 @@ struct BASE_EXPORT LaunchOptions {
+@@ -95,7 +95,7 @@ struct BASE_EXPORT LaunchOptions {
bool feedback_cursor_off = false;
// Windows can inherit handles when it launches child processes.
@@ -5960,7 +5774,7 @@ diff --git a/base/process/launch.h b/base/process/launch.h
// for a good overview of Windows handle inheritance.
//
// Implementation note: it might be nice to implement in terms of
-@@ -149,7 +149,7 @@ struct BASE_EXPORT LaunchOptions {
+@@ -148,7 +148,7 @@ struct BASE_EXPORT LaunchOptions {
// The handles must be inheritable. Pseudo handles are used when stdout and
// stderr redirect to the console. In that case, GetFileType() will return
// FILE_TYPE_CHAR and they're automatically inherited by child processes. See
@@ -6032,7 +5846,7 @@ diff --git a/base/process/process_metrics.h b/base/process/process_metrics.h
diff --git a/base/profiler/metadata_recorder.h b/base/profiler/metadata_recorder.h
--- a/base/profiler/metadata_recorder.h
+++ b/base/profiler/metadata_recorder.h
-@@ -243,7 +243,7 @@ class BASE_EXPORT MetadataRecorder {
+@@ -247,7 +247,7 @@ class BASE_EXPORT MetadataRecorder {
// otherwise cause mismatches between metadata name hashes and values.
//
// For the rationale behind this design (along with others considered), see
@@ -6080,7 +5894,7 @@ diff --git a/base/system/sys_info.h b/base/system/sys_info.h
diff --git a/base/task/sequence_manager/sequence_manager_impl.cc b/base/task/sequence_manager/sequence_manager_impl.cc
--- a/base/task/sequence_manager/sequence_manager_impl.cc
+++ b/base/task/sequence_manager/sequence_manager_impl.cc
-@@ -1163,7 +1163,7 @@ void SequenceManagerImpl::RecordCrashKeys(const PendingTask& pending_task) {
+@@ -1189,7 +1189,7 @@ void SequenceManagerImpl::RecordCrashKeys(const PendingTask& pending_task) {
// this.
//
// See
@@ -6270,8 +6084,8 @@ diff --git a/base/third_party/symbolize/symbolize.cc b/base/third_party/symboliz
diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thread_win.cc
--- a/base/threading/platform_thread_win.cc
+++ b/base/threading/platform_thread_win.cc
-@@ -34,7 +34,7 @@ namespace {
- constexpr int kWin7BackgroundThreadModePriority = 4;
+@@ -38,7 +38,7 @@ constexpr int kWin7BackgroundThreadModePriority = 4;
+ constexpr int kWin7NormalPriority = 3;
// The information on how to set the thread name comes from
-// a MSDN article: http://msdn2.microsoft.com/en-us/library/xcb2z8hs.aspx
@@ -6279,7 +6093,7 @@ diff --git a/base/threading/platform_thread_win.cc b/base/threading/platform_thr
const DWORD kVCThreadNameException = 0x406D1388;
typedef struct tagTHREADNAME_INFO {
-@@ -144,7 +144,7 @@ bool CreateThreadInternal(size_t stack_size,
+@@ -148,7 +148,7 @@ bool CreateThreadInternal(size_t stack_size,
// will have to work running on CreateThread() threads anyway, since we run
// code on the Windows thread pool, etc. For some background on the
// difference:
@@ -6303,15 +6117,15 @@ diff --git a/base/threading/platform_thread_win.h b/base/threading/platform_thre
diff --git a/base/time/time.h b/base/time/time.h
--- a/base/time/time.h
+++ b/base/time/time.h
-@@ -605,7 +605,7 @@ class BASE_EXPORT Time : public time_internal::TimeBase
@@ -7750,7 +7547,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
diff --git a/chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrShellDelegate.java b/chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrShellDelegate.java
--- a/chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrShellDelegate.java
+++ b/chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrShellDelegate.java
-@@ -147,7 +147,7 @@ public class VrShellDelegate
+@@ -149,7 +149,7 @@ public class VrShellDelegate
// Whether or not the VR Device ON flow succeeded. If this is true it means the user has a VR
// headset on, but we haven't switched into VR mode yet.
@@ -7780,18 +7577,6 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/
private static final String FEED_SERVER_METHOD = "feed_server_method";
/** Default value for feed server method. */
-diff --git a/chrome/android/geo/java/src/org/chromium/chrome/browser/omnibox/geo/CellInfoDelegate.java b/chrome/android/geo/java/src/org/chromium/chrome/browser/omnibox/geo/CellInfoDelegate.java
---- a/chrome/android/geo/java/src/org/chromium/chrome/browser/omnibox/geo/CellInfoDelegate.java
-+++ b/chrome/android/geo/java/src/org/chromium/chrome/browser/omnibox/geo/CellInfoDelegate.java
-@@ -22,7 +22,7 @@ class CellInfoDelegate {
- static void requestCellInfoUpdate(
- TelephonyManager telephonyManager, Callback> callback) {
- // Apps targeting Q+ must call a different API to trigger a refresh of the cached CellInfo.
-- // https://developer.android.com/reference/android/telephony/TelephonyManager.html#getAllCellInfo()
-+ // https://developer.8n6r01d.qjz9zk/reference/android/telephony/TelephonyManager.html#getAllCellInfo()
- if (BuildInfo.isAtLeastQ()) {
- requestCellInfoUpdateAtLeastQ(telephonyManager, callback);
- return;
diff --git a/chrome/android/java/res/layout/content_suggestions_card_modern_reversed.xml b/chrome/android/java/res/layout/content_suggestions_card_modern_reversed.xml
--- a/chrome/android/java/res/layout/content_suggestions_card_modern_reversed.xml
+++ b/chrome/android/java/res/layout/content_suggestions_card_modern_reversed.xml
@@ -7840,7 +7625,7 @@ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res
states that the adaptive icon should be 108dp. It also states that the safe zone should
be a circle with diameter being ~61% (66dp/108dp) of width.
The Web Spec (https://www.w3.org/TR/appmanifest/#icon-masks), however, states that the
-@@ -588,7 +588,7 @@
+@@ -596,7 +596,7 @@
16dp
-@@ -1370,7 +1370,7 @@ Your Google account may have other forms of browsing history like searches and a
- In Lite mode, Chrome loads pages faster and uses up to 60 percent less data. To optimize the pages that you visit, Chrome sends your web traffic to Google. <link>Learn more</link>
-
-
-- https://support.google.com/chrome/?p=lite_mode
-+ https://support.9oo91e.qjz9zk/chrome/?p=lite_mode
-
-
- Turn on Lite mode
-@@ -1502,7 +1502,7 @@ Your Google account may have other forms of browsing history like searches and a
- Signed in to Google as
-
-
-- Syncing to %1$sjohndoe@gmail.com
-+ Syncing to %1$sjohndoe@9ma1l.qjz9zk
-
-
- Sign out of Chrome
-@@ -1516,10 +1516,10 @@ Your Google account may have other forms of browsing history like searches and a
- Waiting for details of parents.
-
-
-- This account is managed by %1$sparent1@gmail.com.
-+ This account is managed by %1$sparent1@9ma1l.qjz9zk.
-
-
-- This account is managed by %1$sparent1@gmail.com and %2$sparent2@gmail.com.
-+ This account is managed by %1$sparent1@9ma1l.qjz9zk and %2$sparent2@9ma1l.qjz9zk.
-
-
- Content
-@@ -1575,13 +1575,13 @@ Your Google account may have other forms of browsing history like searches and a
- Chrome Privacy Notice
-
-
-- https://www.google.com/intl/$LOCALE/chrome/browser/privacy/
-+ https://www.9oo91e.qjz9zk/intl/$LOCALE/chrome/browser/privacy/
-
-
-- https://www.google.com/intl/$LOCALE/chrome/browser/privacy/eula_text.html
-+ https://www.9oo91e.qjz9zk/intl/$LOCALE/chrome/browser/privacy/eula_text.html
-
-
-- https://families.google.com/intl/$LOCALE/familylink/privacy/child-policy/
-+ https://families.9oo91e.qjz9zk/intl/$LOCALE/familylink/privacy/child-policy/
-
-
-
-@@ -1614,7 +1614,7 @@ Your Google account may have other forms of browsing history like searches and a
- Also clear your Chrome data from this device
-
-
-- Because you're signing out of an account managed by %1$sgoogle.com, your Chrome data will be deleted from this device. It will remain in your Google Account.
-+ Because you're signing out of an account managed by %1$s9oo91e.qjz9zk, your Chrome data will be deleted from this device. It will remain in your Google Account.
-
-
- Contacting Google. This may take a minute…
-@@ -1756,7 +1756,7 @@ To change this setting, <resetlink>reset sync
-
-- %1$shttps://www.google.com wants to pair
-+ %1$shttps://www.9oo91e.qjz9zk wants to pair
-
- <link>Get help</link> while scanning for devices…
-
-@@ -1801,7 +1801,7 @@ To change this setting, <resetlink>reset sync
-
-- %1$swww.google.com wants to scan for nearby Bluetooth devices. The following devices have been found:
-+ %1$swww.9oo91e.qjz9zk wants to scan for nearby Bluetooth devices. The following devices have been found:
-
-
- Unknown or unsupported device (%1$sA1:B2:C3:D4:E5:F6)
-@@ -1990,7 +1990,7 @@ To change this setting, <resetlink>reset sync
- Translate
-
--
-+
- Never translate this site
-
-
-@@ -2260,7 +2260,7 @@ To change this setting, <resetlink>reset sync
-
-- This content is from %1$sgoogle.com, delivered by Google.
-+ This content is from %1$s9oo91e.qjz9zk, delivered by Google.
-
-
- Open Online
-@@ -2269,7 +2269,7 @@ To change this setting, <resetlink>reset sync
-
-- <link>Load original page</link> from %1$sgoogle.com
-+ <link>Load original page</link> from %1$s9oo91e.qjz9zk
-
-
-
-@@ -3247,7 +3247,7 @@ To change this setting, <resetlink>reset sync
-
-- Touch to return to %1$shttps://apprtc.appspot.com
-+ Touch to return to %1$shttps://apprtc.8pp2p8t.qjz9zk
-
-
- Tap to go to site
-@@ -3259,7 +3259,7 @@ To change this setting, <resetlink>reset sync
-
-- %1$shttps://apprtc.appspot.com is sharing your screen
-+ %1$shttps://apprtc.8pp2p8t.qjz9zk is sharing your screen
-
-
- A site is sharing your screen
-@@ -3459,7 +3459,7 @@ To change this setting, <resetlink>reset sync
-
-- %1$shttps://www.google.com wants to connect
-+ %1$shttps://www.9oo91e.qjz9zk wants to connect
-
-
- No compatible devices found
-@@ -3502,7 +3502,7 @@ To change this setting, <resetlink>reset sync
-
-- The contacts you select will be shared with <b>%1$shttps://www.google.com</b>.
-+ The contacts you select will be shared with <b>%1$shttps://www.9oo91e.qjz9zk</b>.
-
-
-
-@@ -3791,7 +3791,7 @@ The site does NOT gain access to the camera. The camera images are only visible
- Sending to %1$sTanya's Pixel 2...
-
-
-- %1$swww.google.com - Sent from %2$sTanya's Pixel 2XL
-+ %1$swww.9oo91e.qjz9zk - Sent from %2$sTanya's Pixel 2XL
-
-
- Tab received
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/ShortcutHelperTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/ShortcutHelperTest.java
--- a/chrome/android/junit/src/org/chromium/chrome/browser/ShortcutHelperTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/ShortcutHelperTest.java
@@ -9232,7 +8748,7 @@ diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/explore_sites/
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java
--- a/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencerTest.java
-@@ -38,7 +38,7 @@ import java.util.List;
+@@ -42,7 +42,7 @@ import java.util.Map;
public class FirstRunFlowSequencerTest {
/** Information for Google OS account */
private static final String GOOGLE_ACCOUNT_TYPE = "com.google";
@@ -9385,7 +8901,7 @@ diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/omnibox/UrlBar
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderUnitTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderUnitTest.java
--- a/chrome/android/junit/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderUnitTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderUnitTest.java
-@@ -50,7 +50,7 @@ import java.util.HashSet;
+@@ -49,7 +49,7 @@ import java.util.HashSet;
@RunWith(BaseRobolectricTestRunner.class)
@Config(manifest = Config.NONE)
public class GeolocationHeaderUnitTest {
@@ -9409,7 +8925,7 @@ diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/search_engines
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/signin/SigninManagerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/signin/SigninManagerTest.java
--- a/chrome/android/junit/src/org/chromium/chrome/browser/signin/SigninManagerTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/signin/SigninManagerTest.java
-@@ -209,9 +209,9 @@ public class SigninManagerTest {
+@@ -212,9 +212,9 @@ public class SigninManagerTest {
@Test
public void callbackNotifiedOnSignin() {
@@ -9418,6 +8934,19 @@ diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/signin/SigninM
- "test_at_gmail.com");
+ CoreAccountInfo account = new CoreAccountInfo(new CoreAccountId("test_at_9ma1l.qjz9zk"),
+ new Account("test@9ma1l.qjz9zk", AccountManagerFacade.GOOGLE_ACCOUNT_TYPE),
++ "test_at_9ma1l.qjz9zk");
+
+ // No need to seed accounts to the native code.
+ doReturn(true).when(mAccountTrackerService).checkAndSeedSystemAccounts();
+@@ -245,9 +245,9 @@ public class SigninManagerTest {
+
+ @Test(expected = AssertionError.class)
+ public void failIfAlreadySignedin() {
+- CoreAccountInfo account = new CoreAccountInfo(new CoreAccountId("test_at_gmail.com"),
+- new Account("test@gmail.com", AccountManagerFacade.GOOGLE_ACCOUNT_TYPE),
+- "test_at_gmail.com");
++ CoreAccountInfo account = new CoreAccountInfo(new CoreAccountId("test_at_9ma1l.qjz9zk"),
++ new Account("test@9ma1l.qjz9zk", AccountManagerFacade.GOOGLE_ACCOUNT_TYPE),
+ "test_at_9ma1l.qjz9zk");
// No need to seed accounts to the native code.
@@ -9579,7 +9108,7 @@ diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebApk
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappDataStorageTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappDataStorageTest.java
--- a/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappDataStorageTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappDataStorageTest.java
-@@ -137,7 +137,7 @@ public class WebappDataStorageTest {
+@@ -123,7 +123,7 @@ public class WebappDataStorageTest {
@Test
@Feature({"Webapp"})
public void testScopeRetrieval() {
@@ -9588,7 +9117,7 @@ diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/webapps/Webapp
mSharedPreferences.edit().putString(WebappDataStorage.KEY_SCOPE, scope).apply();
assertEquals(scope, new WebappDataStorage("test").getScope());
}
-@@ -145,7 +145,7 @@ public class WebappDataStorageTest {
+@@ -131,7 +131,7 @@ public class WebappDataStorageTest {
@Test
@Feature({"Webapp"})
public void testUrlRetrieval() {
@@ -10081,7 +9610,7 @@ diff --git a/chrome/app/PRESUBMIT.py b/chrome/app/PRESUBMIT.py
diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h
--- a/chrome/app/chrome_command_ids.h
+++ b/chrome/app/chrome_command_ids.h
-@@ -394,7 +394,7 @@
+@@ -395,7 +395,7 @@
#define IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE_ONCE 52412
// NOTE: The last valid command value is 57343 (0xDFFF)
@@ -10093,7 +9622,7 @@ diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h
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
-@@ -468,7 +468,7 @@ Chromium is unable to recover your settings.
+@@ -489,7 +489,7 @@ Chromium is unable to recover your settings.
@@ -10102,7 +9631,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
-@@ -578,10 +578,10 @@ Chromium is unable to recover your settings.
+@@ -599,10 +599,10 @@ Chromium is unable to recover your settings.
You're signed in to Chromium!
@@ -10115,7 +9644,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.
-@@ -614,7 +614,7 @@ Chromium is unable to recover your settings.
+@@ -635,7 +635,7 @@ Chromium is unable to recover your settings.
@@ -10127,7 +9656,7 @@ diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
-@@ -273,7 +273,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -304,7 +304,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -10136,7 +9665,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Allow
-@@ -459,7 +459,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -490,7 +490,7 @@ are declared in tools/grit/grit_rule.gni.
Open link as
@@ -10145,7 +9674,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Open link in $1Gmail App
-@@ -602,7 +602,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -633,7 +633,7 @@ are declared in tools/grit/grit_rule.gni.
&Search $1Google for image
@@ -10154,7 +9683,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Suggest password...
-@@ -677,7 +677,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -708,7 +708,7 @@ are declared in tools/grit/grit_rule.gni.
Open Link as
@@ -10163,7 +9692,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Open Link in $1Gmail App
-@@ -832,7 +832,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -863,7 +863,7 @@ are declared in tools/grit/grit_rule.gni.
&Search $1Google for Image
@@ -10172,7 +9701,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Suggest Password...
-@@ -1030,7 +1030,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -1061,7 +1061,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -10181,7 +9710,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -2319,7 +2319,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -1168,7 +1168,7 @@ are declared in tools/grit/grit_rule.gni.
+ Review
+
+
+- https://www.google.com/chrome/privacy/eula_text.html
++ https://www.9oo91e.qjz9zk/chrome/privacy/eula_text.html
+
+
+
+@@ -2405,7 +2405,7 @@ are declared in tools/grit/grit_rule.gni.
Share
@@ -10190,7 +9728,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -2382,10 +2382,10 @@ are declared in tools/grit/grit_rule.gni.
+@@ -2468,10 +2468,10 @@ are declared in tools/grit/grit_rule.gni.
Images were blocked on this page.
@@ -10203,7 +9741,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Continue blocking cookies
-@@ -2394,7 +2394,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -2480,7 +2480,7 @@ are declared in tools/grit/grit_rule.gni.
Continue allowing cookies
@@ -10212,7 +9750,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Continue blocking images
-@@ -2406,7 +2406,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -2492,7 +2492,7 @@ are declared in tools/grit/grit_rule.gni.
Pop-ups blocked:
@@ -10221,7 +9759,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Continue blocking
-@@ -2415,22 +2415,22 @@ are declared in tools/grit/grit_rule.gni.
+@@ -2501,22 +2501,22 @@ are declared in tools/grit/grit_rule.gni.
Manage pop-up blocking...
@@ -10250,7 +9788,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Always block camera and microphone access
-@@ -2451,13 +2451,13 @@ are declared in tools/grit/grit_rule.gni.
+@@ -2537,13 +2537,13 @@ are declared in tools/grit/grit_rule.gni.
Continue blocking camera access
@@ -10267,7 +9805,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Pop-up blocked
-@@ -2472,7 +2472,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -2558,7 +2558,7 @@ are declared in tools/grit/grit_rule.gni.
JavaScript was blocked on this page.
@@ -10276,7 +9814,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Continue blocking JavaScript
-@@ -2490,7 +2490,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -2576,7 +2576,7 @@ are declared in tools/grit/grit_rule.gni.
Sound was muted on this page
@@ -10285,7 +9823,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Continue muting sound
-@@ -2617,7 +2617,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -2715,7 +2715,7 @@ are declared in tools/grit/grit_rule.gni.
@@ -10294,7 +9832,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
&General
-@@ -3147,13 +3147,13 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3245,13 +3245,13 @@ are declared in tools/grit/grit_rule.gni.
@@ -10311,7 +9849,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Share this tab instead
-@@ -3358,10 +3358,10 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3456,10 +3456,10 @@ are declared in tools/grit/grit_rule.gni.
Incognito Tab: $1Google
@@ -10324,7 +9862,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Plugin: $1Unknown Plugin
-@@ -3370,10 +3370,10 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3468,10 +3468,10 @@ are declared in tools/grit/grit_rule.gni.
Plugin Broker: $1Unknown Plugin
@@ -10337,7 +9875,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Service Worker: $1https://googlechrome.github.io/samples/service-worker/basic/service-worker.js
-@@ -3397,10 +3397,10 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3495,10 +3495,10 @@ are declared in tools/grit/grit_rule.gni.
Print: $1Google Maps
@@ -10350,7 +9888,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
App: $1com.android.systemui
-@@ -3579,13 +3579,13 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3680,13 +3680,13 @@ are declared in tools/grit/grit_rule.gni.
The extension "$1Gmail Checker" has been added.
@@ -10366,7 +9904,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
The app "$1Gmail" was automatically removed.
-@@ -3597,10 +3597,10 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3698,10 +3698,10 @@ are declared in tools/grit/grit_rule.gni.
@@ -10379,7 +9917,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
It can:
-@@ -3733,22 +3733,22 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3834,22 +3834,22 @@ are declared in tools/grit/grit_rule.gni.
Change your home page to: $1home.page.com/home.html
@@ -10408,7 +9946,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Read and change your data on a number of websites
-@@ -3757,10 +3757,10 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3858,10 +3858,10 @@ are declared in tools/grit/grit_rule.gni.
Read your data on a number of websites
@@ -10421,7 +9959,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Read and change anything you type
-@@ -4118,7 +4118,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -4216,7 +4216,7 @@ are declared in tools/grit/grit_rule.gni.
When you click the extension
@@ -10430,7 +9968,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
On all sites
-@@ -4168,7 +4168,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -4266,7 +4266,7 @@ are declared in tools/grit/grit_rule.gni.
When You Click the Extension
@@ -10439,7 +9977,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
On All Sites
-@@ -4982,7 +4982,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5068,7 +5068,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
@@ -10448,7 +9986,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Pa&ste and search for “$1flowers”
-@@ -4990,7 +4990,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5076,7 +5076,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
@@ -10457,7 +9995,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Pa&ste and Search for “$1flowers”
-@@ -5000,7 +5000,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5086,7 +5086,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
S&how URL
@@ -10466,7 +10004,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Press $1Tab to send commands to $2Google Talk
-@@ -5009,16 +5009,16 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5095,16 +5095,16 @@ Keep your key file in a safe place. You will need it to create new versions of y
Tab
@@ -10486,7 +10024,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Click to view today’s doodle
-@@ -5400,7 +5400,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
+@@ -5500,7 +5500,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Stay in Chrome
@@ -10495,7 +10033,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -5470,7 +5470,7 @@ the Bookmarks menu.">
+@@ -5570,7 +5570,7 @@ the Bookmarks menu.">
@@ -10504,7 +10042,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Accessibility Events
-@@ -5483,7 +5483,7 @@ the Bookmarks menu.">
+@@ -5583,7 +5583,7 @@ the Bookmarks menu.">
@@ -10513,7 +10051,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Clipboard
-@@ -5508,7 +5508,7 @@ the Bookmarks menu.">
+@@ -5608,7 +5608,7 @@ the Bookmarks menu.">
This site has been blocked from seeing text and images copied to the clipboard
@@ -10522,7 +10060,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Continue blocking this site from seeing the clipboard
-@@ -5577,7 +5577,7 @@ the Bookmarks menu.">
+@@ -5680,7 +5680,7 @@ the Bookmarks menu.">
The page has become unresponsive. You can wait for it to become responsive or close it.
@@ -10531,7 +10069,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Close
-@@ -5614,7 +5614,7 @@ the Bookmarks menu.">
+@@ -5717,7 +5717,7 @@ the Bookmarks menu.">
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.
@@ -10540,7 +10078,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Hide
-@@ -5882,7 +5882,7 @@ the Bookmarks menu.">
+@@ -5988,7 +5988,7 @@ the Bookmarks menu.">
Run Flash
@@ -10549,7 +10087,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Cleared Chrome data
-@@ -6126,7 +6126,7 @@ the Bookmarks menu.">
+@@ -6232,7 +6232,7 @@ the Bookmarks menu.">
Uploading ($127%)...
@@ -10558,7 +10096,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -6263,31 +6263,31 @@ the Bookmarks menu.">
+@@ -6399,31 +6399,31 @@ the Bookmarks menu.">
$1html5rocks.com is sharing your screen.
@@ -10595,7 +10133,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Change source
-@@ -6312,7 +6312,7 @@ the Bookmarks menu.">
+@@ -6448,7 +6448,7 @@ the Bookmarks menu.">
@@ -10604,7 +10142,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -6320,10 +6320,10 @@ the Bookmarks menu.">
+@@ -6456,10 +6456,10 @@ the Bookmarks menu.">
Sign in to Security Device
@@ -10617,7 +10155,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Please sign in to $1Software Security Device.
-@@ -7308,10 +7308,10 @@ the Bookmarks menu.">
+@@ -7456,10 +7456,10 @@ the Bookmarks menu.">
Can't sign in
@@ -10630,7 +10168,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Close
-@@ -7336,13 +7336,13 @@ the Bookmarks menu.">
+@@ -7484,13 +7484,13 @@ the Bookmarks menu.">
This wasn't me.
@@ -10646,7 +10184,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Cancel
-@@ -7386,7 +7386,7 @@ the Bookmarks menu.">
+@@ -7534,7 +7534,7 @@ the Bookmarks menu.">
Open $1Adobe Acrobat?
@@ -10655,7 +10193,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
A website wants to open this application.
-@@ -7424,7 +7424,7 @@ the Bookmarks menu.">
+@@ -7572,7 +7572,7 @@ the Bookmarks menu.">
Date Modified
@@ -10664,7 +10202,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -7565,7 +7565,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -7713,7 +7713,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -10673,7 +10211,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
On - sync everything
-@@ -7923,7 +7923,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -8080,7 +8080,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -10682,7 +10220,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -8002,7 +8002,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -8159,7 +8159,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
Wrong index.
@@ -10691,7 +10229,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -8396,12 +8396,12 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -8553,12 +8553,12 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -10706,7 +10244,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Location
-@@ -8434,7 +8434,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -8591,7 +8591,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -10715,7 +10253,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -8553,10 +8553,10 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -8710,10 +8710,10 @@ Please help our engineers fix this problem. Tell us what happened right before y
Know your unique device identifier
@@ -10728,7 +10266,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Protected Media Identifier
-@@ -8566,7 +8566,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -8723,7 +8723,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
View and manage saved passwords in your $1Google Account
@@ -10737,7 +10275,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -8595,10 +8595,10 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -8752,10 +8752,10 @@ Please help our engineers fix this problem. Tell us what happened right before y
Undo
@@ -10750,7 +10288,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -8709,19 +8709,19 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -8866,19 +8866,19 @@ Please help our engineers fix this problem. Tell us what happened right before y
An extension triggered full screen.
@@ -10773,7 +10311,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
This page has disabled your mouse cursor.
-@@ -8745,10 +8745,10 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -8902,10 +8902,10 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -10786,7 +10324,16 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Open $1search links
-@@ -8811,7 +8811,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -8957,7 +8957,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+
+
+
+- $1google.com wants to send and receive info when you tap your phone on an NFC device
++ $19oo91e.qjz9zk wants to send and receive info when you tap your phone on an NFC device
+
+
+ NFC
+@@ -8978,7 +8978,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
This site has been blocked from using motion sensors.
@@ -10795,7 +10342,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Continue blocking sensor access
-@@ -8838,7 +8838,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -9005,7 +9005,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
Continue allowing sensor access
@@ -10804,7 +10351,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -9075,7 +9075,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -9200,7 +9200,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. Choose what you'd like to share.
@@ -10813,7 +10360,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Share audio
-@@ -9206,7 +9206,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -9331,7 +9331,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -10822,7 +10369,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
-@@ -9266,8 +9266,8 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -9397,8 +9397,8 @@ Please help our engineers fix this problem. Tell us what happened right before y
$1Google Photos - Serial port connected
@@ -10833,7 +10380,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
$1Google Search - Crashed
-@@ -9422,7 +9422,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -9553,7 +9553,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -10842,7 +10389,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
$1Nexus 5 detected
-@@ -9460,7 +9460,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -9591,7 +9591,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -10851,7 +10398,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
"$1Chrome Extension Name" wants to pair
-@@ -9506,7 +9506,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -9637,7 +9637,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -10860,7 +10407,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
"$1Chrome Extension Name" wants to connect
-@@ -9537,7 +9537,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -9668,7 +9668,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
No nearby devices found.
@@ -10869,7 +10416,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Allow
-@@ -9569,7 +9569,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -9700,7 +9700,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -10878,7 +10425,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
"$1Chrome Extension Name" wants to connect to a serial port
-@@ -9588,7 +9588,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -9719,7 +9719,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -10887,7 +10434,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
"$1Chrome Extension Name" wants to connect to a HID device
-@@ -9735,7 +9735,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -9866,7 +9866,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -10896,7 +10443,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
-@@ -9904,10 +9904,10 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10035,10 +10035,10 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -10909,7 +10456,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Verifying your identity helps protect your personal information
-@@ -9916,7 +9916,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10047,7 +10047,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
Continue
@@ -10918,7 +10465,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Pick an option
-@@ -10122,13 +10122,13 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10253,13 +10253,13 @@ Please help our engineers fix this problem. Tell us what happened right before y
@@ -10934,7 +10481,7 @@ diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources
Select an account to sign in
-@@ -10141,7 +10141,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10272,7 +10272,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
@@ -10943,7 +10490,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.
-@@ -10150,7 +10150,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
+@@ -10281,7 +10281,7 @@ Please help our engineers fix this problem. Tell us what happened right before y
Allow this site to see your security key?
@@ -10955,7 +10502,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
-@@ -480,7 +480,7 @@ Google Chrome is unable to recover your settings.
+@@ -501,7 +501,7 @@ Google Chrome is unable to recover your settings.
@@ -10964,7 +10511,7 @@ diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_str
-@@ -590,10 +590,10 @@ Google Chrome is unable to recover your settings.
+@@ -611,10 +611,10 @@ Google Chrome is unable to recover your settings.
You're signed in to Chrome!
@@ -10977,7 +10524,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.
-@@ -626,7 +626,7 @@ Google Chrome is unable to recover your settings.
+@@ -647,7 +647,7 @@ Google Chrome is unable to recover your settings.
@@ -11053,7 +10600,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
-@@ -283,14 +283,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
+@@ -285,14 +285,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
const FeatureEntry::Choice kTraceUploadURL[] = {
{flags_ui::kGenericExperimentChoiceDisabled, "", ""},
{flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL,
@@ -11072,7 +10619,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
const FeatureEntry::Choice kPassiveListenersChoices[] = {
{flags_ui::kGenericExperimentChoiceDefault, "", ""},
-@@ -2245,7 +2245,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2265,7 +2265,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSyncSandboxDescription, kOsAll,
SINGLE_VALUE_TYPE_AND_VALUE(
switches::kSyncServiceURL,
@@ -11081,7 +10628,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
#if !defined(OS_ANDROID)
{"load-media-router-component-extension",
flag_descriptions::kLoadMediaRouterComponentExtensionName,
-@@ -2492,7 +2492,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -2509,7 +2509,7 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kSetMarketUrlForTestingName,
flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid,
SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting,
@@ -11093,7 +10640,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/android/autofill_assistant/client_android.cc b/chrome/browser/android/autofill_assistant/client_android.cc
--- a/chrome/browser/android/autofill_assistant/client_android.cc
+++ b/chrome/browser/android/autofill_assistant/client_android.cc
-@@ -52,7 +52,7 @@ const char* const kAutofillAssistantUrl = "autofill-assistant-url";
+@@ -53,7 +53,7 @@ const char* const kAutofillAssistantUrl = "autofill-assistant-url";
namespace {
const char* const kDefaultAutofillAssistantServerUrl =
@@ -11117,7 +10664,7 @@ diff --git a/chrome/browser/android/contextualsearch/contextual_search_context.h
diff --git a/chrome/browser/android/digital_asset_links/digital_asset_links_handler.cc b/chrome/browser/android/digital_asset_links/digital_asset_links_handler.cc
--- a/chrome/browser/android/digital_asset_links/digital_asset_links_handler.cc
+++ b/chrome/browser/android/digital_asset_links/digital_asset_links_handler.cc
-@@ -33,7 +33,7 @@ namespace {
+@@ -32,7 +32,7 @@ namespace {
const int kNumNetworkRetries = 1;
// Location on a website where the asset links file can be found, see
@@ -11129,7 +10676,7 @@ diff --git a/chrome/browser/android/digital_asset_links/digital_asset_links_hand
diff --git a/chrome/browser/android/digital_asset_links/digital_asset_links_handler.h b/chrome/browser/android/digital_asset_links/digital_asset_links_handler.h
--- a/chrome/browser/android/digital_asset_links/digital_asset_links_handler.h
+++ b/chrome/browser/android/digital_asset_links/digital_asset_links_handler.h
-@@ -31,7 +31,7 @@ using RelationshipCheckResultCallback =
+@@ -32,7 +32,7 @@ using RelationshipCheckResultCallback =
// A handler class for sending REST API requests to DigitalAssetLinks web
// end point. See
@@ -11138,7 +10685,7 @@ diff --git a/chrome/browser/android/digital_asset_links/digital_asset_links_hand
// for details of usage and APIs. These APIs are used to verify declared
// relationships between different asset types like web domains or Android apps.
// The lifecycle of this handler will be governed by the owner.
-@@ -52,7 +52,7 @@ class DigitalAssetLinksHandler : public content::WebContentsObserver {
+@@ -53,7 +53,7 @@ class DigitalAssetLinksHandler : public content::WebContentsObserver {
// Calling this multiple times on the same handler will cancel the previous
// checks.
// See
@@ -11186,7 +10733,7 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
-@@ -286,7 +286,7 @@ void TabAndroid::DestroyWebContents(JNIEnv* env,
+@@ -280,7 +280,7 @@ void TabAndroid::DestroyWebContents(JNIEnv* env,
// renderer process. Otherwise, we go with the slow path where renderer
// process shuts down itself when ref count becomes 0.
// This helps the render process exit quickly which avoids some issues
@@ -11243,7 +10790,7 @@ diff --git a/chrome/browser/android/vr/PRESUBMIT.py b/chrome/browser/android/vr/
diff --git a/chrome/browser/android/webapk/webapk_installer.cc b/chrome/browser/android/webapk/webapk_installer.cc
--- a/chrome/browser/android/webapk/webapk_installer.cc
+++ b/chrome/browser/android/webapk/webapk_installer.cc
-@@ -60,7 +60,7 @@ namespace {
+@@ -59,7 +59,7 @@ namespace {
// The default WebAPK server URL.
const char kDefaultServerUrl[] =
@@ -11306,7 +10853,7 @@ diff --git a/chrome/browser/browser_switcher/browser_switcher_service.cc b/chrom
diff --git a/chrome/browser/browser_switcher/ieem_sitelist_parser.cc b/chrome/browser/browser_switcher/ieem_sitelist_parser.cc
--- a/chrome/browser/browser_switcher/ieem_sitelist_parser.cc
+++ b/chrome/browser/browser_switcher/ieem_sitelist_parser.cc
-@@ -70,7 +70,7 @@ Entry ParseDomainOrPath(const base::Value& node, ParsedXml* result) {
+@@ -68,7 +68,7 @@ Entry ParseDomainOrPath(const base::Value& node, ParsedXml* result) {
}
// Parses Enterprise Mode schema 1 files according to:
@@ -11315,7 +10862,7 @@ diff --git a/chrome/browser/browser_switcher/ieem_sitelist_parser.cc b/chrome/br
void ParseIeFileVersionOne(const base::Value& xml, ParsedXml* result) {
DCHECK(data_decoder::IsXmlElementNamed(xml, kSchema1RulesElement));
for (const base::Value& node :
-@@ -102,7 +102,7 @@ void ParseIeFileVersionOne(const base::Value& xml, ParsedXml* result) {
+@@ -100,7 +100,7 @@ void ParseIeFileVersionOne(const base::Value& xml, ParsedXml* result) {
}
// Parses Enterprise Mode schema 2 files according to:
@@ -11409,7 +10956,7 @@ diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/c
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -3786,7 +3786,7 @@ std::string ChromeContentBrowserClient::GetMetricSuffixForURL(const GURL& url) {
+@@ -3790,7 +3790,7 @@ std::string ChromeContentBrowserClient::GetMetricSuffixForURL(const GURL& url) {
// function could be removed.
if (page_load_metrics::IsGoogleSearchResultUrl(url))
return "search";
@@ -11513,7 +11060,7 @@ diff --git a/chrome/browser/chromeos/arc/auth/arc_robot_auth_code_fetcher.cc b/c
diff --git a/chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.cc b/chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.cc
--- a/chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.cc
+++ b/chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.cc
-@@ -82,7 +82,7 @@ base::Optional SdkVersion() {
+@@ -84,7 +84,7 @@ base::Optional SdkVersion() {
return sdk_version;
}
@@ -11522,7 +11069,7 @@ diff --git a/chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.cc b/chr
constexpr int32_t GATT_CHAR_PROP_BIT_BROADCAST = (1 << 0);
constexpr int32_t GATT_CHAR_PROP_BIT_READ = (1 << 1);
constexpr int32_t GATT_CHAR_PROP_BIT_WRITE_NR = (1 << 2);
-@@ -160,7 +160,7 @@ constexpr int32_t kMaxGattAttributeHandle = 0xFFFF;
+@@ -162,7 +162,7 @@ constexpr int32_t kMaxGattAttributeHandle = 0xFFFF;
// The maximum length of an attribute value shall be 512 octets.
constexpr int kMaxGattAttributeLength = 512;
// Copied from Android at system/bt/stack/btm/btm_ble_int.h
@@ -11531,7 +11078,7 @@ diff --git a/chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.cc b/chr
constexpr uint16_t kAndroidMBluetoothVersionNumber = 95;
// Bluetooth SDP Service Class ID List Attribute identifier
constexpr uint16_t kServiceClassIDListAttributeID = 0x0001;
-@@ -1854,7 +1854,7 @@ void ArcBluetoothBridge::AddDescriptor(int32_t service_handle,
+@@ -1856,7 +1856,7 @@ void ArcBluetoothBridge::AddDescriptor(int32_t service_handle,
// is the parent of the new descriptor, we assume that it would be the last
// characteristic that was added to the given service. This matches the
// Android framework code at android/bluetooth/BluetoothGattServer.java#594.
@@ -11543,7 +11090,7 @@ diff --git a/chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.cc b/chr
diff --git a/chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.h b/chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.h
--- a/chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.h
+++ b/chrome/browser/chromeos/arc/bluetooth/arc_bluetooth_bridge.h
-@@ -262,7 +262,7 @@ class ArcBluetoothBridge
+@@ -266,7 +266,7 @@ class ArcBluetoothBridge
// Bluetooth Mojo host interface - Bluetooth Gatt Server functions
// Android counterpart link:
@@ -11579,19 +11126,15 @@ diff --git a/chrome/browser/chromeos/arc/tracing/arc_app_performance_tracing.cc
diff --git a/chrome/browser/chromeos/assistant/assistant_util.cc b/chrome/browser/chromeos/assistant/assistant_util.cc
--- a/chrome/browser/chromeos/assistant/assistant_util.cc
+++ b/chrome/browser/chromeos/assistant/assistant_util.cc
-@@ -107,11 +107,11 @@ ash::mojom::AssistantAllowedState IsAssistantAllowedForProfile(
-
+@@ -134,8 +134,8 @@ ash::mojom::AssistantAllowedState IsAssistantAllowedForProfile(
if (identity_manager) {
const std::string email = identity_manager->GetPrimaryAccountInfo().email;
-- if (base::EndsWith(email, "@gmail.com",
-+ if (base::EndsWith(email, "@9ma1l.qjz9zk",
- base::CompareCase::INSENSITIVE_ASCII) ||
-- base::EndsWith(email, "@googlemail.com",
-+ base::EndsWith(email, "@9oo91email.qjz9zk",
- base::CompareCase::INSENSITIVE_ASCII) ||
-- base::EndsWith(email, "@google.com",
-+ base::EndsWith(email, "@9oo91e.qjz9zk",
- base::CompareCase::INSENSITIVE_ASCII)) {
+ if (!email.empty() &&
+- (gaia::ExtractDomainName(email) == "gmail.com" ||
+- gaia::ExtractDomainName(email) == "googlemail.com" ||
++ (gaia::ExtractDomainName(email) == "9ma1l.qjz9zk" ||
++ gaia::ExtractDomainName(email) == "9oo91email.qjz9zk" ||
+ gaia::IsGoogleInternalAccountEmail(email))) {
account_supported = true;
}
diff --git a/chrome/browser/chromeos/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc b/chrome/browser/chromeos/backdrop_wallpaper_handlers/backdrop_wallpaper_handlers.cc
@@ -11621,19 +11164,19 @@ diff --git a/chrome/browser/chromeos/backdrop_wallpaper_handlers/backdrop_wallpa
diff --git a/chrome/browser/chromeos/crostini/crostini_util.h b/chrome/browser/chromeos/crostini/crostini_util.h
--- a/chrome/browser/chromeos/crostini/crostini_util.h
+++ b/chrome/browser/chromeos/crostini/crostini_util.h
-@@ -177,7 +177,7 @@ constexpr char kCrostiniCroshBuiltinAppId[] =
+@@ -183,7 +183,7 @@ constexpr char kCrostiniCroshBuiltinAppId[] =
// Generated using crx_file::id_util::GenerateId("LinuxAppsFolder")
constexpr char kCrostiniFolderId[] = "ddolnhmblagmcagkedkbfejapapdimlk";
constexpr char kCrostiniDefaultImageServerUrl[] =
- "https://storage.googleapis.com/cros-containers/%d";
+ "https://storage.9oo91eapis.qjz9zk/cros-containers/%d";
- constexpr char kCrostiniDefaultImageAlias[] = "debian/stretch";
- constexpr base::FilePath::CharType kHomeDirectory[] =
- FILE_PATH_LITERAL("/home");
+ constexpr char kCrostiniStretchImageAlias[] = "debian/stretch";
+ constexpr char kCrostiniBusterImageAlias[] = "debian/buster";
+
diff --git a/chrome/browser/chromeos/customization/customization_document.cc b/chrome/browser/chromeos/customization/customization_document.cc
--- a/chrome/browser/chromeos/customization/customization_document.cc
+++ b/chrome/browser/chromeos/customization/customization_document.cc
-@@ -175,7 +175,7 @@ std::string ReadFileInBackground(const base::FilePath& file) {
+@@ -172,7 +172,7 @@ std::string ReadFileInBackground(const base::FilePath& file) {
// Template URL where to fetch OEM services customization manifest from.
const char ServicesCustomizationDocument::kManifestUrl[] =
@@ -11654,18 +11197,6 @@ diff --git a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h b/
//
class ProxyResolutionServiceProvider
: public CrosDBusService::ServiceProviderInterface {
-diff --git a/chrome/browser/chromeos/drive/drive_integration_service.cc b/chrome/browser/chromeos/drive/drive_integration_service.cc
---- a/chrome/browser/chromeos/drive/drive_integration_service.cc
-+++ b/chrome/browser/chromeos/drive/drive_integration_service.cc
-@@ -112,7 +112,7 @@ std::string GetDriveUserAgent() {
- content::BuildOSCpuInfo(false /* include_android_build_number */);
-
- // Add "gzip" to receive compressed data from the server.
-- // (see https://developers.google.com/drive/performance)
-+ // (see https://developers.9oo91e.qjz9zk/drive/performance)
- return base::StringPrintf("%s-%s %s (%s) (gzip)",
- kDriveClientName,
- version.c_str(),
diff --git a/chrome/browser/chromeos/extensions/default_web_app_ids.h b/chrome/browser/chromeos/extensions/default_web_app_ids.h
--- a/chrome/browser/chromeos/extensions/default_web_app_ids.h
+++ b/chrome/browser/chromeos/extensions/default_web_app_ids.h
@@ -11737,9 +11268,9 @@ diff --git a/chrome/browser/chromeos/extensions/device_local_account_management_
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
-@@ -1053,7 +1053,7 @@ void FileManagerPrivateInternalGetDownloadUrlFunction::OnGotDownloadUrl(
+@@ -1042,7 +1042,7 @@ void FileManagerPrivateInternalGetDownloadUrlFunction::OnGotDownloadUrl(
IdentityManagerFactory::GetForProfile(chrome_details.GetProfile());
- const std::string& account_id = identity_manager->GetPrimaryAccountId();
+ const CoreAccountId& account_id = identity_manager->GetPrimaryAccountId();
std::vector scopes;
- scopes.emplace_back("https://www.googleapis.com/auth/drive.readonly");
+ scopes.emplace_back("https://www.9oo91eapis.qjz9zk/auth/drive.readonly");
@@ -11749,7 +11280,7 @@ diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.c
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
-@@ -84,7 +84,7 @@ namespace {
+@@ -82,7 +82,7 @@ namespace {
using api::file_manager_private::ProfileInfo;
@@ -11871,18 +11402,6 @@ diff --git a/chrome/browser/chromeos/hats/hats_dialog.cc b/chrome/browser/chrome
"async_survey?site=%s&force_https=1&sc=%s";
// Keyword used to join the separate device info elements into a single string
// to be used as site context.
-diff --git a/chrome/browser/chromeos/hats/hats_notification_controller.cc b/chrome/browser/chromeos/hats/hats_notification_controller.cc
---- a/chrome/browser/chromeos/hats/hats_notification_controller.cc
-+++ b/chrome/browser/chromeos/hats/hats_notification_controller.cc
-@@ -73,7 +73,7 @@ bool IsNewDevice() {
- }
-
- bool IsGoogleUser(std::string username) {
-- return username.find("@google.com") != std::string::npos;
-+ return username.find("@9oo91e.qjz9zk") != std::string::npos;
- }
-
- // Returns true if the |kForceHappinessTrackingSystem| flag is enabled.
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_names.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_names.cc
--- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_names.cc
+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_names.cc
@@ -11978,7 +11497,7 @@ diff --git a/chrome/browser/chromeos/login/screens/recommend_apps/recommend_apps
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
-@@ -1187,7 +1187,7 @@ void UserSessionManager::PrepareProfile(const base::FilePath& profile_path) {
+@@ -1189,7 +1189,7 @@ void UserSessionManager::PrepareProfile(const base::FilePath& profile_path) {
DemoAppLauncher::IsDemoAppSession(user_context_.GetAccountId());
// TODO(nkostylev): Figure out whether demo session is using the right profile
@@ -11987,7 +11506,7 @@ diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chr
g_browser_process->profile_manager()->CreateProfileAsync(
profile_path,
base::Bind(&UserSessionManager::OnProfileCreated, AsWeakPtr(),
-@@ -1251,7 +1251,7 @@ void ShowSupervisedUserDeprecationNotification(Profile* profile,
+@@ -1253,7 +1253,7 @@ void ShowSupervisedUserDeprecationNotification(Profile* profile,
NavigateParams params(
profile,
@@ -12008,18 +11527,6 @@ diff --git a/chrome/browser/chromeos/login/ui/captive_portal_view.cc b/chrome/br
if (!redirected_ && url != GURL::EmptyGURL() &&
url != GURL(CaptivePortalStartURL())) {
redirected_ = true;
-diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
---- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
-+++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
-@@ -129,7 +129,7 @@ const char kDeviceLocalAccountPendingDataRemoval[] =
- // data.
- const char kDeviceLocalAccountsWithSavedData[] = "PublicAccounts";
-
--constexpr char kGoogleDotCom[] = "@google.com";
-+constexpr char kGoogleDotCom[] = "@9oo91e.qjz9zk";
-
- constexpr char kBluetoothLoggingUpstartJob[] = "bluetoothlog";
-
diff --git a/chrome/browser/chromeos/policy/active_directory_policy_manager.cc b/chrome/browser/chromeos/policy/active_directory_policy_manager.cc
--- a/chrome/browser/chromeos/policy/active_directory_policy_manager.cc
+++ b/chrome/browser/chromeos/policy/active_directory_policy_manager.cc
@@ -12072,20 +11579,12 @@ diff --git a/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc
// CRD host states we care about:
constexpr char kCRDStateKey[] = "state";
-@@ -79,17 +79,17 @@ constexpr char kCRDAccessCodeLifetimeKey[] = "accessCodeLifetime";
- constexpr char kCRDConnectClientKey[] = "client";
-
- constexpr char kICEConfigURL[] =
-- "https://www.googleapis.com/chromoting/v1/@me/iceconfig";
-+ "https://www.9oo91eapis.qjz9zk/chromoting/v1/@me/iceconfig";
+@@ -80,11 +80,11 @@ constexpr char kCRDConnectClientKey[] = "client";
// OAuth2 Token scopes
constexpr char kCloudDevicesOAuth2Scope[] =
- "https://www.googleapis.com/auth/clouddevices";
+ "https://www.9oo91eapis.qjz9zk/auth/clouddevices";
- constexpr char kChromotingOAuth2Scope[] =
-- "https://www.googleapis.com/auth/chromoting";
-+ "https://www.9oo91eapis.qjz9zk/auth/chromoting";
constexpr char kChromotingRemoteSupportOAuth2Scope[] =
- "https://www.googleapis.com/auth/chromoting.remote.support";
+ "https://www.9oo91eapis.qjz9zk/auth/chromoting.remote.support";
@@ -12093,17 +11592,8 @@ diff --git a/chrome/browser/chromeos/policy/remote_commands/crd_host_delegate.cc
- "https://www.googleapis.com/auth/tachyon";
+ "https://www.9oo91eapis.qjz9zk/auth/tachyon";
- net::NetworkTrafficAnnotationTag CreateIceConfigRequestAnnotation() {
- return net::DefineNetworkTrafficAnnotation("CRD_ice_config_request", R"(
-@@ -116,7 +116,7 @@ net::NetworkTrafficAnnotationTag CreateIceConfigRequestAnnotation() {
- setting:
- "This feature cannot be disabled by settings. You can block Chrome "
- "Remote Desktop as specified here: "
-- "https://support.google.com/chrome/?p=remote_desktop"
-+ "https://support.9oo91e.qjz9zk/chrome/?p=remote_desktop"
- chrome_policy {
- RemoteAccessHostFirewallTraversal {
- policy_options {mode: MANDATORY}
+ } // namespace
+
diff --git a/chrome/browser/chromeos/policy/status_collector/status_collector.h b/chrome/browser/chromeos/policy/status_collector/status_collector.h
--- a/chrome/browser/chromeos/policy/status_collector/status_collector.h
+++ b/chrome/browser/chromeos/policy/status_collector/status_collector.h
@@ -12116,18 +11606,6 @@ diff --git a/chrome/browser/chromeos/policy/status_collector/status_collector.h
virtual bool ShouldReportActivityTimes() const = 0;
virtual bool ShouldReportNetworkInterfaces() const = 0;
virtual bool ShouldReportUsers() const = 0;
-diff --git a/chrome/browser/chromeos/release_notes/release_notes_storage.cc b/chrome/browser/chromeos/release_notes/release_notes_storage.cc
---- a/chrome/browser/chromeos/release_notes/release_notes_storage.cc
-+++ b/chrome/browser/chromeos/release_notes/release_notes_storage.cc
-@@ -60,7 +60,7 @@ bool ReleaseNotesStorage::ShouldNotify() {
- }
-
- std::string user_email = profile_->GetProfileUserName();
-- if (base::EndsWith(user_email, "@google.com",
-+ if (base::EndsWith(user_email, "@9oo91e.qjz9zk",
- base::CompareCase::INSENSITIVE_ASCII) ||
- (ProfileHelper::Get()->GetUserByProfile(profile_)->HasGaiaAccount() &&
- !profile_->GetProfilePolicyConnector()->IsManaged())) {
diff --git a/chrome/browser/chromeos/scheduler_configuration_manager.h b/chrome/browser/chromeos/scheduler_configuration_manager.h
--- a/chrome/browser/chromeos/scheduler_configuration_manager.h
+++ b/chrome/browser/chromeos/scheduler_configuration_manager.h
@@ -12264,7 +11742,7 @@ diff --git a/chrome/browser/data_reduction_proxy/data_reduction_proxy_settings_a
diff --git a/chrome/browser/devtools/device/adb/mock_adb_server.cc b/chrome/browser/devtools/device/adb/mock_adb_server.cc
--- a/chrome/browser/devtools/device/adb/mock_adb_server.cc
+++ b/chrome/browser/devtools/device/adb/mock_adb_server.cc
-@@ -134,7 +134,7 @@ char kSampleChromePages[] = "[ {\n"
+@@ -133,7 +133,7 @@ char kSampleChromePages[] = "[ {\n"
" \"id\": \"0\",\n"
" \"title\": \"The Chromium Projects\",\n"
" \"type\": \"page\",\n"
@@ -12273,7 +11751,7 @@ diff --git a/chrome/browser/devtools/device/adb/mock_adb_server.cc b/chrome/brow
" \"webSocketDebuggerUrl\": \""
"ws:///devtools/page/0\"\n"
"} ]";
-@@ -146,7 +146,7 @@ char kSampleChromeBetaPages[] = "[ {\n"
+@@ -145,7 +145,7 @@ char kSampleChromeBetaPages[] = "[ {\n"
" \"id\": \"0\",\n"
" \"title\": \"The Chromium Projects\",\n"
" \"type\": \"page\",\n"
@@ -12282,7 +11760,7 @@ diff --git a/chrome/browser/devtools/device/adb/mock_adb_server.cc b/chrome/brow
" \"webSocketDebuggerUrl\": \""
"ws:///devtools/page/0\"\n"
"} ]";
-@@ -155,20 +155,20 @@ char kSampleWebViewPages[] = "[ {\n"
+@@ -154,20 +154,20 @@ char kSampleWebViewPages[] = "[ {\n"
" \"description\": \"{\\\"attached\\\":false,\\\"empty\\\":false,"
"\\\"height\\\":1173,\\\"screenX\\\":0,\\\"screenY\\\":0,"
"\\\"visible\\\":true,\\\"width\\\":800}\",\n"
@@ -12536,7 +12014,7 @@ diff --git a/chrome/browser/extensions/api/image_writer_private/removable_storag
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
-@@ -66,7 +66,7 @@ namespace {
+@@ -68,7 +68,7 @@ namespace {
#if defined(OS_CHROMEOS)
const char kPlayIntentPrefix[] =
@@ -12607,7 +12085,7 @@ diff --git a/chrome/browser/extensions/extension_browser_window_helper.cc b/chro
diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc
--- a/chrome/browser/extensions/external_pref_loader.cc
+++ b/chrome/browser/extensions/external_pref_loader.cc
-@@ -253,7 +253,7 @@ void ExternalPrefLoader::LoadOnFileThread() {
+@@ -283,7 +283,7 @@ void ExternalPrefLoader::LoadOnFileThread() {
if (!prefs->empty())
LOG(WARNING) << "You are using an old-style extension deployment method "
"(external_extensions.json), which will soon be "
@@ -12674,7 +12152,7 @@ diff --git a/chrome/browser/extensions/permissions_updater.cc b/chrome/browser/e
diff --git a/chrome/browser/extensions/scripting_permissions_modifier.cc b/chrome/browser/extensions/scripting_permissions_modifier.cc
--- a/chrome/browser/extensions/scripting_permissions_modifier.cc
+++ b/chrome/browser/extensions/scripting_permissions_modifier.cc
-@@ -41,8 +41,8 @@ bool CanWithholdFromExtension(const Extension& extension) {
+@@ -27,8 +27,8 @@ namespace {
// |runtime_granted_permissions|. The returned permission set may contain new
// patterns not found in either |requested_permissions| or
// |runtime_granted_permissions| in the case of overlapping host permissions
@@ -12711,7 +12189,7 @@ diff --git a/chrome/browser/extensions/scripting_permissions_modifier.h b/chrome
diff --git a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
--- a/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
+++ b/chrome/browser/extensions/updater/chrome_extension_downloader_factory.cc
-@@ -51,7 +51,7 @@ ChromeExtensionDownloaderFactory::CreateForURLLoaderFactory(
+@@ -49,7 +49,7 @@ ChromeExtensionDownloaderFactory::CreateForURLLoaderFactory(
manifest_query_params += "&testrequest=1";
}
downloader->set_manifest_query_params(manifest_query_params);
@@ -12808,7 +12286,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 82
},
{
-@@ -159,14 +159,14 @@
+@@ -163,14 +163,14 @@
},
{
"name": "arc-native-bridge-toggle",
@@ -12822,10 +12300,10 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"name": "arc-print-spooler-experiment",
- "owners": [ "jschettler@google.com", "bmgordon@google.com" ],
+ "owners": [ "jschettler@9oo91e.qjz9zk", "bmgordon@9oo91e.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 82
},
{
-@@ -181,7 +181,7 @@
+@@ -185,7 +185,7 @@
},
{
"name": "arc-vpn",
@@ -12834,7 +12312,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 76
},
{
-@@ -230,7 +230,7 @@
+@@ -244,7 +244,7 @@
},
{
"name": "autofill-always-return-cloud-tokenized-card",
@@ -12843,13 +12321,22 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 87
},
{
-@@ -280,18 +280,18 @@
+@@ -279,7 +279,7 @@
+ },
+ {
+ "name": "autofill-enable-virtual-card",
+- "owners": [ "siyua", "jsaul@google.com" ],
++ "owners": [ "siyua", "jsaul@9oo91e.qjz9zk" ],
+ "expiry_milestone": 87
+ },
+ {
+@@ -299,18 +299,18 @@
},
{
"name": "autofill-keyboard-accessory-view",
- "owners": [ "fhorschig@chromium.org" ],
+ "owners": [ "fhorschig@ch40m1um.qjz9zk" ],
- "expiry_milestone": 79
+ "expiry_milestone": 82
},
{
"name": "autofill-no-local-save-on-unmask-success",
@@ -12865,16 +12352,25 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
// Must wait for the Autofill Auth Project to be launched.
"expiry_milestone": 84
},
-@@ -472,7 +472,7 @@
+@@ -371,7 +371,7 @@
+ },
+ {
+ "name": "bluetooth-aggressive-appearance-filter",
+- "owners": [ "hansberry", "cros-system-services@google.com" ],
++ "owners": [ "hansberry", "cros-system-services@9oo91e.qjz9zk" ],
+ "expiry_milestone": 85
+ },
+ {
+@@ -501,7 +501,7 @@
},
{
"name": "compositor-threaded-scrollbar-scrolling",
- "owners": [ "arakeri@microsoft.com" ],
+ "owners": [ "arakeri@m1cr050ft.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 90
},
{
-@@ -582,7 +582,7 @@
+@@ -641,7 +641,7 @@
},
{
"name": "darken-websites-checkbox-in-themes-setting",
@@ -12883,7 +12379,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 83
},
{
-@@ -605,17 +605,17 @@
+@@ -664,17 +664,17 @@
},
{
"name": "decode-jpeg-images-to-yuv",
@@ -12895,7 +12391,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"name": "decode-webp-images-to-yuv",
- "owners": [ "andrescj", "chromeos-gfx@google.com" ],
+ "owners": [ "andrescj", "chromeos-gfx@9oo91e.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 88
},
{
"name": "delegate-overscroll-swipes",
@@ -12904,7 +12400,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 88
},
{
-@@ -645,39 +645,39 @@
+@@ -709,39 +709,39 @@
},
{
"name": "disable-accelerated-mjpeg-decode",
@@ -12950,7 +12446,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
// This flag is used for QA & debugging on ChromeOS, which has no way to
// customize switches.
"expiry_milestone": -1
-@@ -690,7 +690,7 @@
+@@ -754,7 +754,7 @@
{
// See https://crbug.com/882238.
"name": "disable-ipc-flooding-protection",
@@ -12959,7 +12455,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 76
},
{
-@@ -708,8 +708,8 @@
+@@ -772,8 +772,8 @@
{
"name": "disable-office-editing-component-app",
"owners": [
@@ -12970,7 +12466,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 88
},
{
-@@ -720,7 +720,7 @@
+@@ -784,7 +784,7 @@
{
// See https://crbug.com/882238.
"name": "disable-pushstate-throttle",
@@ -12979,7 +12475,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 76
},
{
-@@ -737,7 +737,7 @@
+@@ -801,7 +801,7 @@
},
{
"name": "disable-webrtc-hw-decoding",
@@ -12988,7 +12484,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
// This flag does not expire because it allows users to disable HW video
// decoding only in webrtc usecase for debugging purpose and temporary
// workaround for some issues.
-@@ -745,7 +745,7 @@
+@@ -809,7 +809,7 @@
},
{
"name": "disable-webrtc-hw-encoding",
@@ -12997,7 +12493,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
// This flag does not expire because it allows users to disable HW video
// encoding only in webrtc usecase for debugging purpose and temporary
// workaround for some issues.
-@@ -769,7 +769,7 @@
+@@ -833,7 +833,7 @@
},
{
"name": "dns-over-https",
@@ -13006,7 +12502,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 81
},
{
-@@ -804,7 +804,7 @@
+@@ -868,7 +868,7 @@
},
{
"name": "draw-vertically-edge-to-edge",
@@ -13015,7 +12511,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 88
},
{
-@@ -815,12 +815,12 @@
+@@ -879,12 +879,12 @@
},
{
"name": "enable-accessibility-expose-aria-annotations",
@@ -13030,7 +12526,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 82
},
{
-@@ -840,12 +840,12 @@
+@@ -904,12 +904,12 @@
},
{
"name": "enable-ambient-authentication-in-guest-session",
@@ -13045,7 +12541,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 87
},
{
-@@ -955,22 +955,22 @@
+@@ -1019,22 +1019,22 @@
},
{
"name": "enable-autofill-account-wallet-storage",
@@ -13072,7 +12568,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
// This flag is heavily used by the testing team that can't easily use the
// commandline, and can't be enabled by default.
// http://g/chrome-flags/s2RTQCvcRRs
-@@ -978,52 +978,52 @@
+@@ -1042,42 +1042,42 @@
},
{
"name": "enable-autofill-credit-card-upload-editable-cardholder-name",
@@ -13108,7 +12604,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"name": "enable-autofill-manual-fallback",
- "owners": [ "fhorschig@chromium.org" ],
+ "owners": [ "fhorschig@ch40m1um.qjz9zk" ],
- "expiry_milestone": 79
+ "expiry_milestone": 82
},
{
"name": "enable-autofill-refresh-style",
@@ -13123,19 +12619,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 82
},
{
- "name": "enable-autofill-save-credit-card-uses-improved-messaging",
-- "owners": [ "siyua@chromium.org", "payments-autofill-team@google.com" ],
-+ "owners": [ "siyua@ch40m1um.qjz9zk", "payments-autofill-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 80
- },
- {
- "name": "enable-autofill-updated-card-unmask-prompt-ui",
-- "owners": ["siyua", "payments-autofill-team@google.com"],
-+ "owners": ["siyua", "payments-autofill-team@9oo91e.qjz9zk"],
- "expiry_milestone": 87
- },
- {
-@@ -1033,7 +1033,7 @@
+@@ -1087,7 +1087,7 @@
},
{
"name": "enable-backdrop-filter",
@@ -13144,16 +12628,16 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 78
},
{
-@@ -1043,7 +1043,7 @@
+@@ -1097,7 +1097,7 @@
},
{
"name": "enable-bookmark-reorder",
- "owners": ["jhimawan@google.com", "twellington" ],
+ "owners": ["jhimawan@9oo91e.qjz9zk", "twellington" ],
- "expiry_milestone": 80
+ "expiry_milestone": 82
},
{
-@@ -1083,7 +1083,7 @@
+@@ -1137,17 +1137,17 @@
},
{
"name": "enable-chromeos-account-manager",
@@ -13162,7 +12646,10 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 79
},
{
-@@ -1093,7 +1093,7 @@
+ "name": "enable-clipboard-provider-text-suggestions",
+- "owners": [ "gangwu", "chrome-omnibox-team@google.com"],
++ "owners": [ "gangwu", "chrome-omnibox-team@9oo91e.qjz9zk"],
+ "expiry_milestone": 84
},
{
"name": "enable-close-tab-suggestions",
@@ -13171,31 +12658,49 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 82
},
{
-@@ -1130,7 +1130,7 @@
+@@ -1184,22 +1184,22 @@
},
{
"name": "enable-cros-ime-input-logic-fst",
- "owners": [ "essential-inputs-team@google.com" ],
+ "owners": [ "essential-inputs-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 77
+ "expiry_milestone": 85
},
{
-@@ -1181,12 +1181,12 @@
+ "name": "enable-cros-ime-input-logic-hmm",
+- "owners": [ "essential-inputs-team@google.com" ],
++ "owners": [ "essential-inputs-team@9oo91e.qjz9zk" ],
+ "expiry_milestone": 85
+ },
+ {
+ "name": "enable-cros-ime-native-decoder",
+- "owners": [ "essential-inputs-team@google.com" ],
++ "owners": [ "essential-inputs-team@9oo91e.qjz9zk" ],
+ "expiry_milestone": 85
+ },
+ {
+ "name": "enable-cros-virtual-keyboard-bordered-key",
+- "owners": [ "essential-inputs-team@google.com" ],
++ "owners": [ "essential-inputs-team@9oo91e.qjz9zk" ],
+ "expiry_milestone": 83
+ },
+ {
+@@ -1250,12 +1250,12 @@
+ },
+ {
+ "name": "enable-desktop-minimal-ui",
+- "owners": [ "desktop-pwas-team@google.com" ],
++ "owners": [ "desktop-pwas-team@9oo91e.qjz9zk" ],
+ "expiry_milestone": 83
},
{
"name": "enable-desktop-pwas-local-updating",
- "owners": [ "desktop-pwas-team@google.com" ],
+ "owners": [ "desktop-pwas-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 83
},
{
- "name": "enable-desktop-pwas-omnibox-install",
-- "owners": [ "desktop-pwas-team@google.com" ],
-+ "owners": [ "desktop-pwas-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 79
- },
- {
-@@ -1202,7 +1202,7 @@
+@@ -1271,12 +1271,12 @@
},
{
"name": "enable-duet-tabstrip-integration",
@@ -13204,7 +12709,13 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 84
},
{
-@@ -1247,17 +1247,17 @@
+ "name": "enable-edu-coexistence",
+- "owners": [ "anastasiian@chromium.org", "sinhak@chromium.org" ],
++ "owners": [ "anastasiian@ch40m1um.qjz9zk", "sinhak@ch40m1um.qjz9zk" ],
+ "expiry_milestone": 83
+ },
+ {
+@@ -1326,17 +1326,17 @@
},
{
"name": "enable-experimental-accessibility-switch-access",
@@ -13222,10 +12733,10 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"name": "enable-experimental-fling-animation",
- "owners": [ "sarsha@microsoft.com" ],
+ "owners": [ "sarsha@m1cr050ft.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 81
},
{
-@@ -1267,7 +1267,7 @@
+@@ -1346,7 +1346,7 @@
},
{
"name": "enable-experimental-productivity-features",
@@ -13234,13 +12745,13 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 81
},
{
-@@ -1291,12 +1291,12 @@
+@@ -1370,12 +1370,12 @@
},
{
"name": "enable-force-dark",
- "owners": [ "gilmanmh@google.com" ],
+ "owners": [ "gilmanmh@9oo91e.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 85
},
{
"name": "enable-fs-nosymfollow",
@@ -13249,7 +12760,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 76
},
{
-@@ -1308,12 +1308,12 @@
+@@ -1397,12 +1397,12 @@
},
{
"name": "enable-generic-sensor-extra-classes",
@@ -13264,16 +12775,22 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 76
},
{
-@@ -1359,7 +1359,7 @@
+@@ -1453,12 +1453,12 @@
+ },
+ {
+ "name": "enable-home-page-location-policy",
+- "owners": [ "wenyufu", "chrome-android-app@chromium.org" ],
++ "owners": [ "wenyufu", "chrome-android-app@ch40m1um.qjz9zk" ],
+ "expiry_milestone": 83
},
{
"name": "enable-horizontal-tab-switcher",
- "owners": [ "memex-team@google.com" ],
+ "owners": [ "memex-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 77
+ "expiry_milestone": -1
},
{
-@@ -1389,7 +1389,7 @@
+@@ -1488,7 +1488,7 @@
},
{
"name": "enable-intent-picker",
@@ -13282,7 +12799,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 80
},
{
-@@ -1400,7 +1400,7 @@
+@@ -1499,7 +1499,7 @@
},
{
"name": "enable-layout-ng",
@@ -13291,7 +12808,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 80
},
{
-@@ -1459,12 +1459,12 @@
+@@ -1563,12 +1563,12 @@
},
{
"name": "enable-nacl",
@@ -13306,7 +12823,13 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 75
},
{
-@@ -1512,7 +1512,7 @@
+@@ -1618,12 +1618,12 @@
+ },
+ {
+ "name": "enable-ntp-remote-suggestions",
+- "owners": [ "//chrome/android/feed/OWNERS", "feed@chromium.org" ],
++ "owners": [ "//chrome/android/feed/OWNERS", "feed@ch40m1um.qjz9zk" ],
+ "expiry_milestone": 80
},
{
"name": "enable-offer-store-unmasked-wallet-cards",
@@ -13315,25 +12838,25 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 86
},
{
-@@ -1582,7 +1582,7 @@
+@@ -1698,7 +1698,7 @@
},
{
"name": "enable-query-in-omnibox",
- "owners": [ "tommycli", "chrome-omnibox-team@google.com" ],
+ "owners": [ "tommycli", "chrome-omnibox-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 85
},
{
-@@ -1592,7 +1592,7 @@
+@@ -1708,7 +1708,7 @@
},
{
"name": "enable-reader-mode",
- "owners": [ "gilmanmh@google.com" ],
+ "owners": [ "gilmanmh@9oo91e.qjz9zk" ],
- "expiry_milestone": 78
+ "expiry_milestone": 82
},
{
-@@ -1679,7 +1679,7 @@
+@@ -1790,7 +1790,7 @@
},
{
"name": "enable-service-worker-imported-script-update-check",
@@ -13342,16 +12865,16 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
// It's still in development. Tentatively set to M76 as the expiry_milestone.
"expiry_milestone": 76
},
-@@ -1791,7 +1791,7 @@
+@@ -1897,7 +1897,7 @@
},
{
"name": "enable-sync-uss-nigori",
- "owners": [ "mmoskvitin@google.com", "//components/sync/OWNERS" ],
+ "owners": [ "mmoskvitin@9oo91e.qjz9zk", "//components/sync/OWNERS" ],
- "expiry_milestone": 80
+ "expiry_milestone": 83
},
{
-@@ -1806,37 +1806,37 @@
+@@ -1912,37 +1912,37 @@
},
{
"name": "enable-tab-engagement-reporting",
@@ -13396,22 +12919,22 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 82
},
{
-@@ -1890,12 +1890,12 @@
+@@ -1996,12 +1996,12 @@
},
{
"name": "enable-vaapi-jpeg-image-decode-acceleration",
- "owners": [ "chromeos-gfx@google.com" ],
+ "owners": [ "chromeos-gfx@9oo91e.qjz9zk" ],
- "expiry_milestone": 79
+ "expiry_milestone": 83
},
{
"name": "enable-vaapi-webp-image-decode-acceleration",
- "owners": [ "chromeos-gfx@google.com" ],
+ "owners": [ "chromeos-gfx@9oo91e.qjz9zk" ],
- "expiry_milestone": 79
+ "expiry_milestone": 83
},
{
-@@ -1932,62 +1932,62 @@
+@@ -2038,62 +2038,62 @@
},
{
"name": "enable-web-authentication-ble-support",
@@ -13485,7 +13008,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 81
},
{
-@@ -2002,17 +2002,17 @@
+@@ -2113,17 +2113,17 @@
},
{
"name": "enable-webrtc-hw-h264-encoding",
@@ -13506,22 +13029,22 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 76
},
{
-@@ -2027,7 +2027,7 @@
+@@ -2138,7 +2138,7 @@
},
{
"name": "enable-webrtc-pipewire-capturer",
- "owners": [ "tomas.popela@gmail.com" ],
+ "owners": [ "tomas.popela@9ma1l.qjz9zk" ],
- "expiry_milestone": 79
+ "expiry_milestone": 81
},
{
-@@ -2047,22 +2047,22 @@
+@@ -2158,22 +2158,22 @@
},
{
- "name": "enable-webvr",
-- "owners": [ "//third_party/blink/renderer/modules/vr/OWNERS", "xr-dev@chromium.org" ],
-+ "owners": [ "//third_party/blink/renderer/modules/vr/OWNERS", "xr-dev@ch40m1um.qjz9zk" ],
- "expiry_milestone": 80
+ "name": "enable-webrtc-use-min-max-vea-dimensions",
+- "owners": [ "mcasas", "chromeos-gfx-video@google.com" ],
++ "owners": [ "mcasas", "chromeos-gfx-video@9oo91e.qjz9zk" ],
+ "expiry_milestone": 88
},
{
"name": "enable-winrt-geolocation-implementation",
@@ -13533,7 +13056,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"name": "enable-winrt-sensor-implementation",
- "owners": [ "wensh@microsoft.com" ],
+ "owners": [ "wensh@m1cr050ft.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 84
},
{
"name": "enable-zero-copy",
@@ -13542,16 +13065,16 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
// This flag is commonly used when asking users to help gather debug info.
"expiry_milestone": -1
},
-@@ -2125,7 +2125,7 @@
+@@ -2241,7 +2241,7 @@
},
{
"name": "file-handling-api",
- "owners": ["harrisjay@chromium.org", "raymes@chromium.org"],
+ "owners": ["harrisjay@ch40m1um.qjz9zk", "raymes@ch40m1um.qjz9zk"],
- "expiry_milestone": 79
+ "expiry_milestone": 82
},
{
-@@ -2156,7 +2156,7 @@
+@@ -2261,7 +2261,7 @@
},
{
"name": "focus-mode",
@@ -13560,7 +13083,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 82
},
{
-@@ -2217,12 +2217,12 @@
+@@ -2322,12 +2322,12 @@
},
{
"name": "forced-colors",
@@ -13575,7 +13098,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 81
},
{
-@@ -2247,7 +2247,7 @@
+@@ -2352,7 +2352,7 @@
},
{
"name": "gesture-properties-dbus-service",
@@ -13584,16 +13107,34 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
// Used by developers for debugging and input device tuning.
"expiry_milestone": -1
},
-@@ -2263,7 +2263,7 @@
+@@ -2368,7 +2368,7 @@
},
{
"name": "handwriting-gesture",
- "owners": [ "essential-inputs-team@google.com" ],
+ "owners": [ "essential-inputs-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 83
},
{
-@@ -2391,7 +2391,7 @@
+@@ -2447,7 +2447,7 @@
+ },
+ {
+ "name": "instant-tethering",
+- "owners": [ "hansberry", "khorimoto", "vecore", "cros-system-services@google.com" ],
++ "owners": [ "hansberry", "khorimoto", "vecore", "cros-system-services@9oo91e.qjz9zk" ],
+ // Though Instant Tethering is now a launched feature, it is only marked enabled on select,
+ // approved boards which have passed hardware verification and received server config seeds
+ // marking it as enabled. This means it is actually disabled-by-default, and since test machines
+@@ -2457,7 +2457,7 @@
+ },
+ {
+ "name": "interest-feed-content-suggestions",
+- "owners": [ "//chrome/android/feed/OWNERS", "feed@chromium.org" ],
++ "owners": [ "//chrome/android/feed/OWNERS", "feed@ch40m1um.qjz9zk" ],
+ "expiry_milestone": 90
+ },
+ {
+@@ -2501,7 +2501,7 @@
},
{
"name": "mac-syscall-sandbox",
@@ -13602,7 +13143,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 88
},
{
-@@ -2401,7 +2401,7 @@
+@@ -2511,7 +2511,7 @@
},
{
"name": "mac-v2-gpu-sandbox",
@@ -13611,7 +13152,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 88
},
{
-@@ -2507,7 +2507,7 @@
+@@ -2627,7 +2627,7 @@
},
{
"name": "new-usb-backend",
@@ -13620,7 +13161,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 83
},
{
-@@ -2547,7 +2547,7 @@
+@@ -2677,7 +2677,7 @@
},
{
"name": "oculus-vr",
@@ -13629,7 +13170,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 82
},
{
-@@ -2567,7 +2567,7 @@
+@@ -2692,7 +2692,7 @@
},
{
"name": "offline-indicator-v2",
@@ -13638,7 +13179,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 85
},
{
-@@ -2637,37 +2637,37 @@
+@@ -2762,77 +2762,77 @@
},
{
"name": "omnibox-autocomplete-titles",
@@ -13650,7 +13191,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"name": "omnibox-disable-instant-extended-limit",
- "owners": [ "pnoland", "chrome-omnibox-team@google.com" ],
+ "owners": [ "pnoland", "chrome-omnibox-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 85
},
{
"name": "omnibox-display-title-for-current-url",
@@ -13662,34 +13203,55 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"name": "omnibox-drive-suggestions",
- "owners": [ "manukh", "chrome-omnibox-team@google.com" ],
+ "owners": [ "manukh", "chrome-omnibox-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 85
},
{
"name": "omnibox-experimental-keyword-mode",
- "owners": [ "krb", "chrome-omnibox-team@google.com" ],
+ "owners": [ "krb", "chrome-omnibox-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 82
+ },
+ {
+ "name": "omnibox-experimental-suggest-scoring",
+- "owners": [ "jdonnelly", "chrome-omnibox-team@google.com" ],
++ "owners": [ "jdonnelly", "chrome-omnibox-team@9oo91e.qjz9zk" ],
+ "expiry_milestone": 85
},
{
"name": "omnibox-group-suggestions-by-search-vs-url",
- "owners": [ "krb", "chrome-omnibox-team@google.com" ],
+ "owners": [ "krb", "chrome-omnibox-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 78
+ "expiry_milestone": 82
},
{
"name": "omnibox-local-entity-suggestions",
- "owners": [ "manukh", "chrome-omnibox-team@google.com" ],
+ "owners": [ "manukh", "chrome-omnibox-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 85
},
{
-@@ -2682,22 +2682,22 @@
+ "name": "omnibox-loose-max-limit-on-dedicated-rows",
+- "owners": [ "krb", "chrome-omnibox-team@google.com" ],
++ "owners": [ "krb", "chrome-omnibox-team@9oo91e.qjz9zk" ],
+ "expiry_milestone": 83
+ },
+ {
+ "name": "omnibox-material-design-weather-icons",
+- "owners": [ "manukh", "ender", "chrome-omnibox-team@google.com" ],
++ "owners": [ "manukh", "ender", "chrome-omnibox-team@9oo91e.qjz9zk" ],
+ "expiry_milestone": 85
+ },
+ {
+ "name": "omnibox-max-url-matches",
+- "owners": [ "krb", "chrome-omnibox-team@google.com" ],
++ "owners": [ "krb", "chrome-omnibox-team@9oo91e.qjz9zk" ],
+ "expiry_milestone": 82
},
{
"name": "omnibox-on-device-head-suggestions",
- "owners": [ "cechen", "suggest-2g@google.com" ],
+ "owners": [ "cechen", "suggest-2g@9oo91e.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 85
},
{
"name": "omnibox-on-focus-suggestions",
@@ -13701,7 +13263,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"name": "omnibox-pedal-suggestions",
- "owners": [ "orinj", "chrome-omnibox-team@google.com" ],
+ "owners": [ "orinj", "chrome-omnibox-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 85
},
{
"name": "omnibox-preserve-default-match-against-async-update",
@@ -13710,7 +13272,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 85
},
{
-@@ -2707,87 +2707,87 @@
+@@ -2842,87 +2842,87 @@
},
{
"name": "omnibox-reverse-answers",
@@ -13722,19 +13284,19 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"name": "omnibox-rich-entity-suggestions",
- "owners": [ "jdonnelly", "chrome-omnibox-team@google.com" ],
+ "owners": [ "jdonnelly", "chrome-omnibox-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 85
},
{
"name": "omnibox-search-engine-logo",
- "owners": [ "wylieb", "chrome-omnibox-team@google.com" ],
+ "owners": [ "wylieb", "chrome-omnibox-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 82
},
{
"name": "omnibox-short-bookmark-suggestions",
- "owners": [ "krb", "chrome-omnibox-team@google.com" ],
+ "owners": [ "krb", "chrome-omnibox-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 78
+ "expiry_milestone": 82
},
{
"name": "omnibox-spare-renderer",
@@ -13746,7 +13308,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"name": "omnibox-suggestion-transparency-options",
- "owners": [ "tommycli", "chrome-omnibox-team@google.com" ],
+ "owners": [ "tommycli", "chrome-omnibox-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 85
},
{
"name": "omnibox-tab-switch-suggestions",
@@ -13788,7 +13350,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"name": "omnibox-ui-max-autocomplete-matches",
- "owners": [ "jdonnelly", "chrome-omnibox-team@google.com" ],
+ "owners": [ "jdonnelly", "chrome-omnibox-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 80
+ "expiry_milestone": 85
},
{
"name": "omnibox-ui-one-click-unelide",
@@ -13800,7 +13362,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"name": "omnibox-ui-show-suggestion-favicons",
- "owners": [ "ender", "chrome-omnibox-team@google.com" ],
+ "owners": [ "ender", "chrome-omnibox-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 79
+ "expiry_milestone": 85
},
{
"name": "omnibox-ui-swap-title-and-url",
@@ -13810,12 +13372,12 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
},
{
"name": "omnibox-zero-suggestions-on-ntp",
-- "owners": [ "chrome-omnibox-team@google.com" ],
-+ "owners": [ "chrome-omnibox-team@9oo91e.qjz9zk" ],
- "expiry_milestone": 81
+- "owners": [ "tommycli", "chrome-omnibox-team@google.com" ],
++ "owners": [ "tommycli", "chrome-omnibox-team@9oo91e.qjz9zk" ],
+ "expiry_milestone": 85
},
{
-@@ -2802,17 +2802,17 @@
+@@ -2937,17 +2937,17 @@
},
{
"name": "on-the-fly-mhtml-hash-computation",
@@ -13836,7 +13398,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 82
},
{
-@@ -2842,7 +2842,7 @@
+@@ -2977,7 +2977,7 @@
},
{
"name": "overlay-strategies",
@@ -13845,7 +13407,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
// This flag is used for QA & debugging on ChromeOS, which has no way to
// customize switches.
"expiry_milestone": -1
-@@ -2889,7 +2889,7 @@
+@@ -3034,7 +3034,7 @@
},
{
"name": "pdf-annotations",
@@ -13854,7 +13416,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 76
},
{
-@@ -2904,7 +2904,7 @@
+@@ -3049,7 +3049,7 @@
},
{
"name": "percent-based-scrolling",
@@ -13863,7 +13425,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 82
},
{
-@@ -2930,7 +2930,7 @@
+@@ -3070,7 +3070,7 @@
{
"name": "privacy-settings-redesign",
"owners": ["harrisonsean", "msramek",
@@ -13872,7 +13434,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 82
},
{
-@@ -3019,7 +3019,7 @@
+@@ -3164,7 +3164,7 @@
},
{
"name": "scrollable-tabstrip",
@@ -13881,7 +13443,28 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 82
},
{
-@@ -3167,7 +3167,7 @@
+@@ -3266,7 +3266,7 @@
+ },
+ {
+ "name": "show-bluetooth-device-battery",
+- "owners": [ "hansberry", "cros-system-services@google.com" ],
++ "owners": [ "hansberry", "cros-system-services@9oo91e.qjz9zk" ],
+ "expiry_milestone": 85
+ },
+ {
+@@ -3337,17 +3337,17 @@
+ },
+ {
+ "name": "split-settings",
+- "owners": [ "jamescook", "cros-system-services@google.com" ],
++ "owners": [ "jamescook", "cros-system-services@9oo91e.qjz9zk" ],
+ "expiry_milestone": 80
+ },
+ {
+ "name": "split-settings-sync",
+- "owners": [ "jamescook", "cros-system-services@google.com" ],
++ "owners": [ "jamescook", "cros-system-services@9oo91e.qjz9zk" ],
+ "expiry_milestone": 82
},
{
"name": "stop-in-background",
@@ -13890,7 +13473,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 76
},
{
-@@ -3177,7 +3177,7 @@
+@@ -3357,7 +3357,7 @@
},
{
"name": "storage-access-api",
@@ -13899,16 +13482,16 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 80
},
{
-@@ -3207,7 +3207,7 @@
+@@ -3377,7 +3377,7 @@
},
{
"name": "sync-wifi-configurations",
- "owners": ["jonmann", "cros-system-services@google.com"],
+ "owners": ["jonmann", "cros-system-services@9oo91e.qjz9zk"],
- "expiry_milestone": 80
+ "expiry_milestone": 85
},
{
-@@ -3217,7 +3217,7 @@
+@@ -3387,7 +3387,7 @@
},
{
"name": "tab-groups",
@@ -13917,7 +13500,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 82
},
{
-@@ -3237,7 +3237,7 @@
+@@ -3407,7 +3407,7 @@
},
{
"name": "tab-switcher-longpress-menu",
@@ -13926,7 +13509,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 81
},
{
-@@ -3257,7 +3257,7 @@
+@@ -3432,7 +3432,7 @@
},
{
"name": "tint-gl-composited-content",
@@ -13935,7 +13518,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
// This flag is used for QA & development on ChromeOS, which has no way to
// customize switches.
"expiry_milestone": -1
-@@ -3269,7 +3269,7 @@
+@@ -3444,7 +3444,7 @@
},
{
"name": "top-chrome-touch-ui",
@@ -13944,7 +13527,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 81
},
{
-@@ -3299,19 +3299,19 @@
+@@ -3474,19 +3474,19 @@
},
{
"name": "translate-android-manual-trigger",
@@ -13964,10 +13547,10 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"name": "translate-ui-bubble-options",
- "owners": [ "hhw", "anthonyvd", "chrome-language@google.com" ],
+ "owners": [ "hhw", "anthonyvd", "chrome-language@9oo91e.qjz9zk" ],
- "expiry_milestone": 78
+ "expiry_milestone": 82
},
{
-@@ -3336,7 +3336,7 @@
+@@ -3511,7 +3511,7 @@
},
{
"name": "turn-off-streaming-media-caching",
@@ -13976,7 +13559,13 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 82
},
{
-@@ -3387,12 +3387,12 @@
+@@ -3562,17 +3562,17 @@
+ },
+ {
+ "name": "updated_cellular_activation_ui",
+- "owners": [ "azeemarshad", "khorimoto", "vecore", "cros-system-services@google.com" ],
++ "owners": [ "azeemarshad", "khorimoto", "vecore", "cros-system-services@9oo91e.qjz9zk" ],
+ "expiry_milestone": 85
},
{
"name": "usage-stats",
@@ -13991,7 +13580,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
// This flag is used by certain customers to set ANGLE to use its OpenGL
// backend on Windows. Its usage is small enough that it isn't worth
// promoting this to a chrome://settings entry, but it needs to be readily
-@@ -3401,7 +3401,7 @@
+@@ -3581,7 +3581,7 @@
},
{
"name": "use-fake-device-for-media-stream",
@@ -14000,7 +13589,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
"expiry_milestone": 81
},
{
-@@ -3464,7 +3464,7 @@
+@@ -3639,7 +3639,7 @@
},
{
"name": "wallet-service-use-sandbox",
@@ -14009,7 +13598,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
// This flag is used by testing teams to run Google Payments calls against
// the development server environment.
"expiry_milestone": -1
-@@ -3491,52 +3491,52 @@
+@@ -3671,57 +3671,57 @@
},
{
"name": "webxr",
@@ -14053,11 +13642,17 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
+ "owners": [ "//third_party/blink/renderer/modules/xr/OWNERS", "xr-dev@ch40m1um.qjz9zk" ],
"expiry_milestone": 82
},
+ {
+ "name": "win-use-hybrid-spellchecker",
+- "owners": [ "gujen@google.com", "chrome-language@google.com" ],
++ "owners": [ "gujen@9oo91e.qjz9zk", "chrome-language@9oo91e.qjz9zk" ],
+ "expiry_milestone": 83
+ },
{
"name": "win-use-native-spellchecker",
-- "owners": [ "gujen@google.com", "yyushkina@google.com" ],
-+ "owners": [ "gujen@9oo91e.qjz9zk", "yyushkina@9oo91e.qjz9zk" ],
- "expiry_milestone": 81
+- "owners": [ "gujen@google.com", "chrome-language@google.com" ],
++ "owners": [ "gujen@9oo91e.qjz9zk", "chrome-language@9oo91e.qjz9zk" ],
+ "expiry_milestone": 83
},
{
"name": "windows-mixed-reality",
@@ -14075,7 +13670,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
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
-@@ -98,9 +98,9 @@ const char kUpdatedCellularActivationUiName[] =
+@@ -105,9 +105,9 @@ const char kUpdatedCellularActivationUiName[] =
const char kUpdatedCellularActivationUiDescription[] =
"Enables the updated cellular activation UI.";
@@ -14300,7 +13895,7 @@ diff --git a/chrome/browser/local_discovery/service_discovery_client_mac.mm b/ch
diff --git a/chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc b/chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc
--- a/chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc
+++ b/chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc
-@@ -101,7 +101,7 @@ std::string GetSimilarDomainFromTop500(const DomainInfo& navigated_domain) {
+@@ -96,7 +96,7 @@ std::string GetSimilarDomainFromTop500(const DomainInfo& navigated_domain) {
// If the only difference between the navigated and top
// domains is the registry part, this is unlikely to be a spoofing
// attempt. Ignore this match and continue. E.g. If the navigated domain
@@ -14309,7 +13904,7 @@ diff --git a/chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc b/ch
// produce a match.
const std::string top_domain_without_registry =
url_formatter::top_domains::HostnameWithoutRegistry(top_domain);
-@@ -135,7 +135,7 @@ std::string GetSimilarDomainFromEngagedSites(
+@@ -129,7 +129,7 @@ std::string GetSimilarDomainFromEngagedSites(
// If the only difference between the navigated and engaged
// domain is the registry part, this is unlikely to be a spoofing
// attempt. Ignore this match and continue. E.g. If the navigated
@@ -14318,7 +13913,7 @@ diff --git a/chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc b/ch
// won't produce a match.
if (navigated_domain.domain_without_registry !=
engaged_site.domain_without_registry) {
-@@ -309,7 +309,7 @@ ThrottleCheckResult LookalikeUrlNavigationThrottle::HandleThrottleRequest(
+@@ -331,7 +331,7 @@ ThrottleCheckResult LookalikeUrlNavigationThrottle::HandleThrottleRequest(
IsInterstitialReload(url, interstitial_params.redirect_chain)) {
CHECK(interstitial_params.url.SchemeIsHTTPOrHTTPS());
// See
@@ -14327,7 +13922,7 @@ diff --git a/chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc b/ch
// for why this is OK. Assume interstitial reloads are always browser
// initiated.
navigation_handle()->GetWebContents()->OpenURL(content::OpenURLParams(
-@@ -565,17 +565,17 @@ ThrottleCheckResult LookalikeUrlNavigationThrottle::PerformChecks(
+@@ -587,17 +587,17 @@ ThrottleCheckResult LookalikeUrlNavigationThrottle::PerformChecks(
// eTLD+1s only so this works well.
// 2. If matched_domain is an engaged domain and is not an eTLD+1, don't
// suggest it. Otherwise, navigating to googlé.com and having engaged with
@@ -14353,14 +13948,14 @@ diff --git a/chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc b/ch
diff --git a/chrome/browser/lookalikes/lookalike_url_service.h b/chrome/browser/lookalikes/lookalike_url_service.h
--- a/chrome/browser/lookalikes/lookalike_url_service.h
+++ b/chrome/browser/lookalikes/lookalike_url_service.h
-@@ -36,7 +36,7 @@ struct DomainInfo {
- // eTLD+1, used for skeleton and edit distance comparison. Must be ASCII.
+@@ -35,7 +35,7 @@ struct DomainInfo {
// Empty for non-unique domains, localhost or sites whose eTLD+1 is empty.
const std::string domain_and_registry;
-- // eTLD+1 without the registry part. For "www.google.com", this will be
-+ // eTLD+1 without the registry part. For "www.9oo91e.qjz9zk", this will be
- // "google". Used for edit distance comparisons.
- // Empty for non-unique domains, localhost or sites whose eTLD+1 is empty.
+ // eTLD+1 without the registry part, and with a trailing period. For
+- // "www.google.com", this will be "google.". Used for edit distance
++ // "www.9oo91e.qjz9zk", this will be "google.". Used for edit distance
+ // comparisons. Empty for non-unique domains, localhost or sites whose eTLD+1
+ // is empty.
const std::string domain_without_registry;
diff --git a/chrome/browser/media/android/remote/flinging_controller_bridge.cc b/chrome/browser/media/android/remote/flinging_controller_bridge.cc
--- a/chrome/browser/media/android/remote/flinging_controller_bridge.cc
@@ -14425,7 +14020,7 @@ diff --git a/chrome/browser/media/router/presentation/local_presentation_manager
diff --git a/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc b/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc
--- a/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc
+++ b/chrome/browser/media/router/providers/cast/cast_media_route_provider.cc
-@@ -31,7 +31,7 @@ std::vector GetOrigins(const MediaSource::Id& source_id) {
+@@ -34,7 +34,7 @@ std::vector GetOrigins(const MediaSource::Id& source_id) {
return base::StartsWith(source_id, kMirroringAppPrefix,
base::CompareCase::SENSITIVE)
? std::vector(
@@ -14459,7 +14054,7 @@ diff --git a/chrome/browser/media/router/providers/dial/dial_media_route_provide
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
--- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
-@@ -122,7 +122,7 @@ void OnURLLoadUploadProgress(uint64_t current, uint64_t total) {
+@@ -123,7 +123,7 @@ void OnURLLoadUploadProgress(uint64_t current, uint64_t total) {
} // namespace
const char WebRtcEventLogUploaderImpl::kUploadURL[] =
@@ -14529,7 +14124,7 @@ diff --git a/chrome/browser/nacl_host/nacl_infobar_delegate.cc b/chrome/browser/
diff --git a/chrome/browser/net/dns_probe_runner.cc b/chrome/browser/net/dns_probe_runner.cc
--- a/chrome/browser/net/dns_probe_runner.cc
+++ b/chrome/browser/net/dns_probe_runner.cc
-@@ -16,7 +16,7 @@
+@@ -18,7 +18,7 @@
namespace chrome_browser_net {
@@ -14598,7 +14193,7 @@ diff --git a/chrome/browser/notifications/notification_permission_context.h b/ch
diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/chrome/browser/notifications/notification_platform_bridge_mac.mm
--- a/chrome/browser/notifications/notification_platform_bridge_mac.mm
+++ b/chrome/browser/notifications/notification_platform_bridge_mac.mm
-@@ -489,7 +489,7 @@ bool NotificationPlatformBridgeMac::VerifyNotificationData(
+@@ -479,7 +479,7 @@ bool NotificationPlatformBridgeMac::VerifyNotificationData(
// Overriden from _NSUserNotificationCenterDelegatePrivate.
// Emitted when a user closes a notification from the notification center.
// This is an undocumented method introduced in 10.8 according to
@@ -14634,7 +14229,7 @@ diff --git a/chrome/browser/page_load_metrics/observers/amp_page_load_metrics_ob
diff --git a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.cc b/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.cc
--- a/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.cc
+++ b/chrome/browser/page_load_metrics/observers/from_gws_page_load_metrics_observer.cc
-@@ -505,7 +505,7 @@ bool FromGWSPageLoadMetricsLogger::ShouldLogPostCommitMetrics(const GURL& url) {
+@@ -522,7 +522,7 @@ bool FromGWSPageLoadMetricsLogger::ShouldLogPostCommitMetrics(const GURL& url) {
// redirector url), so we should not log stats. We could try to detect only
// the specific known search URLs here, and log navigations to other pages on
// the google search hostname (for example, a search for 'about google'
@@ -14694,39 +14289,48 @@ diff --git a/chrome/browser/permissions/mock_permission_request.cc b/chrome/brow
- GURL("http://www.google.com"),
+ GURL("http://www.9oo91e.qjz9zk"),
PermissionRequestType::PERMISSION_NOTIFICATIONS,
- PermissionRequestGestureType::UNKNOWN) {}
-
-@@ -25,7 +25,7 @@ MockPermissionRequest::MockPermissionRequest(const std::string& text)
+ PermissionRequestGestureType::UNKNOWN,
+ ContentSettingsType::NOTIFICATIONS) {}
+@@ -26,7 +26,7 @@ MockPermissionRequest::MockPermissionRequest(const std::string& text)
: MockPermissionRequest(text,
"button",
"button",
- GURL("http://www.google.com"),
+ GURL("http://www.9oo91e.qjz9zk"),
PermissionRequestType::PERMISSION_NOTIFICATIONS,
- PermissionRequestGestureType::UNKNOWN) {}
-
-@@ -36,7 +36,7 @@ MockPermissionRequest::MockPermissionRequest(
+ PermissionRequestGestureType::UNKNOWN,
+ ContentSettingsType::NOTIFICATIONS) {}
+@@ -38,7 +38,7 @@ MockPermissionRequest::MockPermissionRequest(
: MockPermissionRequest(text,
"button",
"button",
-- GURL("http://www.google.com"),
-+ GURL("http://www.9oo91e.qjz9zk"),
- request_type,
- gesture_type) {}
-
-@@ -56,7 +56,7 @@ MockPermissionRequest::MockPermissionRequest(const std::string& text,
+- GURL("http://www.google.com"),
++ GURL("http://www.9oo91e.qjz9zk"),
+ request_type,
+ gesture_type,
+ ContentSettingsType::NOTIFICATIONS) {}
+@@ -60,7 +60,7 @@ MockPermissionRequest::MockPermissionRequest(const std::string& text,
: MockPermissionRequest(text,
accept_label,
deny_label,
- GURL("http://www.google.com"),
+ GURL("http://www.9oo91e.qjz9zk"),
PermissionRequestType::PERMISSION_NOTIFICATIONS,
- PermissionRequestGestureType::UNKNOWN) {}
-
+ PermissionRequestGestureType::UNKNOWN,
+ ContentSettingsType::NOTIFICATIONS) {}
+@@ -71,7 +71,7 @@ MockPermissionRequest::MockPermissionRequest(
+ : MockPermissionRequest(text,
+ "button",
+ "button",
+- GURL("http://www.google.com"),
++ GURL("http://www.9oo91e.qjz9zk"),
+ PermissionRequestType::PERMISSION_NOTIFICATIONS,
+ PermissionRequestGestureType::UNKNOWN,
+ content_settings_type_) {}
diff --git a/chrome/browser/permissions/permission_context_base.cc b/chrome/browser/permissions/permission_context_base.cc
--- a/chrome/browser/permissions/permission_context_base.cc
+++ b/chrome/browser/permissions/permission_context_base.cc
-@@ -50,33 +50,33 @@ const char kPermissionBlockedKillSwitchMessage[] =
+@@ -59,33 +59,33 @@ const char kPermissionBlockedKillSwitchMessage[] =
const char kPermissionBlockedRepeatedDismissalsMessage[] =
"%s permission has been blocked as the user has dismissed the permission "
"prompt several times. This can be reset in Site Settings. See "
@@ -14804,15 +14408,15 @@ diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_
diff --git a/chrome/browser/prefs/pref_metrics_service.cc b/chrome/browser/prefs/pref_metrics_service.cc
--- a/chrome/browser/prefs/pref_metrics_service.cc
+++ b/chrome/browser/prefs/pref_metrics_service.cc
-@@ -68,7 +68,7 @@ void PrefMetricsService::RecordHomePageLaunchMetrics(bool show_home_button,
+@@ -45,7 +45,7 @@ void PrefMetricsService::RecordHomePageLaunchMetrics(bool show_home_button,
// use, due to both false negatives (pages that come from unknown TLD+1 X but
// consist of a search box that sends to known TLD+1 Y) and false positives
// (pages that share a TLD+1 with a known engine but aren't actually search
-- // pages, e.g. plus.google.com). Additionally, record the TLD+1 of non-NTP
-+ // pages, e.g. plus.9oo91e.qjz9zk). Additionally, record the TLD+1 of non-NTP
- // homepages through the privacy-preserving Rappor service.
+- // pages, e.g. plus.google.com).
++ // pages, e.g. plus.9oo91e.qjz9zk).
if (!homepage_is_ntp) {
if (homepage_url.is_valid()) {
+ UMA_HISTOGRAM_ENUMERATION(
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
--- a/chrome/browser/process_singleton_posix.cc
+++ b/chrome/browser/process_singleton_posix.cc
@@ -14864,7 +14468,7 @@ diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
-@@ -1480,7 +1480,7 @@ GURL ProfileImpl::GetHomePage() {
+@@ -1424,7 +1424,7 @@ GURL ProfileImpl::GetHomePage() {
*base::CommandLine::ForCurrentProcess();
if (command_line.HasSwitch(switches::kHomePage)) {
// TODO(evanm): clean up usage of DIR_CURRENT.
@@ -14876,7 +14480,7 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/p
diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h
--- a/chrome/browser/profiles/profile_impl.h
+++ b/chrome/browser/profiles/profile_impl.h
-@@ -328,7 +328,7 @@ class ProfileImpl : public Profile {
+@@ -325,7 +325,7 @@ class ProfileImpl : public Profile {
// Profile use our new BrowserContextKeyedServiceFactory system instead.
// You can find the design document here:
//
@@ -14950,7 +14554,7 @@ diff --git a/chrome/browser/push_messaging/push_messaging_notification_manager.h
diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chrome/browser/push_messaging/push_messaging_service_impl.cc
--- a/chrome/browser/push_messaging/push_messaging_service_impl.cc
+++ b/chrome/browser/push_messaging/push_messaging_service_impl.cc
-@@ -86,7 +86,7 @@ const char kSilentPushUnsupportedMessage[] =
+@@ -84,7 +84,7 @@ const char kSilentPushUnsupportedMessage[] =
"Chrome currently only supports the Push API for subscriptions that will "
"result in user-visible messages. You can indicate this by calling "
"pushManager.subscribe({userVisibleOnly: true}) instead. See "
@@ -14974,15 +14578,15 @@ diff --git a/chrome/browser/resources/PRESUBMIT.py b/chrome/browser/resources/PR
diff --git a/chrome/browser/resources/bookmarks/command_manager.js b/chrome/browser/resources/bookmarks/command_manager.js
--- a/chrome/browser/resources/bookmarks/command_manager.js
+++ b/chrome/browser/resources/bookmarks/command_manager.js
-@@ -413,7 +413,7 @@ cr.define('bookmarks', function() {
- chrome.bookmarks.export();
- break;
- case Command.HELP_CENTER:
-- window.open('https://support.google.com/chrome/?p=bookmarks');
-+ window.open('https://support.9oo91e.qjz9zk/chrome/?p=bookmarks');
- break;
- default:
- assert(false);
+@@ -447,7 +447,7 @@ export const CommandManager = Polymer({
+ chrome.bookmarks.export();
+ break;
+ case Command.HELP_CENTER:
+- window.open('https://support.google.com/chrome/?p=bookmarks');
++ window.open('https://support.9oo91e.qjz9zk/chrome/?p=bookmarks');
+ break;
+ default:
+ assert(false);
diff --git a/chrome/browser/resources/chromeos/about_os_credits.html b/chrome/browser/resources/chromeos/about_os_credits.html
--- a/chrome/browser/resources/chromeos/about_os_credits.html
+++ b/chrome/browser/resources/chromeos/about_os_credits.html
@@ -15147,7 +14751,7 @@ diff --git a/chrome/browser/resources/chromeos/camera/src/js/google-analytics-bu
diff --git a/chrome/browser/resources/chromeos/camera/src/js/util.js b/chrome/browser/resources/chromeos/camera/src/js/util.js
--- a/chrome/browser/resources/chromeos/camera/src/js/util.js
+++ b/chrome/browser/resources/chromeos/camera/src/js/util.js
-@@ -866,7 +866,7 @@ cca.util.isWindowFullSize = function() {
+@@ -284,7 +284,7 @@ cca.util.isWindowFullSize = function() {
*/
cca.util.openHelp = function() {
window.open(
@@ -15168,409 +14772,6 @@ diff --git a/chrome/browser/resources/chromeos/camera/src/manifest.json b/chrome
],
"app": {
"background": {
-diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/background.js b/chrome/browser/resources/chromeos/chromevox/chromevox/background/background.js
---- a/chrome/browser/resources/chromeos/chromevox/chromevox/background/background.js
-+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/background.js
-@@ -359,7 +359,7 @@ cvox.ChromeVoxBackground.prototype.addBridgeListener = function() {
- chrome.tabs.create(explorerPage);
- break;
- case 'HelpDocs':
-- var helpPage = {url: 'http://chromevox.com/tutorial/index.html'};
-+ var helpPage = {url: 'http://ch40mevox.qjz9zk/tutorial/index.html'};
- chrome.tabs.create(helpPage);
- break;
- case 'Options':
-diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/options.css b/chrome/browser/resources/chromeos/chromevox/chromevox/background/options.css
---- a/chrome/browser/resources/chromeos/chromevox/chromevox/background/options.css
-+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/options.css
-@@ -2,7 +2,7 @@
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file. */
-
--@import url(https://fonts.googleapis.com/css?family=Roboto);
-+@import url(https://f0ntz.9oo91e8p1.qjz9zk/css?family=Roboto);
-
- body {
- margin: 0 0 20px 0;
-diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/options.js b/chrome/browser/resources/chromeos/chromevox/chromevox/background/options.js
---- a/chrome/browser/resources/chromeos/chromevox/chromevox/background/options.js
-+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/options.js
-@@ -100,7 +100,7 @@ cvox.OptionsPage.init = function() {
- }
- }
-
-- chrome.commandLinePrivate.hasSwitch(
-+ ch40me.qjz9zkmandLinePrivate.hasSwitch(
- 'enable-experimental-accessibility-chromevox-language-switching',
- function(enabled) {
- if (!enabled) {
-diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/background/prefs.js b/chrome/browser/resources/chromeos/chromevox/chromevox/background/prefs.js
---- a/chrome/browser/resources/chromeos/chromevox/chromevox/background/prefs.js
-+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/background/prefs.js
-@@ -87,9 +87,9 @@ cvox.ChromeVoxPrefs.DEFAULT_PREFS = {
- 'position': '{}',
- 'siteSpecificEnhancements': true,
- 'siteSpecificScriptBase':
-- 'https://ssl.gstatic.com/accessibility/javascript/ext/',
-+ 'https://ssl.95tat1c.qjz9zk/accessibility/javascript/ext/',
- 'siteSpecificScriptLoader':
-- 'https://ssl.gstatic.com/accessibility/javascript/ext/loader.js',
-+ 'https://ssl.95tat1c.qjz9zk/accessibility/javascript/ext/loader.js',
- 'speakTextUnderMouse': false,
- 'sticky': false,
- 'typingEcho': 0,
-@@ -170,7 +170,7 @@ cvox.ChromeVoxPrefs.prototype.init = function(pullFromLocalStorage) {
- }
- // Since language switching is currently an experimental feature, ensure that
- // it is off if the feature flag is absent.
-- chrome.commandLinePrivate.hasSwitch(
-+ ch40me.qjz9zkmandLinePrivate.hasSwitch(
- 'enable-experimental-accessibility-chromevox-language-switching',
- function(enabled) {
- if (!enabled) {
-diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/event_watcher.js b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/event_watcher.js
---- a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/event_watcher.js
-+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/event_watcher.js
-@@ -364,7 +364,7 @@ cvox.ChromeVoxEventWatcher.addEventListeners_ = function(doc) {
- doc, 'select', cvox.ChromeVoxEventWatcher.selectEventWatcher, true);
-
- // TODO(dtseng): Experimental, see:
-- // https://developers.google.com/chrome/whitepapers/pagevisibility
-+ // https://developers.9oo91e.qjz9zk/chrome/whitepapers/pagevisibility
- cvox.ChromeVoxEventWatcher.addEventListener_(
- doc, 'webkitvisibilitychange',
- cvox.ChromeVoxEventWatcher.visibilityChangeWatcher, true);
-diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/history.js b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/history.js
---- a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/history.js
-+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/history.js
-@@ -396,7 +396,7 @@ cvox.History.sendToFeedback = function() {
-
- var feedbackScript = document.createElement('script');
- feedbackScript.type = 'text/javascript';
-- feedbackScript.src = 'https://www.gstatic.com/feedback/api.js';
-+ feedbackScript.src = 'https://www.95tat1c.qjz9zk/feedback/api.js';
-
- var runFeedbackScript = document.createElement('script');
- runFeedbackScript.type = 'text/javascript';
-diff --git a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/navigation_manager.js b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/navigation_manager.js
---- a/chrome/browser/resources/chromeos/chromevox/chromevox/injected/navigation_manager.js
-+++ b/chrome/browser/resources/chromeos/chromevox/chromevox/injected/navigation_manager.js
-@@ -98,7 +98,7 @@ cvox.NavigationManager.prototype.reset = function() {
- this.shifter_ = new cvox.NavigationShifter();
-
- // NOTE(deboer): document.activeElement can not be null (c.f.
-- // https://developer.mozilla.org/en-US/docs/DOM/document.activeElement)
-+ // https://developer.m0z111a.qjz9zk/en-US/docs/DOM/document.activeElement)
- // Instead, if there is no active element, activeElement is set to
- // document.body.
- /**
-diff --git a/chrome/browser/resources/chromeos/chromevox/common/dom_util.js b/chrome/browser/resources/chromeos/chromevox/common/dom_util.js
---- a/chrome/browser/resources/chromeos/chromevox/common/dom_util.js
-+++ b/chrome/browser/resources/chromeos/chromevox/common/dom_util.js
-@@ -1438,7 +1438,7 @@ cvox.DomUtil.isFocusable = function(targetNode) {
- return false;
- }
-
-- // Workaround for http://code.google.com/p/chromium/issues/detail?id=153904
-+ // Workaround for http://code.9oo91e.qjz9zk/p/chromium/issues/detail?id=153904
- if ((targetNode.tagName == 'A') && !targetNode.hasAttribute('href') &&
- !targetNode.hasAttribute('tabindex')) {
- return false;
-@@ -2062,7 +2062,7 @@ cvox.DomUtil.isLayoutTable = function(tableNode) {
-
- // These heuristics are loosely based on Okada and Miura's "Detection of
- // Layout-Purpose TABLE Tags Based on Machine Learning" (2007).
-- // http://books.google.com/books?id=kUbmdqasONwC&lpg=PA116&ots=Lb3HJ7dISZ&lr&pg=PA116
-+ // http://books.9oo91e.qjz9zk/books?id=kUbmdqasONwC&lpg=PA116&ots=Lb3HJ7dISZ&lr&pg=PA116
-
- // Increase the points for each heuristic. If there are 3 or more points,
- // this is probably a layout table.
-@@ -2147,7 +2147,7 @@ cvox.DomUtil.hasBorder = function(tableNode) {
- }
-
- // If .style.border-width is specified in units of length
-- // ( https://developer.mozilla.org/en/CSS/border-width ) then we need
-+ // ( https://developer.m0z111a.qjz9zk/en/CSS/border-width ) then we need
- // to check if .style.border-width starts with 0[px,em,etc]
- if (tableNode.style.borderWidth) {
- return (tableNode.style.borderWidth.slice(0, -2) != 0);
-@@ -2185,7 +2185,7 @@ cvox.DomUtil.getFirstLeafNode = function() {
- * CSS selector expressions. These expressions often result in a more
- * compact representation of the desired result.
- * This is the findNode function from goog.dom:
-- * http://code.google.com/p/closure-library/source/browse/trunk/closure/goog/dom/dom.js
-+ * http://code.9oo91e.qjz9zk/p/closure-library/source/browse/trunk/closure/goog/dom/dom.js
- *
- * @param {Node} root The root of the tree to search.
- * @param {function(Node) : boolean} p The filter function.
-@@ -2223,7 +2223,7 @@ cvox.DomUtil.countNodes = function(root, p) {
- * @return {boolean} Whether the search is complete or not. True in case
- * findOne is true and the node is found. False otherwise. This is the
- * findNodes_ function from goog.dom:
-- * http://code.google.com/p/closure-library/source/browse/trunk/closure/goog/dom/dom.js.
-+ * http://code.9oo91e.qjz9zk/p/closure-library/source/browse/trunk/closure/goog/dom/dom.js.
- * @private
- */
- cvox.DomUtil.findNodes_ = function(root, p, rv, findOne, maxChildCount) {
-diff --git a/chrome/browser/resources/chromeos/chromevox/common/selection_util.js b/chrome/browser/resources/chromeos/chromevox/common/selection_util.js
---- a/chrome/browser/resources/chromeos/chromevox/common/selection_util.js
-+++ b/chrome/browser/resources/chromeos/chromevox/common/selection_util.js
-@@ -292,7 +292,7 @@ cvox.SelectionUtil.scrollToSelection = function(sel) {
- };
-
- /**
-- * This is from https://developer.mozilla.org/en/Whitespace_in_the_DOM
-+ * This is from https://developer.m0z111a.qjz9zk/en/Whitespace_in_the_DOM
- * Determine whether a node's text content is entirely whitespace.
- *
- * Throughout, whitespace is defined as one of the characters
-@@ -316,7 +316,7 @@ cvox.SelectionUtil.isAllWs = function(node) {
-
-
- /**
-- * This is from https://developer.mozilla.org/en/Whitespace_in_the_DOM
-+ * This is from https://developer.m0z111a.qjz9zk/en/Whitespace_in_the_DOM
- * Determine if a node should be ignored by the iterator functions.
- *
- * @param {Node} node An object implementing the DOM1 |Node| interface.
-@@ -333,7 +333,7 @@ cvox.SelectionUtil.isIgnorable = function(node) {
- };
-
- /**
-- * This is from https://developer.mozilla.org/en/Whitespace_in_the_DOM
-+ * This is from https://developer.m0z111a.qjz9zk/en/Whitespace_in_the_DOM
- * Version of |previousSibling| that skips nodes that are entirely
- * whitespace or comments. (Normally |previousSibling| is a property
- * of all DOM nodes that gives the sibling node, the node that is
-@@ -356,7 +356,7 @@ cvox.SelectionUtil.nodeBefore = function(sib) {
- };
-
- /**
-- * This is from https://developer.mozilla.org/en/Whitespace_in_the_DOM
-+ * This is from https://developer.m0z111a.qjz9zk/en/Whitespace_in_the_DOM
- * Version of |nextSibling| that skips nodes that are entirely
- * whitespace or comments.
- *
-@@ -376,7 +376,7 @@ cvox.SelectionUtil.nodeAfter = function(sib) {
- };
-
- /**
-- * This is from https://developer.mozilla.org/en/Whitespace_in_the_DOM
-+ * This is from https://developer.m0z111a.qjz9zk/en/Whitespace_in_the_DOM
- * Version of |lastChild| that skips nodes that are entirely
- * whitespace or comments. (Normally |lastChild| is a property
- * of all DOM nodes that gives the last of the nodes contained
-@@ -400,7 +400,7 @@ cvox.SelectionUtil.lastChildNode = function(par) {
- };
-
- /**
-- * This is from https://developer.mozilla.org/en/Whitespace_in_the_DOM
-+ * This is from https://developer.m0z111a.qjz9zk/en/Whitespace_in_the_DOM
- * Version of |firstChild| that skips nodes that are entirely
- * whitespace and comments.
- *
-@@ -422,7 +422,7 @@ cvox.SelectionUtil.firstChildNode = function(par) {
- };
-
- /**
-- * This is from https://developer.mozilla.org/en/Whitespace_in_the_DOM
-+ * This is from https://developer.m0z111a.qjz9zk/en/Whitespace_in_the_DOM
- * Version of |data| that doesn't include whitespace at the beginning
- * and end and normalizes all whitespace to a single space. (Normally
- * |data| is a property of text nodes that gives the text of the node.)
-diff --git a/chrome/browser/resources/chromeos/chromevox/common/traverse_table.js b/chrome/browser/resources/chromeos/chromevox/common/traverse_table.js
---- a/chrome/browser/resources/chromeos/chromevox/common/traverse_table.js
-+++ b/chrome/browser/resources/chromeos/chromevox/common/traverse_table.js
-@@ -961,7 +961,7 @@ cvox.TraverseTable.prototype.getRow = function() {
- * 2) Null if the table does not contain a summary attribute.
- */
- cvox.TraverseTable.prototype.summaryText = function() {
-- // see http://code.google.com/p/chromium/issues/detail?id=46567
-+ // see http://code.9oo91e.qjz9zk/p/chromium/issues/detail?id=46567
- // for information why this is necessary
- if (!this.activeTable_.hasAttribute('summary')) {
- return null;
-diff --git a/chrome/browser/resources/chromeos/chromevox/common/traverse_util.js b/chrome/browser/resources/chromeos/chromevox/common/traverse_util.js
---- a/chrome/browser/resources/chromeos/chromevox/common/traverse_util.js
-+++ b/chrome/browser/resources/chromeos/chromevox/common/traverse_util.js
-@@ -53,7 +53,7 @@ cvox.TraverseUtil.treatAsLeafNode = function(node) {
-
- /**
- * Return true only if a single character is whitespace.
-- * From https://developer.mozilla.org/en/Whitespace_in_the_DOM,
-+ * From https://developer.m0z111a.qjz9zk/en/Whitespace_in_the_DOM,
- * whitespace is defined as one of the characters
- * "\t" TAB \u0009
- * "\n" LF \u000A
-diff --git a/chrome/browser/resources/chromeos/chromevox/common/xpath_util.js b/chrome/browser/resources/chromeos/chromevox/common/xpath_util.js
---- a/chrome/browser/resources/chromeos/chromevox/common/xpath_util.js
-+++ b/chrome/browser/resources/chromeos/chromevox/common/xpath_util.js
-@@ -43,7 +43,7 @@ cvox.XpathUtil.resolveNameSpace = function(prefix) {
- * Given an XPath expression and rootNode, it returns an array of children nodes
- * that match. The code for this function was taken from Mihai Parparita's GMail
- * Macros Greasemonkey Script.
-- * http://gmail-greasemonkey.googlecode.com/svn/trunk/scripts/gmail-new-macros.user.js
-+ * http://gmail-greasemonkey.9oo91ecode.qjz9zk/svn/trunk/scripts/gmail-new-macros.user.js
- * @param {string} expression The XPath expression to evaluate.
- * @param {Node} rootNode The HTML node to start evaluating the XPath from.
- * @return {Array} The array of children nodes that match.
-diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/command_handler.js b/chrome/browser/resources/chromeos/chromevox/cvox2/background/command_handler.js
---- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/command_handler.js
-+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/command_handler.js
-@@ -204,7 +204,7 @@ CommandHandler.onCommand = function(command) {
- cvox.QueueMode.FLUSH);
- return false;
- case 'reportIssue':
-- var url = 'https://code.google.com/p/chromium/issues/entry?' +
-+ var url = 'https://code.9oo91e.qjz9zk/p/chromium/issues/entry?' +
- 'labels=Type-Bug,Pri-2,cvox2,OS-Chrome&' +
- 'components=UI>accessibility&' +
- 'description=';
-diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/language_switching.js b/chrome/browser/resources/chromeos/chromevox/cvox2/background/language_switching.js
---- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/language_switching.js
-+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/language_switching.js
-@@ -54,7 +54,7 @@ LanguageSwitching.availableVoices_ = [];
- */
- LanguageSwitching.init = function() {
- // Enable sub-node language switching if feature flag is enabled.
-- chrome.commandLinePrivate.hasSwitch(
-+ ch40me.qjz9zkmandLinePrivate.hasSwitch(
- 'enable-experimental-accessibility-chromevox-sub-node-language-' +
- 'switching',
- function(enabled) {
-@@ -288,7 +288,7 @@ LanguageSwitching.hasVoiceForLanguage = function(languageCode) {
- for (var i = 0; i < LanguageSwitching.availableVoices_.length; ++i) {
- // Note: availableVoices_[i].lang is always in the form of
- // 'language-region'. See link for documentation on chrome.tts api:
-- // https://developer.chrome.com/apps/tts#type-TtsVoice
-+ // https://developer.ch40me.qjz9zk/apps/tts#type-TtsVoice
- var candidateLanguage =
- LanguageSwitching.availableVoices_[i].lang.toLowerCase().split('-')[0];
- if (language === candidateLanguage)
-diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/panel.html b/chrome/browser/resources/chromeos/chromevox/cvox2/background/panel.html
---- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/panel.html
-+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/panel.html
-@@ -6,7 +6,7 @@
-
-
-
--
-+
-
-
-
-diff --git a/chrome/browser/resources/chromeos/chromevox/cvox2/background/tutorial.js b/chrome/browser/resources/chromeos/chromevox/cvox2/background/tutorial.js
---- a/chrome/browser/resources/chromeos/chromevox/cvox2/background/tutorial.js
-+++ b/chrome/browser/resources/chromeos/chromevox/cvox2/background/tutorial.js
-@@ -128,15 +128,15 @@ Tutorial.PAGES = [
- {msgid: 'tutorial_learn_more'},
- {
- msgid: 'next_command_reference',
-- link: 'http://www.chromevox.com/next_keyboard_shortcuts.html'
-+ link: 'http://www.ch40mevox.qjz9zk/next_keyboard_shortcuts.html'
- },
- {
- msgid: 'chrome_keyboard_shortcuts',
-- link: 'https://support.google.com/chromebook/answer/183101?hl=en'
-+ link: 'https://support.9oo91e.qjz9zk/chromebook/answer/183101?hl=en'
- },
- {
- msgid: 'touchscreen_accessibility',
-- link: 'https://support.google.com/chromebook/answer/6103702?hl=en'
-+ link: 'https://support.9oo91e.qjz9zk/chromebook/answer/6103702?hl=en'
- },
- ],
- ];
-diff --git a/chrome/browser/resources/chromeos/chromevox/extensions/searchvox/loader.js b/chrome/browser/resources/chromeos/chromevox/extensions/searchvox/loader.js
---- a/chrome/browser/resources/chromeos/chromevox/extensions/searchvox/loader.js
-+++ b/chrome/browser/resources/chromeos/chromevox/extensions/searchvox/loader.js
-@@ -24,7 +24,7 @@ cvox.SearchLoader.onReadyStateChange = function() {
- if (document.readyState !== 'complete') {
- return;
- }
-- var GOOGLE_HOST = 'www.google.com';
-+ var GOOGLE_HOST = 'www.9oo91e.qjz9zk';
- var SEARCH_PATH = '/search';
-
- if (window.location.host !== GOOGLE_HOST ||
-diff --git a/chrome/browser/resources/chromeos/chromevox/manifest.json.jinja2 b/chrome/browser/resources/chromeos/chromevox/manifest.json.jinja2
---- a/chrome/browser/resources/chromeos/chromevox/manifest.json.jinja2
-+++ b/chrome/browser/resources/chromeos/chromevox/manifest.json.jinja2
-@@ -43,8 +43,8 @@
- {% if is_webstore is not defined %}
- "chrome-extension://*",
- "chrome://*",
-- "https://accounts.google.com/embedded/setup/chromeos*",
-- "https://talkgadget.google.com/hangouts*",
-+ "https://accounts.9oo91e.qjz9zk/embedded/setup/chromeos*",
-+ "https://talkgadget.9oo91e.qjz9zk/hangouts*",
- "*.pdf"
- {% endif %}
- ],
-diff --git a/chrome/browser/resources/chromeos/chromevox/strings/chromevox_strings.grd b/chrome/browser/resources/chromeos/chromevox/strings/chromevox_strings.grd
---- a/chrome/browser/resources/chromeos/chromevox/strings/chromevox_strings.grd
-+++ b/chrome/browser/resources/chromeos/chromevox/strings/chromevox_strings.grd
-@@ -114,7 +114,7 @@
-
-
-
--
-+
- en
-
-
-@@ -159,13 +159,13 @@
-
- Decrease navigation granularity
-
--
-+
- Increase navigation granularity
-
-
- Move to previous at granularity
-
--
-+
- Move to next at granularity
-
-
-diff --git a/chrome/browser/resources/chromeos/chromevox/tools/webstore_extension_util.py b/chrome/browser/resources/chromeos/chromevox/tools/webstore_extension_util.py
---- a/chrome/browser/resources/chromeos/chromevox/tools/webstore_extension_util.py
-+++ b/chrome/browser/resources/chromeos/chromevox/tools/webstore_extension_util.py
-@@ -19,7 +19,7 @@ import webbrowser
-
- PROJECT_ARGS = {
- 'client_id': ('937534751394-gbj5334v9144c57qjqghl7d283plj5r4'
-- '.apps.googleusercontent.com'),
-+ '.apps.9oo91eusercontent.qjz9zk'),
- 'grant_type': 'authorization_code',
- 'redirect_uri': 'http://localhost:8000'
- }
-@@ -33,11 +33,11 @@ g_app_id = ''
-
- # Constants.
- PORT = 8000
--OAUTH_DOMAIN = 'accounts.google.com'
-+OAUTH_DOMAIN = 'accounts.9oo91e.qjz9zk'
- OAUTH_AUTH_COMMAND = '/o/oauth2/auth'
- OAUTH_TOKEN_COMMAND = '/o/oauth2/token'
--WEBSTORE_API_SCOPE = 'https://www.googleapis.com/auth/chromewebstore'
--API_ENDPOINT_DOMAIN = 'www.googleapis.com'
-+WEBSTORE_API_SCOPE = 'https://www.9oo91eapis.qjz9zk/auth/chromewebstore'
-+API_ENDPOINT_DOMAIN = 'www.9oo91eapis.qjz9zk'
-
- def GetUploadStatusCommand():
- global g_app_id
-@@ -99,7 +99,7 @@ def GetPopulatedHeader(client_secret):
- code = GetAuthCode()
- access_token = GetOauthToken(code, client_secret)
-
-- url = 'www.googleapis.com'
-+ url = 'www.9oo91eapis.qjz9zk'
-
- return {'Authorization': 'Bearer %(access_token)s' % access_token,
- 'x-goog-api-version': 2,
diff --git a/chrome/browser/resources/chromeos/connectivity_diagnostics/manifest.json b/chrome/browser/resources/chromeos/connectivity_diagnostics/manifest.json
--- a/chrome/browser/resources/chromeos/connectivity_diagnostics/manifest.json
+++ b/chrome/browser/resources/chromeos/connectivity_diagnostics/manifest.json
@@ -15620,7 +14821,7 @@ diff --git a/chrome/browser/resources/chromeos/echo/manifest.json b/chrome/brows
diff --git a/chrome/browser/resources/chromeos/emulator/icons.html b/chrome/browser/resources/chromeos/emulator/icons.html
--- a/chrome/browser/resources/chromeos/emulator/icons.html
+++ b/chrome/browser/resources/chromeos/emulator/icons.html
-@@ -5,7 +5,7 @@
+@@ -3,7 +3,7 @@
-diff --git a/components/gcm_driver/account_tracker.cc b/components/gcm_driver/account_tracker.cc
---- a/components/gcm_driver/account_tracker.cc
-+++ b/components/gcm_driver/account_tracker.cc
-@@ -221,7 +221,7 @@ AccountIdFetcher::~AccountIdFetcher() {
-
- void AccountIdFetcher::Start() {
- identity::ScopeSet scopes;
-- scopes.insert("https://www.googleapis.com/auth/userinfo.profile");
-+ scopes.insert("https://www.9oo91eapis.qjz9zk/auth/userinfo.profile");
- access_token_fetcher_ = identity_manager_->CreateAccessTokenFetcherForAccount(
- account_key_, "gaia_account_tracker", scopes,
- base::BindOnce(&AccountIdFetcher::AccessTokenFetched,
diff --git a/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GoogleCloudMessagingV2.java b/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GoogleCloudMessagingV2.java
--- a/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GoogleCloudMessagingV2.java
+++ b/components/gcm_driver/android/java/src/org/chromium/components/gcm_driver/GoogleCloudMessagingV2.java
@@ -30501,7 +29992,7 @@ diff --git a/components/gcm_driver/gcm_account_tracker.cc b/components/gcm_drive
diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gcm_client_impl.cc
--- a/components/gcm_driver/gcm_client_impl.cc
+++ b/components/gcm_driver/gcm_client_impl.cc
-@@ -87,7 +87,7 @@ const char kMessageTypeDeletedMessagesKey[] = "deleted_messages";
+@@ -88,7 +88,7 @@ const char kMessageTypeDeletedMessagesKey[] = "deleted_messages";
const char kMessageTypeKey[] = "message_type";
const char kMessageTypeSendErrorKey[] = "send_error";
const char kSubtypeKey[] = "subtype";
@@ -30513,7 +30004,7 @@ diff --git a/components/gcm_driver/gcm_client_impl.cc b/components/gcm_driver/gc
diff --git a/components/gcm_driver/web_push_sender.cc b/components/gcm_driver/web_push_sender.cc
--- a/components/gcm_driver/web_push_sender.cc
+++ b/components/gcm_driver/web_push_sender.cc
-@@ -27,14 +27,14 @@ namespace {
+@@ -27,7 +27,7 @@ namespace {
// VAPID header constants.
const char kClaimsKeyAudience[] = "aud";
@@ -30521,7 +30012,8 @@ diff --git a/components/gcm_driver/web_push_sender.cc b/components/gcm_driver/we
+const char kFCMServerAudience[] = "https://fcm.9oo91eapis.qjz9zk";
const char kClaimsKeyExpirationTime[] = "exp";
-
+ // It's 12 hours rather than 24 hours to avoid any issues with clock differences
+@@ -37,7 +37,7 @@ constexpr base::TimeDelta kClaimsValidPeriod = base::TimeDelta::FromHours(12);
const char kAuthorizationRequestHeaderFormat[] = "vapid t=%s, k=%s";
// Endpoint constants.
@@ -30606,7 +30098,7 @@ diff --git a/components/history/core/browser/browsing_history_service.cc b/compo
diff --git a/components/history/core/browser/domain_mixing_metrics.h b/components/history/core/browser/domain_mixing_metrics.h
--- a/components/history/core/browser/domain_mixing_metrics.h
+++ b/components/history/core/browser/domain_mixing_metrics.h
-@@ -16,7 +16,7 @@ namespace history {
+@@ -21,7 +21,7 @@ constexpr int kOneMonth = 30;
// Emits domain mixing metrics given a list of domain visits and the start of
// the first day to compute metrics for.
//
@@ -30618,7 +30110,7 @@ diff --git a/components/history/core/browser/domain_mixing_metrics.h b/component
diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc
--- a/components/history/core/browser/history_backend.cc
+++ b/components/history/core/browser/history_backend.cc
-@@ -332,10 +332,10 @@ SegmentID HistoryBackend::UpdateSegments(const GURL& url,
+@@ -388,10 +388,10 @@ SegmentID HistoryBackend::UpdateSegments(const GURL& url,
// same transition type. We are not adding it as a new segment in that case
// because if this was the target of a redirect, we might end up with
// 2 entries for the same final URL. Ex: User types google.net, gets
@@ -30633,7 +30125,7 @@ diff --git a/components/history/core/browser/history_backend.cc b/components/his
// in the segment table, showing as 2 entries in the NTP.
// Note also that we should still be updating the visit count for that segment
// which we are not doing now. It should be addressed when
-@@ -1747,30 +1747,30 @@ void HistoryBackend::MergeFavicon(
+@@ -1824,30 +1824,30 @@ void HistoryBackend::MergeFavicon(
// A site may have changed the favicons that it uses for |page_url|.
// Example Scenario:
@@ -30691,7 +30183,7 @@ diff --git a/components/history/core/browser/history_backend.h b/components/hist
// any registered callbacks. It is valid to call NotifyFaviconsChanged()
// with non-empty |page_urls| and an empty |icon_url| and vice versa.
virtual void NotifyFaviconsChanged(const std::set& page_urls,
-@@ -794,8 +794,8 @@ class HistoryBackend : public base::RefCountedThreadSafe,
+@@ -802,8 +802,8 @@ class HistoryBackend : public base::RefCountedThreadSafe,
// Send notification that the favicon has changed for |page_url| and all its
// redirects. This should be called if the mapping between the page URL
@@ -30719,7 +30211,7 @@ diff --git a/components/history/core/browser/history_backend_notifier.h b/compon
diff --git a/components/history/core/browser/history_service.cc b/components/history/core/browser/history_service.cc
--- a/components/history/core/browser/history_service.cc
+++ b/components/history/core/browser/history_service.cc
-@@ -1088,7 +1088,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween(
+@@ -1096,7 +1096,7 @@ void HistoryService::DeleteLocalAndRemoteHistoryBetween(
semantics {
description:
"If a user who syncs their browsing history deletes history "
@@ -30728,7 +30220,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his
"host to execute the corresponding deletion serverside."
trigger:
"Deleting browsing history for a given time range, e.g. from the "
-@@ -1130,7 +1130,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history,
+@@ -1138,7 +1138,7 @@ void HistoryService::DeleteLocalAndRemoteUrl(WebHistoryService* web_history,
semantics {
description:
"If a user who syncs their browsing history deletes urls from "
@@ -30740,7 +30232,7 @@ diff --git a/components/history/core/browser/history_service.cc b/components/his
diff --git a/components/history/core/browser/history_service.h b/components/history/core/browser/history_service.h
--- a/components/history/core/browser/history_service.h
+++ b/components/history/core/browser/history_service.h
-@@ -451,8 +451,8 @@ class HistoryService : public KeyedService {
+@@ -466,8 +466,8 @@ class HistoryService : public KeyedService {
base::CancelableTaskTracker* tracker);
// Callback for when favicon data changes. Contains a std::set of page URLs
@@ -30751,7 +30243,7 @@ diff --git a/components/history/core/browser/history_service.h b/components/hist
// data has changed. It is valid to call the callback with non-empty
// "page URLs" and no "icon URL" and vice versa.
using OnFaviconsChangedCallback =
-@@ -708,11 +708,11 @@ class HistoryService : public KeyedService {
+@@ -723,11 +723,11 @@ class HistoryService : public KeyedService {
// Used by FaviconService to set a favicon for |page_url| and |icon_url| with
// |pixel_size|.
// Example:
@@ -30767,7 +30259,7 @@ diff --git a/components/history/core/browser/history_service.h b/components/hist
//
// Merging occurs in the following manner:
// 1) |page_url| is set to map to only to |icon_url|. In order to not lose
-@@ -814,8 +814,8 @@ class HistoryService : public KeyedService {
+@@ -829,8 +829,8 @@ class HistoryService : public KeyedService {
void ScheduleTask(SchedulePriority priority, base::OnceClosure task);
// Called when the favicons for the given page URLs (e.g.
@@ -30861,7 +30353,7 @@ diff --git a/components/history/core/browser/url_utils.h b/components/history/co
diff --git a/components/history/core/browser/visit_database.cc b/components/history/core/browser/visit_database.cc
--- a/components/history/core/browser/visit_database.cc
+++ b/components/history/core/browser/visit_database.cc
-@@ -496,11 +496,11 @@ bool VisitDatabase::GetVisibleVisitCountToHost(const GURL& url,
+@@ -493,11 +493,11 @@ bool VisitDatabase::GetVisibleVisitCountToHost(const GURL& url,
return false;
// We need to search for URLs with a matching host/port. One way to query for
@@ -30875,6 +30367,21 @@ diff --git a/components/history/core/browser/visit_database.cc b/components/hist
// 0 is used as it is one character greater than '/'.
const std::string host_query_min = url.GetOrigin().spec();
if (host_query_min.empty())
+@@ -579,11 +579,11 @@ bool VisitDatabase::GetLastVisitToHost(const GURL& host,
+ return false;
+
+ // We need to search for URLs with a matching host/port. One way to query for
+- // this is to use the GLOB operator, eg 'url GLOB "http://google.com/*"'. This
++ // this is to use the GLOB operator, eg 'url GLOB "http://9oo91e.qjz9zk/*"'. This
+ // approach requires escaping the * and ? and such a query would also need to
+ // be recompiled on every Step(). The same query can be executed by using >=
+- // and < operator. The query becomes: 'url >= http://google.com/' and url <
+- // http://google.com0'. 0 is used as it is one character greater than '/'.
++ // and < operator. The query becomes: 'url >= http://9oo91e.qjz9zk/' and url <
++ // http://9oo91e.qjz9zk0'. 0 is used as it is one character greater than '/'.
+ // This effectively applies the GLOB optimization by doing it in C++ instead
+ // of relying on SQLite to do it.
+ const std::string host_query_min = host.GetOrigin().spec();
diff --git a/components/history/core/browser/web_history_service.cc b/components/history/core/browser/web_history_service.cc
--- a/components/history/core/browser/web_history_service.cc
+++ b/components/history/core/browser/web_history_service.cc
@@ -30952,7 +30459,7 @@ diff --git a/components/image_fetcher/ios/webp_decoder.h b/components/image_fetc
diff --git a/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java b/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java
--- a/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java
+++ b/components/invalidation/impl/android/java/src/org/chromium/components/invalidation/InvalidationClientService.java
-@@ -60,7 +60,7 @@ import java.util.concurrent.atomic.AtomicReference;
+@@ -61,7 +61,7 @@ import java.util.concurrent.atomic.AtomicReference;
* This class is an {@code IntentService}. All methods are assumed to be executing on its single
* execution thread.
*
@@ -30988,7 +30495,7 @@ diff --git a/components/invalidation/impl/gcm_network_channel.cc b/components/in
diff --git a/components/invalidation/impl/per_user_topic_registration_manager.cc b/components/invalidation/impl/per_user_topic_registration_manager.cc
--- a/components/invalidation/impl/per_user_topic_registration_manager.cc
+++ b/components/invalidation/impl/per_user_topic_registration_manager.cc
-@@ -45,10 +45,10 @@ const char kActiveRegistrationTokens[] =
+@@ -46,10 +46,10 @@ const char kActiveRegistrationTokens[] =
"invalidation.per_sender_active_registration_tokens";
const char kInvalidationRegistrationScope[] =
@@ -31092,7 +30599,7 @@ diff --git a/components/minidump_uploader/android/java/src/org/chromium/componen
diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/browser/nacl_process_host.cc
--- a/components/nacl/browser/nacl_process_host.cc
+++ b/components/nacl/browser/nacl_process_host.cc
-@@ -174,7 +174,7 @@ class NaClSandboxedProcessLauncherDelegate
+@@ -175,7 +175,7 @@ class NaClSandboxedProcessLauncherDelegate
// from .dll loading. The NaCl process will attempt to locate this space by
// scanning the address space using VirtualQuery.
// TODO(bbudge) Handle the --no-sandbox case.
@@ -31101,7 +30608,7 @@ diff --git a/components/nacl/browser/nacl_process_host.cc b/components/nacl/brow
const SIZE_T kNaClSandboxSize = 1 << 30;
if (!nacl::AllocateAddressSpaceASLR(process, kNaClSandboxSize)) {
DLOG(WARNING) << "Failed to reserve address space for Native Client";
-@@ -449,7 +449,7 @@ void NaClProcessHost::LaunchNaClGdb() {
+@@ -451,7 +451,7 @@ void NaClProcessHost::LaunchNaClGdb() {
base::FilePath::StringType irt_path(
NaClBrowser::GetInstance()->GetIrtFilePath().value());
// Avoid back slashes because nacl-gdb uses posix escaping rules on Windows.
@@ -31333,7 +30840,7 @@ diff --git a/components/ntp_snippets/remote/fetch.py b/components/ntp_snippets/r
diff --git a/components/ntp_tiles/popular_sites_impl.cc b/components/ntp_tiles/popular_sites_impl.cc
--- a/components/ntp_tiles/popular_sites_impl.cc
+++ b/components/ntp_tiles/popular_sites_impl.cc
-@@ -55,7 +55,7 @@ namespace ntp_tiles {
+@@ -56,7 +56,7 @@ namespace ntp_tiles {
namespace {
const char kPopularSitesURLFormat[] =
@@ -31381,7 +30888,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/
diff --git a/components/omnibox/browser/autocomplete_controller.h b/components/omnibox/browser/autocomplete_controller.h
--- a/components/omnibox/browser/autocomplete_controller.h
+++ b/components/omnibox/browser/autocomplete_controller.h
-@@ -256,7 +256,7 @@ class AutocompleteController : public AutocompleteProviderListener,
+@@ -258,7 +258,7 @@ class AutocompleteController : public AutocompleteProviderListener,
// The most recent time the default match (inline match) changed. This may
// be earlier than the most recent keystroke if the recent keystrokes didn't
// change the suggested match in the omnibox. (For instance, if
@@ -31435,7 +30942,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo
if (!docs_url_pattern_.Match(url, 0, url.size(), RE2::ANCHOR_START,
matched_doc_ids.data(),
matched_doc_ids.size())) {
-@@ -414,7 +414,7 @@ bool DocumentProvider::IsDocumentProviderAllowed(
+@@ -418,7 +418,7 @@ bool DocumentProvider::IsDocumentProviderAllowed(
// True if not explicitly in keyword mode, or a Drive suggestion.
return !IsExplicitlyInKeywordMode(input, keyword_provider->keyword()) ||
base::StartsWith(input.text(),
@@ -31444,7 +30951,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo
base::CompareCase::SENSITIVE);
}
return true;
-@@ -852,7 +852,7 @@ ACMatchClassifications DocumentProvider::Classify(
+@@ -908,7 +908,7 @@ ACMatchClassifications DocumentProvider::Classify(
// static
const GURL DocumentProvider::GetURLForDeduping(const GURL& url) {
// Early exit to avoid unnecessary and more involved checks.
@@ -31453,7 +30960,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo
return GURL();
// We aim to prevent duplicate Drive URLs to appear between the Drive document
-@@ -861,9 +861,9 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) {
+@@ -917,9 +917,9 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) {
// not guaranteed to be usable for navigation.
// Drive redirects are already handled by the regex in |ExtractDocIdFromUrl|.
@@ -31465,7 +30972,7 @@ diff --git a/components/omnibox/browser/document_provider.cc b/components/omnibo
if ((!net::GetValueForKeyInQuery(url, "q", &url_str) || url_str.empty()) &&
(!net::GetValueForKeyInQuery(url, "url", &url_str) || url_str.empty()))
return GURL();
-@@ -880,5 +880,5 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) {
+@@ -936,5 +936,5 @@ const GURL DocumentProvider::GetURLForDeduping(const GURL& url) {
// Canonicalize to the /open form without any extra args.
// This is similar to what we expect from the server.
@@ -31571,7 +31078,7 @@ diff --git a/components/omnibox/browser/in_memory_url_index_types.h b/components
diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc
--- a/components/omnibox/browser/omnibox_edit_model.cc
+++ b/components/omnibox/browser/omnibox_edit_model.cc
-@@ -977,16 +977,16 @@ void OmniboxEditModel::ClearKeyword() {
+@@ -982,16 +982,16 @@ void OmniboxEditModel::ClearKeyword() {
// backspace or shift-tab to enter this function:
// (1) was_toggled_into_keyword_mode == false, entry_by_tab == false
// The user typed a further key after being in keyword mode already, e.g.
@@ -31592,7 +31099,7 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnib
//
// For states 1-3, we can safely handle the exit from keyword mode by using
// OnBefore/AfterPossibleChange() to do a complete state update of all
-@@ -999,8 +999,8 @@ void OmniboxEditModel::ClearKeyword() {
+@@ -1004,8 +1004,8 @@ void OmniboxEditModel::ClearKeyword() {
//
// You might wonder why we don't simply do this in all cases. In states 1-2,
// getting out of keyword mode likely shouldn't put us in keyword hint mode;
@@ -31603,7 +31110,7 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnib
// be a keyword. Unconditionally putting things back in keyword hint mode is
// going to lead to internally inconsistent state, and possible future
// crashes. State 3 is more subtle; here we need to do the full state update
-@@ -1027,7 +1027,7 @@ void OmniboxEditModel::ClearKeyword() {
+@@ -1032,7 +1032,7 @@ void OmniboxEditModel::ClearKeyword() {
// the user entered keyword mode unintentionally, so backspacing
// immediately out of keyword mode should keep the space. In states 1 and
// 2, having the space is "safer" behavior. For instance, if the user types
@@ -31612,7 +31119,7 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnib
// the left, and presses backspace to leave keyword mode (state 1), it's
// better to have the space because it may be what the user wanted. The
// user can easily delete it. On the other hand, if there is no space and
-@@ -1367,8 +1367,8 @@ bool OmniboxEditModel::OnAfterPossibleChange(
+@@ -1372,8 +1372,8 @@ bool OmniboxEditModel::OnAfterPossibleChange(
// We won't need the below logic for creating a keyword by a space at the
// end or in the middle, or by typing a '?', but we do need to update the
// popup view because the keyword can change without the text changing,
@@ -31626,7 +31133,7 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnib
diff --git a/components/omnibox/browser/omnibox_edit_model.h b/components/omnibox/browser/omnibox_edit_model.h
--- a/components/omnibox/browser/omnibox_edit_model.h
+++ b/components/omnibox/browser/omnibox_edit_model.h
-@@ -573,8 +573,8 @@ class OmniboxEditModel {
+@@ -578,8 +578,8 @@ class OmniboxEditModel {
// temporary text.
//
// Example of use: If the user types "goog", then arrows down in the
@@ -31652,7 +31159,7 @@ diff --git a/components/omnibox/browser/scored_history_match.cc b/components/omn
diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc
--- a/components/omnibox/browser/search_provider.cc
+++ b/components/omnibox/browser/search_provider.cc
-@@ -1257,8 +1257,8 @@ SearchProvider::ScoreHistoryResultsHelper(const HistoryResults& results,
+@@ -1259,8 +1259,8 @@ SearchProvider::ScoreHistoryResultsHelper(const HistoryResults& results,
CompareScoredResults());
// Don't autocomplete to search terms that would normally be treated as URLs
@@ -31735,13 +31242,17 @@ diff --git a/components/omnibox/browser/zero_suggest_provider.cc b/components/om
diff --git a/components/optimization_guide/optimization_guide_constants.cc b/components/optimization_guide/optimization_guide_constants.cc
--- a/components/optimization_guide/optimization_guide_constants.cc
+++ b/components/optimization_guide/optimization_guide_constants.cc
-@@ -12,7 +12,7 @@ const base::FilePath::CharType kUnindexedHintsFileName[] =
+@@ -12,10 +12,10 @@ const base::FilePath::CharType kUnindexedHintsFileName[] =
const char kRulesetFormatVersionString[] = "1.0.0";
- const char kOptimizationGuideServiceDefaultURL[] =
+ const char kOptimizationGuideServiceGetHintsDefaultURL[] =
- "https://optimizationguide-pa.googleapis.com/v1:GetHints";
+ "https://optimizationguide-pa.9oo91eapis.qjz9zk/v1:GetHints";
+ const char kOptimizationGuideServiceGetModelsDefaultURL[] =
+- "https://optimizationguide-pa.googleapis.com/v1:GetModels";
++ "https://optimizationguide-pa.9oo91eapis.qjz9zk/v1:GetModels";
+
const char kLoadedHintLocalHistogramString[] =
"OptimizationGuide.LoadedHint.Result";
diff --git a/components/page_load_metrics/common/page_load_metrics_util.h b/components/page_load_metrics/common/page_load_metrics_util.h
@@ -31851,7 +31362,7 @@ diff --git a/components/password_manager/core/browser/generation/password_requir
diff --git a/components/password_manager/core/browser/hash_password_manager.cc b/components/password_manager/core/browser/hash_password_manager.cc
--- a/components/password_manager/core/browser/hash_password_manager.cc
+++ b/components/password_manager/core/browser/hash_password_manager.cc
-@@ -241,7 +241,7 @@ void HashPasswordManager::ClearAllNonGmailPasswordHash() {
+@@ -214,7 +214,7 @@ void HashPasswordManager::ClearAllNonGmailPasswordHash() {
std::string username = GetAndDecryptField(data, kUsernameFieldKey);
std::string email =
CanonicalizeUsername(username, /*is_gaia_account=*/true);
@@ -32033,7 +31544,7 @@ diff --git a/components/password_manager/core/browser/password_reuse_detector.cc
diff --git a/components/password_manager/core/browser/password_store.cc b/components/password_manager/core/browser/password_store.cc
--- a/components/password_manager/core/browser/password_store.cc
+++ b/components/password_manager/core/browser/password_store.cc
-@@ -222,18 +222,18 @@ void PasswordStore::GetLogins(const FormDigest& form,
+@@ -231,18 +231,18 @@ void PasswordStore::GetLogins(const FormDigest& form,
PasswordStoreConsumer* consumer) {
DCHECK(main_task_runner_->RunsTasksInCurrentSequence());
// Per http://crbug.com/121738, we deliberately ignore saved logins for
@@ -32117,7 +31628,7 @@ diff --git a/components/password_manager/core/browser/psl_matching_helper.cc b/c
diff --git a/components/password_manager/core/browser/sync/password_sync_bridge.h b/components/password_manager/core/browser/sync/password_sync_bridge.h
--- a/components/password_manager/core/browser/sync/password_sync_bridge.h
+++ b/components/password_manager/core/browser/sync/password_sync_bridge.h
-@@ -26,7 +26,7 @@ class PasswordStoreSync;
+@@ -27,7 +27,7 @@ class PasswordStoreSync;
// This is achieved by implementing the interface ModelTypeSyncBridge, which
// ClientTagBasedModelTypeProcessor will use to interact, ultimately, with the
// sync server. See
@@ -32126,24 +31637,10 @@ diff --git a/components/password_manager/core/browser/sync/password_sync_bridge.
// for details.
class PasswordSyncBridge : public syncer::ModelTypeSyncBridge {
public:
-diff --git a/components/payments/content/payment_request_spec.cc b/components/payments/content/payment_request_spec.cc
---- a/components/payments/content/payment_request_spec.cc
-+++ b/components/payments/content/payment_request_spec.cc
-@@ -78,8 +78,8 @@ std::string ToString(bool value) {
- } // namespace
-
- const char kBasicCardMethodName[] = "basic-card";
--const char kGooglePayMethodName[] = "https://google.com/pay";
--const char kAndroidPayMethodName[] = "https://android.com/pay";
-+const char kGooglePayMethodName[] = "https://9oo91e.qjz9zk/pay";
-+const char kAndroidPayMethodName[] = "https://8n6r01d.qjz9zk/pay";
-
- PaymentRequestSpec::PaymentRequestSpec(
- mojom::PaymentOptionsPtr options,
diff --git a/components/payments/content/utility/payment_manifest_parser.h b/components/payments/content/utility/payment_manifest_parser.h
--- a/components/payments/content/utility/payment_manifest_parser.h
+++ b/components/payments/content/utility/payment_manifest_parser.h
-@@ -68,7 +68,7 @@ class ErrorLogger;
+@@ -69,7 +69,7 @@ class ErrorLogger;
// }
//
// Specs:
@@ -32151,7 +31648,7 @@ diff --git a/components/payments/content/utility/payment_manifest_parser.h b/com
+// https://docs.9oo91e.qjz9zk/document/d/1izV4uC-tiRJG3JLooqY3YRLU22tYOsLTNq0P_InPJeE
// https://w3c.github.io/manifest/
//
- // Note the JSON parsing is done using the SafeJsonParser (either OOP or in a
+ // Note the JSON parsing is done using the DataDecoder (either OOP or in a safe
diff --git a/components/payments/core/journey_logger.cc b/components/payments/core/journey_logger.cc
--- a/components/payments/core/journey_logger.cc
+++ b/components/payments/core/journey_logger.cc
@@ -32327,7 +31824,7 @@ diff --git a/components/policy/core/common/preg_parser.h b/components/policy/cor
diff --git a/components/policy/proto/chrome_device_policy.proto b/components/policy/proto/chrome_device_policy.proto
--- a/components/policy/proto/chrome_device_policy.proto
+++ b/components/policy/proto/chrome_device_policy.proto
-@@ -356,14 +356,14 @@ message AndroidKioskAppInfoProto {
+@@ -359,14 +359,14 @@ message AndroidKioskAppInfoProto {
// Package name (must be present).
// In the event this is the only field that is specified, runtime may use
// PackageManager.getLaunchIntentForPackage() to start the app. See
@@ -32367,7 +31864,7 @@ diff --git a/components/policy/resources/PRESUBMIT.py b/components/policy/resour
+# mnissler@ch40m1um.qjz9zk, bartfab@ch40m1um.qjz9zk or atwilson@ch40m1um.qjz9zk.
import sys
- import xml.dom.minidom
+ from xml.dom import minidom
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -32380,7 +31877,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
#
# Generated grd names:
# Each name has two parts: the second part is either CAPTION, DESC or LABEL,
-@@ -397,7 +397,7 @@
+@@ -399,7 +399,7 @@
If you choose to auto detect the proxy server, all other options are ignored.
For detailed examples, visit:
@@ -32389,7 +31886,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If you enable this setting, $1Google Chrome and ARC-apps ignore all proxy-related options specified from the command line.
-@@ -541,7 +541,7 @@
+@@ -544,7 +544,7 @@
},
{
'name': 'ChromeFrameRendererSettings',
@@ -32398,7 +31895,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'group',
'caption': '''Default HTML renderer for $3Google Chrome Frame''',
'desc': '''Allows you to configure the default HTML renderer when $3Google Chrome Frame is installed.
-@@ -556,7 +556,7 @@
+@@ -559,7 +559,7 @@
},
{
'name': 'ChromeFrameContentTypes',
@@ -32407,7 +31904,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'group',
'caption': '''Allow $3Google Chrome Frame to handle the following content types''',
'desc': '''Allow $3Google Chrome Frame to handle the following content types.''',
-@@ -1068,7 +1068,7 @@
+@@ -1087,7 +1087,7 @@
'dynamic_refresh': True,
'per_profile': True,
},
@@ -32416,7 +31913,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 1,
'caption': '''Configure the home page URL''',
'tags': [],
-@@ -1125,7 +1125,7 @@
+@@ -1144,7 +1144,7 @@
'dynamic_refresh': True,
'per_profile': True,
},
@@ -32425,7 +31922,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 360,
'caption': '''Configure the New Tab page URL''',
'tags': [],
-@@ -1162,7 +1162,7 @@
+@@ -1181,7 +1181,7 @@
If this setting is not set, $1Google Chrome will allow the user to control whether it is the default browser and whether user notifications should be shown when it isn't.
@@ -32434,7 +31931,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'label': '''Set $1Google Chrome as Default Browser''',
},
{
-@@ -1568,7 +1568,7 @@
+@@ -1636,7 +1636,7 @@
+ },
+ {
+ 'name': 'ForceLegacyDefaultReferrerPolicy',
+- 'owners': ['davidvc@chromium.org', 'chrome-network-stack@chromium.org'],
++ 'owners': ['davidvc@ch40m1um.qjz9zk', 'chrome-network-stack@ch40m1um.qjz9zk'],
+ 'type': 'main',
+ 'schema': { 'type': 'boolean' },
+ 'supported_on': ['chrome.*:80-', 'chrome_os:80-'],
+@@ -1659,7 +1659,7 @@
},
{
'name': 'RemoteAccessClientFirewallTraversal',
@@ -32443,7 +31949,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:14-16', 'chrome_os:14-16'],
-@@ -1590,7 +1590,7 @@
+@@ -1681,7 +1681,7 @@
},
{
'name': 'RemoteAccessHostClientDomain',
@@ -32452,7 +31958,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:22-', 'chrome_os:41-'],
-@@ -1607,7 +1607,7 @@
+@@ -1698,7 +1698,7 @@
},
{
'name': 'RemoteAccessHostClientDomainList',
@@ -32461,7 +31967,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -1634,7 +1634,7 @@
+@@ -1725,7 +1725,7 @@
},
{
'name': 'RemoteAccessHostFirewallTraversal',
@@ -32470,7 +31976,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:14-', 'chrome_os:41-'],
-@@ -1656,7 +1656,7 @@
+@@ -1747,7 +1747,7 @@
},
{
'name': 'RemoteAccessHostDomain',
@@ -32479,7 +31985,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:22-', 'chrome_os:41-'],
-@@ -1673,7 +1673,7 @@
+@@ -1764,7 +1764,7 @@
},
{
'name': 'RemoteAccessHostDomainList',
@@ -32488,7 +31994,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -1700,7 +1700,7 @@
+@@ -1791,7 +1791,7 @@
},
{
'name': 'RemoteAccessHostRequireTwoFactor',
@@ -32497,7 +32003,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:22-22'],
-@@ -1722,7 +1722,7 @@
+@@ -1813,7 +1813,7 @@
},
{
'name': 'RemoteAccessHostTalkGadgetPrefix',
@@ -32505,8 +32011,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
+ 'owners': ['jamiewalch@ch40m1um.qjz9zk', 'rkjnsn@ch40m1um.qjz9zk'],
'type': 'string',
'schema': { 'type': 'string' },
- 'supported_on': ['chrome.*:22-', 'chrome_os:41-'],
-@@ -1736,17 +1736,17 @@
+ 'supported_on': ['chrome.*:22-75', 'chrome_os:41-75'],
+@@ -1828,17 +1828,17 @@
'tags': [],
'desc': '''Configures the TalkGadget prefix that will be used by remote access hosts and prevents users from changing it.
@@ -32528,7 +32034,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:23-', 'chrome_os:41-'],
-@@ -1766,7 +1766,7 @@
+@@ -1858,7 +1858,7 @@
},
{
'name': 'RemoteAccessHostAllowClientPairing',
@@ -32537,7 +32043,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:30-', 'chrome_os:41-'],
-@@ -1784,7 +1784,7 @@
+@@ -1876,7 +1876,7 @@
},
{
'name': 'RemoteAccessHostAllowGnubbyAuth',
@@ -32546,7 +32052,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:35-', 'chrome_os:41-'],
-@@ -1802,7 +1802,7 @@
+@@ -1894,7 +1894,7 @@
},
{
'name': 'RemoteAccessHostAllowRelayedConnection',
@@ -32555,7 +32061,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:36-', 'chrome_os:41-'],
-@@ -1824,7 +1824,7 @@
+@@ -1916,7 +1916,7 @@
},
{
'name': 'RemoteAccessHostUdpPortRange',
@@ -32564,7 +32070,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:36-', 'chrome_os:41-'],
-@@ -1842,7 +1842,7 @@
+@@ -1934,7 +1934,7 @@
},
{
'name': 'RemoteAccessHostMatchUsername',
@@ -32573,7 +32079,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.linux:25-', 'chrome.mac:25-', 'chrome_os:42-'],
-@@ -1860,7 +1860,7 @@
+@@ -1952,7 +1952,7 @@
},
{
'name': 'RemoteAccessHostTokenUrl',
@@ -32582,7 +32088,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:28-','chrome_os:42-'],
-@@ -1878,7 +1878,7 @@
+@@ -1970,7 +1970,7 @@
},
{
'name': 'RemoteAccessHostTokenValidationUrl',
@@ -32591,7 +32097,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:28-','chrome_os:42-'],
-@@ -1896,7 +1896,7 @@
+@@ -1988,7 +1988,7 @@
},
{
'name': 'RemoteAccessHostTokenValidationCertificateIssuer',
@@ -32600,7 +32106,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:28-','chrome_os:42-'],
-@@ -1914,7 +1914,7 @@
+@@ -2006,7 +2006,7 @@
},
{
'name': 'RemoteAccessHostDebugOverridePolicies',
@@ -32609,7 +32115,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:25-47','chrome_os:42-47'],
-@@ -1932,7 +1932,7 @@
+@@ -2024,7 +2024,7 @@
},
{
'name': 'RemoteAccessHostAllowUiAccessForRemoteAssistance',
@@ -32618,7 +32124,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.win:55-'],
-@@ -1950,7 +1950,7 @@
+@@ -2042,7 +2042,7 @@
},
{
'name': 'RemoteAccessHostAllowFileTransfer',
@@ -32627,7 +32133,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:74-'],
-@@ -2009,7 +2009,7 @@
+@@ -2101,7 +2101,7 @@
},
{
'name': 'PrintingAllowedColorModes',
@@ -32636,7 +32142,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string-enum',
'schema': {
'type': 'string',
-@@ -2050,7 +2050,7 @@
+@@ -2142,7 +2142,7 @@
},
{
'name': 'PrintingAllowedDuplexModes',
@@ -32645,7 +32151,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string-enum',
'schema': {
'type': 'string',
-@@ -2091,7 +2091,7 @@
+@@ -2183,7 +2183,7 @@
},
{
'name': 'PrintingAllowedPinModes',
@@ -32654,7 +32160,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string-enum',
'schema': {
'type': 'string',
-@@ -2133,7 +2133,7 @@
+@@ -2225,7 +2225,7 @@
},
{
'name': 'PrintingAllowedBackgroundGraphicsModes',
@@ -32663,7 +32169,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string-enum',
'schema': {
'type': 'string',
-@@ -2174,7 +2174,7 @@
+@@ -2266,7 +2266,7 @@
},
{
'name': 'PrintingAllowedPageSizes',
@@ -32672,7 +32178,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'array',
-@@ -2208,7 +2208,7 @@
+@@ -2300,7 +2300,7 @@
},
{
'name': 'PrintingColorDefault',
@@ -32681,7 +32187,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string-enum',
'schema': {
'type': 'string',
-@@ -2243,7 +2243,7 @@
+@@ -2335,7 +2335,7 @@
},
{
'name': 'PrintingDuplexDefault',
@@ -32690,7 +32196,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string-enum',
'schema': {
'type': 'string',
-@@ -2284,7 +2284,7 @@
+@@ -2376,7 +2376,7 @@
},
{
'name': 'PrintingPinDefault',
@@ -32699,7 +32205,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string-enum',
'schema': {
'type': 'string',
-@@ -2320,7 +2320,7 @@
+@@ -2412,7 +2412,7 @@
},
{
'name': 'PrintingBackgroundGraphicsDefault',
@@ -32708,7 +32214,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string-enum',
'schema': {
'type': 'string',
-@@ -2355,7 +2355,7 @@
+@@ -2447,7 +2447,7 @@
},
{
'name': 'PrintingSizeDefault',
@@ -32717,7 +32223,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'object',
-@@ -2386,7 +2386,7 @@
+@@ -2478,7 +2478,7 @@
},
{
'name': 'PrintingSendUsernameAndFilenameEnabled',
@@ -32726,7 +32232,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:72-'],
-@@ -2406,7 +2406,7 @@
+@@ -2498,7 +2498,7 @@
},
{
'name': 'PrintJobHistoryExpirationPeriod',
@@ -32735,7 +32241,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int',
'schema': { 'type': 'integer', 'minimum': -1 },
'supported_on': ['chrome_os:79-'],
-@@ -2428,7 +2428,7 @@
+@@ -2520,7 +2520,7 @@
},
{
'name': 'ForceSafeSearch',
@@ -32744,7 +32250,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:25-', 'chrome_os:25-', 'android:30-'],
-@@ -2452,7 +2452,7 @@
+@@ -2544,7 +2544,7 @@
},
{
'name': 'ForceGoogleSafeSearch',
@@ -32753,7 +32259,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:41-', 'chrome_os:41-', 'android:41-'],
-@@ -2473,7 +2473,7 @@
+@@ -2565,7 +2565,7 @@
},
{
'name': 'ForceYouTubeSafetyMode',
@@ -32762,7 +32268,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:41-', 'chrome_os:41-', 'android:41-'],
-@@ -2567,7 +2567,7 @@
+@@ -2659,7 +2659,7 @@
If this policy is left not set, this will be enabled but the user will be able to change it.
@@ -32771,7 +32277,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
This policy is available only on Windows instances that are joined to a Microsoft® Active Directory® domain. or Windows 10 Pro or Enterprise instances that enrolled for device management.''',
},
-@@ -2727,7 +2727,7 @@
+@@ -2819,7 +2819,7 @@
},
{
'name': 'AutofillCreditCardEnabled',
@@ -32780,7 +32286,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': [
-@@ -2947,14 +2947,14 @@
+@@ -3002,7 +3002,7 @@
+ },
+ {
+ 'name': 'SyncTypesListDisabled',
+- 'owners': ['pastarmovj@chromium.org', 'mastiz@chromium.org'],
++ 'owners': ['pastarmovj@ch40m1um.qjz9zk', 'mastiz@ch40m1um.qjz9zk'],
+ 'type': 'list',
+ 'schema': {
+ 'type': 'array',
+@@ -3060,14 +3060,14 @@
If you set this policy, $1Google Chrome will use the provided directory to store the roaming copy of the profiles if the RoamingProfileSupportEnabled policy has been enabled. If the RoamingProfileSupportEnabled policy is disabled or left unset the value stored in this policy is not used.
@@ -32797,7 +32312,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:27-', 'android:38-'],
-@@ -3014,7 +3014,7 @@
+@@ -3127,7 +3127,7 @@
If you set this policy, $1Google Chrome will use the provided directory regardless whether the user has specified the '--user-data-dir' flag or not. To avoid data loss or other unexpected errors this policy should not be set to a volume's root directory or to a directory used for other purposes, because $1Google Chrome manages its contents.
@@ -32806,7 +32321,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is left not set the default profile path will be used and the user will be able to override it with the '--user-data-dir' command line flag.''',
'label': '''Set user data directory''',
-@@ -3037,7 +3037,7 @@
+@@ -3150,7 +3150,7 @@
If you set this policy, $1Google Chrome will use the provided directory regardless whether the user has specified the '--disk-cache-dir' flag or not. To avoid data loss or other unexpected errors this policy should not be set to a volume's root directory or to a directory used for other purposes, because $1Google Chrome manages its contents.
@@ -32815,7 +32330,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is left not set the default cache directory will be used and the user will be able to override it with the '--disk-cache-dir' command line flag.''',
'label': '''Set disk cache directory''',
-@@ -3090,7 +3090,7 @@
+@@ -3203,7 +3203,7 @@
},
{
'name': 'DownloadRestrictions',
@@ -32824,7 +32339,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -3149,7 +3149,7 @@
+@@ -3262,7 +3262,7 @@
Note that these restrictions apply to downloads triggered from web page content, as well as the 'download link...' context menu option. These restrictions do not apply to the save / download of the currently displayed page, nor does it apply to saving as PDF from the printing options.
@@ -32833,7 +32348,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'label': '''Download restrictions''',
},
{
-@@ -3171,7 +3171,7 @@
+@@ -3284,7 +3284,7 @@
If you set this policy, $1Google Chrome will use the provided directory regardless whether the user has specified one or enabled the flag to be prompted for download location every time.
@@ -32842,7 +32357,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is left not set the default download directory will be used and the user will be able to change it.''',
'label': '''Set download directory''',
-@@ -3179,7 +3179,7 @@
+@@ -3292,7 +3292,7 @@
},
{
'name': 'SafeBrowsingForTrustedSourcesEnabled',
@@ -32851,7 +32366,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.win:61-'],
-@@ -3224,7 +3224,7 @@
+@@ -3337,7 +3337,7 @@
},
{
'name': 'CaptivePortalAuthenticationIgnoresProxy',
@@ -32860,7 +32375,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:41-'],
-@@ -3315,7 +3315,7 @@
+@@ -3428,7 +3428,7 @@
If you choose to use a .pac proxy script, you must specify the URL to the script in 'URL to a proxy .pac file'.
For detailed examples, visit:
@@ -32869,7 +32384,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If you enable this setting, $1Google Chrome and ARC-apps ignore all proxy-related options specified from the command line.
-@@ -3388,7 +3388,7 @@
+@@ -3501,7 +3501,7 @@
If you choose manual proxy settings, you can specify further options in 'Address or URL of proxy server', 'URL to a proxy .pac file' and 'Comma-separated list of proxy bypass rules'. Only the HTTP proxy server with the highest priority is available for ARC-apps.
For detailed examples, visit:
@@ -32878,7 +32393,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If you enable this setting, $1Google Chrome ignores all proxy-related options specified from the command line.
-@@ -3420,7 +3420,7 @@
+@@ -3533,7 +3533,7 @@
You should leave this policy not set if you have selected any other mode for setting proxy policies.
For more options and detailed examples, visit:
@@ -32887,7 +32402,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'arc_support': 'You cannot force Android apps to use a proxy. A subset of proxy settings is made available to Android apps, which they may voluntarily choose to honor. See the ProxyMode policy for more details.',
},
{
-@@ -3448,7 +3448,7 @@
+@@ -3561,7 +3561,7 @@
You should leave this policy not set if you have selected any other mode for setting proxy policies.
For detailed examples, visit:
@@ -32896,7 +32411,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'arc_support': 'You cannot force Android apps to use a proxy. A subset of proxy settings is made available to Android apps, which they may voluntarily choose to honor. See the ProxyMode policy for more details.',
},
{
-@@ -3476,7 +3476,7 @@
+@@ -3589,7 +3589,7 @@
You should leave this policy not set if you have selected any other mode for setting proxy policies.
For more detailed examples, visit:
@@ -32905,7 +32420,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'label': '''Comma-separated list of proxy bypass rules''',
'arc_support': 'You cannot force Android apps to use a proxy. A subset of proxy settings is made available to Android apps, which they may voluntarily choose to honor. See the ProxyMode policy for more details.',
},
-@@ -3694,7 +3694,7 @@
+@@ -3807,7 +3807,7 @@
'id': 305,
'caption': '''Account type for HTTP Negotiate authentication''',
'tags': [],
@@ -32914,7 +32429,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If no setting is provided, HTTP Negotiate authentication is disabled on Android.''',
},
-@@ -3797,7 +3797,7 @@
+@@ -3910,7 +3910,7 @@
'dynamic_refresh': True,
'per_profile': True,
},
@@ -32923,7 +32438,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 34,
'caption': '''Configure the list of force-installed apps and extensions''',
'tags': ['full-admin-access'],
-@@ -3817,9 +3817,9 @@
+@@ -3930,9 +3930,9 @@
Note that the source code of any extension may be altered by users via Developer Tools (potentially rendering the extension dysfunctional). If this is a concern, the DeveloperToolsDisabled policy should be set.
@@ -32935,7 +32450,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is left not set, no apps or extensions are installed automatically and the user can uninstall any app or extension in $1Google Chrome.
-@@ -3849,14 +3849,14 @@
+@@ -3962,14 +3962,14 @@
Starting in $1Google Chrome 21, it is more difficult to install extensions, apps, and user scripts from outside the Chrome Web Store. Previously, users could click on a link to a *.crx file, and $1Google Chrome would offer to install the file after a few warnings. After $1Google Chrome 21, such files must be downloaded and dragged onto the $1Google Chrome settings page. This setting allows specific URLs to have the old, easier installation flow.
@@ -32952,7 +32467,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'deprecated': True,
'schema': { 'type': 'boolean' },
-@@ -4009,7 +4009,7 @@
+@@ -4122,7 +4122,7 @@
},
},
},
@@ -32961,7 +32476,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'supported_on': ['chrome.*:62-', 'chrome_os:62-'],
'features': {
'dynamic_refresh': True,
-@@ -4062,7 +4062,7 @@
+@@ -4175,7 +4175,7 @@
This policy controls multiple settings, including settings controlled by any existing extension-related policies. This policy will override any legacy policies if both are set.
@@ -32970,7 +32485,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
For Windows instances that are not joined to a Microsoft® Active Directory® domain, forced installation is limited to apps and extensions listed in the Chrome Web Store.
''',
-@@ -4244,7 +4244,7 @@
+@@ -4221,7 +4221,7 @@
+
+ Disabling this setting or leaving it unset allows external extensions to be installed.
+
+- External extensions and their installation are documented at https://developer.chrome.com/apps/external_extensions.
++ External extensions and their installation are documented at https://developer.ch40me.qjz9zk/apps/external_extensions.
+ ''',
+ },
+ {
+@@ -4380,7 +4380,7 @@
'dynamic_refresh': True,
'per_profile': True,
},
@@ -32979,7 +32503,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 38,
'caption': '''URLs to open on startup''',
'tags': [],
-@@ -5000,7 +5000,7 @@
+@@ -5139,7 +5139,7 @@
},
{
'name': 'DefaultWebUsbGuardSetting',
@@ -32988,7 +32512,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -5035,7 +5035,7 @@
+@@ -5174,7 +5174,7 @@
},
{
'name': 'WebUsbAllowDevicesForUrls',
@@ -32997,7 +32521,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'array',
-@@ -5067,7 +5067,7 @@
+@@ -5206,7 +5206,7 @@
},
'example_value': [{
'devices': [{'vendor_id': 1234, 'product_id': 5678}],
@@ -33006,7 +32530,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
}],
'id': 486,
'caption': '''Automatically grant permission to these sites to connect to USB devices with the given vendor and product IDs.''',
-@@ -5082,7 +5082,7 @@
+@@ -5221,7 +5221,7 @@
},
{
'name': 'DeviceLoginScreenWebUsbAllowDevicesForUrls',
@@ -33015,7 +32539,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'array',
-@@ -5115,7 +5115,7 @@
+@@ -5254,7 +5254,7 @@
},
'example_value': [{
'devices': [{'vendor_id': 1234, 'product_id': 5678}],
@@ -33024,7 +32548,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
}],
'id': 603,
'caption': '''Automatically grant permission to these sites to connect to USB devices with the given vendor and product IDs on the login screen.''',
-@@ -5128,7 +5128,7 @@
+@@ -5267,7 +5267,7 @@
},
{
'name': 'WebUsbAskForUrls',
@@ -33033,7 +32557,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -5151,7 +5151,7 @@
+@@ -5290,7 +5290,7 @@
},
{
'name': 'WebUsbBlockedForUrls',
@@ -33042,7 +32566,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -5482,7 +5482,7 @@
+@@ -5621,7 +5621,7 @@
},
{
'name': 'LegacySameSiteCookieBehaviorEnabled',
@@ -33051,7 +32575,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -5513,13 +5513,13 @@
+@@ -5652,13 +5652,13 @@
'id': 623,
'caption': '''Default legacy SameSite cookie behavior setting''',
'tags': [],
@@ -33067,7 +32591,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -5538,7 +5538,7 @@
+@@ -5677,7 +5677,7 @@
'id': 624,
'caption': '''Revert to legacy SameSite behavior for cookies on these sites''',
'tags': [],
@@ -33076,7 +32600,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
For cookies on domains not covered by the patterns specified here, or for all cookies if this policy is not set, the global default value will be used either from the LegacySameSiteCookieBehaviorEnabled policy, if it is set, or the user's personal configuration otherwise.
-@@ -5643,7 +5643,7 @@
+@@ -5782,7 +5782,7 @@
'can_be_recommended': True,
'can_be_mandatory' : False,
},
@@ -33085,7 +32609,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 268,
'caption': '''Register protocol handlers''',
'tags': [],
-@@ -5797,7 +5797,7 @@
+@@ -5936,7 +5936,7 @@
},
{
'name': 'Disable3DAPIs',
@@ -33094,7 +32618,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:9-', 'chrome_os:11-'],
-@@ -5839,7 +5839,7 @@
+@@ -5978,7 +5978,7 @@
},
{
'name': 'MaxInvalidationFetchDelay',
@@ -33103,7 +32627,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int',
'schema': { 'type': 'integer' },
'supported_on': ['chrome.*:30-', 'chrome_os:30-'],
-@@ -5859,7 +5859,7 @@
+@@ -5998,7 +5998,7 @@
},
{
'name': 'ChromeFrameRendererSettings',
@@ -33112,7 +32636,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -5908,7 +5908,7 @@
+@@ -6047,7 +6047,7 @@
If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy.
@@ -33121,7 +32645,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'RenderInHostList',
-@@ -5930,7 +5930,7 @@
+@@ -6069,7 +6069,7 @@
If this policy is not set the default renderer will be used for all sites as specified by the 'ChromeFrameRendererSettings' policy.
@@ -33130,7 +32654,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'AdditionalLaunchParameters',
-@@ -5972,7 +5972,7 @@
+@@ -6111,7 +6111,7 @@
},
{
'name': 'ChromeFrameContentTypes',
@@ -33139,7 +32663,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -5992,7 +5992,7 @@
+@@ -6131,7 +6131,7 @@
},
{
'name': 'ChromeOsLockOnIdleSuspend',
@@ -33148,7 +32672,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:9-'],
-@@ -6017,7 +6017,7 @@
+@@ -6156,7 +6156,7 @@
},
{
'name': 'ChromeOsMultiProfileUserBehavior',
@@ -33157,7 +32681,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string-enum',
'schema': {
'type': 'string',
-@@ -6071,7 +6071,7 @@
+@@ -6210,7 +6210,7 @@
},
{
'name': 'SecondaryGoogleAccountSigninAllowed',
@@ -33166,7 +32690,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:65-'],
-@@ -6124,7 +6124,7 @@
+@@ -6263,7 +6263,7 @@
},
{
'name': 'AppRecommendationZeroStateEnabled',
@@ -33175,7 +32699,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:75-'],
-@@ -6319,7 +6319,7 @@
+@@ -6458,7 +6458,7 @@
},
{
'name': 'SecurityKeyPermitAttestation',
@@ -33184,7 +32708,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'tags': ['website-sharing'],
'type': 'list',
'schema': {
-@@ -6340,7 +6340,7 @@
+@@ -6479,7 +6479,7 @@
},
{
'name': 'GCFUserDataDir',
@@ -33193,7 +32717,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome_frame:12-32'],
-@@ -6355,7 +6355,7 @@
+@@ -6494,7 +6494,7 @@
If you set this policy, $3Google Chrome Frame will use the provided directory.
@@ -33202,7 +32726,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this setting is left not set the default profile directory will be used.''',
'label': '''Set user data directory''',
-@@ -6579,7 +6579,7 @@
+@@ -6719,7 +6719,7 @@
'tags': ['filtering'],
'desc': '''This policy prevents the user from loading web pages from blacklisted URLs. The blacklist provides a list of URL patterns that specify which URLs will be blacklisted.
@@ -33211,7 +32735,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
Exceptions can be defined in the URL whitelist policy. These policies are limited to 1000 entries; subsequent entries will be ignored.
-@@ -6627,7 +6627,7 @@
+@@ -6768,7 +6768,7 @@
},
{
'name': 'PolicyAtomicGroupsEnabled',
@@ -33220,7 +32744,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:78-', 'chrome_os:78-'],
-@@ -6647,7 +6647,7 @@
+@@ -6788,7 +6788,7 @@
},
{
'name': 'PolicyListMultipleSourceMergeList',
@@ -33229,7 +32753,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -6673,7 +6673,7 @@
+@@ -6814,7 +6814,7 @@
},
{
'name': 'PolicyDictionaryMultipleSourceMergeList',
@@ -33238,7 +32762,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string-enum-list',
'schema': {
'type': 'array',
-@@ -6744,7 +6744,7 @@
+@@ -6885,7 +6885,7 @@
'owners': ['file://components/policy/resources/OWNERS'],
'type': 'string',
'schema': { 'type': 'string' },
@@ -33247,7 +32771,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'supported_on': ['chrome_os:16-'],
'features': {
'dynamic_refresh': True,
-@@ -6762,7 +6762,7 @@
+@@ -6903,7 +6903,7 @@
'owners': ['file://components/policy/resources/OWNERS'],
'type': 'string',
'schema': { 'type': 'string' },
@@ -33256,7 +32780,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'supported_on': ['chrome_os:16-'],
'device_only': True,
'features': {
-@@ -7052,7 +7052,7 @@
+@@ -7195,7 +7195,7 @@
},
{
'name': 'PrintHeaderFooter',
@@ -33265,7 +32789,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:70-', 'chrome.*:70-'],
-@@ -7176,7 +7176,7 @@
+@@ -7319,7 +7319,7 @@
},
{
'name': 'EnableSha1ForLocalAnchors',
@@ -33274,7 +32798,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:54-71', 'chrome_os:54-71', 'android:54-71'],
-@@ -7449,7 +7449,7 @@
+@@ -7592,7 +7592,7 @@
},
{
'name': 'ReportDeviceUsers',
@@ -33283,7 +32807,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:32-'],
-@@ -7469,7 +7469,7 @@
+@@ -7612,7 +7612,7 @@
},
{
'name': 'ReportDeviceHardwareStatus',
@@ -33292,7 +32816,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:42-'],
-@@ -7490,7 +7490,7 @@
+@@ -7633,7 +7633,7 @@
},
{
'name': 'ReportDeviceSessionStatus',
@@ -33301,7 +32825,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:42-'],
-@@ -7513,7 +7513,7 @@
+@@ -7656,7 +7656,7 @@
},
{
'name': 'ReportDeviceOsUpdateStatus',
@@ -33310,7 +32834,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -7535,7 +7535,7 @@
+@@ -7678,7 +7678,7 @@
},
{
'name': 'ReportDevicePowerStatus',
@@ -33319,7 +32843,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:73-'],
-@@ -7556,7 +7556,7 @@
+@@ -7699,7 +7699,7 @@
},
{
'name': 'ReportDeviceStorageStatus',
@@ -33328,7 +32852,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:73-'],
-@@ -7577,7 +7577,7 @@
+@@ -7720,7 +7720,7 @@
},
{
'name': 'ReportDeviceBoardStatus',
@@ -33337,7 +32861,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:73-'],
-@@ -7619,7 +7619,7 @@
+@@ -7762,7 +7762,7 @@
},
{
'name': 'ReportArcStatusEnabled',
@@ -33346,7 +32870,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:55-'],
-@@ -7642,7 +7642,7 @@
+@@ -7785,7 +7785,7 @@
},
{
'name': 'ReportCrostiniUsageEnabled',
@@ -33355,7 +32879,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:70-'],
-@@ -7709,7 +7709,7 @@
+@@ -7852,7 +7852,7 @@
},
{
'name': 'LogUploadEnabled',
@@ -33364,7 +32888,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:46-'],
-@@ -7743,11 +7743,11 @@
+@@ -7886,11 +7886,11 @@
'features': {
'dynamic_refresh': True,
},
@@ -33378,7 +32902,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is not configured, there are no restrictions on which users are allowed to sign in. Note that creating new users still requires the DeviceAllowNewUsers policy to be configured appropriately.''',
'arc_support': 'This policy controls who may start a $2Chromium OS session. It does not prevent users from signing in to additional Google accounts within Android. If you want to prevent this, configure the Android-specific accountTypesWithManagementDisabled policy as part of ArcPolicy.',
-@@ -7932,7 +7932,7 @@
+@@ -8075,7 +8075,7 @@
'features': {
'dynamic_refresh': True,
},
@@ -33387,7 +32911,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 137,
'caption': '''Load specified urls on demo login''',
'tags': [],
-@@ -8031,7 +8031,7 @@
+@@ -8174,7 +8174,7 @@
'features': {
'dynamic_refresh': True,
},
@@ -33396,7 +32920,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 135,
'caption': '''List of AppPack extensions''',
'tags': [],
-@@ -8063,7 +8063,7 @@
+@@ -8206,7 +8206,7 @@
},
{
'name': 'DeviceAutoUpdateP2PEnabled',
@@ -33405,7 +32929,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:31-'],
-@@ -8317,7 +8317,7 @@
+@@ -8460,7 +8460,7 @@
},
{
'name': 'DeviceLocalAccountPromptForNetworkWhenOffline',
@@ -33414,7 +32938,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:33-'],
-@@ -8338,7 +8338,7 @@
+@@ -8481,7 +8481,7 @@
},
{
'name': 'DeviceLocalAccountManagedSessionEnabled',
@@ -33423,7 +32947,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:70-'],
-@@ -8350,7 +8350,7 @@
+@@ -8493,7 +8493,7 @@
'id': 463,
'caption': '''Allow managed session on device''',
'tags': [],
@@ -33432,7 +32956,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is set to true or left unset, managed guest session will take on "Managed Session" behaviour which lifts many of the restrictions that are in place for regular "Public Sessions".
-@@ -8453,13 +8453,13 @@
+@@ -8596,13 +8596,13 @@
'dynamic_refresh': True,
'per_profile': True,
},
@@ -33448,7 +32972,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is configured, the set of applications is fixed and can't be changed by the user.
-@@ -8506,11 +8506,11 @@
+@@ -8649,11 +8649,11 @@
If this setting is disabled or not configured then users can choose to proceed to the flagged site after being shown the warning.
@@ -33462,7 +32986,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:44-', 'chrome_os:44-'],
-@@ -8527,7 +8527,7 @@
+@@ -8670,7 +8670,7 @@
Setting this policy to false stops users from choosing to send some system information and page content to Google servers. If this setting is true or not configured, then users will be allowed to send some system information and page content to Safe Browsing to help detect dangerous apps and sites.
@@ -33471,7 +32995,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'SpellCheckServiceEnabled',
-@@ -8572,7 +8572,7 @@
+@@ -8715,7 +8715,7 @@
},
{
'name': 'ExternalStorageReadOnly',
@@ -33480,7 +33004,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 343,
'type': 'main',
'schema': { 'type': 'boolean' },
-@@ -8638,7 +8638,7 @@
+@@ -8781,7 +8781,7 @@
},
{
'name': 'AudioCaptureAllowedUrls',
@@ -33489,7 +33013,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -8684,7 +8684,7 @@
+@@ -8827,7 +8827,7 @@
},
{
'name': 'VideoCaptureAllowedUrls',
@@ -33498,7 +33022,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -8749,7 +8749,7 @@
+@@ -8892,7 +8892,7 @@
},
{
'name': 'SystemUse24HourClock',
@@ -33507,7 +33031,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:30-'],
-@@ -8771,7 +8771,7 @@
+@@ -8914,7 +8914,7 @@
},
{
'name': 'TouchVirtualKeyboardEnabled',
@@ -33516,7 +33040,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:37-' ],
-@@ -8813,7 +8813,7 @@
+@@ -8956,7 +8956,7 @@
},
{
'name': 'BuiltInDnsClientEnabled',
@@ -33525,16 +33049,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:25-'],
-@@ -8835,7 +8835,7 @@
+@@ -8980,7 +8980,7 @@
},
{
'name': 'DnsOverHttpsMode',
-- 'owners': ['doh-core@google.com'],
-+ 'owners': ['doh-core@9oo91e.qjz9zk'],
+- 'owners': ['dalyk@chromium.org', 'ericorth@chromium.org', 'bingler@chromium.org'],
++ 'owners': ['dalyk@ch40m1um.qjz9zk', 'ericorth@ch40m1um.qjz9zk', 'bingler@ch40m1um.qjz9zk'],
'type': 'string-enum',
'schema': {
'type': 'string',
-@@ -9905,7 +9905,7 @@
+@@ -9032,7 +9032,7 @@
+ },
+ {
+ 'name': 'DnsOverHttpsTemplates',
+- 'owners': ['dalyk@chromium.org', 'ericorth@chromium.org', 'bingler@chromium.org'],
++ 'owners': ['dalyk@ch40m1um.qjz9zk', 'ericorth@ch40m1um.qjz9zk', 'bingler@ch40m1um.qjz9zk'],
+ 'type': 'string',
+ 'schema': { 'type': 'string' },
+ 'supported_on': ['chrome_os:80-', 'chrome.*:80-'],
+@@ -10112,7 +10112,7 @@
},
{
'name': 'DeviceAllowRedeemChromeOsRegistrationOffers',
@@ -33543,7 +33076,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:26-'],
-@@ -10072,7 +10072,7 @@
+@@ -10304,7 +10304,7 @@
},
{
'name': 'StickyKeysEnabled',
@@ -33552,7 +33085,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:76-'],
-@@ -10097,7 +10097,7 @@
+@@ -10329,7 +10329,7 @@
},
{
'name': 'SelectToSpeakEnabled',
@@ -33561,7 +33094,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:77-'],
-@@ -10122,7 +10122,7 @@
+@@ -10354,7 +10354,7 @@
},
{
'name': 'DictationEnabled',
@@ -33570,7 +33103,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:78-'],
-@@ -10147,7 +10147,7 @@
+@@ -10379,7 +10379,7 @@
},
{
'name': 'KeyboardFocusHighlightEnabled',
@@ -33579,7 +33112,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:78-'],
-@@ -10174,7 +10174,7 @@
+@@ -10406,7 +10406,7 @@
},
{
'name': 'CursorHighlightEnabled',
@@ -33588,7 +33121,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:78-'],
-@@ -10201,7 +10201,7 @@
+@@ -10433,7 +10433,7 @@
},
{
'name': 'CaretHighlightEnabled',
@@ -33597,7 +33130,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:78-'],
-@@ -10228,7 +10228,7 @@
+@@ -10460,7 +10460,7 @@
},
{
'name': 'MonoAudioEnabled',
@@ -33606,7 +33139,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:78-'],
-@@ -10255,7 +10255,7 @@
+@@ -10487,7 +10487,7 @@
},
{
'name': 'AutoclickEnabled',
@@ -33615,7 +33148,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:78-'],
-@@ -10370,7 +10370,7 @@
+@@ -10602,7 +10602,7 @@
},
{
'name': 'DeviceLoginScreenLargeCursorEnabled',
@@ -33624,7 +33157,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:78-'],
-@@ -10421,7 +10421,7 @@
+@@ -10653,7 +10653,7 @@
},
{
'name': 'DeviceLoginScreenSpokenFeedbackEnabled',
@@ -33633,7 +33166,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -10472,7 +10472,7 @@
+@@ -10704,7 +10704,7 @@
},
{
'name': 'DeviceLoginScreenHighContrastEnabled',
@@ -33642,7 +33175,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -10523,7 +10523,7 @@
+@@ -10755,7 +10755,7 @@
},
{
'name': 'DeviceLoginScreenVirtualKeyboardEnabled',
@@ -33651,7 +33184,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -10548,7 +10548,7 @@
+@@ -10780,7 +10780,7 @@
},
{
'name': 'SharedClipboardEnabled',
@@ -33660,7 +33193,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:79-', 'chrome_os:79-', 'android:79-'],
-@@ -10616,7 +10616,7 @@
+@@ -10850,7 +10850,7 @@
},
{
'name': 'DeviceLoginScreenScreenMagnifierType',
@@ -33669,7 +33202,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -10663,7 +10663,7 @@
+@@ -10897,7 +10897,7 @@
},
{
'name': 'DeviceLoginScreenDictationEnabled',
@@ -33678,7 +33211,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -10688,7 +10688,7 @@
+@@ -10922,7 +10922,7 @@
},
{
'name': 'DeviceLoginScreenSelectToSpeakEnabled',
@@ -33687,7 +33220,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -10713,7 +10713,7 @@
+@@ -10947,7 +10947,7 @@
},
{
'name': 'DeviceLoginScreenCursorHighlightEnabled',
@@ -33696,7 +33229,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -10738,7 +10738,7 @@
+@@ -10972,7 +10972,7 @@
},
{
'name': 'DeviceLoginScreenCaretHighlightEnabled',
@@ -33705,7 +33238,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -10763,7 +10763,7 @@
+@@ -10997,7 +10997,7 @@
},
{
'name': 'DeviceLoginScreenMonoAudioEnabled',
@@ -33714,7 +33247,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -10790,7 +10790,7 @@
+@@ -11024,7 +11024,7 @@
},
{
'name': 'DeviceLoginScreenAutoclickEnabled',
@@ -33723,7 +33256,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -10817,7 +10817,7 @@
+@@ -11051,7 +11051,7 @@
},
{
'name': 'DeviceLoginScreenStickyKeysEnabled',
@@ -33732,7 +33265,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -10842,7 +10842,7 @@
+@@ -11076,7 +11076,7 @@
},
{
'name': 'DeviceLoginScreenKeyboardFocusHighlightEnabled',
@@ -33741,7 +33274,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -11291,20 +11291,20 @@
+@@ -11525,20 +11525,20 @@
"toplevel_name": "My managed bookmarks folder"
}, {
"name": "Google",
@@ -33766,7 +33299,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
}
]
}
-@@ -11314,7 +11314,7 @@
+@@ -11548,7 +11548,7 @@
'tags': [],
'desc': '''Configures a list of managed bookmarks.
@@ -33775,7 +33308,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
These bookmarks are placed in a folder that can't be modified by the user (but the user can choose to hide it from the bookmark bar). By default the folder name is "Managed bookmarks" but it can be customized by adding to the list of bookmarks a dictionary containing the key "toplevel_name" with the desired folder name as the value.
-@@ -11322,7 +11322,7 @@
+@@ -11556,7 +11556,7 @@
},
{
'name': 'DataCompressionProxyEnabled',
@@ -33784,7 +33317,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['android:31-'],
-@@ -11536,7 +11536,7 @@
+@@ -11770,7 +11770,7 @@
},
{
'name': 'BrowserGuestModeEnabled',
@@ -33793,7 +33326,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:38-'],
-@@ -11554,7 +11554,7 @@
+@@ -11788,7 +11788,7 @@
},
{
'name': 'BrowserGuestModeEnforced',
@@ -33802,7 +33335,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:77-'],
-@@ -11572,7 +11572,7 @@
+@@ -11806,7 +11806,7 @@
},
{
'name': 'BrowserAddPersonEnabled',
@@ -33811,7 +33344,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:39-'],
-@@ -11590,7 +11590,7 @@
+@@ -11824,7 +11824,7 @@
},
{
'name': 'ForceBrowserSignin',
@@ -33820,7 +33353,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'deprecated': True,
'schema': { 'type': 'boolean' },
-@@ -11649,7 +11649,7 @@
+@@ -11883,7 +11883,7 @@
If the policy is set to "Enable browser sign-in," then the user is allowed to sign in to the browser and is automatically signed in to the browser when signed in to Google web services like Gmail. Being signed in to the browser means the user's account information will be kept by the browser. However, it does not mean that Chrome sync will be turned on per default; the user must separately opt-in to use this feature. Enabling this policy will prevent the user from turning off the setting that allows browser sign-in. To control the availability of Chrome sync, use the "SyncDisabled" policy.
@@ -33829,7 +33362,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is not set then the user can decide if they want to enable the browser sign in option and use it as they see fit.''',
},
-@@ -11811,7 +11811,7 @@
+@@ -12045,7 +12045,7 @@
This policy allows certificates for the hostnames in the specified URLs to not be disclosed via Certificate Transparency. This allows certificates that would otherwise be untrusted, because they were not properly publicly disclosed, to continue to be used, but makes it harder to detect misissued certificates for those hosts.
@@ -33838,7 +33371,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is not set, any certificate that is required to be disclosed via Certificate Transparency will be treated as untrusted if it is not disclosed according to the Certificate Transparency policy.''',
},
-@@ -11934,7 +11934,7 @@
+@@ -12168,7 +12168,7 @@
},
{
'name': 'ContextualSearchEnabled',
@@ -33847,7 +33380,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': [
-@@ -12029,7 +12029,7 @@
+@@ -12263,7 +12263,7 @@
},
{
'name': 'SSLErrorOverrideAllowed',
@@ -33856,7 +33389,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:44-', 'chrome_os:44-', 'android:44-'],
-@@ -12106,7 +12106,7 @@
+@@ -12340,7 +12340,7 @@
},
{
'name': 'WelcomePageOnOSUpgradeEnabled',
@@ -33865,7 +33398,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'supported_on': ['chrome.win:45-62'],
'type': 'main',
'schema': { 'type': 'boolean' },
-@@ -12124,7 +12124,7 @@
+@@ -12358,7 +12358,7 @@
},
{
'name': 'HardwareAccelerationModeEnabled',
@@ -33874,7 +33407,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:46-'],
-@@ -12142,7 +12142,7 @@
+@@ -12376,7 +12376,7 @@
},
{
'name': 'UnifiedDesktopEnabledByDefault',
@@ -33883,7 +33416,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:47-'],
-@@ -12165,7 +12165,7 @@
+@@ -12399,7 +12399,7 @@
},
{
'name': 'DisplayRotationDefault',
@@ -33892,7 +33425,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -12218,7 +12218,7 @@
+@@ -12452,7 +12452,7 @@
},
{
'name': 'ArcEnabled',
@@ -33901,7 +33434,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:50-'],
-@@ -12304,7 +12304,7 @@
+@@ -12538,7 +12538,7 @@
},
{
'name': 'AllowKioskAppControlChromeVersion',
@@ -33910,7 +33443,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:51-'],
-@@ -12330,7 +12330,7 @@
+@@ -12564,7 +12564,7 @@
},
{
'name': 'LoginAuthenticationBehavior',
@@ -33919,7 +33452,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -12366,7 +12366,7 @@
+@@ -12600,7 +12600,7 @@
},
{
'name': 'UsbDetachableWhitelist',
@@ -33928,7 +33461,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -12403,7 +12403,7 @@
+@@ -12637,7 +12637,7 @@
},
{
'name': 'DeviceAllowBluetooth',
@@ -33937,16 +33470,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:52-'],
-@@ -12425,7 +12425,7 @@
+@@ -12659,7 +12659,7 @@
},
{
'name': 'SuppressUnsupportedOSWarning',
- 'owners': ['grt@chromium.org'],
+ 'owners': ['grt@ch40m1um.qjz9zk'],
'caption': '''Suppress the unsupported OS warning''',
- 'desc': '''Suppresses the warning that appears when $1Google Chrome is running on a computer or operating system that is no longer supported.''',
- 'type': 'main',
-@@ -12441,7 +12441,7 @@
+ 'desc': '''Suppresses the warning that appears when $1Google Chrome is running on a computer or operating system that is no longer supported.
+
+@@ -12677,7 +12677,7 @@
},
{
'name': 'DeviceQuirksDownloadEnabled',
@@ -33955,7 +33488,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:51-'],
-@@ -12464,7 +12464,7 @@
+@@ -12700,7 +12700,7 @@
},
{
'name': 'SystemTimezoneAutomaticDetection',
@@ -33964,7 +33497,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -12542,7 +12542,7 @@
+@@ -12778,7 +12778,7 @@
},
{
'name': 'NetworkThrottlingEnabled',
@@ -33973,7 +33506,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'device_only': True,
'caption': '''Enable throttling network bandwidth''',
'desc': '''Allows enabling or disabling network throttling.
-@@ -12582,7 +12582,7 @@
+@@ -12818,7 +12818,7 @@
},
{
'name': 'DeviceWiFiFastTransitionEnabled',
@@ -33982,7 +33515,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'device_only': True,
'caption': '''Enable 802.11r Fast Transition''',
'desc': '''Allows enabling or disabling Fast Transition.
-@@ -12605,7 +12605,7 @@
+@@ -12841,7 +12841,7 @@
},
{
'name': 'DeviceWiFiAllowed',
@@ -33991,7 +33524,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'device_only': True,
'caption': '''Enable WiFi''',
'desc': '''
-@@ -12624,7 +12624,7 @@
+@@ -12860,7 +12860,7 @@
},
{
'name': 'DeviceDockMacAddressSource',
@@ -34000,7 +33533,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'caption': '''Device MAC address source when docked''',
'desc': '''
Configures which MAC (media access control) address will be used when a dock is connected to the device.
-@@ -12672,7 +12672,7 @@
+@@ -12908,7 +12908,7 @@
},
{
'name': 'LoginVideoCaptureAllowedUrls',
@@ -34009,7 +33542,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -12696,7 +12696,7 @@
+@@ -12932,7 +12932,7 @@
},
{
'name': 'DeviceLoginScreenExtensions',
@@ -34018,7 +33551,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -12707,7 +12707,7 @@
+@@ -12943,7 +12943,7 @@
'features': {
'dynamic_refresh': True,
},
@@ -34027,7 +33560,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 336,
'caption': '''Configure the list of installed apps on the login screen''',
'tags': ['full-admin-access'],
-@@ -12722,9 +12722,9 @@
+@@ -12958,9 +12958,9 @@
If an app that previously had been force-installed is removed from this list, it is automatically uninstalled by $1Google Chrome.
@@ -34039,7 +33572,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'AllowScreenLock',
-@@ -12744,7 +12744,7 @@
+@@ -12980,7 +12980,7 @@
},
{
'name': 'ArcCertificatesSyncMode',
@@ -34048,7 +33581,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -12777,7 +12777,7 @@
+@@ -13013,7 +13013,7 @@
},
{
'name': 'AllowedDomainsForApps',
@@ -34057,7 +33590,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:51-', 'chrome_os:51-', 'android:51-'],
-@@ -12786,7 +12786,7 @@
+@@ -13022,7 +13022,7 @@
'dynamic_refresh': True,
'per_profile': True,
},
@@ -34066,7 +33599,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 331,
'caption': '''Define domains allowed to access G Suite''',
'tags': ['filtering'],
-@@ -12794,7 +12794,7 @@
+@@ -13030,7 +13030,7 @@
If you define this setting, the user will only be able to access Google
Apps using accounts from the specified domains (note that to allow
@@ -34075,7 +33608,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
(without quotes) to the list of domains).
This setting will prevent the user from logging in, and adding a Secondary
-@@ -12805,14 +12805,14 @@
+@@ -13041,14 +13041,14 @@
access G Suite with any account.
This policy causes the X-GoogApps-Allowed-Domains header to be appended to
@@ -34093,7 +33626,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': [ 'chrome.*:52-74', 'chrome_os:52-74' ],
-@@ -12941,7 +12941,7 @@
+@@ -13177,7 +13177,7 @@
},
{
'name': 'NTPContentSuggestionsEnabled',
@@ -34102,7 +33635,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['android:54-'],
-@@ -12961,7 +12961,7 @@
+@@ -13197,7 +13197,7 @@
+ },
+ {
+ 'name': 'NTPCustomBackgroundEnabled',
+- 'owners': ['mahmadi@chromium.org', 'yyushkina@chromium.org'],
++ 'owners': ['mahmadi@ch40m1um.qjz9zk', 'yyushkina@ch40m1um.qjz9zk'],
+ 'type': 'main',
+ 'schema': { 'type': 'boolean' },
+ 'supported_on': ['chrome.*:80-', 'chrome_os:80-'],
+@@ -13217,7 +13217,7 @@
},
{
'name': 'WebRtcUdpPortRange',
@@ -34111,7 +33653,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:54-', 'chrome_os:54-', 'android:54-'],
-@@ -12979,7 +12979,7 @@
+@@ -13235,7 +13235,7 @@
},
{
'name': 'WebRtcLocalIpsAllowedUrls',
@@ -34120,7 +33662,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -13034,7 +13034,7 @@
+@@ -13290,7 +13290,7 @@
If set to False, updates to components are disabled. However, some components are exempt from this policy: updates to any component that does not contain executable code, or does not significantly alter the behavior of the browser, or is critical for its security will not be disabled.
Examples of such components include the certificate revocation lists and Safe Browsing data.
@@ -34129,7 +33671,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'NativePrinters',
-@@ -13062,7 +13062,7 @@
+@@ -13318,7 +13318,7 @@
'properties': {
'effective_model': {
'type': 'string',
@@ -34138,7 +33680,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
'autoconf': {
'type': 'boolean',
-@@ -13242,7 +13242,7 @@
+@@ -13498,7 +13498,7 @@
},
{
'name': 'DeviceNativePrinters',
@@ -34147,7 +33689,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 386,
'device_only': True,
'type': 'external',
-@@ -13284,7 +13284,7 @@
+@@ -13540,7 +13540,7 @@
},
{
'name': 'DeviceNativePrintersAccessMode',
@@ -34156,7 +33698,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 387,
'device_only': True,
'supported_on': ['chrome_os:73-'],
-@@ -13326,7 +13326,7 @@
+@@ -13582,7 +13582,7 @@
},
{
'name': 'DeviceNativePrintersBlacklist',
@@ -34165,7 +33707,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'supported_on': ['chrome_os:73-'],
'device_only': True,
'id': 388,
-@@ -13350,7 +13350,7 @@
+@@ -13606,7 +13606,7 @@
},
{
'name': 'DeviceNativePrintersWhitelist',
@@ -34174,7 +33716,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'supported_on': ['chrome_os:73-'],
'device_only': True,
'id': 389,
-@@ -13425,7 +13425,7 @@
+@@ -13681,7 +13681,7 @@
},
{
'name': 'MinimumRequiredChromeVersion',
@@ -34183,7 +33725,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'supported_on': ['chrome_os:64-'],
'device_only': True,
'type': 'string',
-@@ -13585,7 +13585,7 @@
+@@ -13841,7 +13841,7 @@
},
{
'name': 'DeviceWallpaperImage',
@@ -34192,7 +33734,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'external',
'schema': {
'type': 'object',
-@@ -13660,7 +13660,7 @@
+@@ -13916,7 +13916,7 @@
},
{
'name': 'DeviceLoginScreenSystemInfoEnforced',
@@ -34201,7 +33743,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:79-'],
-@@ -13683,7 +13683,7 @@
+@@ -13939,7 +13939,7 @@
},
{
'name': 'SmsMessagesAllowed',
@@ -34210,7 +33752,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:70-'],
-@@ -13704,7 +13704,7 @@
+@@ -13960,7 +13960,7 @@
},
{
'name': 'SmartLockSigninAllowed',
@@ -34219,7 +33761,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:71-'],
-@@ -13725,7 +13725,7 @@
+@@ -13981,7 +13981,7 @@
},
{
'name': 'InstantTetheringAllowed',
@@ -34228,7 +33770,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:60-'],
-@@ -13746,7 +13746,7 @@
+@@ -14002,7 +14002,7 @@
},
{
'name': 'BrowserNetworkTimeQueriesEnabled',
@@ -34237,7 +33779,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:60-'],
-@@ -13762,7 +13762,7 @@
+@@ -14018,7 +14018,7 @@
},
{
'name': 'DeviceSecondFactorAuthentication',
@@ -34246,7 +33788,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -13828,7 +13828,7 @@
+@@ -14084,7 +14084,7 @@
},
{
'name': 'DeviceEcryptfsMigrationStrategy',
@@ -34255,7 +33797,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -13967,7 +13967,7 @@
+@@ -14223,7 +14223,7 @@
},
{
'name': 'NoteTakingAppsLockScreenWhitelist',
@@ -34264,7 +33806,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -14120,7 +14120,7 @@
+@@ -14376,7 +14376,7 @@
},
{
'name': 'CloudPolicyOverridesPlatformPolicy',
@@ -34273,7 +33815,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean'},
'supported_on': ['chrome.*:75-'],
-@@ -14141,7 +14141,7 @@
+@@ -14397,7 +14397,7 @@
},
{
'name': 'PromptForDownloadLocation',
@@ -34282,7 +33824,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean'},
'supported_on': ['chrome.*:64-', 'chrome_os:64-'],
-@@ -14161,7 +14161,7 @@
+@@ -14417,7 +14417,7 @@
},
{
'name': 'UnaffiliatedArcAllowed',
@@ -34291,7 +33833,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:64-'],
-@@ -14181,7 +14181,7 @@
+@@ -14437,7 +14437,7 @@
},
{
'name': 'IsolateOrigins',
@@ -34300,7 +33842,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:63-', 'chrome_os:63-'],
-@@ -14207,7 +14207,7 @@
+@@ -14463,7 +14463,7 @@
},
{
'name': 'SitePerProcess',
@@ -34309,7 +33851,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:63-', 'chrome_os:63-'],
-@@ -14272,7 +14272,7 @@
+@@ -14528,7 +14528,7 @@
},
{
'name': 'IsolateOriginsAndroid',
@@ -34318,7 +33860,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['android:68-'],
-@@ -14301,7 +14301,7 @@
+@@ -14557,7 +14557,7 @@
},
{
'name': 'SitePerProcessAndroid',
@@ -34327,7 +33869,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['android:68-'],
-@@ -14352,7 +14352,7 @@
+@@ -14612,7 +14612,7 @@
},
{
'name': 'UnsafelyTreatInsecureOriginAsSecure',
@@ -34336,7 +33878,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -14399,7 +14399,7 @@
+@@ -14659,7 +14659,7 @@
},
{
'name': 'DefaultDownloadDirectory',
@@ -34345,7 +33887,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:64-', 'chrome_os:64-'],
-@@ -14419,11 +14419,11 @@
+@@ -14679,11 +14679,11 @@
If you do not set this policy, $1Google Chrome will use its usual default directory (platform-specific).
@@ -34359,7 +33901,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome_os:65-'],
-@@ -14446,7 +14446,7 @@
+@@ -14706,7 +14706,7 @@
},
{
'name': 'AbusiveExperienceInterventionEnforce',
@@ -34368,7 +33910,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:65-', 'chrome_os:65-'],
-@@ -14467,7 +14467,7 @@
+@@ -14727,7 +14727,7 @@
},
{
'name': 'SpellcheckLanguage',
@@ -34377,7 +33919,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -14498,7 +14498,7 @@
+@@ -14758,7 +14758,7 @@
},
{
'name': 'SpellcheckLanguageBlacklist',
@@ -34386,7 +33928,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -14529,7 +14529,7 @@
+@@ -14789,7 +14789,7 @@
},
{
'name': 'ThirdPartyBlockingEnabled',
@@ -34395,7 +33937,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.win:65-'],
-@@ -14547,7 +14547,7 @@
+@@ -14807,7 +14807,7 @@
},
{
'name': 'SpellcheckEnabled',
@@ -34404,7 +33946,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:65-', 'chrome_os:65-'],
-@@ -14569,7 +14569,7 @@
+@@ -14829,7 +14829,7 @@
},
{
'name': 'AdsSettingForIntrusiveAdsSites',
@@ -34413,7 +33955,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -14605,7 +14605,7 @@
+@@ -14865,7 +14865,7 @@
},
{
'name': 'RestrictAccountsToPatterns',
@@ -34422,7 +33964,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -14616,7 +14616,7 @@
+@@ -14876,7 +14876,7 @@
'dynamic_refresh': True,
'per_profile': False,
},
@@ -34431,7 +33973,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'id': 410,
'caption': '''Restrict accounts that are visible in $1Google Chrome''',
'tags': [],
-@@ -14630,7 +14630,7 @@
+@@ -14890,7 +14890,7 @@
},
{
'name': 'PasswordProtectionWarningTrigger',
@@ -34440,7 +33982,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -14674,7 +14674,7 @@
+@@ -14934,7 +14934,7 @@
{
'id': 419,
'name': 'RelaunchNotification',
@@ -34449,7 +33991,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'tags': [],
'features': {
'dynamic_refresh': True,
-@@ -14709,7 +14709,7 @@
+@@ -14969,7 +14969,7 @@
{
'id': 420,
'name': 'RelaunchNotificationPeriod',
@@ -34458,7 +34000,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'tags': [],
'features': {
'dynamic_refresh': True,
-@@ -14748,7 +14748,7 @@
+@@ -15008,7 +15008,7 @@
},
{
'name': 'VirtualMachinesAllowed',
@@ -34467,7 +34009,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:66-'],
-@@ -14772,7 +14772,7 @@
+@@ -15032,7 +15032,7 @@
},
{
'name': 'CrostiniAllowed',
@@ -34476,7 +34018,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:70-'],
-@@ -14793,7 +14793,7 @@
+@@ -15053,7 +15053,7 @@
},
{
'name': 'DeviceUnaffiliatedCrostiniAllowed',
@@ -34485,7 +34027,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:70-'],
-@@ -14813,7 +14813,7 @@
+@@ -15073,7 +15073,7 @@
},
{
'name': 'CrostiniExportImportUIAllowed',
@@ -34494,7 +34036,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:74-'],
-@@ -14829,7 +14829,7 @@
+@@ -15089,7 +15089,7 @@
},
{
'name': 'CrostiniRootAccessAllowed',
@@ -34503,7 +34045,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:77-'],
-@@ -14849,7 +14849,7 @@
+@@ -15109,7 +15109,7 @@
+ },
+ {
+ 'name': 'CrostiniAnsiblePlaybook',
+- 'owners': ['aoldemeier@chromium.org', 'okalitova@chromium.org'],
++ 'owners': ['aoldemeier@ch40m1um.qjz9zk', 'okalitova@ch40m1um.qjz9zk'],
+ 'type': 'external',
+ 'schema': {
+ 'type': 'object',
+@@ -15150,7 +15150,7 @@
},
{
'name': 'SafeBrowsingWhitelistDomains',
@@ -34512,7 +34063,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -14875,7 +14875,7 @@
+@@ -15176,7 +15176,7 @@
},
{
'name': 'PasswordProtectionLoginURLs',
@@ -34521,7 +34072,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -14891,15 +14891,15 @@
+@@ -15192,15 +15192,15 @@
'caption': '''Configure the list of enterprise login URLs where password protection service should capture fingerprint of password.''',
'tags': [],
'desc': '''Configure the list of enterprise login URLs (HTTP and HTTPS schemes only). Fingerprint of password will be captured on these URLs and used for password reuse detection.
@@ -34540,7 +34091,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:69-', 'chrome_os:69-'],
-@@ -14912,15 +14912,15 @@
+@@ -15213,15 +15213,15 @@
'caption': '''Configure the change password URL.''',
'tags': [],
'desc': '''Configure the change password URL (HTTP and HTTPS schemes only). Password protection service will send users to this URL to change their password after seeing a warning in the browser.
@@ -34559,7 +34110,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:66-', 'chrome_os:66-'],
-@@ -14944,11 +14944,11 @@
+@@ -15245,11 +15245,11 @@
If this policy is left unset, the user will be able to change the setting and decide whether to send reports or not.
@@ -34573,7 +34124,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:66-'],
-@@ -14967,7 +14967,7 @@
+@@ -15268,7 +15268,7 @@
},
{
'name': 'CloudManagementEnrollmentToken',
@@ -34582,7 +34133,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'supported_on': ['chrome.*:72-'],
-@@ -14986,7 +14986,7 @@
+@@ -15287,7 +15287,7 @@
},
{
'name': 'CloudManagementEnrollmentMandatory',
@@ -34591,7 +34142,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:72-'],
-@@ -15007,7 +15007,7 @@
+@@ -15308,7 +15308,7 @@
},
{
'name': 'AutoplayAllowed',
@@ -34600,7 +34151,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.win:66-', 'chrome.linux:66-', 'chrome.mac:66-', 'chrome_os:66-'],
-@@ -15030,7 +15030,7 @@
+@@ -15331,7 +15331,7 @@
},
{
'name': 'AutoplayWhitelist',
@@ -34609,7 +34160,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -15073,7 +15073,7 @@
+@@ -15374,7 +15374,7 @@
},
{
'name': 'TabUnderAllowed',
@@ -34618,7 +34169,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:67-67', 'chrome_os:67-67'],
-@@ -15088,13 +15088,13 @@
+@@ -15389,13 +15389,13 @@
'tags': [],
'desc': '''Deprecated in M68. Use DefaultPopupsSetting instead.
@@ -34634,7 +34185,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:67-'],
-@@ -15153,7 +15153,7 @@
+@@ -15454,7 +15454,7 @@
},
{
'name': 'ChromeCleanupEnabled',
@@ -34643,7 +34194,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.win:68-'],
-@@ -15173,7 +15173,7 @@
+@@ -15474,7 +15474,7 @@
},
{
'name': 'ChromeCleanupReportingEnabled',
@@ -34652,7 +34203,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.win:68-'],
-@@ -15195,7 +15195,7 @@
+@@ -15496,7 +15496,7 @@
},
{
'name': 'AllowedLanguages',
@@ -34661,7 +34212,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -15217,7 +15217,7 @@
+@@ -15518,7 +15518,7 @@
},
{
'name': 'AllowedInputMethods',
@@ -34670,7 +34221,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -15259,7 +15259,7 @@
+@@ -15560,7 +15560,7 @@
},
{
'name': 'UsageTimeLimit',
@@ -34679,7 +34230,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'object',
-@@ -15522,7 +15522,7 @@
+@@ -15823,7 +15823,7 @@
},
{
'name': 'EnableSyncConsent',
@@ -34688,7 +34239,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean'},
'supported_on': ['chrome_os:66-'],
-@@ -15646,7 +15646,7 @@
+@@ -15947,7 +15947,7 @@
{
'id': 454,
'name': 'PromotionalTabsEnabled',
@@ -34697,7 +34248,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'tags': [],
'features': {
'dynamic_refresh': True,
-@@ -15667,7 +15667,7 @@
+@@ -15968,7 +15968,7 @@
},
{
'name': 'SafeSitesFilterBehavior',
@@ -34706,7 +34257,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -15704,7 +15704,7 @@
+@@ -16005,7 +16005,7 @@
},
{
'name': 'OverrideSecurityRestrictionsOnInsecureOrigin',
@@ -34715,7 +34266,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -15790,7 +15790,7 @@
+@@ -16091,7 +16091,7 @@
},
{
'name': 'TabFreezingEnabled',
@@ -34723,8 +34274,8 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
+ 'owners': ['catan-team@ch40m1um.qjz9zk'],
'type': 'main',
'schema': { 'type': 'boolean' },
- 'supported_on': ['chrome.win:79-'],
-@@ -15804,7 +15804,7 @@
+ 'supported_on': ['chrome.*:79-', 'chrome_os:79-'],
+@@ -16105,7 +16105,7 @@
'tags': [],
'desc': '''Controls whether $1Google Chrome can freeze tabs that have been in the background for at least 5 minutes.
@@ -34733,7 +34284,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If the policy is set to false, no tabs will be frozen.''',
},
-@@ -15835,7 +15835,7 @@
+@@ -16136,7 +16136,7 @@
{
'id': 462,
'name': 'NetworkFileSharesAllowed',
@@ -34742,7 +34293,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean', },
'tags': [],
-@@ -15854,7 +15854,7 @@
+@@ -16155,7 +16155,7 @@
},
{
'name': 'WebRtcEventLogCollectionAllowed',
@@ -34751,7 +34302,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:70-', 'chrome_os:70-'],
-@@ -15884,7 +15884,7 @@
+@@ -16185,7 +16185,7 @@
},
{
'name': 'PowerSmartDimEnabled',
@@ -34760,7 +34311,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:70-'],
-@@ -15903,7 +15903,7 @@
+@@ -16204,7 +16204,7 @@
},
{
'name': 'CoalesceH2ConnectionsWithClientCertificatesForHosts',
@@ -34769,7 +34320,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -15928,7 +15928,7 @@
+@@ -16229,7 +16229,7 @@
{
'id': 467,
'name': 'NetBiosShareDiscoveryEnabled',
@@ -34778,7 +34329,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean', },
'tags': [],
-@@ -15973,11 +15973,11 @@
+@@ -16274,11 +16274,11 @@
'per_profile': True,
},
'example_value': [{
@@ -34792,7 +34343,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'default_launch_container': 'tab'
}],
'id': 468,
-@@ -15991,7 +15991,7 @@
+@@ -16292,7 +16292,7 @@
{
'id': 470,
'name': 'ReportVersionData',
@@ -34801,7 +34352,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean' },
'tags': ['admin-sharing'],
-@@ -16013,7 +16013,7 @@
+@@ -16314,7 +16314,7 @@
{
'id': 471,
'name': 'ReportPolicyData',
@@ -34810,7 +34361,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean' },
'tags': ['admin-sharing'],
-@@ -16035,7 +16035,7 @@
+@@ -16336,7 +16336,7 @@
{
'id': 472,
'name': 'ReportMachineIDData',
@@ -34819,7 +34370,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean' },
'tags': ['admin-sharing'],
-@@ -16057,7 +16057,7 @@
+@@ -16358,7 +16358,7 @@
{
'id': 473,
'name': 'ReportUserIDData',
@@ -34828,7 +34379,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean' },
'tags': ['admin-sharing'],
-@@ -16079,7 +16079,7 @@
+@@ -16380,7 +16380,7 @@
{
'id': 499,
'name': 'ReportExtensionsAndPluginsData',
@@ -34837,7 +34388,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean' },
'tags': ['admin-sharing'],
-@@ -16101,7 +16101,7 @@
+@@ -16402,7 +16402,7 @@
{
'id': 500,
'name': 'ReportSafeBrowsingData',
@@ -34846,7 +34397,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean' },
'tags': ['admin-sharing'],
-@@ -16123,7 +16123,7 @@
+@@ -16424,7 +16424,7 @@
{
'id': 608,
'name': 'CloudExtensionRequestEnabled',
@@ -34855,7 +34406,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean' },
'tags': ['admin-sharing', 'google-sharing'],
-@@ -16147,7 +16147,7 @@
+@@ -16448,7 +16448,7 @@
{
'id': 493,
'name': 'CloudReportingEnabled',
@@ -34864,7 +34415,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean' },
'tags': ['admin-sharing', 'google-sharing'],
-@@ -16171,7 +16171,7 @@
+@@ -16471,7 +16471,7 @@
},
{
'name': 'EnterpriseHardwarePlatformAPIEnabled',
@@ -34873,7 +34424,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:71-', 'chrome_os:71-', 'android:71-'],
-@@ -16189,7 +16189,7 @@
+@@ -16489,7 +16489,7 @@
},
{
'name': 'VpnConfigAllowed',
@@ -34882,7 +34433,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:71-'],
-@@ -16214,7 +16214,7 @@
+@@ -16514,7 +16514,7 @@
{
'id': 489,
'name': 'NTLMShareAuthenticationEnabled',
@@ -34891,7 +34442,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {'type': 'boolean', },
'tags': [],
-@@ -16235,7 +16235,7 @@
+@@ -16535,7 +16535,7 @@
},
{
'name': 'NetworkFileSharesPreconfiguredShares',
@@ -34900,7 +34451,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'array',
-@@ -16313,7 +16313,7 @@
+@@ -16613,7 +16613,7 @@
{
'id': 494,
'name': 'AlternativeBrowserPath',
@@ -34909,7 +34460,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': {'type': 'string'},
'features': {
-@@ -16339,7 +16339,7 @@
+@@ -16639,7 +16639,7 @@
{
'id': 495,
'name': 'AlternativeBrowserParameters',
@@ -34918,7 +34469,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -16374,7 +16374,7 @@
+@@ -16674,7 +16674,7 @@
{
'id': 530,
'name': 'BrowserSwitcherChromePath',
@@ -34927,7 +34478,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': {'type': 'string'},
'features': {
-@@ -16398,7 +16398,7 @@
+@@ -16698,7 +16698,7 @@
{
'id': 531,
'name': 'BrowserSwitcherChromeParameters',
@@ -34936,7 +34487,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -16431,7 +16431,7 @@
+@@ -16731,7 +16731,7 @@
{
'id': 496,
'name': 'BrowserSwitcherUrlList',
@@ -34945,7 +34496,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -16464,7 +16464,7 @@
+@@ -16764,7 +16764,7 @@
{
'id': 497,
'name': 'BrowserSwitcherUrlGreylist',
@@ -34954,7 +34505,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -16495,7 +16495,7 @@
+@@ -16795,7 +16795,7 @@
{
'id': 498,
'name': 'BrowserSwitcherUseIeSitelist',
@@ -34963,7 +34514,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'example_value': True,
-@@ -16512,12 +16512,12 @@
+@@ -16812,12 +16812,12 @@
When this policy is set to true, $1Google Chrome reads Internet Explorer's SiteList to obtain the site list's URL. $1Google Chrome then downloads the site list from that URL, and applies the rules as if they had been configured with the BrowserSwitcherUrlList policy.
@@ -34978,7 +34529,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'example_value': 'http://example.com/sitelist.xml',
-@@ -16534,12 +16534,12 @@
+@@ -16834,12 +16834,12 @@
When this policy is set to a valid URL, $1Google Chrome downloads the site list from that URL, and applies the rules as if they had been configured with the BrowserSwitcherUrlList policy.
@@ -34993,7 +34544,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': { 'type': 'string' },
'example_value': 'http://example.com/greylist.xml',
-@@ -16558,12 +16558,12 @@
+@@ -16858,12 +16858,12 @@
When this policy is set to a valid URL, $1Google Chrome downloads the site list from that URL, and applies the rules as if they had been configured with the BrowserSwitcherUrlGreylist policy.
@@ -35008,7 +34559,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int',
'schema': { 'type': 'integer' },
'example_value': 10000,
-@@ -16583,7 +16583,7 @@
+@@ -16883,7 +16883,7 @@
{
'id': 517,
'name': 'BrowserSwitcherEnabled',
@@ -35017,7 +34568,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'example_value': True,
-@@ -16605,7 +16605,7 @@
+@@ -16905,7 +16905,7 @@
{
'id': 519,
'name': 'BrowserSwitcherKeepLastChromeTab',
@@ -35026,7 +34577,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'example_value': False,
-@@ -16624,7 +16624,7 @@
+@@ -16924,7 +16924,7 @@
},
{
'name': 'DeviceDisplayResolution',
@@ -35035,7 +34586,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'object',
-@@ -16681,7 +16681,7 @@
+@@ -16981,7 +16981,7 @@
},
{
'name': 'PluginVmAllowed',
@@ -35044,7 +34595,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:72-'],
-@@ -16699,7 +16699,7 @@
+@@ -16999,7 +16999,7 @@
},
{
'name': 'PluginVmLicenseKey',
@@ -35053,7 +34604,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': {
'sensitiveValue': True,
-@@ -16718,7 +16718,7 @@
+@@ -17018,7 +17018,7 @@
},
{
'name': 'PluginVmImage',
@@ -35062,7 +34613,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'object',
-@@ -16935,7 +16935,7 @@
+@@ -17241,7 +17241,7 @@
},
{
'name': 'VoiceInteractionContextEnabled',
@@ -35071,7 +34622,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:74-'],
-@@ -16954,7 +16954,7 @@
+@@ -17260,7 +17260,7 @@
},
{
'name': 'VoiceInteractionHotwordEnabled',
@@ -35080,7 +34631,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:74-'],
-@@ -16975,7 +16975,7 @@
+@@ -17281,7 +17281,7 @@
},
{
'name': 'DeviceWilcoDtcAllowed',
@@ -35089,7 +34640,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:74-'],
-@@ -16995,7 +16995,7 @@
+@@ -17301,7 +17301,7 @@
},
{
'name': 'AllowPopupsDuringPageUnload',
@@ -35098,7 +34649,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:74-', 'chrome_os:74-', 'android:74-'],
-@@ -17016,11 +17016,11 @@
+@@ -17322,11 +17322,11 @@
This policy will be removed in Chrome 82.
@@ -35112,7 +34663,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'external',
'schema': {
'type': 'object',
-@@ -17053,7 +17053,7 @@
+@@ -17359,7 +17359,7 @@
},
{
'name': 'DevicePowerPeakShiftEnabled',
@@ -35121,7 +34672,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:75-'],
-@@ -17080,7 +17080,7 @@
+@@ -17386,7 +17386,7 @@
},
{
'name': 'DevicePowerPeakShiftBatteryThreshold',
@@ -35130,7 +34681,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int',
'schema': {
'type': 'integer',
-@@ -17105,7 +17105,7 @@
+@@ -17411,7 +17411,7 @@
},
{
'name': 'DevicePowerPeakShiftDayConfig',
@@ -35139,7 +34690,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'object',
-@@ -17177,7 +17177,7 @@
+@@ -17483,7 +17483,7 @@
},
{
'name': 'DeviceBootOnAcEnabled',
@@ -35148,7 +34699,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:75-'],
-@@ -17204,7 +17204,7 @@
+@@ -17510,7 +17510,7 @@
},
{
'name': 'DeviceUsbPowerShareEnabled',
@@ -35157,7 +34708,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:75-'],
-@@ -17251,7 +17251,7 @@
+@@ -17557,7 +17557,7 @@
},
{
'name': 'DeviceQuickFixBuildToken',
@@ -35166,7 +34717,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'string',
'schema': {
'type': 'string',
-@@ -17274,7 +17274,7 @@
+@@ -17580,7 +17580,7 @@
},
{
'name': 'SamlInSessionPasswordChangeEnabled',
@@ -35175,7 +34726,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:76-'],
-@@ -17296,7 +17296,7 @@
+@@ -17602,7 +17602,7 @@
},
{
'name': 'UserFeedbackAllowed',
@@ -35184,7 +34735,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {
'type': 'boolean',
-@@ -17317,7 +17317,7 @@
+@@ -17623,7 +17623,7 @@
},
{
'name': 'SamlPasswordExpirationAdvanceWarningDays',
@@ -35193,7 +34744,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int',
'schema': {
'type': 'integer',
-@@ -17344,7 +17344,7 @@
+@@ -17650,7 +17650,7 @@
},
{
'name': 'DeviceAdvancedBatteryChargeModeEnabled',
@@ -35202,7 +34753,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:75-'],
-@@ -17371,7 +17371,7 @@
+@@ -17677,7 +17677,7 @@
},
{
'name': 'DeviceAdvancedBatteryChargeModeDayConfig',
@@ -35211,7 +34762,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'dict',
'schema': {
'type': 'object',
-@@ -17436,7 +17436,7 @@
+@@ -17742,7 +17742,7 @@
},
{
'name': 'DeviceBatteryChargeMode',
@@ -35220,7 +34771,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -17493,7 +17493,7 @@
+@@ -17799,7 +17799,7 @@
},
{
'name': 'DeviceBatteryChargeCustomStartCharging',
@@ -35229,7 +34780,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int',
'schema': {
'type': 'integer',
-@@ -17522,7 +17522,7 @@
+@@ -17828,7 +17828,7 @@
},
{
'name': 'DeviceBatteryChargeCustomStopCharging',
@@ -35238,7 +34789,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int',
'schema': {
'type': 'integer',
-@@ -17551,7 +17551,7 @@
+@@ -17857,7 +17857,7 @@
},
{
'name': 'DeviceScheduledUpdateCheck',
@@ -35247,7 +34798,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'device_only': True,
'type': 'dict',
'schema': {
-@@ -17741,7 +17741,7 @@
+@@ -18047,7 +18047,7 @@
},
{
'name': 'CommandLineFlagSecurityWarningsEnabled',
@@ -35256,7 +34807,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:76-'],
-@@ -17761,7 +17761,7 @@
+@@ -18067,7 +18067,7 @@
},
{
'name': 'StartupBrowserWindowLaunchSuppressed',
@@ -35265,7 +34816,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:76-'],
-@@ -17849,7 +17849,7 @@
+@@ -18155,7 +18155,7 @@
},
{
'name': 'VmManagementCliAllowed',
@@ -35274,16 +34825,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome_os:77-'],
-@@ -17870,7 +17870,7 @@
- },
- {
- 'name': 'SafeBrowsingRealTimeLookupEnabled',
-- 'owners': ['drubery@chromium.org', 'nparker@chromium.org'],
-+ 'owners': ['drubery@ch40m1um.qjz9zk', 'nparker@ch40m1um.qjz9zk'],
- 'type': 'main',
- 'schema': {
- 'type': 'boolean',
-@@ -17958,7 +17958,7 @@
+@@ -18243,7 +18243,7 @@
'id': 583,
'name': 'SendFilesForMalwareCheck',
'type': 'int-enum',
@@ -35292,7 +34834,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'schema': {
'type': 'integer',
'enum': [0, 2, 3, 4],
-@@ -18006,7 +18006,7 @@
+@@ -18291,7 +18291,7 @@
},
{
'name': 'UnsafeEventsReportingEnabled',
@@ -35301,7 +34843,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {
'type': 'boolean',
-@@ -18028,7 +18028,7 @@
+@@ -18313,7 +18313,7 @@
},
{
'name': 'BlockLargeFileTransfer',
@@ -35310,7 +34852,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -18079,7 +18079,7 @@
+@@ -18364,7 +18364,7 @@
},
{
'name': 'DelayDeliveryUntilVerdict',
@@ -35319,7 +34861,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -18130,7 +18130,7 @@
+@@ -18415,7 +18415,7 @@
},
{
'name': 'AllowPasswordProtectedFiles',
@@ -35328,7 +34870,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -18181,7 +18181,7 @@
+@@ -18466,7 +18466,7 @@
},
{
'name': 'CheckContentCompliance',
@@ -35337,16 +34879,16 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -18232,7 +18232,7 @@
+@@ -18517,7 +18517,7 @@
},
{
- 'name': 'DomainsToCheckComplianceOfDownloadedContent',
+ 'name': 'URLsToCheckComplianceOfDownloadedContent',
- 'owners': ['rogerta@chromium.org', 'mad@chromium.org'],
+ 'owners': ['rogerta@ch40m1um.qjz9zk', 'mad@ch40m1um.qjz9zk'],
'type': 'list',
'schema': {
'type': 'array',
-@@ -18252,12 +18252,12 @@
+@@ -18537,12 +18537,12 @@
If this policy is not set or set to an empty list of url patterns, no downloaded content is checked for sensitive data protection rule violations.
@@ -35355,13 +34897,13 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'''
},
{
- 'name': 'DomainsToNotCheckComplianceOfUploadedContent',
+ 'name': 'URLsToNotCheckComplianceOfUploadedContent',
- 'owners': ['rogerta@chromium.org', 'mad@chromium.org'],
+ 'owners': ['rogerta@ch40m1um.qjz9zk', 'mad@ch40m1um.qjz9zk'],
'type': 'list',
'schema': {
'type': 'array',
-@@ -18277,12 +18277,12 @@
+@@ -18562,12 +18562,12 @@
If this policy is not set or set to an empty list of url patterns, all content is checked for sensitive data protection rule violations.
@@ -35376,7 +34918,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.win:78-'],
-@@ -18296,12 +18296,12 @@
+@@ -18581,12 +18581,12 @@
'tags': ['system-security'],
'desc': '''If this policy is enabled or left unset, then Renderer Code Integrity is enabled. This should only be disabled if compatibility issues are encountered with third party software that must run inside Chrome's renderer processes.
@@ -35385,13 +34927,13 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
# TODO(rogerta): Use a custom policy handler to show in chrome://policy that this policy depends on the state of SendFilesForMalwareCheck.
- 'name': 'DomainsToCheckForMalwareOfUploadedContent',
+ 'name': 'URLsToCheckForMalwareOfUploadedContent',
- 'owners': ['rogerta@chromium.org', 'drubery@chromium.org'],
+ 'owners': ['rogerta@ch40m1um.qjz9zk', 'drubery@ch40m1um.qjz9zk'],
'type': 'list',
'schema': {
'type': 'array',
-@@ -18321,12 +18321,12 @@
+@@ -18606,12 +18606,12 @@
If this policy is not set or set to an empty list of url patterns, no uploaded content is checked for malware.
@@ -35406,7 +34948,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -18348,7 +18348,7 @@
+@@ -18633,7 +18633,7 @@
},
{
'name': 'AllowSyncXHRInPageDismissal',
@@ -35415,7 +34957,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:78-', 'chrome_os:78-', 'android:78-'],
-@@ -18369,11 +18369,11 @@
+@@ -18654,11 +18654,11 @@
This policy will be removed in Chrome 82.
@@ -35429,7 +34971,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int',
'schema': {
'type': 'integer',
-@@ -18448,7 +18448,7 @@
+@@ -18733,7 +18733,7 @@
},
{
'name': 'CorsMitigationList',
@@ -35438,7 +34980,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -18465,17 +18465,17 @@
+@@ -18750,17 +18750,17 @@
'tags': [],
'desc': '''Enable CORS check mitigations in the new CORS implementation, allowing Extensions to keep compatible behavior, and allowing $1Google Chrome to send specified headers without CORS checks.
@@ -35459,7 +35001,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:79-', 'chrome_os:79-'],
-@@ -18495,7 +18495,7 @@
+@@ -18780,7 +18780,7 @@
This policy will be removed after a couple of milestones.
@@ -35468,7 +35010,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
{
'name': 'ExternalPrintServersWhitelist',
-@@ -18524,7 +18524,7 @@
+@@ -18809,7 +18809,7 @@
},
{
'name': 'ExternalProtocolDialogShowAlwaysOpenCheckbox',
@@ -35477,7 +35019,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': {
'type': 'boolean',
-@@ -18546,7 +18546,7 @@
+@@ -18831,7 +18831,7 @@
},
{
'name': 'DefaultInsecureContentSetting',
@@ -35486,7 +35028,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'int-enum',
'schema': {
'type': 'integer',
-@@ -18581,7 +18581,7 @@
+@@ -18866,7 +18866,7 @@
},
{
'name': 'InsecureContentAllowedForUrls',
@@ -35495,7 +35037,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -18602,7 +18602,7 @@
+@@ -18887,7 +18887,7 @@
},
{
'name': 'InsecureContentBlockedForUrls',
@@ -35504,7 +35046,43 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'list',
'schema': {
'type': 'array',
-@@ -18623,7 +18623,7 @@
+@@ -18908,7 +18908,7 @@
+ },
+ {
+ 'name': 'DeviceWebBasedAttestationAllowedUrls',
+- 'owners': ['miersh@google.com', 'pmarko@chromium.com', 'file://chrome/browser/chromeos/login/OWNERS'],
++ 'owners': ['miersh@9oo91e.qjz9zk', 'pmarko@chromium.com', 'file://chrome/browser/chromeos/login/OWNERS'],
+ 'device_only': True,
+ 'type': 'list',
+ 'schema': {
+@@ -18934,7 +18934,7 @@
+ },
+ {
+ 'name': 'DeviceShowNumericKeyboardForPassword',
+- 'owners': ['raleksandrov@google.com', 'file://chrome/browser/chromeos/login/OWNERS'],
++ 'owners': ['raleksandrov@9oo91e.qjz9zk', 'file://chrome/browser/chromeos/login/OWNERS'],
+ 'type' : 'main',
+ 'schema': { 'type': 'boolean' },
+ 'supported_on': ['chrome_os:80-'],
+@@ -18952,7 +18952,7 @@
+ },
+ {
+ 'name': 'PerAppTimeLimits',
+- 'owners': ['agawronska@chromium.org', 'cros-families-eng@google.com'],
++ 'owners': ['agawronska@ch40m1um.qjz9zk', 'cros-families-eng@9oo91e.qjz9zk'],
+ 'type': 'dict',
+ 'schema': {
+ 'type': 'object',
+@@ -19074,7 +19074,7 @@
+ },
+ {
+ 'name': 'WebComponentsV0Enabled',
+- 'owners': ['masonfreed@chromium.org', 'chrishtr@chromium.org'],
++ 'owners': ['masonfreed@ch40m1um.qjz9zk', 'chrishtr@ch40m1um.qjz9zk'],
+ 'type': 'main',
+ 'schema': { 'type': 'boolean' },
+ 'example_value': True,
+@@ -19096,7 +19096,7 @@
},
{
'name': 'ClickToCallEnabled',
@@ -35513,7 +35091,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
'type': 'main',
'schema': { 'type': 'boolean' },
'supported_on': ['chrome.*:79-', 'chrome_os:79-'],
-@@ -18635,7 +18635,7 @@
+@@ -19108,7 +19108,7 @@
'id': 645,
'caption': '''Enable the Click to Call Feature''',
'tags': [],
@@ -35522,7 +35100,25 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
If this policy is set to enabled, the capability of sending phone numbers to Android devices will be enabled for the Chrome user.
-@@ -18735,7 +18735,7 @@
+@@ -19185,7 +19185,7 @@
+ },
+ {
+ 'name': 'AmbientAuthenticationInPrivateModesEnabled',
+- 'owners': ['rhalavati@chromium.org', 'roagarwal@chromium.org', 'chrome-privacy-core@google.com'],
++ 'owners': ['rhalavati@ch40m1um.qjz9zk', 'roagarwal@ch40m1um.qjz9zk', 'chrome-privacy-core@9oo91e.qjz9zk'],
+ 'type': 'int-enum',
+ 'schema': {
+ 'type': 'integer',
+@@ -19260,7 +19260,7 @@
+ },
+ {
+ 'name': 'StricterMixedContentTreatmentEnabled',
+- 'owners': ['carlosil@chromium.org', 'estark@chromium.org'],
++ 'owners': ['carlosil@ch40m1um.qjz9zk', 'estark@ch40m1um.qjz9zk'],
+ 'type': 'main',
+ 'schema': { 'type': 'boolean' },
+ 'supported_on': ['chrome.*:80-', 'chrome_os:80-'],
+@@ -19367,7 +19367,7 @@
},
'doc_banner': {
'desc': '''A banner shown at the top of the policy documentation''',
@@ -35531,7 +35127,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
'doc_intro': {
'desc': '''Introduction text for the generated policy documentation''',
-@@ -18743,13 +18743,13 @@
+@@ -19375,13 +19375,13 @@
These policies are strictly intended to be used to configure instances of $1Google Chrome internal to your organization. Use of these policies outside of your organization (for example, in a publicly distributed program) is considered malware and will likely be labeled as malware by Google and anti-virus vendors.
@@ -35547,7 +35143,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
'doc_policy_in_atomic_group': {
'desc': '''Label notifying that a policy is part of an atomic policy group''',
-@@ -18805,11 +18805,11 @@ The recommended way to configure policy on Windows is via GPO, although provisio
+@@ -19437,11 +19437,11 @@ The recommended way to configure policy on Windows is via GPO, although provisio
},
'doc_complex_policies_on_windows': {
'desc': '''Text pointing the user to a help article for complex policies on Windows''',
@@ -35561,7 +35157,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
'doc_legacy_single_line_label': {
'desc': '''A label for the legacy single-line textbox for a policy also has a more user-friendly multi-line textbox. See http://crbug/829328''',
-@@ -18829,7 +18829,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio
+@@ -19461,7 +19461,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio
},
'doc_schema_description_link': {
'desc': '''Text pointing the user to the expanded documentation page for this policy, containing the information about schema and formatting.''',
@@ -35570,7 +35166,7 @@ diff --git a/components/policy/resources/policy_templates.json b/components/poli
},
'deprecated_policy_group_caption': {
'desc': '''Localized name for the deprecated policies folder, for Microsoft's Group Policy Editor.''',
-@@ -18841,7 +18841,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio
+@@ -19473,7 +19473,7 @@ The recommended way to configure policy on Windows is via GPO, although provisio
},
'deprecated_policy_desc': {
'desc': '''Description shared by all deprecated policies, in Microsoft Windows' Group Policy Editor.''',
@@ -35594,7 +35190,7 @@ diff --git a/components/policy/tools/generate_extension_admx.py b/components/pol
diff --git a/components/policy/tools/syntax_check_policy_template_json.py b/components/policy/tools/syntax_check_policy_template_json.py
--- a/components/policy/tools/syntax_check_policy_template_json.py
+++ b/components/policy/tools/syntax_check_policy_template_json.py
-@@ -383,7 +383,7 @@ class PolicyTemplateChecker(object):
+@@ -440,7 +440,7 @@ class PolicyTemplateChecker(object):
'of the description, it is recommended to add a page under %s '
'instead and provide a link to it.' %
(POLICY_DESCRIPTION_LENGTH_SOFT_LIMIT,
@@ -35627,7 +35223,7 @@ diff --git a/components/policy/tools/template_writers/writers/adm_writer.py b/co
def GetWriter(config):
-@@ -178,7 +178,7 @@ class AdmWriter(gpo_editor_writer.GpoEditorWriter):
+@@ -179,7 +179,7 @@ class AdmWriter(gpo_editor_writer.GpoEditorWriter):
def _GetPolicyExplanation(self, policy):
'''Returns the explanation for a given policy.
@@ -35686,7 +35282,7 @@ diff --git a/components/prefs/pref_change_registrar.cc b/components/prefs/pref_c
diff --git a/components/previews/content/previews_decider_impl.cc b/components/previews/content/previews_decider_impl.cc
--- a/components/previews/content/previews_decider_impl.cc
+++ b/components/previews/content/previews_decider_impl.cc
-@@ -257,7 +257,7 @@ PreviewsEligibilityReason PreviewsDeciderImpl::DeterminePreviewEligibility(
+@@ -243,7 +243,7 @@ PreviewsEligibilityReason PreviewsDeciderImpl::DeterminePreviewEligibility(
// Do not allow previews for URL suffixes which are excluded. In practice,
// this is used to exclude navigations that look like media resources like
@@ -35719,7 +35315,7 @@ diff --git a/components/previews/core/previews_experiments.cc b/components/previ
diff --git a/components/previews/core/previews_features.cc b/components/previews/core/previews_features.cc
--- a/components/previews/core/previews_features.cc
+++ b/components/previews/core/previews_features.cc
-@@ -80,7 +80,7 @@ const base::Feature kCoinFlipHoldback{"PreviewsCoinFlipHoldback_UKMOnly",
+@@ -79,7 +79,7 @@ const base::Feature kCoinFlipHoldback{"PreviewsCoinFlipHoldback_UKMOnly",
// Enables filtering navigation URLs by suffix to exclude navigation that look
// like media resources from triggering previews. For example,
@@ -35731,7 +35327,7 @@ diff --git a/components/previews/core/previews_features.cc b/components/previews
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
--- a/components/printing/renderer/print_render_frame_helper.cc
+++ b/components/printing/renderer/print_render_frame_helper.cc
-@@ -1585,7 +1585,7 @@ void PrintRenderFrameHelper::OnPrintFrameContent(
+@@ -1700,7 +1700,7 @@ void PrintRenderFrameHelper::OnPrintFrameContent(
// Printing embedded pdf plugin has been broken since pdf plugin viewer was
// moved out-of-process
@@ -37821,7 +37417,7 @@ diff --git a/components/rlz/rlz_tracker.h b/components/rlz/rlz_tracker.h
diff --git a/components/safe_browsing/base_ui_manager.cc b/components/safe_browsing/base_ui_manager.cc
--- a/components/safe_browsing/base_ui_manager.cc
+++ b/components/safe_browsing/base_ui_manager.cc
-@@ -192,7 +192,7 @@ void BaseUIManager::DisplayBlockingPage(
+@@ -194,7 +194,7 @@ void BaseUIManager::DisplayBlockingPage(
// main-frame or sub-frame resource. Similar warning restrictions should be
// applied to malware sites tagged as "landing sites" (see "Types of
// Malware sites" under
@@ -37857,7 +37453,7 @@ diff --git a/components/safe_browsing/db/metadata.proto b/components/safe_browsi
diff --git a/components/safe_browsing/db/v4_get_hash_protocol_manager.cc b/components/safe_browsing/db/v4_get_hash_protocol_manager.cc
--- a/components/safe_browsing/db/v4_get_hash_protocol_manager.cc
+++ b/components/safe_browsing/db/v4_get_hash_protocol_manager.cc
-@@ -390,7 +390,7 @@ void V4GetHashProtocolManager::GetFullHashCachedResults(
+@@ -392,7 +392,7 @@ void V4GetHashProtocolManager::GetFullHashCachedResults(
DCHECK(cached_full_hash_infos->empty());
// Caching behavior is documented here:
@@ -37869,7 +37465,7 @@ diff --git a/components/safe_browsing/db/v4_get_hash_protocol_manager.cc b/compo
diff --git a/components/safe_browsing/db/v4_protocol_manager_util.cc b/components/safe_browsing/db/v4_protocol_manager_util.cc
--- a/components/safe_browsing/db/v4_protocol_manager_util.cc
+++ b/components/safe_browsing/db/v4_protocol_manager_util.cc
-@@ -28,7 +28,7 @@ namespace safe_browsing {
+@@ -29,7 +29,7 @@ namespace safe_browsing {
// Can be overriden by tests.
const char* g_sbv4_url_prefix_for_testing = nullptr;
@@ -37878,7 +37474,7 @@ diff --git a/components/safe_browsing/db/v4_protocol_manager_util.cc b/component
const base::FilePath::CharType kStoreSuffix[] = FILE_PATH_LITERAL(".store");
-@@ -37,7 +37,7 @@ namespace {
+@@ -38,7 +38,7 @@ namespace {
// The default URL prefix where browser reports safe browsing hits and malware
// details.
const char kSbReportsURLPrefix[] =
@@ -37887,9 +37483,9 @@ diff --git a/components/safe_browsing/db/v4_protocol_manager_util.cc b/component
std::string Unescape(const std::string& url) {
std::string unescaped_str(url);
-@@ -118,7 +118,7 @@ PlatformType GetCurrentPlatformType() {
- return OSX_PLATFORM;
- #else
+@@ -123,7 +123,7 @@ PlatformType GetCurrentPlatformType() {
+ // ANDROID_PLATFORM here.
+ //
// This should ideally never compile but it is getting compiled on Android.
- // See: https://bugs.chromium.org/p/chromium/issues/detail?id=621647
+ // See: https://bugs.ch40m1um.qjz9zk/p/chromium/issues/detail?id=621647
@@ -37948,6 +37544,15 @@ diff --git a/components/safe_browsing/password_protection/password_protection_se
} // namespace
+@@ -66,7 +66,7 @@ PasswordProtectionService::PasswordProtectionService(
+
+ common_spoofed_domains_ = {
+ "login.live.com"
+- "facebook.com",
++ "f8c3b00k.qjz9zk",
+ "box.com",
+ "paypal.com",
+ "apple.com",
diff --git a/components/safe_browsing/proto/csd.proto b/components/safe_browsing/proto/csd.proto
--- a/components/safe_browsing/proto/csd.proto
+++ b/components/safe_browsing/proto/csd.proto
@@ -37969,7 +37574,7 @@ diff --git a/components/safe_browsing/proto/csd.proto b/components/safe_browsing
GMAIL = 1;
// User signed in with a G Suite account.
-@@ -300,7 +300,7 @@ message LoginReputationClientRequest {
+@@ -302,7 +302,7 @@ message LoginReputationClientRequest {
// User signed in with a dasher account.
GSUITE = 1;
@@ -37978,7 +37583,7 @@ diff --git a/components/safe_browsing/proto/csd.proto b/components/safe_browsing
GMAIL = 2;
// Password used for Enterprise login on an Enterprise login page.
-@@ -382,7 +382,7 @@ message LoginReputationClientResponse {
+@@ -384,7 +384,7 @@ message LoginReputationClientResponse {
// hosting sites (e.g., geocities.com), we further divide the domains.
//
// Examples:
@@ -37987,7 +37592,7 @@ diff --git a/components/safe_browsing/proto/csd.proto b/components/safe_browsing
// www.geocities.com/foo/bar.html -> geocities.com/foo
// adwords.blogspot.com/index.html -> adwords.blogspot.com
//
-@@ -1295,7 +1295,7 @@ message ClientSafeBrowsingReportRequest {
+@@ -1297,7 +1297,7 @@ message ClientSafeBrowsingReportRequest {
// Native implementation of Safe Browsing API v4 protocol.
PVER4_NATIVE = 2;
// Android SafetyNet API.
@@ -37999,7 +37604,7 @@ diff --git a/components/safe_browsing/proto/csd.proto b/components/safe_browsing
diff --git a/components/safe_browsing/realtime/url_lookup_service.cc b/components/safe_browsing/realtime/url_lookup_service.cc
--- a/components/safe_browsing/realtime/url_lookup_service.cc
+++ b/components/safe_browsing/realtime/url_lookup_service.cc
-@@ -21,7 +21,7 @@ namespace safe_browsing {
+@@ -25,7 +25,7 @@ namespace safe_browsing {
namespace {
const char kRealTimeLookupUrlPrefix[] =
@@ -38023,7 +37628,7 @@ diff --git a/components/safe_browsing/triggers/trigger_util.cc b/components/safe
diff --git a/components/safe_browsing/verdict_cache_manager.cc b/components/safe_browsing/verdict_cache_manager.cc
--- a/components/safe_browsing/verdict_cache_manager.cc
+++ b/components/safe_browsing/verdict_cache_manager.cc
-@@ -82,8 +82,8 @@ bool ParseVerdictEntry(base::Value* verdict_entry,
+@@ -85,8 +85,8 @@ bool ParseVerdictEntry(base::Value* verdict_entry,
}
// Return the path of the cache expression. e.g.:
@@ -38085,7 +37690,7 @@ diff --git a/components/search_engines/template_url.h b/components/search_engine
diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
-@@ -1464,7 +1464,7 @@ TemplateURL* TemplateURLService::BestEngineForKeyword(TemplateURL* engine1,
+@@ -1453,7 +1453,7 @@ TemplateURL* TemplateURLService::BestEngineForKeyword(TemplateURL* engine1,
DCHECK(IsCreatedByExtension(engine1) || IsCreatedByExtension(engine2));
// TODO(a-v-y) Remove following code for non extension engines when reasons
@@ -38169,13 +37774,13 @@ diff --git a/components/search_provider_logos/switches.cc b/components/search_pr
diff --git a/components/security_interstitials/core/browser/resources/interstitial_large.js b/components/security_interstitials/core/browser/resources/interstitial_large.js
--- a/components/security_interstitials/core/browser/resources/interstitial_large.js
+++ b/components/security_interstitials/core/browser/resources/interstitial_large.js
-@@ -15,7 +15,7 @@ var keyPressState = 0;
+@@ -15,7 +15,7 @@ let keyPressState = 0;
function handleKeypress(e) {
// HTTPS errors are serious and should not be ignored. For testing purposes,
// other approaches are both safer and have fewer side-effects.
- // See https://goo.gl/ZcZixP for more details.
+ // See https://goo.gl.qjz9zk.qjz9zk/ZcZixP for more details.
- var BYPASS_SEQUENCE = window.atob('dGhpc2lzdW5zYWZl');
+ const BYPASS_SEQUENCE = window.atob('dGhpc2lzdW5zYWZl');
if (BYPASS_SEQUENCE.charCodeAt(keyPressState) == e.keyCode) {
keyPressState++;
diff --git a/components/security_interstitials/core/controller_client.cc b/components/security_interstitials/core/controller_client.cc
@@ -38193,10 +37798,10 @@ diff --git a/components/security_interstitials/core/controller_client.cc b/compo
diff --git a/components/security_interstitials/core/safe_browsing_loud_error_ui.cc b/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
--- a/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
+++ b/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
-@@ -24,11 +24,11 @@ namespace {
+@@ -23,11 +23,11 @@ namespace {
+ // For malware interstitial pages, we link the problematic URL to Google's
// diagnostic page.
const char kSbDiagnosticUrl[] =
- /* trk:227 */
- "https://transparencyreport.google.com/safe-browsing/search?url=%s";
+ "https://transparencyreport.9oo91e.qjz9zk/safe-browsing/search?url=%s";
@@ -38225,7 +37830,7 @@ diff --git a/components/security_interstitials/core/urls.cc b/components/securit
diff --git a/components/security_state/core/security_state.h b/components/security_state/core/security_state.h
--- a/components/security_state/core/security_state.h
+++ b/components/security_state/core/security_state.h
-@@ -113,7 +113,7 @@ enum MaliciousContentStatus {
+@@ -115,7 +115,7 @@ enum MaliciousContentStatus {
//
// Style note: this differs from other enums in this file to follow new
// histogram enum naming conventions
@@ -38282,7 +37887,7 @@ diff --git a/components/services/quarantine/quarantine_mac.mm b/components/servi
diff --git a/components/services/quarantine/quarantine_win.cc b/components/services/quarantine/quarantine_win.cc
--- a/components/services/quarantine/quarantine_win.cc
+++ b/components/services/quarantine/quarantine_win.cc
-@@ -80,7 +80,7 @@ QuarantineFileResult FailedSaveResultToQuarantineResult(HRESULT result) {
+@@ -79,7 +79,7 @@ QuarantineFileResult FailedSaveResultToQuarantineResult(HRESULT result) {
// Invokes IAttachmentExecute::Save on CLSID_AttachmentServices to validate the
// downloaded file. The call may scan the file for viruses and if necessary,
// annotate it with evidence. As a result of the validation, the file may be
@@ -38336,15 +37941,15 @@ diff --git a/components/signin/core/browser/chrome_connected_header_helper.cc b/
diff --git a/components/signin/core/browser/resources/signin_internals.js b/components/signin/core/browser/resources/signin_internals.js
--- a/components/signin/core/browser/resources/signin_internals.js
+++ b/components/signin/core/browser/resources/signin_internals.js
-@@ -22,7 +22,7 @@ function highlightIfChanged(node, oldVal, newVal) {
+@@ -23,7 +23,7 @@ function highlightIfChanged(node, oldVal, newVal) {
if (oldStr != '' && oldStr != newStr) {
// Note the addListener function does not end up creating duplicate
// listeners. There can be only one listener per event at a time.
- // Reference: https://developer.mozilla.org/en/DOM/element.addEventListener
+ // Reference: https://developer.m0z111a.qjz9zk/en/DOM/element.addEventListener
- node.addEventListener('webkitAnimationEnd',
- function() { this.removeAttribute('highlighted'); },
- false);
+ node.addEventListener('webkitAnimationEnd', function() {
+ this.removeAttribute('highlighted');
+ }, false);
diff --git a/components/signin/internal/identity_manager/oauth2_token_service_delegate_android.cc b/components/signin/internal/identity_manager/oauth2_token_service_delegate_android.cc
--- a/components/signin/internal/identity_manager/oauth2_token_service_delegate_android.cc
+++ b/components/signin/internal/identity_manager/oauth2_token_service_delegate_android.cc
@@ -38384,8 +37989,8 @@ diff --git a/components/signin/ios/browser/account_consistency_service.mm b/comp
diff --git a/components/signin/public/base/signin_client.h b/components/signin/public/base/signin_client.h
--- a/components/signin/public/base/signin_client.h
+++ b/components/signin/public/base/signin_client.h
-@@ -96,7 +96,7 @@ class SigninClient : public KeyedService {
- virtual void SetReadyForDiceMigration(bool is_ready) {}
+@@ -93,7 +93,7 @@ class SigninClient : public KeyedService {
+ virtual void SetDiceMigrationCompleted() {}
// Checks whether a user is known to be non-enterprise. Domains such as
- // gmail.com and googlemail.com are known to not be managed. Also returns
@@ -38441,21 +38046,15 @@ diff --git a/components/spellcheck/browser/android/java/src/org/chromium/compone
diff --git a/components/spellcheck/browser/spelling_service_client.cc b/components/spellcheck/browser/spelling_service_client.cc
--- a/components/spellcheck/browser/spelling_service_client.cc
+++ b/components/spellcheck/browser/spelling_service_client.cc
-@@ -40,12 +40,12 @@ namespace {
+@@ -38,7 +38,7 @@ namespace {
- // The old JSON-RPC endpoint for requesting spell checking and sending user
- // feedback.
--const char kSpellingServiceRpcURL[] = "https://www.googleapis.com/rpc";
-+const char kSpellingServiceRpcURL[] = "https://www.9oo91eapis.qjz9zk/rpc";
-
- // The new REST endpoint for requesting spell checking and sending user
- // feedback.
+ // The REST endpoint for requesting spell checking and sending user feedback.
const char kSpellingServiceRestURL[] =
- "https://www.googleapis.com/spelling/v%d/spelling/check?key=%s";
+ "https://www.9oo91eapis.qjz9zk/spelling/v%d/spelling/check?key=%s";
// The spellcheck suggestions object key in the JSON response from the spelling
- // service when using the JSON-RPC endpoint.
+ // service.
diff --git a/components/ssl_errors/error_classification.h b/components/ssl_errors/error_classification.h
--- a/components/ssl_errors/error_classification.h
+++ b/components/ssl_errors/error_classification.h
@@ -38603,18 +38202,6 @@ diff --git a/components/sync/android/java/src/org/chromium/components/sync/notif
*/
public class InvalidationPreferences {
/**
-diff --git a/components/sync/base/data_type_histogram.h b/components/sync/base/data_type_histogram.h
---- a/components/sync/base/data_type_histogram.h
-+++ b/components/sync/base/data_type_histogram.h
-@@ -37,7 +37,7 @@ void SyncRecordModelTypeCountHistogram(syncer::ModelType model_type,
- //
- // TODO(zea): Once visual studio supports proper variadic argument replacement
- // in macros, pass in the histogram method directly as a parameter.
--// See http://connect.microsoft.com/VisualStudio/feedback/details/380090/
-+// See http://connect.m1cr050ft.qjz9zk/VisualStudio/feedback/details/380090/
- // variadic-macro-replacement#details
- // When adding a new datatype in the switch below, also update the SyncModelType
- // and SyncModelTypeByMacro histogram suffixes in histograms.xml.
diff --git a/components/sync/driver/resources/about.js b/components/sync/driver/resources/about.js
--- a/components/sync/driver/resources/about.js
+++ b/components/sync/driver/resources/about.js
@@ -38658,7 +38245,7 @@ diff --git a/components/sync/protocol/history_delete_directive_specifics.proto b
diff --git a/components/sync/protocol/sync.proto b/components/sync/protocol/sync.proto
--- a/components/sync/protocol/sync.proto
+++ b/components/sync/protocol/sync.proto
-@@ -86,7 +86,7 @@ message EntitySpecifics {
+@@ -85,7 +85,7 @@ message EntitySpecifics {
// To add new datatype-specific fields to the protocol, extend
// EntitySpecifics. First, pick a non-colliding tag number by
// picking a Cr-Commit-Position of one of your past commits
@@ -38691,7 +38278,7 @@ diff --git a/components/sync_bookmarks/PRESUBMIT.py b/components/sync_bookmarks/
diff --git a/components/sync_bookmarks/bookmark_model_merger.cc b/components/sync_bookmarks/bookmark_model_merger.cc
--- a/components/sync_bookmarks/bookmark_model_merger.cc
+++ b/components/sync_bookmarks/bookmark_model_merger.cc
-@@ -464,7 +464,7 @@ void BookmarkModelMerger::ProcessLocalCreation(
+@@ -624,7 +624,7 @@ void BookmarkModelMerger::ProcessLocalCreation(
DCHECK(parent_entity);
// Similar to the directory implementation here:
@@ -38703,7 +38290,7 @@ diff --git a/components/sync_bookmarks/bookmark_model_merger.cc b/components/syn
diff --git a/components/sync_bookmarks/bookmark_model_observer_impl.cc b/components/sync_bookmarks/bookmark_model_observer_impl.cc
--- a/components/sync_bookmarks/bookmark_model_observer_impl.cc
+++ b/components/sync_bookmarks/bookmark_model_observer_impl.cc
-@@ -91,7 +91,7 @@ void BookmarkModelObserverImpl::BookmarkNodeAdded(
+@@ -92,7 +92,7 @@ void BookmarkModelObserverImpl::BookmarkNodeAdded(
CHECK(parent_entity);
// Similar to the directory implementation here:
@@ -38850,7 +38437,7 @@ diff --git a/components/ukm/ukm_reporting_service.cc b/components/ukm/ukm_report
diff --git a/components/url_formatter/android/java/src/org/chromium/components/url_formatter/UrlFormatter.java b/components/url_formatter/android/java/src/org/chromium/components/url_formatter/UrlFormatter.java
--- a/components/url_formatter/android/java/src/org/chromium/components/url_formatter/UrlFormatter.java
+++ b/components/url_formatter/android/java/src/org/chromium/components/url_formatter/UrlFormatter.java
-@@ -19,9 +19,9 @@ public final class UrlFormatter {
+@@ -20,9 +20,9 @@ public final class UrlFormatter {
* Refer to url_formatter::FixupURL.
*
* Given a URL-like string, returns a real URL or null. For example:
@@ -38865,7 +38452,7 @@ diff --git a/components/url_formatter/android/java/src/org/chromium/components/u
diff --git a/components/url_formatter/elide_url.cc b/components/url_formatter/elide_url.cc
--- a/components/url_formatter/elide_url.cc
+++ b/components/url_formatter/elide_url.cc
-@@ -257,7 +257,7 @@ base::string16 ElideUrl(const GURL& url,
+@@ -251,7 +251,7 @@ base::string16 ElideUrl(const GURL& url,
base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
// Get filename - note that for a path ending with /
@@ -38877,7 +38464,7 @@ diff --git a/components/url_formatter/elide_url.cc b/components/url_formatter/el
diff --git a/components/url_formatter/elide_url.h b/components/url_formatter/elide_url.h
--- a/components/url_formatter/elide_url.h
+++ b/components/url_formatter/elide_url.h
-@@ -70,7 +70,7 @@ enum class SchemeDisplay {
+@@ -68,7 +68,7 @@ enum class SchemeDisplay {
// Internationalized domain names (IDN) will be presented in Unicode if
// they're regarded safe except that domain names with RTL characters
// will still be in ACE/punycode for now (http://crbug.com/650760).
@@ -38889,7 +38476,7 @@ diff --git a/components/url_formatter/elide_url.h b/components/url_formatter/eli
diff --git a/components/url_formatter/spoof_checks/idn_spoof_checker.cc b/components/url_formatter/spoof_checks/idn_spoof_checker.cc
--- a/components/url_formatter/spoof_checks/idn_spoof_checker.cc
+++ b/components/url_formatter/spoof_checks/idn_spoof_checker.cc
-@@ -499,7 +499,7 @@ void IDNSpoofChecker::SetAllowedUnicodeSet(UErrorCode* status) {
+@@ -585,7 +585,7 @@ void IDNSpoofChecker::SetAllowedUnicodeSet(UErrorCode* status) {
allowed_set.addAll(*inclusion_set);
// The sections below refer to Mozilla's IDN blacklist:
@@ -38953,7 +38540,7 @@ diff --git a/components/url_formatter/url_fixer.cc b/components/url_formatter/ur
diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
--- a/components/url_formatter/url_formatter.cc
+++ b/components/url_formatter/url_formatter.cc
-@@ -340,7 +340,7 @@ bool IsIDNComponentSafe(base::StringPiece16 label, bool is_tld_ascii) {
+@@ -364,7 +364,7 @@ bool IsIDNComponentSafe(base::StringPiece16 label,
// 7. Do not allow unassigned code points.
//
// It also closely matches what IE 10 does except for the BiDi check (
@@ -38962,7 +38549,7 @@ diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatte
// See http://http://unicode.org/reports/tr46/ and references therein/ for more
// details.
struct UIDNAWrapper {
-@@ -521,7 +521,7 @@ base::string16 FormatUrlWithAdjustments(
+@@ -548,7 +548,7 @@ base::string16 FormatUrlWithAdjustments(
((format_types & kFormatUrlTrimAfterHost) != 0)) {
// Remove the username and password fields. We don't want to display those
// to the user since they can be used for attacks,
@@ -39018,7 +38605,7 @@ diff --git a/components/url_pattern_index/PRESUBMIT.py b/components/url_pattern_
diff --git a/components/user_manager/user.h b/components/user_manager/user.h
--- a/components/user_manager/user.h
+++ b/components/user_manager/user.h
-@@ -279,8 +279,8 @@ class USER_MANAGER_EXPORT User : public UserInfo {
+@@ -283,8 +283,8 @@ class USER_MANAGER_EXPORT User : public UserInfo {
base::string16 display_name_;
base::string16 given_name_;
// User email for display, which may include capitals and non-significant
@@ -39165,7 +38752,7 @@ diff --git a/components/variations/variations_url_constants.cc b/components/vari
diff --git a/components/viz/service/display/output_surface.h b/components/viz/service/display/output_surface.h
--- a/components/viz/service/display/output_surface.h
+++ b/components/viz/service/display/output_surface.h
-@@ -197,7 +197,7 @@ class VIZ_SERVICE_EXPORT OutputSurface {
+@@ -203,7 +203,7 @@ class VIZ_SERVICE_EXPORT OutputSurface {
// output. This is the same rotation as the physical rotation on the display.
// In some cases, this is done natively by the graphics backend (
// For instance, this is already done by GL drivers on Android. See
@@ -39177,7 +38764,7 @@ diff --git a/components/viz/service/display/output_surface.h b/components/viz/se
diff --git a/components/wifi/wifi_service_win.cc b/components/wifi/wifi_service_win.cc
--- a/components/wifi/wifi_service_win.cc
+++ b/components/wifi/wifi_service_win.cc
-@@ -1759,7 +1759,7 @@ bool WiFiServiceImpl::CreateProfile(
+@@ -1760,7 +1760,7 @@ bool WiFiServiceImpl::CreateProfile(
xml_writer.StartElement("WLANProfile");
xml_writer.AddAttribute(
"xmlns",
@@ -39269,7 +38856,7 @@ diff --git a/content/browser/accessibility/browser_accessibility_com_win.h b/con
diff --git a/content/browser/appcache/appcache_request_handler.cc b/content/browser/appcache/appcache_request_handler.cc
--- a/content/browser/appcache/appcache_request_handler.cc
+++ b/content/browser/appcache/appcache_request_handler.cc
-@@ -137,7 +137,7 @@ AppCacheJob* AppCacheRequestHandler::MaybeLoadFallbackForRedirect(
+@@ -140,7 +140,7 @@ AppCacheJob* AppCacheRequestHandler::MaybeLoadFallbackForRedirect(
// misinterpret the rules for the new target and cause unnecessary
// fallbacks/errors, therefore it is better to give up on app-caching in this
// case. More information in https://crbug.com/141114 and the discussion at
@@ -39281,7 +38868,7 @@ diff --git a/content/browser/appcache/appcache_request_handler.cc b/content/brow
diff --git a/content/browser/appcache/appcache_update_job.cc b/content/browser/appcache/appcache_update_job.cc
--- a/content/browser/appcache/appcache_update_job.cc
+++ b/content/browser/appcache/appcache_update_job.cc
-@@ -601,7 +601,7 @@ void AppCacheUpdateJob::HandleResourceFetchCompleted(URLFetcher* url_fetcher,
+@@ -659,7 +659,7 @@ void AppCacheUpdateJob::HandleResourceFetchCompleted(URLFetcher* url_fetcher,
duplicate_response_ids_.push_back(entry.response_id());
// TODO(michaeln): Check for
@@ -39293,7 +38880,7 @@ diff --git a/content/browser/appcache/appcache_update_job.cc b/content/browser/a
diff --git a/content/browser/appcache/appcache_update_url_fetcher.cc b/content/browser/appcache/appcache_update_url_fetcher.cc
--- a/content/browser/appcache/appcache_update_url_fetcher.cc
+++ b/content/browser/appcache/appcache_update_url_fetcher.cc
-@@ -89,7 +89,7 @@ void AppCacheUpdateJob::URLFetcher::OnResponseStarted(int net_error) {
+@@ -90,7 +90,7 @@ void AppCacheUpdateJob::URLFetcher::OnResponseStarted(int net_error) {
// We've opted for a milder constraint and allow caching unless
// the resource has a "no-store" header. A spec change has been
// requested on the whatwg list.
@@ -39305,7 +38892,7 @@ diff --git a/content/browser/appcache/appcache_update_url_fetcher.cc b/content/b
diff --git a/content/browser/appcache/appcache_url_loader_job.cc b/content/browser/appcache/appcache_url_loader_job.cc
--- a/content/browser/appcache/appcache_url_loader_job.cc
+++ b/content/browser/appcache/appcache_url_loader_job.cc
-@@ -214,7 +214,7 @@ void AppCacheURLLoaderJob::OnResponseInfoLoaded(
+@@ -185,7 +185,7 @@ void AppCacheURLLoaderJob::OnResponseInfoLoaded(
if (storage_->service()->storage() == storage_.get()) {
// A resource that is expected to be in the appcache is missing.
// If the 'check' fails, the corrupt appcache will be deleted.
@@ -39329,7 +38916,7 @@ diff --git a/content/browser/bluetooth/bluetooth_device_chooser_controller.cc b/
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
-@@ -548,7 +548,7 @@ void BrowserPluginGuest::EmbedderSystemDragEnded() {
+@@ -484,7 +484,7 @@ void BrowserPluginGuest::EmbedderSystemDragEnded() {
}
// TODO(wjmaclean): Replace this approach with ones based on std::function
@@ -39367,7 +38954,7 @@ diff --git a/content/browser/browsing_data/browsing_data_filter_builder_impl.cc
diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/client_hints/client_hints.cc
--- a/content/browser/client_hints/client_hints.cc
+++ b/content/browser/client_hints/client_hints.cc
-@@ -237,7 +237,7 @@ void AddViewportWidthHeader(net::HttpRequestHeaders* headers,
+@@ -240,7 +240,7 @@ void AddViewportWidthHeader(net::HttpRequestHeaders* headers,
DCHECK(headers);
DCHECK(context);
// The default value on Android. See
@@ -39379,7 +38966,7 @@ diff --git a/content/browser/client_hints/client_hints.cc b/content/browser/clie
diff --git a/content/browser/content_service_delegate_impl.cc b/content/browser/content_service_delegate_impl.cc
--- a/content/browser/content_service_delegate_impl.cc
+++ b/content/browser/content_service_delegate_impl.cc
-@@ -111,7 +111,7 @@ class NavigableContentsDelegateImpl : public content::NavigableContentsDelegate,
+@@ -112,7 +112,7 @@ class NavigableContentsDelegateImpl : public content::NavigableContentsDelegate,
const std::string& frame_name,
const GURL& target_url) override {
// This method is invoked when attempting to open links in a new tab, e.g.:
@@ -39403,7 +38990,7 @@ diff --git a/content/browser/devtools/devtools_http_handler.cc b/content/browser
diff --git a/content/browser/devtools/devtools_protocol_encoding_cbor_fuzzer.cc b/content/browser/devtools/devtools_protocol_encoding_cbor_fuzzer.cc
--- a/content/browser/devtools/devtools_protocol_encoding_cbor_fuzzer.cc
+++ b/content/browser/devtools/devtools_protocol_encoding_cbor_fuzzer.cc
-@@ -11,7 +11,7 @@
+@@ -8,7 +8,7 @@
// devtools_protocol_encoding_cbor_fuzzer_corpus.
// The files contained therein were generated from JSON examples,
// by running the transcode utility from
@@ -39411,19 +38998,7 @@ diff --git a/content/browser/devtools/devtools_protocol_encoding_cbor_fuzzer.cc
+// https://chromium.9oo91esource.qjz9zk/deps/inspector_protocol/
namespace content {
- namespace {
-diff --git a/content/browser/fileapi/browser_file_system_helper.cc b/content/browser/fileapi/browser_file_system_helper.cc
---- a/content/browser/fileapi/browser_file_system_helper.cc
-+++ b/content/browser/fileapi/browser_file_system_helper.cc
-@@ -48,7 +48,7 @@ namespace content {
- namespace {
-
- // All FileSystemContexts currently need to share the same sequence per sharing
--// global objects: https://codereview.chromium.org/2883403002#msg14.
-+// global objects: https://codereview.ch40m1um.qjz9zk/2883403002#msg14.
- base::LazySequencedTaskRunner g_fileapi_task_runner =
- LAZY_SEQUENCED_TASK_RUNNER_INITIALIZER(
- base::TaskTraits(base::ThreadPool(),
+ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
diff --git a/content/browser/frame_host/interstitial_page_impl.cc b/content/browser/frame_host/interstitial_page_impl.cc
--- a/content/browser/frame_host/interstitial_page_impl.cc
+++ b/content/browser/frame_host/interstitial_page_impl.cc
@@ -39448,7 +39023,7 @@ diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/
base::Time timestamp =
time_smoother_.GetSmoothedTime(get_timestamp_callback_.Run());
DVLOG(1) << "Navigation finished at (smoothed) timestamp "
-@@ -3443,7 +3443,7 @@ void NavigationControllerImpl::FinishRestore(int selected_index,
+@@ -3468,7 +3468,7 @@ void NavigationControllerImpl::FinishRestore(int selected_index,
void NavigationControllerImpl::DiscardNonCommittedEntries() {
// Avoid sending a notification if there is nothing to discard.
// TODO(mthiesse): Temporarily checking failed_pending_entry_id_ to help
@@ -39460,7 +39035,7 @@ diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc
--- a/content/browser/frame_host/navigation_request.cc
+++ b/content/browser/frame_host/navigation_request.cc
-@@ -2742,7 +2742,7 @@ NavigationRequest::CheckCredentialedSubresource() const {
+@@ -2744,7 +2744,7 @@ NavigationRequest::CheckCredentialedSubresource() const {
const char* console_message =
"Subresource requests whose URLs contain embedded credentials (e.g. "
"`https://user:pass@host/`) are blocked. See "
@@ -39469,7 +39044,7 @@ diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/
"details.";
parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning,
console_message);
-@@ -2772,7 +2772,7 @@ NavigationRequest::CheckLegacyProtocolInSubresource() const {
+@@ -2774,7 +2774,7 @@ NavigationRequest::CheckLegacyProtocolInSubresource() const {
const char* console_message =
"Subresource requests using legacy protocols (like `ftp:`) are blocked. "
"Please deliver web-accessible resources over modern protocols like "
@@ -39478,7 +39053,7 @@ diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/
"details.";
parent->AddMessageToConsole(blink::mojom::ConsoleMessageLevel::kWarning,
console_message);
-@@ -2869,7 +2869,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck(
+@@ -2875,7 +2875,7 @@ void NavigationRequest::RecordDownloadUseCountersPrePolicyCheck(
base::StringPrintf(
"Navigating a cross-origin opener to a download (%s) is "
"deprecated, see "
@@ -39490,16 +39065,7 @@ diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/
diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/frame_host/navigator_impl.cc
--- a/content/browser/frame_host/navigator_impl.cc
+++ b/content/browser/frame_host/navigator_impl.cc
-@@ -155,7 +155,7 @@ void NavigatorImpl::DidFailProvisionalLoadWithError(
- // the second one. We can't tell this apart, so we think we're tearing down
- // the current page which will cause a crash later on.
- //
-- // http://code.google.com/p/chromium/issues/detail?id=2855
-+ // http://code.9oo91e.qjz9zk/p/chromium/issues/detail?id=2855
- // Because this will not tear down the interstitial properly, if "back" is
- // back to another tab type, the interstitial will still be somewhat alive
- // in the previous tab type. If you navigate somewhere that activates the
-@@ -271,7 +271,7 @@ void NavigatorImpl::DidNavigate(
+@@ -210,7 +210,7 @@ void NavigatorImpl::DidNavigate(
// determine whether or not to enable the encoding menu.
// It's updated only for the main frame. For a subframe,
// RenderView::UpdateURL does not set params.contents_mime_type.
@@ -39511,7 +39077,7 @@ diff --git a/content/browser/frame_host/navigator_impl.cc b/content/browser/fram
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
-@@ -7659,8 +7659,8 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage(
+@@ -7728,8 +7728,8 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage(
"cross-site requests if they are set with `SameSite=None` and "
"`Secure`. You can review cookies in developer tools under "
"Application>Storage>Cookies and see more details at "
@@ -39522,7 +39088,7 @@ diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/brow
} else if (warning == net::CanonicalCookie::CookieInclusionStatus::
WarningReason::WARN_SAMESITE_NONE_INSECURE) {
if (!ShouldAddCookieSameSiteDeprecationMessage(
-@@ -7680,7 +7680,7 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage(
+@@ -7749,7 +7749,7 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage(
"`SameSite=None` if they are also marked `Secure`. You "
"can review cookies in developer tools under "
"Application>Storage>Cookies and see more details at "
@@ -39531,7 +39097,7 @@ diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/brow
} else if (warning ==
net::CanonicalCookie::CookieInclusionStatus::WarningReason::
WARN_SAMESITE_UNSPECIFIED_LAX_ALLOW_UNSAFE) {
-@@ -7697,7 +7697,7 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage(
+@@ -7766,7 +7766,7 @@ void RenderFrameHostImpl::AddSameSiteCookieDeprecationMessage(
"if they were set with `SameSite=Lax` and will only allow them to be "
"sent with top-level cross-site requests if the HTTP method is safe. "
"See more details at "
@@ -39543,7 +39109,7 @@ diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/brow
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
-@@ -776,7 +776,7 @@ void GpuDataManagerImplPrivate::AddLogMessage(
+@@ -787,7 +787,7 @@ void GpuDataManagerImplPrivate::AddLogMessage(
int level, const std::string& header, const std::string& message) {
// Some clients emit many log messages. This has been observed to consume GBs
// of memory in the wild
@@ -39555,7 +39121,7 @@ diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/brow
diff --git a/content/browser/indexed_db/indexed_db_backing_store.cc b/content/browser/indexed_db/indexed_db_backing_store.cc
--- a/content/browser/indexed_db/indexed_db_backing_store.cc
+++ b/content/browser/indexed_db/indexed_db_backing_store.cc
-@@ -667,7 +667,7 @@ leveldb::Status IndexedDBBackingStore::Initialize(bool clean_live_journal) {
+@@ -676,7 +676,7 @@ leveldb::Status IndexedDBBackingStore::Initialize(bool clean_active_journal) {
indexed_db::ReportV2Schema(has_blobs, origin_);
if (has_blobs) {
INTERNAL_CONSISTENCY_ERROR(UPGRADING_SCHEMA_CORRUPTED_BLOBS);
@@ -39615,7 +39181,7 @@ diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
-@@ -100,7 +100,7 @@ gfx::OverlayTransform RotationToDisplayTransform(
+@@ -99,7 +99,7 @@ gfx::OverlayTransform RotationToDisplayTransform(
// Note that the angle provided by |rotation| here is the opposite direction
// of the physical rotation of the device, which is the space in which the UI
// prepares the scene (see
@@ -39624,7 +39190,7 @@ diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/
// for details).
//
// The rotation which needs to be applied by the display compositor to allow
-@@ -391,7 +391,7 @@ void CompositorImpl::SetSurface(jobject surface,
+@@ -392,7 +392,7 @@ void CompositorImpl::SetSurface(jobject surface,
if (surface) {
// Note: This ensures that any local references used by
// ANativeWindow_fromSurface are released immediately. This is needed as a
@@ -39636,7 +39202,7 @@ diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/
diff --git a/content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc b/content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc
--- a/content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc
+++ b/content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc
-@@ -81,7 +81,7 @@ bool ExtractCaseFoldedLocalizedStrings(
+@@ -91,7 +91,7 @@ bool ExtractCaseFoldedLocalizedStrings(
localized_name.resize(length);
// The documentation for the API call does not specify an encoding but the
// results are wchar_t and FireFox considers them UTF-16, as seen here:
@@ -39672,7 +39238,7 @@ diff --git a/content/browser/renderer_host/input/touch_action_filter.h b/content
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
-@@ -1792,7 +1792,7 @@ void RenderProcessHostImpl::InitializeChannelProxy() {
+@@ -1800,7 +1800,7 @@ void RenderProcessHostImpl::InitializeChannelProxy() {
// Note that Channel send is effectively paused and unpaused at various points
// during startup, and existing code relies on a fragile relative message
// ordering resulting from some early messages being queued until process
@@ -39684,7 +39250,7 @@ diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
--- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h
-@@ -62,7 +62,7 @@ class TimeoutMonitor;
+@@ -68,7 +68,7 @@ using WillEnterBackForwardCacheCallbackForTesting =
// (if frame specific) or WebContentsImpl (if page specific).
//
// For context, please see https://crbug.com/467770 and
@@ -39744,7 +39310,7 @@ diff --git a/content/browser/sandbox_ipc_linux.h b/content/browser/sandbox_ipc_l
diff --git a/content/browser/service_worker/service_worker_metrics.cc b/content/browser/service_worker/service_worker_metrics.cc
--- a/content/browser/service_worker/service_worker_metrics.cc
+++ b/content/browser/service_worker/service_worker_metrics.cc
-@@ -236,13 +236,13 @@ ServiceWorkerMetrics::Site ServiceWorkerMetrics::SiteFromURL(const GURL& url) {
+@@ -230,13 +230,13 @@ ServiceWorkerMetrics::Site ServiceWorkerMetrics::SiteFromURL(const GURL& url) {
}
const base::StringPiece host = url.host_piece();
@@ -39834,7 +39400,7 @@ diff --git a/content/browser/speech/tts_win.cc b/content/browser/speech/tts_win.
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -188,7 +188,7 @@ namespace content {
+@@ -192,7 +192,7 @@ using AccessibilityEventCallback =
namespace {
const int kMinimumDelayBetweenLoadingUpdatesMS = 100;
@@ -39843,7 +39409,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser
base::LazyInstance>::DestructorAtExit
-@@ -6229,7 +6229,7 @@ void WebContentsImpl::UpdateTitle(RenderFrameHost* render_frame_host,
+@@ -6160,7 +6160,7 @@ void WebContentsImpl::UpdateTitle(RenderFrameHost* render_frame_host,
return;
// TODO(evan): make use of title_direction.
@@ -39855,7 +39421,7 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser
diff --git a/content/browser/webauth/authenticator_common.cc b/content/browser/webauth/authenticator_common.cc
--- a/content/browser/webauth/authenticator_common.cc
+++ b/content/browser/webauth/authenticator_common.cc
-@@ -256,23 +256,23 @@ base::Optional ProcessAppIdExtension(std::string appid,
+@@ -280,23 +280,23 @@ base::Optional ProcessAppIdExtension(std::string appid,
// At this point we diverge from the specification in order to avoid the
// complexity of making a network request which isn't believed to be
// necessary in practice. See also
@@ -39885,8 +39451,8 @@ diff --git a/content/browser/webauth/authenticator_common.cc b/content/browser/w
(appid_url.EqualsIgnoringRef(kGstatic1) ||
appid_url.EqualsIgnoringRef(kGstatic2))) {
return appid;
-@@ -692,7 +692,7 @@ std::string AuthenticatorCommon::SerializeCollectedClientDataToJson(
- // https://tools.ietf.org/html/draft-davidben-tls-grease-01
+@@ -727,7 +727,7 @@ std::string AuthenticatorCommon::SerializeCollectedClientDataToJson(
+ // https://tools.ietf.org/html/draft-ietf-tls-grease
client_data.SetKey("extra_keys_may_be_added_here",
base::Value("do not compare clientDataJSON against a "
- "template. See https://goo.gl/yabPex"));
@@ -39909,7 +39475,7 @@ diff --git a/content/common/fetch/fetch_api_request.proto b/content/common/fetch
diff --git a/content/common/input/input_handler.mojom b/content/common/input/input_handler.mojom
--- a/content/common/input/input_handler.mojom
+++ b/content/common/input/input_handler.mojom
-@@ -300,7 +300,7 @@ interface WidgetInputHandler {
+@@ -299,7 +299,7 @@ interface WidgetInputHandler {
// Other input actions may also be dispatched via the WidgetInputHandler
// interface. If frame input actions are dispatched the WidgetInputHandler
// should be fetched via the associated interface request so that input calls
@@ -39918,18 +39484,6 @@ diff --git a/content/common/input/input_handler.mojom b/content/common/input/inp
interface FrameInputHandler {
// Sets the text composition to be between the given start and end offsets in
// the currently focused editable field.
-diff --git a/content/common/media/peer_connection_tracker.mojom b/content/common/media/peer_connection_tracker.mojom
---- a/content/common/media/peer_connection_tracker.mojom
-+++ b/content/common/media/peer_connection_tracker.mojom
-@@ -24,7 +24,7 @@ struct PeerConnectionInfo {
- interface PeerConnectionTrackerHost {
- // PeerConnectionTrackerHost forwards these events to WebRTCInternals.
- // TODO(vm.arjun): Migrate rest of the messages,
-- // https://bugs.chromium.org/p/chromium/issues/detail?id=792801
-+ // https://bugs.ch40m1um.qjz9zk/p/chromium/issues/detail?id=792801
-
- // Notifies WebRTCInternals about the addition of the peer connection
- // whose data is specified in |info|.
diff --git a/content/common/net/record_load_histograms.cc b/content/common/net/record_load_histograms.cc
--- a/content/common/net/record_load_histograms.cc
+++ b/content/common/net/record_load_histograms.cc
@@ -39945,7 +39499,7 @@ diff --git a/content/common/net/record_load_histograms.cc b/content/common/net/r
diff --git a/content/common/renderer.mojom b/content/common/renderer.mojom
--- a/content/common/renderer.mojom
+++ b/content/common/renderer.mojom
-@@ -271,7 +271,7 @@ interface Renderer {
+@@ -282,7 +282,7 @@ interface Renderer {
SetSchedulerKeepActive(bool keep_active);
// Tells the renderer process that it has been locked to a site (i.e., a
@@ -39990,7 +39544,7 @@ diff --git a/content/public/android/java/res/values/strings.xml b/content/public
diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java
-@@ -68,7 +68,7 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProvider
+@@ -69,7 +69,7 @@ public class WebContentsAccessibilityImpl extends AccessibilityNodeProvider
private static final int WINDOW_CONTENT_CHANGED_DELAY_MS = 500;
// Constants from AccessibilityNodeInfo defined in the M SDK.
@@ -40002,7 +39556,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/access
diff --git a/content/public/android/java/src/org/chromium/content/browser/accessibility/captioning/CaptioningChangeDelegate.java b/content/public/android/java/src/org/chromium/content/browser/accessibility/captioning/CaptioningChangeDelegate.java
--- a/content/public/android/java/src/org/chromium/content/browser/accessibility/captioning/CaptioningChangeDelegate.java
+++ b/content/public/android/java/src/org/chromium/content/browser/accessibility/captioning/CaptioningChangeDelegate.java
-@@ -23,7 +23,7 @@ import java.util.WeakHashMap;
+@@ -24,7 +24,7 @@ import java.util.WeakHashMap;
* This class is based on CaptioningManager.CaptioningChangeListener except it uses internal
* classes instead of the API level dependent versions. Here is the documentation for that class:
*
@@ -40026,7 +39580,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/access
diff --git a/content/public/android/java/src/org/chromium/content/browser/input/ThreadedInputConnection.java b/content/public/android/java/src/org/chromium/content/browser/input/ThreadedInputConnection.java
--- a/content/public/android/java/src/org/chromium/content/browser/input/ThreadedInputConnection.java
+++ b/content/public/android/java/src/org/chromium/content/browser/input/ThreadedInputConnection.java
-@@ -196,7 +196,7 @@ class ThreadedInputConnection extends BaseInputConnection implements ChromiumBas
+@@ -197,7 +197,7 @@ class ThreadedInputConnection extends BaseInputConnection implements ChromiumBas
Range selection = textInputState.selection();
Range composition = textInputState.composition();
// As per Guidelines in
@@ -40125,7 +39679,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
const base::Feature kAllowContentInitiatedDataUrlNavigations{
"AllowContentInitiatedDataUrlNavigations",
base::FEATURE_DISABLED_BY_DEFAULT};
-@@ -505,17 +505,17 @@ const base::Feature kSignedExchangePrefetchCacheForNavigations{
+@@ -498,17 +498,17 @@ const base::Feature kSignedExchangePrefetchCacheForNavigations{
base::FEATURE_DISABLED_BY_DEFAULT};
// Signed Exchange Reporting for distributors
@@ -40149,7 +39703,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
-@@ -663,7 +663,7 @@ const char kPpapiStartupDialog[] = "ppapi-startup-dialog";
+@@ -665,7 +665,7 @@ const char kPpapiStartupDialog[] = "ppapi-startup-dialog";
// consolidates same-site pages so that they share a single process.
//
// More details here:
@@ -40158,7 +39712,7 @@ diff --git a/content/public/common/content_switches.cc b/content/public/common/c
// - The class comment in site_instance.h, listing the supported process models.
//
// IMPORTANT: This isn't to be confused with --site-per-process (which is about
-@@ -757,8 +757,8 @@ const char kSingleProcess[] = "single-process";
+@@ -759,8 +759,8 @@ const char kSingleProcess[] = "single-process";
// *