BASELINE: Update Chromium to 90.0.4430.221

Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

438 files changed, 34652 insertions, 12584 deletions

diff --git a/chromium/tools/OWNERS b/chromium/tools/OWNERS
index d8f480f4832..246d0b7c25f 100644
--- a/chromium/tools/OWNERS
+++ b/chromium/tools/OWNERS
@@ -5,6 +5,7 @@
 # If you're changing existing tools, have your change reviewed by the
 # OWNERS of the existing tool.
 
+set noparent
 brucedawson@chromium.org
 dpranke@google.com
 scottmg@chromium.org
diff --git a/chromium/tools/accessibility/inspect/README.md b/chromium/tools/accessibility/inspect/README.md
index 7874ece3d48..6eaa9db2bda 100644
--- a/chromium/tools/accessibility/inspect/README.md
+++ b/chromium/tools/accessibility/inspect/README.md
@@ -44,15 +44,14 @@ At your convenience the number of pre-defined application selectors are availabl
 You can also specify an application by its title:
 `ax_dump_tree --pattern=title`
 
-Alternatively you can dump a tree by HWDN on Windows:
-`--window=HWDN`
+Alternatively you can dump a tree by HWND on Windows:
+`--pid=HWND`
 Note, to use a hex window handle prefix it with `0x`.
 
 Or by application PID on Mac and Linux:
 `--pid=process_id`
 
 Other options:
-`--json` to output a tree in JSON format
 `--filters=absolute_path_to_filters.txt` to filter properties, use where the filters text file has a series of `@ALLOW` and/or `@DENY` lines. See example-tree-filters.txt in tools/accessibility/inspect.
 `--help` for help
 
diff --git a/chromium/tools/accessibility/inspect/ax_dump_tree.cc b/chromium/tools/accessibility/inspect/ax_dump_tree.cc
index e0239d27b4e..ba9a2d9aa63 100644
--- a/chromium/tools/accessibility/inspect/ax_dump_tree.cc
+++ b/chromium/tools/accessibility/inspect/ax_dump_tree.cc
@@ -7,6 +7,7 @@
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
@@ -22,7 +23,6 @@ char kIdSwitch[] =
     "pid";
 #endif
 char kFiltersSwitch[] = "filters";
-char kJsonSwitch[] = "json";
 char kHelpSwitch[] = "help";
 
 // Convert from string to int, whether in 0x hex format or decimal format.
@@ -68,7 +68,6 @@ void PrintHelp() {
   printf(
       "  --filters\tfile containing property filters used to filter out\n"
       "  \t\taccessible tree, see example-tree-filters.txt as an example\n");
-  printf("  --json\toutputs tree in JSON format\n");
 }
 
 int main(int argc, char** argv) {
@@ -88,8 +87,6 @@ int main(int argc, char** argv) {
   base::FilePath filters_path =
       command_line->GetSwitchValuePath(kFiltersSwitch);
 
-  bool use_json = command_line->HasSwitch(kJsonSwitch);
-
   std::string id_str = command_line->GetSwitchValueASCII(kIdSwitch);
   if (!id_str.empty()) {
     unsigned hwnd_or_pid;
@@ -100,14 +97,14 @@ int main(int argc, char** argv) {
     gfx::AcceleratedWidget widget(CastToAcceleratedWidget(hwnd_or_pid));
 
     std::unique_ptr<content::AXTreeServer> server(
-        new content::AXTreeServer(widget, filters_path, use_json));
+        new content::AXTreeServer(widget, filters_path));
     return 0;
   }
 
   AXTreeSelector selector = tools::TreeSelectorFromCommandLine(command_line);
   if (!selector.empty()) {
     std::unique_ptr<content::AXTreeServer> server(
-        new content::AXTreeServer(selector, filters_path, use_json));
+        new content::AXTreeServer(selector, filters_path));
     return 0;
   }
 
diff --git a/chromium/tools/accessibility/inspect/ax_event_server.cc b/chromium/tools/accessibility/inspect/ax_event_server.cc
index 349123115b7..a5cb9ff53b1 100644
--- a/chromium/tools/accessibility/inspect/ax_event_server.cc
+++ b/chromium/tools/accessibility/inspect/ax_event_server.cc
@@ -5,13 +5,15 @@
 #include "tools/accessibility/inspect/ax_event_server.h"
 
 #include "base/bind.h"
+#include "content/public/browser/ax_inspect_factory.h"
 
 namespace tools {
 
 AXEventServer::AXEventServer(base::ProcessId pid,
                              const ui::AXTreeSelector& selector)
-    : recorder_(
-          content::AccessibilityEventRecorder::Create(nullptr, pid, selector)) {
+    : recorder_(content::AXInspectFactory::CreatePlatformRecorder(nullptr,
+                                                                  pid,
+                                                                  selector)) {
   recorder_->ListenToEvents(
       base::BindRepeating(&AXEventServer::OnEvent, base::Unretained(this)));
 }
diff --git a/chromium/tools/accessibility/inspect/ax_event_server.h b/chromium/tools/accessibility/inspect/ax_event_server.h
index f6d8074fb7d..996a3ae0dd1 100644
--- a/chromium/tools/accessibility/inspect/ax_event_server.h
+++ b/chromium/tools/accessibility/inspect/ax_event_server.h
@@ -7,7 +7,8 @@
 
 #include "base/process/process_handle.h"
 #include "build/build_config.h"
-#include "content/browser/accessibility/accessibility_event_recorder.h"
+#include "ui/accessibility/platform/inspect/ax_event_recorder.h"
+#include "ui/accessibility/platform/inspect/ax_inspect.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_com_initializer.h"
@@ -30,7 +31,7 @@ class AXEventServer final {
   // Only one COM initializer per thread is permitted.
   base::win::ScopedCOMInitializer com_initializer_;
 #endif
-  std::unique_ptr<content::AccessibilityEventRecorder> recorder_;
+  std::unique_ptr<ui::AXEventRecorder> recorder_;
 
   DISALLOW_COPY_AND_ASSIGN(AXEventServer);
 };
diff --git a/chromium/tools/accessibility/inspect/ax_tree_server.cc b/chromium/tools/accessibility/inspect/ax_tree_server.cc
index d9658d7789c..59390517cbe 100644
--- a/chromium/tools/accessibility/inspect/ax_tree_server.cc
+++ b/chromium/tools/accessibility/inspect/ax_tree_server.cc
@@ -10,7 +10,6 @@
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
-#include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
@@ -20,6 +19,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
+#include "content/public/browser/ax_inspect_factory.h"
 
 using ui::AXTreeFormatter;
 using ui::AXTreeSelector;
@@ -41,22 +41,19 @@ base::Value BuildTreeForWindow(gfx::AcceleratedWidget widget,
 }
 
 AXTreeServer::AXTreeServer(const AXTreeSelector& selector,
-                           const base::FilePath& filters_path,
-                           bool use_json) {
-  Run(base::BindOnce(&BuildTreeForSelector, selector), filters_path, use_json);
+                           const base::FilePath& filters_path) {
+  Run(base::BindOnce(&BuildTreeForSelector, selector), filters_path);
 }
 
 AXTreeServer::AXTreeServer(gfx::AcceleratedWidget widget,
-                           const base::FilePath& filters_path,
-                           bool use_json) {
-  Run(base::BindOnce(&BuildTreeForWindow, widget), filters_path, use_json);
+                           const base::FilePath& filters_path) {
+  Run(base::BindOnce(&BuildTreeForWindow, widget), filters_path);
 }
 
 void AXTreeServer::Run(BuildTree build_tree,
-                       const base::FilePath& filters_path,
-                       bool use_json) {
+                       const base::FilePath& filters_path) {
   std::unique_ptr<AXTreeFormatter> formatter(
-      AccessibilityTreeFormatter::Create());
+      AXInspectFactory::CreatePlatformFormatter());
 
   // Set filters.
   std::vector<ui::AXPropertyFilter> filters = GetPropertyFilters(filters_path);
@@ -73,8 +70,8 @@ void AXTreeServer::Run(BuildTree build_tree,
     return;
   }
 
-  // Format the tree.
-  Format(*formatter, base::Value::AsDictionaryValue(dict), use_json);
+  // Write to console.
+  printf("%s", formatter->FormatTree(dict).c_str());
 }
 
 std::vector<ui::AXPropertyFilter> AXTreeServer::GetPropertyFilters(
@@ -118,24 +115,4 @@ std::vector<ui::AXPropertyFilter> AXTreeServer::GetPropertyFilters(
   return filters;
 }
 
-void AXTreeServer::Format(AXTreeFormatter& formatter,
-                          const base::DictionaryValue& dict,
-                          bool use_json) {
-  std::string accessibility_contents;
-
-  // Format accessibility tree as JSON or text.
-  if (use_json) {
-    const std::unique_ptr<base::DictionaryValue> filtered_dict =
-        formatter.FilterAccessibilityTree(dict);
-    base::JSONWriter::WriteWithOptions(*filtered_dict,
-                                       base::JSONWriter::OPTIONS_PRETTY_PRINT,
-                                       &accessibility_contents);
-  } else {
-    formatter.FormatAccessibilityTree(dict, &accessibility_contents);
-  }
-
-  // Write to console.
-  printf("%s", accessibility_contents.c_str());
-}
-
 }  // namespace content
diff --git a/chromium/tools/accessibility/inspect/ax_tree_server.h b/chromium/tools/accessibility/inspect/ax_tree_server.h
index 0e148dce06e..be96184f650 100644
--- a/chromium/tools/accessibility/inspect/ax_tree_server.h
+++ b/chromium/tools/accessibility/inspect/ax_tree_server.h
@@ -8,8 +8,9 @@
 #include <string>
 
 #include "base/callback.h"
+#include "base/files/file_path.h"
 #include "build/build_config.h"
-#include "content/public/browser/accessibility_tree_formatter.h"
+#include "ui/accessibility/platform/inspect/ax_tree_formatter.h"
 
 #if defined(OS_WIN)
 #include "base/win/scoped_com_initializer.h"
@@ -20,29 +21,20 @@ namespace content {
 class AXTreeServer final {
  public:
   AXTreeServer(gfx::AcceleratedWidget widget,
-               const base::FilePath& filters_path,
-               bool use_json);
+               const base::FilePath& filters_path);
   AXTreeServer(const ui::AXTreeSelector& selector,
-               const base::FilePath& filters_path,
-               bool use_json);
+               const base::FilePath& filters_path);
 
  private:
   using BuildTree = base::OnceCallback<base::Value(const ui::AXTreeFormatter*)>;
 
   // Builds and formats the accessible tree.
-  void Run(BuildTree build_tree,
-           const base::FilePath& filters_path,
-           bool use_json);
+  void Run(BuildTree build_tree, const base::FilePath& filters_path);
 
   // Generates property filters.
   std::vector<ui::AXPropertyFilter> GetPropertyFilters(
       const base::FilePath& filters_path);
 
-  // Formats and dumps into console the tree.
-  void Format(ui::AXTreeFormatter& formatter,
-              const base::DictionaryValue& dict,
-              bool use_json);
-
 #if defined(OS_WIN)
   // Only one COM initializer per thread is permitted.
   base::win::ScopedCOMInitializer com_initializer_;
diff --git a/chromium/tools/accessibility/inspect/ax_utils.cc b/chromium/tools/accessibility/inspect/ax_utils.cc
index f558f213d01..7c1d841694e 100644
--- a/chromium/tools/accessibility/inspect/ax_utils.cc
+++ b/chromium/tools/accessibility/inspect/ax_utils.cc
@@ -10,6 +10,7 @@ char kActiveTabSwitch[] = "active-tab";
 char kChromeSwitch[] = "chrome";
 char kChromiumSwitch[] = "chromium";
 char kFirefoxSwitch[] = "firefox";
+char kEdgeSwitch[] = "edge";
 char kPatternSwitch[] = "pattern";
 char kSafariSwitch[] = "safari";
 
@@ -22,8 +23,13 @@ void PrintHelpForTreeSelectors() {
   printf("  pre-defined application selectors to dump accessible tree for:\n");
   printf("    --chrome\tChrome browser\n");
   printf("    --chromium\tChromium browser\n");
+#if defined(WINDOWS)
+  printf("    --edge\tEdge browser\n");
+#endif
   printf("    --firefox\tFirefox browser\n");
+#if defined(MACOS)
   printf("    --safari\tSafari browser\n");
+#endif
   printf("    --active-tab\tActive tab of a choosen browser\n");
 }
 
@@ -34,6 +40,8 @@ AXTreeSelector TreeSelectorFromCommandLine(
     selectors = AXTreeSelector::Chrome;
   } else if (command_line->HasSwitch(kChromiumSwitch)) {
     selectors = AXTreeSelector::Chromium;
+  } else if (command_line->HasSwitch(kEdgeSwitch)) {
+    selectors = AXTreeSelector::Edge;
   } else if (command_line->HasSwitch(kFirefoxSwitch)) {
     selectors = AXTreeSelector::Firefox;
   } else if (command_line->HasSwitch(kSafariSwitch)) {
diff --git a/chromium/tools/accessibility/inspect/ax_utils.h b/chromium/tools/accessibility/inspect/ax_utils.h
index 35b61f3c55b..da6621cf703 100644
--- a/chromium/tools/accessibility/inspect/ax_utils.h
+++ b/chromium/tools/accessibility/inspect/ax_utils.h
@@ -6,7 +6,7 @@
 #define TOOLS_ACCESSIBILITY_INSPECT_AX_UTILS_H_
 
 #include "base/command_line.h"
-#include "ui/accessibility/platform/inspect/inspect.h"
+#include "ui/accessibility/platform/inspect/ax_inspect.h"
 
 namespace tools {
 
diff --git a/chromium/tools/accessibility/inspect/chrome-tree.ps1 b/chromium/tools/accessibility/inspect/chrome-tree.ps1
index c0bb8a709f0..1c1b2d2383e 100644
--- a/chromium/tools/accessibility/inspect/chrome-tree.ps1
+++ b/chromium/tools/accessibility/inspect/chrome-tree.ps1
@@ -8,6 +8,6 @@ If (@($all).length -gt 1) {
 }
 
 $hwnd = Get-Process | Where-Object {$_.ProcessName -eq 'chrome'} | where MainWindowTitle -like "*$($args[0])*Google Chrome*" | select MainWindowHandle -ExpandProperty MainWindowHandle | Out-String
-$hwnd_arg = "--window=" + $hwnd
+$hwnd_arg = "--pid=" + $hwnd
 $exe = ".\ax_dump_tree.exe"
 & $exe $hwnd_arg
\ No newline at end of file
diff --git a/chromium/tools/accessibility/inspect/chromium-tree.ps1 b/chromium/tools/accessibility/inspect/chromium-tree.ps1
index 8c77fff09c9..98d3807f5ca 100644
--- a/chromium/tools/accessibility/inspect/chromium-tree.ps1
+++ b/chromium/tools/accessibility/inspect/chromium-tree.ps1
@@ -1,5 +1,5 @@
 # Powershell script to dump accessibility tree for Chromium. Takes optional first argument with part of window title to disambiguate the desired window.
-$all = ps | where {$_.ProcessName -eq 'chrome'} |where MainWindowTitle -like "*$($args[0])*Google Chrome" | select MainWindowHandle, MainWindowTitle
+$all = ps | where {$_.ProcessName -eq 'chrome'} |where MainWindowTitle -like "*$($args[0])*Chromium" | select MainWindowHandle, MainWindowTitle
 echo $all
 echo ""
 If (@($all).length -gt 1) {
@@ -8,6 +8,6 @@ If (@($all).length -gt 1) {
 }
 
 $hwnd = Get-Process | where {$_.ProcessName -eq 'chrome'} | where MainWindowTitle -like "*$($args[0])*Chromium*" | select MainWindowHandle -ExpandProperty MainWindowHandle | Out-String
-$hwnd_arg = "--window=" + $hwnd
+$hwnd_arg = "--pid=" + $hwnd
 $exe = ".\ax_dump_tree.exe"
-& $exe $hwnd_arg
\ No newline at end of file
+& $exe $hwnd_arg
diff --git a/chromium/tools/accessibility/rebase_dump_accessibility_tree_test.py b/chromium/tools/accessibility/rebase_dump_accessibility_tree_test.py
index 8900d4d6b8b..b19660e7850 100755
--- a/chromium/tools/accessibility/rebase_dump_accessibility_tree_test.py
+++ b/chromium/tools/accessibility/rebase_dump_accessibility_tree_test.py
@@ -137,7 +137,7 @@ def Run():
             step.find('Upload') == -1):
 
           a11y_step = step.rstrip()
-          logdog_cat = 'cit logdog cat -raw "chromium%s"' % a11y_step
+          logdog_cat = 'cit logdog cat -raw "%s"' % a11y_step
           # A bit noisy but useful for debugging.
           # print((BRIGHT_COLOR + '=> %s' + NORMAL_COLOR) % logdog_cat)
           output = os.popen(logdog_cat).read()
diff --git a/chromium/tools/android/audio_focus_grabber/BUILD.gn b/chromium/tools/android/audio_focus_grabber/BUILD.gn
index 144b80e66a1..08cfabbbc32 100644
--- a/chromium/tools/android/audio_focus_grabber/BUILD.gn
+++ b/chromium/tools/android/audio_focus_grabber/BUILD.gn
@@ -12,8 +12,8 @@ android_apk("audio_focus_grabber_apk") {
   deps = [
     ":audio_focus_grabber_apk_resources",
     "//base:base_java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:androidx_core_core_java",
+    "//third_party/androidx:androidx_annotation_annotation_java",
+    "//third_party/androidx:androidx_core_core_java",
   ]
 
   sources = [
diff --git a/chromium/tools/android/customtabs_benchmark/BUILD.gn b/chromium/tools/android/customtabs_benchmark/BUILD.gn
index 45dde349667..aefbff135cc 100644
--- a/chromium/tools/android/customtabs_benchmark/BUILD.gn
+++ b/chromium/tools/android/customtabs_benchmark/BUILD.gn
@@ -24,7 +24,7 @@ android_apk("customtabs_benchmark_apk") {
   deps = [
     ":customtabs_benchmark_apk_resources",
     "//third_party/android_deps:android_support_v4_java",
-    "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_sdk/androidx_browser:androidx_browser_java",
+    "//third_party/androidx:androidx_annotation_annotation_java",
+    "//third_party/androidx:androidx_browser_browser_java",
   ]
 }
diff --git a/chromium/tools/android/errorprone_plugin/BUILD.gn b/chromium/tools/android/errorprone_plugin/BUILD.gn
index 0f205ff5cea..0c13ec098c7 100644
--- a/chromium/tools/android/errorprone_plugin/BUILD.gn
+++ b/chromium/tools/android/errorprone_plugin/BUILD.gn
@@ -35,31 +35,3 @@ java_binary("errorprone_plugin") {
     "//third_party/android_deps:com_google_errorprone_javac_java",
   ]
 }
-
-android_library("no_redundant_field_init_check_int_test_java") {
-  testonly = true
-  enable_errorprone = true
-  errorprone_expected_warning_regex = "NoRedundantFieldInitCheck"
-  sources = [ "test/src/org/chromium/tools/errorprone/plugin/NoRedundantFieldInitCheckIntTest.java" ]
-  deps = []
-}
-
-android_library("test_class_name_check_test_java") {
-  testonly = true
-  enable_errorprone = true
-  errorprone_expected_warning_regex = "TestClassNameCheck"
-  sources = [ "test/src/org/chromium/tools/errorprone/plugin/TestClassNameCheckTesting.java" ]
-  deps = [
-    "//base:base_java_test_support",
-    "//third_party/android_support_test_runner:runner_java",
-    "//third_party/junit:junit",
-  ]
-}
-
-group("errorprone_plugin_tests") {
-  testonly = true
-  deps = [
-    ":no_redundant_field_init_check_int_test_java",
-    ":test_class_name_check_test_java",
-  ]
-}
diff --git a/chromium/tools/android/errorprone_plugin/test/BUILD.gn b/chromium/tools/android/errorprone_plugin/test/BUILD.gn
new file mode 100644
index 00000000000..b84dac1ca64
--- /dev/null
+++ b/chromium/tools/android/errorprone_plugin/test/BUILD.gn
@@ -0,0 +1,30 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/android_nocompile.gni")
+import("nocompile_gn/nocompile_sources.gni")
+
+android_nocompile_test_suite("errorprone_plugin_tests") {
+  # Depend on errorprone_plugin so that the action is re-run whenever any custom
+  # errorprone check is modified.
+  deps = [ "//tools/android/errorprone_plugin" ]
+  tests = [
+    {
+      target = "nocompile_gn:no_redundant_field_init_check_int_test_java"
+      nocompile_sources =
+          rebase_path(no_redundant_field_init_check_int_test_nocompile_sources,
+                      "",
+                      "nocompile_gn")
+      expected_compile_output_regex = "warning: .NoRedundantFieldInit"
+    },
+    {
+      target = "nocompile_gn:test_class_name_check_test_java"
+      nocompile_sources =
+          rebase_path(test_class_name_check_test_nocompile_sources,
+                      "",
+                      "nocompile_gn")
+      expected_compile_output_regex = "warning: .TestClassNameCheck"
+    },
+  ]
+}
diff --git a/chromium/tools/android/errorprone_plugin/test/nocompile_gn/BUILD.gn b/chromium/tools/android/errorprone_plugin/test/nocompile_gn/BUILD.gn
new file mode 100644
index 00000000000..a662f06054e
--- /dev/null
+++ b/chromium/tools/android/errorprone_plugin/test/nocompile_gn/BUILD.gn
@@ -0,0 +1,32 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/android/android_nocompile.gni")
+import("//build/config/android/rules.gni")
+import("nocompile_sources.gni")
+
+empty_java = "../src/org/chromium/tools/errorprone/plugin/Empty.java"
+
+android_library("no_redundant_field_init_check_int_test_java") {
+  testonly = true
+  enable_errorprone = true
+  sources = [ empty_java ]
+  if (enable_android_nocompile_tests) {
+    sources += no_redundant_field_init_check_int_test_nocompile_sources
+  }
+}
+
+android_library("test_class_name_check_test_java") {
+  testonly = true
+  enable_errorprone = true
+  sources = [ empty_java ]
+  if (enable_android_nocompile_tests) {
+    sources += test_class_name_check_test_nocompile_sources
+  }
+  deps = [
+    "//base:base_java_test_support",
+    "//third_party/android_support_test_runner:runner_java",
+    "//third_party/junit:junit",
+  ]
+}
diff --git a/chromium/tools/android/errorprone_plugin/test/nocompile_gn/nocompile_sources.gni b/chromium/tools/android/errorprone_plugin/test/nocompile_gn/nocompile_sources.gni
new file mode 100644
index 00000000000..1be38a19204
--- /dev/null
+++ b/chromium/tools/android/errorprone_plugin/test/nocompile_gn/nocompile_sources.gni
@@ -0,0 +1,9 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+no_redundant_field_init_check_int_test_nocompile_sources = [ "../src/org/chromium/tools/errorprone/plugin/NoRedundantFieldInitCheckIntTest.java" ]
+
+test_class_name_check_test_nocompile_sources = [
+  "../src/org/chromium/tools/errorprone/plugin/TestClassNameCheckTesting.java",
+]
diff --git a/chromium/tools/auto-nav.py b/chromium/tools/auto-nav.py
index 7aa4bac71a0..6238c39f1be 100644
--- a/chromium/tools/auto-nav.py
+++ b/chromium/tools/auto-nav.py
@@ -10,8 +10,10 @@ Usage: vpython auto-nav.py <chrome dir> <number of navigations> <url> <url> ...
 Optional flags:
 * --interval <seconds>, -i <seconds>: specify a number of seconds to wait
                                       between navigations, e.g., -i=5
-* --wait, -w: start Chrome, then wait for the user to press any key before
-              starting auto-navigation
+* --start_prompt, -s: start Chrome, then wait for the user to press Enter before
+                      starting auto-navigation
+* --exit-prompt, -e: after auto-navigation, wait for the user to press Enter
+                     before shutting down chrome.exe
 * --idlewakeups_dir: Windows only; specify the directory containing
                      idlewakeups.exe to print measurements taken by IdleWakeups,
                      e.g., --idlewakeups_dir=tools/win/IdleWakeups/x64/Debug
@@ -92,10 +94,14 @@ def ParseArgs():
                       '-i',
                       type=int,
                       help='Seconds to wait between navigations; default is 1')
-  parser.add_argument('--wait',
-                      '-w',
+  parser.add_argument('--start_prompt',
+                      '-s',
                       action='store_true',
-                      help='Wait for confirmation before beginning navigation')
+                      help='Wait for confirmation before starting navigation')
+  parser.add_argument('--exit_prompt',
+                      '-e',
+                      action='store_true',
+                      help='Wait for confirmation before exiting chrome.exe')
   parser.add_argument(
       '--idlewakeups_dir',
       help='Windows only; directory containing idlewakeups.exe, if using')
@@ -144,7 +150,7 @@ def main():
   driver = webdriver.Chrome(os.path.abspath(chromedriver_exe),
                             options=chrome_options)
 
-  if args.wait:
+  if args.start_prompt:
     driver.get(args.url[0])
     raw_input('Press Enter to begin navigation...')
 
@@ -171,6 +177,9 @@ def main():
     for url in args.url:
       driver.get(url)
       time.sleep(interval)
+
+  if args.exit_prompt:
+    raw_input('Press Enter to exit...')
   driver.quit()
 
   # Print IdleWakeups' output, if using.
diff --git a/chromium/tools/autotest.py b/chromium/tools/autotest.py
index f1d8d02998f..ac209767d77 100755
--- a/chromium/tools/autotest.py
+++ b/chromium/tools/autotest.py
@@ -33,6 +33,7 @@ import re
 import subprocess
 import sys
 
+from enum import Enum
 from pathlib import Path
 
 USE_PYTHON_3 = f'This script will only run under python3.'
@@ -41,14 +42,6 @@ SRC_DIR = Path(__file__).parent.parent.resolve()
 DEPOT_TOOLS_DIR = SRC_DIR.joinpath('third_party', 'depot_tools')
 DEBUG = False
 
-_TEST_TARGET_SUFFIXES = [
-    '_browsertests',
-    '_junit_tests',
-    '_perftests',
-    '_test_apk',
-    '_unittests',
-]
-
 # Some test suites use suffixes that would also match non-test-suite targets.
 # Those test suites should be manually added here.
 _OTHER_TEST_TARGETS = [
@@ -56,6 +49,9 @@ _OTHER_TEST_TARGETS = [
     '//chrome/test:unit_tests',
 ]
 
+_TEST_TARGET_REGEX = re.compile(
+    r'(_browsertests|_junit_tests|_perftests|_test_.*apk|_unittests)$')
+
 TEST_FILE_NAME_REGEX = re.compile(r'(.*Test\.java)|(.*_[a-z]*test\.cc)')
 
 # Some tests don't directly include gtest.h and instead include it via gmock.h
@@ -68,20 +64,28 @@ def ExitWithMessage(*args):
   print(*args, file=sys.stderr)
   sys.exit(1)
 
+
+class TestValidity(Enum):
+  NOT_A_TEST = 0  # Does not match test file regex.
+  MAYBE_A_TEST = 1  # Matches test file regex, but doesn't include gtest files.
+  VALID_TEST = 2  # Matches test file regex and includes gtest files.
+
+
 def IsTestFile(file_path):
   if not TEST_FILE_NAME_REGEX.match(file_path):
-    return False
+    return TestValidity.NOT_A_TEST
   if file_path.endswith('.cc'):
     # Try a bit harder to remove non-test files for c++. Without this,
     # 'autotest.py base/' finds non-test files.
     try:
       with open(file_path, 'r', encoding='utf-8') as f:
         if GTEST_INCLUDE_REGEX.search(f.read()) is not None:
-          return True
+          return TestValidity.VALID_TEST
     except IOError:
       pass
-    return False
-  return True
+    # It may still be a test file, even if it doesn't include a gtest file.
+    return TestValidity.MAYBE_A_TEST
+  return TestValidity.VALID_TEST
 
 
 class CommandError(Exception):
@@ -127,7 +131,7 @@ def BuildTestTargetsWithNinja(out_dir, targets, dry_run):
   cmd = [ninja_path, '-C', out_dir] + targets
   print('Building: ' + ' '.join(cmd))
   if (dry_run):
-    return
+    return True
   try:
     subprocess.check_call(cmd)
   except subprocess.CalledProcessError as e:
@@ -138,27 +142,33 @@ def BuildTestTargetsWithNinja(out_dir, targets, dry_run):
 def RecursiveMatchFilename(folder, filename):
   current_dir = os.path.split(folder)[-1]
   if current_dir.startswith('out') or current_dir.startswith('.'):
-    return []
-  matches = []
+    return [[], []]
+  exact = []
+  close = []
   with os.scandir(folder) as it:
     for entry in it:
       if (entry.is_symlink()):
         continue
       if (entry.is_file() and filename in entry.path and
           not os.path.basename(entry.path).startswith('.')):
-        if IsTestFile(entry.path):
-          matches.append(entry.path)
+        file_validity = IsTestFile(entry.path)
+        if file_validity is TestValidity.VALID_TEST:
+          exact.append(entry.path)
+        elif file_validity is TestValidity.MAYBE_A_TEST:
+          close.append(entry.path)
       if entry.is_dir():
         # On Windows, junctions are like a symlink that python interprets as a
         # directory, leading to exceptions being thrown. We can just catch and
         # ignore these exceptions like we would ignore symlinks.
         try:
-          matches += RecursiveMatchFilename(entry.path, filename)
+          matches = RecursiveMatchFilename(entry.path, filename)
+          exact += matches[0]
+          close += matches[1]
         except FileNotFoundError as e:
           if DEBUG:
             print(f'Failed to scan directory "{entry}" - junction?')
           pass
-  return matches
+  return [exact, close]
 
 
 def FindTestFilesInDirectory(directory):
@@ -168,10 +178,13 @@ def FindTestFilesInDirectory(directory):
   for root, dirs, files in os.walk(directory):
     for f in files:
       path = os.path.join(root, f)
-      if IsTestFile(path):
+      file_validity = IsTestFile(path)
+      if file_validity is TestValidity.VALID_TEST:
         if DEBUG:
           print(path)
         test_files.append(path)
+      elif DEBUG and file_validity is TestValidity.MAYBE_A_TEST:
+        print(path + ' matched but doesn\'t include gtest files, skipping.')
   return test_files
 
 
@@ -180,10 +193,20 @@ def FindMatchingTestFiles(target):
   if os.path.isfile(target):
     # If the target is a C++ implementation file, try to guess the test file.
     if target.endswith('.cc') or target.endswith('.h'):
-      if IsTestFile(target):
+      target_validity = IsTestFile(target)
+      if target_validity is TestValidity.VALID_TEST:
         return [target]
       alternate = f"{target.rsplit('.', 1)[0]}_unittest.cc"
-      if os.path.isfile(alternate) and IsTestFile(alternate):
+      alt_validity = TestValidity.NOT_A_TEST if not os.path.isfile(
+          alternate) else IsTestFile(alternate)
+      if alt_validity is TestValidity.VALID_TEST:
+        return [alternate]
+
+      # If neither the target nor its alternative were valid, check if they just
+      # didn't include the gtest files before deciding to exit.
+      if target_validity is TestValidity.MAYBE_A_TEST:
+        return [target]
+      if alt_validity is TestValidity.MAYBE_A_TEST:
         return [alternate]
       ExitWithMessage(f"{target} doesn't look like a test file")
     return [target]
@@ -202,24 +225,31 @@ def FindMatchingTestFiles(target):
     target = target.replace(os.path.altsep, os.path.sep)
   if DEBUG:
     print('Finding files with full path containing: ' + target)
-  results = RecursiveMatchFilename(SRC_DIR, target)
+
+  [exact, close] = RecursiveMatchFilename(SRC_DIR, target)
   if DEBUG:
-    print('Found matching file(s): ' + ' '.join(results))
-  if len(results) > 1:
+    if exact:
+      print('Found exact matching file(s):')
+      print('\n'.join(exact))
+    if close:
+      print('Found possible matching file(s):')
+      print('\n'.join(close))
+
+  test_files = exact if len(exact) > 0 else close
+  if len(test_files) > 1:
     # Arbitrarily capping at 10 results so we don't print the name of every file
     # in the repo if the target is poorly specified.
-    results = results[:10]
+    test_files = test_files[:10]
     ExitWithMessage(f'Target "{target}" is ambiguous. Matching files: '
-                    f'{results}')
-  if not results:
+                    f'{test_files}')
+  if not test_files:
     ExitWithMessage(f'Target "{target}" did not match any files.')
-  return results
+  return test_files
 
 
 def IsTestTarget(target):
-  for suffix in _TEST_TARGET_SUFFIXES:
-    if target.endswith(suffix):
-      return True
+  if _TEST_TARGET_REGEX.search(target):
+    return True
   return target in _OTHER_TEST_TARGETS
 
 
@@ -294,7 +324,7 @@ def FindTestTargets(target_cache, out_dir, paths, run_all):
   if not test_targets:
     ExitWithMessage(
         f'Target(s) "{paths}" did not match any test targets. Consider adding'
-        f' one of the following targets to the top of this file: {targets}')
+        f' one of the following targets to the top of {__file__}: {targets}')
 
   target_cache.Store(paths, test_targets)
   target_cache.Save()
diff --git a/chromium/tools/binary_size/BUILD.gn b/chromium/tools/binary_size/BUILD.gn
index e6806bf7754..383ab115e57 100644
--- a/chromium/tools/binary_size/BUILD.gn
+++ b/chromium/tools/binary_size/BUILD.gn
@@ -21,9 +21,13 @@ python_library("sizes_py") {
   data_deps = [ "//third_party/catapult/tracing:convert_chart_json" ]
 }
 
-if (is_linux || is_chromeos) {
-  group("caspian") {
-    deps = [ "//tools/binary_size/libsupersize/caspian:cli($host_toolchain)" ]
+if (is_linux) {
+  group("caspian_all") {
+    testonly = true
+    deps = [
+      "//tools/binary_size/libsupersize/caspian:caspian_cli",
+      "//tools/binary_size/libsupersize/caspian:caspian_unittests",
+    ]
   }
 }
 
diff --git a/chromium/tools/binary_size/diagnose_bloat.py b/chromium/tools/binary_size/diagnose_bloat.py
index dd91d2853f5..426c935aac2 100755
--- a/chromium/tools/binary_size/diagnose_bloat.py
+++ b/chromium/tools/binary_size/diagnose_bloat.py
@@ -127,9 +127,10 @@ class ResourceSizesDiff(BaseDiff):
   _AGGREGATE_SECTIONS = (
       'InstallBreakdown', 'Breakdown', 'MainLibInfo', 'Uncompressed')
 
-  def __init__(self, filename='results-chart.json'):
+  def __init__(self, filename='results-chart.json', include_sections=None):
     self._diff = None  # Set by |ProduceDiff()|
     self._filename = filename
+    self._include_sections = include_sections
     super(ResourceSizesDiff, self).__init__('Resource Sizes Diff')
 
   @property
@@ -141,6 +142,13 @@ class ResourceSizesDiff(BaseDiff):
           return _DiffResult(full_name, value, units)
     raise Exception('Could not find "normalized" in: ' + repr(self._diff))
 
+  def CombinedSizeChangeForSection(self, section):
+    for subsection_name, value, _ in self._diff[section]:
+      if 'Combined' in subsection_name:
+        return value
+    raise Exception('Could not find "Combined" in: ' +
+                    repr(self._diff[section]))
+
   def DetailedResults(self):
     return self._ResultLines()
 
@@ -158,6 +166,8 @@ class ResourceSizesDiff(BaseDiff):
     after = self._LoadResults(after_dir)
     self._diff = collections.defaultdict(list)
     for section, section_dict in after.items():
+      if self._include_sections and section not in self._include_sections:
+        continue
       for subsection, v in section_dict.items():
         # Ignore entries when resource_sizes.py chartjson format has changed.
         if (section not in before or
@@ -228,33 +238,49 @@ class _BuildHelper(object):
     self._SetDefaults()
     self.is_bundle = 'minimal' in self.target
 
+  def _MaybeAddGoogleSuffix(self, path):
+    if self.IsTrichrome() and '_google' in self.target:
+      return path.replace('.', 'Google.', 1)
+    return path
+
   @property
-  def abs_apk_path(self):
-    return os.path.join(self.output_directory, self.apk_path)
+  def abs_apk_paths(self):
+    return [os.path.join(self.output_directory, x) for x in self.apk_paths]
 
   @property
-  def abs_mapping_path(self):
-    return os.path.join(self.output_directory, self.mapping_path)
+  def abs_mapping_paths(self):
+    def to_mapping_path(p):
+      return p.replace('.minimal.apks', '.aab') + '.mapping'
+
+    return [to_mapping_path(x) for x in self.abs_apk_paths]
 
   @property
   def apk_name(self):
     # my_great_apk -> MyGreat.apk
     apk_name = ''.join(s.title() for s in self.target.split('_')[:-1]) + '.apk'
     if self.is_bundle:
-      # my_great_minimal_apks -> MyGreatMinimal.apk -> MyGreat.minimal.apks
+      # trichrome_minimal_apks->TrichromeMinimal.apk->Trichrome.minimal.apks
       apk_name = apk_name.replace('Minimal.apk', '.minimal.apks')
     return apk_name.replace('Webview', 'WebView')
 
   @property
-  def apk_path(self):
-    return os.path.join('apks', self.apk_name)
+  def supersize_input(self):
+    if self.IsTrichrome():
+      return self._MaybeAddGoogleSuffix(
+          os.path.join(self.output_directory, 'apks', 'Trichrome.ssargs'))
+    return self.abs_apk_paths[0]
 
   @property
-  def mapping_path(self):
-    if self.is_bundle:
-      return self.apk_path.replace('.minimal.apks', '.aab') + '.mapping'
-    else:
-      return self.apk_path + '.mapping'
+  def apk_paths(self):
+    if self.IsTrichrome():
+      ret = [
+          os.path.join('apks', 'TrichromeChrome.minimal.apks'),
+          os.path.join('apks', 'TrichromeWebView.minimal.apks'),
+          os.path.join('apks', 'TrichromeLibrary.apk'),
+      ]
+      return [self._MaybeAddGoogleSuffix(x) for x in ret]
+
+    return [os.path.join('apks', self.apk_name)]
 
   @property
   def main_lib_path(self):
@@ -315,9 +341,9 @@ class _BuildHelper(object):
       if self.IsLinux():
         self.target = 'chrome'
       elif self.enable_chrome_android_internal:
-        self.target = 'monochrome_minimal_apks'
+        self.target = 'trichrome_google_minimal_apks'
       else:
-        self.target = 'monochrome_public_minimal_apks'
+        self.target = 'trichrome_minimal_apks'
 
   def _GenGnCmd(self):
     gn_args = 'is_official_build=true'
@@ -360,6 +386,9 @@ class _BuildHelper(object):
   def IsAndroid(self):
     return self.target_os == 'android'
 
+  def IsTrichrome(self):
+    return 'trichrome' in self.target
+
   def IsLinux(self):
     return self.target_os == 'linux'
 
@@ -380,8 +409,10 @@ class _BuildArchive(object):
     logging.info('Saving build results to: %s', self.dir)
     _EnsureDirsExist(self.dir)
     if self.build.IsAndroid():
-      self._ArchiveFile(self.build.abs_apk_path)
-      self._ArchiveFile(self.build.abs_mapping_path)
+      for path in self.build.abs_apk_paths:
+        self._ArchiveFile(path)
+      for path in self.build.abs_mapping_paths:
+        self._ArchiveFile(path)
       self._ArchiveResourceSizes()
     self._ArchiveSizeFile(supersize_path, tool_prefix)
     if self._save_unstripped:
@@ -405,9 +436,17 @@ class _BuildArchive(object):
 
   def _ArchiveResourceSizes(self):
     cmd = [
-        _RESOURCE_SIZES_PATH, self.build.abs_apk_path, '--output-dir', self.dir,
-        '--chartjson', '--chromium-output-dir', self.build.output_directory
+        _RESOURCE_SIZES_PATH, '--output-dir', self.dir, '--chartjson',
+        '--chromium-output-dir', self.build.output_directory
     ]
+    if self.build.IsTrichrome():
+      get_apk = lambda t: next(x for x in self.build.abs_apk_paths if t in x)
+      cmd += ['--trichrome-chrome', get_apk('Chrome')]
+      cmd += ['--trichrome-webview', get_apk('WebView')]
+      cmd += ['--trichrome-library', get_apk('Library')]
+      cmd += [self.build.apk_name]
+    else:
+      cmd += [self.build.abs_apk_paths[0]]
     _RunCmd(cmd)
 
   def _ArchiveFile(self, filename):
@@ -416,24 +455,19 @@ class _BuildArchive(object):
     shutil.copy(filename, self.dir)
 
   def _ArchiveSizeFile(self, supersize_path, tool_prefix):
-    existing_size_file = self.build.abs_apk_path + '.size'
-    if os.path.exists(existing_size_file):
-      logging.info('Found existing .size file')
-      shutil.copy(existing_size_file, self.archived_size_path)
+    supersize_cmd = [supersize_path, 'archive', self.archived_size_path]
+    if self.build.IsAndroid():
+      supersize_cmd += [
+          '-f', self.build.supersize_input, '--aux-elf-file',
+          self.build.abs_main_lib_path
+      ]
     else:
-      supersize_cmd = [supersize_path, 'archive', self.archived_size_path]
-      if self.build.IsAndroid():
-        supersize_cmd += [
-            '-f', self.build.abs_apk_path, '--aux-elf-file',
-            self.build.abs_main_lib_path
-        ]
-      else:
-        supersize_cmd += ['--elf-file', self.build.abs_main_lib_path]
-      supersize_cmd += ['--output-directory', self.build.output_directory]
-      if tool_prefix:
-        supersize_cmd += ['--tool-prefix', tool_prefix]
-      logging.info('Creating .size file')
-      _RunCmd(supersize_cmd)
+      supersize_cmd += ['--elf-file', self.build.abs_main_lib_path]
+    supersize_cmd += ['--output-directory', self.build.output_directory]
+    if tool_prefix:
+      supersize_cmd += ['--tool-prefix', tool_prefix]
+    logging.info('Creating .size file')
+    _RunCmd(supersize_cmd)
 
 
 class _DiffArchiveManager(object):
@@ -479,7 +513,7 @@ class _DiffArchiveManager(object):
     logging.info('See detailed diff results here: %s',
                  os.path.relpath(diff_path))
 
-  def GenerateHtmlReport(self, before_id, after_id):
+  def GenerateHtmlReport(self, before_id, after_id, is_internal=False):
     """Generate HTML report given two build archives."""
     before = self.build_archives[before_id]
     after = self.build_archives[after_id]
@@ -500,6 +534,11 @@ class _DiffArchiveManager(object):
 
     logging.info('Creating .sizediff')
     _RunCmd(supersize_cmd)
+    oneoffs_dir = 'oneoffs'
+    visibility = '-a public-read '
+    if is_internal:
+      oneoffs_dir = 'private-oneoffs'
+      visibility = ''
 
     unique_name = '{}_{}.sizediff'.format(before.rev, after.rev)
     msg = (
@@ -507,14 +546,16 @@ class _DiffArchiveManager(object):
         'Saved locally to {local}. To view, upload to '
         'https://chrome-supersize.firebaseapp.com/viewer.html.\n'
         'To share, run:\n'
-        '> gsutil.py cp -a public-read {local} '
-        'gs://chrome-supersize/oneoffs/{unique_name}\n\n'
+        '> gsutil.py cp {visibility}{local} '
+        'gs://chrome-supersize/{oneoffs_dir}/{unique_name}\n\n'
         'Then view it at https://chrome-supersize.firebaseapp.com/viewer.html'
-        '?load_url=https://storage.googleapis.com/chrome-supersize/oneoffs/'
-        '{unique_name}'
+        '?load_url=https://storage.googleapis.com/chrome-supersize/'
+        '{oneoffs_dir}/{unique_name}'
         '\n=====================\n')
     msg = msg.format(local=os.path.relpath(report_path),
-                     unique_name=unique_name)
+                     unique_name=unique_name,
+                     visibility=visibility,
+                     oneoffs_dir=oneoffs_dir)
     logging.info(msg)
 
   def Summarize(self):
@@ -868,8 +909,8 @@ def main():
                            help='Allow downstream targets to be built.')
   build_group.add_argument('--target',
                            help='GN target to build. Linux default: chrome. '
-                           'Android default: monochrome_public_minimal_apks or '
-                           'monochrome_minimal_apks (depending on '
+                           'Android default: trichrome_minimal_apks or '
+                           'trichrome_google_minimal_apks (depending on '
                            '--enable-chrome-android-internal).')
   if len(sys.argv) == 1:
     parser.print_help()
@@ -926,7 +967,8 @@ def main():
       if i != 0:
         diff_mngr.MaybeDiff(i - 1, i)
 
-    diff_mngr.GenerateHtmlReport(0, i)
+    diff_mngr.GenerateHtmlReport(
+        0, i, is_internal=args.enable_chrome_android_internal)
     diff_mngr.Summarize()
 
 
diff --git a/chromium/tools/binary_size/generate_commit_size_analysis.py b/chromium/tools/binary_size/generate_commit_size_analysis.py
index 25dacde06c1..ca2b7cebefb 100755
--- a/chromium/tools/binary_size/generate_commit_size_analysis.py
+++ b/chromium/tools/binary_size/generate_commit_size_analysis.py
@@ -91,26 +91,11 @@ def main():
   # * supersize_input_file: Main input for SuperSize, and can be {.apk,
   #   .minimal.apks, .ssargs}. If .ssargs, then the file is copied to the
   #   staging dir.
-  # * version: (Unused by this script) Used by build bots to determine whether
-  #   significant binary package restructure has occurred.
 
-  # --size-config-json will replace {--apk-name, --mapping-name}.
   parser.add_argument('--size-config-json',
+                      required=True,
                       help='Path to JSON file with configs for binary size '
                       'measurement.')
-
-  # Deprecated.
-  parser.add_argument(
-      '--apk-name',
-      help='Name of the apk (ex. Name.apk)',
-  )
-  # Deprecated.
-  parser.add_argument(
-      '--mapping-name',
-      action='append',
-      help='Filename of the proguard mapping file.',
-  )
-
   parser.add_argument(
       '--chromium-output-directory',
       required=True,
@@ -124,23 +109,11 @@ def main():
 
   args = parser.parse_args()
 
-  assert bool(args.size_config_json) != bool(
-      args.apk_name), ('Require exactly one of --size-config-json or the'
-                       ' {--apk-name, --mapping-name} group.')
-  assert bool(args.apk_name) == bool(args.mapping_name), (
-      'Require {--apk-name, --mapping-name} to be specified together.')
-
-  if args.size_config_json:
-    with open(args.size_config_json, 'rt') as fh:
-      config = json.load(fh)
-    to_resource_sizes_py = config['to_resource_sizes_py']
-    mapping_files = config['mapping_files']
-    supersize_input_file = config['supersize_input_file']
-  else:
-    # Deprecated flow. Add 'apks/' prefix for compatibility.
-    to_resource_sizes_py = {'apk_name': os.path.join('apks', args.apk_name)}
-    mapping_files = [os.path.join('apks', name) for name in args.mapping_name]
-    supersize_input_file = os.path.join('apks', args.apk_name)
+  with open(args.size_config_json, 'rt') as fh:
+    config = json.load(fh)
+  to_resource_sizes_py = config['to_resource_sizes_py']
+  mapping_files = config['mapping_files']
+  supersize_input_file = config['supersize_input_file']
 
   def make_chromium_output_path(path_rel_to_output=None):
     if path_rel_to_output is None:
diff --git a/chromium/tools/binary_size/generate_milestone_reports.py b/chromium/tools/binary_size/generate_milestone_reports.py
index e31306f8a7d..61e94a98684 100755
--- a/chromium/tools/binary_size/generate_milestone_reports.py
+++ b/chromium/tools/binary_size/generate_milestone_reports.py
@@ -45,7 +45,11 @@ _GSUTIL = os.path.join(_DIR_SOURCE_ROOT, 'third_party', 'depot_tools',
 _PUSH_URL = 'gs://chrome-supersize/milestones/'
 
 _DESIRED_CPUS = ['arm', 'arm_64']
-_DESIRED_APKS = ['Monochrome.apk', 'AndroidWebview.apk']
+_DESIRED_APKS = [
+    'ChromeModern.apk', 'Monochrome.apk', 'AndroidWebview.apk',
+    'TrichromeGoogle'
+]
+
 # Versions are manually gathered from
 # https://omahaproxy.appspot.com/history?os=android&channel=stable
 _DESIRED_VERSIONS = [
@@ -74,28 +78,36 @@ _DESIRED_VERSIONS = [
     '83.0.4103.60',
     '84.0.4147.89',
     '85.0.4183.81',
-    '86.0.4240.11',  # Canary
-    '87.0.4280.13',  # Canary
+    '86.0.4240.198',
+    '87.0.4280.66',
+    '88.0.4324.93',
+    '89.0.4389.48',  # Beta
 ]
 
 
-def _VersionTuple(version):
-  return tuple(int(x) for x in version.split('.'))
+def _VersionMajor(version):
+  return tuple(int(x) for x in version.split('.'))[0]
 
 
 def _IsBundle(apk, version):
-  return apk == 'Monochrome.apk' and _VersionTuple(version) >= (73,)
+  version = _VersionMajor(version)
+  if apk == 'ChromeModern.apk' and version >= 73:
+    return True
+  if apk == 'Monochrome.apk' and version >= 73:
+    return True
+  if apk == 'AndroidWebview.apk' and version >= 89:
+    return True
+  return False
 
 
 def _EnumerateReports():
   for cpu, apk in itertools.product(_DESIRED_CPUS, _DESIRED_APKS):
-    # KitKat doesn't support arm64.
-    if cpu == 'arm_64' and apk == 'Chrome.apk':
-      continue
     versions = _DESIRED_VERSIONS
     # Webview .size files do not exist before M71.
     if apk == 'AndroidWebview.apk':
-      versions = [v for v in versions if _VersionTuple(v) >= (71,)]
+      versions = [v for v in versions if _VersionMajor(v) >= 71]
+    elif apk == 'TrichromeGoogle':
+      versions = [v for v in versions if _VersionMajor(v) >= 88]
 
     for version in versions:
       yield Report(cpu, apk, version)
@@ -103,11 +115,17 @@ def _EnumerateReports():
 
 class Report(collections.namedtuple('Report', 'cpu,apk,version')):
 
-  @property
-  def size_file_subpath(self):
-    ret = '{version}/{cpu}/{apk}.size'.format(**self._asdict())
-    if _IsBundle(self.apk, self.version):
+  def GetSizeFileSubpath(self, local):
+    if not local and self.apk == 'TrichromeGoogle':
+      template = '{version}/{cpu}/for-signing-only/{apk}.size'
+    else:
+      template = '{version}/{cpu}/{apk}.size'
+
+    ret = template.format(**self._asdict())
+
+    if not local and _IsBundle(self.apk, self.version):
       ret = ret.replace('.apk', '.minimal.apks')
+
     return ret
 
 
@@ -141,7 +159,7 @@ def _DownloadOneSizeFile(arg_tuples):
 def _DownloadSizeFiles(base_url, reports):
   temp_dir = tempfile.mkdtemp()
   try:
-    subpaths = set(x.size_file_subpath for x in reports)
+    subpaths = set(x.GetSizeFileSubpath(local=False) for x in reports)
     arg_tuples = ((p, temp_dir, base_url) for p in subpaths)
     for _ in _Shard(_DownloadOneSizeFile, arg_tuples):
       pass
@@ -168,12 +186,11 @@ def _BuildOneReport(report, output_directory, size_file_directory):
   # Newer Monochrome builds are minimal builds, with names like
   # "Monochrome.minimal.apks.size". Standardize to "Monochrome.apk.size".
   local_size_path = os.path.join(output_directory,
-                                 report.size_file_subpath).replace(
-                                     'minimal.apks', 'apk')
-
+                                 report.GetSizeFileSubpath(local=True))
   _MakeDirectory(os.path.dirname(local_size_path))
 
-  size_file = os.path.join(size_file_directory, report.size_file_subpath)
+  size_file = os.path.join(size_file_directory,
+                           report.GetSizeFileSubpath(local=False))
   shutil.copyfile(size_file, local_size_path)
 
 
diff --git a/chromium/tools/binary_size/libsupersize/apkanalyzer.py b/chromium/tools/binary_size/libsupersize/apkanalyzer.py
index 815e442f5ce..ae8febeadac 100644
--- a/chromium/tools/binary_size/libsupersize/apkanalyzer.py
+++ b/chromium/tools/binary_size/libsupersize/apkanalyzer.py
@@ -153,6 +153,7 @@ class LambdaNormalizer:
   def Normalize(self, package, name):
     # Make d8 desugared lambdas look the same as Desugar ones.
     # D8 lambda: org.-$$Lambda$Promise$Nested1$kjevdDQ8V2zqCrdieLqWLHzk.dex
+    #     D8 lambdas may also have no .dex suffix.
     # Desugar lambda: org.Promise$Nested1$$Lambda$0
     # 1) Need to prefix with proper class name so that they will show as nested.
     # 2) Need to suffix with number so that they diff better.
@@ -160,7 +161,11 @@ class LambdaNormalizer:
     lambda_start_idx = package.find('-$$Lambda$')
     class_path = package
     if lambda_start_idx != -1:
-      lambda_end_idx = package.find('.dex') + len('.dex')
+      dex_suffix_idx = package.find('.dex')
+      if dex_suffix_idx == -1:
+        lambda_end_idx = len(package)
+      else:
+        lambda_end_idx = dex_suffix_idx + len('.dex')
       old_lambda_name = package[lambda_start_idx:lambda_end_idx]
       class_path = package.replace('-$$Lambda$', '')
       base_name = _TruncateFrom(class_path, '$', rfind=True)
diff --git a/chromium/tools/binary_size/libsupersize/apkanalyzer_test.py b/chromium/tools/binary_size/libsupersize/apkanalyzer_test.py
index 7c860544190..7a20d387865 100755
--- a/chromium/tools/binary_size/libsupersize/apkanalyzer_test.py
+++ b/chromium/tools/binary_size/libsupersize/apkanalyzer_test.py
@@ -102,6 +102,15 @@ class ApkAnalyzerTest(unittest.TestCase):
     self.assertEqual((expected_outer_class, expected_name),
                      lambda_normalizer.Normalize(package, name))
 
+  def testLambdaNormalizer_wholeString_noDexSuffix(self):
+    lambda_normalizer = apkanalyzer.LambdaNormalizer()
+    name = 'org.-$$Lambda$StackAnimation$Nested1$kjevdDQ8V2zqCrdieLqWLHzk'
+    package = name
+    expected_outer_class = 'org.StackAnimation'
+    expected_name = 'org.StackAnimation$Nested1$$Lambda$0'
+    self.assertEqual((expected_outer_class, expected_name),
+                     lambda_normalizer.Normalize(package, name))
+
   def testLambdaNormalizer_prefix(self):
     lambda_normalizer = apkanalyzer.LambdaNormalizer()
     name = 'org.-$$Lambda$StackAnimation$Nested1$kjevdeLqWLHzk.dex foo bar'
@@ -111,6 +120,15 @@ class ApkAnalyzerTest(unittest.TestCase):
     self.assertEqual((expected_outer_class, expected_name),
                      lambda_normalizer.Normalize(package, name))
 
+  def testLambdaNormalizer_prefix_noDexSuffix(self):
+    lambda_normalizer = apkanalyzer.LambdaNormalizer()
+    name = 'org.-$$Lambda$StackAnimation$Nested1$kjevdeLqWLHzk foo bar'
+    package = name.split(' ')[0]
+    expected_outer_class = 'org.StackAnimation'
+    expected_name = 'org.StackAnimation$Nested1$$Lambda$0 foo bar'
+    self.assertEqual((expected_outer_class, expected_name),
+                     lambda_normalizer.Normalize(package, name))
+
   def testLambdaNormalizer_lambdaCounting(self):
     lambda_normalizer = apkanalyzer.LambdaNormalizer()
     name = 'org.-$$Lambda$StackAnimation$Nested1$kjevdDQ8V2zqCrdieLqWLHzk.dex'
@@ -126,6 +144,21 @@ class ApkAnalyzerTest(unittest.TestCase):
     self.assertEqual((expected_outer_class, expected_name),
                      lambda_normalizer.Normalize(name, name))
 
+  def testLambdaNormalizer_lambdaCounting_noDexSuffix(self):
+    lambda_normalizer = apkanalyzer.LambdaNormalizer()
+    name = 'org.-$$Lambda$StackAnimation$Nested1$kjevdDQ8V2zqCrdieLqWLHzk'
+    expected_outer_class = 'org.StackAnimation'
+    expected_name = 'org.StackAnimation$Nested1$$Lambda$0'
+    # Ensure multiple calls to the same class maps to same number.
+    self.assertEqual((expected_outer_class, expected_name),
+                     lambda_normalizer.Normalize(name, name))
+    self.assertEqual((expected_outer_class, expected_name),
+                     lambda_normalizer.Normalize(name, name))
+    name = 'org.-$$Lambda$StackAnimation$Nested1$kjevdDQ8V2zqCrdieLqWLHzk2'
+    expected_name = 'org.StackAnimation$Nested1$$Lambda$1'
+    self.assertEqual((expected_outer_class, expected_name),
+                     lambda_normalizer.Normalize(name, name))
+
   def testLambdaNormalizer_multiSameLine(self):
     lambda_normalizer = apkanalyzer.LambdaNormalizer()
     name = ('org.-$$Lambda$StackAnimation$Nested1$kevdDQ8V2zqCrdieLqWLHzk.dex '
@@ -145,6 +178,25 @@ class ApkAnalyzerTest(unittest.TestCase):
     self.assertEqual((expected_outer_class, expected_name),
                      lambda_normalizer.Normalize(package, name))
 
+  def testLambdaNormalizer_multiSameLine_noDexSuffix(self):
+    lambda_normalizer = apkanalyzer.LambdaNormalizer()
+    name = ('org.-$$Lambda$StackAnimation$Nested1$kevdDQ8V2zqCrdieLqWLHzk '
+            'org.-$$Lambda$Other$kjevdDQ8V2zqCrdieLqWLHzk bar')
+    package = name.split(' ')[0]
+    expected_outer_class = 'org.StackAnimation'
+    expected_name = ('org.StackAnimation$Nested1$$Lambda$0 '
+                     'org.-$$Lambda$Other$kjevdDQ8V2zqCrdieLqWLHzk bar')
+    self.assertEqual((expected_outer_class, expected_name),
+                     lambda_normalizer.Normalize(package, name))
+
+    name = expected_name
+    package = name.split(' ')[1]
+    expected_outer_class = 'org.Other'
+    expected_name = ('org.StackAnimation$Nested1$$Lambda$0 '
+                     'org.Other$$Lambda$0 bar')
+    self.assertEqual((expected_outer_class, expected_name),
+                     lambda_normalizer.Normalize(package, name))
+
   def testCreateDexSymbol_normal(self):
     name = ('org.StackAnimation org.ChromeAnimation '
             'createReachTopAnimatorSet(org.StackTab[],float)')
diff --git a/chromium/tools/binary_size/libsupersize/archive.py b/chromium/tools/binary_size/libsupersize/archive.py
index 0597ba92bdd..b92e028e405 100644
--- a/chromium/tools/binary_size/libsupersize/archive.py
+++ b/chromium/tools/binary_size/libsupersize/archive.py
@@ -8,7 +8,9 @@ import argparse
 import bisect
 import calendar
 import collections
+import copy
 import datetime
+import functools
 import gzip
 import itertools
 import logging
@@ -20,11 +22,13 @@ import string
 import subprocess
 import sys
 import tempfile
+import time
 import zipfile
 import zlib
 
 import apkanalyzer
 import ar
+import data_quality
 import demangle
 import describe
 import file_format
@@ -52,14 +56,12 @@ _OWNERS_COMPONENT_REGEX = re.compile(r'^\s*#\s*COMPONENT:\s*(\S+)',
 _OWNERS_FILE_PATH_REGEX = re.compile(r'^\s*file://(\S+)', re.MULTILINE)
 
 _UNCOMPRESSED_COMPRESSION_RATIO_THRESHOLD = 0.9
-_APKS_MAIN_APK = 'splits/base-master.apk'
 
 # Holds computation state that is live only when an output directory exists.
 _OutputDirectoryContext = collections.namedtuple('_OutputDirectoryContext', [
     'elf_object_paths',  # Only when elf_path is also provided.
     'known_inputs',  # Only when elf_path is also provided.
     'output_directory',
-    'source_mapper',
     'thin_archives',
 ])
 
@@ -282,15 +284,21 @@ def _NormalizeSourcePath(path):
 
 def _ExtractSourcePathsAndNormalizeObjectPaths(raw_symbols, source_mapper):
   """Fills in the |source_path| attribute and normalizes |object_path|."""
+  logging.info('Normalizing dex symbol paths')
+  dex_and_other = models.DEX_SECTIONS + (models.SECTION_OTHER, )
+  for symbol in raw_symbols:
+    if symbol.source_path and symbol.section_name in dex_and_other:
+      symbol.generated_source, symbol.source_path = _NormalizeSourcePath(
+          symbol.source_path)
+
   if source_mapper:
     logging.info('Looking up source paths from ninja files')
     for symbol in raw_symbols:
-      object_path = symbol.object_path
       if symbol.IsDex() or symbol.IsOther():
-        if symbol.source_path:
-          symbol.generated_source, symbol.source_path = _NormalizeSourcePath(
-              symbol.source_path)
-      elif object_path:
+        continue
+      # Native symbols and pak symbols use object paths.
+      object_path = symbol.object_path
+      if object_path:
         # We don't have source info for prebuilt .a files.
         if not os.path.isabs(object_path) and not object_path.startswith('..'):
           source_path = source_mapper.FindSourceForPath(object_path)
@@ -742,14 +750,14 @@ def LoadAndPostProcessDeltaSizeInfo(path, file_obj=None):
       path, file_obj=file_obj)
   logging.info('Normalizing symbol names')
   _NormalizeNames(before_size_info.raw_symbols)
-  _NormalizeNames(after_size_info.symbols)
+  _NormalizeNames(after_size_info.raw_symbols)
   logging.info('Loaded %d + %d symbols', len(before_size_info.raw_symbols),
                len(after_size_info.raw_symbols))
   return before_size_info, after_size_info
 
 
-def _CollectModuleSizes(minimal_apks_path):
-  sizes_by_module = collections.defaultdict(int)
+def _GetModuleInfoList(minimal_apks_path):
+  module_info_list = []
   with zipfile.ZipFile(minimal_apks_path) as z:
     for info in z.infolist():
       # E.g.:
@@ -760,7 +768,14 @@ def _CollectModuleSizes(minimal_apks_path):
       # TODO(agrieve): Might be worth measuring a non-en locale as well.
       m = re.match(r'splits/(.*)-master\.apk', info.filename)
       if m:
-        sizes_by_module[m.group(1)] += info.file_size
+        module_info_list.append((m.group(1), info.file_size))
+  return sorted(module_info_list)
+
+
+def _CollectModuleSizes(minimal_apks_path):
+  sizes_by_module = collections.defaultdict(int)
+  for module_name, file_size in _GetModuleInfoList(minimal_apks_path):
+    sizes_by_module[module_name] += file_size
   return sizes_by_module
 
 
@@ -811,7 +826,7 @@ def CreateMetadata(args, linker_name, build_config):
   if linker_name:
     update_build_config(models.BUILD_CONFIG_LINKER_NAME, linker_name)
 
-  # Deduce GIT revision.
+  # Deduce GIT revision (cached via @lru_cache).
   git_rev = _DetectGitRevision(args.source_directory)
   if git_rev:
     update_build_config(models.BUILD_CONFIG_GIT_REVISION, git_rev)
@@ -834,14 +849,19 @@ def CreateMetadata(args, linker_name, build_config):
     metadata[models.METADATA_MAP_FILENAME] = shorten_path(args.map_file)
 
   if args.minimal_apks_file:
-    sizes_by_module = _CollectModuleSizes(args.minimal_apks_file)
     metadata[models.METADATA_APK_FILENAME] = shorten_path(
         args.minimal_apks_file)
-    for name, size in sizes_by_module.items():
-      key = models.METADATA_APK_SIZE
-      if name != 'base':
-        key += '-' + name
-      metadata[key] = size
+    if args.split_name and args.split_name != 'base':
+      metadata[models.METADATA_APK_SIZE] = os.path.getsize(args.apk_file)
+      metadata[models.METADATA_APK_SPLIT_NAME] = args.split_name
+      metadata[models.METADATA_APK_SPLIT_ON_DEMAND] = _IsOnDemand(args.apk_file)
+    else:
+      sizes_by_module = _CollectModuleSizes(args.minimal_apks_file)
+      for name, size in sizes_by_module.items():
+        key = models.METADATA_APK_SIZE
+        if name != 'base':
+          key += '-' + name
+        metadata[key] = size
   elif args.apk_file:
     metadata[models.METADATA_APK_FILENAME] = shorten_path(args.apk_file)
     metadata[models.METADATA_APK_SIZE] = os.path.getsize(args.apk_file)
@@ -1050,11 +1070,13 @@ def _ComputePakFileSymbols(
       k: id_map[id(v)]
       for k, v in contents.resources.items() if id_map[id(v)] != k
   }
-  # Longest locale pak is: es-419.pak.
-  # Only non-translated .pak files are: resources.pak, chrome_100_percent.pak.
-  if len(posixpath.basename(file_name)) <= 10:
+  name = posixpath.basename(file_name)
+  # Hyphens used for language regions. E.g.: en-GB.pak, sr-Latn.pak, ...
+  # Longest translated .pak file without hyphen: fil.pak
+  if '-' in name or len(name) <= 7:
     section_name = models.SECTION_PAK_TRANSLATIONS
   else:
+    # E.g.: resources.pak, chrome_100_percent.pak.
     section_name = models.SECTION_PAK_NONTRANSLATED
   overhead = (12 + 6) * compression_ratio  # Header size plus extra offset
   # Key just needs to be unique from other IDs and pak overhead symbols.
@@ -1387,16 +1409,14 @@ def _CalculateElfOverhead(section_ranges, elf_path):
 
 def _OverwriteSymbolSizesWithRelocationCount(raw_symbols, tool_prefix,
                                              elf_path):
-  logging.info('Overwriting symbol sizes with relocation count')
-  native_symbols = [sym for sym in raw_symbols if sym.IsNative()]
-  symbol_addresses = [0] * (1 + len(native_symbols))
-
-  for i, symbol in enumerate(native_symbols):
-    symbol_addresses[i] = symbol.address
+  logging.info('Removing non-native symbols')
+  raw_symbols = [sym for sym in raw_symbols if sym.IsNative()]
 
+  logging.info('Overwriting symbol sizes with relocation count')
   # Last symbol address is the end of the last symbol, so we don't misattribute
   # all relros after the last symbol to that symbol.
-  symbol_addresses[-1] = native_symbols[-1].address + native_symbols[-1].size
+  symbol_addresses = [s.address for s in raw_symbols]
+  symbol_addresses.append(raw_symbols[-1].end_address)
 
   for symbol in raw_symbols:
     symbol.address = 0
@@ -1418,13 +1438,13 @@ def _OverwriteSymbolSizesWithRelocationCount(raw_symbols, tool_prefix,
   for addr in relro_addresses:
     # Attribute relros to largest symbol start address that precede them.
     idx = bisect.bisect_right(symbol_addresses, addr) - 1
-    if 0 <= idx < len(native_symbols):
-      symbol = native_symbols[idx]
+    if 0 <= idx < len(raw_symbols):
+      symbol = raw_symbols[idx]
       for alias in symbol.aliases or [symbol]:
         alias.size += 1
 
-  logging.info('Removing non-native symbols...')
-  raw_symbols[:] = [sym for sym in raw_symbols if sym.size or sym.IsNative()]
+  raw_symbols = [sym for sym in raw_symbols if sym.size]
+  return raw_symbols
 
 
 def _AddUnattributedSectionSymbols(raw_symbols, section_ranges):
@@ -1528,6 +1548,9 @@ def CreateContainerAndSymbols(knobs=None,
     (section_sizes maps section names to respective sizes).
     raw_symbols is a list of Symbol objects.
   """
+  assert elf_path or not opts.relocations_mode, (
+      '--relocations-mode requires a ELF file')
+
   knobs = knobs or SectionSizeKnobs()
   if apk_path and apk_so_path:
     # Extraction takes around 1 second, so do it in parallel.
@@ -1538,23 +1561,18 @@ def CreateContainerAndSymbols(knobs=None,
 
   outdir_context = None
   source_mapper = None
-  if output_directory:
+  section_ranges = {}
+  raw_symbols = []
+  if opts.analyze_native and output_directory:
     # Start by finding the elf_object_paths, so that nm can run on them while
     # the linker .map is being parsed.
-    logging.info('Parsing ninja files.')
-    source_mapper, ninja_elf_object_paths = (
-        ninja_parser.Parse(output_directory, elf_path))
-
-    # If no symbols came from the library, it's because it's a partition
-    # extracted from a combined library. Look there instead.
-    if not ninja_elf_object_paths and elf_path:
-      combined_elf_path = elf_path.replace('.so', '__combined.so')
-      logging.info('Found no objects in %s, trying %s', elf_path,
-                   combined_elf_path)
-      source_mapper, ninja_elf_object_paths = (ninja_parser.Parse(
-          output_directory, combined_elf_path))
-      if ninja_elf_object_paths:
-        assert map_path and '__combined.so.map' in map_path
+    target_elf_path = elf_path
+    if map_path and '__combined.so.map' in map_path:
+      target_elf_path = elf_path.replace('.so', '__combined.so')
+    logging.info('Parsing ninja files, looking for %s.', target_elf_path)
+
+    source_mapper, ninja_elf_object_paths = ninja_parser.Parse(
+        output_directory, target_elf_path)
 
     logging.debug('Parsed %d .ninja files.', source_mapper.parsed_file_count)
     assert not elf_path or ninja_elf_object_paths, (
@@ -1581,7 +1599,6 @@ def CreateContainerAndSymbols(knobs=None,
         elf_object_paths=elf_object_paths,
         known_inputs=known_inputs,
         output_directory=output_directory,
-        source_mapper=source_mapper,
         thin_archives=thin_archives)
 
   if opts.analyze_native:
@@ -1592,8 +1609,6 @@ def CreateContainerAndSymbols(knobs=None,
         opts.track_string_literals,
         outdir_context=outdir_context,
         linker_name=linker_name)
-  else:
-    section_ranges, raw_symbols, object_paths_by_name = {}, [], None
 
   if apk_elf_result:
     section_ranges, elf_overhead_size = _ParseApkElfSectionRanges(
@@ -1613,7 +1628,7 @@ def CreateContainerAndSymbols(knobs=None,
 
   pak_symbols_by_id = None
   other_symbols = []
-  if apk_path and size_info_prefix:
+  if apk_path and size_info_prefix and not opts.relocations_mode:
     # Can modify |section_ranges|.
     pak_symbols_by_id = _FindPakSymbolsFromApk(opts, section_ranges, apk_path,
                                                size_info_prefix)
@@ -1688,8 +1703,9 @@ def CreateContainerAndSymbols(knobs=None,
   logging.debug('Connecting nm aliases')
   _ConnectNmAliases(raw_symbols)
 
-  if elf_path and opts.relocations_mode:
-    _OverwriteSymbolSizesWithRelocationCount(raw_symbols, tool_prefix, elf_path)
+  if opts.relocations_mode:
+    raw_symbols = _OverwriteSymbolSizesWithRelocationCount(
+        raw_symbols, tool_prefix, elf_path)
 
   section_sizes = {k: size for k, (address, size) in section_ranges.items()}
   container = models.Container(name=container_name,
@@ -1698,7 +1714,10 @@ def CreateContainerAndSymbols(knobs=None,
   for symbol in raw_symbols:
     symbol.container = container
 
-  file_format.SortSymbols(raw_symbols, check_already_mostly_sorted=True)
+  # Sorting for relocations mode causes .data and .data.rel.ro to be interleaved
+  # due to setting all addresses to 0.
+  if not opts.relocations_mode:
+    file_format.SortSymbols(raw_symbols, check_already_mostly_sorted=True)
 
   return container, raw_symbols
 
@@ -1725,6 +1744,7 @@ def CreateSizeInfo(build_config,
   return models.SizeInfo(build_config, container_list, all_raw_symbols)
 
 
+@functools.lru_cache
 def _DetectGitRevision(directory):
   """Runs git rev-parse to get the SHA1 hash of the current revision.
 
@@ -1789,6 +1809,7 @@ def _CountRelocationsFromElf(elf_path, tool_prefix):
   return int(relocations, 16)
 
 
+@functools.lru_cache
 def _ParseGnArgs(args_path):
   """Returns a list of normalized "key=value" strings."""
   args = {}
@@ -1876,6 +1897,13 @@ def _AddContainerArguments(parser):
       action='store_true',
       help='Include a padding field for each symbol, instead of rederiving '
       'from consecutive symbols on file load.')
+  parser.add_argument(
+      '--check-data-quality',
+      action='store_true',
+      help='Perform sanity checks to ensure there is no missing data.')
+
+  # The split_name arg is used for bundles to identify DFMs.
+  parser.set_defaults(split_name=None)
 
 
 def AddArguments(parser):
@@ -1980,8 +2008,12 @@ def ParseSsargs(lines):
   return sub_args_list
 
 
-def _DeduceNativeInfo(tentative_output_dir, apk_path, elf_path, map_path,
-                      on_config_error):
+def _DeduceNativeInfo(tentative_output_dir,
+                      apk_path,
+                      elf_path,
+                      map_path,
+                      on_config_error,
+                      allow_missing_linker_map=False):
   apk_so_path = None
   if apk_path:
     with zipfile.ZipFile(apk_path) as z:
@@ -2006,10 +2038,11 @@ def _DeduceNativeInfo(tentative_output_dir, apk_path, elf_path, map_path,
     if not map_path.endswith('.map') and not map_path.endswith('.map.gz'):
       on_config_error('Expected --map-file to end with .map or .map.gz')
   elif elf_path:
-    # Look for a .map file named for either the ELF file, or in the
-    # partitioned native library case, the combined ELF file from which the
-    # main library was extracted. Note that we don't yet have |tool_prefix| to
-    # use here, but that's not a problem for this use case.
+    # TODO(agrieve): Support breaking down partitions.
+    is_partition = elf_path.endswith('_partition.so')
+    if is_partition:
+      return None, None, None
+
     if _ElfIsMainPartition(elf_path, ''):
       map_path = elf_path.replace('.so', '__combined.so') + '.map'
     else:
@@ -2018,6 +2051,12 @@ def _DeduceNativeInfo(tentative_output_dir, apk_path, elf_path, map_path,
       map_path += '.gz'
 
   if not os.path.exists(map_path):
+    # Consider a missing linker map fatal only for the base module. For .so
+    # files in feature modules, allow skipping breakdowns.
+    if allow_missing_linker_map:
+      logging.warning('No linker map found for %s. Skipping native breakdown.',
+                      elf_path)
+      return None, None, None
     on_config_error(
         'Could not find .map(.gz)? file. Ensure you have built with '
         'is_official_build=true and generate_linker_map=true, or use '
@@ -2071,14 +2110,7 @@ def _ReadMultipleArgsFromFile(ssargs_file, on_config_error):
                                      on_config_error)
 
 
-def _ProcessContainerArgs(top_args, sub_args, main_file, on_config_error):
-  if hasattr(sub_args, 'name'):
-    container_name = sub_args.name
-  else:
-    container_name = os.path.basename(main_file)
-  if set(container_name) & set('<>'):
-    parser.error('Container name cannot have characters in "<>"')
-
+def _ProcessContainerArgs(top_args, sub_args, container_name, on_config_error):
   # Copy output_directory, tool_prefix, etc. into sub_args.
   for k, v in top_args.__dict__.items():
     sub_args.__dict__.setdefault(k, v)
@@ -2094,9 +2126,14 @@ def _ProcessContainerArgs(top_args, sub_args, main_file, on_config_error):
       sub_args, apk_prefix)
   linker_name = None
   if opts.analyze_native:
+    is_base_module = sub_args.split_name in (None, 'base')
     sub_args.elf_file, sub_args.map_file, apk_so_path = _DeduceNativeInfo(
-        top_args.output_directory, sub_args.apk_file, sub_args.elf_file
-        or sub_args.aux_elf_file, sub_args.map_file, on_config_error)
+        top_args.output_directory,
+        sub_args.apk_file,
+        sub_args.elf_file or sub_args.aux_elf_file,
+        sub_args.map_file,
+        on_config_error,
+        allow_missing_linker_map=not is_base_module)
     if not (sub_args.elf_file or sub_args.map_file or apk_so_path):
       opts.analyze_native = False
   if opts.analyze_native:
@@ -2127,6 +2164,28 @@ def _ProcessContainerArgs(top_args, sub_args, main_file, on_config_error):
           linker_name, size_info_prefix)
 
 
+def _IsOnDemand(apk_path):
+  # Check if the manifest specifies whether or not to extract native libs.
+  output = subprocess.check_output([
+      path_util.GetAapt2Path(), 'dump', 'xmltree', '--file',
+      'AndroidManifest.xml', apk_path
+  ]).decode('ascii')
+
+  def parse_attr(name):
+    # http://schemas.android.com/apk/res/android:isFeatureSplit(0x0101055b)=true
+    # http://schemas.android.com/apk/distribution:onDemand=true
+    m = re.search(name + r'(?:\(.*?\))?=(\w+)', output)
+    return m and m.group(1) == 'true'
+
+  is_feature_split = parse_attr('android:isFeatureSplit')
+  # Can use <dist:on-demand>, or <module dist:onDemand="true">.
+  on_demand = parse_attr(
+      'distribution:onDemand') or 'distribution:on-demand' in output
+  on_demand = bool(on_demand and is_feature_split)
+
+  return on_demand
+
+
 def _IterSubArgs(top_args, on_config_error):
   """Generates main paths (may be deduced) for each containers given by input.
 
@@ -2162,28 +2221,46 @@ def _IterSubArgs(top_args, on_config_error):
   # Each element in |sub_args_list| specifies a container.
   for sub_args in sub_args_list:
     main_file = _IdentifyInputFile(sub_args, on_config_error)
+    if hasattr(sub_args, 'name'):
+      container_name = sub_args.name
+    else:
+      container_name = os.path.basename(main_file)
+    if set(container_name) & set('<>'):
+      parser.error('Container name cannot have characters in "<>"')
+
 
     # If needed, extract .apk file to a temp file and process that instead.
     if sub_args.minimal_apks_file:
-      with zip_util.UnzipToTemp(sub_args.minimal_apks_file,
-                                _APKS_MAIN_APK) as temp:
-        sub_args.apk_file = temp
-        yield _ProcessContainerArgs(top_args, sub_args, main_file,
-                                    on_config_error)
+      for module_name, _ in _GetModuleInfoList(sub_args.minimal_apks_file):
+        with zip_util.UnzipToTemp(
+            sub_args.minimal_apks_file,
+            'splits/{}-master.apk'.format(module_name)) as temp:
+          module_sub_args = copy.copy(sub_args)
+          module_sub_args.apk_file = temp
+          module_sub_args.split_name = module_name
+          module_sub_args.name = '{}/{}.apk'.format(container_name, module_name)
+          if module_name != 'base':
+            # TODO(crbug.com/1143690): Fix native analysis for split APKs.
+            module_sub_args.map_file = None
+          yield _ProcessContainerArgs(top_args, module_sub_args,
+                                      module_sub_args.name, on_config_error)
     else:
-      yield _ProcessContainerArgs(top_args, sub_args, main_file,
+      yield _ProcessContainerArgs(top_args, sub_args, container_name,
                                   on_config_error)
 
 
 def Run(top_args, on_config_error):
   if not top_args.size_file.endswith('.size'):
     on_config_error('size_file must end with .size')
+  if top_args.check_data_quality:
+    start_time = time.time()
 
   knobs = SectionSizeKnobs()
   build_config = {}
   seen_container_names = set()
   container_list = []
   raw_symbols_list = []
+
   # Iterate over each container.
   for (sub_args, opts, container_name, apk_so_path, resources_pathmap_path,
        linker_name, size_info_prefix) in _IterSubArgs(top_args,
@@ -2222,7 +2299,7 @@ def Run(top_args, on_config_error):
                              normalize_names=False)
 
   if logging.getLogger().isEnabledFor(logging.DEBUG):
-    for line in describe.DescribeSizeInfoCoverage(size_info):
+    for line in data_quality.DescribeSizeInfoCoverage(size_info):
       logging.debug(line)
   logging.info('Recorded info for %d symbols', len(size_info.raw_symbols))
   for container in size_info.containers:
@@ -2235,3 +2312,12 @@ def Run(top_args, on_config_error):
                            include_padding=top_args.include_padding)
   size_in_mb = os.path.getsize(top_args.size_file) / 1024.0 / 1024.0
   logging.info('Done. File size is %.2fMiB.', size_in_mb)
+
+  if top_args.check_data_quality:
+    logging.info('Checking data quality')
+    data_quality.CheckDataQuality(size_info, top_args.track_string_literals)
+    duration = (time.time() - start_time) / 60
+    if duration > 10:
+      raise data_quality.QualityCheckError(
+          'Command should not take longer than 10 minutes.'
+          ' Took {:.1f} minutes.'.format(duration))
diff --git a/chromium/tools/binary_size/libsupersize/canned_queries.py b/chromium/tools/binary_size/libsupersize/canned_queries.py
index fa06330c08e..4e847604880 100644
--- a/chromium/tools/binary_size/libsupersize/canned_queries.py
+++ b/chromium/tools/binary_size/libsupersize/canned_queries.py
@@ -5,6 +5,7 @@
 """Contains a set of Chrome-specific size queries."""
 
 import logging
+import re
 
 import models
 
@@ -132,7 +133,11 @@ def _CategorizeGenerated(symbols):
       '/protobuf/' in s.object_path or
       s.object_path.endswith('.pbzero.o') or
       s.object_path.endswith('.pb.o'))))
-  symbols = g.Add('Mojo', symbols.WhereSourcePathMatches(r'\bmojom?\b|^mojo::'))
+  mojo_pattern = re.compile(r'\bmojom?\b')
+  symbols = g.Add(
+      'Mojo',
+      symbols.Filter(lambda s: (s.full_name.startswith('mojo::') or mojo_pattern
+                                .search(s.source_path))))
   symbols = g.Add('DevTools', symbols.WhereSourcePathMatches(
       r'\b(?:protocol|devtools)\b'))
   symbols = g.Add('Blink (bindings)', symbols.WherePathMatches(
diff --git a/chromium/tools/binary_size/libsupersize/caspian/BUILD.gn b/chromium/tools/binary_size/libsupersize/caspian/BUILD.gn
index 73641867d5d..a032e2daf76 100644
--- a/chromium/tools/binary_size/libsupersize/caspian/BUILD.gn
+++ b/chromium/tools/binary_size/libsupersize/caspian/BUILD.gn
@@ -54,7 +54,7 @@ test("caspian_unittests") {
   ]
 }
 
-executable("cli") {
+executable("caspian_cli") {
   sources = [ "cli.cc" ]
   deps = [ ":caspian-lib" ]
   cflags = [ "-Wall" ]
diff --git a/chromium/tools/binary_size/libsupersize/caspian/README.md b/chromium/tools/binary_size/libsupersize/caspian/README.md
index 013eaec8681..3b37625d7f6 100644
--- a/chromium/tools/binary_size/libsupersize/caspian/README.md
+++ b/chromium/tools/binary_size/libsupersize/caspian/README.md
@@ -4,7 +4,36 @@
 
 Caspian is the name for the WebAssembly portion of the SuperSize Tiger Viewer.
 
-## How do I build it?
+## Applying patches
+
+Caspian needs some minor edits that we don't want to commit:
+
+```sh
+git apply -3 tools/binary_size/libsupersize/caspian/wasmbuild.patch
+```
+
+To re-create .patch file:
+```sh
+git add ...files to include in patch...
+git diff --staged > tools/binary_size/libsupersize/caspian/wasmbuild.patch
+# Double check that only expected files are included in the patch:
+grep +++ tools/binary_size/libsupersize/caspian/wasmbuild.patch
+```
+
+## Building the test app & tests
+There is a test and a binary that you can run to help with development (and
+allows debugging outside of the browser).
+
+```sh
+OUT=$out/linux_debug
+autoninja -C $OUT caspian_cli caspian_unittests
+$OUT/caspian_cli --help
+$OUT/caspian_unittests
+# To debug a crash:
+lldb $OUT/caspian_cli validatediff supersize_diff.sizediff
+```
+
+## Building the wasm module
 
 Install emscripten from:
 https://emscripten.org/docs/getting_started/downloads.html
@@ -14,24 +43,18 @@ https://emscripten.org/docs/getting_started/downloads.html
 ./emsdk install 2.0.3 && ./emsdk activate 2.0.3 && source ./emsdk_env.sh
 ```
 
+Build:
 ```sh
-git apply -3 tools/binary_size/libsupersize/caspian/wasmbuild.patch
 gn gen out/caspian --args='is_official_build=true treat_warnings_as_errors=false fatal_linker_warnings=false chrome_pgo_phase=0'
-( cd out/caspian; autoninja tools/binary_size:caspian_web && cp wasm/caspian_web.* ../../tools/binary_size/libsupersize/static/ )
+( cd out/caspian; autoninja caspian_web && cp wasm/caspian_web.* ../../tools/binary_size/libsupersize/static/ )
 ```
 
-Then run locally via:
+Run local test server:
 ```sh
 tools/binary_size/libsupersize/upload_html_viewer.py --local
 ```
 
-or upload to hosted site via:
+Deploy to firebase:
 ```sh
 tools/binary_size/libsupersize/upload_html_viewer.py [--prod | --staging]
 ```
-
-To re-create .patch file:
-```sh
-git add ...any files...
-git diff --staged > tools/binary_size/libsupersize/caspian/wasmbuild.patch
-```
diff --git a/chromium/tools/binary_size/libsupersize/caspian/cli.cc b/chromium/tools/binary_size/libsupersize/caspian/cli.cc
index 2fcffb9fb61..d8954c24065 100644
--- a/chromium/tools/binary_size/libsupersize/caspian/cli.cc
+++ b/chromium/tools/binary_size/libsupersize/caspian/cli.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 // Command-line interface for checking the integrity of .size files.
-// Usage: cli (path to .size file)
 
 #include <stdlib.h>
 
@@ -76,8 +75,9 @@ void PrintUsageAndExit() {
   std::cerr << "Must have exactly one of:" << std::endl;
   std::cerr << "  validate, diff" << std::endl;
   std::cerr << "Usage:" << std::endl;
-  std::cerr << "  cli validate <size file>" << std::endl;
-  std::cerr << "  cli diff <before_file> <after_file>" << std::endl;
+  std::cerr << "  caspian_cli validate <.size file>" << std::endl;
+  std::cerr << "  caspian_cli validatediff <.sizediff file>" << std::endl;
+  std::cerr << "  caspian_cli diff <before_file> <after_file>" << std::endl;
   exit(1);
 }
 
diff --git a/chromium/tools/binary_size/libsupersize/caspian/diff.cc b/chromium/tools/binary_size/libsupersize/caspian/diff.cc
index ca17f9a8b0a..72ca321f911 100644
--- a/chromium/tools/binary_size/libsupersize/caspian/diff.cc
+++ b/chromium/tools/binary_size/libsupersize/caspian/diff.cc
@@ -20,11 +20,13 @@ namespace {
 struct SymbolMatchIndex {
   SymbolMatchIndex() {}
   SymbolMatchIndex(caspian::SectionId id,
+                   std::string_view container_name,
                    std::string_view name,
                    std::string_view path,
                    int size_without_padding)
       : nonempty(true),
         id(id),
+        container_name(container_name),
         name(name),
         path(path),
         size_without_padding(size_without_padding) {
@@ -34,12 +36,14 @@ struct SymbolMatchIndex {
   operator bool() const { return nonempty; }
 
   bool operator==(const SymbolMatchIndex& other) const {
-    return id == other.id && name == other.name && path == other.path &&
+    return id == other.id && container_name == other.container_name &&
+           name == other.name && path == other.path &&
            size_without_padding == other.size_without_padding;
   }
 
   bool nonempty = false;
   caspian::SectionId id;
+  std::string_view container_name;
   std::string_view name;
   std::string_view path;
   int size_without_padding;
@@ -53,6 +57,7 @@ struct hash<SymbolMatchIndex> {
   static constexpr size_t kPrime2 = 8543;
   size_t operator()(const SymbolMatchIndex& k) const {
     return ((kPrime1 * static_cast<size_t>(k.id)) ^
+            hash<string_view>()(k.container_name) ^
             hash<string_view>()(k.name) ^ hash<string_view>()(k.path) ^
             (kPrime2 * k.size_without_padding));
   }
@@ -148,15 +153,16 @@ class DiffHelper {
 
   MatchFunc SectionAndFullNameAndPathAndSize() {
     return [](const caspian::Symbol& sym) {
-      return SymbolMatchIndex(sym.section_id_, sym.full_name_, GetIdPath(sym),
-                              sym.Pss());
+      return SymbolMatchIndex(sym.section_id_, sym.ContainerName(),
+                              sym.full_name_, GetIdPath(sym), sym.Pss());
     };
   }
 
   MatchFunc SectionAndFullNameAndPath() {
     return [this](const caspian::Symbol& sym) {
-      return SymbolMatchIndex(sym.section_id_, StripNumbers(sym.full_name_),
-                              GetIdPath(sym), 0.0f);
+      return SymbolMatchIndex(sym.section_id_, sym.ContainerName(),
+                              StripNumbers(sym.full_name_), GetIdPath(sym),
+                              0.0f);
     };
   }
 
@@ -167,7 +173,8 @@ class DiffHelper {
       if (!name.empty() && name[0] == '*') {
         name = NormalizeStarSymbols(name);
       }
-      return SymbolMatchIndex(sym.section_id_, name, GetIdPath(sym), 0.0f);
+      return SymbolMatchIndex(sym.section_id_, sym.ContainerName(), name,
+                              GetIdPath(sym), 0.0f);
     };
   }
 
@@ -177,7 +184,8 @@ class DiffHelper {
       if (!sym.IsNameUnique()) {
         return SymbolMatchIndex();
       }
-      return SymbolMatchIndex(sym.section_id_, sym.full_name_, "", 0.0f);
+      return SymbolMatchIndex(sym.section_id_, sym.ContainerName(),
+                              sym.full_name_, "", 0.0f);
     };
   }
 
diff --git a/chromium/tools/binary_size/libsupersize/caspian/diff_test.cc b/chromium/tools/binary_size/libsupersize/caspian/diff_test.cc
index 460edca3c97..a92457653aa 100644
--- a/chromium/tools/binary_size/libsupersize/caspian/diff_test.cc
+++ b/chromium/tools/binary_size/libsupersize/caspian/diff_test.cc
@@ -67,6 +67,8 @@ int32_t SumOfSymbolPadding(const DeltaSizeInfo& info) {
 
 std::unique_ptr<SizeInfo> CreateSizeInfo() {
   std::unique_ptr<SizeInfo> info = std::make_unique<SizeInfo>();
+  info->containers.emplace_back("");
+  Container::AssignShortNames(&info->containers);
   info->raw_symbols.push_back(
       MakeSymbol(SectionId::kDexMethod, 10, "a", "com.Foo#bar()"));
   info->raw_symbols.push_back(MakeSymbol(SectionId::kText, 20, "a", ".Lfoo"));
@@ -74,6 +76,10 @@ std::unique_ptr<SizeInfo> CreateSizeInfo() {
   info->raw_symbols.push_back(MakeSymbol(SectionId::kText, 40, "b"));
   info->raw_symbols.push_back(MakeSymbol(SectionId::kText, 50, "b"));
   info->raw_symbols.push_back(MakeSymbol(SectionId::kText, 60, ""));
+
+  for (auto sym : info->raw_symbols) {
+    sym.container_ = &info->containers[0];
+  }
   return info;
 }
 
@@ -154,6 +160,23 @@ TEST(DiffTest, TestDontMatchAcrossSections) {
   EXPECT_EQ(0, SumOfSymbolSizes(diff));
 }
 
+TEST(DiffTest, TestDontMatchAcrossContainers) {
+  std::unique_ptr<SizeInfo> size_info1 = CreateSizeInfo();
+  std::unique_ptr<SizeInfo> size_info2 = CreateSizeInfo();
+  size_info1->containers.emplace_back("C2");
+  Container::AssignShortNames(&size_info1->containers);
+  size_info2->containers.emplace_back("C2");
+  Container::AssignShortNames(&size_info2->containers);
+
+  size_info1->raw_symbols[0].container_ = &size_info1->containers[1];
+
+  DeltaSizeInfo diff = Diff(size_info1.get(), size_info2.get());
+
+  DeltaSizeInfo::Results expected_counts{5, 0, 1, 1};
+  EXPECT_EQ(expected_counts, diff.CountsByDiffStatus());
+  EXPECT_EQ(0, SumOfSymbolSizes(diff));
+}
+
 TEST(DiffTest, TestAliasesRemove) {
   std::unique_ptr<SizeInfo> size_info1 = CreateSizeInfo();
   std::unique_ptr<SizeInfo> size_info2 = CreateSizeInfo();
diff --git a/chromium/tools/binary_size/libsupersize/caspian/file_format.cc b/chromium/tools/binary_size/libsupersize/caspian/file_format.cc
index 5c07458ba98..58fb508d918 100644
--- a/chromium/tools/binary_size/libsupersize/caspian/file_format.cc
+++ b/chromium/tools/binary_size/libsupersize/caspian/file_format.cc
@@ -69,9 +69,11 @@ void Decompress(const char* gzipped,
 
 std::vector<const char*> ReadValuesFromLine(char** rest,
                                             const char* delimiter) {
-  char* rest_of_line = strsep(rest, "\n");
-
   std::vector<const char*> ret;
+  char* rest_of_line = strsep(rest, "\n");
+  // Check for empty line (otherwise "" is added).
+  if (!*rest_of_line)
+    return ret;
   while (true) {
     char* token = strsep(&rest_of_line, delimiter);
     if (!token)
diff --git a/chromium/tools/binary_size/libsupersize/caspian/lens.cc b/chromium/tools/binary_size/libsupersize/caspian/lens.cc
index 16676c3d8cc..16cc2dc1faf 100644
--- a/chromium/tools/binary_size/libsupersize/caspian/lens.cc
+++ b/chromium/tools/binary_size/libsupersize/caspian/lens.cc
@@ -35,15 +35,11 @@ std::string_view IdPathLens::ParentName(const BaseSymbol& symbol) {
 }
 
 std::string_view ContainerLens::ParentName(const BaseSymbol& symbol) {
-  std::string component;
-  if (symbol.ContainerName() && *symbol.ContainerName()) {
-    return symbol.ContainerName();
-  }
-  return kDefaultContainer;
+  std::string_view ret = symbol.ContainerName();
+  return ret.empty() ? kDefaultContainer : ret;
 }
 
 std::string_view ComponentLens::ParentName(const BaseSymbol& symbol) {
-  std::string component;
   if (symbol.Component() && *symbol.Component()) {
     return symbol.Component();
   }
@@ -80,8 +76,9 @@ std::string_view GeneratedLens::ParentName(const BaseSymbol& symbol) {
     return "C++ Protocol Buffers";
   }
 
-  static LazyRE2 mojo_regex = {"\\bmojom?\\b|^mojo::"};
-  if (PartialMatch(symbol.SourcePath(), *mojo_regex)) {
+  static LazyRE2 mojo_regex = {"\\bmojom?\\b"};
+  if (symbol.FullName().substr(0, 7) == "mojom::" ||
+      PartialMatch(symbol.SourcePath(), *mojo_regex)) {
     return "Mojo";
   }
 
diff --git a/chromium/tools/binary_size/libsupersize/caspian/lens_test.cc b/chromium/tools/binary_size/libsupersize/caspian/lens_test.cc
index aca1693d090..d99185f6195 100644
--- a/chromium/tools/binary_size/libsupersize/caspian/lens_test.cc
+++ b/chromium/tools/binary_size/libsupersize/caspian/lens_test.cc
@@ -59,14 +59,22 @@ TEST(LensTest, TestGeneratedLensCppProto) {
   EXPECT_EQ("C++ Protocol Buffers", GeneratedLens().ParentName(sym));
 }
 
-TEST(LensTest, TestGeneratedLensMojo) {
+TEST(LensTest, TestGeneratedLensMojo1) {
   Symbol sym;
   sym.section_id_ = SectionId::kText;
-  sym.object_path_ = "a.mojom";
+  sym.source_path_ = "a.mojom";
   sym.flags_ |= SymbolFlag::kGeneratedSource;
   EXPECT_EQ("Mojo", GeneratedLens().ParentName(sym));
 }
 
+TEST(LensTest, TestGeneratedLensMojo2) {
+  Symbol sym;
+  sym.section_id_ = SectionId::kText;
+  sym.flags_ |= SymbolFlag::kGeneratedSource;
+  sym.full_name_ = "mojom::foo()";
+  EXPECT_EQ("Mojo", GeneratedLens().ParentName(sym));
+}
+
 TEST(LensTest, TestGeneratedLensDevTools) {
   Symbol sym;
   sym.section_id_ = SectionId::kText;
diff --git a/chromium/tools/binary_size/libsupersize/caspian/model.cc b/chromium/tools/binary_size/libsupersize/caspian/model.cc
index bc8f4cd23fc..4040e63e716 100644
--- a/chromium/tools/binary_size/libsupersize/caspian/model.cc
+++ b/chromium/tools/binary_size/libsupersize/caspian/model.cc
@@ -101,8 +101,8 @@ SectionId Symbol::Section() const {
   return section_id_;
 }
 
-const char* Symbol::ContainerName() const {
-  return container_->name.c_str();
+std::string_view Symbol::ContainerName() const {
+  return container_ ? container_->name : std::string_view();
 }
 const char* Symbol::ObjectPath() const {
   return object_path_;
@@ -206,7 +206,7 @@ SectionId DeltaSymbol::Section() const {
   return (after_ ? after_ : before_)->Section();
 }
 
-const char* DeltaSymbol::ContainerName() const {
+std::string_view DeltaSymbol::ContainerName() const {
   return (after_ ? after_ : before_)->ContainerName();
 }
 
diff --git a/chromium/tools/binary_size/libsupersize/caspian/model.h b/chromium/tools/binary_size/libsupersize/caspian/model.h
index 3115c78cbd6..7430a74a8b4 100644
--- a/chromium/tools/binary_size/libsupersize/caspian/model.h
+++ b/chromium/tools/binary_size/libsupersize/caspian/model.h
@@ -100,7 +100,7 @@ class BaseSymbol {
   virtual const std::vector<Symbol*>* Aliases() const = 0;
   virtual SectionId Section() const = 0;
 
-  virtual const char* ContainerName() const = 0;
+  virtual std::string_view ContainerName() const = 0;
   virtual const char* ObjectPath() const = 0;
   virtual const char* SourcePath() const = 0;
   virtual const char* SectionName() const = 0;
@@ -188,7 +188,7 @@ class Symbol : public BaseSymbol {
   const std::vector<Symbol*>* Aliases() const override;
   SectionId Section() const override;
 
-  const char* ContainerName() const override;
+  std::string_view ContainerName() const override;
   const char* ObjectPath() const override;
   const char* SourcePath() const override;
   const char* SectionName() const override;
@@ -245,7 +245,7 @@ class DeltaSymbol : public BaseSymbol {
   const std::vector<Symbol*>* Aliases() const override;
   SectionId Section() const override;
 
-  const char* ContainerName() const override;
+  std::string_view ContainerName() const override;
   const char* ObjectPath() const override;
   const char* SourcePath() const override;
   const char* SectionName() const override;
diff --git a/chromium/tools/binary_size/libsupersize/caspian/wasmbuild.patch b/chromium/tools/binary_size/libsupersize/caspian/wasmbuild.patch
index 821a3594daf..512dae3aeab 100644
--- a/chromium/tools/binary_size/libsupersize/caspian/wasmbuild.patch
+++ b/chromium/tools/binary_size/libsupersize/caspian/wasmbuild.patch
@@ -1,9 +1,9 @@
 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
-index bb656fa19ff3..7fbf650f7b0e 100644
+index 407ca1a239c1..4a0e5b97307b 100644
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
-@@ -291,10 +291,11 @@ is_ios = current_os == "ios"
- is_linux = current_os == "chromeos" || current_os == "linux"
+@@ -299,10 +299,11 @@ is_ios = current_os == "ios"
+ is_linux = current_os == "linux"
  is_mac = current_os == "mac"
  is_nacl = current_os == "nacl"
 +is_wasm = current_os == "wasm"
@@ -14,12 +14,12 @@ index bb656fa19ff3..7fbf650f7b0e 100644
 +is_posix = !is_win && !is_fuchsia && !is_wasm
  
  # =============================================================================
- # SOURCES FILTERS
+ # TARGET DEFAULTS
 diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index c9ef45a1495e..85ea1ddd0d00 100644
+index ccf1dd59f9a4..a8ef5afa086a 100644
 --- a/build/config/compiler/BUILD.gn
 +++ b/build/config/compiler/BUILD.gn
-@@ -603,6 +603,20 @@ config("compiler") {
+@@ -594,6 +594,20 @@ config("compiler") {
      ldflags += [ "-stdlib=libc++" ]
    }
  
@@ -40,16 +40,18 @@ index c9ef45a1495e..85ea1ddd0d00 100644
    # Add flags for link-time optimization. These flags enable
    # optimizations/transformations that require whole-program visibility at link
    # time, so they need to be applied to all translation units, and we may end up
-@@ -726,7 +740,7 @@ config("compiler") {
+@@ -714,9 +728,7 @@ config("compiler") {
    if (use_lld && !enable_call_graph_profile_sort) {
      if (is_win) {
        ldflags += [ "/call-graph-profile-sort:no" ]
--    } else {
+-    } else if (!is_apple) {
+-      # TODO(thakis): Once LLD's Mach-O port basically works, implement call
+-      # graph profile sorting for it, add an opt-out flag, and pass it here.
 +    } else if (!is_wasm) {
        ldflags += [ "-Wl,--no-call-graph-profile-sort" ]
      }
    }
-@@ -1532,7 +1546,8 @@ config("default_warnings") {
+@@ -1559,7 +1571,8 @@ config("default_warnings") {
          cflags += [ "-Wno-nonportable-include-path" ]
        }
  
@@ -59,7 +61,7 @@ index c9ef45a1495e..85ea1ddd0d00 100644
          # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
          # recognize.
          cflags += [
-@@ -2294,6 +2309,9 @@ config("symbols") {
+@@ -2321,6 +2334,9 @@ config("symbols") {
          "-debug-info-kind=constructor",
        ]
      }
diff --git a/chromium/tools/binary_size/libsupersize/console.py b/chromium/tools/binary_size/libsupersize/console.py
index e5afd7c6b9b..763f2d9f4ff 100644
--- a/chromium/tools/binary_size/libsupersize/console.py
+++ b/chromium/tools/binary_size/libsupersize/console.py
@@ -18,6 +18,7 @@ import types
 
 import archive
 import canned_queries
+import data_quality
 import describe
 import diff
 import file_format
@@ -76,6 +77,7 @@ class _Session(object):
     self._printed_variables = []
     self._variables = {
         'Print': self._PrintFunc,
+        'CheckDataQuality': self._CheckDataQuality,
         'Csv': self._CsvFunc,
         'Diff': self._DiffFunc,
         'SaveSizeInfo': self._SaveSizeInfo,
@@ -145,6 +147,26 @@ class _Session(object):
     after = after if after is not None else self._size_infos[1]
     return diff.Diff(before, after, sort=sort)
 
+  def _PrintUploadCommand(self, file_to_upload, is_internal=False):
+    oneoffs_dir = 'oneoffs'
+    visibility = '-a public-read '
+    if is_internal:
+      oneoffs_dir = 'private-oneoffs'
+      visibility = ''
+
+    shortname = os.path.basename(os.path.normpath(file_to_upload))
+    msg = (
+        'Saved locally to {local}. To share, run:\n'
+        '> gsutil.py cp {visibility}{local} gs://chrome-supersize/'
+        '{oneoffs_dir}\n'
+        '  Then view it at https://chrome-supersize.firebaseapp.com/viewer.html'
+        '?load_url=https://storage.googleapis.com/chrome-supersize/'
+        '{oneoffs_dir}/{shortname}')
+    print(msg.format(local=file_to_upload,
+                     shortname=shortname,
+                     oneoffs_dir=oneoffs_dir,
+                     visibility=visibility))
+
   def _SaveSizeInfo(self, filtered_symbols=None, size_info=None, to_file=None):
     """Saves a .size file containing only filtered_symbols into to_file.
 
@@ -163,14 +185,8 @@ class _Session(object):
         include_padding=filtered_symbols is not None,
         sparse_symbols=filtered_symbols)
 
-    shortname = os.path.basename(os.path.normpath(to_file))
-    msg = (
-        'Saved locally to {local}. To share, run:\n'
-        '> gsutil.py cp -a public-read {local} gs://chrome-supersize/oneoffs\n'
-        '  Then view it at https://chrome-supersize.firebaseapp.com/viewer.html'
-        '?load_url=https://storage.googleapis.com/chrome-supersize/oneoffs/'
-        '{shortname}')
-    print(msg.format(local=to_file, shortname=shortname))
+    is_internal = len(size_info.symbols.WherePathMatches('^clank')) > 0
+    self._PrintUploadCommand(to_file, is_internal)
 
   def _SaveDeltaSizeInfo(self, size_info, to_file=None):
     """Saves a .sizediff file containing only filtered_symbols into to_file.
@@ -183,15 +199,8 @@ class _Session(object):
     assert to_file.endswith('.sizediff'), 'to_file should end with .sizediff'
 
     file_format.SaveDeltaSizeInfo(size_info, to_file)
-
-    shortname = os.path.basename(os.path.normpath(to_file))
-    msg = (
-        'Saved locally to {local}. To share, run:\n'
-        '> gsutil.py cp {local} gs://chrome-supersize/oneoffs && gsutil.py -m '
-        'acl ch -u AllUsers:R gs://chrome-supersize/oneoffs/{shortname}\n'
-        '  Then view it at https://storage.googleapis.com/chrome-supersize'
-        '/viewer.html?load_url=oneoffs%2F{shortname}')
-    print(msg.format(local=to_file, shortname=shortname))
+    is_internal = len(size_info.symbols.WherePathMatches('^clank')) > 0
+    self._PrintUploadCommand(to_file, is_internal)
 
   def _SizeStats(self, size_info=None):
     """Prints some statistics for the given size info.
@@ -200,8 +209,13 @@ class _Session(object):
       size_info: Defaults to size_infos[0].
     """
     size_info = size_info or self._size_infos[0]
-    describe.WriteLines(
-        describe.DescribeSizeInfoCoverage(size_info), sys.stdout.write)
+    describe.WriteLines(data_quality.DescribeSizeInfoCoverage(size_info),
+                        sys.stdout.write)
+
+  def _CheckDataQuality(self, size_info=None, track_string_literals=True):
+    """Performs checks that run as part of --check-data-quality."""
+    size_info = size_info or self._size_infos[0]
+    data_quality.CheckDataQuality(size_info, track_string_literals)
 
   def _PrintFunc(self, obj=None, verbose=False, summarize=True, recursive=False,
                  use_pager=None, to_file=None):
@@ -333,6 +347,19 @@ class _Session(object):
       tool_prefix = path_util.ToolPrefixFinder(
           output_directory=output_directory_finder.Finalized(),
           linker_name='ld').Finalized()
+    else:
+      # Output directory is not set, so we cannot load tool_prefix from
+      # build_vars.json, nor resolve the output directory-relative path stored
+      # size_info.metadata.
+      is_android = next(
+          filter(None, (m.get(models.METADATA_APK_FILENAME)
+                        for m in size_info.metadata)), None)
+      arch = next(
+          filter(None, (m.get(models.METADATA_ELF_ARCHITECTURE)
+                        for m in size_info.metadata)), None)
+      # Hardcode path for arm32.
+      if is_android and arch == 'arm':
+        tool_prefix = path_util.ANDROID_ARM_NDK_TOOL_PREFIX
 
     args = [
         path_util.GetObjDumpPath(tool_prefix),
diff --git a/chromium/tools/binary_size/libsupersize/data_quality.py b/chromium/tools/binary_size/libsupersize/data_quality.py
new file mode 100644
index 00000000000..98bd1e2fdcc
--- /dev/null
+++ b/chromium/tools/binary_size/libsupersize/data_quality.py
@@ -0,0 +1,240 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""Checks that collected symbols are not missing things."""
+
+import logging
+import models
+import os
+
+
+class QualityCheckError(Exception):
+  def __init__(self, msg):
+    super(QualityCheckError,
+          self).__init__('--check-data-quality assertion failed: ' + msg)
+
+
+def CheckDataQuality(size_info, track_string_literals):
+  logging.debug('Grouping symbols')
+  grouped = size_info.raw_symbols.GroupedByContainerAndSectionName()
+  section_sizes = size_info.section_sizes
+  logging.debug('computing')
+  for symbols in grouped:
+    container = symbols[0].container
+    section_name = symbols[0].section_name
+    segment_size = container.section_sizes[section_name]
+    is_other = section_name == models.SECTION_OTHER
+    is_native = section_name in models.NATIVE_SECTIONS
+    is_dex = section_name in models.DEX_SECTIONS
+
+    logging.debug('checking section %s<%s>', section_name, container.name)
+
+    actual_size = 0.0
+    actual_padding = 0.0
+    placeholder_size = 0.0
+    no_name_size = 0.0
+    no_source_path_size = 0.0
+    no_attribution_size = 0.0
+    no_component_size = 0.0
+    string_literal_size = 0.0
+    alias_count = 0
+    generated_count = 0
+    unlikely_count = 0
+    startup_count = 0
+
+    for sym in symbols:
+      pss = sym.pss
+      actual_size += pss
+      actual_padding += sym.padding_pss
+      if sym.full_name.startswith('**'):
+        placeholder_size += pss
+      if not sym.full_name:
+        no_name_size += pss
+      if not sym.source_path:
+        no_source_path_size += pss
+      if not (sym.full_name or sym.source_path or sym.object_path):
+        no_attribution_size += pss
+      if not sym.component:
+        no_component_size += pss
+      if sym.IsStringLiteral():
+        string_literal_size += pss
+      alias_count += int(bool(sym.aliases and sym is sym.aliases[0]))
+      generated_count += int(bool(sym.flags & models.FLAG_GENERATED_SOURCE))
+      unlikely_count += int(bool(sym.flags & models.FLAG_UNLIKELY))
+      startup_count += int(bool(sym.flags & models.FLAG_STARTUP))
+
+      if os.path.isabs(sym.source_path):
+        raise QualityCheckError('Abs path found in source_path: ' + repr(sym))
+      if os.path.isabs(sym.object_path):
+        raise QualityCheckError('Abs path found in object_path: ' + repr(sym))
+
+    def raise_error(msg, *args):
+      header = ('Within section {} of container "{}", '
+                'which has {} symbols totalling {} bytes: ').format(
+                    section_name, container.name, len(symbols), segment_size)
+      raise QualityCheckError(header + msg.format(*args))
+
+    def raise_size_error(kind, size, limit_fraction):
+      raise_error(
+          'Abnormally high number of bytes attributed to {}: {:.0f} '
+          '({:.0%}, limit was {:.0%}).', kind, size, size / segment_size,
+          limit_fraction)
+
+    def check_size(kind, size, limit_fraction):
+      limit = limit_fraction * segment_size
+      if size > limit:
+        raise_size_error(kind, size, limit_fraction)
+
+    def check_some_exist(kind, count, limit=1):
+      if count < limit:
+        raise_error(
+            'Expected at least {} {} to exist. '
+            'Found only {} out of {} symbols.', limit, kind, count,
+            len(symbols))
+
+    if not isinstance(segment_size, int):
+      raise_error('Section size should be a whole number.')
+    if segment_size < 1:
+      raise_error('Section size should not greater than zero.')
+    if round(actual_size) != segment_size:
+      raise_error('Sum of symbols sizes do not match section size. Sum={}',
+                  round(actual_size))
+
+    check_size('padding', actual_padding, (0.05 if is_other else 0.01))
+
+    # One bad symbol can mess up small containers.
+    is_small_section = (len(symbols) < 10
+                        or segment_size / section_sizes[section_name] < .1)
+    if not is_small_section:
+      # Dex string tables show up as placeholders.
+      check_size('placeholders', placeholder_size, (0.2 if is_dex else 0.01))
+
+      check_size('symbols without names', no_name_size, 0.01)
+      check_size('symbols without source paths', no_source_path_size, 0.1)
+      check_size('symbols without name or path', no_attribution_size, 0.01)
+      check_size('symbols without component', no_component_size, 0.20)
+
+      if track_string_literals and section_name == models.SECTION_RODATA:
+        if string_literal_size / segment_size < .05:
+          raise_error(
+              'Expected more size from string literals. Found only {} ({:.1%})',
+              string_literal_size, string_literal_size / segment_size)
+
+      if is_native:
+        check_some_exist('symbol aliases', alias_count)
+      if is_native or is_dex:
+        check_some_exist('generated symbols', generated_count)
+      if section_name == models.SECTION_TEXT:
+        check_some_exist('symbols annotated by AFDO profile', unlikely_count)
+        check_some_exist('static initializers', startup_count)
+
+
+def _Divide(a, b):
+  return float(a) / b if b else 0
+
+
+# TODO(agrieve): Have this utilize the stats collected by CheckDataQuality().
+def _DescribeSizeInfoContainerCoverage(raw_symbols, container):
+  """Yields lines describing how accurate |size_info| is."""
+  for section, section_name in models.SECTION_TO_SECTION_NAME.items():
+    expected_size = container.section_sizes.get(section_name)
+    in_section = raw_symbols.WhereInSection(section_name, container=container)
+    actual_size = in_section.size
+
+    if expected_size is None:
+      yield 'Section {}: {} bytes from {} symbols.'.format(
+          section_name, actual_size, len(in_section))
+    else:
+      size_fraction = _Divide(actual_size, expected_size)
+      yield ('Section {}: has {:.1%} of {} bytes accounted for from '
+             '{} symbols. {} bytes are unaccounted for.').format(
+                 section_name, size_fraction, actual_size, len(in_section),
+                 expected_size - actual_size)
+
+    padding = in_section.padding
+    yield '* Padding accounts for {} bytes ({:.1%})'.format(
+        padding, _Divide(padding, actual_size))
+
+    def size_msg(syms, show_padding=False):
+      size = syms.size if not show_padding else syms.size_without_padding
+      size_msg = 'Accounts for {} bytes ({:.1%}).'.format(
+          size, _Divide(size, actual_size))
+      if show_padding:
+        size_msg = size_msg[:-1] + ' padding is {} bytes.'.format(syms.padding)
+      return size_msg
+
+    syms = in_section.Filter(lambda s: s.source_path)
+    yield '* {} have source paths. {}'.format(len(syms), size_msg(syms))
+    syms = in_section.WhereHasComponent()
+    yield '* {} have a component assigned. {}'.format(len(syms), size_msg(syms))
+
+    syms = in_section.WhereNameMatches(r'^\*')
+    if len(syms):
+      yield '* {} placeholders exist (symbols that start with **). {}'.format(
+          len(syms), size_msg(syms))
+
+    syms = syms.Inverted().WhereHasAnyAttribution().Inverted()
+    if syms:
+      yield '* {} symbols have no name or path. {}'.format(
+          len(syms), size_msg(syms))
+
+    if section == 'r':
+      syms = in_section.Filter(lambda s: s.IsStringLiteral())
+      yield '* {} string literals exist. {}'.format(
+          len(syms), size_msg(syms, show_padding=True))
+
+    syms = in_section.Filter(lambda s: s.aliases)
+    if len(syms):
+      uniques = sum(1 for s in syms.IterUniqueSymbols())
+      saved = sum(s.size_without_padding * (s.num_aliases - 1)
+                  for s in syms.IterUniqueSymbols())
+      yield ('* {} aliases exist, mapped to {} unique addresses '
+             '({} bytes saved)').format(len(syms), uniques, saved)
+
+    syms = in_section.WhereObjectPathMatches('{shared}')
+    if len(syms):
+      yield '* {} symbols have shared ownership. {}'.format(
+          len(syms), size_msg(syms))
+    else:
+      yield '* 0 symbols have shared ownership.'
+
+    for flag, desc in ((models.FLAG_HOT, 'marked as "hot"'),
+                       (models.FLAG_UNLIKELY, 'marked as "unlikely"'),
+                       (models.FLAG_STARTUP,
+                        'marked as "startup"'), (models.FLAG_CLONE, 'clones'),
+                       (models.FLAG_GENERATED_SOURCE,
+                        'from generated sources')):
+      syms = in_section.WhereHasFlag(flag)
+      if len(syms):
+        yield '* {} symbols are {}. {}'.format(len(syms), desc, size_msg(syms))
+
+    # These thresholds were found by experimenting with arm32 Chrome.
+    # E.g.: Set them to 0 and see what warnings get logged, then take max value.
+    spam_counter = 0
+    for i in range(len(in_section) - 1):
+      sym = in_section[i + 1]
+      if (not sym.full_name.startswith('*')
+          and not sym.source_path.endswith('.S')  # Assembly symbol are iffy.
+          and not sym.IsStringLiteral()
+          and ((sym.section in 'rd' and sym.padding >= 256) or
+               (sym.section in 't' and sym.padding >= 64))):
+        # TODO(crbug.com/959906): We should synthesize symbols for these gaps
+        #     rather than attribute them as padding.
+        spam_counter += 1
+        if spam_counter > 5:
+          break
+        yield 'Large padding of {} between:'.format(sym.padding)
+        yield '  A) ' + repr(in_section[i])
+        yield '  B) ' + repr(sym)
+
+
+def DescribeSizeInfoCoverage(size_info):
+  for i, container in enumerate(size_info.containers):
+    if i > 0:
+      yield ''
+    if container.name:
+      yield 'Container <%s>' % container.name
+    # TODO(huangs): Change to use "yield from" once linters allow this.
+    for line in _DescribeSizeInfoContainerCoverage(size_info.raw_symbols,
+                                                   container):
+      yield line
diff --git a/chromium/tools/binary_size/libsupersize/describe.py b/chromium/tools/binary_size/libsupersize/describe.py
index 319e7f6781c..158821ea95e 100644
--- a/chromium/tools/binary_size/libsupersize/describe.py
+++ b/chromium/tools/binary_size/libsupersize/describe.py
@@ -4,6 +4,7 @@
 """Methods for converting model objects to human-readable formats."""
 
 import abc
+import data_quality
 import io
 import collections
 import csv
@@ -594,117 +595,12 @@ class DescriberText(Describer):
 
     if self.verbose:
       desc_list.append(('', ))
-      desc_list.append(DescribeSizeInfoCoverage(size_info))
+      desc_list.append(data_quality.DescribeSizeInfoCoverage(size_info))
     desc_list.append(('', ))
     desc_list.append(self.GenerateLines(size_info.symbols))
     return itertools.chain.from_iterable(desc_list)
 
 
-def _DescribeSizeInfoContainerCoverage(raw_symbols, container):
-  """Yields lines describing how accurate |size_info| is."""
-  for section, section_name in models.SECTION_TO_SECTION_NAME.items():
-    expected_size = container.section_sizes.get(section_name)
-    in_section = raw_symbols.WhereInSection(section_name, container=container)
-    actual_size = in_section.size
-
-    if expected_size is None:
-      yield 'Section {}: {} bytes from {} symbols.'.format(
-          section_name, actual_size, len(in_section))
-    else:
-      size_percent = _Divide(actual_size, expected_size)
-      yield ('Section {}: has {:.1%} of {} bytes accounted for from '
-             '{} symbols. {} bytes are unaccounted for.').format(
-                 section_name, size_percent, actual_size, len(in_section),
-                 expected_size - actual_size)
-
-    padding = in_section.padding
-    yield '* Padding accounts for {} bytes ({:.1%})'.format(
-        padding, _Divide(padding, actual_size))
-
-    def size_msg(syms, padding=False):
-      size = syms.size if not padding else syms.size_without_padding
-      size_msg = 'Accounts for {} bytes ({:.1%}).'.format(
-          size, _Divide(size, actual_size))
-      if padding:
-        size_msg = size_msg[:-1] + ' padding is {} bytes.'.format(syms.padding)
-      return size_msg
-
-    syms = in_section.Filter(lambda s: s.source_path)
-    yield '* {} have source paths. {}'.format(len(syms), size_msg(syms))
-    syms = in_section.WhereHasComponent()
-    yield '* {} have a component assigned. {}'.format(len(syms), size_msg(syms))
-
-    syms = in_section.WhereNameMatches(r'^\*')
-    if len(syms):
-      yield '* {} placeholders exist (symbols that start with **). {}'.format(
-          len(syms), size_msg(syms))
-
-    syms = syms.Inverted().WhereHasAnyAttribution().Inverted()
-    if syms:
-      yield '* {} symbols have no name or path. {}'.format(
-          len(syms), size_msg(syms))
-
-    if section == 'r':
-      syms = in_section.Filter(lambda s: s.IsStringLiteral())
-      yield '* {} string literals exist. {}'.format(
-          len(syms), size_msg(syms, padding=True))
-
-    syms = in_section.Filter(lambda s: s.aliases)
-    if len(syms):
-      uniques = sum(1 for s in syms.IterUniqueSymbols())
-      saved = sum(s.size_without_padding * (s.num_aliases - 1)
-                  for s in syms.IterUniqueSymbols())
-      yield ('* {} aliases exist, mapped to {} unique addresses '
-             '({} bytes saved)').format(len(syms), uniques, saved)
-
-    syms = in_section.WhereObjectPathMatches('{shared}')
-    if len(syms):
-      yield '* {} symbols have shared ownership. {}'.format(
-          len(syms), size_msg(syms))
-    else:
-      yield '* 0 symbols have shared ownership.'
-
-    for flag, desc in (
-        (models.FLAG_HOT, 'marked as "hot"'),
-        (models.FLAG_UNLIKELY, 'marked as "unlikely"'),
-        (models.FLAG_STARTUP, 'marked as "startup"'),
-        (models.FLAG_CLONE, 'clones'),
-        (models.FLAG_GENERATED_SOURCE, 'from generated sources')):
-      syms = in_section.WhereHasFlag(flag)
-      if len(syms):
-        yield '* {} symbols are {}. {}'.format(len(syms), desc, size_msg(syms))
-
-    # These thresholds were found by experimenting with arm32 Chrome.
-    # E.g.: Set them to 0 and see what warnings get logged, then take max value.
-    spam_counter = 0
-    for i in range(len(in_section) - 1):
-      sym = in_section[i + 1]
-      if (not sym.full_name.startswith('*')
-          and not sym.source_path.endswith('.S')  # Assembly symbol are iffy.
-          and not sym.IsStringLiteral()
-          and ((sym.section in 'rd' and sym.padding >= 256) or
-               (sym.section in 't' and sym.padding >= 64))):
-        # TODO(crbug.com/959906): We should synthesize symbols for these gaps
-        #     rather than attribute them as padding.
-        spam_counter += 1
-        if spam_counter <= 5:
-          yield 'Large padding of {} between:'.format(sym.padding)
-          yield '  A) ' + repr(in_section[i])
-          yield '  B) ' + repr(sym)
-
-
-def DescribeSizeInfoCoverage(size_info):
-  for i, container in enumerate(size_info.containers):
-    if i > 0:
-      yield ''
-    if container.name:
-      yield 'Container <%s>' % container.name
-    # TODO(huangs): Change to use "yield from" once linters allow this.
-    for line in _DescribeSizeInfoContainerCoverage(size_info.raw_symbols,
-                                                   container):
-      yield line
-
-
 class DescriberCsv(Describer):
   def __init__(self, verbose=False):
     super(DescriberCsv, self).__init__()
diff --git a/chromium/tools/binary_size/libsupersize/diff.py b/chromium/tools/binary_size/libsupersize/diff.py
index 4b0a1c256be..66dcf93a13a 100644
--- a/chromium/tools/binary_size/libsupersize/diff.py
+++ b/chromium/tools/binary_size/libsupersize/diff.py
@@ -30,12 +30,12 @@ def _Key1(s):
   path = s.source_path or s.object_path
   # Use section rather than section_name since clang & gcc use
   # .data.rel.ro vs. .data.rel.ro.local.
-  return s.section, name, path, s.size_without_padding
+  return s.container_name, s.section, name, path, s.size_without_padding
 
 
 # Same as _Key1, but size can change.
 def _Key2(s):
-  return _Key1(s)[:3]
+  return _Key1(s)[:4]
 
 
 # Same as _Key2, but allow signature changes (uses name rather than full_name).
@@ -48,14 +48,14 @@ def _Key3(s):
   if name.startswith('*'):
     # "* symbol gap 3 (bar)" -> "* symbol gaps"
     name = _NORMALIZE_STAR_SYMBOLS_PATTERN.sub('s', name)
-  return s.section, name, path
+  return s.container_name, s.section, name, path
 
 
 # Match on full name, but without path (to account for file moves).
 def _Key4(s):
   if not s.IsNameUnique():
     return None
-  return s.section, s.full_name
+  return s.container_name, s.section, s.full_name
 
 
 def _MatchSymbols(before, after, key_func, padding_by_segment):
diff --git a/chromium/tools/binary_size/libsupersize/diff_test.py b/chromium/tools/binary_size/libsupersize/diff_test.py
index 33ec9d851bc..08d57bf4262 100755
--- a/chromium/tools/binary_size/libsupersize/diff_test.py
+++ b/chromium/tools/binary_size/libsupersize/diff_test.py
@@ -9,17 +9,19 @@ import diff
 import models
 
 
-def _MakeSym(section, size, path, name=None):
+def _MakeSym(section, size, path, name=None, container=None):
   if name is None:
     # Trailing letter is important since diffing trims numbers.
     name = '{}_{}A'.format(section[1:], size)
-  return models.Symbol(
-      section,
-      size,
-      full_name=name,
-      template_name=name,
-      name=name,
-      object_path=path)
+  ret = models.Symbol(section,
+                      size,
+                      full_name=name,
+                      template_name=name,
+                      name=name,
+                      object_path=path)
+  if container:
+    ret.container = container
+  return ret
 
 
 def _SetName(symbol, full_name, name=None):
@@ -30,13 +32,14 @@ def _SetName(symbol, full_name, name=None):
   symbol.name = name
 
 
-def _CreateSizeInfo(aliases=None):
+def _CreateSizeInfo(aliases=None, containers=None):
   build_config = {}
   metadata = {}
   section_sizes = {'.text': 100, '.bss': 40}
-  containers = [
-      models.Container(name='', metadata=metadata, section_sizes=section_sizes)
-  ]
+  if not containers:
+    containers = [
+        models.Container('', metadata=metadata, section_sizes=section_sizes)
+    ]
   models.Container.AssignShortNames(containers)
   TEXT = models.SECTION_TEXT
   symbols = [
@@ -47,7 +50,8 @@ def _CreateSizeInfo(aliases=None):
       _MakeSym(TEXT, 50, 'b'),
       _MakeSym(TEXT, 60, ''),
   ]
-  # For simplicity, not associating |symbols| with |containers|.
+  for s in symbols:
+    s.container = containers[0]
   if aliases:
     for tup in aliases:
       syms = symbols[tup[0]:tup[1]]
@@ -109,6 +113,17 @@ class DiffTest(unittest.TestCase):
     self.assertEqual((0, 1, 1), d.raw_symbols.CountsByDiffStatus()[1:])
     self.assertEqual(0, d.raw_symbols.size)
 
+  def testDontMatchAcrossContainers(self):
+    container_a = models.Container('A', metadata={}, section_sizes={})
+    container_b = models.Container('B', metadata={}, section_sizes={})
+    containers = [container_a, container_b]
+    size_info1 = _CreateSizeInfo(containers=containers)
+    size_info1.raw_symbols[0].container = container_b
+    size_info2 = _CreateSizeInfo(containers=containers)
+    d = diff.Diff(size_info1, size_info2)
+    # Should show as one add and one remove rather than a change.
+    self.assertEqual((0, 1, 1), d.raw_symbols.CountsByDiffStatus()[1:])
+
   def testAliases_Remove(self):
     size_info1 = _CreateSizeInfo(aliases=[(0, 3)])
     size_info2 = _CreateSizeInfo(aliases=[(0, 2)])
diff --git a/chromium/tools/binary_size/libsupersize/html_report.py b/chromium/tools/binary_size/libsupersize/html_report.py
index 6ce16c70219..3ce9e00228d 100644
--- a/chromium/tools/binary_size/libsupersize/html_report.py
+++ b/chromium/tools/binary_size/libsupersize/html_report.py
@@ -287,18 +287,19 @@ def Run(args, on_config_error):
   logging.warning('Done!')
   msg = [
       'View using a local server via: ',
-      '    {0}/upload_html_viwer.py --local',
+      '    {0}/upload_html_viewer.py --local',
       'or run:',
       '    gsutil.py cp -a public-read {1} gs://chrome-supersize/oneoffs/'
       '{2}.ndjson',
       '  to view at:',
-      '    https://chrome-supersize.firebaseapp.com/viewer.html'
-      '?load_url=oneoffs/{2}.ndjson',
+      '    https://chrome-supersize.firebaseapp.com/viewer.html?load_url='
+      'https://storage.googleapis.com/chrome-supersize/oneoffs/{2}.ndjson',
   ]
-  supersize_path = os.path.relpath(
-      os.path.join(path_util.TOOLS_SRC_ROOT, 'tools', 'binary_size'))
+  libsupersize_path = os.path.relpath(
+      os.path.join(path_util.TOOLS_SRC_ROOT, 'tools', 'binary_size',
+                   'libsupersize'))
   # Use a random UUID as the filename so user can copy-and-paste command
   # directly without a name collision.
   upload_id = uuid.uuid4()
-  print('\n'.join(msg).format(supersize_path, args.output_report_file,
+  print('\n'.join(msg).format(libsupersize_path, args.output_report_file,
                               upload_id))
diff --git a/chromium/tools/binary_size/libsupersize/integration_test.py b/chromium/tools/binary_size/libsupersize/integration_test.py
index 0a96916bf88..a43fc8ce25d 100755
--- a/chromium/tools/binary_size/libsupersize/integration_test.py
+++ b/chromium/tools/binary_size/libsupersize/integration_test.py
@@ -19,6 +19,7 @@ import tempfile
 import zipfile
 
 import archive
+import data_quality
 import describe
 import diff
 import file_format
@@ -40,11 +41,19 @@ _TEST_PAK_INFO_PATH = os.path.join(
 _TEST_ELF_FILE_BEGIN = os.path.join(_TEST_OUTPUT_DIR, 'elf.begin')
 _TEST_APK_LOCALE_PAK_PATH = os.path.join(_TEST_APK_ROOT_DIR, 'assets/en-US.pak')
 _TEST_APK_PAK_PATH = os.path.join(_TEST_APK_ROOT_DIR, 'assets/resources.pak')
+_TEST_ON_DEMAND_MANIFEST_PATH = os.path.join(_TEST_DATA_DIR,
+                                             'AndroidManifest_OnDemand.xml')
+_TEST_ALWAYS_INSTALLED_MANIFEST_PATH = os.path.join(
+    _TEST_DATA_DIR, 'AndroidManifest_AlwaysInstalled.xml')
 
 # The following files are dynamically created.
 _TEST_ELF_PATH = os.path.join(_TEST_OUTPUT_DIR, 'elf')
 _TEST_APK_PATH = os.path.join(_TEST_OUTPUT_DIR, 'test.apk')
+_TEST_NOT_ON_DEMAND_SPLIT_APK_PATH = os.path.join(_TEST_OUTPUT_DIR,
+                                                  'not_on_demand.apk')
+_TEST_ON_DEMAND_SPLIT_APK_PATH = os.path.join(_TEST_OUTPUT_DIR, 'on_demand.apk')
 _TEST_MINIMAL_APKS_PATH = os.path.join(_TEST_OUTPUT_DIR, 'Bundle.minimal.apks')
+_TEST_SSARGS_PATH = os.path.join(_TEST_OUTPUT_DIR, 'test.ssargs')
 
 # Generated file paths relative to apk
 _TEST_APK_SO_PATH = 'test.so'
@@ -79,11 +88,13 @@ def _AddMocksToPath():
   os.environ['PATH'] = _TEST_TOOL_PREFIX[:-1] + os.path.pathsep + prev_path
   os.environ['APK_ANALYZER'] = os.path.join(_TEST_SDK_DIR, 'tools', 'bin',
                                             'apkanalyzer')
+  os.environ['AAPT2'] = os.path.join(_TEST_SDK_DIR, 'tools', 'bin', 'aapt2')
   try:
     yield
   finally:
     os.environ['PATH'] = prev_path
     del os.environ['APK_ANALYZER']
+    del os.environ['AAPT2']
 
 
 def _RunApp(name, args, debug_measures=False):
@@ -144,19 +155,30 @@ class IntegrationTest(unittest.TestCase):
       apk_file.writestr(
           _TEST_APK_DEX_PATH, IntegrationTest._CreateBlankData(23))
 
+    with zipfile.ZipFile(_TEST_NOT_ON_DEMAND_SPLIT_APK_PATH, 'w') as z:
+      z.write(_TEST_ALWAYS_INSTALLED_MANIFEST_PATH, 'AndroidManifest.xml')
+    with zipfile.ZipFile(_TEST_ON_DEMAND_SPLIT_APK_PATH, 'w') as z:
+      z.write(_TEST_ON_DEMAND_MANIFEST_PATH, 'AndroidManifest.xml')
+
     with zipfile.ZipFile(_TEST_MINIMAL_APKS_PATH, 'w') as apk_file:
+      apk_file.writestr('toc.pb', 'x' * 80)
       apk_file.write(_TEST_APK_PATH, 'splits/base-master.apk')
       apk_file.writestr('splits/base-en.apk', 'x' * 10)
-      apk_file.writestr('splits/vr-master.apk', 'x' * 20)
+      apk_file.write(_TEST_NOT_ON_DEMAND_SPLIT_APK_PATH,
+                     'splits/not_on_demand-master.apk')
+      apk_file.write(_TEST_ON_DEMAND_SPLIT_APK_PATH,
+                     'splits/on_demand-master.apk')
       apk_file.writestr('splits/vr-en.apk', 'x' * 40)
-      apk_file.writestr('toc.pb', 'x' * 80)
+
 
   @classmethod
   def tearDownClass(cls):
     IntegrationTest._SafeRemoveFiles([
-      _TEST_ELF_PATH,
-      _TEST_APK_PATH,
-      _TEST_MINIMAL_APKS_PATH,
+        _TEST_ELF_PATH,
+        _TEST_APK_PATH,
+        _TEST_NOT_ON_DEMAND_SPLIT_APK_PATH,
+        _TEST_ON_DEMAND_SPLIT_APK_PATH,
+        _TEST_MINIMAL_APKS_PATH,
     ])
 
   def _CreateTestArgs(self):
@@ -191,11 +213,13 @@ class IntegrationTest(unittest.TestCase):
       apk_so_path = None
       size_info_prefix = None
       extracted_minimal_apk_path = None
+      container_name = ''
       if use_apk:
         args.apk_file = _TEST_APK_PATH
       elif use_minimal_apks:
         args.minimal_apks_file = _TEST_MINIMAL_APKS_PATH
         extracted_minimal_apk_path = _TEST_APK_PATH
+        container_name = 'Bundle.minimal.apks'
       if use_apk or use_minimal_apks:
         apk_so_path = _TEST_APK_SO_PATH
         if args.output_directory:
@@ -218,10 +242,13 @@ class IntegrationTest(unittest.TestCase):
       with _AddMocksToPath():
         build_config = {}
         metadata = archive.CreateMetadata(args, linker_name, build_config)
+        container_list = []
+        raw_symbols_list = []
         container, raw_symbols = archive.CreateContainerAndSymbols(
             knobs=knobs,
             opts=opts,
-            container_name='',
+            container_name='{}/base.apk'.format(container_name)
+            if container_name else '',
             metadata=metadata,
             map_path=args.map_file,
             tool_prefix=args.tool_prefix,
@@ -234,8 +261,44 @@ class IntegrationTest(unittest.TestCase):
             pak_info_file=pak_info_file,
             linker_name=linker_name,
             size_info_prefix=size_info_prefix)
+        container_list.append(container)
+        raw_symbols_list.append(raw_symbols)
+        if use_minimal_apks:
+          opts.analyze_native = False
+          args.split_name = 'not_on_demand'
+          args.apk_file = _TEST_NOT_ON_DEMAND_SPLIT_APK_PATH
+          args.elf_file = None
+          args.map_file = None
+          metadata = archive.CreateMetadata(args, None, build_config)
+          container, raw_symbols = archive.CreateContainerAndSymbols(
+              knobs=knobs,
+              opts=opts,
+              container_name='{}/not_on_demand.apk'.format(container_name),
+              metadata=metadata,
+              tool_prefix=args.tool_prefix,
+              output_directory=args.output_directory,
+              source_directory=args.source_directory,
+              apk_path=_TEST_NOT_ON_DEMAND_SPLIT_APK_PATH,
+              size_info_prefix=size_info_prefix)
+          container_list.append(container)
+          raw_symbols_list.append(raw_symbols)
+          args.split_name = 'on_demand'
+          args.apk_file = _TEST_ON_DEMAND_SPLIT_APK_PATH
+          metadata = archive.CreateMetadata(args, None, build_config)
+          container, raw_symbols = archive.CreateContainerAndSymbols(
+              knobs=knobs,
+              opts=opts,
+              container_name='{}/on_demand.apk'.format(container_name),
+              metadata=metadata,
+              tool_prefix=args.tool_prefix,
+              output_directory=args.output_directory,
+              source_directory=args.source_directory,
+              apk_path=_TEST_ON_DEMAND_SPLIT_APK_PATH,
+              size_info_prefix=size_info_prefix)
+          container_list.append(container)
+          raw_symbols_list.append(raw_symbols)
         IntegrationTest.cached_size_info[cache_key] = archive.CreateSizeInfo(
-            build_config, [container], [raw_symbols])
+            build_config, container_list, raw_symbols_list)
     return copy.deepcopy(IntegrationTest.cached_size_info[cache_key])
 
   def _DoArchive(self,
@@ -243,23 +306,30 @@ class IntegrationTest(unittest.TestCase):
                  use_output_directory=True,
                  use_elf=False,
                  use_apk=False,
+                 use_ssargs=False,
                  use_minimal_apks=False,
                  use_pak=False,
                  use_aux_elf=None,
                  debug_measures=False,
                  include_padding=False):
     args = [
-      archive_path,
-      '--map-file', _TEST_MAP_PATH,
-      '--source-directory', _TEST_SOURCE_DIR,
+        archive_path,
+        '--source-directory',
+        _TEST_SOURCE_DIR,
+        #  --map-file ignored for use_ssargs.
+        '--map-file',
+        _TEST_MAP_PATH,
     ]
+
     if use_output_directory:
       # Let autodetection find output_directory when --elf-file is used.
       if not use_elf:
         args += ['--output-directory', _TEST_OUTPUT_DIR]
     else:
       args += ['--no-output-directory']
-    if use_apk:
+    if use_ssargs:
+      args += ['-f', _TEST_SSARGS_PATH]
+    elif use_apk:
       args += ['-f', _TEST_APK_PATH]
     elif use_minimal_apks:
       args += ['-f', _TEST_MINIMAL_APKS_PATH]
@@ -312,16 +382,15 @@ class IntegrationTest(unittest.TestCase):
     self.assertEqual(expected, actual)
 
     sym_strs = (repr(sym) for sym in size_info.symbols)
-    stats = describe.DescribeSizeInfoCoverage(size_info)
+    stats = data_quality.DescribeSizeInfoCoverage(size_info)
     if len(size_info.containers) == 1:
       # If there's only one container, merge the its metadata into build_config.
       merged_data_desc = describe.DescribeDict(size_info.metadata_legacy)
-      return itertools.chain(merged_data_desc, stats, sym_strs)
     else:
-      build_config = describe.DescribeDict(size_info.build_config)
-      metadata = itertools.chain.from_iterable(
-          describe.DescribeDict(c.metadata) for c in size_info.containers)
-      return itertools.chain(build_config, metadata, stats, sym_strs)
+      merged_data_desc = describe.DescribeDict(size_info.build_config)
+      for m in size_info.metadata:
+        merged_data_desc.extend(describe.DescribeDict(m))
+    return itertools.chain(merged_data_desc, stats, sym_strs)
 
   @_CompareWithGolden()
   def test_Archive(self):
@@ -511,6 +580,30 @@ class IntegrationTest(unittest.TestCase):
         describe.GenerateLines(all_syms.GroupedByName(depth=1, min_count=2)),
     )
 
+  @_CompareWithGolden()
+  def test_ArchiveContainers(self):
+    with tempfile.NamedTemporaryFile(suffix='.size') as temp_file:
+      self._DoArchive(temp_file.name,
+                      use_output_directory=True,
+                      use_ssargs=True)
+      size_info = archive.LoadAndPostProcessSizeInfo(temp_file.name)
+
+    # Don't cluster.
+    size_info.symbols = size_info.raw_symbols
+    sym_strs = (repr(sym) for sym in size_info.symbols)
+    build_config = describe.DescribeDict(size_info.build_config)
+    metadata = itertools.chain.from_iterable(
+        itertools.chain([c.name], describe.DescribeDict(c.metadata))
+        for c in size_info.containers)
+    return itertools.chain(
+        ['BuildConfig:'],
+        build_config,
+        ['Metadata:'],
+        metadata,
+        ['Symbols:'],
+        sym_strs,
+    )
+
 
 def main():
   argv = sys.argv
diff --git a/chromium/tools/binary_size/libsupersize/models.py b/chromium/tools/binary_size/libsupersize/models.py
index f521f8a9416..4746d2e9b61 100644
--- a/chromium/tools/binary_size/libsupersize/models.py
+++ b/chromium/tools/binary_size/libsupersize/models.py
@@ -54,6 +54,8 @@ BUILD_CONFIG_KEYS = (
 
 METADATA_APK_FILENAME = 'apk_file_name'  # Path relative to output_directory.
 METADATA_APK_SIZE = 'apk_size'  # File size of apk in bytes.
+METADATA_APK_SPLIT_NAME = 'apk_split_name'  # Name of the split if applicable.
+METADATA_APK_SPLIT_ON_DEMAND = 'apk_split_on_demand'  # Split is onDemand.
 METADATA_ZIPALIGN_OVERHEAD = 'zipalign_padding'  # Overhead from zipalign.
 METADATA_SIGNING_BLOCK_SIZE = 'apk_signature_block_size'  # Size in bytes.
 METADATA_MAP_FILENAME = 'map_file_name'  # Path relative to output_directory.
@@ -315,8 +317,11 @@ class BaseSizeInfo(object):
     return self._pak_symbols
 
   @property
-  def all_section_sizes(self):
-    return [c.section_sizes for c in self.containers]
+  def section_sizes(self):
+    ret = collections.Counter()
+    for c in self.containers:
+      ret.update(c.section_sizes)
+    return dict(ret)
 
   @property
   def metadata(self):
@@ -996,6 +1001,13 @@ class SymbolGroup(BaseSymbol):
   def WherePssBiggerThan(self, min_pss):
     return self.Filter(lambda s: s.pss >= min_pss)
 
+  def WhereIsOnDemand(self, value=True):
+    ret = self.Filter(lambda s: not s.container or s.container.metadata.get(
+        METADATA_APK_SPLIT_ON_DEMAND))
+    if not value:
+      ret = ret.Inverted()
+    return ret
+
   def WhereInSection(self, section, container=None):
     """|section| can be section_name ('.bss'), or section chars ('bdr')."""
     if section.startswith('.'):
@@ -1229,7 +1241,7 @@ class SymbolGroup(BaseSymbol):
     # A full second faster to cluster per-section. Plus, don't need create
     # (section_name, name) tuples in cluster_func.
     ret = []
-    for section in self.GroupedBySectionName():
+    for section in self.GroupedByContainerAndSectionName():
       ret.extend(section.GroupedBy(
           cluster_func, min_count=2, group_factory=group_factory))
 
@@ -1264,6 +1276,9 @@ class SymbolGroup(BaseSymbol):
   def GroupedByContainerAndSectionName(self):
     return self.GroupedBy(lambda s: (s.container_name, s.section_name))
 
+  def GroupedByContainer(self):
+    return self.GroupedBy(lambda s: s.container_name)
+
   def GroupedBySectionName(self):
     return self.GroupedBy(lambda s: s.section_name)
 
diff --git a/chromium/tools/binary_size/libsupersize/path_util.py b/chromium/tools/binary_size/libsupersize/path_util.py
index df1edd1dbb5..da33b465196 100644
--- a/chromium/tools/binary_size/libsupersize/path_util.py
+++ b/chromium/tools/binary_size/libsupersize/path_util.py
@@ -23,6 +23,11 @@ TOOLS_SRC_ROOT = os.environ.get(
 
 _SAMPLE_TOOL_SUFFIX = 'readelf'
 
+ANDROID_ARM_NDK_TOOL_PREFIX = os.path.join(TOOLS_SRC_ROOT, 'third_party',
+                                           'android_ndk', 'toolchains', 'llvm',
+                                           'prebuilt', 'linux-x86_64', 'bin',
+                                           'arm-linux-androideabi-')
+
 
 class _PathFinder(object):
   def __init__(self, name, value):
@@ -212,6 +217,12 @@ def GetApkAnalyzerPath():
   return os.environ.get('APK_ANALYZER', default_path)
 
 
+def GetAapt2Path():
+  default_path = FromToolsSrcRootRelative(
+      os.path.join('third_party', 'android_build_tools', 'aapt2', 'aapt2'))
+  return os.environ.get('AAPT2', default_path)
+
+
 def GetJavaHome():
   return FromToolsSrcRootRelative(os.path.join('third_party', 'jdk', 'current'))
 
diff --git a/chromium/tools/binary_size/libsupersize/static/auth.js b/chromium/tools/binary_size/libsupersize/static/auth.js
index 799ee2023f7..609ed0dc762 100644
--- a/chromium/tools/binary_size/libsupersize/static/auth.js
+++ b/chromium/tools/binary_size/libsupersize/static/auth.js
@@ -17,15 +17,29 @@ function handleClientLoad() {
   }
 }
 
+function toggleSigninModal(show) {
+  const modal = document.getElementById('signin-modal');
+  if (show) {
+    modal.style.display = 'block';
+  } else {
+    modal.style.display = 'none';
+  }
+}
+
 function initClient() {
+  const signin_button = document.querySelector('#signin-modal button.signin')
+  signin_button.addEventListener('click', () => {
+    window.googleAuth.signIn().then(setSigninStatus);
+    toggleSigninModal(false /*show*/);
+  });
   return gapi.client.init({
       'clientId': AUTH_CLIENT_ID,
       'discoveryDocs': [AUTH_DISCOVERY_URL],
       'scope': AUTH_SCOPE,
   }).then(function () {
     window.googleAuth = gapi.auth2.getAuthInstance();
-    if (!window.googleAuth.isSignedIn.get()) {
-      window.googleAuth.signIn().then(setSigninStatus);
+    if (!window.googleAuth.isSignedIn.get() && requiresAuthentication()) {
+      toggleSigninModal(true /*show*/);
     } else {
       setSigninStatus();
     }
diff --git a/chromium/tools/binary_size/libsupersize/static/main.css b/chromium/tools/binary_size/libsupersize/static/main.css
index 629669e05b3..96618d6a87d 100644
--- a/chromium/tools/binary_size/libsupersize/static/main.css
+++ b/chromium/tools/binary_size/libsupersize/static/main.css
@@ -228,3 +228,29 @@ ul {
 .center-text {
   text-align: center;
 }
+
+.modal {
+  background-color: rgba(0,0,0,0.5);
+  display: none;
+  height: 100%;
+  left: 0;
+  overflow: auto;
+  position: fixed;
+  top: 0;
+  width: 100%;
+  z-index: 1;
+}
+
+.modal-content {
+  align-items: flex-end;   /* Or center if you'd prefer */
+  background-color: #fefefe;
+  border: 1px solid #888;
+  border-radius: 5px;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  margin: 15% auto;
+  min-width: 250px;
+  padding: 20px;
+  width: 50%;
+}
diff --git a/chromium/tools/binary_size/libsupersize/static/tree-ui.js b/chromium/tools/binary_size/libsupersize/static/tree-ui.js
index 8af09d5be67..2deec6a510c 100644
--- a/chromium/tools/binary_size/libsupersize/static/tree-ui.js
+++ b/chromium/tools/binary_size/libsupersize/static/tree-ui.js
@@ -454,9 +454,17 @@ const newTreeElement = (() => {
   }
 
   window.supersize.treeReady.then((message) => {
-    document.querySelector('#group-by-container')
-            .toggleAttribute('disabled', !message.isMultiContainer);
-    displayTree(message);
+    if (message.isMultiContainer) {
+      document.getElementById('group-by-container').checked = true;
+      // Fire a change event manually, to reload the tree otherwise it does not
+      // fire on its own. No need to display the tree since it is going to get
+      // reloaded anyways.
+      document.getElementById('options').dispatchEvent(new Event('change'));
+    } else {
+      document.querySelector('#group-by-container')
+        .toggleAttribute('disabled', true);
+      displayTree(message);
+    }
   });
   window.supersize.worker.setOnProgressHandler(displayTree);
 
diff --git a/chromium/tools/binary_size/libsupersize/static/viewer.html b/chromium/tools/binary_size/libsupersize/static/viewer.html
index 08bfc42e41a..6ebb3a39f1f 100644
--- a/chromium/tools/binary_size/libsupersize/static/viewer.html
+++ b/chromium/tools/binary_size/libsupersize/static/viewer.html
@@ -586,6 +586,13 @@
       </div>
     </footer>
   </div>
+  <!-- Modal Sign in Dialog -->
+  <div id="signin-modal" class="modal">
+    <div class="modal-content">
+      <p>You are trying to access a private size file. Please sign in with your @google.com account.</p>
+      <button type="button" class="signin text-button filled-button">Sign Me In</button>
+    </div>
+  </div>
 </body>
 
 </html>
diff --git a/chromium/tools/binary_size/libsupersize/upload_html_viewer.py b/chromium/tools/binary_size/libsupersize/upload_html_viewer.py
index 9de13f19c1f..a5820a6c52f 100755
--- a/chromium/tools/binary_size/libsupersize/upload_html_viewer.py
+++ b/chromium/tools/binary_size/libsupersize/upload_html_viewer.py
@@ -7,6 +7,7 @@
 
 import argparse
 import os
+import requests
 import shutil
 import subprocess
 import sys
@@ -15,6 +16,12 @@ import uuid
 
 
 FIREBASE_PROJECT = 'chrome-supersize'
+PROD_URL = 'https://chrome-supersize.firebaseapp.com/'
+CASPIAN_FILES = [
+    'caspian_web.js',
+    'caspian_web.wasm',
+    'caspian_web.wasm.map',
+]
 
 PROD = 'prod'
 STAGING = 'staging'
@@ -72,12 +79,22 @@ def _FirebaseDeploy(project_dir, deploy_mode=PROD):
                           cwd=project_dir)
 
 
+def _DownloadCaspianFiles(project_static_dir):
+  for f in CASPIAN_FILES:
+    response = requests.get(PROD_URL + f)
+    with open(os.path.join(project_static_dir, f), 'wb') as output:
+      output.write(response.content)
+
+
 def _CopyStaticFiles(project_static_dir):
   """Copy over static files from the static directory."""
   static_files = os.path.join(os.path.dirname(__file__), 'static')
-  if not os.path.exists(os.path.join(static_files, 'caspian_web.js')):
-    raise Exception('static/caspian_web.js is missing. See caspian/README.md')
   shutil.copytree(static_files, project_static_dir)
+  if not all(
+      os.path.exists(os.path.join(static_files, f)) for f in CASPIAN_FILES):
+    print('Some caspian files do not exist in ({}). Downloading *all* caspian '
+          'files from currently deployed instance.'.format(static_files))
+    _DownloadCaspianFiles(project_static_dir)
 
 
 def _FillInAndCopyTemplates(project_static_dir):
diff --git a/chromium/tools/binary_size/milestone_apk_sizes.py b/chromium/tools/binary_size/milestone_apk_sizes.py
index e98b06db759..6d6efc719da 100755
--- a/chromium/tools/binary_size/milestone_apk_sizes.py
+++ b/chromium/tools/binary_size/milestone_apk_sizes.py
@@ -96,7 +96,7 @@ class _Artifact(object):
 
   def AddDfmSizes(self, metrics):
     for k, v in sorted(self._resource_sizes_json['charts'].items()):
-      if k.startswith('DFM_'):
+      if k.startswith('DFM_') and k != 'DFM_base':
         metrics['DFM: ' + k[4:]] = v['Size with hindi']['value']
 
   def PrintLibraryCompression(self):
diff --git a/chromium/tools/binary_size/supersize.pydeps b/chromium/tools/binary_size/supersize.pydeps
index e915efe5263..b3f306eae0f 100644
--- a/chromium/tools/binary_size/supersize.pydeps
+++ b/chromium/tools/binary_size/supersize.pydeps
@@ -35,7 +35,7 @@
 ../grit/grit/node/structure.py
 ../grit/grit/node/variant.py
 ../grit/grit/pseudo.py
-../grit/grit/pseudo_rtl.py
+../grit/grit/pseudolocales.py
 ../grit/grit/tclib.py
 ../grit/grit/util.py
 ../grit/grit/xtb_reader.py
@@ -46,6 +46,7 @@ libsupersize/archive.py
 libsupersize/bcanalyzer.py
 libsupersize/canned_queries.py
 libsupersize/console.py
+libsupersize/data_quality.py
 libsupersize/demangle.py
 libsupersize/describe.py
 libsupersize/diff.py
diff --git a/chromium/tools/binary_size/trybot_commit_size_checker.py b/chromium/tools/binary_size/trybot_commit_size_checker.py
index f2e725ff5ef..5a0784c5fcd 100755
--- a/chromium/tools/binary_size/trybot_commit_size_checker.py
+++ b/chromium/tools/binary_size/trybot_commit_size_checker.py
@@ -22,6 +22,7 @@ import file_format
 import models
 
 _RESOURCE_SIZES_LOG = 'resource_sizes_log'
+_BASE_RESOURCE_SIZES_LOG = 'base_resource_sizes_log'
 _MUTABLE_CONSTANTS_LOG = 'mutable_contstants_log'
 _FOR_TESTING_LOG = 'for_test_log'
 _DEX_SYMBOLS_LOG = 'dex_symbols_log'
@@ -73,41 +74,46 @@ class _SizeDelta(collections.namedtuple(
     return self.name < other.name
 
 
-def _SymbolDiffHelper(symbols):
+def _SymbolDiffHelper(title_fragment, symbols):
   added = symbols.WhereDiffStatusIs(models.DIFF_STATUS_ADDED)
   removed = symbols.WhereDiffStatusIs(models.DIFF_STATUS_REMOVED)
   both = (added + removed).SortedByName()
-  lines = None
+  lines = []
   if len(both) > 0:
-    lines = [
-        'Added: {}'.format(len(added)),
-        'Removed: {}'.format(len(removed)),
-    ]
-    lines.extend(describe.GenerateLines(both, summarize=False))
+    for group in both.GroupedByContainer():
+      counts = group.CountsByDiffStatus()
+      lines += [
+          '===== {} Added & Removed ({}) ====='.format(
+              title_fragment, group.full_name),
+          'Added: {}'.format(counts[models.DIFF_STATUS_ADDED]),
+          'Removed: {}'.format(counts[models.DIFF_STATUS_REMOVED]),
+          ''
+      ]
+      lines.extend(describe.GenerateLines(group, summarize=False))
+      lines += ['']
 
   return lines, len(added) - len(removed)
 
 
 def _CreateMutableConstantsDelta(symbols):
   symbols = symbols.WhereInSection('d').WhereNameMatches(r'\bk[A-Z]|\b[A-Z_]+$')
-  lines, net_added = _SymbolDiffHelper(symbols)
+  lines, net_added = _SymbolDiffHelper('Mutable Constants', symbols)
 
   return lines, _SizeDelta('Mutable Constants', 'symbols', 0, net_added)
 
 
 def _CreateMethodCountDelta(symbols):
+  symbols = symbols.WhereIsOnDemand(False)
   method_symbols = symbols.WhereInSection(models.SECTION_DEX_METHOD)
-  method_lines, net_method_added = _SymbolDiffHelper(method_symbols)
+  method_lines, net_method_added = _SymbolDiffHelper('Methods', method_symbols)
   class_symbols = symbols.WhereInSection(
       models.SECTION_DEX).WhereNameMatches('#').Inverted()
-  class_lines, _ = _SymbolDiffHelper(class_symbols)
+  class_lines, _ = _SymbolDiffHelper('Classes', class_symbols)
   lines = []
   if class_lines:
-    lines.append('===== Classes Added & Removed =====')
     lines.extend(class_lines)
     lines.extend(['', ''])  # empty lines added for clarity
   if method_lines:
-    lines.append('===== Methods Added & Removed =====')
     lines.extend(method_lines)
 
   return lines, _SizeDelta('Dex Methods Count', 'methods',
@@ -123,6 +129,15 @@ def _CreateResourceSizesDelta(before_dir, after_dir):
       sizes_diff.summary_stat.value)
 
 
+def _CreateBaseModuleResourceSizesDelta(before_dir, after_dir):
+  sizes_diff = diagnose_bloat.ResourceSizesDiff(include_sections=['base'])
+  sizes_diff.ProduceDiff(before_dir, after_dir)
+
+  return sizes_diff.DetailedResults(), _SizeDelta(
+      'Base Module Size', 'bytes', _MAX_NORMALIZED_INCREASE,
+      sizes_diff.CombinedSizeChangeForSection('base'))
+
+
 def _CreateSupersizeDiff(main_file_name, before_dir, after_dir):
   before_size_path = os.path.join(before_dir, main_file_name + '.size')
   after_size_path = os.path.join(after_dir, main_file_name + '.size')
@@ -202,21 +217,13 @@ def _CreateTestingSymbolsDeltas(before_mapping_paths, after_mapping_paths):
                            len(added_symbols) - len(removed_symbols))
 
 
-def _GuessMappingFilename(to_result_path, container_filename):
-  guess = to_result_path(container_filename + '.mapping')
-  if os.path.exists(guess):
-    return guess
-  guess = to_result_path(
-      container_filename.replace('.minimal.apks', '.aab').replace(
-          '.apks', '.aab') + '.mapping')
-  if os.path.exists(guess):
-    return guess
-  return None
-
-
 def _GenerateBinarySizePluginDetails(metrics):
   binary_size_listings = []
   for delta, log_name in metrics:
+    # Only show the base module delta if it is significant.
+    if (log_name == _BASE_RESOURCE_SIZES_LOG and delta.IsAllowable()
+        and not delta.IsLargeImprovement()):
+      continue
     listing = {
         'name': delta.name,
         'delta': '{} {}'.format(_FormatNumber(delta.actual), delta.units),
@@ -255,16 +262,10 @@ def _FormatNumber(number):
 def main():
   parser = argparse.ArgumentParser()
   parser.add_argument('--author', required=True, help='CL author')
-
-  name_parser = parser.add_mutually_exclusive_group(required=True)
-
-  # --size-config-json-name will replace --apk-name.
-  name_parser.add_argument('--size-config-json-name',
-                           help='Filename of JSON with configs for '
-                           'binary size measurement.')
-  # Deprecated.
-  name_parser.add_argument('--apk-name', help='Name of the apk (ex. Name.apk).')
-
+  parser.add_argument('--size-config-json-name',
+                      required=True,
+                      help='Filename of JSON with configs for '
+                      'binary size measurement.')
   parser.add_argument(
       '--before-dir',
       required=True,
@@ -289,25 +290,12 @@ def main():
 
   to_before_path = lambda p: os.path.join(args.before_dir, os.path.basename(p))
   to_after_path = lambda p: os.path.join(args.after_dir, os.path.basename(p))
-  if args.size_config_json_name:
-    with open(to_after_path(args.size_config_json_name), 'rt') as fh:
-      config = json.load(fh)
-    supersize_input_name = os.path.basename(config['supersize_input_file'])
-    before_mapping_paths = [to_before_path(f) for f in config['mapping_files']]
-    after_mapping_paths = [to_after_path(f) for f in config['mapping_files']]
-  else:
-    supersize_input_name = args.apk_name
-    # Guess separately for "before" and "after" to be robust against naming
-    # glitches as generate_commit_size_analysis.py's renaming scheme change.
-    before_mapping_path = _GuessMappingFilename(to_before_path, args.apk_name)
-    if not before_mapping_path:
-      raise Exception('Cannot find "before" proguard mapping file.')
-    before_mapping_paths = [before_mapping_path]
-
-    after_mapping_path = _GuessMappingFilename(to_after_path, args.apk_name)
-    if not after_mapping_path:
-      raise Exception('Cannot find "after" proguard mapping file.')
-    after_mapping_paths = [after_mapping_path]
+
+  with open(to_after_path(args.size_config_json_name), 'rt') as fh:
+    config = json.load(fh)
+  supersize_input_name = os.path.basename(config['supersize_input_file'])
+  before_mapping_paths = [to_before_path(f) for f in config['mapping_files']]
+  after_mapping_paths = [to_after_path(f) for f in config['mapping_files']]
 
   logging.info('Creating Supersize diff')
   supersize_diff_lines, delta_size_info = _CreateSupersizeDiff(
@@ -350,6 +338,12 @@ def main():
   size_deltas.add(resource_sizes_delta)
   metrics.add((resource_sizes_delta, _RESOURCE_SIZES_LOG))
 
+  logging.info('Creating base module sizes diff')
+  base_resource_sizes_lines, base_resource_sizes_delta = (
+      _CreateBaseModuleResourceSizesDelta(args.before_dir, args.after_dir))
+  size_deltas.add(base_resource_sizes_delta)
+  metrics.add((base_resource_sizes_delta, _BASE_RESOURCE_SIZES_LOG))
+
   # .sizediff can be consumed by the html viewer.
   logging.info('Creating HTML Report')
   sizediff_path = os.path.join(args.staging_dir, _SIZEDIFF_FILENAME)
@@ -389,6 +383,11 @@ https://chromium.googlesource.com/chromium/src/+/master/docs/speed/binary_size/a
           'log_name': _RESOURCE_SIZES_LOG,
       },
       {
+          'name': 'Base Module Binary Size Details',
+          'lines': base_resource_sizes_lines,
+          'log_name': _BASE_RESOURCE_SIZES_LOG,
+      },
+      {
           'name': 'Mutable Constants Diff',
           'lines': mutable_constants_lines,
           'log_name': _MUTABLE_CONSTANTS_LOG,
diff --git a/chromium/tools/boilerplate.py b/chromium/tools/boilerplate.py
index 48d67217c0b..70bbbac4e23 100755
--- a/chromium/tools/boilerplate.py
+++ b/chromium/tools/boilerplate.py
@@ -22,9 +22,15 @@ LINES = [
     'found in the LICENSE file.'
 ]
 
+NO_COMPILE_LINES = [
+    'This is a "No Compile Test" suite.',
+    'https://dev.chromium.org/developers/testing/no-compile-tests'
+]
+
 EXTENSIONS_TO_COMMENTS = {
     'h': '//',
     'cc': '//',
+    'nc': '//',
     'mm': '//',
     'js': '//',
     'py': '#',
@@ -34,11 +40,21 @@ EXTENSIONS_TO_COMMENTS = {
     'typemap': '#',
 }
 
-def _GetHeader(filename):
+
+def _GetHeaderImpl(filename, lines):
   _, ext = os.path.splitext(filename)
   ext = ext[1:]
   comment = EXTENSIONS_TO_COMMENTS[ext] + ' '
-  return '\n'.join([comment + line for line in LINES])
+  return '\n'.join([comment + line for line in lines])
+
+
+def _GetHeader(filename):
+  return _GetHeaderImpl(filename, LINES)
+
+
+def _GetNoCompileHeader(filename):
+  assert (filename.endswith(".nc"))
+  return '\n' + _GetHeaderImpl(filename, NO_COMPILE_LINES)
 
 
 def _CppHeader(filename):
@@ -112,6 +128,9 @@ def _CreateFile(filename):
     contents += _CppHeader(filename)
   elif filename.endswith('.cc'):
     contents += _CppImplementation(filename)
+  elif filename.endswith('.nc'):
+    contents += _GetNoCompileHeader(filename) + '\n'
+    contents += _CppImplementation(filename)
   elif filename.endswith('.mm'):
     contents += _ObjCppImplementation(filename)
 
diff --git a/chromium/tools/buildstate.bat b/chromium/tools/buildstate.bat
new file mode 100755
index 00000000000..14a6f9acb10
--- /dev/null
+++ b/chromium/tools/buildstate.bat
@@ -0,0 +1 @@
+call python3 %~dp0buildstate.py
diff --git a/chromium/tools/buildstate.py b/chromium/tools/buildstate.py
new file mode 100755
index 00000000000..b7eeff7a8b5
--- /dev/null
+++ b/chromium/tools/buildstate.py
@@ -0,0 +1,102 @@
+#!/usr/bin/env vpython
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""
+This script checks to see what build commands are currently running by printing
+the command lines of any processes that are the children of ninja processes.
+
+The idea is that if the build is serialized (not many build steps running) then
+you can run this to see what it is serialized on.
+
+This uses python3 on Linux and vpython elsewhere (for psutil).
+"""
+
+# [VPYTHON:BEGIN]
+# wheel: <
+#   name: "infra/python/wheels/psutil/${vpython_platform}"
+#   version: "version:5.6.2"
+# >
+# [VPYTHON:END]
+
+from __future__ import print_function
+
+import sys
+
+
+def main():
+  parents = []
+  processes = []
+
+  print('Gathering process data...')
+  # Ninja's name on Linux is ninja-linux64, presumably different elsewhere, so
+  # we look for a matching prefix.
+  ninja_prefix = 'ninja.exe' if sys.platform in ['win32', 'cygwin'] else 'ninja'
+
+  if sys.platform in ['win32', 'cygwin']:
+    # psutil handles short-lived ninja descendants poorly on Windows (it misses
+    # most of them) so use wmic instead.
+    import subprocess
+    cmd = 'wmic process get Caption,ParentProcessId,ProcessId,CommandLine'
+    lines = subprocess.check_output(cmd, universal_newlines=True).splitlines()
+
+    # Find the offsets for the various data columns by looking at the labels in
+    # the first line of output.
+    CAPTION_OFF = 0
+    COMMAND_LINE_OFF = lines[0].find('CommandLine')
+    PARENT_PID_OFF = lines[0].find('ParentProcessId')
+    PID_OFF = lines[0].find(' ProcessId') + 1
+
+    for line in lines[1:]:
+      # Ignore blank lines
+      if not line.strip():
+        continue
+      command = line[:COMMAND_LINE_OFF].strip()
+      command_line = line[COMMAND_LINE_OFF:PARENT_PID_OFF].strip()
+      parent_pid = int(line[PARENT_PID_OFF:PID_OFF].strip())
+      pid = int(line[PID_OFF:].strip())
+      processes.append((command, command_line, parent_pid, pid))
+
+  else:
+    # Portable process-collection code, but works badly on Windows.
+    import psutil
+    for proc in psutil.process_iter(['pid', 'ppid', 'name', 'cmdline']):
+      try:
+        cmdline = proc.cmdline()
+        # Convert from list to a single string.
+        cmdline = ' '.join(cmdline)
+      except psutil.AccessDenied:
+        cmdline = "Access denied"
+      processes.append(
+          (proc.name()[:], cmdline, int(proc.ppid()), int(proc.pid)))
+
+  # Scan the list of processes to find ninja.
+  for process in processes:
+    command, command_line, parent_pid, pid = process
+    if command.startswith(ninja_prefix):
+      parents.append(pid)
+
+  if not parents:
+    print('No interesting parent processes found.')
+    return 1
+
+  print('Tracking the children of these PIDs:')
+  print(', '.join(map(lambda x: str(x), parents)))
+
+  print()
+
+  # Print all the processes that have parent-processes of interest.
+  count = 0
+  for process in processes:
+    command, command_line, parent_pid, pid = process
+    if parent_pid in parents:
+      if not command_line:
+        command_line = command
+      print('%5d: %s' % (pid, command_line[:160]))
+      count += 1
+  print('Found %d children' % count)
+  return 0
+
+
+if __name__ == '__main__':
+  main()
diff --git a/chromium/tools/cfi/ignores.txt b/chromium/tools/cfi/ignores.txt
index 4dc4b3b0f53..e0fe3a658b5 100644
--- a/chromium/tools/cfi/ignores.txt
+++ b/chromium/tools/cfi/ignores.txt
@@ -38,6 +38,9 @@ src:*third_party/grpc/src/src/core/lib/gprpp/inlined_vector.h
 # https://crbug.com/994752
 src:*third_party/spirv-cross/spirv-cross/spirv_cross_containers.hpp
 
+# Vulkan memory allocator
+src:*third_party/vulkan_memory_allocator/src/vk_mem_alloc.h
+
 #############################################################################
 # Base class's constructor accesses a derived class.
 
@@ -169,6 +172,9 @@ src:*ui/gl/gl_bindings_autogen_*
 
 # Calls to vulkan function pointers from shared library.
 src:*third_party/vulkan_memory_allocator/src/vk_mem_alloc.h
+src:*third_party/angle/third_party/vulkan-loader/src/loader*
+src:*third_party/vulkan-deps/vulkan-loader/src/loader*
+src:*third_party/vulkan-deps/vulkan-validation-layers/src/layers/*
 
 src:*components/os_crypt/*
 
diff --git a/chromium/tools/checkperms/checkperms.py b/chromium/tools/checkperms/checkperms.py
index 37958d8c838..854fd2cbc3b 100755
--- a/chromium/tools/checkperms/checkperms.py
+++ b/chromium/tools/checkperms/checkperms.py
@@ -178,7 +178,7 @@ IGNORED_PATHS = (
   'native_client_sdk/src/build_tools/sdk_tools/third_party/fancy_urllib/'
       '__init__.py',
   'out/',
-  'third_party/blink/web_tests/external/wpt/tools/third_party/',
+  'third_party/wpt_tools/wpt/tools/third_party/',
   # TODO(maruel): Fix these.
   'third_party/devscripts/licensecheck.pl.vanilla',
   'third_party/libxml/linux/xml2-config',
diff --git a/chromium/tools/clang/blink_gc_plugin/BadPatternFinder.cpp b/chromium/tools/clang/blink_gc_plugin/BadPatternFinder.cpp
index e081cf3cdc6..36d5d8cef1e 100644
--- a/chromium/tools/clang/blink_gc_plugin/BadPatternFinder.cpp
+++ b/chromium/tools/clang/blink_gc_plugin/BadPatternFinder.cpp
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "BadPatternFinder.h"
+#include <clang/AST/Decl.h>
 #include "DiagnosticsReporter.h"
 
 #include <algorithm>
@@ -18,7 +19,9 @@ namespace {
 TypeMatcher GarbageCollectedType() {
   auto has_gc_base = hasCanonicalType(hasDeclaration(
       cxxRecordDecl(isDerivedFrom(hasAnyName("::blink::GarbageCollected",
-                                             "::blink::GarbageCollectedMixin")))
+                                             "::blink::GarbageCollectedMixin",
+                                             "::cppgc::GarbageCollected",
+                                             "::cppgc::GarbageCollectedMixin")))
           .bind("gctype")));
   return anyOf(has_gc_base,
                hasCanonicalType(arrayType(hasElementType(has_gc_base))));
@@ -60,24 +63,30 @@ class OptionalGarbageCollectedMatcher : public MatchFinder::MatchCallback {
       : diagnostics_(diagnostics) {}
 
   void Register(MatchFinder& match_finder) {
-    // Matches any application of make_unique where the template argument is
-    // known to refer to a garbage-collected type.
-    auto optional_construction =
-        cxxConstructExpr(hasDeclaration(cxxConstructorDecl(ofClass(
-                             classTemplateSpecializationDecl(
-                                 hasName("::base::Optional"),
-                                 hasTemplateArgument(
-                                     0, refersToType(GarbageCollectedType())))
-                                 .bind("optional")))))
-            .bind("bad");
-    match_finder.addDynamicMatcher(optional_construction, this);
+    // Matches fields and new-expressions of type base::Optional where the
+    // template argument is known to refer to a garbage-collected type.
+    auto optional_type = hasType(
+        classTemplateSpecializationDecl(
+            hasName("::base::Optional"),
+            hasTemplateArgument(0, refersToType(GarbageCollectedType())))
+            .bind("optional"));
+    auto optional_field = fieldDecl(optional_type).bind("bad_field");
+    auto optional_new_expression =
+        cxxNewExpr(has(cxxConstructExpr(optional_type))).bind("bad_new");
+    match_finder.addDynamicMatcher(optional_field, this);
+    match_finder.addDynamicMatcher(optional_new_expression, this);
   }
 
   void run(const MatchFinder::MatchResult& result) override {
-    auto* bad_use = result.Nodes.getNodeAs<clang::Expr>("bad");
     auto* optional = result.Nodes.getNodeAs<clang::CXXRecordDecl>("optional");
     auto* gc_type = result.Nodes.getNodeAs<clang::CXXRecordDecl>("gctype");
-    diagnostics_.OptionalUsedWithGC(bad_use, optional, gc_type);
+    if (auto* bad_field =
+            result.Nodes.getNodeAs<clang::FieldDecl>("bad_field")) {
+      diagnostics_.OptionalFieldUsedWithGC(bad_field, optional, gc_type);
+    } else {
+      auto* bad_new = result.Nodes.getNodeAs<clang::Expr>("bad_new");
+      diagnostics_.OptionalNewExprUsedWithGC(bad_new, optional, gc_type);
+    }
   }
 
  private:
diff --git a/chromium/tools/clang/blink_gc_plugin/BlinkGCPluginConsumer.cpp b/chromium/tools/clang/blink_gc_plugin/BlinkGCPluginConsumer.cpp
index 826b94c1140..f829ab22201 100644
--- a/chromium/tools/clang/blink_gc_plugin/BlinkGCPluginConsumer.cpp
+++ b/chromium/tools/clang/blink_gc_plugin/BlinkGCPluginConsumer.cpp
@@ -86,10 +86,14 @@ BlinkGCPluginConsumer::BlinkGCPluginConsumer(
       json_(0) {
   // Only check structures in the blink and WebKit namespaces.
   options_.checked_namespaces.insert("blink");
+  options_.checked_namespaces.insert("cppgc");
 
   // Ignore GC implementation files.
   options_.ignored_directories.push_back(
       "third_party/blink/renderer/platform/heap/");
+  options_.ignored_directories.push_back("v8/src/heap/cppgc/");
+  options_.ignored_directories.push_back("v8/src/heap/cppgc-js/");
+
   options_.allowed_directories.push_back(
       "third_party/blink/renderer/platform/heap/test/");
 }
@@ -106,18 +110,14 @@ void BlinkGCPluginConsumer::HandleTranslationUnit(ASTContext& context) {
 
   if (options_.dump_graph) {
     std::error_code err;
-    // TODO: Make createDefaultOutputFile or a shorter createOutputFile work.
+    SmallString<128> OutputFile(instance_.getFrontendOpts().OutputFile);
+    llvm::sys::path::replace_extension(OutputFile, "graph.json");
     json_ = JsonWriter::from(instance_.createOutputFile(
-        "",                                      // OutputPath
-        err,                                     // Errors
+        OutputFile,                              // OutputPath
         true,                                    // Binary
         true,                                    // RemoveFileOnSignal
-        instance_.getFrontendOpts().OutputFile,  // BaseInput
-        "graph.json",                            // Extension
         false,                                   // UseTemporary
-        false,                                   // CreateMissingDirectories
-        0,                                       // ResultPathName
-        0));                                     // TempPathName
+        false));                                 // CreateMissingDirectories
     if (!err && json_) {
       json_->OpenList();
     } else {
@@ -371,7 +371,9 @@ void BlinkGCPluginConsumer::CheckPolymorphicClass(
 CXXRecordDecl* BlinkGCPluginConsumer::GetLeftMostBase(
     CXXRecordDecl* left_most) {
   CXXRecordDecl::base_class_iterator it = left_most->bases_begin();
+  CXXRecordDecl* previous_left_most = left_most;
   while (it != left_most->bases_end()) {
+    previous_left_most = left_most;
     if (it->getType()->isDependentType())
       left_most = RecordInfo::GetDependentTemplatedDecl(*it->getType());
     else
@@ -380,6 +382,12 @@ CXXRecordDecl* BlinkGCPluginConsumer::GetLeftMostBase(
       return 0;
     it = left_most->bases_begin();
   }
+  if (Config::IsCppgcGCBase(left_most->getName())) {
+    // In the cppgc library, the GC base classes share a common parent. The
+    // common parent should be ignored for the purposes of getting the left
+    // most base.
+    return previous_left_most;
+  }
   return left_most;
 }
 
diff --git a/chromium/tools/clang/blink_gc_plugin/Config.h b/chromium/tools/clang/blink_gc_plugin/Config.h
index 3f768b4d5d0..7e6e4fe54aa 100644
--- a/chromium/tools/clang/blink_gc_plugin/Config.h
+++ b/chromium/tools/clang/blink_gc_plugin/Config.h
@@ -118,6 +118,10 @@ class Config {
            name == "ThreadSafeRefCounted";
   }
 
+  static bool IsCppgcGCBase(llvm::StringRef name) {
+    return name == "GarbageCollectedBase";
+  }
+
   static bool IsGCSimpleBase(llvm::StringRef name) {
     return name == "GarbageCollected";
   }
diff --git a/chromium/tools/clang/blink_gc_plugin/DiagnosticsReporter.cpp b/chromium/tools/clang/blink_gc_plugin/DiagnosticsReporter.cpp
index 4a6d9ddeb8d..de7853c41ef 100644
--- a/chromium/tools/clang/blink_gc_plugin/DiagnosticsReporter.cpp
+++ b/chromium/tools/clang/blink_gc_plugin/DiagnosticsReporter.cpp
@@ -141,9 +141,15 @@ const char kUniquePtrUsedWithGC[] =
     "[blink-gc] Disallowed use of %0 found; %1 is a garbage-collected type. "
     "std::unique_ptr cannot hold garbage-collected objects.";
 
-const char kOptionalUsedWithGC[] =
-    "[blink-gc] Disallowed construction of %0 found; %1 is a garbage-collected "
-    "type. optional cannot hold garbage-collected objects.";
+const char kOptionalFieldUsedWithGC[] =
+    "[blink-gc] Disallowed optional field of %0 found; %1 is a "
+    "garbage-collected "
+    "type. Optional fields cannot hold garbage-collected objects.";
+
+const char kOptionalNewExprUsedWithGC[] =
+    "[blink-gc] Disallowed new-expression of %0 found; %1 is a "
+    "garbage-collected "
+    "type. GCed types cannot be created with new.";
 
 const char kVariantUsedWithGC[] =
     "[blink-gc] Disallowed construction of %0 found; %1 is a garbage-collected "
@@ -248,8 +254,10 @@ DiagnosticsReporter::DiagnosticsReporter(
 
   diag_unique_ptr_used_with_gc_ =
       diagnostic_.getCustomDiagID(getErrorLevel(), kUniquePtrUsedWithGC);
-  diag_optional_used_with_gc_ =
-      diagnostic_.getCustomDiagID(getErrorLevel(), kOptionalUsedWithGC);
+  diag_optional_field_used_with_gc_ =
+      diagnostic_.getCustomDiagID(getErrorLevel(), kOptionalFieldUsedWithGC);
+  diag_optional_new_expr_used_with_gc_ =
+      diagnostic_.getCustomDiagID(getErrorLevel(), kOptionalNewExprUsedWithGC);
   diag_variant_used_with_gc_ =
       diagnostic_.getCustomDiagID(getErrorLevel(), kVariantUsedWithGC);
 }
@@ -540,11 +548,19 @@ void DiagnosticsReporter::UniquePtrUsedWithGC(
       << bad_function << gc_type << expr->getSourceRange();
 }
 
-void DiagnosticsReporter::OptionalUsedWithGC(
+void DiagnosticsReporter::OptionalFieldUsedWithGC(
+    const clang::FieldDecl* field,
+    const clang::CXXRecordDecl* optional,
+    const clang::CXXRecordDecl* gc_type) {
+  ReportDiagnostic(field->getBeginLoc(), diag_optional_field_used_with_gc_)
+      << optional << gc_type << field->getSourceRange();
+}
+
+void DiagnosticsReporter::OptionalNewExprUsedWithGC(
     const clang::Expr* expr,
     const clang::CXXRecordDecl* optional,
     const clang::CXXRecordDecl* gc_type) {
-  ReportDiagnostic(expr->getBeginLoc(), diag_optional_used_with_gc_)
+  ReportDiagnostic(expr->getBeginLoc(), diag_optional_new_expr_used_with_gc_)
       << optional << gc_type << expr->getSourceRange();
 }
 
diff --git a/chromium/tools/clang/blink_gc_plugin/DiagnosticsReporter.h b/chromium/tools/clang/blink_gc_plugin/DiagnosticsReporter.h
index 24cf7a1b2ab..73ddcd0e4c9 100644
--- a/chromium/tools/clang/blink_gc_plugin/DiagnosticsReporter.h
+++ b/chromium/tools/clang/blink_gc_plugin/DiagnosticsReporter.h
@@ -79,9 +79,12 @@ class DiagnosticsReporter {
   void UniquePtrUsedWithGC(const clang::Expr* expr,
                            const clang::FunctionDecl* bad_function,
                            const clang::CXXRecordDecl* gc_type);
-  void OptionalUsedWithGC(const clang::Expr* expr,
-                          const clang::CXXRecordDecl* optional,
-                          const clang::CXXRecordDecl* gc_type);
+  void OptionalFieldUsedWithGC(const clang::FieldDecl* decl,
+                               const clang::CXXRecordDecl* optional,
+                               const clang::CXXRecordDecl* gc_type);
+  void OptionalNewExprUsedWithGC(const clang::Expr* expr,
+                                 const clang::CXXRecordDecl* optional,
+                                 const clang::CXXRecordDecl* gc_type);
   void VariantUsedWithGC(const clang::Expr* expr,
                          const clang::CXXRecordDecl* variant,
                          const clang::CXXRecordDecl* gc_type);
@@ -142,7 +145,8 @@ class DiagnosticsReporter {
   unsigned diag_member_in_stack_allocated_class_;
 
   unsigned diag_unique_ptr_used_with_gc_;
-  unsigned diag_optional_used_with_gc_;
+  unsigned diag_optional_field_used_with_gc_;
+  unsigned diag_optional_new_expr_used_with_gc_;
   unsigned diag_variant_used_with_gc_;
 };
 
diff --git a/chromium/tools/clang/blink_gc_plugin/RecordInfo.cpp b/chromium/tools/clang/blink_gc_plugin/RecordInfo.cpp
index d00cd0ec2be..2758a5a9e71 100644
--- a/chromium/tools/clang/blink_gc_plugin/RecordInfo.cpp
+++ b/chromium/tools/clang/blink_gc_plugin/RecordInfo.cpp
@@ -159,7 +159,18 @@ CXXRecordDecl* RecordInfo::GetDependentTemplatedDecl(const Type& type) {
   if (!tmpl_decl)
     return 0;
 
-  return dyn_cast_or_null<CXXRecordDecl>(tmpl_decl->getTemplatedDecl());
+  if (CXXRecordDecl* record_decl =
+          dyn_cast_or_null<CXXRecordDecl>(tmpl_decl->getTemplatedDecl()))
+    return record_decl;
+
+  // Type is an alias.
+  TypeAliasDecl* alias_decl =
+      dyn_cast<TypeAliasDecl>(tmpl_decl->getTemplatedDecl());
+  assert(alias_decl);
+  const Type* alias_type = alias_decl->getUnderlyingType().getTypePtr();
+  if (CXXRecordDecl* record_decl = alias_type->getAsCXXRecordDecl())
+    return record_decl;
+  return GetDependentTemplatedDecl(*alias_type);
 }
 
 void RecordInfo::walkBases() {
@@ -693,7 +704,12 @@ Edge* RecordInfo::CreateEdge(const Type* type) {
     // TODO: Consider using a more canonical identification than names.
     NamespaceDecl* ns =
         dyn_cast<NamespaceDecl>(info->record()->getDeclContext());
-    if (!ns || ns->getName() != "blink")
+    // Find outer-most namespace.
+    while (NamespaceDecl* outer_ns =
+               dyn_cast<NamespaceDecl>(ns->getDeclContext())) {
+      ns = outer_ns;
+    }
+    if (!ns || (ns->getName() != "blink") && (ns->getName() != "cppgc"))
       return 0;
     if (!info->GetTemplateArgs(1, &args))
       return 0;
diff --git a/chromium/tools/clang/blink_gc_plugin/RecordInfo.h b/chromium/tools/clang/blink_gc_plugin/RecordInfo.h
index de44d8652e6..20ef058a6e2 100644
--- a/chromium/tools/clang/blink_gc_plugin/RecordInfo.h
+++ b/chromium/tools/clang/blink_gc_plugin/RecordInfo.h
@@ -40,7 +40,7 @@ class BasePoint : public GraphPoint {
             RecordInfo* info,
             const TracingStatus& status)
       : spec_(spec), info_(info), status_(status) {}
-  const TracingStatus NeedsTracing() { return status_; }
+  const TracingStatus NeedsTracing() override { return status_; }
   const clang::CXXBaseSpecifier& spec() { return spec_; }
   RecordInfo* info() { return info_; }
 
@@ -54,7 +54,7 @@ class FieldPoint : public GraphPoint {
  public:
   FieldPoint(clang::FieldDecl* field, Edge* edge)
       : field_(field), edge_(edge) {}
-  const TracingStatus NeedsTracing() {
+  const TracingStatus NeedsTracing() override {
     return edge_->NeedsTracing(Edge::kRecursive);
   }
   clang::FieldDecl* field() { return field_; }
diff --git a/chromium/tools/clang/blink_gc_plugin/process-graph.py b/chromium/tools/clang/blink_gc_plugin/process-graph.py
index 06031838528..eac8f363c64 100755
--- a/chromium/tools/clang/blink_gc_plugin/process-graph.py
+++ b/chromium/tools/clang/blink_gc_plugin/process-graph.py
@@ -364,6 +364,8 @@ def read_ignored_cycles():
 gc_bases = (
   'blink::GarbageCollected',
   'blink::GarbageCollectedMixin',
+  'cppgc::GarbageCollected',
+  'cppgc::GarbageCollectedMixin',
 )
 ref_bases = (
   'WTF::RefCounted',
@@ -418,7 +420,8 @@ def print_stats():
          % (
              stats['ref'] == 0 and stats['ref-mixins'] == 0 and "*" or " ",
              total == 0 and 100 or stats['mem'] * 100 / total,
-             node.name.replace('blink::', ''),
+             node.name.replace('blink::', '').replace(
+                 'cppgc::subtle::', '').replace('cppgc::', ''),
              stats['classes'],
              stats['mem'],
              stats['ref'],
diff --git a/chromium/tools/clang/plugins/FindBadConstructsAction.h b/chromium/tools/clang/plugins/FindBadConstructsAction.h
index 383db84206d..04cfc811928 100644
--- a/chromium/tools/clang/plugins/FindBadConstructsAction.h
+++ b/chromium/tools/clang/plugins/FindBadConstructsAction.h
@@ -16,12 +16,11 @@ class FindBadConstructsAction : public clang::PluginASTAction {
   FindBadConstructsAction();
 
  protected:
-  // Overridden from PluginASTAction:
-  virtual std::unique_ptr<clang::ASTConsumer> CreateASTConsumer(
+  std::unique_ptr<clang::ASTConsumer> CreateASTConsumer(
       clang::CompilerInstance& instance,
-      llvm::StringRef ref);
-  virtual bool ParseArgs(const clang::CompilerInstance& instance,
-                         const std::vector<std::string>& args);
+      llvm::StringRef ref) override;
+  bool ParseArgs(const clang::CompilerInstance& instance,
+                 const std::vector<std::string>& args) override;
 
  private:
   Options options_;
diff --git a/chromium/tools/clang/pylib/clang/compile_db.py b/chromium/tools/clang/pylib/clang/compile_db.py
index 2502810cfbb..2966ea92f07 100755
--- a/chromium/tools/clang/pylib/clang/compile_db.py
+++ b/chromium/tools/clang/pylib/clang/compile_db.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
@@ -10,6 +10,7 @@ import os
 import re
 import sys
 import subprocess
+import shutil
 
 
 _RSP_RE = re.compile(r' (@(.+?\.rsp)) ')
@@ -140,8 +141,11 @@ def GenerateWithNinja(path, targets=[]):
   # TODO(dcheng): Ensure that clang is enabled somehow.
 
   # First, generate the compile database.
+  ninja_path = GetNinjaPath()
+  if not os.path.exists(ninja_path):
+    ninja_path = shutil.which("ninja")
   json_compile_db = subprocess.check_output(
-      [GetNinjaPath(), '-C', path] + targets +
+      [ninja_path, '-C', path] + targets +
       ['-t', 'compdb', 'cc', 'cxx', 'objc', 'objcxx'])
   return json.loads(json_compile_db)
 
diff --git a/chromium/tools/clang/rewrite_raw_ptr_fields/OWNERS b/chromium/tools/clang/rewrite_raw_ptr_fields/OWNERS
new file mode 100644
index 00000000000..b9574f85df5
--- /dev/null
+++ b/chromium/tools/clang/rewrite_raw_ptr_fields/OWNERS
@@ -0,0 +1,9 @@
+dcheng@chromium.org
+lukasza@chromium.org
+
+per-file manual-*-to-ignore.txt=bartekn@chromium.org
+per-file manual-*-to-ignore.txt=glazunov@google.com
+per-file manual-*-to-ignore.txt=keishi@chromium.org
+per-file rewrite*.sh=bartekn@chromium.org
+per-file rewrite*.sh=keishi@chromium.org
+per-file rewrite*.sh=yukishiino@chromium.org
diff --git a/chromium/tools/clang/rewrite_raw_ptr_fields/RewriteRawPtrFields.cpp b/chromium/tools/clang/rewrite_raw_ptr_fields/RewriteRawPtrFields.cpp
index 41766cc99a8..b8a00c7c6c2 100644
--- a/chromium/tools/clang/rewrite_raw_ptr_fields/RewriteRawPtrFields.cpp
+++ b/chromium/tools/clang/rewrite_raw_ptr_fields/RewriteRawPtrFields.cpp
@@ -307,21 +307,35 @@ class FilterFile {
     return it != file_lines_.end();
   }
 
-  // Returns true if any of the filter file lines is a substring of
-  // |string_to_match|.
+  // Returns true if |string_to_match| matches based on the filter file lines.
+  // Filter file lines can contain both inclusions and exclusions in the filter.
+  // Only returns true if |string_to_match| both matches an inclusion filter and
+  // is *not* matched by an exclusion filter.
   bool ContainsSubstringOf(llvm::StringRef string_to_match) const {
-    if (!substring_regex_.hasValue()) {
-      std::vector<std::string> regex_escaped_file_lines;
-      regex_escaped_file_lines.reserve(file_lines_.size());
-      for (const llvm::StringRef& file_line : file_lines_.keys())
-        regex_escaped_file_lines.push_back(llvm::Regex::escape(file_line));
-      std::string substring_regex_pattern =
-          llvm::join(regex_escaped_file_lines.begin(),
-                     regex_escaped_file_lines.end(), "|");
-      substring_regex_.emplace(substring_regex_pattern);
+    if (!inclusion_substring_regex_.hasValue()) {
+      std::vector<std::string> regex_escaped_inclusion_file_lines;
+      std::vector<std::string> regex_escaped_exclusion_file_lines;
+      regex_escaped_inclusion_file_lines.reserve(file_lines_.size());
+      for (const llvm::StringRef& file_line : file_lines_.keys()) {
+        if (file_line.startswith("!")) {
+          regex_escaped_exclusion_file_lines.push_back(
+              llvm::Regex::escape(file_line.substr(1)));
+        } else {
+          regex_escaped_inclusion_file_lines.push_back(
+              llvm::Regex::escape(file_line));
+        }
+      }
+      std::string inclusion_substring_regex_pattern =
+          llvm::join(regex_escaped_inclusion_file_lines.begin(),
+                     regex_escaped_inclusion_file_lines.end(), "|");
+      inclusion_substring_regex_.emplace(inclusion_substring_regex_pattern);
+      std::string exclusion_substring_regex_pattern =
+          llvm::join(regex_escaped_exclusion_file_lines.begin(),
+                     regex_escaped_exclusion_file_lines.end(), "|");
+      exclusion_substring_regex_.emplace(exclusion_substring_regex_pattern);
     }
-
-    return substring_regex_->match(string_to_match);
+    return inclusion_substring_regex_->match(string_to_match) &&
+           !exclusion_substring_regex_->match(string_to_match);
   }
 
  private:
@@ -368,9 +382,16 @@ class FilterFile {
   // Stores all file lines (after stripping comments and blank lines).
   llvm::StringSet<> file_lines_;
 
+  // |file_lines_| is partitioned based on whether the line starts with a !
+  // (exclusion line) or not (inclusion line). Inclusion lines specify things to
+  // be matched by the filter. The exclusion lines specify what to force exclude
+  // from the filter. Lazily-constructed regex that matches strings that contain
+  // any of the inclusion lines in |file_lines_|.
+  mutable llvm::Optional<llvm::Regex> inclusion_substring_regex_;
+
   // Lazily-constructed regex that matches strings that contain any of the
-  // |file_lines_|.
-  mutable llvm::Optional<llvm::Regex> substring_regex_;
+  // exclusion lines in |file_lines_|.
+  mutable llvm::Optional<llvm::Regex> exclusion_substring_regex_;
 };
 
 AST_MATCHER_P(clang::FieldDecl,
@@ -445,6 +466,10 @@ AST_MATCHER(clang::FunctionDecl, isImplicitFunctionTemplateSpecialization) {
   }
 }
 
+AST_MATCHER(clang::Type, anyCharType) {
+  return Node.isAnyCharacterType();
+}
+
 AST_POLYMORPHIC_MATCHER(isInMacroLocation,
                         AST_POLYMORPHIC_SUPPORTED_TYPES(clang::Decl,
                                                         clang::Stmt,
@@ -937,9 +962,11 @@ int main(int argc, const char* argv[]) {
   llvm::cl::opt<std::string> exclude_paths_param(
       kExcludePathsParamName, llvm::cl::value_desc("filepath"),
       llvm::cl::desc("file listing paths to be blocked (not rewritten)"));
-  clang::tooling::CommonOptionsParser options(argc, argv, category);
-  clang::tooling::ClangTool tool(options.getCompilations(),
-                                 options.getSourcePathList());
+  llvm::Expected<clang::tooling::CommonOptionsParser> options =
+      clang::tooling::CommonOptionsParser::create(argc, argv, category);
+  assert(static_cast<bool>(options));  // Should not return an error.
+  clang::tooling::ClangTool tool(options->getCompilations(),
+                                 options->getSourcePathList());
 
   MatchFinder match_finder;
   OutputHelper output_helper;
@@ -1046,6 +1073,26 @@ int main(int argc, const char* argv[]) {
   match_finder.addMatcher(affected_ternary_operator_arg_matcher,
                           &affected_expr_rewriter);
 
+  // Affected string binary operator =========
+  // Given
+  //   struct S { const char* y; }
+  //   void foo(const S& s) {
+  //     std::string other;
+  //     bool v1 = s.y == other;
+  //     std::string v2 = s.y + other;
+  //   }
+  // binds the |s.y| expr if it matches the |affected_expr_matcher| above.
+  //
+  // See also testcases in tests/affected-expr-original.cc
+  auto std_string_expr_matcher =
+      expr(hasType(cxxRecordDecl(hasName("::std::basic_string"))));
+  auto affected_string_binary_operator_arg_matcher = cxxOperatorCallExpr(
+      hasAnyOverloadedOperatorName("+", "==", "!=", "<", "<=", ">", ">="),
+      hasAnyArgument(std_string_expr_matcher),
+      forEachArgumentWithParam(affected_expr_matcher, parmVarDecl()));
+  match_finder.addMatcher(affected_string_binary_operator_arg_matcher,
+                          &affected_expr_rewriter);
+
   // Calls to templated functions =========
   // Given
   //   struct S { int* y; };
@@ -1066,7 +1113,7 @@ int main(int argc, const char* argv[]) {
   // TODO(lukasza): It is unclear why |traverse| below is needed.  Maybe it can
   // be removed if https://bugs.llvm.org/show_bug.cgi?id=46287 is fixed.
   match_finder.addMatcher(
-      traverse(clang::ast_type_traits::TK_AsIs,
+      traverse(clang::TraversalKind::TK_AsIs,
                cxxConstructExpr(templated_function_arg_matcher)),
       &affected_expr_rewriter);
 
@@ -1081,10 +1128,12 @@ int main(int argc, const char* argv[]) {
   // binds the |s.y| expr if it matches the |affected_expr_matcher| above.
   //
   // See also testcases in tests/affected-expr-original.cc
-  auto implicit_ctor_expr_matcher = implicitCastExpr(has(cxxConstructExpr(allOf(
+  auto implicit_ctor_expr_matcher = cxxConstructExpr(allOf(
+      anyOf(hasParent(materializeTemporaryExpr()),
+            hasParent(implicitCastExpr())),
       hasDeclaration(
           cxxConstructorDecl(allOf(parameterCountIs(1), unless(isExplicit())))),
-      forEachArgumentWithParam(affected_expr_matcher, parmVarDecl())))));
+      forEachArgumentWithParam(affected_expr_matcher, parmVarDecl())));
   match_finder.addMatcher(implicit_ctor_expr_matcher, &affected_expr_rewriter);
 
   // |auto| type declarations =========
@@ -1182,6 +1231,16 @@ int main(int argc, const char* argv[]) {
   FilteredExprWriter macro_field_decl_writer(&output_helper, "macro");
   match_finder.addMatcher(macro_field_decl_matcher, &macro_field_decl_writer);
 
+  // See the doc comment for the anyCharType matcher
+  // and the testcases in tests/gen-char-test.cc.
+  auto char_ptr_field_decl_matcher = fieldDecl(allOf(
+      field_decl_matcher,
+      hasType(pointerType(pointee(qualType(allOf(
+          isConstQualified(), hasUnqualifiedDesugaredType(anyCharType()))))))));
+  FilteredExprWriter char_ptr_field_decl_writer(&output_helper, "const-char");
+  match_finder.addMatcher(char_ptr_field_decl_matcher,
+                          &char_ptr_field_decl_writer);
+
   // See the testcases in tests/gen-global-destructor-test.cc.
   auto global_destructor_matcher =
       varDecl(allOf(hasGlobalStorage(),
@@ -1230,6 +1289,17 @@ int main(int argc, const char* argv[]) {
   FilteredExprWriter union_field_decl_writer(&output_helper, "union");
   match_finder.addMatcher(union_field_decl_matcher, &union_field_decl_writer);
 
+  // Matches rewritable fields of struct `SomeStruct` if that struct happens to
+  // be a destination type of a `reinterpret_cast<SomeStruct*>` cast.
+  auto reinterpret_cast_struct_matcher =
+      cxxReinterpretCastExpr(hasDestinationType(
+          pointerType(pointee(hasUnqualifiedDesugaredType(recordType(
+              hasDeclaration(recordDecl(forEach(field_decl_matcher)))))))));
+  FilteredExprWriter reinterpret_cast_struct_writer(&output_helper,
+                                                    "reinterpret-cast-struct");
+  match_finder.addMatcher(reinterpret_cast_struct_matcher,
+                          &reinterpret_cast_struct_writer);
+
   // Prepare and run the tool.
   std::unique_ptr<clang::tooling::FrontendActionFactory> factory =
       clang::tooling::newFrontendActionFactory(&match_finder, &output_helper);
diff --git a/chromium/tools/clang/rewrite_raw_ptr_fields/manual-fields-to-ignore.txt b/chromium/tools/clang/rewrite_raw_ptr_fields/manual-fields-to-ignore.txt
index 7b3dbd2252c..6ac34e65192 100644
--- a/chromium/tools/clang/rewrite_raw_ptr_fields/manual-fields-to-ignore.txt
+++ b/chromium/tools/clang/rewrite_raw_ptr_fields/manual-fields-to-ignore.txt
@@ -77,10 +77,6 @@ remoting::ContinueWindowGtk::continue_window_
 ui::AXPlatformNodeAuraLinux::atk_hyperlink_
 PrintDialogGtk::dialog_
 
-# Populated manually - using nmap or base::AllocPages directly
-blink::GCInfoTable::table_
-disk_cache::MappedFile::buffer_
-
 # Populated manually, because of in-out-arg usage.
 blink::PaintController::IdAsHashKey::client
 ui::AXPlatformNodeAuraLinux::atk_object_
@@ -112,6 +108,32 @@ cc::GpuImageDecodeCache::dark_mode_filter_
 blink::scheduler::MainThreadSchedulerImpl::current_agent_group_scheduler_
 performance_manager::v8_memory::(anonymous namespace)::V8ContextTrackerTest::tracker
 content::(anonymous namespace)::BackForwardCacheMessageFilter::interface_name_
+base::trace_event::MemoryDumpProviderInfo::name
+
+# Populated manually - requires rewriting member pointer type
+courgette::LabelManagerTest_SimpleIndexAssigner_Test::TestBody()::TestCase::input
+courgette::LabelManagerTest_SimpleIndexAssigner_Test::TestBody()::TestCase::expect_forward
+courgette::LabelManagerTest_SimpleIndexAssigner_Test::TestBody()::TestCase::expect_backward
+courgette::LabelManagerTest_SimpleIndexAssigner_Test::TestBody()::TestCase::expect_in
+
+# Populated manually - pointer to address in another process could be confused
+# as a pointer to PA memory
+sandbox::TargetProcess::base_address_ # https://crbug.com/1173374
+
+# Populated manually - uninitialized memory reinterpret_cast to CheckedPtr
+# causing AddRef/Deref mismatch.
+sandbox::(anonymous namespace)::_HEAP_32::Heap
+sandbox::(anonymous namespace)::_HEAP_64::Heap
+sql::SandboxedVfsFileSqliteBridge::sandboxed_vfs_file
+sandbox::SharedMemIPCServer::client_control_
+sandbox::SharedMemIPCServer::thread_provider_
+sandbox::SharedMemIPCServer::call_dispatcher_
+
+# Populated manually - pointer to stale non-PA allocation could be confused as a
+# pointer to PA memory when that address space is reused https://crbug.com/1173851
+base::PersistentMemoryAllocator::mem_base_ # https://crbug.com/1169582
+base::SharedMemoryMapping::memory_ # https://crbug.com/1169581
+mojo::core::PlatformSharedMemoryMapping::base_ # https://crbug.com/1173380
 
 # Populated manually - other compile-time reasons
 iovec::iov_base  # requires adding .get() in another repository, used e.g. in
@@ -119,37 +141,38 @@ iovec::iov_base  # requires adding .get() in another repository, used e.g. in
 net::SockaddrStorage::addr  # .get() not added in reinterpret_cast, reason unknown
 views::internal::ClassPropertyValueSetter::property_  # passed to templated param T*
 (anonymous namespace)::ScopedFunctionHelper::function_  # function pointer template
-
-#######
-# CheckedPtr2/MTECheckedPtr-specific sections
-#######
-
-# Populated manually - these pointers are assigned invalid address (with top
-# bits sets), which CheckedPtr is unable to handle, leading to run-time crashes.
-(anonymous namespace)::TlsVectorEntry::data
-blink::(anonymous namespace)::ThreadMarker::creating_thread_
-blink::ControlKey::name_
-performance_manager::frame_priority::BoostingVoteAggregator::Edge::src_
-performance_manager::frame_priority::BoostingVoteAggregator::Edge::dst_
-
-# Populated manually - these pointers crash due to a mismatching tag.
-# Under investigation.
-blink::NGPhysicalContainerFragment::buffer_
-blink::DisplayItem::client_
-cc::FrameSequenceMetrics::throughput_ukm_reporter_
-cc::(anonymous namespace)::RasterTaskImpl::tile_tracing_id_
-content::RenderViewImpl::webview_
-mojo::core::WatcherDispatcher::last_watch_to_block_arming_
-net::IOBuffer::data_
-safe_browsing::RemoteSafeBrowsingDatabaseManager::ClientRequest::client_
-
-# Populated manually - this pointer crashes, because assigned address appears
-# unallocated.
-x11::ReadBuffer::fds
-
-#######
-# End of CheckedPtr2/MTECheckedPtr-specific sections
-#######
+KeyedServiceBaseFactory::service_name_ # used in decltype
+OutOfMemoryTest::value_ # used to pass non const pointer to pointer
+
+# ELEMENT() treats the CheckedPtr as a void*, and so when a pointer is written
+# AddRef() won't be called, causing AddRef/Deref mismatch.
+device::AttestedCredentialData::ConsumeFromCtapResponse(base::span<const uint8_t>)::COSEKey::alg
+device::AttestedCredentialData::ConsumeFromCtapResponse(base::span<const uint8_t>)::COSEKey::kty
+device::cablev2::authenticator::(anonymous namespace)::MakeCredRequest::client_data_hash
+device::cablev2::authenticator::(anonymous namespace)::MakeCredRequest::rp_id
+device::cablev2::authenticator::(anonymous namespace)::MakeCredRequest::user_id
+device::cablev2::authenticator::(anonymous namespace)::MakeCredRequest::cred_params
+device::cablev2::authenticator::(anonymous namespace)::MakeCredRequest::excluded_credentials
+device::cablev2::authenticator::(anonymous namespace)::MakeCredRequest::origin
+device::cablev2::authenticator::(anonymous namespace)::MakeCredRequest::challenge
+device::cablev2::authenticator::(anonymous namespace)::AttestationObject::fmt
+device::cablev2::authenticator::(anonymous namespace)::AttestationObject::auth_data
+device::cablev2::authenticator::(anonymous namespace)::AttestationObject::statement
+device::cablev2::authenticator::(anonymous namespace)::GetAssertionRequest::rp_id
+device::cablev2::authenticator::(anonymous namespace)::GetAssertionRequest::client_data_hash
+device::cablev2::authenticator::(anonymous namespace)::GetAssertionRequest::allowed_credentials
+device::cablev2::authenticator::(anonymous namespace)::GetAssertionRequest::origin
+device::cablev2::authenticator::(anonymous namespace)::GetAssertionRequest::challenge
+device::Ed25519PublicKey::ExtractFromCOSEKey(int32_t, base::span<const uint8_t>, const cbor::Value::MapValue &)::COSEKey::kty
+device::Ed25519PublicKey::ExtractFromCOSEKey(int32_t, base::span<const uint8_t>, const cbor::Value::MapValue &)::COSEKey::crv
+device::Ed25519PublicKey::ExtractFromCOSEKey(int32_t, base::span<const uint8_t>, const cbor::Value::MapValue &)::COSEKey::key
+device::P256PublicKey::ExtractFromCOSEKey(int32_t, base::span<const uint8_t>, const cbor::Value::MapValue &)::COSEKey::kty
+device::P256PublicKey::ExtractFromCOSEKey(int32_t, base::span<const uint8_t>, const cbor::Value::MapValue &)::COSEKey::crv
+device::P256PublicKey::ExtractFromCOSEKey(int32_t, base::span<const uint8_t>, const cbor::Value::MapValue &)::COSEKey::x
+device::P256PublicKey::ExtractFromCOSEKey(int32_t, base::span<const uint8_t>, const cbor::Value::MapValue &)::COSEKey::y
+device::RSAPublicKey::ExtractFromCOSEKey(int32_t, base::span<const uint8_t>, const cbor::Value::MapValue &)::COSEKey::kty
+device::RSAPublicKey::ExtractFromCOSEKey(int32_t, base::span<const uint8_t>, const cbor::Value::MapValue &)::COSEKey::n
+device::RSAPublicKey::ExtractFromCOSEKey(int32_t, base::span<const uint8_t>, const cbor::Value::MapValue &)::COSEKey::e
 
 #######
 # BackupRefPtr-specific sections
@@ -180,3 +203,34 @@ gpu::gles2::PassthroughProgramCache::ProgramCacheValue::program_cache_
 #######
 # End of BackupRefPtr-specific sections
 #######
+
+#######
+# Performance-related exclusions
+#######
+
+# Populated manually - on-stack pointer + a large number of non-PA pointees
+base::AutoReset::scoped_variable_
+
+# Populated manually - on-stack pointee
+base::StackAllocator::source_
+
+# Populated manually - on-stack pointer + a large number of non-PA pointees
+mojo::core::ports::PortLocker::port_refs_
+
+# Populated manually - static pointee
+mojo::core::RequestContext::tls_context_
+
+# Populated manually - on-stack pointee
+mojo::internal::ValidationContext::ScopedDepthTracker::ctx_
+
+# Populated manually - using mmap, MapViewOfFile or base::AllocPages directly
+blink::GCInfoTable::table_
+cc::(anonymous namespace)::BitmapRasterBufferImpl::pixels_
+# TODO(bartekn): This one has a malloc() path, consider rewriting after all.
+disk_cache::MappedFile::buffer_
+network::MojoToNetPendingBuffer::buffer_
+network::NetToMojoPendingBuffer::buffer_
+
+#######
+# End of performance-related exclusions
+#######
diff --git a/chromium/tools/clang/rewrite_raw_ptr_fields/manual-paths-to-ignore.txt b/chromium/tools/clang/rewrite_raw_ptr_fields/manual-paths-to-ignore.txt
index de839fbde0e..3e0cc942410 100644
--- a/chromium/tools/clang/rewrite_raw_ptr_fields/manual-paths-to-ignore.txt
+++ b/chromium/tools/clang/rewrite_raw_ptr_fields/manual-paths-to-ignore.txt
@@ -4,6 +4,9 @@
 # If a source file path contains any of the lines in the filter file below,
 # then such source file will not be rewritten.
 #
+# Lines prefixed with "!" can be used to force include files that matched a file
+# path to be ignored.
+#
 # Note that the rewriter has a hardcoded logic for a handful of path-based
 # exclusions that cannot be expressed as substring matches:
 # - Excluding paths containing "third_party/", but still covering
@@ -27,10 +30,24 @@ net/tools/
 chrome/chrome_elf/
 chrome/installer/mini_installer/
 
+# DEPS prohibits includes from base/
+chrome/install_static
+
+# Exclude pocdll.dll as it doesn't depend on //base and only used for testing.
+sandbox/win/sandbox_poc/pocdll
+
+# Exclude directories that don't depend on //base, because nothing there uses
+# anything from /base.
+sandbox/linux/system_headers/
+
 # The folder holds headers that are duplicated in the Android source and need to
 # provide a stable C ABI. Can't depend on //base.
 android_webview/public/
 
+# Exclude dependences of checked_ptr.h
+base/logging.h
+base/synchronization/lock_impl.h
+
 # Exclude code that only runs inside a renderer process - renderer
 # processes are excluded for now from the MiraclePtr project scope,
 # because they are sensitive to performance regressions (to a much higher
@@ -40,12 +57,17 @@ android_webview/public/
 # elsewhere - for example "v8/" is excluded in another part of this
 # file.
 #
+# The common/ directories must be included in the rewrite as they contain code
+# that is also used from the browser process.
+#
 # Also, note that isInThirdPartyLocation AST matcher in
 # RewriteRawPtrFields.cpp explicitly includes third_party/blink
 # (because it is in the same git repository as the rest of Chromium),
 # but we go ahead and exclude it below.
 /renderer/  # (e.g. //content/renderer/ or //components/visitedlink/renderer/).
 third_party/blink/
+!third_party/blink/public/common/
+!third_party/blink/common/
 
 # Exclude paths in separate repositories - i.e. in directories that
 # 1. Contain a ".git" subdirectory
diff --git a/chromium/tools/clang/rewrite_raw_ptr_fields/rewrite.sh b/chromium/tools/clang/rewrite_raw_ptr_fields/rewrite.sh
index 30eebc984ba..868968dad78 100755
--- a/chromium/tools/clang/rewrite_raw_ptr_fields/rewrite.sh
+++ b/chromium/tools/clang/rewrite_raw_ptr_fields/rewrite.sh
@@ -47,10 +47,16 @@ gn gen $OUT_DIR
 GEN_H_TARGETS=`ninja -C $OUT_DIR -t targets all | grep '^gen/.*\(\.h\|inc\|css_tokenizer_codepoints.cc\)' | cut -d : -f 1`
 time ninja -C $OUT_DIR $GEN_H_TARGETS
 
+if grep -qE '^\s*target_os\s*=\s*("win"|win)' $OUT_DIR/args.gn
+then
+  TARGET_OS_OPTION="--target_os=win"
+fi
+
 # A preliminary rewriter run in a special mode that generates a list of fields
 # to ignore. These fields would likely lead to compiler errors if rewritten.
 echo "*** Generating the ignore list ***"
 time tools/clang/scripts/run_tool.py \
+    $TARGET_OS_OPTION \
     --tool rewrite_raw_ptr_fields \
     --tool-arg=--exclude-paths=$REWRITER_SRC_DIR/manual-paths-to-ignore.txt \
     --generate-compdb \
@@ -61,11 +67,13 @@ cat ~/scratch/rewriter.out \
     | sort | uniq > ~/scratch/automated-fields-to-ignore.txt
 cat ~/scratch/automated-fields-to-ignore.txt \
     tools/clang/rewrite_raw_ptr_fields/manual-fields-to-ignore.txt \
-    >> ~/scratch/combined-fields-to-ignore.txt
+    | grep -v "base::FileDescriptorWatcher::Controller::watcher_" \
+    > ~/scratch/combined-fields-to-ignore.txt
 
 # Main rewrite.
 echo "*** Running the main rewrite phase ***"
 time tools/clang/scripts/run_tool.py \
+    $TARGET_OS_OPTION \
     --tool rewrite_raw_ptr_fields \
     --tool-arg=--exclude-fields=$HOME/scratch/combined-fields-to-ignore.txt \
     --tool-arg=--exclude-paths=$REWRITER_SRC_DIR/manual-paths-to-ignore.txt \
diff --git a/chromium/tools/clang/scripts/apply_edits.py b/chromium/tools/clang/scripts/apply_edits.py
index a49a739792b..abf95df42ac 100755
--- a/chromium/tools/clang/scripts/apply_edits.py
+++ b/chromium/tools/clang/scripts/apply_edits.py
@@ -164,6 +164,59 @@ _INCLUDE_INSERTION_POINT_REGEX_TEMPLATE = r'''
 '''
 
 
+_NEWLINE_CHARACTERS = [ord('\n'), ord('\r')]
+
+
+def _FindStartOfPreviousLine(contents, index):
+  """ Requires that `index` points to the start of a line.
+      Returns an index to the start of the previous line.
+  """
+  assert (index > 0)
+  assert (contents[index - 1] in _NEWLINE_CHARACTERS)
+
+  # Go back over the newline characters associated with the *single* end of a
+  # line just before `index`, despite of whether end of a line is designated by
+  # "\r", "\n" or "\r\n".  Examples:
+  # 1. "... \r\n <new index> \r\n <old index> ...
+  # 2. "... \n <new index> \n <old index> ...
+  index = index - 1
+  if index > 0 and contents[index - 1] in _NEWLINE_CHARACTERS and \
+      contents[index - 1] != contents[index]:
+    index = index - 1
+
+  # Go back until `index` points right after an end of a line (or at the
+  # beginning of the `contents`).
+  while index > 0 and contents[index - 1] not in _NEWLINE_CHARACTERS:
+    index = index - 1
+
+  return index
+
+
+def _SkipOverPreviousComment(contents, index):
+  """ Returns `index`, possibly moving it earlier so that it skips over comment
+      lines appearing in `contents` just before the old `index.
+
+      Example:
+          <returned `index` points here>// Comment
+                                        // Comment
+          <original `index` points here>bar
+  """
+  # If `index` points at the start of the file, or `index` doesn't point at the
+  # beginning of a line, then don't skip anything and just return `index`.
+  if index == 0 or contents[index - 1] not in _NEWLINE_CHARACTERS:
+    return index
+
+  # Is the previous line a non-comment?  If so, just return `index`.
+  new_index = _FindStartOfPreviousLine(contents, index)
+  prev_text = contents[new_index:index]
+  _COMMENT_START_REGEX = "^  \s*  (  //  |  \*  )"
+  if not re.search(_COMMENT_START_REGEX, prev_text, re.VERBOSE):
+    return index
+
+  # Otherwise skip over the previous line + continue skipping via recursion.
+  return _SkipOverPreviousComment(contents, new_index)
+
+
 def _InsertNonSystemIncludeHeader(filepath, header_line_to_add, contents):
   """ Mutates |contents| (contents of |filepath|) to #include
       the |header_to_add
@@ -185,7 +238,7 @@ def _InsertNonSystemIncludeHeader(filepath, header_line_to_add, contents):
   regex_text = _INCLUDE_INSERTION_POINT_REGEX_TEMPLATE % primary_header_basename
   match = re.search(regex_text, contents, re.MULTILINE | re.VERBOSE)
   assert (match is not None)
-  insertion_point = match.start()
+  insertion_point = _SkipOverPreviousComment(contents, match.start())
 
   # Extra empty line is required if the addition is not adjacent to other
   # includes.
diff --git a/chromium/tools/clang/scripts/apply_edits_test.py b/chromium/tools/clang/scripts/apply_edits_test.py
index d8edd45f869..a2bc63b4fe2 100755
--- a/chromium/tools/clang/scripts/apply_edits_test.py
+++ b/chromium/tools/clang/scripts/apply_edits_test.py
@@ -56,6 +56,15 @@ def _InsertHeader(old_contents,
 
 
 class InsertIncludeHeaderTest(unittest.TestCase):
+  def _assertEqualContents(self, expected, actual):
+    if expected != actual:
+      print("####################### EXPECTED:")
+      print(expected)
+      print("####################### ACTUAL:")
+      print(actual)
+      print("####################### END.")
+    self.assertEqual(expected, actual)
+
   def testSkippingCppComments(self):
     old_contents = '''
 // Copyright info here.
@@ -69,7 +78,144 @@ class InsertIncludeHeaderTest(unittest.TestCase):
 #include "old/header.h"
     '''
     new_header_line = '#include "new/header.h'
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
+
+  def testSkippingCppComments_DocCommentForStruct(self):
+    """ This is a regression test for https://crbug.com/1175684 """
+    old_contents = '''
+// Copyright blah blah...
+
+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_FILTER_H_
+#define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_FILTER_H_
+
+#include <stdint.h>
+
+// Doc comment for a struct.
+// Multiline.
+struct sock_filter {
+  uint16_t code;
+};
+    '''
+    expected_new_contents = '''
+// Copyright blah blah...
+
+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_FILTER_H_
+#define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_FILTER_H_
+
+#include <stdint.h>
+
+#include "new/header.h"
+
+// Doc comment for a struct.
+// Multiline.
+struct sock_filter {
+  uint16_t code;
+};
+    '''
+    new_header_line = '#include "new/header.h'
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
+
+  def testSkippingCppComments_DocCommentForStruct2(self):
+    """ This is a regression test for https://crbug.com/1175684 """
+    old_contents = '''
+// Copyright blah blah...
+
+// Doc comment for a struct.
+struct sock_filter {
+  uint16_t code;
+};
+    '''
+    expected_new_contents = '''
+// Copyright blah blah...
+
+#include "new/header.h"
+
+// Doc comment for a struct.
+struct sock_filter {
+  uint16_t code;
+};
+    '''
+    new_header_line = '#include "new/header.h'
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
+
+  def testSkippingCppComments_DocCommentForStruct3(self):
+    """ This is a regression test for https://crbug.com/1175684 """
+    old_contents = '''
+// Doc comment for a struct.
+struct sock_filter {
+  uint16_t code;
+};
+    '''
+    expected_new_contents = '''
+#include "new/header.h"
+
+// Doc comment for a struct.
+struct sock_filter {
+  uint16_t code;
+};
+    '''
+    new_header_line = '#include "new/header.h'
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
+
+  def testSkippingCppComments_DocCommentForInclude(self):
+    """ This is a regression test for https://crbug.com/1175684 """
+    old_contents = '''
+// Copyright blah blah...
+
+// System includes.
+#include <stdint.h>
+
+// Doc comment for a struct.
+struct sock_filter {
+  uint16_t code;
+};
+    '''
+    expected_new_contents = '''
+// Copyright blah blah...
+
+// System includes.
+#include <stdint.h>
+
+#include "new/header.h"
+
+// Doc comment for a struct.
+struct sock_filter {
+  uint16_t code;
+};
+    '''
+    new_header_line = '#include "new/header.h'
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
+
+  def testSkippingCppComments_DocCommentForWholeFile(self):
+    """ This is a regression test for https://crbug.com/1175684 """
+    old_contents = '''
+// Copyright blah blah...
+
+// Doc comment for the whole file.
+
+struct sock_filter {
+  uint16_t code;
+};
+    '''
+    expected_new_contents = '''
+// Copyright blah blah...
+
+// Doc comment for the whole file.
+
+#include "new/header.h"
+
+struct sock_filter {
+  uint16_t code;
+};
+    '''
+    new_header_line = '#include "new/header.h'
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testSkippingOldStyleComments(self):
     old_contents = '''
@@ -87,7 +233,8 @@ class InsertIncludeHeaderTest(unittest.TestCase):
 #include "new/header.h"
 #include "old/header.h"
     '''
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testSkippingOldStyleComments_NoWhitespaceAtLineStart(self):
     old_contents = '''
@@ -105,7 +252,8 @@ class InsertIncludeHeaderTest(unittest.TestCase):
 #include "new/header.h"
 #include "old/header.h"
     '''
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testSkippingSystemHeaders(self):
     old_contents = '''
@@ -121,7 +269,8 @@ class InsertIncludeHeaderTest(unittest.TestCase):
 #include "new/header.h"
 #include "old/header.h"
     '''
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testSkippingPrimaryHeader(self):
     old_contents = '''
@@ -139,7 +288,8 @@ class InsertIncludeHeaderTest(unittest.TestCase):
 #include "new/header.h"
 #include "old/header.h"
     '''
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testSimilarNonPrimaryHeader_WithPrimaryHeader(self):
     old_contents = '''
@@ -159,7 +309,8 @@ class InsertIncludeHeaderTest(unittest.TestCase):
 #include "new/header.h"
 #include "zzz/foo.h"
     '''
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testSimilarNonPrimaryHeader_NoPrimaryHeader(self):
     old_contents = '''
@@ -175,7 +326,8 @@ class InsertIncludeHeaderTest(unittest.TestCase):
 #include "new/header.h"
 #include "zzz/foo.h"
     '''
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testSkippingIncludeGuards(self):
     old_contents = '''
@@ -195,8 +347,9 @@ class InsertIncludeHeaderTest(unittest.TestCase):
 
 #endif FOO_IMPL_H_
     '''
-    self.assertEqual(expected_new_contents,
-                     _InsertHeader(old_contents, 'foo/impl.h', 'new/header.h'))
+    self._assertEqualContents(
+        expected_new_contents,
+        _InsertHeader(old_contents, 'foo/impl.h', 'new/header.h'))
 
   def testSkippingIncludeGuards2(self):
     # This test is based on base/third_party/valgrind/memcheck.h
@@ -217,7 +370,8 @@ class InsertIncludeHeaderTest(unittest.TestCase):
 
 #endif
     '''
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testSkippingIncludeGuards3(self):
     # This test is based on base/third_party/xdg_mime/xdgmime.h
@@ -256,7 +410,8 @@ typedef void (*XdgMimeCallback) (void *user_data);
 #endif /* __cplusplus */
 #endif /* __XDG_MIME_H__ */
     '''
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testSkippingIncludeGuards4(self):
     # This test is based on ash/first_run/desktop_cleaner.h and/or
@@ -285,7 +440,8 @@ namespace ash {
 
 #endif  // ASH_FIRST_RUN_DESKTOP_CLEANER_
     '''
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testSkippingIncludeGuards5(self):
     # This test is based on third_party/weston/include/GLES2/gl2.h (the |extern
@@ -322,7 +478,8 @@ namespace ash {
 
 #endif
     '''
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testSkippingIncludeGuards6(self):
     # This test is based on ios/third_party/blink/src/html_token.h
@@ -353,7 +510,8 @@ namespace ash {
 
 #endif
     '''
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testNoOpIfAlreadyPresent(self):
     # This tests that the new header won't be inserted (and duplicated)
@@ -372,7 +530,8 @@ namespace ash {
 #include "new/header.h"
 #include "new/header2.h"
     '''
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testNoOpIfAlreadyPresent_WithTrailingComment(self):
     # This tests that the new header won't be inserted (and duplicated)
@@ -391,7 +550,8 @@ namespace ash {
 #include "new/header.h" // blah
 #include "new/header2.h"
     '''
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testNoOldHeaders(self):
     # This tests that an extra new line is inserted after the new header
@@ -408,7 +568,8 @@ struct S {};
 
 struct S {};
     '''
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testPlatformIfDefs(self):
     # This test is based on
@@ -454,7 +615,8 @@ inline void abort_noreturn() { abort(); }
 
 namespace double_conversion {
     '''
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testNoOldIncludesAndIfDefs(self):
     # Artificial test: no old #includes + some #ifdefs.  The main focus of the
@@ -476,7 +638,8 @@ void foo();
 
 void foo();
     '''
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testNoOldIncludesAndIfDefs2(self):
     # Artificial test: no old #includes + some #ifdefs.  The main focus of the
@@ -498,7 +661,8 @@ void foo();
 
 void foo();
     '''
-    self.assertEqual(expected_new_contents, _InsertHeader(old_contents))
+    self._assertEqualContents(expected_new_contents,
+                              _InsertHeader(old_contents))
 
   def testUtf8BomMarker(self):
     # Test based on
@@ -523,12 +687,12 @@ void foo();
     expected.extend(expected_new_contents.encode('utf-8'))
     # Test sanity check (i.e. not an assertion about code under test).
     utf8_bom = [0xef, 0xbb, 0xbf]
-    self.assertEqual(list(actual[0:3]), utf8_bom)
-    self.assertEqual(list(expected[0:3]), utf8_bom)
+    self._assertEqualContents(list(actual[0:3]), utf8_bom)
+    self._assertEqualContents(list(expected[0:3]), utf8_bom)
     # Actual test.
     edit = apply_edits.Edit('include-user-header', -1, -1, "new/header.h")
     apply_edits._ApplySingleEdit("foo/impl.cc", actual, edit, None)
-    self.assertEqual(expected, actual)
+    self._assertEqualContents(expected, actual)
 
 
 def _CreateReplacement(content_string, old_substring, new_substring):
diff --git a/chromium/tools/clang/scripts/build.py b/chromium/tools/clang/scripts/build.py
index d4793c26811..ba3cc0f6653 100755
--- a/chromium/tools/clang/scripts/build.py
+++ b/chromium/tools/clang/scripts/build.py
@@ -38,7 +38,6 @@ LLVM_BOOTSTRAP_INSTALL_DIR = os.path.join(THIRD_PARTY_DIR,
 LLVM_INSTRUMENTED_DIR = os.path.join(THIRD_PARTY_DIR, 'llvm-instrumented')
 LLVM_PROFDATA_FILE = os.path.join(LLVM_INSTRUMENTED_DIR, 'profdata.prof')
 CHROME_TOOLS_SHIM_DIR = os.path.join(LLVM_DIR, 'llvm', 'tools', 'chrometools')
-COMPILER_RT_BUILD_DIR = os.path.join(LLVM_BUILD_DIR, 'compiler-rt')
 LLVM_BUILD_TOOLS_DIR = os.path.abspath(
     os.path.join(LLVM_DIR, '..', 'llvm-build-tools'))
 ANDROID_NDK_DIR = os.path.join(
@@ -165,8 +164,9 @@ def UrlOpen(url):
 
 def GetLatestLLVMCommit():
   """Get the latest commit hash in the LLVM monorepo."""
-  ref = json.loads(UrlOpen(('https://api.github.com/repos/'
-                            'llvm/llvm-project/git/refs/heads/master')))
+  ref = json.loads(
+      UrlOpen(('https://api.github.com/repos/'
+               'llvm/llvm-project/git/refs/heads/main')))
   assert ref['object']['type'] == 'commit'
   return ref['object']['sha']
 
@@ -175,8 +175,9 @@ def GetCommitDescription(commit):
   """Get the output of `git describe`.
 
   Needs to be called from inside the git repository dir."""
+  git_exe = 'git.bat' if sys.platform.startswith('win') else 'git'
   return subprocess.check_output(
-      ['git', 'describe', '--long', '--abbrev=8', commit]).rstrip()
+      [git_exe, 'describe', '--long', '--abbrev=8', commit]).rstrip()
 
 
 def DeleteChromeToolsShim():
@@ -316,9 +317,9 @@ def MaybeDownloadHostGcc(args):
   """Download a modern GCC host compiler on Linux."""
   if not sys.platform.startswith('linux') or args.gcc_toolchain:
     return
-  gcc_dir = os.path.join(LLVM_BUILD_TOOLS_DIR, 'gcc530trusty')
+  gcc_dir = os.path.join(LLVM_BUILD_TOOLS_DIR, 'gcc-10.2.0-trusty')
   if not os.path.exists(gcc_dir):
-    DownloadAndUnpack(CDS_URL + '/tools/gcc530trusty.tgz', gcc_dir)
+    DownloadAndUnpack(CDS_URL + '/tools/gcc-10.2.0-trusty.tgz', gcc_dir)
   args.gcc_toolchain = gcc_dir
 
 
@@ -378,6 +379,7 @@ def CopyLibstdcpp(args, build_dir):
   # The two fuzzer tests are weird in that they copy the fuzzer binary from bin/
   # into the test tree under a different name. To make the relative rpath in
   # them work, copy libstdc++ to the copied location for now.
+  # There is also a compiler-rt test that copies llvm-symbolizer out of bin/.
   # TODO(thakis): Instead, make the upstream lit.local.cfg.py for these 2 tests
   # check if the binary contains an rpath and if so disable the tests.
   for d in ['lib',
@@ -386,6 +388,17 @@ def CopyLibstdcpp(args, build_dir):
     EnsureDirExists(os.path.join(build_dir, d))
     CopyFile(libstdcpp, os.path.join(build_dir, d))
 
+  sanitizer_common_tests = os.path.join(build_dir,
+                                 'projects/compiler-rt/test/sanitizer_common')
+  if os.path.exists(sanitizer_common_tests):
+    for d in ['asan-i386-Linux', 'asan-x86_64-Linux', 'lsan-i386-Linux',
+              'lsan-x86_64-Linux', 'msan-x86_64-Linux', 'tsan-x86_64-Linux',
+              'ubsan-i386-Linux', 'ubsan-x86_64-Linux']:
+      libpath = os.path.join(sanitizer_common_tests, d, 'Output', 'lib')
+      EnsureDirExists(libpath)
+      CopyFile(libstdcpp, libpath)
+
+
 def gn_arg(v):
   if v == 'True':
     return True
@@ -416,6 +429,8 @@ def main():
                       help='do not build anything')
   parser.add_argument('--skip-checkout', action='store_true',
                       help='do not create or update any checkouts')
+  parser.add_argument('--build-dir',
+                      help='Override build directory')
   parser.add_argument('--extra-tools', nargs='*', default=[],
                       help='select additional chrome tools to build')
   parser.add_argument('--use-system-cmake', action='store_true',
@@ -454,7 +469,9 @@ def main():
     print('Install the Fuchsia SDK by adding fuchsia to the ')
     print('target_os section in your .gclient and running hooks, ')
     print('or pass --without-fuchsia.')
-    print('https://chromium.googlesource.com/chromium/src/+/master/docs/fuchsia_build_instructions.md')
+    print(
+        'https://chromium.googlesource.com/chromium/src/+/master/docs/fuchsia/build_instructions.md'
+    )
     print('for general Fuchsia build instructions.')
     return 1
 
@@ -484,7 +501,11 @@ def main():
   if sys.platform == 'darwin':
     isysroot = subprocess.check_output(['xcrun', '--show-sdk-path']).rstrip()
 
-  global CLANG_REVISION, PACKAGE_VERSION
+  global CLANG_REVISION, PACKAGE_VERSION, LLVM_BUILD_DIR
+
+  if args.build_dir:
+    LLVM_BUILD_DIR = args.build_dir
+
   if args.llvm_force_head_revision:
     checkout_revision = GetLatestLLVMCommit()
   else:
@@ -570,8 +591,6 @@ def main():
         '-DLIBCXX_INCLUDE_TESTS=OFF',
         '-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF',
     ])
-    # Prefer Python 2. TODO(crbug.com/1076834): Remove this.
-    base_cmake_args.append('-DPython3_EXECUTABLE=/nonexistent')
 
   if args.gcc_toolchain:
     # Force compiler-rt tests to use our gcc toolchain (including libstdc++.so)
@@ -670,11 +689,7 @@ def main():
     CopyLibstdcpp(args, LLVM_BOOTSTRAP_INSTALL_DIR)
     RunCommand(['ninja'], msvc_arch='x64')
     if args.run_tests:
-      test_targets = [ 'check-all' ]
-      if sys.platform == 'darwin':
-        # TODO(crbug.com/731375): Run check-all on Darwin too.
-        test_targets = [ 'check-llvm', 'check-clang', 'check-builtins' ]
-      RunCommand(['ninja'] + test_targets, msvc_arch='x64')
+      RunCommand(['ninja', 'check-all'], msvc_arch='x64')
     RunCommand(['ninja', 'install'], msvc_arch='x64')
 
     if sys.platform == 'win32':
@@ -725,8 +740,6 @@ def main():
     if cc is not None:  instrument_args.append('-DCMAKE_C_COMPILER=' + cc)
     if cxx is not None: instrument_args.append('-DCMAKE_CXX_COMPILER=' + cxx)
     if lld is not None: instrument_args.append('-DCMAKE_LINKER=' + lld)
-    if args.thinlto:
-      instrument_args.append('-DLLVM_ENABLE_LTO=Thin')
 
     RunCommand(['cmake'] + instrument_args + [os.path.join(LLVM_DIR, 'llvm')],
                msvc_arch='x64')
@@ -793,8 +806,8 @@ def main():
         '-DDARWIN_iossim_ARCHS=i386;x86_64;arm64',
     ])
     if args.bootstrap:
-      # mac/arm64 needs MacOSX11.0.sdk. System Xcode (+ SDK) on the chrome bots
-      # is something much older.
+      # mac/arm64 needs MacOSX11.0.sdk. System Xcode (+ SDK) may be something
+      # else, so use the hermetic Xcode.
       # Options:
       # - temporarily set system Xcode to Xcode 12 beta while running this
       #   script, (cf build/swarming_xcode_install.py, but it looks unused)
@@ -806,11 +819,11 @@ def main():
       #   LLVM build without it being system Xcode.
       #
       # The last option seems best, so let's go with that. We need to pass
-      # -isysroot to the 11.0 SDK and -B to the /usr/bin so that the new ld64 is
+      # -isysroot to the SDK and -B to the /usr/bin so that the new ld64 is
       # used.
       # The compiler-rt build overrides -isysroot flags set via cflags, and we
       # only need to use the 11 SDK for the compiler-rt build. So set only
-      # DARWIN_macosx_CACHED_SYSROOT to the 11.0 SDK and use the regular SDK
+      # DARWIN_macosx_CACHED_SYSROOT to the 11 SDK and use the regular SDK
       # for the rest of the build. (The new ld is used for all links.)
       sys.path.insert(1, os.path.join(CHROMIUM_DIR, 'build'))
       import mac_toolchain
@@ -818,12 +831,12 @@ def main():
       mac_toolchain.InstallXcodeBinaries(LLVM_XCODE)
       isysroot_11 = os.path.join(LLVM_XCODE, 'Contents', 'Developer',
                                  'Platforms', 'MacOSX.platform', 'Developer',
-                                 'SDKs', 'MacOSX11.0.sdk')
+                                 'SDKs', 'MacOSX11.1.sdk')
       xcode_bin = os.path.join(LLVM_XCODE, 'Contents', 'Developer',
                                'Toolchains', 'XcodeDefault.xctoolchain', 'usr',
                                'bin')
       # Include an arm64 slice for libclang_rt.osx.a. This requires using
-      # MacOSX11.0.sdk (via -isysroot, via DARWIN_macosx_CACHED_SYSROOT) and
+      # MacOSX11.x.sdk (via -isysroot, via DARWIN_macosx_CACHED_SYSROOT) and
       # the new ld, via -B
       compiler_rt_args.extend([
           # We don't need 32-bit intel support for macOS, we only ship 64-bit.
@@ -926,10 +939,11 @@ def main():
 
   # Do an out-of-tree build of compiler-rt for 32-bit Win clang_rt.profile.lib.
   if sys.platform == 'win32':
-    if os.path.isdir(COMPILER_RT_BUILD_DIR):
-      RmTree(COMPILER_RT_BUILD_DIR)
-    os.makedirs(COMPILER_RT_BUILD_DIR)
-    os.chdir(COMPILER_RT_BUILD_DIR)
+    compiler_rt_build_dir = os.path.join(LLVM_BUILD_DIR, 'compiler-rt')
+    if os.path.isdir(compiler_rt_build_dir):
+      RmTree(compiler_rt_build_dir)
+    os.makedirs(compiler_rt_build_dir)
+    os.chdir(compiler_rt_build_dir)
     if args.bootstrap:
       # The bootstrap compiler produces 64-bit binaries by default.
       cflags += ['-m32']
@@ -955,7 +969,7 @@ def main():
     RunCommand(['ninja', 'compiler-rt'], msvc_arch='x86')
 
     # Copy select output to the main tree.
-    rt_lib_src_dir = os.path.join(COMPILER_RT_BUILD_DIR, 'lib', 'clang',
+    rt_lib_src_dir = os.path.join(compiler_rt_build_dir, 'lib', 'clang',
                                   RELEASE_VERSION, 'lib', platform)
     # Static and dynamic libraries:
     CopyDirectoryContents(rt_lib_src_dir, rt_lib_dst_dir)
@@ -979,6 +993,10 @@ def main():
           '--target=' + target_triple,
           '--sysroot=%s/sysroot' % toolchain_dir,
           '--gcc-toolchain=' + toolchain_dir,
+          # android_ndk/toolchains/llvm/prebuilt/linux-x86_64/aarch64-linux-android/bin/ld
+          # depends on a newer version of libxml2.so than what's available on
+          # the bots. To make things work, use our just-built lld as linker.
+          '-fuse-ld=lld',
       ]
       android_args = base_cmake_args + [
         '-DCMAKE_C_COMPILER=' + os.path.join(LLVM_BUILD_DIR, 'bin/clang'),
@@ -1071,6 +1089,27 @@ def main():
       CopyFile(os.path.join(build_dir, 'lib', target_spec, builtins_a),
                fuchsia_lib_dst_dir)
 
+      # Build the Fuchsia profile runtime.
+      if target_arch == 'x86_64':
+        fuchsia_args.extend([
+            '-DCOMPILER_RT_BUILD_BUILTINS=OFF',
+            '-DCOMPILER_RT_BUILD_PROFILE=ON',
+            '-DCMAKE_CXX_COMPILER_TARGET=%s-fuchsia' % target_arch,
+            '-DCMAKE_CXX_COMPILER_WORKS=ON',
+        ])
+        profile_build_dir = os.path.join(LLVM_BUILD_DIR,
+                                         'fuchsia-profile-' + target_arch)
+        if not os.path.exists(profile_build_dir):
+          os.mkdir(os.path.join(profile_build_dir))
+        os.chdir(profile_build_dir)
+        RunCommand(['cmake'] +
+                   fuchsia_args +
+                   [COMPILER_RT_DIR])
+        profile_a = 'libclang_rt.profile.a'
+        RunCommand(['ninja', profile_a])
+        CopyFile(os.path.join(profile_build_dir, 'lib', target_spec, profile_a),
+                              fuchsia_lib_dst_dir)
+
   # Run tests.
   if args.run_tests or args.llvm_force_head_revision:
     RunCommand(['ninja', '-C', LLVM_BUILD_DIR, 'cr-check-all'], msvc_arch='x64')
diff --git a/chromium/tools/clang/scripts/build_clang_tools_extra.py b/chromium/tools/clang/scripts/build_clang_tools_extra.py
index 2026c845caa..7c49391af62 100755
--- a/chromium/tools/clang/scripts/build_clang_tools_extra.py
+++ b/chromium/tools/clang/scripts/build_clang_tools_extra.py
@@ -50,7 +50,7 @@ def FetchLLVM(checkout_dir, revision):
   except subprocess.CalledProcessError:
     # Otherwise, try to update it.
     print('-- Attempting to update existing repo')
-    args = ['git', 'pull', '--rebase', 'origin', 'master']
+    args = ['git', 'pull', '--rebase', 'origin', 'main']
     subprocess.check_call(args, cwd=checkout_dir, shell=sys.platform == 'win32')
   if revision:
     args = ['git', 'checkout', revision]
diff --git a/chromium/tools/clang/scripts/generate_compdb.py b/chromium/tools/clang/scripts/generate_compdb.py
index f981c36af9c..d5329532cda 100755
--- a/chromium/tools/clang/scripts/generate_compdb.py
+++ b/chromium/tools/clang/scripts/generate_compdb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
diff --git a/chromium/tools/clang/scripts/package.py b/chromium/tools/clang/scripts/package.py
index cfed526d3b5..4ea0b6380b5 100755
--- a/chromium/tools/clang/scripts/package.py
+++ b/chromium/tools/clang/scripts/package.py
@@ -158,13 +158,6 @@ def main():
                       help='Upload the target archive to Google Cloud Storage.')
   args = parser.parse_args()
 
-  # Check that the script is not going to upload a toolchain built from HEAD.
-  use_head_revision = bool(int(os.environ.get('LLVM_FORCE_HEAD_REVISION', '0')))
-  if args.upload and use_head_revision:
-    print ("--upload and LLVM_FORCE_HEAD_REVISION could not be used "
-           "at the same time.")
-    return 1
-
   expected_stamp = GetExpectedStamp()
   pdir = 'clang-' + expected_stamp
   print(pdir)
@@ -189,7 +182,7 @@ def main():
         os.path.join(THIS_DIR, 'build.py'), '--bootstrap', '--disable-asserts',
         '--run-tests', '--pgo'
     ]
-    if sys.platform.startswith('linux'):
+    if sys.platform != 'darwin':
       build_cmd.append('--thinlto')
 
     TeeCmd(build_cmd, log)
@@ -226,6 +219,7 @@ def main():
       # Include libclang_rt.builtins.a for Fuchsia targets.
       'lib/clang/$V/lib/aarch64-fuchsia/libclang_rt.builtins.a',
       'lib/clang/$V/lib/x86_64-fuchsia/libclang_rt.builtins.a',
+      'lib/clang/$V/lib/x86_64-fuchsia/libclang_rt.profile.a',
     ])
   if sys.platform == 'darwin':
     want.extend([
@@ -397,6 +391,8 @@ def main():
 
   if sys.platform.startswith('linux'):
     os.symlink('lld', os.path.join(pdir, 'bin', 'ld.lld'))
+    os.symlink('lld', os.path.join(pdir, 'bin', 'ld64.lld'))
+    os.symlink('lld', os.path.join(pdir, 'bin', 'ld64.lld.darwinnew'))
     os.symlink('lld', os.path.join(pdir, 'bin', 'lld-link'))
 
   # Copy libc++ headers.
@@ -473,8 +469,10 @@ def main():
                 os.path.join(llddir, 'bin'))
     shutil.copy(os.path.join(LLVM_RELEASE_DIR, 'bin', 'llvm-ar'),
                 os.path.join(llddir, 'bin'))
-    os.symlink('lld', os.path.join(llddir, 'bin', 'lld-link'))
     os.symlink('lld', os.path.join(llddir, 'bin', 'ld.lld'))
+    os.symlink('lld', os.path.join(llddir, 'bin', 'ld64.lld'))
+    os.symlink('lld', os.path.join(llddir, 'bin', 'ld64.lld.darwinnew'))
+    os.symlink('lld', os.path.join(llddir, 'bin', 'lld-link'))
     with tarfile.open(llddir + '.tgz', 'w:gz') as tar:
       tar.add(os.path.join(llddir, 'bin'), arcname='bin',
               filter=PrintTarProgress)
diff --git a/chromium/tools/clang/scripts/update.py b/chromium/tools/clang/scripts/update.py
index 3fdf468b935..a9c0af0dc9f 100755
--- a/chromium/tools/clang/scripts/update.py
+++ b/chromium/tools/clang/scripts/update.py
@@ -38,12 +38,11 @@ import zipfile
 # https://chromium.googlesource.com/chromium/src/+/master/docs/updating_clang.md
 # Reverting problematic clang rolls is safe, though.
 # This is the output of `git describe` and is usable as a commit-ish.
-CLANG_REVISION = 'llvmorg-12-init-11462-g418f18c6'
-CLANG_SUB_REVISION = 1
+CLANG_REVISION = 'llvmorg-13-init-1559-g01b87444'
+CLANG_SUB_REVISION = 3
 
 PACKAGE_VERSION = '%s-%s' % (CLANG_REVISION, CLANG_SUB_REVISION)
-RELEASE_VERSION = '12.0.0'
-
+RELEASE_VERSION = '13.0.0'
 
 CDS_URL = os.environ.get('CDS_CLANG_BUCKET_OVERRIDE',
     'https://commondatastorage.googleapis.com/chromium-browser-clang')
@@ -178,12 +177,28 @@ def DownloadAndUnpackPackage(package_file, output_dir, host_os):
     sys.exit(1)
 
 
+def DownloadAndUnpackClangMacRuntime(output_dir):
+  cds_file = "clang-%s.tgz" % PACKAGE_VERSION
+  cds_full_url = GetPlatformUrlPrefix('mac') + cds_file
+  path_prefixes = [
+      'lib/clang/' + RELEASE_VERSION + '/lib/darwin', 'include/c++/v1'
+  ]
+  try:
+    DownloadAndUnpack(cds_full_url, output_dir, path_prefixes)
+  except URLError:
+    print('Failed to download prebuilt clang %s' % cds_file)
+    print('Use build.py if you want to build locally.')
+    print('Exiting.')
+    sys.exit(1)
+
+
 # TODO(hans): Create a clang-win-runtime package instead.
 def DownloadAndUnpackClangWinRuntime(output_dir):
-  cds_file = "clang-%s.tgz" %  PACKAGE_VERSION
+  cds_file = "clang-%s.tgz" % PACKAGE_VERSION
   cds_full_url = GetPlatformUrlPrefix('win') + cds_file
-  path_prefixes =  [ 'lib/clang/' + RELEASE_VERSION + '/lib/',
-                     'bin/llvm-symbolizer.exe' ]
+  path_prefixes = [
+      'lib/clang/' + RELEASE_VERSION + '/lib/windows', 'bin/llvm-symbolizer.exe'
+  ]
   try:
     DownloadAndUnpack(cds_full_url, output_dir, path_prefixes)
   except URLError:
@@ -256,6 +271,8 @@ def UpdatePackage(package_name, host_os):
 
   DownloadAndUnpackPackage(package_file, LLVM_BUILD_DIR, host_os)
 
+  if package_name == 'clang' and 'mac' in target_os:
+    DownloadAndUnpackClangMacRuntime(LLVM_BUILD_DIR)
   if package_name == 'clang' and 'win' in target_os:
     # When doing win/cross builds on other hosts, get the Windows runtime
     # libraries, and llvm-symbolizer.exe (needed in asan builds).
@@ -285,8 +302,6 @@ def main():
       help='Which host OS to download for (default: %s)' % default_host_os,
       default=default_host_os,
       choices=('linux', 'mac', 'win'))
-  parser.add_argument('--force-local-build', action='store_true',
-                      help='(no longer used)')
   parser.add_argument('--print-revision', action='store_true',
                       help='Print current clang revision and exit.')
   parser.add_argument('--llvm-force-head-revision', action='store_true',
@@ -298,11 +313,6 @@ def main():
                       help='Verify that clang has the passed-in version.')
   args = parser.parse_args()
 
-  if args.force_local_build:
-    print(('update.py --force-local-build is no longer used to build clang; '
-           'use build.py instead.'))
-    return 1
-
   if args.verify_version and args.verify_version != RELEASE_VERSION:
     print('RELEASE_VERSION is %s but --verify-version argument was %s.' % (
         RELEASE_VERSION, args.verify_version))
diff --git a/chromium/tools/clang/scripts/upload_revision.py b/chromium/tools/clang/scripts/upload_revision.py
index d05f5127246..2fb1aaa289d 100755
--- a/chromium/tools/clang/scripts/upload_revision.py
+++ b/chromium/tools/clang/scripts/upload_revision.py
@@ -36,7 +36,6 @@ Cq-Include-Trybots: chromium/try:dawn-win10-x86-deps-rel
 Cq-Include-Trybots: chromium/try:linux-chromeos-dbg
 Cq-Include-Trybots: chromium/try:linux_angle_deqp_rel_ng
 Cq-Include-Trybots: chromium/try:linux_chromium_cfi_rel_ng
-Cq-Include-Trybots: chromium/try:linux_chromium_chromeos_asan_rel_ng
 Cq-Include-Trybots: chromium/try:linux_chromium_chromeos_msan_rel_ng
 Cq-Include-Trybots: chromium/try:linux_chromium_compile_dbg_32_ng
 Cq-Include-Trybots: chromium/try:linux_chromium_msan_rel_ng
diff --git a/chromium/tools/clang/string_piece_rewriters/CMakeLists.txt b/chromium/tools/clang/string_piece_rewriters/CMakeLists.txt
new file mode 100644
index 00000000000..14ed0c8b775
--- /dev/null
+++ b/chromium/tools/clang/string_piece_rewriters/CMakeLists.txt
@@ -0,0 +1,33 @@
+set(LLVM_LINK_COMPONENTS
+  BitReader
+  MCParser
+  Option
+  Support
+  X86AsmParser
+  X86CodeGen
+  X86Desc
+  X86Info
+  )
+
+add_llvm_executable(string_piece_rewriters
+  StringPieceRewriters.cpp
+  )
+
+target_link_libraries(string_piece_rewriters
+  clangAST
+  clangASTMatchers
+  clangAnalysis
+  clangBasic
+  clangDriver
+  clangEdit
+  clangFrontend
+  clangLex
+  clangParse
+  clangSema
+  clangSerialization
+  clangTooling
+  clangToolingCore
+  clangTransformer
+  )
+
+cr_install(TARGETS string_piece_rewriters RUNTIME DESTINATION bin)
diff --git a/chromium/tools/clang/string_piece_rewriters/StringPieceRewriters.cpp b/chromium/tools/clang/string_piece_rewriters/StringPieceRewriters.cpp
new file mode 100644
index 00000000000..fa2a73b6d3b
--- /dev/null
+++ b/chromium/tools/clang/string_piece_rewriters/StringPieceRewriters.cpp
@@ -0,0 +1,275 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <assert.h>
+#include <stdlib.h>
+#include <algorithm>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "clang/AST/ASTContext.h"
+#include "clang/AST/ParentMap.h"
+#include "clang/ASTMatchers/ASTMatchFinder.h"
+#include "clang/ASTMatchers/ASTMatchers.h"
+#include "clang/ASTMatchers/ASTMatchersMacros.h"
+#include "clang/Analysis/CFG.h"
+#include "clang/Basic/SourceManager.h"
+#include "clang/Frontend/FrontendActions.h"
+#include "clang/Lex/Lexer.h"
+#include "clang/Tooling/CommonOptionsParser.h"
+#include "clang/Tooling/Refactoring.h"
+#include "clang/Tooling/Refactoring/AtomicChange.h"
+#include "clang/Tooling/Tooling.h"
+#include "clang/Tooling/Transformer/RewriteRule.h"
+#include "clang/Tooling/Transformer/SourceCodeBuilders.h"
+#include "clang/Tooling/Transformer/Stencil.h"
+#include "clang/Tooling/Transformer/Transformer.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/TargetSelect.h"
+
+using clang::tooling::AtomicChange;
+using clang::tooling::AtomicChanges;
+using clang::tooling::Transformer;
+using namespace ::clang::ast_matchers;
+using namespace ::clang::transformer;
+
+namespace {
+
+// Custom matcher to differentiate variable initializations based on the syntax.
+AST_MATCHER_P(clang::VarDecl,
+              hasInitStyle,
+              clang::VarDecl::InitializationStyle,
+              InitStyle) {
+  return Node.getInitStyle() == InitStyle;
+}
+
+// Like `maybeDeref`, but with support for smart pointers. Assumes that any type
+// that overloads `->` also overloads `*`.
+Stencil maybeDerefSmart(std::string ID) {
+  return run([ID = std::move(ID)](const MatchFinder::MatchResult& result)
+                 -> llvm::Expected<std::string> {
+    if (const auto* op_call =
+            result.Nodes.getNodeAs<clang::CXXOperatorCallExpr>(ID)) {
+      if (op_call->getOperator() == clang::OO_Arrow &&
+          op_call->getNumArgs() == 1) {
+        llvm::Optional<std::string> text = clang::tooling::buildDereference(
+            *op_call->getArg(0), *result.Context);
+        if (!text) {
+          return llvm::make_error<llvm::StringError>(
+              llvm::errc::invalid_argument,
+              "ID has no corresponding source: " + ID);
+        }
+        return *text;
+      }
+    }
+    return maybeDeref(std::move(ID))->eval(result);
+  });
+}
+
+// A matcher that matches the `as_string()` member function call on a
+// StringPiece. Binds both the call to `as_string()`, as well as the
+// StringPiece.
+auto GetAsStringMatcher() {
+  return materializeTemporaryExpr(
+             has(ignoringParenImpCasts(
+                 cxxBindTemporaryExpr(has(cxxMemberCallExpr(
+                     on(expr().bind("piece")),
+                     callee(cxxMethodDecl(
+                         ofClass(hasName("::base::BasicStringPiece")),
+                         hasName("as_string")))))))))
+      .bind("as_string");
+}
+
+// Replaces calls of `piece.as_string()` and `piece_ptr->as_string()` with
+// `std::string(piece)` and `std::string(*piece_ptr)` respectively.
+RewriteRule ReplaceAsStringWithExplicitStringConversionRule() {
+  return makeRule(GetAsStringMatcher(),
+                  changeTo(cat("std::string(", maybeDerefSmart("piece"), ")")));
+}
+
+// A rule that rewrites expressions like `std::string str = piece.as_string();`
+// to `std::string str(foo);`, making use of the explicit conversion from
+// base::StringPiece to std::string.
+RewriteRule RewriteImplicitToExplicitStringConstructionRule() {
+  auto matcher = materializeTemporaryExpr(
+      GetAsStringMatcher(), hasParent(cxxConstructExpr(
+                                hasDeclaration(cxxConstructorDecl(
+                                    ofClass(hasName("::std::basic_string")))),
+                                hasParent(exprWithCleanups(hasParent(
+                                    varDecl(hasInitStyle(clang::VarDecl::CInit))
+                                        .bind("varDecl")))))));
+  return makeRule(
+      matcher,
+      // Remove the existing initialization via assignment and insert a new
+      // making use of explicit construction.
+      editList({
+          remove(between(name("varDecl"), after(node("as_string")))),
+          insertAfter(name("varDecl"), cat("(", maybeDerefSmart("piece"), ")")),
+      }));
+}
+
+// A rule that removes redundant calls to `as_string`. This can happen if:
+//
+// (1) the resulting string is converted to another string piece,
+// (2) the resulting string is involved in a call to a member function (2a) or
+//     operator (2b) StringPiece also supports, or
+// (3) the as_string call is part of the explicit construction of a std::string.
+//     This can either be a local variable that is explicitly constructed (3a),
+//     or a class member initialized by the constructor list (3b).
+//
+// The resulting rewrite rule will replace expressions like `piece.as_string()`
+// simply with `piece`, and expressions like `piece_ptr->as_string()` with
+// either `*piece_ptr` or `piece_ptr->`, depending on whether or not it is
+// followed by a member expression.
+RewriteRule RemoveAsStringRule() {
+  // List of std::string members that are also supported by base::StringPiece.
+  // Note: `data()` is absent from this list, because std::string::data is
+  // guaranteed to return a null-terminated string, while
+  // base::StringPiece::data is not. Furthermore, `substr()` is missing as well,
+  // due to the possibly breaking change in return type (std::string vs
+  // base::StringPiece).
+  static constexpr llvm::StringRef kMatchingStringMembers[] = {
+      "begin",
+      "cbegin",
+      "end",
+      "cend",
+      "rbegin",
+      "crbegin",
+      "rend",
+      "crend",
+      "at",
+      "front",
+      "back",
+      "size",
+      "length",
+      "max_size",
+      "empty",
+      "copy",
+      "compare",
+      "find",
+      "rfind",
+      "find_first_of",
+      "find_last_of",
+      "find_first_not_of",
+      "find_last_not_of",
+      "npos",
+  };
+
+  // List of std::string operators that are also supported by base::StringPiece.
+  // Note: `operator[]` is absent from this list, because string::operator[idx]
+  // is valid for idx == size(), while base::StringPiece::operator[] is not.
+  static constexpr llvm::StringRef kMatchingStringOperators[] = {
+      "==", "!=", "<", ">", "<=", ">=", "<<",
+  };
+
+  auto string_piece_construct_expr = cxxConstructExpr(hasDeclaration(
+      cxxConstructorDecl(ofClass(hasName("::base::BasicStringPiece")))));
+
+  auto matching_string_member_expr =
+      memberExpr(member(hasAnyName(kMatchingStringMembers))).bind("member");
+
+  auto matching_string_operator_call_expr = cxxOperatorCallExpr(
+      hasAnyOverloadedOperatorName(kMatchingStringOperators));
+
+  auto string_construct_expr = cxxConstructExpr(hasDeclaration(
+      cxxConstructorDecl(ofClass(hasName("::std::basic_string")))));
+
+  // Matches the explicit construction of a string variable, i.e. not making use
+  // of C-style assignment syntax.
+  auto explicit_string_var_construct_expr = cxxConstructExpr(
+      string_construct_expr,
+      hasParent(exprWithCleanups(
+          hasParent(varDecl(unless(hasInitStyle(clang::VarDecl::CInit)))))));
+
+  auto string_class_member_construct_expr = cxxConstructExpr(
+      string_construct_expr,
+      hasParent(exprWithCleanups(hasParent(cxxConstructorDecl()))));
+
+  auto matcher = materializeTemporaryExpr(
+      GetAsStringMatcher(),
+      anyOf(
+          // Case (1)
+          hasParent(string_piece_construct_expr),
+          // Case (2a)
+          hasParent(matching_string_member_expr),
+          // Const APIs like `size()` or `find()` add an extra implicit cast
+          // to const std::string here, that we need to ignore.
+          hasParent(implicitCastExpr(hasParent(matching_string_member_expr))),
+          // Case (2b)
+          hasParent(matching_string_operator_call_expr),
+          // Case (3a)
+          hasParent(explicit_string_var_construct_expr),
+          // Case (3b)
+          hasParent(string_class_member_construct_expr)));
+  return makeRule(
+      matcher,
+      // In case there is a bound member expression, construct an access
+      // expression into the string piece. This is required to handle
+      // expressions like `piece_ptr->as_string().some_member()` correctly.
+      ifBound("member",
+              changeTo(node("member"), access("piece", cat(member("member")))),
+              changeTo(maybeDerefSmart("piece"))));
+}
+
+// Returns a consumer that adds `change` to `changes` if present.
+Transformer::ChangeConsumer GetConsumer(AtomicChanges& changes) {
+  return [&changes](llvm::Expected<AtomicChange> change) {
+    if (change)
+      changes.push_back(*change);
+  };
+}
+
+}  // namespace
+
+int main(int argc, const char* argv[]) {
+  llvm::InitializeNativeTarget();
+  llvm::InitializeNativeTargetAsmParser();
+
+  static llvm::cl::OptionCategory tool_options("Tool options");
+  clang::tooling::CommonOptionsParser options(argc, argv, tool_options);
+  clang::tooling::ClangTool tool(options.getCompilations(),
+                                 options.getSourcePathList());
+
+  // Combine the above rules into a single one and add an include for the right
+  // header.
+  RewriteRule as_string_rule = applyFirst({
+      RemoveAsStringRule(),
+      RewriteImplicitToExplicitStringConstructionRule(),
+      ReplaceAsStringWithExplicitStringConversionRule(),
+  });
+  addInclude(as_string_rule, "base/strings/string_piece.h");
+
+  AtomicChanges changes;
+  Transformer transformer(as_string_rule, GetConsumer(changes));
+
+  MatchFinder match_finder;
+  transformer.registerMatchers(&match_finder);
+  auto factory = clang::tooling::newFrontendActionFactory(&match_finder);
+  int result = tool.run(factory.get());
+  if (result != 0)
+    return result;
+
+  if (changes.empty())
+    return 0;
+
+  // Serialization format is documented in tools/clang/scripts/run_tool.py
+  llvm::outs() << "==== BEGIN EDITS ====\n";
+  for (const auto& change : changes) {
+    for (const auto& r : change.getReplacements()) {
+      std::string replacement(r.getReplacementText());
+      std::replace(replacement.begin(), replacement.end(), '\n', '\0');
+      llvm::outs() << "r:::" << r.getFilePath() << ":::" << r.getOffset()
+                   << ":::" << r.getLength() << ":::" << replacement << "\n";
+    }
+
+    for (const auto& header : change.getInsertedHeaders()) {
+      llvm::outs() << "include-user-header:::" << change.getFilePath()
+                   << ":::-1:::-1:::" << header << "\n";
+    }
+  }
+  llvm::outs() << "==== END EDITS ====\n";
+
+  return 0;
+}
diff --git a/chromium/tools/clang/translation_unit/TranslationUnitGenerator.cpp b/chromium/tools/clang/translation_unit/TranslationUnitGenerator.cpp
index 278b40b7824..382b57cb597 100644
--- a/chromium/tools/clang/translation_unit/TranslationUnitGenerator.cpp
+++ b/chromium/tools/clang/translation_unit/TranslationUnitGenerator.cpp
@@ -281,7 +281,13 @@ static llvm::cl::extrahelp common_help(CommonOptionsParser::HelpMessage);
 
 int main(int argc, const char* argv[]) {
   llvm::cl::OptionCategory category("TranslationUnitGenerator Tool");
-  CommonOptionsParser options(argc, argv, category);
+  auto ExpectedParser = CommonOptionsParser::create(
+      argc, argv, category, llvm::cl::OneOrMore, nullptr);
+  if (!ExpectedParser) {
+    llvm::errs() << ExpectedParser.takeError();
+    return 1;
+  }
+  CommonOptionsParser& options = ExpectedParser.get();
   std::unique_ptr<clang::tooling::FrontendActionFactory> frontend_factory =
       clang::tooling::newFrontendActionFactory<CompilationIndexerAction>();
   clang::tooling::ClangTool tool(options.getCompilations(),
diff --git a/chromium/tools/code_coverage/OWNERS b/chromium/tools/code_coverage/OWNERS
index 69ae6f43f9c..56f84aae402 100644
--- a/chromium/tools/code_coverage/OWNERS
+++ b/chromium/tools/code_coverage/OWNERS
@@ -1,5 +1,4 @@
 liaoyuke@chromium.org
 robertocn@chromium.org
 nodir@chromium.org
-mmoroz@chromium.org
-inferno@chromium.org
\ No newline at end of file
+inferno@chromium.org
diff --git a/chromium/tools/code_coverage/coverage.py b/chromium/tools/code_coverage/coverage.py
index f8404565d00..f574812b86a 100755
--- a/chromium/tools/code_coverage/coverage.py
+++ b/chromium/tools/code_coverage/coverage.py
@@ -187,6 +187,11 @@ def _GetTargetOS():
   return build_args['target_os'] if 'target_os' in build_args else ''
 
 
+def _IsAndroid():
+  """Returns true if the target_os specified in args.gn file is android"""
+  return _GetTargetOS() == 'android'
+
+
 def _IsIOS():
   """Returns true if the target_os specified in args.gn file is ios"""
   return _GetTargetOS() == 'ios'
@@ -351,6 +356,12 @@ def _GetTargetProfDataPathsByExecutingCommands(targets, commands):
       profraw_file_paths = []
       if _IsIOS():
         profraw_file_paths = [_GetProfrawDataFileByParsingOutput(output)]
+      elif _IsAndroid():
+        android_coverage_dir = os.path.join(BUILD_DIR, 'coverage')
+        for r, _, files in os.walk(android_coverage_dir):
+          for f in files:
+            if f.endswith(PROFRAW_FILE_EXTENSION):
+              profraw_file_paths.append(os.path.join(r, f))
       else:
         for file_or_dir in os.listdir(report_root_dir):
           if file_or_dir.endswith(PROFRAW_FILE_EXTENSION):
@@ -571,7 +582,6 @@ def _CreateTargetProfDataFileFromProfRawFiles(target, profraw_file_paths):
         LLVM_PROFDATA_PATH, 'merge', '-o', profdata_file_path, '-sparse=true'
     ]
     subprocess_cmd.extend(profraw_file_paths)
-
     output = subprocess.check_output(subprocess_cmd)
     logging.debug('Merge output: %s', output)
   except subprocess.CalledProcessError as error:
@@ -706,9 +716,10 @@ def _ValidateCurrentPlatformIsSupported():
   else:
     current_platform = coverage_utils.GetHostPlatform()
 
-  assert current_platform in [
-      'linux', 'mac', 'chromeos', 'ios', 'win'
-  ], ('Coverage is only supported on linux, mac, chromeos, ios and win.')
+  supported_platforms = ['android', 'chromeos', 'ios', 'linux', 'mac', 'win']
+  assert current_platform in supported_platforms, ('Coverage is only'
+                                                   'supported on %s' %
+                                                   supported_platforms)
 
 
 def _GetBuildArgs():
@@ -763,8 +774,8 @@ def _VerifyPathsAndReturnAbsolutes(paths):
 
 def _GetBinaryPathsFromTargets(targets, build_dir):
   """Return binary paths from target names."""
-  # FIXME: Derive output binary from target build definitions rather than
-  # assuming that it is always the same name.
+  # TODO(crbug.com/899974): Derive output binary from target build definitions
+  # rather than assuming that it is always the same name.
   binary_paths = []
   for target in targets:
     binary_path = os.path.join(build_dir, target)
@@ -798,6 +809,20 @@ def _GetCommandForWebTests(arguments):
   return ' '.join(command_list)
 
 
+def _GetBinaryPathsForAndroid(targets):
+  """Return binary paths used when running android tests."""
+  # TODO(crbug.com/899974): Implement approach that doesn't assume .so file is
+  # based on the target's name.
+  android_binaries = set()
+  for target in targets:
+    so_library_path = os.path.join(BUILD_DIR, 'lib.unstripped',
+                                   'lib%s__library.so' % target)
+    if os.path.exists(so_library_path):
+      android_binaries.add(so_library_path)
+
+  return list(android_binaries)
+
+
 def _GetBinaryPathForWebTests():
   """Return binary path used to run blink web tests."""
   host_platform = coverage_utils.GetHostPlatform()
@@ -1035,7 +1060,10 @@ def Main():
         'otool')
     if os.path.exists(hermetic_otool_path):
       otool_path = hermetic_otool_path
-  if sys.platform.startswith('linux') or sys.platform.startswith('darwin'):
+
+  if _IsAndroid():
+    binary_paths = _GetBinaryPathsForAndroid(args.targets)
+  elif sys.platform.startswith('linux') or sys.platform.startswith('darwin'):
     binary_paths.extend(
         coverage_utils.GetSharedLibraries(binary_paths, BUILD_DIR, otool_path))
 
diff --git a/chromium/tools/cygprofile/PRESUBMIT.py b/chromium/tools/cygprofile/PRESUBMIT.py
index 0b69bb9c7d8..90e23d00d2f 100644
--- a/chromium/tools/cygprofile/PRESUBMIT.py
+++ b/chromium/tools/cygprofile/PRESUBMIT.py
@@ -11,9 +11,11 @@ for more details on the presubmit API built into depot_tools.
 
 def CommonChecks(input_api, output_api):
   output = []
-  blacklist = []
-  output.extend(input_api.canned_checks.RunPylint(
-      input_api, output_api, black_list=blacklist))
+  files_to_skip = []
+  output.extend(
+      input_api.canned_checks.RunPylint(input_api,
+                                        output_api,
+                                        files_to_skip=files_to_skip))
   output.extend(input_api.canned_checks.RunUnitTests(
       input_api,
       output_api,
diff --git a/chromium/tools/cygprofile_win/BUILD.gn b/chromium/tools/cygprofile_win/BUILD.gn
deleted file mode 100644
index 99b23c5fb8d..00000000000
--- a/chromium/tools/cygprofile_win/BUILD.gn
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-static_library("cygprofile_win") {
-  sources = [ "cygprofile.cc" ]
-
-  # Don't instrument this library.
-  configs -= [ "//build/config/win:default_cygprofile_instrumentation" ]
-}
diff --git a/chromium/tools/cygprofile_win/OWNERS b/chromium/tools/cygprofile_win/OWNERS
deleted file mode 100644
index 8d8029eabcb..00000000000
--- a/chromium/tools/cygprofile_win/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-hans@chromium.org
diff --git a/chromium/tools/cygprofile_win/cygprofile.cc b/chromium/tools/cygprofile_win/cygprofile.cc
deleted file mode 100644
index 87045a75fde..00000000000
--- a/chromium/tools/cygprofile_win/cygprofile.cc
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <stdio.h>
-#include <atomic>
-#include <string>
-#include <unordered_set>
-
-#include <windows.h>  // Needs to be included before the others.
-
-#include <dbghelp.h>
-#include <process.h>
-
-namespace {
-
-// The main purpose of the order file is to optimize startup time,
-// so capturing the first N function calls is enough.
-static constexpr int kSamplesCapacity = 25 * 1024 * 1024;
-
-void* samples[kSamplesCapacity];
-std::atomic_int num_samples;
-std::atomic_int done;
-
-// Path to the dump file. %lu will be substituted by the process id.
-static const char kDumpFile[] = "/src/tmp/cygprofile_%lu.txt";
-
-// Symbolize the samples and write them to disk.
-void dump(void*) {
-  HMODULE dbghelp = LoadLibraryA("dbghelp.dll");
-  auto sym_from_addr = reinterpret_cast<decltype(::SymFromAddr)*>(
-      ::GetProcAddress(dbghelp, "SymFromAddr"));
-  auto sym_initialize = reinterpret_cast<decltype(::SymInitialize)*>(
-      ::GetProcAddress(dbghelp, "SymInitialize"));
-  auto sym_set_options = reinterpret_cast<decltype(::SymSetOptions)*>(
-      ::GetProcAddress(dbghelp, "SymSetOptions"));
-
-  char filename[MAX_PATH];
-  snprintf(filename, sizeof(filename), kDumpFile, ::GetCurrentProcessId());
-  FILE* f = fopen(filename, "w");
-  if (!f)
-    return;
-
-  sym_initialize(::GetCurrentProcess(), NULL, TRUE);
-  sym_set_options(SYMOPT_DEFERRED_LOADS | SYMOPT_PUBLICS_ONLY);
-  char sym_buf[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(TCHAR)];
-
-  std::unordered_set<void*> seen;
-  std::unordered_set<std::string> seen_names;
-
-  for (void* sample : samples) {
-    // Only print the first call of a function.
-    if (seen.count(sample))
-      continue;
-    seen.insert(sample);
-
-    SYMBOL_INFO* symbol = reinterpret_cast<SYMBOL_INFO*>(sym_buf);
-    symbol->SizeOfStruct = sizeof(SYMBOL_INFO);
-    symbol->MaxNameLen = MAX_SYM_NAME;
-    DWORD64 offset = 0;
-
-    if (sym_from_addr(::GetCurrentProcess(), reinterpret_cast<DWORD64>(sample),
-                      &offset, symbol)) {
-      const char* name = symbol->Name;
-      if (name[0] == '_')
-        name++;
-      if (seen_names.count(name))
-        continue;
-      seen_names.insert(name);
-
-      fprintf(f, "%s\n", name);
-    }
-  }
-
-  fclose(f);
-}
-
-}  // namespace
-
-extern "C" {
-
-void __cyg_profile_func_enter(void* this_fn, void* call_site_unused) {
-  if (done)
-    return;
-
-  // Get our index for the samples array atomically.
-  int n = num_samples++;
-
-  if (n < kSamplesCapacity) {
-    samples[n] = this_fn;
-
-    if (n + 1 == kSamplesCapacity) {
-      // This is the final sample; start dumping the samples to a file (on a
-      // separate thread so as not to disturb the main program).
-      done = 1;
-      _beginthread(dump, 0, nullptr);
-    }
-  }
-}
-
-void __cyg_profile_func_exit(void* this_fn, void* call_site) {}
-
-}  // extern "C"
diff --git a/chromium/tools/determinism/deterministic_build_ignorelist.pyl b/chromium/tools/determinism/deterministic_build_ignorelist.pyl
index cebd74516af..36a2de62c9c 100644
--- a/chromium/tools/determinism/deterministic_build_ignorelist.pyl
+++ b/chromium/tools/determinism/deterministic_build_ignorelist.pyl
@@ -203,6 +203,10 @@
     'mini_installer.exe.pdb',
     'previous_version_mini_installer.exe',
 
+    # https://crbug.com/1163310
+    r'swiftshader\libGLESv2.dll',
+    r'swiftshader\libGLESv2.dll.pdb',
+
     # These probably have mtimes in the zip headers and the scripts creating
     # them probably should use build_utils.ZipDir() instead.
     'mini_installer_tests.zip',
diff --git a/chromium/tools/find_runtime_symbols/PRESUBMIT.py b/chromium/tools/find_runtime_symbols/PRESUBMIT.py
index 3a29a5aae5a..62288643be0 100644
--- a/chromium/tools/find_runtime_symbols/PRESUBMIT.py
+++ b/chromium/tools/find_runtime_symbols/PRESUBMIT.py
@@ -26,9 +26,10 @@ def CommonChecks(input_api, output_api):
 
   output.extend(
       input_api.canned_checks.RunUnitTestsInDirectory(
-          input_api, output_api,
+          input_api,
+          output_api,
           input_api.os_path.join(input_api.PresubmitLocalPath(), 'tests'),
-          whitelist=[r'.+_test\.py$']))
+          files_to_check=[r'.+_test\.py$']))
 
   if input_api.is_committing:
     output.extend(input_api.canned_checks.PanProjectChecks(input_api,
diff --git a/chromium/tools/find_runtime_symbols/find_runtime_symbols.py b/chromium/tools/find_runtime_symbols/find_runtime_symbols.py
index ba32d0c266f..51d129ec787 100755
--- a/chromium/tools/find_runtime_symbols/find_runtime_symbols.py
+++ b/chromium/tools/find_runtime_symbols/find_runtime_symbols.py
@@ -44,11 +44,11 @@ _FILES_FILENAME = 'files.json'
 
 class RuntimeSymbolsInProcess(object):
   def __init__(self):
-    self._maps = None
+    self.maps = None
     self._static_symbols_in_filse = {}
 
   def find_procedure(self, runtime_address):
-    for vma in self._maps.iter(ProcMaps.executable):
+    for vma in self.maps.iter(ProcMaps.executable):
       if vma.begin <= runtime_address < vma.end:
         static_symbols = self._static_symbols_in_filse.get(vma.name)
         if static_symbols:
@@ -59,7 +59,7 @@ class RuntimeSymbolsInProcess(object):
     return None
 
   def find_sourcefile(self, runtime_address):
-    for vma in self._maps.iter(ProcMaps.executable):
+    for vma in self.maps.iter(ProcMaps.executable):
       if vma.begin <= runtime_address < vma.end:
         static_symbols = self._static_symbols_in_filse.get(vma.name)
         if static_symbols:
@@ -70,7 +70,7 @@ class RuntimeSymbolsInProcess(object):
     return None
 
   def find_typeinfo(self, runtime_address):
-    for vma in self._maps.iter(ProcMaps.constants):
+    for vma in self.maps.iter(ProcMaps.constants):
       if vma.begin <= runtime_address < vma.end:
         static_symbols = self._static_symbols_in_filse.get(vma.name)
         if static_symbols:
@@ -85,12 +85,12 @@ class RuntimeSymbolsInProcess(object):
     symbols_in_process = RuntimeSymbolsInProcess()
 
     with open(os.path.join(prepared_data_dir, _MAPS_FILENAME), mode='r') as f:
-      symbols_in_process._maps = ProcMaps.load_file(f)
+      symbols_in_process.maps = ProcMaps.load_file(f)
     with open(os.path.join(prepared_data_dir, _FILES_FILENAME), mode='r') as f:
       files = json.load(f)
 
     # pylint: disable=W0212
-    for vma in symbols_in_process._maps.iter(ProcMaps.executable_and_constants):
+    for vma in symbols_in_process.maps.iter(ProcMaps.executable_and_constants):
       file_entry = files.get(vma.name)
       if not file_entry:
         continue
diff --git a/chromium/tools/grit/PRESUBMIT.py b/chromium/tools/grit/PRESUBMIT.py
index cf8f3a7a3a0..d82b5b3c32f 100644
--- a/chromium/tools/grit/PRESUBMIT.py
+++ b/chromium/tools/grit/PRESUBMIT.py
@@ -16,7 +16,7 @@ def RunUnittests(input_api, output_api):
       output_api, [
           input_api.os_path.join('grit', 'test_suite_all.py'),
           input_api.os_path.join(input_api.PresubmitLocalPath(),
-                                 'preprocess_grit_test.py')
+                                 'preprocess_if_expr_test.py')
       ],
       run_on_python3=False)  # See https://crbug.com/1145395.
 
diff --git a/chromium/tools/grit/grit/clique.py b/chromium/tools/grit/grit/clique.py
index e7be3ec164f..16e82b5aa13 100644
--- a/chromium/tools/grit/grit/clique.py
+++ b/chromium/tools/grit/grit/clique.py
@@ -16,7 +16,7 @@ from grit import constants
 from grit import exception
 from grit import lazy_re
 from grit import pseudo
-from grit import pseudo_rtl
+from grit import pseudolocales
 from grit import tclib
 
 
@@ -399,8 +399,11 @@ class MessageClique(object):
       if lang == msglang:
         return self.clique[msglang]
 
-    if lang == constants.FAKE_BIDI:
-      return pseudo_rtl.PseudoRTLMessage(self.GetMessage())
+    if pseudo_if_no_match:
+      if lang == constants.PSEUDOLOCALE_LONG_STRINGS:
+        return pseudolocales.PseudoLongStringMessage(self.GetMessage())
+      elif lang == constants.PSEUDOLOCALE_RTL:
+        return pseudolocales.PseudoRTLMessage(self.GetMessage())
 
     if fallback_to_english:
       self.uber_clique._AddMissingTranslation(lang, self, is_error=False)
diff --git a/chromium/tools/grit/grit/constants.py b/chromium/tools/grit/grit/constants.py
index 8229c94b093..1a82faf9393 100644
--- a/chromium/tools/grit/grit/constants.py
+++ b/chromium/tools/grit/grit/constants.py
@@ -15,7 +15,9 @@ ENCODING_CHECK = u'm\u00f6l'
 # A special language, translations into which are always "TTTTTT".
 CONSTANT_LANGUAGE = 'x_constant'
 
-FAKE_BIDI = 'fake-bidi'
+PSEUDOLOCALE_LONG_STRINGS = 'en-XA'
+PSEUDOLOCALE_RTL = 'ar-XB'
+PSEUDOLOCALES = [PSEUDOLOCALE_LONG_STRINGS, PSEUDOLOCALE_RTL]
 
 # Magic number added to the header of resources brotli compressed by grit. Used
 # to easily identify resources as being brotli compressed. See
diff --git a/chromium/tools/grit/grit/format/chrome_messages_json.py b/chromium/tools/grit/grit/format/chrome_messages_json.py
index 88ec1d914bd..8be72720e07 100644
--- a/chromium/tools/grit/grit/format/chrome_messages_json.py
+++ b/chromium/tools/grit/grit/format/chrome_messages_json.py
@@ -27,11 +27,11 @@ def Format(root, lang='en', output_dir='.'):
         id = id[4:]
 
       translation_missing = child.GetCliques()[0].clique.get(lang) is None;
-      if (child.ShouldFallbackToEnglish() and translation_missing and
-          lang != constants.FAKE_BIDI):
-          # Skip the string if it's not translated. Chrome will fallback
-          # to English automatically.
-          continue
+      if (child.ShouldFallbackToEnglish() and translation_missing
+          and lang not in constants.PSEUDOLOCALES):
+        # Skip the string if it's not translated. Chrome will fallback
+        # to English automatically.
+        continue
 
       loc_message = encoder.encode(child.ws_at_start + child.Translate(lang) +
                                    child.ws_at_end)
diff --git a/chromium/tools/grit/grit/format/data_pack.py b/chromium/tools/grit/grit/format/data_pack.py
index 2876462bfe8..cfb01561442 100755
--- a/chromium/tools/grit/grit/format/data_pack.py
+++ b/chromium/tools/grit/grit/format/data_pack.py
@@ -283,7 +283,10 @@ def RePackFromDataPackStrings(inputs,
     # Make sure we have no dups.
     duplicate_keys = set(input_resources.keys()) & set(resources.keys())
     if duplicate_keys:
-      raise KeyError('Duplicate keys: ' + str(list(duplicate_keys)))
+      raise KeyError(
+        'Duplicate resource IDs: ' + str(list(duplicate_keys)) + '. '
+        'This is likely because the reserved ID ranges defined in' +
+        'tools/gritsettings/resource_ids.spec have been exhausted.')
 
     # Make sure encoding is consistent.
     if encoding in (None, BINARY):
diff --git a/chromium/tools/grit/grit/format/html_inline.py b/chromium/tools/grit/grit/format/html_inline.py
index da55216ea4b..cd1fe1f3cee 100755
--- a/chromium/tools/grit/grit/format/html_inline.py
+++ b/chromium/tools/grit/grit/format/html_inline.py
@@ -255,6 +255,52 @@ class InlinedData:
     self.inlined_data = inlined_data
     self.inlined_files = inlined_files
 
+
+def CheckConditionalElements(grd_node, str):
+  def IsConditionSatisfied(src_match):
+    expr1 = src_match.group('expr1') or ''
+    expr2 = src_match.group('expr2') or ''
+    return grd_node is None or grd_node.EvaluateCondition(expr1 + expr2)
+
+  """Helper function to conditionally inline inner elements"""
+  while True:
+    begin_if = _BEGIN_IF_BLOCK.search(str)
+    if begin_if is None:
+      if _END_IF_BLOCK.search(str) is not None:
+        raise Exception('Unmatched </if>')
+      return str
+
+    condition_satisfied = IsConditionSatisfied(begin_if)
+    leading = str[0:begin_if.start()]
+    content_start = begin_if.end()
+
+    # Find matching "if" block end.
+    count = 1
+    pos = begin_if.end()
+    while True:
+      end_if = _END_IF_BLOCK.search(str, pos)
+      if end_if is None:
+        raise Exception('Unmatched <if>')
+
+      next_if = _BEGIN_IF_BLOCK.search(str, pos)
+      if next_if is None or next_if.start() >= end_if.end():
+        count = count - 1
+        if count == 0:
+          break
+        pos = end_if.end()
+      else:
+        count = count + 1
+        pos = next_if.end()
+
+    content = str[content_start:end_if.start()]
+    trailing = str[end_if.end():]
+
+    if condition_satisfied:
+      str = leading + CheckConditionalElements(grd_node, content) + trailing
+    else:
+      str = leading + trailing
+
+
 def DoInline(
     input_filename, grd_node, allow_external_script=False,
     preprocess_only=False, names_only=False, strip_whitespace=False,
@@ -317,50 +363,6 @@ def DoInline(
       filename = filename_expansion_function(filename)
     return os.path.normpath(os.path.join(base_path, filename))
 
-  def IsConditionSatisfied(src_match):
-    expr1 = src_match.group('expr1') or ''
-    expr2 = src_match.group('expr2') or ''
-    return grd_node is None or grd_node.EvaluateCondition(expr1 + expr2)
-
-  def CheckConditionalElements(str):
-    """Helper function to conditionally inline inner elements"""
-    while True:
-      begin_if = _BEGIN_IF_BLOCK.search(str)
-      if begin_if is None:
-        if _END_IF_BLOCK.search(str) is not None:
-          raise Exception('Unmatched </if>')
-        return str
-
-      condition_satisfied = IsConditionSatisfied(begin_if)
-      leading = str[0:begin_if.start()]
-      content_start = begin_if.end()
-
-      # Find matching "if" block end.
-      count = 1
-      pos = begin_if.end()
-      while True:
-        end_if = _END_IF_BLOCK.search(str, pos)
-        if end_if is None:
-          raise Exception('Unmatched <if>')
-
-        next_if = _BEGIN_IF_BLOCK.search(str, pos)
-        if next_if is None or next_if.start() >= end_if.end():
-          count = count - 1
-          if count == 0:
-            break
-          pos = end_if.end()
-        else:
-          count = count + 1
-          pos = next_if.end()
-
-      content = str[content_start:end_if.start()]
-      trailing = str[end_if.end():]
-
-      if condition_satisfied:
-        str = leading + CheckConditionalElements(content) + trailing
-      else:
-        str = leading + trailing
-
   def InlineFileContents(src_match,
                          pattern,
                          inlined_files=inlined_files,
@@ -483,7 +485,7 @@ def DoInline(
   # this twice. The first pass is so that we don't even bother calling
   # InlineScript, InlineCSSFile and InlineIncludeFiles on text we're eventually
   # going to throw out anyway.
-  flat_text = CheckConditionalElements(flat_text)
+  flat_text = CheckConditionalElements(grd_node, flat_text)
 
   flat_text = _INCLUDE_RE.sub(InlineIncludeFiles, flat_text)
 
@@ -506,7 +508,7 @@ def DoInline(
 
   # Check conditional elements, second pass. This catches conditionals in any
   # of the text we just inlined.
-  flat_text = CheckConditionalElements(flat_text)
+  flat_text = CheckConditionalElements(grd_node, flat_text)
 
   # Allow custom modifications before inlining images.
   if rewrite_function:
diff --git a/chromium/tools/grit/grit/format/rc.py b/chromium/tools/grit/grit/format/rc.py
index ed32bb809ef..be8efcd6970 100644
--- a/chromium/tools/grit/grit/format/rc.py
+++ b/chromium/tools/grit/grit/format/rc.py
@@ -163,7 +163,10 @@ _LANGUAGE_CHARSET_PAIR = {
   'gl'          : '045604e4',
   # No codepage for Zulu, use unicode(1200).
   'zu'          : '043504b0',
-  'fake-bidi'   : '040d04e7',
+
+  # Pseudolocales
+  'ar-XB'       : '040d04e7',
+  'en-XA'       : '040904b0',
 }
 
 # Language ID resource: http://msdn.microsoft.com/en-us/library/ms776294.aspx
@@ -250,7 +253,10 @@ _LANGUAGE_DIRECTIVE_PAIR = {
   'si'          : 'LANG_SINHALESE, SUBLANG_SINHALESE_SRI_LANKA',
   'ne'          : 'LANG_NEPALI, SUBLANG_NEPALI_NEPAL',
   'ti'          : 'LANG_TIGRIGNA, SUBLANG_TIGRIGNA_ERITREA',
-  'fake-bidi'   : 'LANG_HEBREW, SUBLANG_DEFAULT',
+
+  # Pseudolocales
+  'ar-XB'       : 'LANG_HEBREW, SUBLANG_DEFAULT',
+  'en-XA'       : 'LANG_ENGLISH, SUBLANG_ENGLISH_US',
 }
 
 # A note on 'no-specific-language' in the following few functions:
diff --git a/chromium/tools/grit/grit/format/resource_map.py b/chromium/tools/grit/grit/format/resource_map.py
index 35cce409159..eaaef28ae20 100644
--- a/chromium/tools/grit/grit/format/resource_map.py
+++ b/chromium/tools/grit/grit/format/resource_map.py
@@ -54,17 +54,13 @@ def _FormatHeader(root, lang='en', output_dir='.'):
 
 #include <stddef.h>
 
-#ifndef GRIT_RESOURCE_MAP_STRUCT_
-#define GRIT_RESOURCE_MAP_STRUCT_
-struct GritResourceMap {
-  const char* const name;
-  int value;
-};
-#endif // GRIT_RESOURCE_MAP_STRUCT_
+#include "ui/base/webui/resource_path.h"
 
-extern const GritResourceMap %(map_name)s[];
+extern const webui::ResourcePath %(map_name)s[];
 extern const size_t %(map_name)sSize;
-''' % { 'map_name': GetMapName(root) }
+''' % {
+      'map_name': GetMapName(root)
+  }
 
 
 def _FormatSourceHeader(root, output_dir):
@@ -93,11 +89,12 @@ def _FormatSourceHeader(root, output_dir):
 
 #include "%(rc_header_file)s"
 
-const GritResourceMap %(map_name)s[] = {
-''' % { 'map_header_file': map_header_file,
-        'rc_header_file': rc_header_file,
-        'map_name': GetMapName(root),
-      }
+const webui::ResourcePath %(map_name)s[] = {
+''' % {
+      'map_header_file': map_header_file,
+      'rc_header_file': rc_header_file,
+      'map_name': GetMapName(root),
+  }
 
 
 def _FormatSourceFooter(root):
@@ -129,13 +126,6 @@ def _FormatSource(get_key, root, lang, output_dir):
 def _GetItemName(item):
   return item.attrs['name']
 
-# Check if |path2| is a subpath of |path1|.
-def _IsSubpath(path1, path2):
-  path1_abs = os.path.abspath(path1)
-  path2_abs = os.path.abspath(path2)
-  common = os.path.commonprefix([path1_abs, path2_abs])
-  return path1_abs == common
-
 def _GetItemPath(item):
   resource_path = item.attrs.get('resource_path', '')
   if resource_path:
@@ -143,21 +133,14 @@ def _GetItemPath(item):
 
   path = item.GetInputPath().replace("\\", "/")
 
-  # Handle the case where the file resides within the output folder,
-  # by expanding any variables as well as replacing the output folder name with
-  # a fixed string such that the key added to the map does not depend on a given
-  # developer's setup.
-  #
-  # For example this will convert the following path:
-  # ../../out/gchrome/${root_gen_dir}/ui/webui/resources/js/foo.js
-  # to:
-  # @out_folder@/gen/ui/webui/resources/js/foo.js
-
-  real_path = item.ToRealPath(item.GetInputPath())
-  if (item.attrs.get('use_base_dir', 'true') != 'true' and
-          _IsSubpath(os.path.curdir, real_path)):
-    path = os.path.join(
-        '@out_folder@', os.path.relpath(real_path)).replace("\\", "/")
+  # For the case of generated files such as
+  # out/gchrome/${root_gen_dir}/ui/webui/resources/js/foo.js
+  # |resource_path| must be provided. It will be used as the |path| in the
+  # generated ResourcePath entry. For WebUI files, it will also be used as
+  # the URL subpath under which a file will be served at runtime.
+  assert item.attrs.get('use_base_dir', 'true') == 'true', \
+      'resource_path attribute missing for %s. Generated files must specify' \
+      ' resource_path' % item.attrs.get('name')
 
   assert '$' not in path, 'all variables should have been expanded'
   return path
diff --git a/chromium/tools/grit/grit/format/resource_map_unittest.py b/chromium/tools/grit/grit/format/resource_map_unittest.py
index 3531a8e78d5..4b2c2d2a99b 100755
--- a/chromium/tools/grit/grit/format/resource_map_unittest.py
+++ b/chromium/tools/grit/grit/format/resource_map_unittest.py
@@ -51,25 +51,21 @@ class FormatResourceMapUnittest(unittest.TestCase):
        </release>''', run_gatherers=True)
     output = util.StripBlankLinesAndComments(''.join(
         resource_map.GetFormatter('resource_map_header')(grd, 'en', '.')))
-    self.assertEqual('''\
+    self.assertEqual(
+        '''\
 #include <stddef.h>
-#ifndef GRIT_RESOURCE_MAP_STRUCT_
-#define GRIT_RESOURCE_MAP_STRUCT_
-struct GritResourceMap {
-  const char* const name;
-  int value;
-};
-#endif // GRIT_RESOURCE_MAP_STRUCT_
-extern const GritResourceMap kTheRcHeader[];
+#include "ui/base/webui/resource_path.h"
+extern const webui::ResourcePath kTheRcHeader[];
 extern const size_t kTheRcHeaderSize;''', output)
     output = util.StripBlankLinesAndComments(''.join(
         resource_map.GetFormatter('resource_map_source')(grd, 'en', '.')))
-    self.assertEqual('''\
+    self.assertEqual(
+        '''\
 #include "the_resource_map_header.h"
 #include <stddef.h>
 #include "base/stl_util.h"
 #include "the_rc_header.h"
-const GritResourceMap kTheRcHeader[] = {
+const webui::ResourcePath kTheRcHeader[] = {
   {"IDC_KLONKMENU", IDC_KLONKMENU},
   {"IDS_FIRSTPRESENT", IDS_FIRSTPRESENT},
   {"IDS_WITHRESOURCEPATH", IDS_WITHRESOURCEPATH},
@@ -79,12 +75,13 @@ const GritResourceMap kTheRcHeader[] = {
 const size_t kTheRcHeaderSize = base::size(kTheRcHeader);''', output)
     output = util.StripBlankLinesAndComments(''.join(
         resource_map.GetFormatter('resource_file_map_source')(grd, 'en', '.')))
-    self.assertEqual('''\
+    self.assertEqual(
+        '''\
 #include "the_resource_map_header.h"
 #include <stddef.h>
 #include "base/stl_util.h"
 #include "the_rc_header.h"
-const GritResourceMap kTheRcHeader[] = {
+const webui::ResourcePath kTheRcHeader[] = {
   {"grit/testdata/klonk.rc", IDC_KLONKMENU},
   {"abc", IDS_FIRSTPRESENT},
   {"new_path/rst_resource", IDS_WITHRESOURCEPATH},
@@ -112,18 +109,11 @@ const size_t kTheRcHeaderSize = base::size(kTheRcHeader);''', output)
          </includes>
         </release>''', run_gatherers=True)
 
-    formatter = resource_map.GetFormatter('resource_file_map_source')
-    output = util.StripBlankLinesAndComments(''.join(formatter(grd, 'en', '.')))
-    expected = '''\
-#include "resource_map_header.h"
-#include <stddef.h>
-#include "base/stl_util.h"
-#include "the_rc_header.h"
-const GritResourceMap kTheRcHeader[] = {
-  {"@out_folder@/gen/foo/bar/baz.js", IDR_FOO_BAR_BAZ_JS},
-};
-const size_t kTheRcHeaderSize = base::size(kTheRcHeader);'''
-    self.assertEqual(expected, output)
+    with self.assertRaises(AssertionError) as assertion_error:
+      formatter = resource_map.GetFormatter('resource_file_map_source')
+      util.StripBlankLinesAndComments(''.join(formatter(grd, 'en', '.')))
+    self.assertTrue(str(assertion_error.exception). \
+        startswith('resource_path attribute missing for IDR_FOO_BAR_BAZ_JS'))
 
   def testFormatResourceMapWithOutputAllEqualsFalseForStructures(self):
     grd = util.ParseGrdForUnittest('''
@@ -168,25 +158,21 @@ const size_t kTheRcHeaderSize = base::size(kTheRcHeader);'''
         </release>''', run_gatherers=True)
     output = util.StripBlankLinesAndComments(''.join(
         resource_map.GetFormatter('resource_map_header')(grd, 'en', '.')))
-    self.assertEqual('''\
+    self.assertEqual(
+        '''\
 #include <stddef.h>
-#ifndef GRIT_RESOURCE_MAP_STRUCT_
-#define GRIT_RESOURCE_MAP_STRUCT_
-struct GritResourceMap {
-  const char* const name;
-  int value;
-};
-#endif // GRIT_RESOURCE_MAP_STRUCT_
-extern const GritResourceMap kTheRcHeader[];
+#include "ui/base/webui/resource_path.h"
+extern const webui::ResourcePath kTheRcHeader[];
 extern const size_t kTheRcHeaderSize;''', output)
     output = util.StripBlankLinesAndComments(''.join(
         resource_map.GetFormatter('resource_map_source')(grd, 'en', '.')))
-    self.assertEqual('''\
+    self.assertEqual(
+        '''\
 #include "the_resource_map_header.h"
 #include <stddef.h>
 #include "base/stl_util.h"
 #include "the_rc_header.h"
-const GritResourceMap kTheRcHeader[] = {
+const webui::ResourcePath kTheRcHeader[] = {
   {"IDR_KLONKMENU", IDR_KLONKMENU},
   {"IDR_BLOB", IDR_BLOB},
   {"IDR_METEOR", IDR_METEOR},
@@ -195,12 +181,13 @@ const GritResourceMap kTheRcHeader[] = {
 const size_t kTheRcHeaderSize = base::size(kTheRcHeader);''', output)
     output = util.StripBlankLinesAndComments(''.join(
         resource_map.GetFormatter('resource_map_source')(grd, 'en', '.')))
-    self.assertEqual('''\
+    self.assertEqual(
+        '''\
 #include "the_resource_map_header.h"
 #include <stddef.h>
 #include "base/stl_util.h"
 #include "the_rc_header.h"
-const GritResourceMap kTheRcHeader[] = {
+const webui::ResourcePath kTheRcHeader[] = {
   {"IDR_KLONKMENU", IDR_KLONKMENU},
   {"IDR_BLOB", IDR_BLOB},
   {"IDR_METEOR", IDR_METEOR},
@@ -247,25 +234,21 @@ const size_t kTheRcHeaderSize = base::size(kTheRcHeader);''', output)
         </release>''', run_gatherers=True)
     output = util.StripBlankLinesAndComments(''.join(
         resource_map.GetFormatter('resource_map_header')(grd, 'en', '.')))
-    self.assertEqual('''\
+    self.assertEqual(
+        '''\
 #include <stddef.h>
-#ifndef GRIT_RESOURCE_MAP_STRUCT_
-#define GRIT_RESOURCE_MAP_STRUCT_
-struct GritResourceMap {
-  const char* const name;
-  int value;
-};
-#endif // GRIT_RESOURCE_MAP_STRUCT_
-extern const GritResourceMap kTheRcHeader[];
+#include "ui/base/webui/resource_path.h"
+extern const webui::ResourcePath kTheRcHeader[];
 extern const size_t kTheRcHeaderSize;''', output)
     output = util.StripBlankLinesAndComments(''.join(
         resource_map.GetFormatter('resource_map_source')(grd, 'en', '.')))
-    self.assertEqual('''\
+    self.assertEqual(
+        '''\
 #include "the_resource_map_header.h"
 #include <stddef.h>
 #include "base/stl_util.h"
 #include "the_rc_header.h"
-const GritResourceMap kTheRcHeader[] = {
+const webui::ResourcePath kTheRcHeader[] = {
   {"IDC_KLONKMENU", IDC_KLONKMENU},
   {"IDS_FIRSTPRESENT", IDS_FIRSTPRESENT},
   {"IDS_THIRDPRESENT", IDS_THIRDPRESENT},
@@ -276,12 +259,13 @@ const GritResourceMap kTheRcHeader[] = {
 const size_t kTheRcHeaderSize = base::size(kTheRcHeader);''', output)
     output = util.StripBlankLinesAndComments(''.join(
         resource_map.GetFormatter('resource_file_map_source')(grd, 'en', '.')))
-    self.assertEqual('''\
+    self.assertEqual(
+        '''\
 #include "the_resource_map_header.h"
 #include <stddef.h>
 #include "base/stl_util.h"
 #include "the_rc_header.h"
-const GritResourceMap kTheRcHeader[] = {
+const webui::ResourcePath kTheRcHeader[] = {
   {"grit/testdata/klonk.rc", IDC_KLONKMENU},
   {"abc", IDS_FIRSTPRESENT},
   {"mno", IDS_THIRDPRESENT},
@@ -320,25 +304,21 @@ const size_t kTheRcHeaderSize = base::size(kTheRcHeader);''', output)
     grd.InitializeIds()
     output = util.StripBlankLinesAndComments(''.join(
         resource_map.GetFormatter('resource_map_header')(grd, 'en', '.')))
-    self.assertEqual('''\
+    self.assertEqual(
+        '''\
 #include <stddef.h>
-#ifndef GRIT_RESOURCE_MAP_STRUCT_
-#define GRIT_RESOURCE_MAP_STRUCT_
-struct GritResourceMap {
-  const char* const name;
-  int value;
-};
-#endif // GRIT_RESOURCE_MAP_STRUCT_
-extern const GritResourceMap kTheRcHeader[];
+#include "ui/base/webui/resource_path.h"
+extern const webui::ResourcePath kTheRcHeader[];
 extern const size_t kTheRcHeaderSize;''', output)
     output = util.StripBlankLinesAndComments(''.join(
         resource_map.GetFormatter('resource_map_source')(grd, 'en', '.')))
-    self.assertEqual('''\
+    self.assertEqual(
+        '''\
 #include "the_rc_map_header.h"
 #include <stddef.h>
 #include "base/stl_util.h"
 #include "the_rc_header.h"
-const GritResourceMap kTheRcHeader[] = {
+const webui::ResourcePath kTheRcHeader[] = {
   {"IDS_PRODUCT_NAME", IDS_PRODUCT_NAME},
   {"IDS_DEFAULT_TAB_TITLE_TITLE_CASE", IDS_DEFAULT_TAB_TITLE_TITLE_CASE},
 };
diff --git a/chromium/tools/grit/grit/node/include.py b/chromium/tools/grit/grit/node/include.py
index 98a6cacd7f5..e4c73883eee 100644
--- a/chromium/tools/grit/grit/node/include.py
+++ b/chromium/tools/grit/grit/node/include.py
@@ -48,8 +48,8 @@ class IncludeNode(base.Node):
     """Attributes:
        translateable:         False if the node has contents that should not be
                               translated.
-       resource_path:         If provided, is used to populate the |name|
-                              property of the generated GritResourceMap struct.
+       resource_path:         If provided, is used to populate the |path|
+                              property of the generated ResourcePath struct.
        preprocess:            Takes the same code path as flattenhtml, but it
                               disables any  processing/inlining outside of <if>
                               and <include>.
diff --git a/chromium/tools/grit/grit/node/misc.py b/chromium/tools/grit/grit/node/misc.py
index d43f676f9b3..ba903652b14 100644
--- a/chromium/tools/grit/grit/node/misc.py
+++ b/chromium/tools/grit/grit/node/misc.py
@@ -45,6 +45,17 @@ _RTL_LANGS = (
 )
 
 
+def _GetIdMapKeyFromFilename(filename, src_root_dir):
+  new_grd_filename = filename
+  abs_grd_filename = os.path.abspath(filename)
+  if abs_grd_filename[:len(src_root_dir)] == src_root_dir:
+    new_grd_filename = abs_grd_filename[len(src_root_dir) + 1:]
+  else:
+    new_grd_filename = abs_grd_filename
+
+  return new_grd_filename.replace('\\', '/')
+
+
 def _ReadFirstIdsFromFile(filename, defines):
   """Read the starting resource id values from |filename|.  We also
   expand variables of the form <(FOO) based on defines passed in on
@@ -56,27 +67,36 @@ def _ReadFirstIdsFromFile(filename, defines):
   first_ids_dict = eval(util.ReadFile(filename, 'utf-8'))
   src_root_dir = os.path.abspath(os.path.join(os.path.dirname(filename),
                                               first_ids_dict['SRCDIR']))
+  EMPTY_REPLACEMENT = 'EMPTY'
 
   def ReplaceVariable(matchobj):
     for key, value in defines.items():
       if matchobj.group(1) == key:
-        return value
-    return ''
+        return value if len(value) > 0 else EMPTY_REPLACEMENT
+    return EMPTY_REPLACEMENT
 
   renames = []
   for grd_filename in first_ids_dict:
     new_grd_filename = re.sub(r'<\(([A-Za-z_]+)\)', ReplaceVariable,
                               grd_filename)
+    new_grd_filename = new_grd_filename.replace('\\', '/')
+
     if new_grd_filename != grd_filename:
-      abs_grd_filename = os.path.abspath(new_grd_filename)
-      if abs_grd_filename[:len(src_root_dir)] != src_root_dir:
-        new_grd_filename = os.path.basename(abs_grd_filename)
-      else:
-        new_grd_filename = abs_grd_filename[len(src_root_dir) + 1:]
-        new_grd_filename = new_grd_filename.replace('\\', '/')
+      # Empty or failed replacements at the start of the path can cause the path
+      # to appear to be absolute, when it in fact represents the path from the
+      # current (output) directory. Replace these with '.' instead.
+      if (new_grd_filename.startswith(EMPTY_REPLACEMENT + '/')):
+        new_grd_filename = '.' + new_grd_filename[len(EMPTY_REPLACEMENT):]
+
+      # Any other empty replacements in the middle of the path can be left
+      # as-is.
+      new_grd_filename = new_grd_filename.replace(EMPTY_REPLACEMENT, '')
+      new_grd_filename = _GetIdMapKeyFromFilename(new_grd_filename,
+                                                  src_root_dir)
       renames.append((grd_filename, new_grd_filename))
 
   for grd_filename, new_grd_filename in renames:
+    assert new_grd_filename not in first_ids_dict
     first_ids_dict[new_grd_filename] = first_ids_dict[grd_filename]
     del(first_ids_dict[grd_filename])
 
@@ -593,12 +613,7 @@ class GritNode(base.Node):
     from grit.node import empty
     for node in self.Preorder():
       if isinstance(node, empty.GroupingNode):
-        abs_filename = os.path.abspath(filename_or_stream)
-        if abs_filename[:len(src_root_dir)] != src_root_dir:
-          filename = os.path.basename(filename_or_stream)
-        else:
-          filename = abs_filename[len(src_root_dir) + 1:]
-          filename = filename.replace('\\', '/')
+        filename = _GetIdMapKeyFromFilename(filename_or_stream, src_root_dir)
 
         if node.attrs['first_id'] != '':
           raise Exception(
diff --git a/chromium/tools/grit/grit/node/misc_unittest.py b/chromium/tools/grit/grit/node/misc_unittest.py
index c192b096f41..684d3acd69c 100755
--- a/chromium/tools/grit/grit/node/misc_unittest.py
+++ b/chromium/tools/grit/grit/node/misc_unittest.py
@@ -80,7 +80,10 @@ class GritNodeUnittest(unittest.TestCase):
         {
           'SHARED_INTERMEDIATE_DIR': '/outside/src_dir',
         })
-    self.assertEqual({}, id_dict.get('devtools.grd', None))
+    # Windows adds a c:// prefix, which is why this is needed here.
+    abs_path = os.path.abspath(
+        '/outside/src_dir/devtools/devtools.grd').replace('\\', '/')
+    self.assertEqual({}, id_dict.get(abs_path, None))
 
   # Verifies that GetInputFiles() returns the correct list of files
   # corresponding to ChromeScaledImage nodes when assets are missing.
diff --git a/chromium/tools/grit/grit/pseudo_rtl.py b/chromium/tools/grit/grit/pseudo_rtl.py
deleted file mode 100644
index 2240b571dec..00000000000
--- a/chromium/tools/grit/grit/pseudo_rtl.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-'''Pseudo RTL, (aka Fake Bidi) support. It simply wraps each word with
-Unicode RTL overrides.
-More info at https://sites.google.com/a/chromium.org/dev/Home/fake-bidi
-'''
-
-from __future__ import print_function
-
-import re
-
-from grit import lazy_re
-from grit import tclib
-
-ACCENTED_STRINGS = {
-  'a': u"\u00e5", 'e': u"\u00e9", 'i': u"\u00ee", 'o': u"\u00f6",
-  'u': u"\u00fb", 'A': u"\u00c5", 'E': u"\u00c9", 'I': u"\u00ce",
-  'O': u"\u00d6", 'U': u"\u00db", 'c': u"\u00e7", 'd': u"\u00f0",
-  'n': u"\u00f1", 'p': u"\u00fe", 'y': u"\u00fd", 'C': u"\u00c7",
-  'D': u"\u00d0", 'N': u"\u00d1", 'P': u"\u00de", 'Y': u"\u00dd",
-  'f': u"\u0192", 's': u"\u0161", 'S': u"\u0160", 'z': u"\u017e",
-  'Z': u"\u017d", 'g': u"\u011d", 'G': u"\u011c", 'h': u"\u0125",
-  'H': u"\u0124", 'j': u"\u0135", 'J': u"\u0134", 'k': u"\u0137",
-  'K': u"\u0136", 'l': u"\u013c", 'L': u"\u013b", 't': u"\u0163",
-  'T': u"\u0162", 'w': u"\u0175", 'W': u"\u0174",
-  '$': u"\u20ac", '?': u"\u00bf", 'R': u"\u00ae", r'!': u"\u00a1",
-}
-
-# a character set containing the keys in ACCENTED_STRINGS
-# We should not accent characters in an escape sequence such as "\n".
-# To be safe, we assume every character following a backslash is an escaped
-# character. We also need to consider the case like "\\n", which means
-# a blackslash and a character "n", we will accent the character "n".
-TO_ACCENT = lazy_re.compile(
-    r'[%s]|\\[a-z\\]' % ''.join(ACCENTED_STRINGS.keys()))
-
-# Lex text so that we don't interfere with html tokens and entities.
-# This lexing scheme will handle all well formed tags and entities, html or
-# xhtml.  It will not handle comments, CDATA sections, or the unescaping tags:
-# script, style, xmp or listing.  If any of those appear in messages,
-# something is wrong.
-TOKENS = [ lazy_re.compile(
-                           '^%s' % pattern,  # match at the beginning of input
-                           re.I | re.S  # html tokens are case-insensitive
-                         )
-           for pattern in
-           (
-            # a run of non html special characters
-            r'[^<&]+',
-            # a tag
-            (r'</?[a-z]\w*' # beginning of tag
-             r'(?:\s+\w+(?:\s*=\s*' # attribute start
-             r'(?:[^\s"\'>]+|"[^\"]*"|\'[^\']*\'))?' # attribute value
-             r')*\s*/?>'),
-            # an entity
-            r'&(?:[a-z]\w+|#\d+|#x[\da-f]+);',
-            # an html special character not part of a special sequence
-            r'.'
-           ) ]
-
-ALPHABETIC_RUN = lazy_re.compile(r'([^\W0-9_]+)')
-
-RLO = u'\u202e'
-PDF = u'\u202c'
-
-def PseudoRTLString(text):
-  '''Returns a fake bidirectional version of the source string. This code is
-    based on accentString above, in turn copied from Frank Tang.
-    '''
-  parts = []
-  while text:
-    m = None
-    for token in TOKENS:
-      m = token.search(text)
-      if m:
-        part = m.group(0)
-        text = text[len(part):]
-        if part[0] not in ('<', '&'):
-          # not a tag or entity, so accent
-          part = ALPHABETIC_RUN.sub(lambda run: RLO + run.group() + PDF, part)
-        parts.append(part)
-        break
-  return ''.join(parts)
-
-
-def PseudoRTLMessage(message):
-  '''Returns a pseudo-RTL (aka Fake-Bidi) translation of the provided message.
-
-  Args:
-    message: tclib.Message()
-
-  Return:
-    tclib.Translation()
-  '''
-  transl = tclib.Translation()
-  for part in message.GetContent():
-    if isinstance(part, tclib.Placeholder):
-      transl.AppendPlaceholder(part)
-    else:
-      transl.AppendText(PseudoRTLString(part))
-
-  return transl
diff --git a/chromium/tools/grit/grit/pseudolocales.py b/chromium/tools/grit/grit/pseudolocales.py
new file mode 100644
index 00000000000..a3c41b7e54f
--- /dev/null
+++ b/chromium/tools/grit/grit/pseudolocales.py
@@ -0,0 +1,326 @@
+# Copyright (c) 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""Pseudolocale translations for chrome."""
+
+from __future__ import print_function
+
+import re
+import string
+
+from collections import namedtuple
+from grit import lazy_re
+from grit import tclib
+
+ACCENTED_STRINGS = {
+    '!': u'\u00a1',
+    '$': u'\u20ac',
+    '?': u'\u00bf',
+    'A': u'\u00c5',
+    'C': u'\u00c7',
+    'D': u'\u00d0',
+    'E': u'\u00c9',
+    'G': u'\u011c',
+    'H': u'\u0124',
+    'I': u'\u00ce',
+    'J': u'\u0134',
+    'K': u'\u0136',
+    'L': u'\u013b',
+    'N': u'\u00d1',
+    'O': u'\u00d6',
+    'P': u'\u00de',
+    'R': u'\u00ae',
+    'S': u'\u0160',
+    'T': u'\u0162',
+    'U': u'\u00db',
+    'W': u'\u0174',
+    'Y': u'\u00dd',
+    'Z': u'\u017d',
+    'a': u'\u00e5',
+    'c': u'\u00e7',
+    'd': u'\u00f0',
+    'e': u'\u00e9',
+    'f': u'\u0192',
+    'g': u'\u011d',
+    'h': u'\u0125',
+    'i': u'\u00ee',
+    'j': u'\u0135',
+    'k': u'\u0137',
+    'l': u'\u013c',
+    'n': u'\u00f1',
+    'o': u'\u00f6',
+    'p': u'\u00fe',
+    's': u'\u0161',
+    't': u'\u0163',
+    'u': u'\u00fb',
+    'w': u'\u0175',
+    'y': u'\u00fd',
+    'z': u'\u017e',
+}
+
+NUMBERS = [
+    'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine',
+    'ten'
+]
+PLACEHOLDER_STRING = '{PLACEHOLDER_VARIABLE}'
+ALPHABETIC_RUN = lazy_re.compile(r'([^\W0-9_]+)')
+WORD = lazy_re.compile(r'\b\S+\b')
+
+# RTL modifiers for letters
+RLO = u'\u202e'
+PDF = u'\u202c'
+
+
+class Node(object):
+  """A node in the syntax tree representing a message to be translated."""
+
+  translatable = False
+  after = ''
+
+  def __init__(self, text, children=None):
+    self.text = text
+    self.children = [] if children is None else children
+
+  def GetNumWords(self):
+    """Returns an approximate worst-case (maximum) number of words within the
+    tree."""
+    return sum(child.GetNumWords() for child in self.children)
+
+  def Transform(self, fn):
+    """Modifies the tree by applying fn to any translatable text within the tree
+
+    Args:
+      fn: Callable[[unicode], unicode]
+    """
+    for child in self.children:
+      child.Transform(fn)
+
+  def ToString(self):
+    """Returns a string representation of the tree suitable for creating a
+    translation from.
+    """
+    children = ''.join(c.ToString() for c in self.children)
+    return u'%s%s%s' % (self.text, children, self.after)
+
+  def __repr__(self):
+    # For debugging
+    if self.children:
+      child_lines = '\n'.join('  ' + line for node in self.children
+                              for line in repr(node).split('\n'))
+      return '%s[before=%s, after=%s\n%s\n]' % (self.__class__.__name__,
+                                                repr(self.text), repr(
+                                                    self.after), child_lines)
+    else:
+      return '%s %s' % (self.__class__.__name__, repr(self.text))
+
+  @classmethod
+  def _MatchPattern(cls, text):
+    match = cls.pattern.match(text)
+    if match is not None:
+      return cls(match.group(0)), text[len(match.group(0)):]
+    return None, text
+
+  @classmethod
+  def Parse(cls, text):
+    """Matches the node against the text, consuming any part of the text that
+    matches.
+
+    Args:
+      text: str
+
+    Return: (Optional[Node], str)
+      If the text starts with something matching the node, returns
+        (node, leftover).
+      Otherwise, returns (None, text)
+    """
+    return cls._MatchPattern(text)
+
+
+class HtmlTag(Node):
+  """HTMLTag represents a HTML tag (eg. <a href='...'> or </span>).
+  Note that since we don't care about the HTML structure, this does not
+  form a tree, has no children, and no linking between open and close tags.
+
+  Lex text so that we don't interfere with html tokens.
+  This lexing scheme will handle all well formed tags, html or xhtml.
+  It will not handle comments, CDATA sections, or the unescaping tags:
+  script, style, xmp or listing.  If any of those appear in messages,
+  something is wrong.
+  """
+  pattern = lazy_re.compile(
+      r'^</?[a-z]\w*'  # beginning of tag
+      r'(?:\s+\w+(?:\s*=\s*'  # attribute start
+      r'(?:[^\s"\'>]+|"[^\"]*"|\'[^\']*\'))?'  # attribute value
+      r')*\s*/?>',
+      re.S | re.I)
+
+
+class RawText(Node):
+  """RawText represents regular text able to be translated."""
+  # Raw text can have a < or $ in it, but only at the very start.
+  # This guarantees that it's already tried and failed to match an HTML tag
+  # and variable.
+  pattern = lazy_re.compile(r'^[^{}][^{}<$]*', re.S)
+
+  def GetNumWords(self):
+    return len(WORD.findall(self.text))
+
+  def Transform(self, fn):
+    self.text = fn(self.text)
+
+
+class BasicVariable(Node):
+  """Represents a variable. Usually used inside a plural option, but has been
+  overloaded to store placeholders as well.
+  """
+  pattern = lazy_re.compile(r'^\$?{[a-zA-Z0-9_]+}')
+
+  def GetNumWords(self):
+    return 1
+
+
+class PluralOption(Node):
+  """Represents a single option for a plural selection.
+  eg. =1 {singular option here}
+  """
+  pattern = lazy_re.compile(r'^(=[0-9]+|other)\s*{')
+  after = '}\n'
+
+  @classmethod
+  def Parse(cls, text):
+    node, text = cls._MatchPattern(text)
+    assert node is not None, text
+    child, text = NodeSequence.Parse(text)
+    assert child is not None, text
+    node.children = child.children if isinstance(child,
+                                                 NodeSequence) else [child]
+
+    assert text.startswith('}')
+    return node, text[1:]
+
+
+class Plural(Node):
+  """Represents a set of options for plurals.
+  eg. {VARIABLE, plural, =1 {singular} other {plural}}
+  """
+  pattern = lazy_re.compile(r'^{[A-Za-z0-9_]+,\s*plural,\s*(offset:\d+\s*)?', re.S)
+  after = '}'
+
+  @classmethod
+  def Parse(cls, text):
+    node, text = cls._MatchPattern(text)
+    if node is None:
+      return None, text
+    while not text.startswith('}'):
+      child, text = PluralOption.Parse(text)
+      assert child is not None, text
+      node.children.append(child)
+      text = text.lstrip()
+
+    assert text.startswith('}'), text
+    return node, text[1:]
+
+  def GetNumWords(self):
+    return max(child.GetNumWords() for child in self.children)
+
+
+class NodeSequence(Node):
+  """Represents a series of nodes.
+  eg. hello {VAR} -> NodeSequence([RawText('Hello'), BasicVariable('{VAR}'])"""
+  child_types = [HtmlTag, BasicVariable, Plural, RawText]
+
+  def __init__(self, children):
+    super(NodeSequence, self).__init__('', children)
+
+  @classmethod
+  def Parse(cls, text):
+    children = []
+    orig_text = None
+    while text != orig_text:
+      orig_text = text
+      for node in cls.child_types:
+        child, text = node.Parse(text)
+        if child is not None:
+          children.append(child)
+          break
+    assert children, text
+    if len(children) == 1:
+      return children[0], text
+    return cls(children), text
+
+
+def BuildTree(text):
+  """Builds a tree from some text"""
+  root, leftovers = NodeSequence.Parse(text)
+  assert not leftovers, leftovers
+  return root
+
+
+def BuildTreeFromMessage(message):
+  """Builds a tree from message, substituting any placeholders with
+  PLACEHOLDER_STRING. Returns (tree, substituted placeholders)
+  """
+  text = ''
+  placeholders = []
+  for part in message.GetContent():
+    if isinstance(part, tclib.Placeholder):
+      text += PLACEHOLDER_STRING
+      placeholders.append(part)
+    else:
+      text += part
+  return BuildTree(text), placeholders
+
+
+def ToTranslation(tree, placeholders):
+  """Converts the tree back to a translation, substituting the placeholders
+  back in as required.
+  """
+  text = tree.ToString()
+  assert text.count(PLACEHOLDER_STRING) == len(placeholders)
+  transl = tclib.Translation()
+  for placeholder in placeholders:
+    index = text.find(PLACEHOLDER_STRING)
+    if index > 0:
+      transl.AppendText(text[:index])
+    text = text[index + len(PLACEHOLDER_STRING):]
+    transl.AppendPlaceholder(placeholder)
+  if text:
+    transl.AppendText(text)
+  return transl
+
+
+def PseudoLongStringMessage(message):
+  """Returns a pseudo-long string (en-XA) translation of the provided message.
+
+  Args:
+    message: tclib.Message()
+
+  Return:
+    tclib.Translation()
+  """
+
+  tree, placeholders = BuildTreeFromMessage(message)
+  # This will change after the transformation, so do it early.
+  n_words = tree.GetNumWords()
+  tree.Transform(lambda x: ''.join(
+      ACCENTED_STRINGS.get(letter, letter) for letter in x))
+  transl = ToTranslation(tree, placeholders)
+  transl.AppendText(' ' + ' '.join(NUMBERS[i % len(NUMBERS)]
+                                   for i in range(n_words)))
+
+  return transl
+
+
+def PseudoRTLMessage(message):
+  """Returns a pseudo-RTL (ar-XB) translation of the provided message.
+
+  Args:
+    message: tclib.Message()
+
+  Return:
+    tclib.Translation()
+  """
+  tree, placeholders = BuildTreeFromMessage(message)
+  tree.Transform(lambda text: ALPHABETIC_RUN.sub(
+      lambda run: RLO + run.group() + PDF, text))
+  return ToTranslation(tree, placeholders)
diff --git a/chromium/tools/grit/grit/pseudolocales_unittest.py b/chromium/tools/grit/grit/pseudolocales_unittest.py
new file mode 100755
index 00000000000..bc449afac0c
--- /dev/null
+++ b/chromium/tools/grit/grit/pseudolocales_unittest.py
@@ -0,0 +1,295 @@
+#!/usr/bin/env python
+# Copyright (c) 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+'''Unit tests for grit.pseudolocales'''
+
+from __future__ import print_function
+
+import sys
+import os.path
+if __name__ == '__main__':
+  sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+
+import unittest
+
+import six
+
+import grit.pseudolocales as pl
+
+from grit import tclib
+import grit.extern.tclib
+
+PLACEHOLDER_NODE = pl.BasicVariable(pl.PLACEHOLDER_STRING)
+VAR_NODE = pl.BasicVariable('{VAR}')
+
+
+class TclibUnittest(unittest.TestCase):
+  def assertBuildTree(self, text, tree):
+    self.assertTreesEqual(pl.BuildTree(text), tree)
+
+  def assertTreesEqual(self, lhs, rhs):
+    try:
+      self.assertSubtreesEqual(lhs, rhs)
+    except AssertionError as e:
+      print('Actual:', lhs, 'Expected:', rhs, sep='\n')
+      raise e
+
+  def assertSubtreesEqual(self, lhs, rhs):
+    try:
+      self.assertIsInstance(lhs, rhs.__class__)
+      self.assertIsInstance(rhs, lhs.__class__)
+      self.assertEqual(lhs.text, rhs.text)
+      self.assertEqual(lhs.after, rhs.after)
+      self.assertEqual(len(lhs.children), len(rhs.children))
+    except AssertionError as e:
+      print('Failing subtree actual:',
+            lhs,
+            'Failing subtree expected:',
+            rhs,
+            sep='\n')
+      raise e
+    for lhs_child, rhs_child in zip(lhs.children, rhs.children):
+      self.assertSubtreesEqual(lhs_child, rhs_child)
+
+  def testSplitTextBasic(self):
+    self.assertBuildTree('foo bar baz', pl.RawText('foo bar baz'))
+
+  def testSplitTextTags(self):
+    self.assertBuildTree(
+        'foo<a href="url">bar</a>baz',
+        pl.NodeSequence([
+            pl.RawText('foo'),
+            pl.HtmlTag('<a href="url">'),
+            pl.RawText('bar'),
+            pl.HtmlTag('</a>'),
+            pl.RawText('baz'),
+        ]))
+
+  def testSplitTextVariables(self):
+    self.assertBuildTree(
+        'Downloaded by <a href="{PLACEHOLDER}">{PLACEHOLDER}</a>${foo}{bar}',
+        pl.NodeSequence([
+            pl.RawText('Downloaded by '),
+            pl.HtmlTag('<a href="{PLACEHOLDER}">'),
+            pl.BasicVariable('{PLACEHOLDER}'),
+            pl.HtmlTag('</a>'),
+            pl.BasicVariable('${foo}'),
+            pl.BasicVariable('{bar}'),
+        ]))
+
+  def testSplitTextWithCurlies(self):
+    self.assertBuildTree(
+        '''{COUNT, plural,
+  =0  {Open all in &incognito window}
+  =1 {Open in &incognito window}
+  other {Open all ({COUNT}) in &incognito window}}''',
+        pl.Plural('{COUNT, plural,\n  ', [
+            pl.PluralOption('=0  {',
+                            [pl.RawText('Open all in &incognito window')]),
+            pl.PluralOption('=1 {', [pl.RawText('Open in &incognito window')]),
+            pl.PluralOption('other {', [
+                pl.RawText('Open all ('),
+                pl.BasicVariable('{COUNT}'),
+                pl.RawText(') in &incognito window'),
+            ]),
+        ]))
+
+    self.assertBuildTree(
+        '''{ATTEMPTS_LEFT, plural,
+  =1 {{0} attempt left}
+  other {{0}<a>attempts</a> left}}''',
+        pl.Plural('{ATTEMPTS_LEFT, plural,\n  ', [
+            pl.PluralOption(
+                '=1 {', [pl.BasicVariable('{0}'),
+                         pl.RawText(' attempt left')]),
+            pl.PluralOption('other {', [
+                pl.BasicVariable('{0}'),
+                pl.HtmlTag('<a>'),
+                pl.RawText('attempts'),
+                pl.HtmlTag('</a>'),
+                pl.RawText(' left')
+            ])
+        ]))
+
+  def testRawTextNumWords(self):
+    self.assertEqual(pl.RawText('hello').GetNumWords(), 1)
+    self.assertEqual(pl.RawText('hello world').GetNumWords(), 2)
+    self.assertEqual(pl.RawText('  ').GetNumWords(), 0)
+    self.assertEqual(pl.RawText('hello \n world').GetNumWords(), 2)
+    self.assertEqual(pl.RawText('that\'s nice, right').GetNumWords(), 3)
+    self.assertEqual(pl.RawText('1 2 3 4 5').GetNumWords(), 5)
+
+  def testTreeNumWords(self):
+    self.assertEqual(pl.HtmlTag('<a href="blah">').GetNumWords(), 0)
+    self.assertEqual(pl.BasicVariable('{COUNT}').GetNumWords(), 1)
+
+    self.assertEqual(
+        pl.NodeSequence([pl.RawText('hi'),
+                         pl.RawText('World')]).GetNumWords(), 2)
+    self.assertEqual(
+        pl.PluralOption(
+            'other {',
+            [pl.RawText('hello'), pl.RawText('World')]).GetNumWords(), 2)
+    self.assertEqual(
+        pl.Plural('{COUNT, plural, {', [
+            pl.PluralOption('=0 {', [pl.RawText('1 2')]),
+            pl.PluralOption('=0 {', [pl.RawText('1 2 3')]),
+            pl.PluralOption('=0 {', [pl.RawText('1 2 3 4 5 6 7 8 9 10')]),
+        ]).GetNumWords(), 10)
+
+  def assertTransformsInto(self, initial, expected):
+    initial.Transform(lambda x: x.title())
+    self.assertTreesEqual(initial, expected)
+
+  def testTransform(self):
+    self.assertTransformsInto(pl.RawText('HI WORLD'), pl.RawText('Hi World'))
+    self.assertTransformsInto(pl.BasicVariable('{HELLO}'),
+                              pl.BasicVariable('{HELLO}'))
+    self.assertTransformsInto(pl.HtmlTag('<a>'), pl.HtmlTag('<a>'))
+    self.assertTransformsInto(
+        pl.NodeSequence(
+            [pl.RawText('HELLO'),
+             pl.HtmlTag('<a>'),
+             pl.RawText('WORLD')]),
+        pl.NodeSequence(
+            [pl.RawText('Hello'),
+             pl.HtmlTag('<a>'),
+             pl.RawText('World')]))
+    self.assertTransformsInto(
+        pl.Plural('{ATTEMPTS_LEFT, plural,\n  ', [
+            pl.PluralOption('=1 {', [pl.RawText('hello')]),
+            pl.PluralOption('other {', [pl.RawText('world')])
+        ]),
+        pl.Plural('{ATTEMPTS_LEFT, plural,\n  ', [
+            pl.PluralOption('=1 {', [pl.RawText('Hello')]),
+            pl.PluralOption('other {', [pl.RawText('World')])
+        ]))
+
+  def testToString(self):
+    self.assertEqual(pl.RawText('Hello world').ToString(), 'Hello world')
+    self.assertEqual(pl.BasicVariable('{0}').ToString(), '{0}')
+    self.assertEqual(pl.HtmlTag('<a>').ToString(), '<a>')
+    self.assertEqual(
+        pl.NodeSequence([pl.RawText('Hello'),
+                         pl.RawText('World')]).ToString(), 'HelloWorld')
+    self.assertEqual(
+        pl.Plural('{ATTEMPTS_LEFT, plural,\n  ', [
+            pl.PluralOption('=1 {', [pl.RawText('hello')]),
+            pl.PluralOption('other {', [pl.RawText('world')])
+        ]).ToString(),
+        '{ATTEMPTS_LEFT, plural,\n  =1 {hello}\nother {world}\n}')
+
+  def testBuildAndUnbuildTree(self):
+    p1 = tclib.Placeholder(u'USERNAME', '%s', 'foo')
+    p2 = tclib.Placeholder(u'EMAIL', '%s', 'bar')
+
+    msg = tclib.Message()
+    msg.AppendText('hello')
+    msg.AppendPlaceholder(p1)
+    msg.AppendPlaceholder(p2)
+    msg.AppendText('world')
+
+    tree, placeholders = pl.BuildTreeFromMessage(msg)
+    self.assertTreesEqual(
+        tree,
+        pl.NodeSequence([
+            pl.RawText('hello'), PLACEHOLDER_NODE, PLACEHOLDER_NODE,
+            pl.RawText('world')
+        ]))
+    self.assertEqual(placeholders, [p1, p2])
+
+    transl = pl.ToTranslation(tree, placeholders)
+    self.assertEqual(transl.GetContent(), ['hello', p1, p2, 'world'])
+
+  def testPseudolocales(self):
+    p1 = tclib.Placeholder(u'USERNAME', '%s', 'foo')
+    p2 = tclib.Placeholder(u'EMAIL', '%s', 'bar')
+    msg = tclib.Message()
+    msg.AppendText('h_')
+    msg.AppendPlaceholder(p1)
+    msg.AppendPlaceholder(p2)
+    msg.AppendText('w')
+
+    self.assertEqual(
+        pl.PseudoLongStringMessage(msg).GetContent(),
+        [u'\u0125_', p1, p2, u'\u0175', ' one two three four'])
+
+    msg.AppendText('hello world')
+    self.assertEqual(
+        pl.PseudoRTLMessage(msg).GetContent(),
+        [u'\u202eh\u202c_', p1, p2, u'\u202ewhello\u202c \u202eworld\u202c'])
+
+  # If it fails to translate with prod messages, add the failure to here to
+  # make sure it doesn't happen again.
+  def testProdFailures(self):
+    p1 = tclib.Placeholder(u'USERNAME', '%s', 'foo')
+
+    msg = tclib.Message()
+    msg.AppendText(u'{LINE_COUNT, plural,\n      =1 {<1 line not shown>}\n'
+                   '      other {<')
+    msg.AppendPlaceholder(p1)
+    msg.AppendText(u' lines not shown>}\n}')
+    tree, _ = pl.BuildTreeFromMessage(msg)
+    self.assertTreesEqual(
+        tree,
+        pl.Plural('{LINE_COUNT, plural,\n      ', [
+            pl.PluralOption('=1 {', [pl.RawText('<1 line not shown>')]),
+            pl.PluralOption('other {', [
+                pl.RawText('<'), PLACEHOLDER_NODE,
+                pl.RawText(' lines not shown>')
+            ])
+        ]))
+
+    msg = tclib.Message()
+    msg.AppendText(u'{1, plural,\n   \n             =1 {Rated ')
+    msg.AppendPlaceholder(p1)
+    msg.AppendText(u' by one user.}\n      other{Rated ')
+    msg.AppendPlaceholder(p1)
+    msg.AppendText(u' by # users.}}')
+    tree, _ = pl.BuildTreeFromMessage(msg)
+    self.assertTreesEqual(
+        tree,
+        pl.Plural('{1, plural,\n   \n             ', [
+            pl.PluralOption('=1 {', [
+                pl.RawText('Rated '), PLACEHOLDER_NODE,
+                pl.RawText(' by one user.')
+            ]),
+            pl.PluralOption('other{', [
+                pl.RawText('Rated '), PLACEHOLDER_NODE,
+                pl.RawText(' by # users.')
+            ]),
+        ]))
+
+    self.assertBuildTree(
+        '{count, plural, offset:2\n'
+        '        =1 {{VAR}}\n'
+        '        =2 {{VAR}, {VAR}}\n'
+        '        other {{VAR}, {VAR}, and # more}\n'
+        '      }',
+        pl.Plural('{count, plural, offset:2\n        ', [
+            pl.PluralOption('=1 {', [VAR_NODE]),
+            pl.PluralOption('=2 {',
+                            [VAR_NODE, pl.RawText(', '), VAR_NODE]),
+            pl.PluralOption('other {', [
+                VAR_NODE,
+                pl.RawText(', '), VAR_NODE,
+                pl.RawText(', and # more')
+            ]),
+        ]))
+
+    self.assertBuildTree(
+        '{NUM_POPUPS,plural,=1{Pop-up blocked} other{# pop-ups blocked}}',
+        pl.Plural('{NUM_POPUPS,plural,', [
+            pl.PluralOption('=1{', [pl.RawText('Pop-up blocked')]),
+            pl.PluralOption('other{', [pl.RawText('# pop-ups blocked')])
+        ]))
+
+    self.assertBuildTree(
+        'Open ${url}',
+        pl.NodeSequence([pl.RawText('Open '),
+                         pl.BasicVariable('${url}')]))
+
+
+if __name__ == '__main__':
+  unittest.main()
diff --git a/chromium/tools/grit/grit/tool/android2grd.py b/chromium/tools/grit/grit/tool/android2grd.py
index 005297bafee..ba4e91403c1 100644
--- a/chromium/tools/grit/grit/tool/android2grd.py
+++ b/chromium/tools/grit/grit/tool/android2grd.py
@@ -202,7 +202,7 @@ OPTIONS may be any of the following:
              current_release="1" source_lang_id="en">
            <outputs />
            <translations />
-           <release allow_pseudo="false" seq="1">
+           <release seq="1">
              <messages fallback_to_english="true" />
            </release>
          </grit>'''), dir='.')
diff --git a/chromium/tools/grit/grit_defines.gni b/chromium/tools/grit/grit_defines.gni
index 74c967443d6..5b92d7a6cd9 100644
--- a/chromium/tools/grit/grit_defines.gni
+++ b/chromium/tools/grit/grit_defines.gni
@@ -48,21 +48,21 @@ if (is_chrome_branded) {
   ]
 }
 
-if (is_chromeos) {
+if (is_chromeos_ash) {
   grit_defines += [
     "-D",
     "chromeos",
   ]
 }
 
-if (chromeos_is_browser_only) {
+if (is_chromeos_lacros) {
   grit_defines += [
     "-D",
     "lacros",
   ]
 }
 
-if (is_linux) {
+if (is_linux || is_chromeos_lacros) {
   grit_defines += [
     "-D",
     "desktop_linux",
diff --git a/chromium/tools/grit/grit_rule.gni b/chromium/tools/grit/grit_rule.gni
index 252c89d6f8e..8a87ce6d24d 100644
--- a/chromium/tools/grit/grit_rule.gni
+++ b/chromium/tools/grit/grit_rule.gni
@@ -423,7 +423,7 @@ if (is_android) {
                                "resource_overlay",
                                "visibility",
                              ])
-      generating_target_name = ":$_zip_target_name"
+      generating_target = ":$_zip_target_name"
       generated_resources_zip = _resources_zip
     }
   }
@@ -465,7 +465,7 @@ if (is_android) {
                                "resource_overlay",
                                "visibility",
                              ])
-      generating_target_name = ":$_zip_target_name"
+      generating_target = ":$_zip_target_name"
       generated_resources_zip = _resources_zip
     }
   }
diff --git a/chromium/tools/grit/preprocess_grit.gni b/chromium/tools/grit/preprocess_if_expr.gni
index 4bc4cad230c..71c1cc1e8d5 100644
--- a/chromium/tools/grit/preprocess_grit.gni
+++ b/chromium/tools/grit/preprocess_if_expr.gni
@@ -5,10 +5,10 @@
 import("//build/config/python.gni")
 import("//tools/grit/grit_defines.gni")
 
-template("preprocess_grit") {
+template("preprocess_if_expr") {
   # TODO(crbug.com/1112471): Get this to run cleanly under Python 3.
   python2_action(target_name) {
-    script = "//tools/grit/preprocess_grit.py"
+    script = "//tools/grit/preprocess_if_expr.py"
 
     if (defined(invoker.deps)) {
       deps = invoker.deps
diff --git a/chromium/tools/grit/preprocess_grit.py b/chromium/tools/grit/preprocess_if_expr.py
index 6294be1a6ab..b06735fde99 100644
--- a/chromium/tools/grit/preprocess_grit.py
+++ b/chromium/tools/grit/preprocess_if_expr.py
@@ -9,26 +9,20 @@ import json
 import os
 import sys
 
-import grit.format.html_inline
+# For Node, EvaluateExpression
 import grit.node.base
-import grit.util
+# For CheckConditionalElements
+import grit.format.html_inline
 
 _CWD = os.getcwd()
 
 
-class PreprocessNode(grit.node.base.Node):
+class PreprocessIfExprNode(grit.node.base.Node):
   def __init__(self):
-    super(PreprocessNode, self).__init__()
-
-  def ProcessFile(self, filepath):
-    return grit.format.html_inline.InlineToString(
-        filepath,
-        self,
-        preprocess_only=True,
-        allow_external_script=False,
-        strip_whitespace=False,
-        rewrite_function=None,
-        filename_expansion_function=None)
+    super(PreprocessIfExprNode, self).__init__()
+
+  def PreprocessIfExpr(self, content):
+    return grit.format.html_inline.CheckConditionalElements(self, content)
 
   def EvaluateCondition(self, expr):
     return grit.node.base.Node.EvaluateExpression(expr, self.defines,
@@ -42,12 +36,27 @@ class PreprocessNode(grit.node.base.Node):
 
   @staticmethod
   def Construct(defines, target_platform):
-    node = PreprocessNode()
+    node = PreprocessIfExprNode()
     node.SetDefines(defines)
     node.SetTargetPlatform(target_platform or sys.platform)
     return node
 
 
+def ParseDefinesArg(definesArg):
+  defines = {}
+  for define_arg in definesArg:
+    define, = define_arg
+    parts = [part.strip() for part in define.split('=', 1)]
+    name = parts[0]
+    val = True if len(parts) == 1 else parts[1]
+    if (val == "1" or val == "true"):
+      val = True
+    elif (val == "0" or val == "false"):
+      val = False
+    defines[name] = val
+  return defines
+
+
 def main(argv):
   parser = argparse.ArgumentParser()
   parser.add_argument('--in-folder', required=True)
@@ -62,17 +71,18 @@ def main(argv):
   in_folder = os.path.normpath(os.path.join(_CWD, args.in_folder))
   out_folder = os.path.normpath(os.path.join(_CWD, args.out_folder))
 
-  defines = {}
-  for define_arg in args.defines:
-    define, = define_arg
-    name, val = grit.util.ParseDefine(define)
-    defines[name] = val
+  defines = ParseDefinesArg(args.defines)
 
-  node = PreprocessNode.Construct(defines, args.target)
+  node = PreprocessIfExprNode.Construct(defines, args.target)
 
   for input_file in args.in_files:
-    output = node.ProcessFile(os.path.join(in_folder, input_file))
+    content = ""
+    with io.open(os.path.join(in_folder, input_file),
+                 encoding='utf-8',
+                 mode='r') as f:
+      content = f.read()
 
+    preprocessed = node.PreprocessIfExpr(content)
     out_path = os.path.join(out_folder, input_file)
     out_dir = os.path.dirname(out_path)
     assert out_dir.startswith(out_folder), \
@@ -85,7 +95,7 @@ def main(argv):
       if e.errno != errno.EEXIST:
         raise
     with io.open(out_path, mode='wb') as f:
-      f.write(output.encode('utf-8'))
+      f.write(preprocessed.encode('utf-8'))
 
   if args.out_manifest:
     manifest_data = {}
diff --git a/chromium/tools/grit/preprocess_grit_test.py b/chromium/tools/grit/preprocess_if_expr_test.py
index d0743d4d6a9..1738bf46db1 100644
--- a/chromium/tools/grit/preprocess_grit_test.py
+++ b/chromium/tools/grit/preprocess_if_expr_test.py
@@ -7,12 +7,12 @@ import shutil
 import tempfile
 import unittest
 
-import preprocess_grit
+import preprocess_if_expr
 
 _HERE_DIR = os.path.dirname(__file__)
 
 
-class PreprocessGritTest(unittest.TestCase):
+class PreprocessIfExprTest(unittest.TestCase):
   def setUp(self):
     self._out_folder = None
 
@@ -27,7 +27,7 @@ class PreprocessGritTest(unittest.TestCase):
   def _run_test(self, defines, file_name):
     assert not self._out_folder
     self._out_folder = tempfile.mkdtemp(dir=_HERE_DIR)
-    preprocess_grit.main([
+    preprocess_if_expr.main([
         '--in-folder',
         os.path.join(_HERE_DIR, 'preprocess_tests'),
         '--out-folder',
diff --git a/chromium/tools/gritsettings/resource_ids.spec b/chromium/tools/gritsettings/resource_ids.spec
index cb06259b198..c9e9d621c73 100644
--- a/chromium/tools/gritsettings/resource_ids.spec
+++ b/chromium/tools/gritsettings/resource_ids.spec
@@ -106,19 +106,24 @@
     "includes": [1220],
     "structures": [1240],
   },
+  "chrome/browser/resources/feedback_webui/feedback_resources.grd": {
+    "includes": [1250],
+  },
   "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/bookmarks/bookmarks_resources.grd": {
     "META": {"sizes": {"includes": [50],}},
     "includes": [1260],
   },
-  "chrome/browser/resources/chromeos/cellular_setup/cellular_setup_resources.grd": {
-    "structures": [1360],
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/chromeos/emoji_picker/resources.grd": {
+    "META": {"sizes": {"includes": [20]}},
+    "includes": [1365],
   },
-  "chrome/browser/resources/chromeos/multidevice_internals/multidevice_internals_resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/chromeos/multidevice_internals/resources.grd": {
+    "META": {"sizes": {"includes": [35]}},
     "includes": [1370],
-    "structures": [1380],
   },
-  "chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_resources.grd": {
-    "structures": [1400],
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/chromeos/multidevice_setup/multidevice_setup_resources.grd": {
+    "META": {"sizes": {"includes": [10]}},
+    "includes": [1380],
   },
   "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/commander/commander_resources.grd": {
     "META": {"sizes": {"includes": [15]}},
@@ -143,6 +148,10 @@
   "chrome/browser/resources/local_ntp/local_ntp_resources.grd": {
     "includes": [1620],
   },
+   "chrome/browser/resources/webid/webid_resources.grd": {
+    "includes": [1622],
+    "structures": [1626],
+  },
   "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/nearby_internals/nearby_internals_resources.grd": {
     "META": {"sizes": {"includes": [20]}},
     "includes": [1630],
@@ -151,15 +160,25 @@
     "META": {"sizes": {"includes": [100]}},
     "includes": [1640],
   },
-  "chrome/browser/resources/new_tab_page/new_tab_page_resources_vulcanized.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/memories/resources.grd": {
+    "META": {"sizes": {"includes": [40]}},
     "includes": [1660],
   },
-  "chrome/browser/resources/new_tab_page/new_tab_page_resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/new_tab_page/resources.grd": {
+    "META": {"sizes": {"includes": [200]}},
     "includes": [1680],
   },
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/ntp4/apps_resources.grd": {
+    "META": {"sizes": {"includes": [40]}},
+    "includes": [1705],
+  },
   "chrome/browser/resources/preinstalled_web_apps/resources.grd": {
     "includes": [1710],
   },
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/pdf/resources.grd": {
+    "META": {"sizes": {"includes": [200]}},
+    "includes": [1715],
+  },
   "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/print_preview/print_preview_resources.grd": {
     "META": {"sizes": {"includes": [500],}},
     "includes": [1720],
@@ -224,44 +243,65 @@
     "META": {"sizes": {"messages": [50]}, "join": 2},  # Relies on src-internal.
     "messages": [2015],
   },
-  "chrome/browser/resources/bluetooth_internals/resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/bluetooth_internals/resources.grd": {
+    "META": {"sizes": {"includes": [30],}},
     "includes": [2020],
   },
   "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/chromeos/bluetooth_pairing_dialog/bluetooth_pairing_dialog_resources.grd": {
     "META": {"sizes": {"includes": [10],}},
     "includes": [2030],
   },
-  "chrome/browser/resources/gaia_auth_host/gaia_auth_host_resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/chromeos/internet_config_dialog/internet_config_dialog_resources.grd": {
+    "META": {"sizes": {"includes": [10],}},
+    "includes": [2040],
+  },
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/chromeos/internet_detail_dialog/internet_detail_dialog_resources.grd": {
+    "META": {"sizes": {"includes": [10],}},
+    "includes": [2050],
+  },
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/chromeos/network_ui/network_ui_resources.grd": {
+    "META": {"sizes": {"includes": [10]}},
+    "includes": [2065],
+  },
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/gaia_auth_host/resources.grd": {
+    "META": {"sizes": {"includes": [10],}},
     "includes": [2080],
   },
-  "chrome/browser/resources/invalidations/invalidations_resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/invalidations/resources.grd": {
+    "META": {"sizes": {"includes": [10],}},
     "includes": [2090],
   },
-  "chrome/browser/resources/media/webrtc_logs_resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/media/webrtc_logs_resources.grd": {
+    "META": {"sizes": {"includes": [10],}},
     "includes": [2100],
   },
-  "chrome/browser/resources/net_internals/net_internals_resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/net_internals/resources.grd": {
+    "META": {"sizes": {"includes": [20]}},
     "includes": [2120],
   },
-  "chrome/browser/resources/omnibox/resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/omnibox/resources.grd": {
+    "META": {"sizes": {"includes": [20]}},
     "includes": [2140],
   },
   "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/quota_internals/quota_internals_resources.grd": {
     "META": {"sizes": {"includes": [20]}},
     "includes": [2160],
   },
-  "chrome/browser/resources/sync_file_system_internals/sync_file_system_internals_resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/sync_file_system_internals/resources.grd": {
+    "META": {"sizes": {"includes": [20]}},
     "includes": [2180],
   },
-  "chrome/browser/resources/usb_internals/resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/usb_internals/resources.grd": {
+    "META": {"sizes": {"includes": [20]}},
     "includes": [2200],
   },
-  "chrome/browser/resources/webapks/webapks_ui_resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/webapks/resources.grd": {
+    "META": {"sizes": {"includes": [10]}},
     "includes": [2220],
   },
-  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/webui_js_exception/webui_js_exception_resources.grd": {
-    "META": {"sizes": {"includes": [10],}},
-    "includes": [2230],
+  "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/webui_js_error/webui_js_error_resources.grd": {
+   "META": {"sizes": {"includes": [10],}},
+   "includes": [2230],
   },
   "components/sync/driver/resources.grd": {
     "includes": [2240],
@@ -269,7 +309,8 @@
   "components/resources/dev_ui_components_resources.grd": {
     "includes": [2260],
   },
-  "content/browser/resources/media/media_internals_resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/content/browser/resources/media/resources.grd": {
+    "META": {"sizes": {"includes": [10],}},
     "includes": [2270],
   },
   "content/browser/webrtc/resources/resources.grd": {
@@ -297,6 +338,9 @@
   "chrome/test/data/webui_test_resources.grd": {
     "includes": [2420],
   },
+  "chrome/test/data/chrome_test_resources.grd": {
+    "messages": [2440],
+  },
   # END chrome/ miscellaneous section.
 
   # START chromeos/ section.
@@ -305,9 +349,9 @@
     "META": {"align": 100},
     "messages": [2500],
   },
-  "chromeos/components/camera_app_ui/resources/camera_app_resources.grd": {
+  "<(SHARED_INTERMEDIATE_DIR)/chromeos/components/camera_app_ui/chromeos_camera_app_resources.grd": {
+    "META": {"sizes": {"includes": [300],}},
     "includes": [2505],
-    "structures": [2510],
   },
   "chromeos/components/camera_app_ui/resources/strings/camera_strings.grd": {
     "messages": [2515],
@@ -371,6 +415,14 @@
   "chromeos/resources/chromeos_resources.grd": {
     "includes": [2660],
   },
+  "<(SHARED_INTERMEDIATE_DIR)/chromeos/components/eche_app_ui/chromeos_eche_app_resources.grd": {
+    "META": {"sizes": {"includes": [50],}},
+    "includes": [2670],
+  },
+  "chromeos/components/eche_app_ui/resources/prod/eche_bundle_resources.grd": {
+    "META": {"sizes": {"includes": [50],}},
+    "includes": [2680],
+  },
   # END chromeos/ section.
 
   # START components/ section.
@@ -659,7 +711,7 @@
     "structures": [3820],
   },
   "<(SHARED_INTERMEDIATE_DIR)/ui/webui/resources/webui_generated_resources.grd": {
-    "META": {"sizes": {"includes": [600]}},
+    "META": {"sizes": {"includes": [800]}},
     "includes": [3830],
   },
   "weblayer/weblayer_resources.grd": {
@@ -668,7 +720,9 @@
 
   # This file is generated during the build.
   "<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd": {
-    "META": {"sizes": {"includes": [1000],}},
+    # In debug build, devtools frontend sources are not bundled and therefore
+    # includes a lot of individual resources
+    "META": {"sizes": {"includes": [2000],}},
     "includes": [3860],
   },
 
diff --git a/chromium/tools/gritsettings/translation_expectations.pyl b/chromium/tools/gritsettings/translation_expectations.pyl
index e8e36260f31..04b0dfcb3cc 100644
--- a/chromium/tools/gritsettings/translation_expectations.pyl
+++ b/chromium/tools/gritsettings/translation_expectations.pyl
@@ -51,6 +51,7 @@
       "components/javascript_dialogs/android/javascript_dialogs_android_strings.grd",
       "components/media_router/browser/android/java/strings/android_chrome_media_router_strings.grd",
       "components/permissions/android/permissions_android_strings.grd",
+      "components/webapps/browser/android/android_webapps_strings.grd",
       "content/public/android/java/strings/android_content_strings.grd",
       "device/bluetooth/bluetooth_strings.grd",
       "device/fido/fido_strings.grd",
@@ -97,6 +98,7 @@
     "chrome/app/resources/locale_settings_linux.grd": "Not UI strings; localized separately",
     "chrome/app/resources/locale_settings_mac.grd": "Not UI strings; localized separately",
     "chrome/app/resources/locale_settings_win.grd": "Not UI strings; localized separately",
+    "chrome/test/data/chrome_test_resources.grd": "Test data",
     "chromecast/app/resources/chromecast_settings.grd": "Not UI strings; localized separately",
     "cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd": "Separate release process",
     "components/components_locale_settings.grd": "Not UI strings; localized separately",
diff --git a/chromium/tools/gypv8sh.py b/chromium/tools/gypv8sh.py
index 868e2aad42f..c14eebd0f4f 100755
--- a/chromium/tools/gypv8sh.py
+++ b/chromium/tools/gypv8sh.py
@@ -29,9 +29,8 @@ def HasSameContent(filename, content):
 
 def main ():
   parser = optparse.OptionParser()
-  parser.set_usage(
-      "%prog v8_shell mock.js test_api.js js2webui.js "
-      "testtype inputfile srcrootdir cxxoutfile jsoutfile")
+  parser.set_usage("%prog v8_shell test_api.js js2webui.js "
+                   "testtype inputfile srcrootdir cxxoutfile jsoutfile")
   parser.add_option('-v', '--verbose', action='store_true')
   parser.add_option('-n', '--impotent', action='store_true',
                     help="don't execute; just print (as if verbose)")
@@ -42,15 +41,14 @@ def main ():
                     help="Load V8's initial snapshot from external files (y/n)")
   (opts, args) = parser.parse_args()
 
-  if len(args) != 9:
+  if len(args) != 8:
     parser.error('all arguments are required.')
-  (v8_shell, mock_js, test_api, js2webui, test_type,
-      inputfile, srcrootdir, cxxoutfile, jsoutfile) = args
+  (v8_shell, test_api, js2webui, test_type, inputfile, srcrootdir, cxxoutfile,
+   jsoutfile) = args
   cmd = [v8_shell]
   arguments = [js2webui, inputfile, srcrootdir, opts.deps_js,
                cxxoutfile, test_type]
-  cmd.extend(['-e', "arguments=" + json.dumps(arguments), mock_js,
-         test_api, js2webui])
+  cmd.extend(['-e', "arguments=" + json.dumps(arguments), test_api, js2webui])
   if opts.verbose or opts.impotent:
     print(cmd)
   if not opts.impotent:
diff --git a/chromium/tools/idl_parser/PRESUBMIT.py b/chromium/tools/idl_parser/PRESUBMIT.py
index ff657aa8596..5fe9cb18077 100644
--- a/chromium/tools/idl_parser/PRESUBMIT.py
+++ b/chromium/tools/idl_parser/PRESUBMIT.py
@@ -7,9 +7,9 @@ WHITELIST = [ r'^.+_test\.py$' ]
 
 def CheckChangeOnUpload(input_api, output_api):
   return input_api.canned_checks.RunUnitTestsInDirectory(
-      input_api, output_api, '.', whitelist=WHITELIST)
+      input_api, output_api, '.', files_to_check=WHITELIST)
 
 
 def CheckChangeOnCommit(input_api, output_api):
   return input_api.canned_checks.RunUnitTestsInDirectory(
-      input_api, output_api, '.', whitelist=WHITELIST)
+      input_api, output_api, '.', files_to_check=WHITELIST)
diff --git a/chromium/tools/idl_parser/idl_parser.py b/chromium/tools/idl_parser/idl_parser.py
index 5dfacf34a1e..7954edb21b1 100755
--- a/chromium/tools/idl_parser/idl_parser.py
+++ b/chromium/tools/idl_parser/idl_parser.py
@@ -1230,7 +1230,7 @@ class IDLParser(object):
 #
 # BuildError
 #
-# Build and Errror node as part of the recovery process.
+# Build and Error node as part of the recovery process.
 #
 #
   def BuildError(self, p, prod):
diff --git a/chromium/tools/imagediff/image_diff.cc b/chromium/tools/imagediff/image_diff.cc
index d5c727373be..45a25b75251 100644
--- a/chromium/tools/imagediff/image_diff.cc
+++ b/chromium/tools/imagediff/image_diff.cc
@@ -23,7 +23,10 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/numerics/safe_conversions.h"
+#include "base/optional.h"
 #include "base/process/memory.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ -44,6 +47,13 @@ static const char kOptionGenerateDiff[] = "diff";
 // Causes the app to have a tolerance for difference in output. To account for
 // differences which occur when running vs hardware GPU output.
 static const char kOptionFuzzyDiff[] = "fuzzy-diff";
+// Causes the app to use the WPT fuzzy-matching algorithm. Both arguments are
+// ranges of the form "x-y", where x and y are integers. If either of these
+// arguments are used, both must be.
+//
+// https://web-platform-tests.org/writing-tests/reftests.html#fuzzy-matching
+static const char kOptionFuzzyMaxChannelDiff[] = "fuzzy-max-channel-diff";
+static const char kOptionFuzzyMaxPixelsDiff[] = "fuzzy-max-pixels-diff";
 
 // Return codes used by this utility.
 static const int kStatusSame = 0;
@@ -365,9 +375,21 @@ int CompareImages(const base::FilePath& file1,
 */
 }
 
+// Calculate the absolute difference between two pixels in a specified channel
+// c, assuming the pixels are encoded with four 8-bit channels.
+uint8_t GetChannelDiff(int c, uint32_t base_pixel, uint32_t actual_pixel) {
+  int shift = c * 8;
+  uint8_t channel_base = (base_pixel >> shift) & 0xFF;
+  uint8_t channel_actual = (actual_pixel >> shift) & 0xFF;
+  return channel_base > channel_actual ? channel_base - channel_actual
+                                       : channel_actual - channel_base;
+}
+
 bool CreateImageDiff(const Image& image1,
                      const Image& image2,
                      bool fuzzy_diff,
+                     std::vector<int> fuzzy_allowed_max_channel_diff,
+                     std::vector<int> fuzzy_allowed_pixels_diff,
                      Image* out) {
   int w = std::min(image1.w(), image2.w());
   int h = std::min(image1.h(), image2.h());
@@ -376,13 +398,24 @@ bool CreateImageDiff(const Image& image1,
 
   // TODO(estade): do something with the extra pixels if the image sizes
   // are different.
+  int pixels_different = 0;
+  uint8_t max_channel_diff = 0;
   for (int y = 0; y < h; y++) {
     for (int x = 0; x < w; x++) {
       uint32_t base_pixel = image1.pixel_at(x, y);
-      if (base_pixel != image2.pixel_at(x, y)) {
+      uint32_t actual_pixel = image2.pixel_at(x, y);
+      if (base_pixel != actual_pixel) {
         // Set differing pixels red.
         out->set_pixel_at(x, y, RGBA_RED | RGBA_ALPHA);
         same = false;
+
+        // Record the necessary information for WPT fuzzy matching. WPT images
+        // only compare on the RGB channels, not A.
+        pixels_different++;
+        for (int c = 0; c < 3; c++) {
+          max_channel_diff = std::max(
+              max_channel_diff, GetChannelDiff(c, base_pixel, actual_pixel));
+        }
       } else {
         // Set same pixels as faded.
         uint32_t alpha = base_pixel & RGBA_ALPHA;
@@ -392,17 +425,39 @@ bool CreateImageDiff(const Image& image1,
     }
   }
 
+  if (!same) {
+    printf("Found pixels_different: %d, max_channel_diff: %u\n",
+           pixels_different, max_channel_diff);
+  }
+
   if (!fuzzy_diff) {
     return same;
   }
 
-  float percent = PercentageDifferent(image1, image2, fuzzy_diff);
-  return percent < 1.0f;
+  if (fuzzy_allowed_max_channel_diff.empty()) {
+    float percent = PercentageDifferent(image1, image2, fuzzy_diff);
+    return percent < 1.0f;
+  }
+
+  // WPT fuzzy matching. This algorithm is equivalent to 'check_pass' in
+  // tools/wptrunner/wptrunner/executors/base.py
+  printf("Allowed pixels_different; %d-%d, max_channel_diff: %u-%u\n",
+         fuzzy_allowed_pixels_diff[0], fuzzy_allowed_pixels_diff[1],
+         fuzzy_allowed_max_channel_diff[0], fuzzy_allowed_max_channel_diff[1]);
+
+  return ((pixels_different == 0 && fuzzy_allowed_pixels_diff[0] == 0) ||
+          (max_channel_diff == 0 && fuzzy_allowed_max_channel_diff[0] == 0) ||
+          (fuzzy_allowed_pixels_diff[0] <= pixels_different &&
+           pixels_different <= fuzzy_allowed_pixels_diff[1] &&
+           fuzzy_allowed_max_channel_diff[0] <= max_channel_diff &&
+           max_channel_diff <= fuzzy_allowed_max_channel_diff[1]));
 }
 
 int DiffImages(const base::FilePath& file1,
                const base::FilePath& file2,
                bool fuzzy_diff,
+               std::vector<int> max_per_channel,
+               std::vector<int> max_pixels_different,
                const base::FilePath& out_file) {
   Image actual_image;
   Image baseline_image;
@@ -420,7 +475,8 @@ int DiffImages(const base::FilePath& file1,
 
   Image diff_image;
   bool same =
-      CreateImageDiff(baseline_image, actual_image, fuzzy_diff, &diff_image);
+      CreateImageDiff(baseline_image, actual_image, fuzzy_diff, max_per_channel,
+                      max_pixels_different, &diff_image);
   if (same)
     return kStatusSame;
 
@@ -447,6 +503,31 @@ base::FilePath FilePathFromASCII(const std::string& str) {
 #endif
 }
 
+// Parses a range command line option of the form "x-y", where x and y are both
+// integers. If the range cannot be parsed, returns kStatusError.
+int ParseRangeOption(const std::string& range, std::vector<int>& parsed_range) {
+  if (range.empty())
+    return 0;
+
+  std::vector<std::string> tokens = base::SplitString(
+      range, "-", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);
+  if (tokens.size() != 2) {
+    fprintf(stderr, "Unable to parse range: '%s'\n", range.c_str());
+    return kStatusError;
+  }
+
+  int min, max;
+  if (!base::StringToInt(tokens[0], &min) ||
+      !base::StringToInt(tokens[1], &max)) {
+    fprintf(stderr, "Unable to parse range: '%s'\n", range.c_str());
+    return kStatusError;
+  }
+
+  parsed_range.push_back(min);
+  parsed_range.push_back(max);
+  return 0;
+}
+
 int main(int argc, const char* argv[]) {
   base::EnableTerminationOnHeapCorruption();
   base::CommandLine::Init(argc, argv);
@@ -454,6 +535,31 @@ int main(int argc, const char* argv[]) {
       *base::CommandLine::ForCurrentProcess();
   bool fuzzy_diff = parsed_command_line.HasSwitch(kOptionFuzzyDiff);
   bool histograms = parsed_command_line.HasSwitch(kOptionCompareHistograms);
+  std::vector<int> fuzzy_max_channel_diff;
+  if (ParseRangeOption(
+          parsed_command_line.GetSwitchValueASCII(kOptionFuzzyMaxChannelDiff),
+          fuzzy_max_channel_diff) == kStatusError) {
+    return kStatusError;
+  }
+  std::vector<int> fuzzy_max_pixels_diff;
+  if (ParseRangeOption(
+          parsed_command_line.GetSwitchValueASCII(kOptionFuzzyMaxPixelsDiff),
+          fuzzy_max_pixels_diff) == kStatusError) {
+    return kStatusError;
+  }
+
+  // If using either of the WPT fuzzy options, both must be supplied.
+  if (fuzzy_max_channel_diff.size() != fuzzy_max_pixels_diff.size()) {
+    fprintf(
+        stderr,
+        "Either both --%s and --%s must be specified, or neither should be.\n",
+        kOptionFuzzyMaxChannelDiff, kOptionFuzzyMaxPixelsDiff);
+    return kStatusError;
+  } else if (!fuzzy_max_channel_diff.empty()) {
+    // The WPT fuzzy options imply a fuzzy diff is happening.
+    fuzzy_diff = true;
+  }
+
   if (parsed_command_line.HasSwitch(kOptionPollStdin)) {
     // Watch stdin for filenames.
     std::string stdin_buffer;
@@ -484,7 +590,8 @@ int main(int argc, const char* argv[]) {
   if (parsed_command_line.HasSwitch(kOptionGenerateDiff)) {
     if (args.size() == 3) {
       return DiffImages(base::FilePath(args[0]), base::FilePath(args[1]),
-                        fuzzy_diff, base::FilePath(args[2]));
+                        fuzzy_diff, fuzzy_max_channel_diff,
+                        fuzzy_max_pixels_diff, base::FilePath(args[2]));
     }
   } else if (args.size() == 2) {
     return CompareImages(base::FilePath(args[0]), base::FilePath(args[1]),
diff --git a/chromium/tools/infra/builder-cache-clobber.py b/chromium/tools/infra/builder-cache-clobber.py
index f74ccb87c75..b50c6909907 100755
--- a/chromium/tools/infra/builder-cache-clobber.py
+++ b/chromium/tools/infra/builder-cache-clobber.py
@@ -21,6 +21,7 @@ def main(raw_args):
   parser.add_argument('--builder', required=True)
   parser.add_argument('--bucket', required=True)
   parser.add_argument('--project', default='chromium')
+  parser.add_argument('--bot-id', default=None)
   args = parser.parse_args(raw_args)
 
   # Matches http://bit.ly/2WZO33P
@@ -28,8 +29,12 @@ def main(raw_args):
   cache = 'builder_%s_v2' % (h.hexdigest())
   pool = 'luci.%s.%s' % (args.project, args.bucket)
 
-  clobber_cache_utils.clobber_caches(args.swarming_server, pool, cache,
-                                     'cache/builder', args.dry_run)
+  clobber_cache_utils.clobber_caches(args.swarming_server,
+                                     pool,
+                                     cache,
+                                     'cache/builder',
+                                     args.dry_run,
+                                     bot_id=args.bot_id)
 
   return 0
 
diff --git a/chromium/tools/infra/clobber_cache_utils.py b/chromium/tools/infra/clobber_cache_utils.py
index ba180373d22..8fef31d59b3 100644
--- a/chromium/tools/infra/clobber_cache_utils.py
+++ b/chromium/tools/infra/clobber_cache_utils.py
@@ -6,56 +6,47 @@
 
 from __future__ import print_function
 
+import json
 import os
 import subprocess
-import sys
 import textwrap
 
 _SRC_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
-_SWARMING_CLIENT = os.path.join(_SRC_ROOT, 'tools', 'swarming_client',
-                                'swarming.py')
+_SWARMING_CLIENT = os.path.join(_SRC_ROOT, 'tools', 'luci-go', 'swarming')
 _SWARMING_SERVER = 'chromium-swarm.appspot.com'
 
 
 def _get_bots(swarming_server, pool, cache):
   cmd = [
-      sys.executable,
       _SWARMING_CLIENT,
       'bots',
-      '-b',
       '-S',
       swarming_server,
-      '-d',
-      'caches',
-      cache,
-      '-d',
-      'pool',
-      pool,
+      '-dimension',
+      'caches=' + cache,
+      '-dimension',
+      'pool=' + pool,
   ]
-  return subprocess.check_output(cmd).splitlines()
+  return [bot['bot_id'] for bot in json.loads(subprocess.check_output(cmd))]
 
 
 def _trigger_clobber(swarming_server, pool, cache, bot, mount_rel_path,
                      dry_run):
   cmd = [
-      sys.executable,
       _SWARMING_CLIENT,
       'trigger',
       '-S',
       swarming_server,
-      '-d',
-      'pool',
-      pool,
-      '-d',
-      'id',
-      bot,
-      '--cipd-package',
-      'cpython:infra/python/cpython/${platform}:latest',
-      '--named-cache',
-      cache,
-      mount_rel_path,
-      '--priority=10',
-      '--raw-cmd',
+      '-dimension',
+      'pool=' + pool,
+      '-dimension',
+      'id=' + bot,
+      '-cipd-package',
+      'cpython:infra/python/cpython/${platform}=latest',
+      '-named-cache',
+      cache + '=' + mount_rel_path,
+      '-priority',
+      '10',
       '--',
       'cpython/bin/python${EXECUTABLE_SUFFIX}',
       '-c',
diff --git a/chromium/tools/ipc_fuzzer/OWNERS b/chromium/tools/ipc_fuzzer/OWNERS
index 2cca4f2232c..a0e5c29e091 100644
--- a/chromium/tools/ipc_fuzzer/OWNERS
+++ b/chromium/tools/ipc_fuzzer/OWNERS
@@ -1,3 +1,2 @@
 inferno@chromium.org
-mbarbella@chromium.org
 tsepez@chromium.org
diff --git a/chromium/tools/ipc_fuzzer/fuzzer/BUILD.gn b/chromium/tools/ipc_fuzzer/fuzzer/BUILD.gn
index ca9d712a4cb..32102ed3b5a 100644
--- a/chromium/tools/ipc_fuzzer/fuzzer/BUILD.gn
+++ b/chromium/tools/ipc_fuzzer/fuzzer/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/chromeos/ui_mode.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 
 executable("ipc_fuzzer") {
@@ -24,7 +25,7 @@ executable("ipc_fuzzer") {
     "//tools/ipc_fuzzer/message_lib:ipc_message_lib",
   ]
   public_deps = [ "//ipc" ]
-  if (is_asan && is_chromeos) {
+  if (is_asan && is_chromeos_ash) {
     # Compiling fuzzer.cc with ASan takes too long, see
     # http://crbug.com/360158.
     configs -= [ "//build/config/sanitizers:default_sanitizer_flags" ]
diff --git a/chromium/tools/ipc_fuzzer/message_lib/all_messages.h b/chromium/tools/ipc_fuzzer/message_lib/all_messages.h
index acfaef7b35a..628d30766b2 100644
--- a/chromium/tools/ipc_fuzzer/message_lib/all_messages.h
+++ b/chromium/tools/ipc_fuzzer/message_lib/all_messages.h
@@ -22,7 +22,6 @@
 #include "components/nacl/common/nacl_host_messages.h"
 #endif
 #include "components/guest_view/common/guest_view_message_generator.h"
-#include "components/subresource_filter/content/common/subresource_filter_messages.h"
 #include "content/common/all_messages.h"
 #include "extensions/common/extension_message_generator.h"
 #include "gpu/ipc/common/gpu_message_generator.h"
diff --git a/chromium/tools/ipc_fuzzer/message_tools/message_list.cc b/chromium/tools/ipc_fuzzer/message_tools/message_list.cc
index 205400ad26b..7e7fb3fc423 100644
--- a/chromium/tools/ipc_fuzzer/message_tools/message_list.cc
+++ b/chromium/tools/ipc_fuzzer/message_tools/message_list.cc
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include "base/stl_util.h"
+#include "base/containers/contains.h"
 #include "build/build_config.h"
 
 // Include once to get the type definitions
@@ -58,7 +58,6 @@ static bool check_msgtable() {
 #if !defined(OS_ANDROID)
   exemptions.push_back(EncryptedMediaMsgStart);
   exemptions.push_back(GinJavaBridgeMsgStart);
-  exemptions.push_back(AndroidWebViewMsgStart);
   exemptions.push_back(ExtensionWorkerMsgStart);
 #endif  // !defined(OS_ANDROID)
 
diff --git a/chromium/tools/json_schema_compiler/PRESUBMIT.py b/chromium/tools/json_schema_compiler/PRESUBMIT.py
index 4c3dd8e60fa..5c8a221a874 100644
--- a/chromium/tools/json_schema_compiler/PRESUBMIT.py
+++ b/chromium/tools/json_schema_compiler/PRESUBMIT.py
@@ -8,13 +8,13 @@ See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into depot_tools.
 """
 
-WHITELIST = [ r'.+_test.py$' ]
+FILE_PATTERN = [ r'.+_test.py$' ]
 
 def CheckChangeOnUpload(input_api, output_api):
   return input_api.canned_checks.RunUnitTestsInDirectory(
-      input_api, output_api, '.', whitelist=WHITELIST)
+      input_api, output_api, '.', files_to_check=FILE_PATTERN)
 
 
 def CheckChangeOnCommit(input_api, output_api):
   return input_api.canned_checks.RunUnitTestsInDirectory(
-      input_api, output_api, '.', whitelist=WHITELIST)
+      input_api, output_api, '.', files_to_check=FILE_PATTERN)
diff --git a/chromium/tools/json_schema_compiler/cc_generator.py b/chromium/tools/json_schema_compiler/cc_generator.py
index 36a56394077..f37d805d4f4 100644
--- a/chromium/tools/json_schema_compiler/cc_generator.py
+++ b/chromium/tools/json_schema_compiler/cc_generator.py
@@ -39,7 +39,8 @@ class _Generator(object):
     c = Code()
     (c.Append(cpp_util.CHROMIUM_LICENSE)
       .Append()
-      .Append(cpp_util.GENERATED_FILE_MESSAGE % self._namespace.source_file)
+      .Append(cpp_util.GENERATED_FILE_MESSAGE %
+              cpp_util.ToPosixPath(self._namespace.source_file))
       .Append()
       .Append(self._util_cc_helper.GetIncludePath())
       .Append('#include "base/check.h"')
@@ -49,7 +50,8 @@ class _Generator(object):
       .Append('#include "base/strings/utf_string_conversions.h"')
       .Append('#include "base/values.h"')
       .Append('#include "%s/%s.h"' %
-              (self._namespace.source_file_dir, self._namespace.short_filename))
+              (cpp_util.ToPosixPath(self._namespace.source_file_dir),
+               self._namespace.short_filename))
       .Append('#include <set>')
       .Append('#include <utility>')
       .Cblock(self._GenerateManifestKeysIncludes())
@@ -999,11 +1001,21 @@ class _Generator(object):
                      failure_value,
                      is_ptr=is_ptr))
       else:
-        c.Sblock('if (!%s(%s)) {' % (
+        args = ['*list', '&%(dst_var)s']
+        if self._generate_error_messages:
+          c.Append('base::string16 array_parse_error;')
+          args.append('&array_parse_error')
+
+        c.Append('if (!%s(%s)) {' % (
             self._util_cc_helper.PopulateArrayFromListFunction(is_ptr),
-            self._GenerateArgs(('*list', '&%(dst_var)s'))))
-        c.Concat(self._GenerateError(
-            '"unable to populate array \'%%(key)s\'"'))
+            self._GenerateArgs(args, generate_error_messages=False)))
+        c.Sblock()
+        if self._generate_error_messages:
+          c.Append(
+            'array_parse_error = base::UTF8ToUTF16("Error at key '
+            '\'%(key)s\': ") + array_parse_error;'
+          )
+          c.Concat(self._AppendError16('array_parse_error'))
         c.Append('return %(failure_value)s;')
         c.Eblock('}')
       c.Eblock('}')
@@ -1258,19 +1270,22 @@ class _Generator(object):
         self._type_helper.GetEnumNoneValue(prop.type_)))
     return c
 
-  def _GenerateError(self, body):
-    """Generates an error message pertaining to population failure.
-
-    E.g 'expected bool, got int'
+  def _AppendError16(self, error16):
+    """Appends the given |error16| expression/variable to |error|.
     """
     c = Code()
     if not self._generate_error_messages:
       return c
-    (c.Append('if (error->length())')
-      .Append('  error->append(UTF8ToUTF16("; "));')
-      .Append('error->append(UTF8ToUTF16(%s));' % body))
+    c.Append('DCHECK(error->empty());')
+    c.Append('*error = %s;' % error16)
     return c
 
+  def _GenerateError(self, body):
+    """Generates an error message pertaining to population failure.
+    E.g 'expected bool, got int'
+    """
+    return self._AppendError16('UTF8ToUTF16(%s)' % body)
+
   def _GenerateParams(self, params, generate_error_messages=None):
     """Builds the parameter list for a function, given an array of parameters.
     If |generate_error_messages| is specified, it overrides
@@ -1282,9 +1297,13 @@ class _Generator(object):
       params = list(params) + ['base::string16* error']
     return ', '.join(str(p) for p in params)
 
-  def _GenerateArgs(self, args):
+  def _GenerateArgs(self, args, generate_error_messages=None):
     """Builds the argument list for a function, given an array of arguments.
+    If |generate_error_messages| is specified, it overrides
+    |self._generate_error_messages|.
     """
-    if self._generate_error_messages:
+    if generate_error_messages is None:
+      generate_error_messages = self._generate_error_messages
+    if generate_error_messages:
       args = list(args) + ['error']
     return ', '.join(str(a) for a in args)
diff --git a/chromium/tools/json_schema_compiler/cpp_bundle_generator.py b/chromium/tools/json_schema_compiler/cpp_bundle_generator.py
index 1f35fd924dd..0c79fe96d7d 100644
--- a/chromium/tools/json_schema_compiler/cpp_bundle_generator.py
+++ b/chromium/tools/json_schema_compiler/cpp_bundle_generator.py
@@ -122,9 +122,10 @@ class CppBundleGenerator(object):
     c = code.Code()
     c.Append(cpp_util.CHROMIUM_LICENSE)
     c.Append()
-    c.Append(cpp_util.GENERATED_BUNDLE_FILE_MESSAGE % self._source_file_dir)
+    c.Append(cpp_util.GENERATED_BUNDLE_FILE_MESSAGE %
+             cpp_util.ToPosixPath(self._source_file_dir))
     ifndef_name = cpp_util.GenerateIfndefName(
-        '%s/%s.h' % (self._source_file_dir, file_base))
+        '%s/%s.h' % (cpp_util.ToPosixPath(self._source_file_dir), file_base))
     c.Append()
     c.Append('#ifndef %s' % ifndef_name)
     c.Append('#define %s' % ifndef_name)
@@ -145,12 +146,13 @@ class CppBundleGenerator(object):
     for platform in model_object.platforms:
       if platform == Platforms.CHROMEOS:
         # TODO(https://crbug.com/1052397): For readability, this should become
-        # defined(OS_CHROMEOS) && BUILDFLAG(IS_ASH).
-        ifdefs.append('(defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS))')
+        # defined(OS_CHROMEOS) && BUILDFLAG(IS_CHROMEOS_ASH).
+        ifdefs.append('(defined(OS_CHROMEOS) && '
+                      '!BUILDFLAG(IS_CHROMEOS_LACROS))')
       elif platform == Platforms.LACROS:
         # TODO(https://crbug.com/1052397): For readability, this should become
-        # defined(OS_CHROMEOS) && BUILDFLAG(IS_LACROS).
-        ifdefs.append('BUILDFLAG(IS_LACROS)')
+        # defined(OS_CHROMEOS) && BUILDFLAG(IS_CHROMEOS_LACROS).
+        ifdefs.append('BUILDFLAG(IS_CHROMEOS_LACROS)')
       elif platform == Platforms.LINUX:
         ifdefs.append('(defined(OS_LINUX) && !defined(OS_CHROMEOS))')
       elif platform == Platforms.MAC:
@@ -256,8 +258,8 @@ class _APICCGenerator(object):
     c.Append(cpp_util.CHROMIUM_LICENSE)
     c.Append()
     c.Append('#include "%s"' % (
-        os.path.join(self._bundle._impl_dir,
-                     'generated_api_registration.h')))
+        cpp_util.ToPosixPath(os.path.join(self._bundle._impl_dir,
+                                          'generated_api_registration.h'))))
     c.Append()
     c.Append('#include "build/build_config.h"')
     c.Append('#include "build/chromeos_buildflags.h"')
@@ -281,7 +283,7 @@ class _APICCGenerator(object):
       if ifdefs is not None:
         c.Append("#if %s" % ifdefs, indent_level=0)
 
-      c.Append('#include "%s"' % implementation_header)
+      c.Append('#include "%s"' % cpp_util.ToPosixPath(implementation_header))
 
       if ifdefs is not None:
         c.Append("#endif  // %s" % ifdefs, indent_level=0)
@@ -341,13 +343,15 @@ class _SchemasCCGenerator(object):
     c = code.Code()
     c.Append(cpp_util.CHROMIUM_LICENSE)
     c.Append()
-    c.Append('#include "%s"' % (os.path.join(self._bundle._source_file_dir,
-                                             'generated_schemas.h')))
+    c.Append('#include "%s"' % (
+             cpp_util.ToPosixPath(os.path.join(self._bundle._source_file_dir,
+                                               'generated_schemas.h'))))
     c.Append()
     c.Append('#include <algorithm>')
     c.Append('#include <iterator>')
     c.Append()
-    c.Append('#include "base/ranges/algorithm.h"')
+    c.Append('#include "base/containers/fixed_flat_map.h"')
+    c.Append('#include "base/strings/string_piece.h"')
     c.Append()
     c.Append('namespace {')
     for api in self._bundle._api_defs:
@@ -379,33 +383,18 @@ class _SchemasCCGenerator(object):
     c.Append('// static')
     c.Sblock('base::StringPiece %s::Get(base::StringPiece name) {' %
              self._bundle._GenerateBundleClass('GeneratedSchemas'))
-    c.Sblock('static constexpr struct kSchemaMapping {')
-    c.Append('const base::StringPiece name;')
-    c.Append('const base::StringPiece schema;')
-    c.Sblock('constexpr bool operator<(const kSchemaMapping& that) const {')
-    c.Append('return name < that.name;')
-    c.Eblock('}')
-    c.Eblock()
-    c.Sblock('} kSchemas[] = {')
+
+    c.Append('static constexpr auto kSchemas = '
+             'base::MakeFixedFlatMap<base::StringPiece, base::StringPiece>({')
+    c.Sblock()
     namespaces = [self._bundle._model.namespaces[api.get('namespace')].name
                   for api in self._bundle._api_defs]
     for namespace in sorted(namespaces):
       schema_constant_name = _FormatNameAsConstant(namespace)
       c.Append('{"%s", %s},' % (namespace, schema_constant_name))
-    c.Eblock('};')
-    c.Append('static_assert(base::ranges::is_sorted(kSchemas), "|kSchemas| '
-             'should be sorted.");')
-
-    c.Sblock('auto it = std::lower_bound(std::begin(kSchemas), '
-             'std::end(kSchemas),')
-    c.Append('kSchemaMapping{name, base::StringPiece()});')
-    c.Eblock()
-
-    c.Sblock('if (it != std::end(kSchemas) && it->name == name)')
-    c.Append('return it->schema;')
-    c.Eblock()
-
-    c.Append('return base::StringPiece();')
+    c.Eblock('});')
+    c.Append('auto it = kSchemas.find(name);')
+    c.Append('return it != kSchemas.end() ? it->second : base::StringPiece();')
     c.Eblock('}')
     c.Append()
     c.Concat(cpp_util.CloseNamespace(self._bundle._cpp_namespace))
diff --git a/chromium/tools/json_schema_compiler/cpp_bundle_generator_test.py b/chromium/tools/json_schema_compiler/cpp_bundle_generator_test.py
index 0994d0659b2..172fecae644 100755
--- a/chromium/tools/json_schema_compiler/cpp_bundle_generator_test.py
+++ b/chromium/tools/json_schema_compiler/cpp_bundle_generator_test.py
@@ -36,13 +36,14 @@ class CppBundleGeneratorTest(unittest.TestCase):
         'test/function_platform_all.json')
     self.assertEquals(
         'defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || '
-        '(defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS))',
+        '(defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_LACROS))',
         _getPlatformIfdefs(cpp_bundle_generator, model))
 
   def testIfDefsForChromeOS(self):
     cpp_bundle_generator, model = _createCppBundleGenerator(
         'test/function_platform_chromeos.json')
-    self.assertEquals('(defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS))',
+    self.assertEquals('(defined(OS_CHROMEOS) && '
+                      '!BUILDFLAG(IS_CHROMEOS_LACROS))',
                       _getPlatformIfdefs(cpp_bundle_generator, model))
 
 
diff --git a/chromium/tools/json_schema_compiler/cpp_type_generator.py b/chromium/tools/json_schema_compiler/cpp_type_generator.py
index 17772d7e18a..4e394f1d344 100644
--- a/chromium/tools/json_schema_compiler/cpp_type_generator.py
+++ b/chromium/tools/json_schema_compiler/cpp_type_generator.py
@@ -178,7 +178,7 @@ class CppTypeGenerator(object):
           path = '%s/%s.h' % (namespace.source_file_dir, namespace.unix_name)
           if path not in added_paths:
             added_paths.add(path)
-            c.Append('#include "%s"' % path)
+            c.Append('#include "%s"' % cpp_util.ToPosixPath(path))
     return c
 
   def _FindType(self, full_name):
diff --git a/chromium/tools/json_schema_compiler/cpp_util.py b/chromium/tools/json_schema_compiler/cpp_util.py
index af8ce05761c..abee9fa8d69 100644
--- a/chromium/tools/json_schema_compiler/cpp_util.py
+++ b/chromium/tools/json_schema_compiler/cpp_util.py
@@ -9,6 +9,7 @@ from code import Code
 from datetime import datetime
 from model import PropertyType
 import os
+import posixpath
 import re
 
 CHROMIUM_LICENSE = (
@@ -165,6 +166,14 @@ def IsUnixName(s):
   """
   return all(x.islower() or x == '_' for x in s) and '_' in s
 
+def ToPosixPath(path):
+  """Returns |path| with separator converted to POSIX style.
+
+  This is needed to generate C++ #include paths.
+  """
+  return path.replace(os.path.sep, posixpath.sep)
+
+
 def CamelCase(unix_name):
   return ''.join(word.capitalize() for word in unix_name.split('_'))
 
diff --git a/chromium/tools/json_schema_compiler/feature_compiler.py b/chromium/tools/json_schema_compiler/feature_compiler.py
index 3827dc3cdb7..645c5fb9341 100644
--- a/chromium/tools/json_schema_compiler/feature_compiler.py
+++ b/chromium/tools/json_schema_compiler/feature_compiler.py
@@ -10,6 +10,7 @@ from datetime import datetime
 from functools import partial
 import json
 import os
+import posixpath
 import re
 import sys
 
@@ -55,6 +56,7 @@ CC_FILE_BEGIN = """
 #include "extensions/common/features/feature_provider.h"
 #include "extensions/common/features/manifest_feature.h"
 #include "extensions/common/features/permission_feature.h"
+#include "extensions/common/mojom/feature_session_type.mojom.h"
 
 namespace extensions {
 
@@ -68,9 +70,12 @@ CC_FILE_END = """
 }  // namespace extensions
 """
 
-# Legacy keys for the allow and blocklists.
-LEGACY_ALLOWLIST_KEY = 'whitelist'
-LEGACY_BLOCKLIST_KEY = 'blacklist'
+def ToPosixPath(path):
+  """Returns |path| with separator converted to POSIX style.
+
+  This is needed to generate C++ #include paths.
+  """
+  return path.replace(os.path.sep, posixpath.sep)
 
 # Returns true if the list 'l' only contains strings that are a hex-encoded SHA1
 # hashes.
@@ -124,7 +129,16 @@ FEATURE_GRAMMAR = ({
         str: {},
         'shared': True
     },
-    LEGACY_BLOCKLIST_KEY: {
+    'allowlist': {
+        list: {
+            'subtype':
+            str,
+            'validators':
+            [(ListContainsOnlySha1Hashes,
+              'list should only have hex-encoded SHA1 hashes of extension ids')]
+        }
+    },
+    'blocklist': {
         list: {
             'subtype':
             str,
@@ -251,9 +265,10 @@ FEATURE_GRAMMAR = ({
     'session_types': {
         list: {
             'enum_map': {
-                'regular': 'FeatureSessionType::REGULAR',
-                'kiosk': 'FeatureSessionType::KIOSK',
-                'kiosk.autolaunched': 'FeatureSessionType::AUTOLAUNCHED_KIOSK',
+                'regular': 'mojom::FeatureSessionType::kRegular',
+                'kiosk': 'mojom::FeatureSessionType::kKiosk',
+                'kiosk.autolaunched':
+                  'mojom::FeatureSessionType::kAutolaunchedKiosk',
             }
         }
     },
@@ -261,15 +276,6 @@ FEATURE_GRAMMAR = ({
         str: {},
         'shared': True
     },
-    LEGACY_ALLOWLIST_KEY: {
-        list: {
-            'subtype':
-            str,
-            'validators':
-            [(ListContainsOnlySha1Hashes,
-              'list should only have hex-encoded SHA1 hashes of extension ids')]
-        }
-    },
 })
 
 FEATURE_TYPES = ['APIFeature', 'BehaviorFeature',
@@ -341,7 +347,7 @@ def IsFeatureCrossReference(property_name, reverse_property_name, feature,
 # Verifies that a feature with an allowlist is not available to hosted apps,
 # returning true on success.
 def DoesNotHaveAllowlistForHostedApps(value):
-  if not LEGACY_ALLOWLIST_KEY in value:
+  if not 'allowlist' in value:
     return True
 
   # Hack Alert: |value| here has the code for the generated C++ feature. Since
@@ -380,12 +386,11 @@ def DoesNotHaveAllowlistForHostedApps(value):
   # Exceptions (see the feature files).
   # DO NOT ADD MORE.
   HOSTED_APP_EXCEPTIONS = [
-      '99060B01DE911EB85FD630C8BA6320C9186CA3AB',
       'B44D08FD98F1523ED5837D78D0A606EA9D6206E5',
       '2653F6F6C39BC6EEBD36A09AFB92A19782FF7EB4',
   ]
 
-  allowlist = cpp_list_to_list(value[LEGACY_ALLOWLIST_KEY])
+  allowlist = cpp_list_to_list(value['allowlist'])
   for entry in allowlist:
     if entry not in HOSTED_APP_EXCEPTIONS:
       return False
@@ -473,14 +478,7 @@ def GetCodeForFeatureValues(feature_values):
     if key in IGNORED_KEYS:
       continue;
 
-    # TODO(devlin): Remove this hack as part of 842387.
-    set_key = key
-    if key == LEGACY_ALLOWLIST_KEY:
-      set_key = 'allowlist'
-    elif key == LEGACY_BLOCKLIST_KEY:
-      set_key = 'blocklist'
-
-    c.Append('feature->set_%s(%s);' % (set_key, feature_values[key]))
+    c.Append('feature->set_%s(%s);' % (key, feature_values[key]))
   return c
 
 class Feature(object):
@@ -892,7 +890,7 @@ class FeatureCompiler(object):
         'header_guard': (header_file_path.replace('/', '_').
                              replace('.', '_').upper()),
         'method_name': self._method_name,
-        'source_files': str(self._source_files),
+        'source_files': str([ToPosixPath(f) for f in self._source_files]),
         'year': str(datetime.now().year)
     })
     if not os.path.exists(self._out_root):
diff --git a/chromium/tools/json_schema_compiler/feature_compiler_test.py b/chromium/tools/json_schema_compiler/feature_compiler_test.py
index 0a226ca772b..ff7231d0af6 100755
--- a/chromium/tools/json_schema_compiler/feature_compiler_test.py
+++ b/chromium/tools/json_schema_compiler/feature_compiler_test.py
@@ -37,7 +37,7 @@ class FeatureCompilerTest(unittest.TestCase):
   def testFeature(self):
     # Test some basic feature parsing for a sanity check.
     f = self._parseFeature({
-      'blacklist': [
+      'blocklist': [
         'ABCDEF0123456789ABCDEF0123456789ABCDEF01',
         '10FEDCBA9876543210FEDCBA9876543210FEDCBA'
       ],
@@ -60,7 +60,7 @@ class FeatureCompilerTest(unittest.TestCase):
       'noparent': True,
       'platforms': ['mac', 'win'],
       'session_types': ['kiosk', 'regular'],
-      'whitelist': [
+      'allowlist': [
         '0123456789ABCDEF0123456789ABCDEF01234567',
         '76543210FEDCBA9876543210FEDCBA9876543210'
       ]
@@ -366,11 +366,11 @@ class FeatureCompilerTest(unittest.TestCase):
 
     with self.assertRaisesRegexp(AssertionError,
                                  'No default parent found for bookmarks'):
-      c._CompileFeature('bookmarks.export', { "whitelist": ["asdf"] })
+      c._CompileFeature('bookmarks.export', { "allowlist": ["asdf"] })
 
-  def testRealIdsDisallowedInWhitelist(self):
+  def testRealIdsDisallowedInAllowlist(self):
     fake_id = 'a' * 32;
-    f = self._parseFeature({'whitelist': [fake_id],
+    f = self._parseFeature({'allowlist': [fake_id],
                             'extension_types': ['extension'],
                             'channel': 'beta'})
     f.Validate('PermissionFeature', {})
@@ -380,7 +380,7 @@ class FeatureCompilerTest(unittest.TestCase):
   def testHostedAppsCantUseAllowlistedFeatures_SimpleFeature(self):
     f = self._parseFeature({
         'extension_types': ['extension', 'hosted_app'],
-        'whitelist': ['0123456789ABCDEF0123456789ABCDEF01234567'],
+        'allowlist': ['0123456789ABCDEF0123456789ABCDEF01234567'],
         'channel': 'beta',
     })
     f.Validate('PermissionFeature', {})
@@ -396,13 +396,13 @@ class FeatureCompilerTest(unittest.TestCase):
         }, {
           'channel': 'beta',
           'extension_types': ['hosted_app'],
-          'whitelist': ['0123456789ABCDEF0123456789ABCDEF01234567'],
+          'allowlist': ['0123456789ABCDEF0123456789ABCDEF01234567'],
         }])
     c._CompileFeature('valid_feature',
         [{
           'extension_types': ['extension'],
           'channel': 'beta',
-          'whitelist': ['0123456789ABCDEF0123456789ABCDEF01234567'],
+          'allowlist': ['0123456789ABCDEF0123456789ABCDEF01234567'],
         }, {
           'channel': 'beta',
           'extension_types': ['hosted_app'],
@@ -429,7 +429,7 @@ class FeatureCompilerTest(unittest.TestCase):
 
     c._CompileFeature('parent.child',
         {
-          'whitelist': ['0123456789ABCDEF0123456789ABCDEF01234567']
+          'allowlist': ['0123456789ABCDEF0123456789ABCDEF01234567']
         })
     feature = c._features.get('parent.child')
     self.assertTrue(feature)
diff --git a/chromium/tools/json_schema_compiler/features_cc_generator.py b/chromium/tools/json_schema_compiler/features_cc_generator.py
index 384791489cd..a2172d63dc0 100644
--- a/chromium/tools/json_schema_compiler/features_cc_generator.py
+++ b/chromium/tools/json_schema_compiler/features_cc_generator.py
@@ -29,11 +29,13 @@ class _Generator(object):
     c = Code()
     (c.Append(cpp_util.CHROMIUM_LICENSE)
       .Append()
-      .Append(cpp_util.GENERATED_FEATURE_MESSAGE % self._source_file)
+      .Append(cpp_util.GENERATED_FEATURE_MESSAGE %
+              cpp_util.ToPosixPath(self._source_file))
       .Append()
       .Append('#include <string>')
       .Append()
-      .Append('#include "%s.h"' % self._source_file_filename)
+      .Append('#include "%s.h"' %
+              cpp_util.ToPosixPath(self._source_file_filename))
       .Append()
       .Append('#include "base/notreached.h"')
       .Append()
diff --git a/chromium/tools/json_schema_compiler/features_h_generator.py b/chromium/tools/json_schema_compiler/features_h_generator.py
index eae39c5c09f..5b88d0c1588 100644
--- a/chromium/tools/json_schema_compiler/features_h_generator.py
+++ b/chromium/tools/json_schema_compiler/features_h_generator.py
@@ -29,7 +29,8 @@ class _Generator(object):
     c = Code()
     (c.Append(cpp_util.CHROMIUM_LICENSE)
       .Append()
-      .Append(cpp_util.GENERATED_FEATURE_MESSAGE % self._source_file)
+      .Append(cpp_util.GENERATED_FEATURE_MESSAGE %
+              cpp_util.ToPosixPath(self._source_file))
       .Append()
     )
 
diff --git a/chromium/tools/json_schema_compiler/h_generator.py b/chromium/tools/json_schema_compiler/h_generator.py
index 0fd7e419389..9e86bb3858f 100644
--- a/chromium/tools/json_schema_compiler/h_generator.py
+++ b/chromium/tools/json_schema_compiler/h_generator.py
@@ -32,7 +32,8 @@ class _Generator(object):
     c = Code()
     (c.Append(cpp_util.CHROMIUM_LICENSE)
       .Append()
-      .Append(cpp_util.GENERATED_FILE_MESSAGE % self._namespace.source_file)
+      .Append(cpp_util.GENERATED_FILE_MESSAGE %
+              cpp_util.ToPosixPath(self._namespace.source_file))
       .Append()
     )
 
diff --git a/chromium/tools/json_schema_compiler/idl_schema.py b/chromium/tools/json_schema_compiler/idl_schema.py
index ab3b177d137..a07853ffd87 100755
--- a/chromium/tools/json_schema_compiler/idl_schema.py
+++ b/chromium/tools/json_schema_compiler/idl_schema.py
@@ -106,7 +106,7 @@ class Callspec(object):
   '''
   Given a Callspec node representing an IDL function declaration, converts into
   a tuple:
-      (name, list of function parameters, return type)
+      (name, list of function parameters, return type, async return)
   '''
   def __init__(self, callspec_node, comment):
     self.node = callspec_node
@@ -115,6 +115,7 @@ class Callspec(object):
   def process(self, callbacks):
     parameters = []
     return_type = None
+    returns_async = None
     if self.node.GetProperty('TYPEREF') not in ('void', None):
       return_type = Typeref(self.node.GetProperty('TYPEREF'),
                             self.node.parent,
@@ -129,7 +130,21 @@ class Callspec(object):
       if parameter['name'] in self.comment:
         parameter['description'] = self.comment[parameter['name']]
       parameters.append(parameter)
-    return (self.node.GetName(), parameters, return_type)
+    # For promise supporting functions, pull off the callback from the final
+    # parameter and put it into the separate returns async field.
+    if self.node.GetProperty('supportsPromises'):
+      assert len(parameters) > 0, (
+          'Callspec "%s" is marked as supportsPromises '
+          'but has no existing callback defined.' % self.node.GetName())
+      returns_async = parameters.pop()
+      assert returns_async.get('type') == 'function', (
+          'Callspec "%s" is marked as supportsPromises '
+          'but the final parameter is not a function.' % self.node.GetName())
+      # The returns_async field is inherently a function, so doesn't need type
+      # specified on it.
+      returns_async.pop('type')
+
+    return (self.node.GetName(), parameters, return_type, returns_async)
 
 
 class Param(object):
@@ -216,8 +231,8 @@ class Member(object):
         properties['description'] = parent_comment
         properties['jsexterns'] = jsexterns
       elif node.cls == 'Callspec':
-        name, parameters, return_type = (Callspec(node, parameter_comments)
-                                         .process(callbacks))
+        name, parameters, return_type, returns_async = (
+            Callspec(node, parameter_comments).process(callbacks))
         if functions_are_properties:
           # If functions are treated as properties (which will happen if the
           # interface is named Properties) then this isn't a function, it's a
@@ -239,6 +254,12 @@ class Member(object):
           properties['parameters'] = parameters
           if return_type is not None:
             properties['returns'] = return_type
+          if returns_async is not None:
+            assert return_type is None, (
+                'Function "%s" cannot support promises and also have a '
+                'return value.' % name)
+            properties['returns_async'] = returns_async
+
     properties['name'] = name
     if type_override is not None:
       properties['type'] = type_override
diff --git a/chromium/tools/json_schema_compiler/idl_schema_test.py b/chromium/tools/json_schema_compiler/idl_schema_test.py
index 98115ade926..d20074b21f6 100755
--- a/chromium/tools/json_schema_compiler/idl_schema_test.py
+++ b/chromium/tools/json_schema_compiler/idl_schema_test.py
@@ -439,6 +439,44 @@ class IdlSchemaTest(unittest.TestCase):
 
     self.assertEquals(expected, badabish_params)
 
+  def testFunctionWithPromise(self):
+    schema = idl_schema.Load('test/idl_function_types.idl')[0]
+
+    promise_function = getFunction(schema, 'promise_supporting')
+    expected = OrderedDict([
+        ('parameters', []),
+        ('returns_async', {
+            'name': 'callback',
+            'parameters': [{'name': 'x', 'type': 'integer'}]
+        }),
+        ('name', 'promise_supporting'),
+        ('type', 'function')
+    ])
+    self.assertEquals(expected, promise_function)
+
+  def testFunctionWithPromiseAndParams(self):
+    schema = idl_schema.Load('test/idl_function_types.idl')[0]
+
+    promise_function = getFunction(schema, 'promise_supporting_with_params')
+    expected = OrderedDict([
+        ('parameters', [
+            {
+               'name': 'z',
+               'type': 'integer'
+            }, {
+                'name':'y',
+                'choices': [{'type': 'integer'}, {'type': 'string'}]
+            }
+        ]),
+        ('returns_async', {
+            'name': 'callback',
+            'parameters': [{'name': 'x', 'type': 'integer'}]
+        }),
+        ('name', 'promise_supporting_with_params'),
+        ('type', 'function')
+    ])
+    self.assertEquals(expected, promise_function)
+
   def testProperties(self):
     schema = idl_schema.Load('test/idl_properties.idl')[0]
     self.assertEquals(OrderedDict([
diff --git a/chromium/tools/json_schema_compiler/manifest_parse_util.cc b/chromium/tools/json_schema_compiler/manifest_parse_util.cc
index 98728c7b762..49938c7c423 100644
--- a/chromium/tools/json_schema_compiler/manifest_parse_util.cc
+++ b/chromium/tools/json_schema_compiler/manifest_parse_util.cc
@@ -40,26 +40,13 @@ bool ParseHelper(const base::DictionaryValue& dict,
 
 }  // namespace
 
-void PopulateArrayParseError(
-    base::StringPiece key,
-    base::string16* error,
-    std::vector<base::StringPiece>* error_path_reversed) {
-  DCHECK(error);
-  DCHECK(error_path_reversed);
-  DCHECK(!error->empty());
-  DCHECK(error_path_reversed->empty());
-
-  error_path_reversed->push_back(key);
-  *error = base::ASCIIToUTF16(base::StringPrintf(
-      "Parsing array failed: %s.", base::UTF16ToASCII(*error).c_str()));
-}
-
 void PopulateInvalidEnumValueError(
     base::StringPiece key,
     const std::string& value,
     base::string16* error,
     std::vector<base::StringPiece>* error_path_reversed) {
   DCHECK(error);
+  DCHECK(error->empty());
   DCHECK(error_path_reversed);
   DCHECK(error_path_reversed->empty());
 
@@ -90,6 +77,7 @@ const base::Value* FindKeyOfType(
     base::string16* error,
     std::vector<base::StringPiece>* error_path_reversed) {
   DCHECK(error);
+  DCHECK(error->empty());
   DCHECK(error_path_reversed);
   DCHECK(error_path_reversed->empty());
 
diff --git a/chromium/tools/json_schema_compiler/manifest_parse_util.h b/chromium/tools/json_schema_compiler/manifest_parse_util.h
index d6c108de993..6f326891389 100644
--- a/chromium/tools/json_schema_compiler/manifest_parse_util.h
+++ b/chromium/tools/json_schema_compiler/manifest_parse_util.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/check.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece_forward.h"
 #include "base/values.h"
@@ -17,14 +18,6 @@ namespace manifest_parse_util {
 
 // This file contains helpers used by auto-generated manifest parsing code.
 
-// Populates |error| and |error_path_reversed| denoting array parse error at the
-// given |key|. Note |error| should already contain the specific parse error for
-// the array item.
-void PopulateArrayParseError(
-    base::StringPiece key,
-    base::string16* error,
-    std::vector<base::StringPiece>* error_path_reversed);
-
 // Populates |error| and |error_path_reversed| denoting the given invalid enum
 // |value| at the given |key|.
 void PopulateInvalidEnumValueError(
@@ -109,8 +102,11 @@ bool ParseFromDictionary(const base::DictionaryValue& dict,
 
   bool result = json_schema_compiler::util::PopulateArrayFromList(
       value->AsListValue(*value), out_ptr, error);
-  if (!result)
-    PopulateArrayParseError(key, error, error_path_reversed);
+  if (!result) {
+    DCHECK(error_path_reversed);
+    DCHECK(error_path_reversed->empty());
+    error_path_reversed->push_back(key);
+  }
 
   return result;
 }
diff --git a/chromium/tools/json_schema_compiler/model.py b/chromium/tools/json_schema_compiler/model.py
index a24d1a59d36..7653535d9a7 100644
--- a/chromium/tools/json_schema_compiler/model.py
+++ b/chromium/tools/json_schema_compiler/model.py
@@ -83,14 +83,14 @@ class SimpleFeature(object):
   - |unix_name| the unix_name of the feature
   - |channel| the channel where the feature is released
   - |extension_types| the types which can use the feature
-  - |whitelist| a list of extensions allowed to use the feature
+  - |allowlist| a list of extensions allowed to use the feature
   """
   def __init__(self, feature_name, feature_def):
     self.name = feature_name
     self.unix_name = UnixName(self.name)
     self.channel = feature_def['channel']
     self.extension_types = feature_def['extension_types']
-    self.whitelist = feature_def.get('whitelist')
+    self.allowlist = feature_def.get('allowlist')
 
 
 class Namespace(object):
@@ -127,6 +127,7 @@ class Namespace(object):
                        'on the API summary page.' % self.name)
       json['description'] = ''
     self.description = json['description']
+    self.nodoc = json.get('nodoc', False)
     self.deprecated = json.get('deprecated', None)
     self.unix_name = UnixName(self.name)
     self.source_file = source_file
@@ -217,6 +218,7 @@ class Type(object):
     self.unix_name = UnixName(self.name)
     self.description = json.get('description', None)
     self.jsexterns = json.get('jsexterns', None)
+    self.nodoc = json.get('nodoc', False)
 
     # Copy the Origin and override the |from_manifest_keys| value as necessary.
     # We need to do this to ensure types reference by manifest types have the
@@ -364,6 +366,7 @@ class Function(object):
     self.supports_listeners = options.get('supportsListeners', True)
     self.supports_rules = options.get('supportsRules', False)
     self.supports_dom = options.get('supportsDom', False)
+    self.nodoc = json.get('nodoc', False)
 
     def GeneratePropertyFromParam(p):
       return Property(self, p['name'], p, namespace, origin)
@@ -377,7 +380,7 @@ class Function(object):
         raise ValueError('Only a single parameter can be specific on '
                          'returns_async: %s.%s' % (namespace.name, name))
       self.returns_async = ReturnsAsync(self, returns_async, namespace,
-                                        Origin(from_client=True))
+                                        Origin(from_client=True), True)
       # TODO(https://crbug.com/1143032): Returning a synchronous value is
       # incompatible with returning a promise. There are APIs that specify this,
       # though. Some appear to be incorrectly specified (i.e., don't return a
@@ -403,8 +406,12 @@ class Function(object):
         self.params.append(GeneratePropertyFromParam(param))
 
     if callback_param:
+      # Even though we are creating a ReturnsAsync type here, this does not
+      # support being returned via a Promise, as this is implied by
+      # "returns_async" being found in the JSON.
+      # This is just a holder type for the callback.
       self.returns_async = ReturnsAsync(self, callback_param, namespace,
-                                        Origin(from_client=True))
+                                        Origin(from_client=True), False)
 
     self.returns = None
     if 'returns' in json:
@@ -429,14 +436,17 @@ class ReturnsAsync(object):
   - |params| a list of parameters supplied to the function in the case of using
              callbacks, or the list of properties on the returned object in the
              case of using promises
+  - |can_return_promise| whether this can be treated as a Promise as well as
+                         callback
   """
-  def __init__(self, parent, json, namespace, origin):
+  def __init__(self, parent, json, namespace, origin, can_return_promise):
     self.name = json.get('name')
     self.simple_name = _StripNamespace(self.name, namespace)
     self.description = json.get('description')
     self.optional = json.get('optional', False)
     self.nocompile = json.get('nocompile')
     self.parent = parent
+    self.can_return_promise = can_return_promise
 
     if json.get('returns') is not None:
       raise ValueError('Cannot return a value from an asynchronous return: '
@@ -479,6 +489,7 @@ class Property(object):
     self.optional = json.get('optional', None)
     self.instance_of = json.get('isInstanceOf', None)
     self.deprecated = json.get('deprecated')
+    self.nodoc = json.get('nodoc', False)
 
     # HACK: only support very specific value types.
     is_allowed_value = (
@@ -603,11 +614,124 @@ class PropertyType(object):
   REF = _PropertyTypeInfo(False, "ref")
   STRING = _PropertyTypeInfo(True, "string")
 
+def IsCPlusPlusKeyword(name):
+  """Returns true if `name` is a C++ reserved keyword.
+  """
+  # Obtained from https://en.cppreference.com/w/cpp/keyword.
+  keywords = {
+    "alignas",
+    "alignof",
+    "and",
+    "and_eq",
+    "asm",
+    "atomic_cancel",
+    "atomic_commit",
+    "atomic_noexcept",
+    "auto",
+    "bitand",
+    "bitor",
+    "bool",
+    "break",
+    "case",
+    "catch",
+    "char",
+    "char8_t",
+    "char16_t",
+    "char32_t",
+    "class",
+    "compl",
+    "concept",
+    "const",
+    "consteval",
+    "constexpr",
+    "constinit",
+    "const_cast",
+    "continue",
+    "co_await",
+    "co_return",
+    "co_yield",
+    "decltype",
+    "default",
+    "delete",
+    "do",
+    "double",
+    "dynamic_cast",
+    "else",
+    "enum",
+    "explicit",
+    "export",
+    "extern",
+    "false",
+    "float",
+    "for",
+    "friend",
+    "goto",
+    "if",
+    "inline",
+    "int",
+    "long",
+    "mutable",
+    "namespace",
+    "new",
+    "noexcept",
+    "not",
+    "not_eq",
+    "nullptr",
+    "operator",
+    "or",
+    "or_eq",
+    "private",
+    "protected",
+    "public",
+    "reflexpr",
+    "register",
+    "reinterpret_cast",
+    "requires",
+    "return",
+    "short",
+    "signed",
+    "sizeof",
+    "static",
+    "static_assert",
+    "static_cast",
+    "struct",
+    "switch",
+    "synchronized",
+    "template",
+    "this",
+    "thread_local",
+    "throw",
+    "true",
+    "try",
+    "typedef",
+    "typeid",
+    "typename",
+    "union",
+    "unsigned",
+    "using",
+    "virtual",
+    "void",
+    "volatile",
+    "wchar_t",
+    "while",
+    "xor",
+    "xor_eq"
+  }
+  return name in keywords
 
 @memoize
 def UnixName(name):
   '''Returns the unix_style name for a given lowerCamelCase string.
   '''
+  # Append an extra underscore to the |name|'s end if it's a reserved C++
+  # keyword in order to avoid compilation errors in generated code.
+  # Note: In some cases, this is overly greedy, because the unix name is
+  # appended to another string (such as in choices, where it becomes
+  # "as_double_"). We can fix this if this situation becomes common, but for now
+  # it's only hit in tests, and not worth the complexity.
+  if IsCPlusPlusKeyword(name):
+    name = name + '_'
+
   unix_name = []
   for i, c in enumerate(name):
     if c.isupper() and i > 0 and name[i - 1] != '_':
diff --git a/chromium/tools/json_schema_compiler/model_test.py b/chromium/tools/json_schema_compiler/model_test.py
index c11f64646b0..170abbea8d6 100755
--- a/chromium/tools/json_schema_compiler/model_test.py
+++ b/chromium/tools/json_schema_compiler/model_test.py
@@ -40,9 +40,25 @@ class ModelTest(unittest.TestCase):
         'path/to/idl_namespace_non_specific_platforms.idl')
     self.idl_namespace_non_specific_platforms = self.model.namespaces.get(
         'idl_namespace_non_specific_platforms')
+    self.returns_async_json = CachedLoad('test/returns_async.json')
+    self.model.AddNamespace(self.returns_async_json[0],
+        'path/to/returns_async.json')
+    self.returns_async = self.model.namespaces.get('returns_async')
+    self.idl_returns_async_idl = Load('test/idl_returns_async.idl')
+    self.model.AddNamespace(self.idl_returns_async_idl[0],
+        'path/to/idl_returns_async.idl')
+    self.idl_returns_async = self.model.namespaces.get('idl_returns_async')
+    self.nodoc_json = CachedLoad('test/namespace_nodoc.json')
+    self.model.AddNamespace(self.nodoc_json[0],
+        'path/to/namespace_nodoc.json')
+    self.nodoc = self.model.namespaces.get('nodoc')
+    self.fakeapi_json = CachedLoad('test/namespace_fakeapi.json')
+    self.model.AddNamespace(self.fakeapi_json[0],
+        'path/to/namespace_fakeapi.json')
+    self.fakeapi = self.model.namespaces.get('fakeapi')
 
   def testNamespaces(self):
-    self.assertEquals(6, len(self.model.namespaces))
+    self.assertEquals(10, len(self.model.namespaces))
     self.assertTrue(self.permissions)
 
   def testHasFunctions(self):
@@ -98,6 +114,18 @@ class ModelTest(unittest.TestCase):
         'True if the extension has the specified permissions.', self.
         permissions.functions['contains'].returns_async.params[0].description)
 
+  def testAsyncPromise(self):
+    supportsPromises = self.returns_async.functions['supportsPromises']
+    self.assertTrue(supportsPromises.returns_async.can_return_promise)
+    doesNotSupportPromises = self.returns_async.functions[
+        'doesNotSupportPromises']
+    self.assertFalse(doesNotSupportPromises.returns_async.can_return_promise)
+    supportsPromisesIdl = self.idl_returns_async.functions['supportsPromises']
+    self.assertTrue(supportsPromisesIdl.returns_async.can_return_promise)
+    doesNotSupportPromisesIdl = self.idl_returns_async.functions[
+        'doesNotSupportPromises']
+    self.assertFalse(doesNotSupportPromisesIdl.returns_async.can_return_promise)
+
   def testPropertyUnixName(self):
     param = self.tabs.functions['move'].params[0]
     self.assertEquals('tab_ids', param.unix_name)
@@ -144,5 +172,26 @@ class ModelTest(unittest.TestCase):
     self.assertEqual(None,
         self.idl_namespace_non_specific_platforms.platforms)
 
+  def testHasNoDoc(self):
+    fakeapi_NoDocType = self.fakeapi.types['NoDocType']
+    self.assertTrue(fakeapi_NoDocType.nodoc)
+
+    fakeapi_FakeType = self.fakeapi.types['FakeType']
+    selected_property = fakeapi_FakeType.properties['nodocProperty']
+    self.assertTrue(selected_property.nodoc)
+
+    nodocMethod_method = self.fakeapi.functions['nodocMethod']
+    self.assertTrue(nodocMethod_method.nodoc)
+
+    onFooNoDoc_event = self.fakeapi.events['onFooNoDoc']
+    self.assertTrue(onFooNoDoc_event.nodoc)
+
+    onFoo_event = self.fakeapi.events['onFoo']
+    self.assertFalse(onFoo_event.nodoc)
+
+    self.assertTrue(self.nodoc.nodoc, 'Namespace should also be marked nodoc')
+    nodoc_ValidType = self.nodoc.types['ValidType']
+    self.assertFalse(nodoc_ValidType.nodoc)
+
 if __name__ == '__main__':
   unittest.main()
diff --git a/chromium/tools/json_schema_compiler/util.cc b/chromium/tools/json_schema_compiler/util.cc
index b83e4a6c266..559279e8c87 100644
--- a/chromium/tools/json_schema_compiler/util.cc
+++ b/chromium/tools/json_schema_compiler/util.cc
@@ -16,11 +16,10 @@ namespace {
 bool ReportError(const base::Value& from,
                  base::Value::Type expected,
                  base::string16* error) {
-  if (!error->empty())
-    error->append(base::ASCIIToUTF16("; "));
-  error->append(base::ASCIIToUTF16(base::StringPrintf(
+  DCHECK(error->empty());
+  *error = base::ASCIIToUTF16(base::StringPrintf(
       "expected %s, got %s", base::Value::GetTypeName(expected),
-      base::Value::GetTypeName(from.type()))));
+      base::Value::GetTypeName(from.type())));
   return false;  // Always false on purpose.
 }
 
diff --git a/chromium/tools/json_schema_compiler/util.h b/chromium/tools/json_schema_compiler/util.h
index 28a8cfd67a0..7900670f05f 100644
--- a/chromium/tools/json_schema_compiler/util.h
+++ b/chromium/tools/json_schema_compiler/util.h
@@ -10,6 +10,9 @@
 #include <utility>
 #include <vector>
 
+#include "base/format_macros.h"
+#include "base/strings/stringprintf.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 
 namespace json_schema_compiler {
@@ -83,14 +86,21 @@ bool PopulateArrayFromList(const base::ListValue& list, std::vector<T>* out) {
 // Populates |out| with |list|. Returns false and sets |error| if there is no
 // list at the specified key or if the list has anything other than |T|.
 template <class T>
-bool PopulateArrayFromList(const base::ListValue& list,
+bool PopulateArrayFromList(const base::ListValue& list_value,
                            std::vector<T>* out,
                            base::string16* error) {
   out->clear();
   T item;
-  for (const auto& value : list) {
-    if (!PopulateItem(value, &item, error))
+  base::string16 item_error;
+  const auto& list = list_value.GetList();
+  for (size_t i = 0; i < list.size(); ++i) {
+    if (!PopulateItem(list[i], &item, &item_error)) {
+      DCHECK(error->empty());
+      *error = base::ASCIIToUTF16(
+          base::StringPrintf("Parsing array failed at index %" PRIuS ": %s", i,
+                             base::UTF16ToASCII(item_error).c_str()));
       return false;
+    }
     out->push_back(std::move(item));
   }
 
diff --git a/chromium/tools/json_to_struct/PRESUBMIT.py b/chromium/tools/json_to_struct/PRESUBMIT.py
index 32809021954..bb36f4707cc 100644
--- a/chromium/tools/json_to_struct/PRESUBMIT.py
+++ b/chromium/tools/json_to_struct/PRESUBMIT.py
@@ -12,9 +12,9 @@ WHITELIST = [ r'.+_test.py$' ]
 
 def CheckChangeOnUpload(input_api, output_api):
   return input_api.canned_checks.RunUnitTestsInDirectory(
-      input_api, output_api, '.', whitelist=WHITELIST)
+      input_api, output_api, '.', files_to_check=WHITELIST)
 
 
 def CheckChangeOnCommit(input_api, output_api):
   return input_api.canned_checks.RunUnitTestsInDirectory(
-      input_api, output_api, '.', whitelist=WHITELIST)
+      input_api, output_api, '.', files_to_check=WHITELIST)
diff --git a/chromium/tools/l10n/.style.yapf b/chromium/tools/l10n/.style.yapf
new file mode 100644
index 00000000000..557fa7bf84c
--- /dev/null
+++ b/chromium/tools/l10n/.style.yapf
@@ -0,0 +1,2 @@
+[style]
+based_on_style = pep8
diff --git a/chromium/tools/l10n/OWNERS b/chromium/tools/l10n/OWNERS
new file mode 100644
index 00000000000..a474a024774
--- /dev/null
+++ b/chromium/tools/l10n/OWNERS
@@ -0,0 +1,3 @@
+claudiomagni@chromium.org
+dvallet@chromium.org
+mlcui@google.com
diff --git a/chromium/tools/l10n/generate_locales_list.py b/chromium/tools/l10n/generate_locales_list.py
new file mode 100755
index 00000000000..18229e23783
--- /dev/null
+++ b/chromium/tools/l10n/generate_locales_list.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""Generates the list of locales with strings for the current platform.
+
+This program generates a file which solely contains a list of locales that will
+be built for this platform in this build of Chrome (equivalently the locales
+that we build strings for) passed in as arguments to this script. This allows us
+to determine what locales we have strings for at runtime without checking the
+locale data paks on the filesystem with a blocking I/O call.
+
+This program can be run with no arguments to run its own unit tests. The first
+argument is the output filename, and all later arguments are interpreted as
+locales.
+
+This script is run by the //ui/base:locales_list_gen build rule, passing in the
+gn variable `locales` defined in build/config/locales.gni as arguments.
+The generated file is then included in ui/base/l10n/l10n_util.h.
+"""
+
+from __future__ import print_function
+
+import sys
+
+
+def gen_locale(locale):  # type: (str) -> str
+    """Returns the generated code for a given locale in the list."""
+    # We assume that all locale codes have only letters, numbers and hyphens.
+    assert locale.replace('-', '').isalnum(), locale
+    # clang-format enforces a four-space indent for initializer lists.
+    return '    PLATFORM_LOCALE({locale})'.format(locale=locale)
+
+
+def gen_locales(locales):  # type: (list) -> str
+    """Returns the generated code for the locale list.
+
+    The list is guaranteed to be in sorted order without duplicates.
+
+    >>> locales = ['en-GB', 'en', 'de', 'en']
+    >>> generated = gen_locales(locales)
+    >>> locales.pop()  # remove the duplicate
+    'en'
+    >>> locales.sort()
+    >>> index_in_generated = lambda locale: generated.index(gen_locale(locale))
+    >>> all(
+    ...     index_in_generated(prev_locale) < index_in_generated(next_locale)
+    ...     for prev_locale, next_locale in zip(locales, locales[1:]))
+    True
+    """
+    return '\n'.join(gen_locale(locale) for locale in sorted(set(locales)))
+
+
+def main():  # type: () -> None
+    import doctest
+    doctest.testmod()
+
+    if len(sys.argv) < 2:
+        print('{}: only ran tests'.format(sys.argv[0]))
+        return
+
+    output = gen_locales(sys.argv[2:])
+    with open(sys.argv[1], 'w') as f:
+        f.write(output)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/chromium/tools/licenses.py b/chromium/tools/licenses.py
index 97d95a238a1..c548ac8f2b2 100755
--- a/chromium/tools/licenses.py
+++ b/chromium/tools/licenses.py
@@ -163,12 +163,6 @@ SPECIAL_CASES = {
         "URL": "http://code.google.com/p/angleproject/",
         "License": "BSD",
     },
-    os.path.join('third_party', 'angle', 'third_party', 'vulkan-headers'): {
-        "Name": "Vulkan-Headers",
-        "URL": "https://github.com/KhronosGroup/Vulkan-Headers",
-        "License": "Apache 2.0",
-        "License File": "src/LICENSE.txt",
-    },
     os.path.join('third_party', 'cros_system_api'): {
         "Name": "Chromium OS system API",
         "URL": "http://www.chromium.org/chromium-os",
@@ -355,7 +349,6 @@ KNOWN_NON_IOS_LIBRARIES = set([
     os.path.join('chrome', 'installer', 'mac', 'third_party', 'xz'),
     os.path.join('chrome', 'test', 'data', 'third_party', 'kraken'),
     os.path.join('chrome', 'test', 'data', 'third_party', 'spaceport'),
-    os.path.join('chrome', 'third_party', 'mock4js'),
     os.path.join('chrome', 'third_party', 'mozilla_security_manager'),
     os.path.join('third_party', 'angle'),
     os.path.join('third_party', 'apple_apsl'),
diff --git a/chromium/tools/linux/PRESUBMIT.py b/chromium/tools/linux/PRESUBMIT.py
index b29a8c47778..241cabc2346 100644
--- a/chromium/tools/linux/PRESUBMIT.py
+++ b/chromium/tools/linux/PRESUBMIT.py
@@ -26,9 +26,10 @@ def CommonChecks(input_api, output_api):
 
   output.extend(
       input_api.canned_checks.RunUnitTestsInDirectory(
-          input_api, output_api,
+          input_api,
+          output_api,
           input_api.os_path.join(input_api.PresubmitLocalPath(), 'tests'),
-          whitelist=[r'.+_tests\.py$']))
+          files_to_check=[r'.+_tests\.py$']))
 
   if input_api.is_committing:
     output.extend(input_api.canned_checks.PanProjectChecks(input_api,
diff --git a/chromium/tools/lldb/OWNERS b/chromium/tools/lldb/OWNERS
deleted file mode 100644
index 03f127c758b..00000000000
--- a/chromium/tools/lldb/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-jzw@chromium.org
-ichikawa@chromium.org
diff --git a/chromium/tools/lldb/lldb_chrome.py b/chromium/tools/lldb/lldb_chrome.py
deleted file mode 100644
index b85d5a5bc00..00000000000
--- a/chromium/tools/lldb/lldb_chrome.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (c) 2017 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""
-    LLDB Support for Chromium types in Xcode
-
-    Add the following to your ~/.lldbinit:
-    command script import {Path to SRC Root}/tools/lldb/lldb_chrome.py
-"""
-
-import lldb
-
-
-def __lldb_init_module(debugger, internal_dict):
-    debugger.HandleCommand('type summary add -F ' +
-        'lldb_chrome.basestring16_SummaryProvider base::string16')
-
-
-def basestring16_SummaryProvider(valobj, internal_dict):
-    s = valobj.GetValueForExpressionPath('.__r_.__value_.__s')
-    l = valobj.GetValueForExpressionPath('.__r_.__value_.__l')
-    size = s.GetChildMemberWithName('__size_').GetValueAsUnsigned(0)
-    is_short_string = size & 128 == 0  # Assumes _LIBCPP_BIG_ENDIAN is defined.
-    if is_short_string:
-        length = size >> 1
-        data = s.GetChildMemberWithName('__data_').GetPointeeData(0, length)
-    else:
-        length = l.GetChildMemberWithName('__size_').GetValueAsUnsigned(0)
-        data = l.GetChildMemberWithName('__data_').GetPointeeData(0, length)
-    error = lldb.SBError()
-    bytes_to_read = 2 * length
-    if not bytes_to_read:
-        return '""'
-    byte_string = data.ReadRawData(error, 0, bytes_to_read)
-    if error.fail:
-        return 'Summary error: %s' % error.description
-    else:
-        return '"' + byte_string.decode('utf-16') + '"'
diff --git a/chromium/tools/mb/docs/design_spec.md b/chromium/tools/mb/docs/design_spec.md
index bbe816e7615..c1f8da25cdc 100644
--- a/chromium/tools/mb/docs/design_spec.md
+++ b/chromium/tools/mb/docs/design_spec.md
@@ -49,8 +49,8 @@ If no matching bot config file is found, `mb` looks in the
 (`gn args`) to use.
 
 A config can either be specified directly (useful for testing) or by specifying
-the master name and builder name (useful on the bots so that they do not need
-to specify a config directly and can be hidden from the details).
+the builder_group name and builder name (useful on the bots so that they do not
+need to specify a config directly and can be hidden from the details).
 
 See the [user guide](user_guide.md#mb_config.pyl) for details.
 
diff --git a/chromium/tools/mb/docs/user_guide.md b/chromium/tools/mb/docs/user_guide.md
index 816ab046607..0685e53c37b 100644
--- a/chromium/tools/mb/docs/user_guide.md
+++ b/chromium/tools/mb/docs/user_guide.md
@@ -27,7 +27,7 @@ a list of files (e.g., the list of files in a patch on a trybot):
 mb analyze -c chromium_linux_rel //out/Release input.json output.json
 ```
 
-Either the `-c/--config` flag or the `-m/--master` and `-b/--builder` flags
+Either the `-c/--config` flag or the `--builder-group` and `-b/--builder` flags
 must be specified so that `mb` can figure out which config to use.
 
 The first positional argument must be a GN-style "source-absolute" path
@@ -90,7 +90,7 @@ differences can be subtle.  We won't even go into how the `targets` and
 `build_targets` differ from each other or from `compile_targets` and
 `test_targets`.
 
-The `-b/--builder`, `-c/--config`, `-f/--config-file`, `-m/--master`,
+The `-b/--builder`, `-c/--config`, `-f/--config-file`, `--builder-group`,
 `-q/--quiet`, and `-v/--verbose` flags work as documented for `mb gen`.
 
 ### mb gen
@@ -104,7 +104,7 @@ specify a build config and a directory, then runs GN as appropriate:
 % mb gen -c linux_rel_trybot //out/Release
 ```
 
-Either the `-c/--config` flag or the `-m/--master` and `-b/--builder` flags
+Either the `-c/--config` flag or the `--builder-group` and `-b/--builder` flags
 must be specified so that `mb` can figure out which config to use. The
 `--phase` flag must also be used with builders that have multiple
 build/compile steps (and only with those builders).
@@ -144,7 +144,7 @@ swarming. See below for more information on isolates and swarming.
 Prints what command will be run by `mb gen` (like `mb gen -n` but does
 not require you to specify a path).
 
-The `-b/--builder`, `-c/--config`, `-f/--config-file`, `-m/--master`,
+The `-b/--builder`, `-c/--config`, `-f/--config-file`, `--builder-group`,
 `--phase`, `-q/--quiet`, and `-v/--verbose` flags work as documented for
 `mb gen`.
 
@@ -176,8 +176,9 @@ like one you could trigger via `git cl try` or via CQ dry runs. Basic usage is
 Your change must be uploaded to Gerrit. Local changes will not be uploaded for
 you. It uses the gerrit CL associated with your given git branch.
 
-You still have to specify the mastername (`-m`) and buildername (`-b`) arguments.
-See [trybots.py](https://cs.chromium.org/chromium/build/scripts/slave/recipe_modules/chromium_tests/trybots.py)
+You still have to specify the builder group(`--builder-group`) and buildername
+(`-b`) arguments.  See
+[trybots.py](https://cs.chromium.org/chromium/build/scripts/slave/recipe_modules/chromium_tests/trybots.py)
 for a mapping of which bots are on which tryservers, and what those bots mirror.
 Any trybot in `trybots.py` is supported; you can test your code on windows, for
 example. The tryjob will compile and run your code on windows.
@@ -236,11 +237,11 @@ listed here, and so by using the configs in this file you can avoid
 having to juggle long lists of gn args by hand.
 
 `mb_config.pyl` is structured as a file containing a single PYthon Literal
-expression: a dictionary with three main keys, `masters`, `configs` and
+expression: a dictionary with three main keys, `builder_groups`, `configs` and
 `mixins`.
 
-The `masters` key contains a nested series of dicts containing mappings
-of master -> builder -> config . This allows us to isolate the buildbot
+The `builder_groups` key contains a nested series of dicts containing mappings
+of builder_group -> builder -> config . This allows us to isolate the builder
 recipes from the actual details of the configs. The config should either
 be a single string value representing a key in the `configs` dictionary,
 or a list of strings, each of which is a key in the `configs` dictionary;
diff --git a/chromium/tools/mb/lib/validation.py b/chromium/tools/mb/lib/validation.py
index ccac4ea1b37..27748de1200 100644
--- a/chromium/tools/mb/lib/validation.py
+++ b/chromium/tools/mb/lib/validation.py
@@ -10,17 +10,17 @@ import os
 import re
 
 
-def GetAllConfigs(masters):
+def GetAllConfigs(builder_groups):
   """Build a list of all of the configs referenced by builders.
   """
   all_configs = {}
-  for master in masters:
-    for config in masters[master].values():
+  for builder_group in builder_groups:
+    for config in builder_groups[builder_group].values():
       if isinstance(config, dict):
         for c in config.values():
-          all_configs[c] = master
+          all_configs[c] = builder_group
       else:
-        all_configs[config] = master
+        all_configs[config] = builder_group
   return all_configs
 
 
@@ -55,13 +55,13 @@ def CheckAllConfigsAndMixinsReferenced(errs, all_configs, configs, mixins):
   return errs
 
 
-def EnsureNoProprietaryMixins(errs, masters, configs, mixins):
+def EnsureNoProprietaryMixins(errs, builder_groups, configs, mixins):
   """If we're checking the Chromium config, check that the 'chromium' bots
   which build public artifacts do not include the chrome_with_codecs mixin.
   """
-  if 'chromium' in masters:
-    for builder in masters['chromium']:
-      config = masters['chromium'][builder]
+  if 'chromium' in builder_groups:
+    for builder in builder_groups['chromium']:
+      config = builder_groups['chromium'][builder]
 
       def RecurseMixins(current_mixin):
         if current_mixin == 'chrome_with_codecs':
@@ -76,21 +76,21 @@ def EnsureNoProprietaryMixins(errs, masters, configs, mixins):
       for mixin in configs[config]:
         RecurseMixins(mixin)
   else:
-    errs.append('Missing "chromium" master. Please update this '
-                'proprietary codecs check with the name of the master '
+    errs.append('Missing "chromium" builder_group. Please update this '
+                'proprietary codecs check with the name of the builder_group '
                 'responsible for public build artifacts.')
 
 
-def _GetConfigsByBuilder(masters):
+def _GetConfigsByBuilder(builder_groups):
   """Builds a mapping from buildername -> [config]
 
     Args
-      masters: the master's dict from mb_config.pyl
+      builder_groups: the builder_group's dict from mb_config.pyl
     """
 
   result = collections.defaultdict(list)
-  for master in masters.values():
-    for buildername, builder in master.items():
+  for builder_group in builder_groups.values():
+    for buildername, builder in builder_group.items():
       result[buildername].append(builder)
 
   return result
@@ -142,13 +142,14 @@ def CheckExpectations(mbw, jsonish_blob, expectations_dir):
 
   Returns: True if expectations are up-to-date. False otherwise.
   """
-  # Assert number of masters == number of expectation files.
+  # Assert number of builder_groups == number of expectation files.
   if len(mbw.ListDir(expectations_dir)) != len(jsonish_blob):
     return False
-  for master, builders in jsonish_blob.items():
-    if not mbw.Exists(os.path.join(expectations_dir, master + '.json')):
-      return False  # No expecation file for the master.
-    expectation = mbw.ReadFile(os.path.join(expectations_dir, master + '.json'))
+  for builder_group, builders in jsonish_blob.items():
+    if not mbw.Exists(os.path.join(expectations_dir, builder_group + '.json')):
+      return False  # No expecation file for the builder_group.
+    expectation = mbw.ReadFile(os.path.join(expectations_dir,
+                                            builder_group + '.json'))
     builders_json = json.dumps(builders,
                                indent=2,
                                sort_keys=True,
diff --git a/chromium/tools/mb/mb.py b/chromium/tools/mb/mb.py
index f9db99a6e04..60520e87bad 100755
--- a/chromium/tools/mb/mb.py
+++ b/chromium/tools/mb/mb.py
@@ -93,7 +93,7 @@ class MetaBuildWrapper(object):
     self.args = argparse.Namespace()
     self.configs = {}
     self.public_artifact_builders = None
-    self.masters = {}
+    self.builder_groups = {}
     self.mixins = {}
     self.isolate_exe = 'isolate.exe' if self.platform.startswith(
         'win') else 'isolate'
@@ -120,7 +120,8 @@ class MetaBuildWrapper(object):
     def AddCommonOptions(subp):
       group = subp.add_mutually_exclusive_group()
       group.add_argument(
-          '-m', '--master', help='master name to look up config from')
+          '-m',  '--builder-group',
+          help='builder group name to look up config from')
       subp.add_argument('-b', '--builder',
                         help='builder name to look up config from')
       subp.add_argument('-c', '--config',
@@ -257,6 +258,16 @@ class MetaBuildWrapper(object):
                            'newline.')
     subp.add_argument('--json-output',
                       help='Write errors to json.output')
+    # For more info about RTS, please see
+    # //docs/testing/regression-test-selection.md
+    subp.add_argument('--use-rts',
+                      action='store_true',
+                      default=False,
+                      help='whether or not to use regression test selection')
+    subp.add_argument('--rts-target-change-recall',
+                      type=float,
+                      help='how much safety is needed when selecting tests. '
+                      '0.0 is the lowest and 1.0 is the highest')
     subp.add_argument('path',
                       help='path to generate build into')
     subp.set_defaults(func=self.CmdGen)
@@ -435,8 +446,8 @@ class MetaBuildWrapper(object):
     for f in self.ListDir(expectations_dir):
       self.RemoveFile(os.path.join(expectations_dir, f))
     obj = self._ToJsonish()
-    for master, builder in sorted(obj.items()):
-      expectation_file = os.path.join(expectations_dir, master + '.json')
+    for builder_group, builder in sorted(obj.items()):
+      expectation_file = os.path.join(expectations_dir, builder_group + '.json')
       json_s = json.dumps(builder,
                           indent=2,
                           sort_keys=True,
@@ -444,7 +455,31 @@ class MetaBuildWrapper(object):
       self.WriteFile(expectation_file, json_s)
     return 0
 
+  def RtsSelect(self):
+    exe = self.PathJoin(self.chromium_src_dir, 'testing', 'rts', 'rts-chromium')
+    if self.platform == 'win32':
+      exe += '.exe'
+
+    args = [
+       exe, 'select',
+      '-model-dir', self.PathJoin(self.chromium_src_dir, 'testing', 'rts'), \
+      '-out', self.PathJoin(self.args.path, 'gen', 'rts'),
+      '-checkout', self.chromium_src_dir,
+    ]
+    if self.args.rts_target_change_recall:
+      if (self.args.rts_target_change_recall < 0
+          or self.args.rts_target_change_recall > 1):
+        self.WriteFailureAndRaise(
+            'rts-target-change-recall must be between (0 and 1]', None)
+      args += ['-target-change-recall', str(self.args.rts_target_change_recall)]
+
+    _, _, err = self.Run(args, force_verbose=False)
+    if err:
+      self.WriteFailureAndRaise(err, None)
+
   def CmdGen(self):
+    if self.args.use_rts:
+      self.RtsSelect()
     vals = self.Lookup()
     return self.RunGNGen(vals)
 
@@ -485,9 +520,7 @@ class MetaBuildWrapper(object):
     else:
       cmd = self.GNCmd('gen', '_path_')
       self.Print('\nWriting """\\\n%s""" to _path_/args.gn.\n' % gn_args)
-      env = None
-
-      self.PrintCmd(cmd, env)
+      self.PrintCmd(cmd)
     return 0
 
   def CmdTry(self):
@@ -607,8 +640,7 @@ class MetaBuildWrapper(object):
         self.RemoveDirectory(zip_dir)
 
   def _RunUnderSwarming(self, build_dir, target, isolate_cmd):
-    isolate_server = 'isolateserver.appspot.com'
-    namespace = 'default-gzip'
+    cas_instance = 'chromium-swarm'
     swarming_server = 'chromium-swarm.appspot.com'
     # TODO(dpranke): Look up the information for the target in
     # the //testing/buildbot.json file, if possible, so that we
@@ -618,7 +650,7 @@ class MetaBuildWrapper(object):
     # TODO(dpranke): Also, add support for sharding and merging results.
     dimensions = []
     for k, v in self._DefaultDimensions() + self.args.dimensions:
-      dimensions += ['-d', k, v]
+      dimensions += ['-d', '%s=%s' % (k, v)]
 
     archive_json_path = self.ToSrcRelPath(
         '%s/%s.archive.json' % (build_dir, target))
@@ -628,12 +660,8 @@ class MetaBuildWrapper(object):
         'archive',
         '-i',
         self.ToSrcRelPath('%s/%s.isolate' % (build_dir, target)),
-        '-s',
-        self.ToSrcRelPath('%s/%s.isolated' % (build_dir, target)),
-        '-I',
-        isolate_server,
-        '-namespace',
-        namespace,
+        '-cas-instance',
+        cas_instance,
         '-dump-json',
         archive_json_path,
     ]
@@ -641,7 +669,7 @@ class MetaBuildWrapper(object):
     # Talking to the isolateserver may fail because we're not logged in.
     # We trap the command explicitly and rewrite the error output so that
     # the error message is actually correct for a Chromium check out.
-    self.PrintCmd(cmd, env=None)
+    self.PrintCmd(cmd)
     ret, out, err = self.Run(cmd, force_verbose=False)
     if ret:
       self.Print('  -> returned %d' % ret)
@@ -664,7 +692,7 @@ class MetaBuildWrapper(object):
           'Failed to read JSON file "%s"' % archive_json_path, file=sys.stderr)
       return 1
     try:
-      isolated_hash = archive_hashes[target]
+      cas_digest = archive_hashes[target]
     except Exception:
       self.Print(
           'Cannot find hash for "%s" in "%s", file content: %s' %
@@ -672,28 +700,52 @@ class MetaBuildWrapper(object):
           file=sys.stderr)
       return 1
 
-    tags = ['--tags=%s' % tag for tag in self.args.tags]
+    tags = ['-tag=%s' % tag for tag in self.args.tags]
 
-    cmd = [
-        self.executable,
-        self.PathJoin('tools', 'swarming_client', 'swarming.py'),
-        'run',
-        '-s',
-        isolated_hash,
-        '-I',
-        isolate_server,
-        '--namespace',
-        namespace,
-        '-S',
-        swarming_server,
-        '--tags=purpose:user-debug-mb',
-        '--relative-cwd',
-        self.ToSrcRelPath(build_dir),
-    ] + tags + dimensions + ['--raw-cmd', '--'] + list(isolate_cmd)
-    if self.args.extra_args:
-      cmd += self.args.extra_args
-    self.Print('')
-    ret, _, _ = self.Run(cmd, force_verbose=True, buffer_output=False)
+    try:
+      json_dir = self.TempDir()
+      json_file = self.PathJoin(json_dir, 'task.json')
+      cmd = [
+          self.PathJoin('tools', 'luci-go', 'swarming'),
+          'trigger',
+          '-digest',
+          cas_digest,
+          '-server',
+          swarming_server,
+          '-tag=purpose:user-debug-mb',
+          '-relative-cwd',
+          self.ToSrcRelPath(build_dir),
+          '-dump-json',
+          json_file,
+      ] + tags + dimensions + ['--'] + list(isolate_cmd)
+      if self.args.extra_args:
+        cmd += self.args.extra_args
+      self.Print('')
+      ret, _, _ = self.Run(cmd, force_verbose=True, buffer_output=False)
+      if ret:
+        return ret
+      task_json = self.ReadFile(json_file)
+      task_id = json.loads(task_json)["tasks"][0]['task_id']
+      collect_output = self.PathJoin(json_dir, 'collect_output.json')
+      cmd = [
+          self.PathJoin('tools', 'luci-go', 'swarming'),
+          'collect',
+          '-server',
+          swarming_server,
+          '-task-output-stdout=console',
+          '-task-summary-json',
+          collect_output,
+          task_id,
+      ]
+      ret, _, _ = self.Run(cmd, force_verbose=True, buffer_output=False)
+      if ret != 0:
+        return ret
+      collect_json = json.loads(self.ReadFile(collect_output))
+      # The exit_code field is not included if the task was successful.
+      ret = collect_json.get(task_id, {}).get('results', {}).get('exit_code', 0)
+    finally:
+      if json_dir:
+        self.RemoveDirectory(json_dir)
     return ret
 
   def _RunLocallyIsolated(self, build_dir, target):
@@ -731,14 +783,14 @@ class MetaBuildWrapper(object):
     """Dumps the config file into a json-friendly expanded dict.
 
     Returns:
-      A dict with master -> builder -> all GN args mapping.
+      A dict with builder group -> builder -> all GN args mapping.
     """
     self.ReadConfigFile(self.args.config_file)
     obj = {}
-    for master, builders in self.masters.items():
-      obj[master] = {}
+    for builder_group, builders in self.builder_groups.items():
+      obj[builder_group] = {}
       for builder in builders:
-        config = self.masters[master][builder]
+        config = self.builder_groups[builder_group][builder]
         if not config:
           continue
         if isinstance(config, dict):
@@ -757,7 +809,7 @@ class MetaBuildWrapper(object):
           args = {'gn_args': gn_helpers.FromGNArgs(flattened_config['gn_args'])}
           if flattened_config.get('args_file'):
             args['args_file'] = flattened_config['args_file']
-        obj[master][builder] = args
+        obj[builder_group][builder] = args
 
     return obj
 
@@ -767,7 +819,7 @@ class MetaBuildWrapper(object):
     self.ReadConfigFile(self.args.config_file)
 
     # Build a list of all of the configs referenced by builders.
-    all_configs = validation.GetAllConfigs(self.masters)
+    all_configs = validation.GetAllConfigs(self.builder_groups)
 
     # Check that every referenced args file or config actually exists.
     for config, loc in all_configs.items():
@@ -784,11 +836,11 @@ class MetaBuildWrapper(object):
                                                   self.configs, self.mixins)
 
     if self.args.config_file == self.default_config:
-      validation.EnsureNoProprietaryMixins(errs, self.masters, self.configs,
-                                           self.mixins)
+      validation.EnsureNoProprietaryMixins(errs, self.builder_groups,
+                                           self.configs, self.mixins)
 
     validation.CheckDuplicateConfigs(errs, self.configs, self.mixins,
-                                     self.masters, FlattenConfig)
+                                     self.builder_groups, FlattenConfig)
 
     if errs:
       raise MBErr(('mb config file %s has problems:\n  ' %
@@ -810,7 +862,7 @@ class MetaBuildWrapper(object):
     build_dir = self.args.path
 
     vals = DefaultVals()
-    if self.args.builder or self.args.master or self.args.config:
+    if self.args.builder or self.args.builder_group or self.args.config:
       vals = self.Lookup()
       # Re-run gn gen in order to ensure the config is consistent with the
       # build dir.
@@ -833,15 +885,34 @@ class MetaBuildWrapper(object):
     gn_args_path = self.PathJoin(self.ToAbsPath(build_dir), 'args.gn')
     if self.Exists(gn_args_path):
       args_contents = self.ReadFile(gn_args_path)
-    gn_args = []
-    for l in args_contents.splitlines():
-      l = l.split('#', 2)[0].strip()
-      if not l:
-        continue
-      (name, value) = l.split('=', 1)
-      gn_args.append('%s=%s' % (name.strip(), value.strip()))
 
-    return ' '.join(gn_args)
+    # Handle any .gni file imports, e.g. the ones used by CrOS. This should
+    # be automatically handled by gn_helpers.FromGNArgs (via its call to
+    # gn_helpers.GNValueParser.ReplaceImports), but that currently breaks
+    # mb_unittest since it mocks out file reads itself instead of using
+    # pyfakefs. This results in gn_helpers trying to read a non-existent file.
+    # The implementation of ReplaceImports here can be removed once the
+    # unittests use pyfakefs.
+    def ReplaceImports(input_contents):
+      output_contents = ''
+      for l in input_contents.splitlines(True):
+        if not l.strip().startswith('#') and 'import(' in l:
+          import_file = l.split('"', 2)[1]
+          import_file = self.ToAbsPath(import_file)
+          imported_contents = self.ReadFile(import_file)
+          output_contents += ReplaceImports(imported_contents) + '\n'
+        else:
+          output_contents += l
+      return output_contents
+
+    args_contents = ReplaceImports(args_contents)
+    args_dict = gn_helpers.FromGNArgs(args_contents)
+    # Re-add the quotes around strings so they show up as they would in the
+    # args.gn file.
+    for k, v in args_dict.items():
+      if isinstance(v, str):
+        args_dict[k] = '"%s"' % v
+    return ' '.join(['%s=%s' % (k, v) for (k, v) in args_dict.items()])
 
   def Lookup(self):
     self.ReadConfigFile(self.args.config_file)
@@ -883,10 +954,10 @@ class MetaBuildWrapper(object):
     return vals
 
   def ReadIOSBotConfig(self):
-    if not self.args.master or not self.args.builder:
+    if not self.args.builder_group or not self.args.builder:
       return {}
     path = self.PathJoin(self.chromium_src_dir, 'ios', 'build', 'bots',
-                         self.args.master, self.args.builder + '.json')
+                         self.args.builder_group, self.args.builder + '.json')
     if not self.Exists(path):
       return {}
 
@@ -908,7 +979,7 @@ class MetaBuildWrapper(object):
 
     self.configs = contents['configs']
     self.mixins = contents['mixins']
-    self.masters = contents.get('masters')
+    self.builder_groups = contents.get('builder_groups')
     self.public_artifact_builders = contents.get('public_artifact_builders')
 
   def ReadIsolateMap(self):
@@ -935,38 +1006,39 @@ class MetaBuildWrapper(object):
 
   def ConfigFromArgs(self):
     if self.args.config:
-      if self.args.master or self.args.builder:
-        raise MBErr('Can not specific both -c/--config and -m/--master or '
-                    '-b/--builder')
+      if self.args.builder_group or self.args.builder:
+        raise MBErr('Can not specific both -c/--config and --group '
+                    'or -b/--builder')
 
       return self.args.config
 
-    if not self.args.master or not self.args.builder:
+    if not self.args.builder_group or not self.args.builder:
       raise MBErr('Must specify either -c/--config or '
-                  '(-m/--master and -b/--builder)')
+                  '(--group and -b/--builder)')
 
-    if not self.args.master in self.masters:
-      raise MBErr('Master name "%s" not found in "%s"' %
-                  (self.args.master, self.args.config_file))
+    if not self.args.builder_group in self.builder_groups:
+      raise MBErr('Builder group name "%s" not found in "%s"' %
+                  (self.args.builder_group, self.args.config_file))
 
-    if not self.args.builder in self.masters[self.args.master]:
-      raise MBErr('Builder name "%s"  not found under masters[%s] in "%s"' %
-                  (self.args.builder, self.args.master, self.args.config_file))
+    if not self.args.builder in self.builder_groups[self.args.builder_group]:
+      raise MBErr('Builder name "%s"  not found under groups[%s] in "%s"' %
+                  (self.args.builder, self.args.builder_group,
+                   self.args.config_file))
 
-    config = self.masters[self.args.master][self.args.builder]
+    config = self.builder_groups[self.args.builder_group][self.args.builder]
     if isinstance(config, dict):
       if self.args.phase is None:
         raise MBErr('Must specify a build --phase for %s on %s' %
-                    (self.args.builder, self.args.master))
+                    (self.args.builder, self.args.builder_group))
       phase = str(self.args.phase)
       if phase not in config:
         raise MBErr('Phase %s doesn\'t exist for %s on %s' %
-                    (phase, self.args.builder, self.args.master))
+                    (phase, self.args.builder, self.args.builder_group))
       return config[phase]
 
     if self.args.phase is not None:
       raise MBErr('Must not specify a build --phase for %s on %s' %
-                  (self.args.builder, self.args.master))
+                  (self.args.builder, self.args.builder_group))
     return config
 
   def RunGNGen(self, vals, compute_inputs_for_analyze=False, check=True):
@@ -1517,6 +1589,7 @@ class MetaBuildWrapper(object):
     cfi_diag = 'use_cfi_diag=true' in vals['gn_args']
     clang_coverage = 'use_clang_coverage=true' in vals['gn_args']
     java_coverage = 'use_jacoco_coverage=true' in vals['gn_args']
+    javascript_coverage = 'use_javascript_coverage=true' in vals['gn_args']
 
     executable = isolate_map[target].get('executable', target)
     executable_suffix = isolate_map[target].get(
@@ -1564,6 +1637,9 @@ class MetaBuildWrapper(object):
           '--tsan=%d' % tsan,
           '--cfi-diag=%d' % cfi_diag,
       ]
+
+      if javascript_coverage:
+        cmdline += ['--devtools-code-coverage=${ISOLATED_OUTDIR}']
     elif test_type in ('windowed_test_launcher', 'console_test_launcher'):
       cmdline += [
           '../../testing/test_env.py',
@@ -1588,10 +1664,21 @@ class MetaBuildWrapper(object):
             '--logs-dir=${ISOLATED_OUTDIR}',
             '--',
         ]
-      cmdline += [
-          '../../testing/test_env.py',
-          '../../' + self.ToSrcRelPath(isolate_map[target]['script'])
-      ]
+      if is_android:
+        extra_files.append('../../build/android/test_wrapper/logdog_wrapper.py')
+        cmdline += [
+            '../../testing/test_env.py',
+            '../../build/android/test_wrapper/logdog_wrapper.py',
+            '--script',
+            '../../' + self.ToSrcRelPath(isolate_map[target]['script']),
+            '--logdog-bin-cmd',
+            '../../.task_template_packages/logdog_butler',
+        ]
+      else:
+        cmdline += [
+            '../../testing/test_env.py',
+            '../../' + self.ToSrcRelPath(isolate_map[target]['script'])
+        ]
     elif test_type == 'additional_compile_target':
       cmdline = [
           './' + str(target) + executable_suffix,
@@ -1789,22 +1876,12 @@ class MetaBuildWrapper(object):
                  (e, path))
 
 
-  def PrintCmd(self, cmd, env):
+  def PrintCmd(self, cmd):
     if self.platform == 'win32':
-      env_prefix = 'set '
-      env_quoter = QuoteForSet
       shell_quoter = QuoteForCmd
     else:
-      env_prefix = ''
-      env_quoter = pipes.quote
       shell_quoter = pipes.quote
 
-    def print_env(var):
-      if env and var in env:
-        self.Print('%s%s=%s' % (env_prefix, var, env_quoter(env[var])))
-
-    print_env('LLVM_FORCE_HEAD_REVISION')
-
     if cmd[0] == self.executable:
       cmd = ['python'] + cmd[1:]
     self.Print(*[shell_quoter(arg) for arg in cmd])
@@ -1828,7 +1905,7 @@ class MetaBuildWrapper(object):
   def Run(self, cmd, env=None, force_verbose=True, buffer_output=True):
     # This function largely exists so it can be overridden for testing.
     if self.args.dryrun or self.args.verbose or force_verbose:
-      self.PrintCmd(cmd, env)
+      self.PrintCmd(cmd)
     if self.args.dryrun:
       return 0, '', ''
 
diff --git a/chromium/tools/mb/mb_config.pyl b/chromium/tools/mb/mb_config.pyl
index 04e84c09739..6e0c5b57c9a 100644
--- a/chromium/tools/mb/mb_config.pyl
+++ b/chromium/tools/mb/mb_config.pyl
@@ -9,15 +9,11 @@
 # * trailing commas are allowed.
 
 {
-  # This is a map of buildbot master names -> buildbot builder names ->
-  # config names (where each config name is a key in the 'configs' dict,
-  # below). MB uses this dict to look up which config to use for a given bot.
-  'masters': {
+  # This is a map of builder group names -> builder names -> config names
+  # (where each config name is a key in the 'configs' dict, below). MB uses
+  # this dict to look up which config to use for a given bot.
+  'builder_groups': {
     'chrome': {
-      'chromeos-arm-generic-beta': 'official_chromeos_arm-generic',
-      'chromeos-arm-generic-ltc': 'official_chromeos_arm-generic',
-      'chromeos-arm-generic-lts': 'official_chromeos_arm-generic',
-      'chromeos-arm-generic-stable': 'official_chromeos_arm-generic',
       'chromeos-arm-generic-cfi-thin-lto-chrome': 'chromeos_arm-generic_cfi_thin_lto_official',
       'chromeos-betty-pi-arc-cfi-thin-lto-chrome': 'chromeos_betty-pi-arc_cfi_thin_lto_official',
       'chromeos-betty-pi-arc-chrome': 'chromeos_betty-pi-arc_include_unwind_tables_official_use_fake_dbus_clients',
@@ -35,17 +31,18 @@
       'chromeos-kevin-chrome-ltc': 'chromeos_kevin_include_unwind_tables_official',
       'chromeos-kevin-chrome-lts': 'chromeos_kevin_include_unwind_tables_official',
       'chromeos-kevin-chrome-stable': 'chromeos_kevin_include_unwind_tables_official',
-      'lacros-chrome': 'chromeos_amd64-generic_lacros_official',
-      # Don't include unwind tables for the remaining three builders since
-      # they monitor binary size growth, which may be affected by the tables.
+      'lacros-amd64-generic-chrome': 'chromeos_amd64-generic_lacros_official',
+      # Don't include unwind tables for linux-/mac-/win-/win64-chrome builders.
+      # They monitor binary size growth, which may be affected by the tables.
       'linux-chrome': 'official_goma',
+      'linux64-trunk': 'official_goma',
       'linux-chrome-beta': 'official_goma',
       'linux-chrome-stable': 'official_goma',
       'linux-chromeos-chrome': 'official_goma_chromeos_include_unwind_tables',
-      'linux-chromeos-beta': 'official_goma_chromeos',
-      'linux-chromeos-ltc': 'official_goma_chromeos',
-      'linux-chromeos-lts': 'official_goma_chromeos',
-      'linux-chromeos-stable': 'official_goma_chromeos',
+      'linux-chromeos-beta': 'official_goma_chromeos_include_unwind_tables',
+      'linux-chromeos-ltc': 'official_goma_chromeos_include_unwind_tables',
+      'linux-chromeos-lts': 'official_goma_chromeos_include_unwind_tables',
+      'linux-chromeos-stable': 'official_goma_chromeos_include_unwind_tables',
       'mac-chrome': 'official_goma_mac',
       'mac-chrome-beta': 'official_goma_mac',
       'mac-chrome-stable': 'official_goma_mac',
@@ -56,25 +53,23 @@
       'win64-chrome-beta': 'official_goma_x64',
       'win64-chrome-stable': 'official_goma_x64',
     },
-
     'chrome.pgo': {
+      'linux-pgo': 'official_goma_linux_pgo',
       'linux-pgo-beta': 'official_goma_linux_pgo',
       'linux-pgo-stable': 'official_goma_linux_pgo',
-      'linux-pgo-trunk': 'official_goma_linux_pgo',
+      'mac-pgo': 'official_goma_mac_pgo',
       'mac-pgo-beta': 'official_goma_mac_pgo',
       'mac-pgo-stable': 'official_goma_mac_pgo',
-      'mac-pgo-trunk': 'official_goma_mac_pgo',
+      'win32-pgo': 'official_goma_x86_pgo',
       'win32-pgo-beta': 'official_goma_x86_pgo',
       'win32-pgo-stable': 'official_goma_x86_pgo',
-      'win32-pgo-trunk': 'official_goma_x86_pgo',
+      'win64-pgo': 'official_goma_x64_pgo',
       'win64-pgo-beta': 'official_goma_x64_pgo',
       'win64-pgo-stable': 'official_goma_x64_pgo',
-      'win64-pgo-trunk': 'official_goma_x64_pgo',
     },
-
     # Take care when changing any of these builders to ensure that you do not
     # include a configuration with 'chrome_with_codecs' since these builders
-    # generated publicly advertised non-Official builds which are not allowed
+    # generate publicly advertised non-Official builds which are not allowed
     # to have proprietary codecs enabled.
     'chromium': {
       'android-archive-rel': 'android_without_codecs_release_bot_minimal_symbols',
@@ -134,9 +129,29 @@
     'chromium.android.fyi': {
       'Android WebView P FYI (rel)': 'android_release_bot_minimal_symbols_arm64_webview_google',
       'android-11-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google',
-      'android-inverse-fieldtrials-pie-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google_invert_fieldtrials',
       'android-pie-arm64-wpt-rel-non-cq': 'android_release_bot_minimal_symbols_arm64_webview_google',
       'android-weblayer-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google',
+      'android-weblayer-pie-x86-wpt-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild_webview_google',
+      'android-weblayer-with-aosp-webview-x86-fyi-rel': 'android_release_bot_minimal_symbols_x86_fastbuild',
+    },
+
+    'chromium.angle': {
+      'android-angle-arm64-builder': 'angle_specific_no_trace_android_release_trybot_arm64',
+      'android-angle-chromium-arm64-builder': 'gpu_tests_android_release_trybot_arm64_fastbuild',
+      'android-angle-perf-arm64-builder': 'angle_specific_android_vulkan_ndk_release_trybot_dcheck_off_arm64',
+      'android-angle-vk-arm-builder': 'angle_specific_android_vulkan_ndk_release_trybot',
+      'android-angle-vk-arm64-builder': 'angle_specific_android_vulkan_ndk_release_trybot_arm64',
+      'fuchsia-angle-builder': 'angle_specific_release_trybot_fuchsia',
+      'ios-angle-builder': 'angle_specific_release_trybot_ios',
+      'linux-angle-builder': 'angle_specific_release_trybot',
+      'linux-angle-chromium-builder': 'gpu_tests_release_trybot',
+      'linux-ozone-angle-builder': 'angle_specific_ozone_linux_system_gbm_libdrm_release_trybot',
+      'mac-angle-builder': 'angle_specific_release_trybot',
+      'mac-angle-chromium-builder': 'gpu_tests_release_trybot_deterministic_mac',
+      'win-angle-chromium-x64-builder': 'gpu_tests_release_trybot',
+      'win-angle-chromium-x86-builder': 'gpu_tests_release_trybot_x86',
+      'win-angle-x64-builder': 'angle_specific_release_trybot',
+      'win-angle-x86-builder': 'angle_specific_release_trybot_x86',
     },
 
     'chromium.chromiumos': {
@@ -150,10 +165,13 @@
       'chromeos-arm-generic-dbg': 'chromeos_arm-generic_dbg',
       'chromeos-arm-generic-rel': 'chromeos_arm-generic',
       'chromeos-kevin-rel': 'chromeos_kevin',
+      'lacros-amd64-generic-binary-size-rel': 'chromeos_amd64-generic_lacros_rel',
+      'lacros-amd64-generic-rel': 'chromeos_amd64-generic_lacros_rel',
       'linux-chromeos-rel': 'chromeos_with_codecs_release_bot',
       'linux-chromeos-dbg': 'chromeos_with_codecs_debug_bot',
       'linux-lacros-builder-rel': 'lacros_on_linux_release_bot',
       'linux-lacros-tester-rel': 'lacros_on_linux_release_bot',
+      'linux-cfm-rel': 'linux_cfm_release_bot',
     },
 
     'chromium.clang': {
@@ -200,7 +218,6 @@
       'ToTWinThinLTO64': 'clang_tot_win_official_full_symbols_thin_lto_static',
       'ToTiOS': 'ios_clang_tot_xctest',
       'ToTiOSDevice': 'ios_clang_device_tot_xctest',
-      'UBSanVptr Linux': 'ubsan_vptr_release_bot',
     },
 
     'chromium.dawn': {
@@ -261,15 +278,19 @@
 
       'Libfuzzer Upload Chrome OS ASan': 'libfuzzer_chromeos_asan_release_bot',
       'Libfuzzer Upload Linux ASan': 'libfuzzer_asan_release_bot',
+      'Libfuzzer Upload Linux ASan (reclient)': 'libfuzzer_asan_release_bot_reclient',
       'Libfuzzer Upload Linux ASan Debug': 'libfuzzer_asan_debug_bot',
       'Libfuzzer Upload Linux MSan': 'libfuzzer_msan_release_bot',
       'Libfuzzer Upload Linux UBSan': 'libfuzzer_ubsan_release_bot',
       'Libfuzzer Upload Mac ASan': 'libfuzzer_mac_asan_shared_release_bot',
       'Libfuzzer Upload Windows ASan': 'libfuzzer_windows_asan_release_bot',
 
-      'Linux remote_run Builder': 'release_bot',
-      'Linux remote_run Tester': 'release_bot',
+      'Linux Builder (reclient)': 'gpu_tests_release_bot_reclient',
+      'Linux TSan Builder (goma cache silo)': 'tsan_disable_nacl_release_bot',
+      'Linux TSan Builder (reclient)': 'tsan_disable_nacl_release_bot_reclient',
+      
       'Linux Viz': 'release_trybot',
+      'lacros-amd64-generic-rel-fyi': 'chromeos_amd64-generic_lacros_rel',
       'linux-ash-chromium-builder-fyi-rel': 'chromeos_with_codecs_release_bot',
       'linux-lacros-builder-fyi-rel': 'lacros_on_linux_release_bot',
       'linux-lacros-tester-fyi-rel': 'lacros_on_linux_release_bot',
@@ -278,47 +299,56 @@
       'Mac deterministic (dbg)': 'debug_bot_deterministic',
 
       'Site Isolation Android': 'android_release_bot_minimal_symbols_arm64',
+      'TSAN Debug (reclient)': 'tsan_disable_nacl_debug_bot_reclient',
+      'TSAN Release (reclient)':  'tsan_disable_nacl_release_bot_reclient',
       'VR Linux': 'vr_release_bot',
       'Win 10 Fast Ring': 'release_trybot',
       'android-code-coverage': 'gpu_tests_android_release_bot_minimal_symbols_arm64_fastbuild_java_coverage',
-      'android-code-coverage-native': 'gpu_tests_android_release_bot_minimal_symbols_arm64_fastbuild_native_coverage',
+      'android-code-coverage-native': 'gpu_tests_android_release_bot_no_symbols_arm64_fastbuild_native_coverage',
       'android-paeverywhere-arm-fyi-dbg': 'debug_bot_paeverywhere_arm',
       'android-paeverywhere-arm-fyi-rel': 'release_trybot_paeverywhere_arm',
       'android-paeverywhere-arm64-fyi-dbg': 'debug_bot_paeverywhere_arm64',
       'android-paeverywhere-arm64-fyi-rel': 'release_trybot_paeverywhere_arm64',
-      'chromeos-amd64-generic-lacros-rel': 'chromeos_amd64-generic_lacros_rel',
+      'fuchsia-code-coverage': 'fuchsia_clang_code_coverage',
       'fuchsia-fyi-arm64-dbg': 'debug_bot_fuchsia_arm64',
       'fuchsia-fyi-arm64-rel': 'release_bot_fuchsia_arm64',
+      'fuchsia-fyi-arm64-size': 'fuchsia_official_arm64_size',
       'fuchsia-fyi-x64-dbg': 'debug_bot_fuchsia',
       'fuchsia-fyi-x64-rel': 'release_bot_fuchsia',
       'ios13-beta-simulator': 'ios_simulator_debug_static_bot_xctest',
-      'ios13-sdk-device': 'ios_device_release_static_rbe_bot_xctest',
-      'ios13-sdk-simulator': 'ios_simulator_debug_static_rbe_bot_xctest',
+      'ios13-sdk-device': 'ios_device_release_static_bot_xctest',
+      'ios13-sdk-simulator': 'ios_simulator_debug_static_bot_xctest',
       'ios14-beta-simulator': 'ios_simulator_debug_static_bot_xctest',
-      'ios14-sdk-simulator': 'ios_simulator_debug_static_rbe_bot_xctest',
+      'ios14-sdk-simulator': 'ios_simulator_debug_static_bot_xctest',
       'ios-asan': 'ios_simulator_release_static_asan_bot_xctest',
       'ios-simulator': 'ios_error',
       'ios-simulator-code-coverage': 'clang_code_coverage_ios_xctest',
       'ios-simulator-cr-recipe': 'ios_simulator_debug_static_bot_xctest',
       'ios-simulator-cronet': 'ios_cronet_xctest',
       'ios-simulator-multi-window': 'ios_simulator_debug_static_bot_multi_window_xctest',
-      'ios-webkit-tot': 'ios_simulator_debug_static_rbe_bot_xctest',
+      'ios-webkit-tot': 'ios_simulator_debug_static_bot_xctest',
       'linux-annotator-rel': 'release_bot',
       'linux-blink-animation-use-time-delta': 'debug_bot_enable_blink_animation_use_time_delta',
       'linux-blink-heap-concurrent-marking-tsan-rel': 'release_trybot_tsan',
       'linux-blink-heap-verification': 'release_bot_enable_blink_heap_verification_dcheck_always_on',
+      'linux-blink-v8-oilpan': 'release_bot_enable_v8_oilpan_dcheck_always_on',
       'linux-chromeos-code-coverage': 'chromeos_with_codecs_release_bot_coverage',
-      'linux-chromeos-js-code-coverage': 'chromeos_with_codecs_release_bot',
+      'linux-chromeos-js-code-coverage': 'chromeos_with_codecs_release_bot_javascript_coverage',
       'linux-chromium-tests-staging-builder': 'release_bot',
       'linux-code-coverage': 'clang_code_coverage',
+      'linux-example-builder': 'release_bot',
       'linux-fieldtrial-rel': 'release_bot_minimal_symbols',
+      'linux-paeverywhere-x64-fyi-dbg': 'debug_bot_paeverywhere_x64',
+      'linux-paeverywhere-x64-fyi-rel': 'release_trybot_paeverywhere_x64',
       'linux-perfetto-rel': 'perfetto_release_bot',
       'linux-upload-perfetto': 'release_bot',
       'linux-wpt-fyi-rel': 'release_bot_minimal_symbols',
       'linux-wpt-identity-fyi-rel': 'release_bot_minimal_symbols',
-      'linux-wpt-payments-fyi-rel': 'release_bot_minimal_symbols',
+      'linux-wpt-input-fyi-rel': 'release_bot_minimal_symbols',
       'mac-code-coverage': 'clang_code_coverage',
       'mac-hermetic-upgrade-rel': 'release_bot',
+      'mac-paeverywhere-x64-fyi-dbg': 'debug_bot_paeverywhere_x64',
+      'mac-paeverywhere-x64-fyi-rel': 'release_trybot_paeverywhere_x64',
       'mac-upload-perfetto': 'release_bot',
       'win-annotator-rel': 'release_bot',
       'win-celab-builder-rel': 'release_bot_minimal_symbols',
@@ -332,67 +362,31 @@
       'win32-archive-rel-goma-rbe-canary': 'release_bot_x86_minimal_symbols_enable_archive_compression',
       'win32-archive-rel-goma-rbe-latest': 'release_bot_x86_minimal_symbols_enable_archive_compression',
       'win32-arm64-rel': 'win32_arm64_release_bot',
-
-      # Builders to test inversed fieldtrials
-      'linux-inverse-fieldtrials-fyi-rel': 'gpu_tests_release_bot_minimal_symbols_invert_fieldtrials',
-      'win10-inverse-fieldtrials-fyi-rel': 'gpu_tests_release_bot_minimal_symbols_invert_fieldtrials',
     },
 
     'chromium.goma.fyi': {
-      'Linux Builder Goma Canary': 'gpu_tests_release_bot',
-      'Linux Builder Goma Latest Client': 'gpu_tests_release_bot',
       'Linux Builder Goma RBE Canary': 'gpu_tests_release_bot',
       'Linux Builder Goma RBE Latest Client': 'gpu_tests_release_bot',
 
-      'Win Builder (dbg) Goma Canary': 'gpu_tests_debug_bot_x86_no_symbols',
-      'Win Builder (dbg) Goma Latest Client': 'gpu_tests_debug_bot_x86_no_symbols',
       'Win Builder (dbg) Goma RBE Latest Client': 'gpu_tests_debug_bot_x86_no_symbols',
-      'Win Builder Goma Canary': 'gpu_tests_release_bot_x86_minimal_symbols',
-      'Win Builder Goma Latest Client': 'gpu_tests_release_bot_x86_minimal_symbols',
       'Win Builder Goma RBE Latest Client': 'gpu_tests_release_bot_x86_minimal_symbols',
-      'win32-archive-rel-goma-canary-localoutputcache': 'release_bot_x86_minimal_symbols_enable_archive_compression',
-      'win32-archive-rel-goma-latest-localoutputcache': 'release_bot_x86_minimal_symbols_enable_archive_compression',
-
-      'Win7 Builder (dbg) Goma Canary': 'gpu_tests_debug_bot_x86_no_symbols',
-      'Win7 Builder (dbg) Goma Latest Client': 'gpu_tests_debug_bot_x86_no_symbols',
-      'Win7 Builder Goma Canary': 'gpu_tests_release_bot_x86_minimal_symbols',
-      'Win7 Builder Goma Latest Client': 'gpu_tests_release_bot_x86_minimal_symbols',
-
-      'Mac Builder (dbg) Goma Canary': 'gpu_tests_debug_bot',
-      'Mac Builder (dbg) Goma Canary (clobber)': 'gpu_tests_debug_bot',
-      'Mac Builder (dbg) Goma Latest Client': 'gpu_tests_debug_bot',
-      'Mac Builder (dbg) Goma Latest Client (clobber)': 'gpu_tests_debug_bot',
+
+
       'Mac Builder (dbg) Goma RBE Canary (clobber)': 'gpu_tests_debug_bot',
       'Mac Builder (dbg) Goma RBE Latest Client (clobber)': 'gpu_tests_debug_bot',
-      'Mac Builder Goma Canary': 'gpu_tests_release_bot_minimal_symbols',
-      'Mac Builder Goma Latest Client': 'gpu_tests_release_bot_minimal_symbols',
-      'mac-archive-rel-goma-canary': 'release_bot_mac_strip_minimal_symbols',
-      'mac-archive-rel-goma-latest': 'release_bot_mac_strip_minimal_symbols',
       'mac-archive-rel-goma-rbe-canary': 'release_bot_mac_strip_minimal_symbols',
       'mac-archive-rel-goma-rbe-latest': 'release_bot_mac_strip_minimal_symbols',
 
-      'mac-archive-rel-goma-canary-localoutputcache': 'release_bot_mac_strip_minimal_symbols',
-      'mac-archive-rel-goma-latest-localoutputcache': 'release_bot_mac_strip_minimal_symbols',
 
-      'chromeos-amd64-generic-rel-goma-canary': 'chromeos_amd64-generic',
-      'chromeos-amd64-generic-rel-goma-latest': 'chromeos_amd64-generic',
       'chromeos-amd64-generic-rel-goma-rbe-canary': 'chromeos_amd64-generic',
       'chromeos-amd64-generic-rel-goma-rbe-latest': 'chromeos_amd64-generic',
-      'android-archive-dbg-goma-canary': 'android_without_codecs_debug_bot',
-      'android-archive-dbg-goma-latest': 'android_without_codecs_debug_bot',
       'android-archive-dbg-goma-rbe-ats-canary': 'android_without_codecs_debug_bot',
       'android-archive-dbg-goma-rbe-ats-latest': 'android_without_codecs_debug_bot',
       'android-archive-dbg-goma-rbe-canary': 'android_without_codecs_debug_bot',
       'android-archive-dbg-goma-rbe-latest': 'android_without_codecs_debug_bot',
 
-      'ios-device-goma-canary-clobber': 'ios_device_release_compile_only',
-      'ios-device-goma-latest-clobber': 'ios_device_release_compile_only',
-      'ios-device-goma-rbe-canary-clobber': 'ios_device_release_rbe_compile_only',
-      'ios-device-goma-rbe-latest-clobber': 'ios_device_release_rbe_compile_only',
-      'linux-archive-rel-goma-canary': 'release_bot',
-      'linux-archive-rel-goma-canary-localoutputcache': 'release_bot',
-      'linux-archive-rel-goma-latest': 'release_bot',
-      'linux-archive-rel-goma-latest-localoutputcache': 'release_bot',
+      'ios-device-goma-rbe-canary-clobber': 'ios_device_release_compile_only',
+      'ios-device-goma-rbe-latest-clobber': 'ios_device_release_compile_only',
       'linux-archive-rel-goma-rbe-ats-canary': 'release_bot',
       'linux-archive-rel-goma-rbe-ats-latest': 'release_bot',
       'linux-archive-rel-goma-rbe-canary': 'release_bot',
@@ -448,10 +442,10 @@
       'Android FYI Release (Nexus 5)': 'gpu_tests_android_release_trybot',
       'Android FYI Release (Nexus 5X)': 'gpu_tests_android_release_trybot_arm64',
       'Android FYI Release (Nexus 6)': 'gpu_tests_android_release_trybot',
-      'Android FYI Release (Nexus 6P)': 'gpu_tests_android_release_trybot_arm64',
       'Android FYI Release (Nexus 9)': 'gpu_tests_android_release_trybot_arm64',
       'Android FYI Release (NVIDIA Shield TV)': 'gpu_tests_android_release_trybot_arm64',
       'Android FYI Release (Pixel 2)': 'gpu_tests_android_release_trybot',
+      'Android FYI Release (Pixel 4)': 'gpu_tests_android_release_trybot',
       'Android FYI 32 Vk Release (Pixel 2)': 'gpu_fyi_tests_android_vulkan_ndk_release_trybot',
       'Android FYI 64 Vk Release (Pixel 2)': 'gpu_fyi_tests_android_vulkan_ndk_release_trybot_arm64',
       'Android FYI 32 dEQP Vk Release (Pixel 2)': 'angle_deqp_android_vulkan_ndk_release_trybot',
@@ -460,6 +454,7 @@
       'Android FYI SkiaRenderer Vulkan (Pixel 2)': 'gpu_tests_android_release_trybot',
       'ChromeOS FYI Release (amd64-generic)': 'gpu_tests_chromeos_amd64_release_trybot_dcheck_off_no_symbols',
       'ChromeOS FYI Release (kevin)': 'gpu_tests_chromeos_kevin_release_trybot_dcheck_off_no_symbols',
+      'GPU FYI Lacros x64 Builder': 'gpu_tests_ozone_linux_non_x11_release_trybot',
       'GPU FYI Linux Builder': 'gpu_fyi_tests_release_trybot',
       'GPU FYI Linux Ozone Builder': 'angle_ozone_linux_system_gbm_libdrm_release_trybot',
       'GPU FYI Linux Builder (dbg)': 'gpu_fyi_tests_debug_trybot',
@@ -514,6 +509,7 @@
       'fuchsia-x64-cast': 'release_bot_fuchsia_cast',
       'fuchsia-x64-dbg': 'debug_bot_fuchsia_compile_only',
       'linux-bfcache-rel': 'release_bot_blink',
+      'linux-extended-tracing-rel': 'release_bot_extended_tracing',
       'linux-gcc-rel': 'release_bot_x86_minimal_symbols_no_clang_cxx11',
       'linux-ozone-rel': 'ozone_linux_release_bot',
       'linux-trusty-rel': 'gpu_tests_release_bot',
@@ -522,10 +518,10 @@
     'chromium.mac': {
       'Mac Builder': 'gpu_tests_release_bot_minimal_symbols_no_nacl',
       'Mac Builder (dbg)': 'gpu_tests_debug_bot',
-      'ios-device': 'ios_device_release_rbe_compile_only',
-      'ios-simulator': 'ios_simulator_debug_static_rbe_bot_xctest',
+      'ios-device': 'ios_device_release_compile_only',
+      'ios-simulator': 'ios_simulator_debug_static_bot_xctest',
       'ios-simulator-full-configs': 'ios_simulator_debug_static_bot_xctest',
-      'ios-simulator-noncq': 'ios_simulator_debug_static_rbe_bot_xctest',
+      'ios-simulator-noncq': 'ios_simulator_debug_static_bot_xctest',
       'mac-arm64-rel': 'mac_arm64_release_bot',
     },
 
@@ -542,6 +538,7 @@
       'WebKit Linux Leak': 'release_bot_blink',
       'WebKit Linux MSAN': 'msan_release_bot_blink',
       'android-asan': 'android_clang_asan_release_bot',
+      'linux-ubsan-vptr': 'ubsan_vptr_release_bot',
       'win-asan': 'asan_clang_fuzzer_static_v8_heap_minimal_symbols_release',
     },
 
@@ -550,7 +547,6 @@
       'Mojo ChromiumOS': 'chromeos_with_codecs_release_trybot',
       'Mojo Linux': 'release_trybot',
       'Mojo Windows': 'release_bot_x86_minimal_symbols',
-      'android-mojo-webview-rel': 'android_release_bot_minimal_symbols_arm64',
       'mac-mojo-rel': 'release_trybot',
     },
 
@@ -561,6 +557,7 @@
       'android-builder-perf': 'official_goma_minimal_symbols_android',
       'chromeos-amd64-generic-lacros-builder-perf': 'chromeos_amd64-generic_lacros_official',
       'linux-builder-perf': 'official_goma_linux_perf',
+      'linux-builder-perf-rel': 'official_goma_linux_perf',
       'mac-builder-perf': 'official_goma_mac_perf',
       'mac-arm-builder-perf': 'official_goma_mac_arm_perf',
       'win32-builder-perf': 'official_goma_x86_perf',
@@ -570,7 +567,8 @@
     'chromium.perf.fyi': {
       'android-cfi-builder-perf-fyi': 'official_goma_minimal_symbols_android_thin_lto_opt',
       'android_arm64-cfi-builder-perf-fyi': 'official_goma_minimal_symbols_android_thin_lto_opt_arm64',
-      'chromeos-kevin-builder-perf-fyi': 'chromeos_kevin',
+      'chromeos-kevin-builder-perf-fyi': 'chromeos_kevin_include_unwind_tables_official',
+      'fuchsia-builder-perf-fyi': 'official_goma_fuchsia_arm64_perf',
     },
 
     'chromium.swangle': {
@@ -654,11 +652,15 @@
     },
 
     'chromium.updater': {
+      'mac-updater-builder-dbg': 'updater_debug_bot',
       'mac-updater-builder-rel': 'updater_release_bot',
+      'win-updater-builder-dbg': 'updater_debug_bot',
       'win-updater-builder-rel': 'updater_release_bot',
+      'win32-updater-builder-dbg': 'updater_debug_bot_x86',
+      'win32-updater-builder-rel': 'updater_release_bot_x86',
     },
 
-    # TODO(crbug.com/818301): This master is going away.
+    # TODO(crbug.com/818301): This group is going away.
     'chromium.webkit': {
       'WebKit Linux Trusty ASAN': 'asan_lsan_release_bot',
       'WebKit Linux Trusty Leak': 'release_bot',
@@ -709,7 +711,9 @@
 
     'internal.chromeos.fyi': {
       'chromeos-betty-arc-r-chrome': 'chromeos_betty-arc-r_include_unwind_tables_official_use_fake_dbus_clients',
+      'chromeos-betty-pi-arc-chrome-dchecks': 'chromeos_betty-pi-arc_dchecks',
       'chromeos-eve-arc-r-chrome': 'chromeos_eve-arc-r_include_unwind_tables_official',
+      'lacros-amd64-generic-chrome-fyi': 'chromeos_amd64-generic_lacros_official',
     },
 
     'internal.client.kitchensync': {
@@ -727,6 +731,8 @@
     },
 
     'official.chrome': {
+      'fuchsia-arm64': 'official_fuchsia_arm64',
+      'fuchsia-x64': 'official_fuchsia_x64',
       'lacros64': 'chromeos_amd64-generic_lacros_official',
     },
 
@@ -780,6 +786,7 @@
       'android-pie-arm64-wpt-rel-non-cq': 'android_release_trybot_arm64_webview_google',
       'android-pie-x86-rel': 'android_release_trybot_x86_fastbuild_webview_google',
       'android-weblayer-pie-x86-fyi-rel': 'android_release_trybot_x86_fastbuild_webview_google',
+      'android-weblayer-pie-x86-wpt-fyi-rel': 'android_release_trybot_x86_fastbuild_webview_google',
       'android-webview-pie-arm64-fyi-rel': 'android_release_trybot_arm64_webview_google',
       'android-10-arm64-rel': 'android_release_trybot_arm64_fastbuild_webview_google',
       'android-11-x86-fyi-rel': 'android_release_trybot_x86_fastbuild_webview_google',
@@ -810,7 +817,6 @@
       'gpu-fyi-try-android-m-nexus-5x-64': 'gpu_tests_android_release_trybot_arm64',
       'gpu-fyi-try-android-m-nexus-5x-deqp-64': 'angle_deqp_android_release_trybot_arm64',
       'gpu-fyi-try-android-m-nexus-5x-skgl-64': 'gpu_tests_android_release_trybot_arm64',
-      'gpu-fyi-try-android-m-nexus-6p-64': 'gpu_tests_android_release_trybot_arm64',
       'gpu-fyi-try-android-m-nexus-9-64': 'gpu_tests_android_release_trybot_arm64',
       'gpu-fyi-try-android-n-nvidia-shield-tv-64': 'gpu_tests_android_release_trybot_arm64',
       'gpu-fyi-try-android-p-pixel-2-32': 'gpu_tests_android_release_trybot',
@@ -819,6 +825,7 @@
       'gpu-fyi-try-android-q-pixel-2-deqp-vk-64': 'angle_deqp_android_vulkan_ndk_release_trybot_arm64',
       'gpu-fyi-try-android-q-pixel-2-vk-32': 'gpu_fyi_tests_android_vulkan_ndk_release_trybot',
       'gpu-fyi-try-android-q-pixel-2-vk-64': 'gpu_fyi_tests_android_vulkan_ndk_release_trybot_arm64',
+      'gpu-fyi-try-android-r-pixel-4-32': 'gpu_tests_android_release_trybot',
       'gpu-try-android-m-nexus-5x-64': 'gpu_tests_android_release_trybot_arm64',
       'linux_android_dbg_ng': 'android_debug_bot',
       'try-nougat-phone-tester': 'android_debug_trybot_arm64',
@@ -835,14 +842,19 @@
       'android_angle_vk32_deqp_rel_ng': 'angle_deqp_android_vulkan_ndk_release_trybot',
       'android_angle_vk64_deqp_rel_ng': 'angle_deqp_android_vulkan_ndk_release_trybot_arm64',
       'fuchsia-angle-rel': 'gpu_fyi_tests_release_trybot_fuchsia',
+      'ios-angle-try-intel': 'angle_specific_release_trybot_ios',
       'linux-angle-rel': 'gpu_fyi_tests_release_trybot',
       'linux_angle_ozone_rel_ng': 'angle_ozone_linux_system_gbm_libdrm_release_trybot',
       'linux_angle_deqp_rel_ng': 'angle_deqp_release_trybot',
+      'mac-angle-chromium-try': 'gpu_tests_release_trybot_deterministic_mac',
       'mac-angle-rel': 'gpu_fyi_tests_release_trybot',
+      'mac-angle-try': 'angle_specific_release_trybot',
       'win-angle-rel-32': 'gpu_fyi_tests_release_trybot_x86',
       'win-angle-rel-64': 'gpu_fyi_tests_release_trybot',
       'win-angle-deqp-rel-32': 'angle_deqp_release_trybot_x86',
       'win-angle-deqp-rel-64': 'angle_deqp_release_trybot',
+      'win-angle-chromium-x64-try': 'gpu_tests_release_trybot',
+      'win-angle-x64-try': 'angle_specific_release_trybot',
     },
 
     'tryserver.chrome': {
@@ -850,11 +862,13 @@
       'chromeos-betty-arc-r-chrome': 'chromeos_betty-arc-r_include_unwind_tables_official_use_fake_dbus_clients',
       'chromeos-betty-pi-arc-cfi-thin-lto-chrome': 'chromeos_betty-pi-arc_cfi_thin_lto_official',
       'chromeos-betty-pi-arc-chrome': 'chromeos_betty-pi-arc_include_unwind_tables_official_use_fake_dbus_clients',
+      'chromeos-betty-pi-arc-chrome-dchecks': 'chromeos_betty-pi-arc_dchecks',
       'chromeos-eve-arc-r-chrome': 'chromeos_eve-arc-r_include_unwind_tables_official',
       'chromeos-eve-chrome': 'chromeos_eve_include_unwind_tables_official',
       'chromeos-eve-compile-chrome': 'chromeos_eve_include_unwind_tables_official',
       'chromeos-kevin-chrome': 'chromeos_kevin_include_unwind_tables_official',
       'chromeos-kevin-compile-chrome': 'chromeos_kevin_include_unwind_tables_official',
+      'lacros-amd64-generic-chrome': 'chromeos_amd64-generic_lacros_official',
       'linux-chrome': 'official_goma',
       'linux-chrome-beta': 'official_goma',
       'linux-chrome-stable': 'official_goma',
@@ -871,6 +885,13 @@
       'win64-chrome-stable': 'official_goma_x64',
     },
 
+    'tryserver.chrome.pgo': {
+      'linux-pgo': 'official_goma_linux_pgo',
+      'mac-pgo': 'official_goma_mac_pgo',
+      'win32-pgo': 'official_goma_x86_pgo',
+      'win64-pgo': 'official_goma_x64_pgo',
+    },
+
     'tryserver.chromium.chromiumos': {
       # TODO(crbug.com/913750): Enable DCHECKS on the two amd64-generic bots
       # and two kevin bots when the PFQ has it enabled.
@@ -883,10 +904,14 @@
       'chromeos-kevin-rel': 'chromeos_kevin',
       'gpu-fyi-try-chromeos-amd64-generic': 'gpu_tests_chromeos_amd64_release_trybot_dcheck_off_no_symbols',
       'gpu-fyi-try-chromeos-kevin': 'gpu_tests_chromeos_kevin_release_trybot_dcheck_off_no_symbols',
+      'lacros-amd64-generic-rel': 'chromeos_amd64-generic_lacros_rel',
+      'linux-chromeos-inverse-fieldtrials-fyi-rel': 'chromeos_with_codecs_release_trybot_invert_fieldtrials',
       'linux-chromeos-rel': 'chromeos_with_codecs_release_trybot_code_coverage',
+      'linux-chromeos-js-code-coverage': 'chromeos_with_codecs_release_trybot_js_cpp_code_coverage',
       'linux-chromeos-compile-dbg': 'chromeos_with_codecs_debug_bot',
       'linux-chromeos-dbg': 'chromeos_with_codecs_debug_bot',
       'linux-lacros-rel': 'lacros_on_linux_release_trybot',
+      'linux-cfm-rel': 'linux_cfm_release_trybot',
     },
 
     'tryserver.chromium.codesearch': {
@@ -913,6 +938,7 @@
     'tryserver.chromium.linux': {
       'cast_shell_audio_linux': 'cast_audio_release_trybot',
       'cast_shell_linux': 'cast_release_trybot',
+      'cast-binary-size': 'cast_binary_size',
       'chromium_presubmit': 'presubmit',
       'fuchsia_arm64': 'release_trybot_fuchsia_arm64',
       'fuchsia-arm64-cast': 'release_trybot_fuchsia_arm64_cast',
@@ -924,6 +950,8 @@
       'fuchsia-fyi-x64-rel': 'release_trybot_fuchsia',
       'fuchsia_x64': 'release_trybot_fuchsia',
       'fuchsia-x64-cast': 'release_trybot_fuchsia_cast',
+      'gpu-fyi-try-lacros-amd-rel': 'gpu_tests_ozone_linux_non_x11_release_trybot',
+      'gpu-fyi-try-lacros-intel-rel': 'gpu_tests_ozone_linux_non_x11_release_trybot',
       'gpu-fyi-try-linux-amd-rel': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-linux-intel-dqp': 'angle_deqp_release_trybot',
       'gpu-fyi-try-linux-intel-exp': 'gpu_fyi_tests_release_trybot',
@@ -944,23 +972,27 @@
       'linux-autofill-assistant': 'autofill_assistant_release_trybot',
       'linux-blink-heap-concurrent-marking-tsan-rel': 'release_trybot_tsan',
       'linux-blink-heap-verification-try': 'release_trybot_enable_blink_heap_verification',
+      'linux-blink-v8-oilpan': 'release_trybot_enable_v8_oilpan',
       'linux-bfcache-rel': 'release_bot_blink',
       'linux-clang-tidy-dbg': 'debug_bot',
       'linux-clang-tidy-rel': 'release_trybot',
       'linux-dcheck-off-rel': 'release_trybot_dcheck_off',
+      'linux-example-builder': 'release_trybot',
+      'linux-extended-tracing-rel': 'release_trybot_extended_tracing',
       'linux-inverse-fieldtrials-fyi-rel': 'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange_invert_fieldtrials',
       'linux-gcc-rel': 'release_bot_x86_minimal_symbols_no_clang_cxx11',
       'linux-lacros-fyi-rel': 'lacros_on_linux_release_trybot',
       'linux-libfuzzer-asan-rel': 'libfuzzer_asan_release_trybot',
+      'linux-mbi-mode-per-render-process-host-rel': 'gpu_tests_release_trybot_mbi_mode_per_render_process_host',
+      'linux-mbi-mode-per-site-instance-rel': 'gpu_tests_release_trybot_mbi_mode_per_site_instance',
       'linux-ozone-rel': 'ozone_linux_release_trybot',
       'linux-perfetto-rel': 'perfetto_release_trybot',
       'linux-rel': 'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange_code_coverage',
-      'linux-rel-builderful': 'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange_code_coverage',
       'linux-trusty-rel': 'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange',
       'linux-viz-rel': 'release_trybot',
       'linux-wpt-fyi-rel': 'release_trybot',
       'linux-wpt-identity-fyi-rel': 'release_trybot',
-      'linux-wpt-payments-fyi-rel': 'release_trybot',
+      'linux-wpt-input-fyi-rel': 'release_trybot',
       'linux-webkit-msan-rel': 'msan_release_bot',
       'linux_chromium_archive_rel_ng': 'release_bot',
       'linux_chromium_asan_rel_ng': 'asan_lsan_release_trybot',
@@ -989,7 +1021,6 @@
       'linux_layout_tests_layout_ng_disabled': 'release_trybot',
       'linux-layout-tests-edit-ng': 'release_trybot',
       'linux-blink-web-tests-force-accessibility-rel': 'release_trybot',
-      'linux-layout-tests-fragment-item': 'release_trybot',
       'linux_mojo': 'release_trybot',
       'linux_mojo_chromeos': 'chromeos_with_codecs_release_trybot',
       'linux_optional_gpu_tests_rel': 'gpu_fyi_tests_release_trybot',
@@ -1016,21 +1047,20 @@
       'gpu-fyi-try-mac-nvidia-retina-rel': 'gpu_fyi_tests_release_trybot',
       'gpu-try-mac-amd-retina-dbg': 'gpu_tests_debug_bot',
       'gpu-try-mac-intel-dbg': 'gpu_tests_debug_bot',
-      'ios-device': 'ios_device_release_rbe_compile_only',
-      'ios13-beta-simulator': 'ios_simulator_debug_static_rbe_bot_xctest',
-      'ios13-sdk-simulator': 'ios_simulator_debug_static_rbe_bot_xctest',
-      'ios14-beta-simulator': 'ios_simulator_debug_static_rbe_bot_xctest',
-      'ios14-sdk-simulator': 'ios_simulator_debug_static_rbe_bot_xctest',
-      'ios-simulator': 'ios_simulator_debug_static_rbe_bot_xctest',
-      'ios-simulator-coverage-exp': 'clang_code_coverage_ios_partial_instrumentation_xctest',
-      'ios-simulator-full-configs': 'ios_simulator_debug_static_bot_xctest',
-      'ios-simulator-full-configs-coverage-exp': 'clang_code_coverage_ios_partial_instrumentation_xctest',
+      'ios-device': 'ios_device_release_compile_only',
+      'ios13-beta-simulator': 'ios_simulator_debug_static_bot_xctest',
+      'ios13-sdk-simulator': 'ios_simulator_debug_static_bot_xctest',
+      'ios14-beta-simulator': 'ios_simulator_debug_static_bot_xctest',
+      'ios14-sdk-simulator': 'ios_simulator_debug_static_bot_xctest',
+      'ios-simulator': 'ios_simulator_code_coverage_partial_instrumentation_xctest',
+      'ios-simulator-full-configs': 'ios_simulator_code_coverage_partial_instrumentation_xctest',
       'ios-simulator-cronet': 'ios_cronet_xctest',
-      'ios-simulator-code-coverage': 'clang_code_coverage_ios_partial_instrumentation_xctest',
       'ios-simulator-cr-recipe': 'ios_simulator_debug_static_bot_xctest',
-      'ios-simulator-noncq': 'ios_simulator_debug_static_rbe_bot_xctest',
+      'ios-simulator-inverse-fieldtrials-fyi': 'ios_simulator_debug_static_bot_invert_fieldtrials_xctest',
+      'ios-simulator-noncq': 'ios_simulator_debug_static_bot_xctest',
       'ios-simulator-multi-window': 'ios_simulator_debug_static_bot_multi_window_xctest',
       'mac-osxbeta-rel': 'gpu_tests_release_trybot_deterministic_mac',
+      'mac_chromium_10.11_rel_ng': 'gpu_tests_release_trybot_deterministic_mac',
       'mac_chromium_10.12_rel_ng': 'gpu_tests_release_trybot_deterministic_mac',
       'mac_chromium_10.13_rel_ng': 'release_trybot',
       'mac_chromium_10.14_rel_ng': 'release_trybot',
@@ -1043,6 +1073,7 @@
       'mac_chromium_dbg_ng': 'gpu_tests_debug_bot',
       'mac_optional_gpu_tests_rel': 'gpu_fyi_tests_release_trybot',
       'mac_upload_clang': 'release_bot',
+      'mac-inverse-fieldtrials-fyi-rel': 'gpu_tests_release_trybot_deterministic_mac_invert_fieldtrials',
       'mac-rel': 'gpu_tests_release_trybot_deterministic_mac_code_coverage',
       'mac-arm64-rel': 'mac_arm64_release_trybot',
     },
@@ -1050,8 +1081,10 @@
     'tryserver.chromium.perf': {
       'Android Compile Perf': 'official_goma_minimal_symbols_android',
       'Android arm64 Compile Perf': 'official_goma_minimal_symbols_android_arm64',
+      'Fuchsia Builder Perf': 'official_goma_fuchsia_arm64_perf',
       'Linux Builder Perf': 'official_goma_linux_perf',
       'Mac Builder Perf': 'official_goma_mac_perf',
+      'Mac arm Builder Perf': 'official_goma_mac_arm_perf',
       'Win Builder Perf': 'official_goma_x86_perf',
       'Win x64 Builder Perf': 'official_goma_perf',
     },
@@ -1074,6 +1107,13 @@
       'win-swangle-try-x86': 'angle_deqp_release_trybot_x86',
     },
 
+    'tryserver.chromium.updater': {
+       'mac-updater-try-builder-dbg': 'updater_debug_bot',
+       'mac-updater-try-builder-rel': 'updater_release_trybot',
+       'win-updater-try-builder-dbg': 'updater_debug_bot',
+       'win-updater-try-builder-rel': 'updater_release_trybot',
+    },
+
     'tryserver.chromium.win': {
       'gpu-fyi-try-win7-amd-dbg-32': 'gpu_fyi_tests_debug_trybot_x86',
       'gpu-fyi-try-win7-amd-dqp-32': 'angle_deqp_release_trybot_x86',
@@ -1093,10 +1133,10 @@
       'gpu-fyi-try-win10-nvidia-rel-32': 'gpu_fyi_tests_release_trybot_x86',
       'gpu-fyi-try-win10-nvidia-rel-64': 'gpu_fyi_tests_release_trybot',
       'gpu-fyi-try-win10-nvidia-sk-dawn-rel-64': 'gpu_tests_sk_dawn_release_trybot',
+      'win10_chromium_inverse_fieldtrials_x64_fyi_rel_ng': 'gpu_tests_release_trybot_resource_whitelisting_invert_fieldtrials',
       'win10_chromium_x64_dbg_ng': 'gpu_tests_debug_bot',
       'win10_chromium_x64_rel_ng': 'gpu_tests_release_trybot_resource_whitelisting_code_coverage',
       'win10_chromium_x64_rel_ng_exp': 'release_trybot',
-      'win10-inverse-fieldtrials-fyi-rel': 'gpu_tests_release_trybot_invert_fieldtrials',
       'win-annotator-rel': 'release_trybot',
       'win-asan': 'asan_clang_fuzzer_static_v8_heap_minimal_symbols_release',
       'win-celab-try-rel': 'release_bot_minimal_symbols',
@@ -1332,6 +1372,11 @@
       'strip_debug_info', 'android_fastbuild', 'webview_google',
     ],
 
+    'android_release_bot_minimal_symbols_x86_fastbuild': [
+      'android', 'release_bot', 'minimal_symbols', 'strip_debug_info',
+      'android_fastbuild', 'x86',
+    ],
+
     'android_release_bot_minimal_symbols_arm64_webview_google': [
       'android', 'release_bot', 'minimal_symbols', 'arm64',
       'strip_debug_info', 'webview_google',
@@ -1352,12 +1397,6 @@
       'strip_debug_info', 'android_fastbuild', 'webview_google',
     ],
 
-    'android_release_bot_minimal_symbols_x86_fastbuild_webview_google_invert_fieldtrials': [
-      'android', 'release_bot', 'minimal_symbols', 'x86',
-      'strip_debug_info', 'android_fastbuild', 'webview_google',
-      'invert_fieldtrials',
-    ],
-
     'android_release_trybot': [
       'android', 'release_trybot', 'strip_debug_info',
     ],
@@ -1451,6 +1490,47 @@
       'angle_tests', 'ozone_linux', 'ozone_linux_non_x11', 'system_gbm_libdrm', 'release_trybot',
     ],
 
+    'angle_specific_android_vulkan_ndk_release_trybot': [
+      'angle_specific_tests', 'android_without_codecs', 'vulkan_ndk',
+      'shared_release_trybot',
+    ],
+
+    'angle_specific_android_vulkan_ndk_release_trybot_arm64': [
+      'angle_specific_tests', 'android_without_codecs', 'vulkan_ndk',
+      'shared_release_trybot', 'arm64',
+    ],
+
+    'angle_specific_android_vulkan_ndk_release_trybot_dcheck_off_arm64': [
+      'angle_specific_tests', 'android_without_codecs',  'vulkan_ndk',
+      'shared_release_trybot_dcheck_off', 'arm64',
+    ],
+
+    'angle_specific_no_trace_android_release_trybot_arm64': [
+      'angle_specific_no_trace_tests', 'android_without_codecs',
+      'shared_release_trybot', 'arm64',
+    ],
+
+    'angle_specific_ozone_linux_system_gbm_libdrm_release_trybot': [
+      'angle_specific_tests', 'ozone_linux', 'ozone_linux_non_x11',
+      'system_gbm_libdrm', 'shared_release_trybot',
+    ],
+
+    'angle_specific_release_trybot': [
+      'angle_specific_tests', 'shared_release_trybot',
+    ],
+
+    'angle_specific_release_trybot_fuchsia': [
+      'angle_specific_tests', 'shared_release_trybot', 'fuchsia',
+    ],
+
+    'angle_specific_release_trybot_ios': [
+      'angle_specific_tests', 'release_trybot', 'ios', 'ios_simulator', 'ios_cpu_x64', 'xctest', 'ios_disable_xcode_project_generation',
+    ],
+
+    'angle_specific_release_trybot_x86': [
+      'angle_specific_tests', 'shared_release_trybot', 'x86',
+    ],
+
     'asan_clang_shared_v8_heap_minimal_symbols_release_tot': [
       'asan', 'clang_tot', 'shared', 'v8_heap', 'minimal_symbols', 'release',
     ],
@@ -1545,6 +1625,10 @@
       'cast', 'release_trybot',
     ],
 
+    'cast_binary_size': [
+      'cast', 'goma', 'minimal_symbols', 'official_optimize',
+    ],
+
     'cast_audio_release_bot': [
       'cast', 'cast_audio', 'release_bot', 'minimal_symbols',
     ],
@@ -1574,7 +1658,7 @@
     ],
 
     'chromeos_amd64-generic_lacros_official': [
-      'chromeos_amd64-generic', 'amd64-lacros', 'official',
+      'chromeos_amd64-generic', 'amd64-lacros', 'official', 'minimal_symbols', 'cfi', 'thin_lto',
     ],
 
     'chromeos_amd64-generic_lacros_rel': [
@@ -1625,6 +1709,11 @@
       'chromeos_device', 'betty-pi-arc', 'include_unwind_tables', 'official', 'use_fake_dbus_clients',
     ],
 
+    'chromeos_betty-pi-arc_dchecks': [
+      'chromeos_device', 'betty-pi-arc', 'include_unwind_tables', 'official',
+      'use_fake_dbus_clients', 'dcheck_always_on',
+    ],
+
     'chromeos_eve-arc-r_include_unwind_tables_official': [
       'chromeos_device', 'eve-arc-r', 'include_unwind_tables', 'official',
     ],
@@ -1657,6 +1746,10 @@
       'chromeos_with_codecs', 'release_bot', 'use_clang_coverage',
     ],
 
+    'chromeos_with_codecs_release_bot_javascript_coverage': [
+      'chromeos_with_codecs', 'release_bot', 'use_javascript_coverage',
+    ],
+
     'chromeos_with_codecs_release_trybot': [
       'chromeos_with_codecs', 'release_trybot', 'no_symbols',
     ],
@@ -1667,16 +1760,26 @@
       'use_clang_coverage', 'partial_code_coverage_instrumentation',
     ],
 
+    'chromeos_with_codecs_release_trybot_js_cpp_code_coverage': [
+      'chromeos_with_codecs', 'release_trybot', 'no_symbols',
+      'use_clang_coverage', 'partial_code_coverage_instrumentation',
+      'use_javascript_coverage', 'no_webui_optimize',
+    ],
+
+    'chromeos_with_codecs_release_trybot_invert_fieldtrials': [
+      'chromeos_with_codecs', 'release_trybot', 'no_symbols', 'invert_fieldtrials',
+    ],
+
     'clang_code_coverage': [
       'release_bot', 'clang', 'use_clang_coverage', 'no_symbols',
     ],
 
     'clang_code_coverage_ios_xctest': [
-      'use_clang_coverage', 'debug_static_bot', 'x64', 'ios', 'ios_use_goma_rbe', 'xctest',
+      'use_clang_coverage', 'debug_static_bot', 'x64', 'ios', 'xctest', 'ios_disable_xcode_project_generation',
     ],
 
-    'clang_code_coverage_ios_partial_instrumentation_xctest': [
-      'use_clang_coverage', 'debug_static_bot', 'x64', 'ios', 'ios_use_goma_rbe', 'partial_code_coverage_instrumentation', 'xctest',
+    'ios_simulator_code_coverage_partial_instrumentation_xctest': [
+      'use_clang_coverage', 'debug_static_bot', 'x64', 'ios', 'ios_simulator', 'partial_code_coverage_instrumentation', 'xctest', 'ios_disable_xcode_project_generation',
     ],
 
     'clang_tot_asan_lsan_static_release': [
@@ -1782,7 +1885,7 @@
     # Lacros uses different gn args to build for chromeOS device vs. Linux. For
     # simplicity, we only generate codesearch x-refs for lacros on Linux.
     'codesearch_gen_chromium_lacros_bot': [
-      'codesearch', 'lacros_on_linux',
+      'codesearch', 'lacros_on_linux', 'static',
     ],
 
     'codesearch_gen_chromium_bot': [
@@ -1857,6 +1960,14 @@
       'debug_bot', 'x86', 'no_com_init_hooks', 'chrome_with_codecs'
     ],
 
+    'fuchsia_clang_code_coverage': [
+      'fuchsia', 'release_bot', 'clang', 'use_clang_coverage', 'no_symbols'
+    ],
+
+    'fuchsia_official_arm64_size': [
+      'official_optimize_goma', 'fuchsia', 'arm64', 'release_bot'
+    ],
+
     'fuchsia_official_optimize_goma': [
       'official_optimize_goma', 'fuchsia',
     ],
@@ -1880,27 +1991,27 @@
     ],
 
     'gpu_fyi_tests_debug_trybot': [
-      'gpu_fyi_tests', 'debug_bot',
+      'gpu_fyi_tests', 'debug_bot', 'disable_nacl',
     ],
 
     'gpu_fyi_tests_debug_trybot_x86': [
-      'gpu_fyi_tests', 'debug_bot', 'x86',
+      'gpu_fyi_tests', 'debug_bot', 'x86', 'disable_nacl',
     ],
 
     'gpu_fyi_tests_dx12vk_debug_trybot': [
-      'gpu_fyi_tests', 'dx12vk', 'debug_bot',
+      'gpu_fyi_tests', 'dx12vk', 'debug_bot', 'disable_nacl',
     ],
 
     'gpu_fyi_tests_dx12vk_release_trybot': [
-      'gpu_fyi_tests', 'dx12vk', 'release_trybot',
+      'gpu_fyi_tests', 'dx12vk', 'release_trybot', 'disable_nacl',
     ],
 
     'gpu_fyi_tests_release_trybot': [
-      'gpu_fyi_tests', 'release_trybot',
+      'gpu_fyi_tests', 'release_trybot', 'disable_nacl',
     ],
 
     'gpu_fyi_tests_release_trybot_arm64': [
-      'gpu_fyi_tests', 'release_trybot', 'arm64',
+      'gpu_fyi_tests', 'release_trybot', 'arm64', 'disable_nacl',
     ],
 
     'gpu_fyi_tests_release_trybot_asan': [
@@ -1908,7 +2019,7 @@
     ],
 
     'gpu_fyi_tests_release_trybot_fuchsia': [
-      'gpu_fyi_tests', 'release_trybot', 'fuchsia',
+      'gpu_fyi_tests', 'release_trybot', 'fuchsia', 'disable_nacl',
     ],
 
     'gpu_fyi_tests_release_trybot_tsan': [
@@ -1916,7 +2027,7 @@
     ],
 
     'gpu_fyi_tests_release_trybot_x86': [
-      'gpu_fyi_tests', 'release_trybot', 'x86',
+      'gpu_fyi_tests', 'release_trybot', 'x86', 'disable_nacl',
     ],
 
     'gpu_tests_android_release_bot_minimal_symbols_arm64_fastbuild': [
@@ -1932,8 +2043,9 @@
     ],
 
     # TODO(crbug/1018431): Add 'resource_whitelisting' back once bug fixed.
-    'gpu_tests_android_release_bot_minimal_symbols_arm64_fastbuild_native_coverage': [
-      'gpu_tests', 'android', 'release_bot', 'minimal_symbols', 'arm64',
+    # No symbols to prevent linker file too large error.
+    'gpu_tests_android_release_bot_no_symbols_arm64_fastbuild_native_coverage': [
+      'gpu_tests', 'android', 'release_bot', 'arm64',
       'static_angle', 'android_fastbuild', 'webview_google',
       'android_no_proguard', 'use_clang_coverage',
     ],
@@ -1991,14 +2103,14 @@
       'partial_code_coverage_instrumentation',
     ],
 
-    'gpu_tests_release_bot_minimal_symbols_invert_fieldtrials': [
-      'gpu_tests', 'release_bot', 'minimal_symbols', 'invert_fieldtrials',
-    ],
-
     'gpu_tests_release_bot_minimal_symbols_no_nacl': [
       'gpu_tests', 'release_bot', 'minimal_symbols', 'disable_nacl',
     ],
 
+    'gpu_tests_release_bot_reclient': [
+      'gpu_tests', 'release_bot_reclient',
+    ],
+
     'gpu_tests_release_bot_x86_minimal_symbols': [
       'gpu_tests', 'release_bot', 'x86', 'minimal_symbols',
     ],
@@ -2011,6 +2123,14 @@
       'gpu_tests', 'release_trybot',
     ],
 
+    'gpu_tests_release_trybot_mbi_mode_per_render_process_host': [
+      'gpu_tests', 'release_trybot', 'mbi_mode_per_render_process_host'
+    ],
+
+    'gpu_tests_release_trybot_mbi_mode_per_site_instance': [
+      'gpu_tests', 'release_trybot', 'mbi_mode_per_site_instance'
+    ],
+
     # TODO(https://crbug.com/330262): Once deterministic builds are default on
     # macOS, remove this special case of gpu_tests_release_trybot.
     'gpu_tests_release_trybot_deterministic_mac': [
@@ -2022,8 +2142,8 @@
       'use_clang_coverage', 'partial_code_coverage_instrumentation',
     ],
 
-    'gpu_tests_release_trybot_invert_fieldtrials': [
-      'gpu_tests', 'release_trybot', 'invert_fieldtrials',
+    'gpu_tests_release_trybot_deterministic_mac_invert_fieldtrials': [
+      'gpu_tests', 'release_trybot', 'mac_deterministic_build', 'invert_fieldtrials',
     ],
 
     'gpu_tests_release_trybot_resource_whitelisting': [
@@ -2038,6 +2158,14 @@
       'use_clang_coverage', 'partial_code_coverage_instrumentation',
     ],
 
+    'gpu_tests_release_trybot_resource_whitelisting_invert_fieldtrials': [
+      'gpu_tests', 'release_trybot', 'resource_whitelisting', 'invert_fieldtrials',
+    ],
+
+    'gpu_tests_release_trybot_x86': [
+      'gpu_tests', 'release_trybot', 'x86',
+    ],
+
     'gpu_tests_release_trybot_no_symbols_use_dummy_lastchange': [
       'gpu_tests', 'release_trybot', 'no_symbols', 'use_dummy_lastchange',
     ],
@@ -2078,44 +2206,40 @@
     'ios_error': [ 'error'],
 
     'ios_clang_tot_xctest': [
-      'clang_tot', 'ios', 'ios_simulator', 'ios_cpu_x64', 'ios_disable_code_signing', 'release', 'static', 'xctest',
+      'clang_tot', 'ios', 'ios_simulator', 'ios_cpu_x64', 'ios_disable_code_signing', 'release', 'static', 'xctest', 'ios_disable_xcode_project_generation',
     ],
 
     'ios_clang_device_tot_xctest': [
-      'clang_tot', 'ios', 'ios_device', 'ios_cpu_arm64', 'release', 'ios_chromium_cert', 'xctest',
+      'clang_tot', 'ios', 'ios_device', 'ios_cpu_arm64', 'release', 'ios_chromium_cert', 'xctest', 'ios_disable_xcode_project_generation',
     ],
 
     'ios_cronet_xctest': [
-      'cronet_ios', 'debug_static_bot', 'ios_deployment_target_10_0', 'ios', 'ios_simulator', 'ios_cpu_x64_x86', 'xctest',
+      'cronet_ios', 'debug_static_bot', 'ios_deployment_target_10_0', 'ios', 'ios_simulator', 'ios_cpu_x64_x86', 'xctest', 'ios_disable_xcode_project_generation',
     ],
 
     'ios_device_release_compile_only': [
-        'compile_only', 'ios', 'ios_device', 'ios_cpu_arm64', 'ios_google_cert', 'ios_disable_code_signing', 'release_bot'
-    ],
-
-    'ios_device_release_rbe_compile_only': [
-        'compile_only', 'ios', 'ios_device', 'ios_cpu_arm64', 'ios_google_cert', 'ios_disable_code_signing', 'ios_use_goma_rbe', 'release_bot'
+        'compile_only', 'ios', 'ios_device', 'ios_cpu_arm64', 'ios_google_cert', 'ios_disable_code_signing', 'release_bot', 'ios_disable_xcode_project_generation',
     ],
 
     # doesn't have symbol_level=0
-    'ios_device_release_static_rbe_bot_xctest': [
-        'ios', 'ios_device', 'ios_cpu_arm64', 'ios_disable_code_signing', 'ios_use_goma_rbe', 'release_bot', 'xctest',
+    'ios_device_release_static_bot_xctest': [
+        'ios', 'ios_device', 'ios_cpu_arm64', 'ios_disable_code_signing', 'release_bot', 'xctest', 'ios_disable_xcode_project_generation',
     ],
 
     'ios_simulator_debug_static_bot_xctest': [
-        'debug_static_bot', 'ios', 'ios_simulator', 'ios_cpu_x64', 'xctest',
+        'debug_static_bot', 'ios', 'ios_simulator', 'ios_cpu_x64', 'xctest', 'ios_disable_xcode_project_generation',
     ],
 
-    'ios_simulator_debug_static_bot_multi_window_xctest': [
-        'debug_static_bot', 'ios_enable_multi_window', 'ios', 'ios_simulator', 'ios_cpu_x64', 'xctest',
+    'ios_simulator_debug_static_bot_invert_fieldtrials_xctest': [
+        'debug_static_bot', 'ios', 'ios_simulator', 'ios_cpu_x64', 'invert_fieldtrials', 'xctest', 'ios_disable_xcode_project_generation',
     ],
 
-    'ios_simulator_debug_static_rbe_bot_xctest': [
-        'debug_static_bot', 'ios', 'ios_simulator', 'ios_cpu_x64', 'ios_use_goma_rbe', 'xctest',
+    'ios_simulator_debug_static_bot_multi_window_xctest': [
+        'debug_static_bot', 'ios_enable_multi_window', 'ios', 'ios_simulator', 'ios_cpu_x64', 'xctest', 'ios_disable_xcode_project_generation',
     ],
 
     'ios_simulator_release_static_asan_bot_xctest': [
-        'ios', 'ios_simulator', 'ios_cpu_x64', 'release_bot', 'asan', 'xctest',
+        'ios', 'ios_simulator', 'ios_cpu_x64', 'release_bot', 'asan', 'xctest', 'ios_disable_xcode_project_generation',
     ],
 
     'lacros_on_linux_release_bot': [
@@ -2150,6 +2274,10 @@
       'libfuzzer', 'asan', 'shared_release_bot', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing', 'mojo_fuzzer',
     ],
 
+    'libfuzzer_asan_release_bot_reclient': [
+      'libfuzzer', 'asan', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing', 'mojo_fuzzer', 'shared_release_bot_reclient',
+    ],
+
     'libfuzzer_asan_release_bot_v8_arm64': [
       'libfuzzer', 'asan', 'shared_release_bot', 'chromeos_codecs', 'pdf_xfa', 'disable_nacl', 'optimize_for_fuzzing', 'v8_simulate_arm64', 'disable_seed_corpus',
     ],
@@ -2197,6 +2325,14 @@
       'libfuzzer', 'asan', 'release_trybot', 'chrome_with_codecs', 'pdf_xfa', 'disable_nacl', 'mojo_fuzzer',
     ],
 
+    'linux_cfm_release_bot': [
+      'cfm', 'release_bot', 'chromeos',
+    ],
+
+    'linux_cfm_release_trybot': [
+      'cfm', 'release_trybot', 'chromeos',
+    ],
+
     'mac_arm64_release_bot': [
       'release_bot', 'arm64',
     ],
@@ -2225,8 +2361,12 @@
       'official', 'release_bot', 'minimal_symbols',
     ],
 
-    'official_chromeos_arm-generic': [
-      'chromeos_device', 'arm-generic', 'goma', 'official_optimize',
+    'official_fuchsia_arm64': [
+      'arm64', 'fuchsia', 'official', 'custom_args',
+    ],
+
+    'official_fuchsia_x64': [
+      'fuchsia', 'official', 'x64', 'custom_args',
     ],
 
     'official_goma': [
@@ -2238,15 +2378,15 @@
     ],
 
     'official_goma_perf': [
-      'official', 'goma', 'minimal_symbols',
+      'official', 'goma', 'minimal_symbols', 'pgo_phase_0',
     ],
 
     'official_goma_mac_perf': [
-      'official', 'goma', 'no_keystone_registration_framework', 'no_widevine_cdm_host_verification', 'full_symbols',
+      'official', 'goma', 'no_keystone_registration_framework', 'no_widevine_cdm_host_verification', 'full_symbols', 'pgo_phase_0',
     ],
 
     'official_goma_mac_arm_perf': [
-      'official', 'goma', 'no_keystone_registration_framework', 'no_widevine_cdm_host_verification', 'full_symbols', 'arm64'
+      'official', 'goma', 'no_keystone_registration_framework', 'no_widevine_cdm_host_verification', 'full_symbols', 'arm64', 'pgo_phase_0',
     ],
 
     'official_goma_mac_pgo': [
@@ -2254,15 +2394,15 @@
     ],
 
     'official_goma_linux_perf': [
-      'official', 'goma', 'no_gnome_keyring', 'minimal_symbols',
+      'official', 'goma', 'no_gnome_keyring', 'minimal_symbols', 'pgo_phase_0',
     ],
 
-    'official_goma_linux_pgo': [
-      'official', 'goma', 'static', 'no_symbols', 'pgo_phase_1',
+    'official_goma_fuchsia_arm64_perf': [
+      'official', 'goma', 'minimal_symbols', 'fuchsia', 'fuchsia_include_astro_images', 'arm64', 'ffmpeg_branding_chrome', 'proprietary_codecs'
     ],
 
-    'official_goma_chromeos': [
-      'official', 'goma', 'chromeos',
+    'official_goma_linux_pgo': [
+      'official', 'goma', 'static', 'no_symbols', 'pgo_phase_1',
     ],
 
     'official_goma_chromeos_include_unwind_tables': [
@@ -2270,19 +2410,19 @@
     ],
 
     'official_goma_minimal_symbols_android': [
-      'official', 'goma', 'minimal_symbols', 'android',
+      'official', 'goma', 'minimal_symbols', 'android', 'pgo_phase_0', 'no_default_afdo'
     ],
 
     'official_goma_minimal_symbols_android_arm64': [
-      'official', 'goma', 'minimal_symbols', 'android', 'arm64',
+      'official', 'goma', 'minimal_symbols', 'android', 'arm64', 'pgo_phase_0', 'no_default_afdo'
     ],
 
     'official_goma_minimal_symbols_android_thin_lto_opt': [
-      'official', 'goma', 'minimal_symbols', 'android', 'thin_lto_opt',
+      'official', 'goma', 'minimal_symbols', 'android', 'thin_lto_opt', 'no_default_afdo'
     ],
 
     'official_goma_minimal_symbols_android_thin_lto_opt_arm64': [
-      'official', 'goma', 'minimal_symbols', 'android', 'thin_lto_opt', 'arm64',
+      'official', 'goma', 'minimal_symbols', 'android', 'thin_lto_opt', 'arm64', 'no_default_afdo'
     ],
 
     'official_goma_x64': [
@@ -2298,7 +2438,7 @@
     ],
 
     'official_goma_x86_perf': [
-      'official', 'goma', 'x86', 'minimal_symbols'
+      'official', 'goma', 'x86', 'minimal_symbols', 'pgo_phase_0',
     ],
 
     'official_goma_x86_pgo': [
@@ -2313,8 +2453,28 @@
       'official_optimize_goma_trybot',
     ],
 
+    'updater_debug_bot': [
+      'updater_on_win_mac', 'debug_bot',
+    ],
+
+    'updater_debug_bot_x86': [
+      'updater_on_win_mac', 'debug_bot', 'x86',
+    ],
+
     'updater_release_bot': [
-      'updater_on_win_mac', 'release',
+      'updater_on_win_mac', 'release_bot',
+    ],
+
+    'updater_release_bot_x86': [
+      'updater_on_win_mac', 'release_bot', 'x86',
+    ],
+
+    'updater_release_trybot': [
+      'updater_on_win_mac', 'release_trybot',
+    ],
+
+    'gpu_tests_ozone_linux_non_x11_release_trybot': [
+      'gpu_tests', 'ozone_linux', 'ozone_linux_non_x11', 'release_trybot',
     ],
 
     'ozone_linux_release_bot': [
@@ -2369,6 +2529,14 @@
       'release_bot_blink', 'enable_blink_heap_verification', 'dcheck_always_on',
     ],
 
+    'release_bot_enable_v8_oilpan_dcheck_always_on': [
+      'release_bot_blink', 'enable_v8_oilpan', 'dcheck_always_on',
+    ],
+
+    'release_bot_extended_tracing': [
+      'release_bot', 'extended_tracing',
+    ],
+
     'release_bot_fuchsia': [
       'release_bot', 'fuchsia',
     ],
@@ -2429,6 +2597,14 @@
       'release_trybot_blink', 'enable_blink_heap_verification',
     ],
 
+    'release_trybot_enable_v8_oilpan': [
+      'release_trybot_blink', 'enable_v8_oilpan',
+    ],
+
+    'release_trybot_extended_tracing': [
+      'release_trybot', 'extended_tracing',
+    ],
+
     'release_trybot_fuchsia': [
       'release_trybot', 'fuchsia',
     ],
@@ -2482,10 +2658,18 @@
       'tsan', 'disable_nacl', 'debug_bot',
     ],
 
+    'tsan_disable_nacl_debug_bot_reclient': [
+      'tsan', 'disable_nacl', 'debug_bot_reclient',
+    ],
+
     'tsan_disable_nacl_release_bot': [
       'tsan', 'disable_nacl', 'release_bot',
     ],
 
+    'tsan_disable_nacl_release_bot_reclient': [
+      'tsan', 'disable_nacl', 'release_bot_reclient',
+    ],
+
     'tsan_disable_nacl_release_trybot': [
       'tsan', 'disable_nacl', 'release_trybot',
     ],
@@ -2541,7 +2725,7 @@
     },
 
     'amd64-lacros': {
-      'gn_args': 'use_ozone=true ozone_platform_wayland=true ozone_platform_x11=false target_os="linux" use_evdev_gestures=false use_vaapi=false use_gtk=false use_glib=false enable_linux_installer=false rtc_use_pipewire=false use_gio=false use_v8_context_snapshot=false use_custom_libcxx=false use_pulseaudio=false use_pangocairo=false chromeos_is_browser_only=true use_system_libsync=false cros_host_sysroot="//build/linux/debian_sid_amd64-sysroot" cros_v8_snapshot_sysroot="//build/linux/debian_sid_amd64-sysroot" use_custom_libcxx_for_host=true'
+      'gn_args': 'use_ozone=true ozone_platform_wayland=true ozone_platform_x11=false target_os="chromeos" use_evdev_gestures=false use_vaapi=false use_gtk=false use_glib=false enable_linux_installer=false rtc_use_pipewire=false use_gio=false use_v8_context_snapshot=false use_custom_libcxx=false use_pulseaudio=false use_pangocairo=false chromeos_is_browser_only=true use_system_libsync=false cros_host_sysroot="//build/linux/debian_sid_amd64-sysroot" cros_v8_snapshot_sysroot="//build/linux/debian_sid_amd64-sysroot" use_custom_libcxx_for_host=true'
     },
 
     # We build Android with codecs on most bots to ensure maximum test
@@ -2579,11 +2763,24 @@
       'gn_args': 'build_angle_deqp_tests=true',
     },
 
+    'angle_gles1_conform_tests': {
+      'gn_args': 'build_angle_gles1_conform_tests=true',
+    },
+
     'angle_tests': {
       'mixins': ['angle_trace_perf_tests', 'gpu_tests',
                  'internal_gles_conform_tests'],
     },
 
+    'angle_specific_tests': {
+      'mixins': ['angle_gles1_conform_tests', 'angle_deqp_tests',
+                 'angle_trace_perf_tests', 'disable_nacl'],
+    },
+
+    'angle_specific_no_trace_tests': {
+      'mixins': ['angle_gles1_conform_tests', 'angle_deqp_tests'],
+    },
+
     'angle_trace_perf_tests': {
       'gn_args': 'build_angle_trace_perf_tests=true',
     },
@@ -2650,6 +2847,10 @@
       'gn_args': 'use_cfi_recover=true',
     },
 
+    'cfm': {
+      'gn_args': 'is_cfm=true',
+    },
+
     'chrome_with_codecs': {
       'mixins': ['ffmpeg_branding_chrome', 'proprietary_codecs'],
     },
@@ -2725,6 +2926,10 @@
       'gn_args': ('disable_brotli_filter=false is_cronet_build=true enable_remoting=false use_allocator_shim=false'),
     },
 
+    'custom_args': {
+      'args_file': '//build/custom_args.gn',
+    },
+
     'dawn_tests': {
       'gn_args': 'use_dawn=true',
     },
@@ -2745,6 +2950,10 @@
       'mixins': ['debug', 'shared', 'goma', 'minimal_symbols'],
     },
 
+    'debug_bot_reclient': {
+      'mixins': ['debug', 'shared', 'reclient', 'minimal_symbols'],
+    },
+
     'debug_bot_blink': {
       'mixins': ['debug', 'shared', 'goma', 'minimal_symbols', 'chrome_with_codecs' ],
     },
@@ -2789,6 +2998,14 @@
       'gn_args': 'skip_archive_compression=false',
     },
 
+    'enable_v8_oilpan': {
+      'gn_args': 'enable_blink_heap_use_v8_oilpan=true',
+    },
+
+    'enable_vulkan': {
+      'gn_args': 'enable_vulkan=true',
+    },
+
     'eve': {
       'args_file': '//build/args/chromeos/eve.gni',
     },
@@ -2797,8 +3014,8 @@
       'args_file': '//build/args/chromeos/eve-arc-r.gni',
     },
 
-    'enable_vulkan': {
-      'gn_args': 'enable_vulkan=true',
+    'extended_tracing': {
+      'gn_args': 'extended_tracing_enabled=true',
     },
 
     # This mixin is used to force configs that use it to fail. It
@@ -2825,6 +3042,10 @@
       'gn_args': 'target_os="fuchsia"',
     },
 
+    'fuchsia_include_astro_images': {
+      'gn_args': 'fuchsia_additional_boot_images=["//third_party/fuchsia-sdk/images-internal/astro-release/"]',
+    },
+
     'full_symbols': {
       'gn_args': 'symbol_level=2',
     },
@@ -2923,8 +3144,17 @@
       'gn_args': 'ios_enable_multi_window=true'
     },
 
-    'ios_use_goma_rbe': {
-      'gn_args': 'ios_use_goma_rbe=true'
+    'ios_disable_xcode_project_generation': {
+      # defaults to true under build/config/ios/rules.gni
+      'gn_args': 'ios_set_attributes_for_xcode_project_generation=false',
+    },
+
+    'mbi_mode_per_render_process_host': {
+      'gn_args': 'mbi_mode=\"per_render_process_host\"',
+    },
+
+    'mbi_mode_per_site_instance': {
+      'gn_args': 'mbi_mode=\"per_site_instance\"',
     },
 
     'mojo_fuzzer': {
@@ -2936,7 +3166,7 @@
     },
 
     'lacros_on_linux': {
-      'gn_args': 'use_ozone=true ozone_platform_wayland=true ozone_platform="wayland" use_gtk=false chromeos_is_browser_only=true'
+      'gn_args': 'target_os="chromeos" use_ozone=true ozone_platform_wayland=true ozone_platform="wayland" use_gtk=false chromeos_is_browser_only=true'
     },
 
     'also_build_ash_chrome': {
@@ -2969,6 +3199,10 @@
       'gn_args': 'is_msan=true msan_track_origins=0',
     },
 
+    'no_default_afdo': {
+      'gn_args': 'clang_use_default_sample_profile=false',
+    },
+
     'no_clang': {
       'gn_args': 'is_clang=false',
     },
@@ -2989,6 +3223,10 @@
       'gn_args': 'enable_keystone_registration_framework=false',
     },
 
+    'no_webui_optimize': {
+      'gn_args': 'optimize_webui=false',
+    },
+
     'no_resource_whitelisting': {
       'gn_args': 'enable_resource_allowlist_generation=false',
     },
@@ -3065,6 +3303,11 @@
       'gn_args': 'use_perfetto_client_library=true',
     },
 
+    'pgo_phase_0': {
+      'mixins': ['strip_absolute_paths_from_debug_symbols'],
+      'gn_args': 'chrome_pgo_phase=0'
+    },
+
     'pgo_phase_1': {
       'mixins': ['strip_absolute_paths_from_debug_symbols'],
       'gn_args': 'chrome_pgo_phase=1'
@@ -3076,6 +3319,10 @@
       'gn_args': 'proprietary_codecs=true',
     },
 
+    'reclient': {
+      'gn_args': 'use_rbe=true',
+    },
+
     'release': {
       'gn_args': 'is_debug=false',
     },
@@ -3090,6 +3337,10 @@
       'mixins': ['release', 'static', 'goma', 'chrome_with_codecs'],
     },
 
+    'release_bot_reclient': {
+      'mixins': ['release', 'static', 'reclient'],
+    },
+
     'release_java': {
       'gn_args': 'is_java_debug=false',
     },
@@ -3118,10 +3369,18 @@
       'mixins': ['shared', 'release', 'goma'],
     },
 
+    'shared_release_bot_reclient': {
+      'mixins': ['shared', 'release', 'reclient']
+    },
+
     'shared_release_trybot': {
       'mixins': ['shared_release_bot', 'minimal_symbols', 'dcheck_always_on'],
     },
 
+    'shared_release_trybot_dcheck_off': {
+      'mixins': ['shared_release_bot', 'minimal_symbols', 'dcheck_off'],
+    },
+
     'sk_dawn': {
       'gn_args': 'skia_use_dawn=true enable_skia_dawn_gtests=true',
     },
@@ -3201,6 +3460,10 @@
       'gn_args': 'use_jacoco_coverage=true',
     },
 
+    'use_javascript_coverage': {
+      'gn_args': 'use_javascript_coverage=true',
+    },
+
     'v8_simulate_arm': {
       'gn_args': 'target_cpu="x86" v8_target_cpu="arm"',
     },
@@ -3232,7 +3495,7 @@
     },
 
     'vulkan_ndk': {
-      'gn_args': 'android32_ndk_api_level=26 android64_ndk_api_level=26',
+      'gn_args': 'android32_ndk_api_level=29 android64_ndk_api_level=29',
     },
 
     'webview_google': {
diff --git a/chromium/tools/mb/mb_config_expectations/chrome.json b/chromium/tools/mb/mb_config_expectations/chrome.json
index bc3f9fe9b7c..fc458701c86 100644
--- a/chromium/tools/mb/mb_config_expectations/chrome.json
+++ b/chromium/tools/mb/mb_config_expectations/chrome.json
@@ -1,13 +1,4 @@
 {
-  "chromeos-arm-generic-beta": {
-    "args_file": "//build/args/chromeos/arm-generic.gni",
-    "gn_args": {
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
   "chromeos-arm-generic-cfi-thin-lto-chrome": {
     "args_file": "//build/args/chromeos/arm-generic.gni",
     "gn_args": {
@@ -22,33 +13,6 @@
       "use_thin_lto": true
     }
   },
-  "chromeos-arm-generic-ltc": {
-    "args_file": "//build/args/chromeos/arm-generic.gni",
-    "gn_args": {
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
-  "chromeos-arm-generic-lts": {
-    "args_file": "//build/args/chromeos/arm-generic.gni",
-    "gn_args": {
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
-  "chromeos-arm-generic-stable": {
-    "args_file": "//build/args/chromeos/arm-generic.gni",
-    "gn_args": {
-      "is_chromeos_device": true,
-      "is_official_build": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
   "chromeos-betty-pi-arc-cfi-thin-lto-chrome": {
     "args_file": "//build/args/chromeos/betty-pi-arc.gni",
     "gn_args": {
@@ -233,13 +197,14 @@
       "use_goma": true
     }
   },
-  "lacros-chrome": {
+  "lacros-amd64-generic-chrome": {
     "args_file": "//build/args/chromeos/amd64-generic.gni",
     "gn_args": {
       "chromeos_is_browser_only": true,
       "cros_host_sysroot": "//build/linux/debian_sid_amd64-sysroot",
       "cros_v8_snapshot_sysroot": "//build/linux/debian_sid_amd64-sysroot",
       "enable_linux_installer": false,
+      "is_cfi": true,
       "is_chrome_branded": true,
       "is_chromeos_device": true,
       "is_official_build": true,
@@ -247,7 +212,8 @@
       "ozone_platform_wayland": true,
       "ozone_platform_x11": false,
       "rtc_use_pipewire": false,
-      "target_os": "linux",
+      "symbol_level": 1,
+      "target_os": "chromeos",
       "use_custom_libcxx": false,
       "use_custom_libcxx_for_host": true,
       "use_evdev_gestures": false,
@@ -259,6 +225,7 @@
       "use_pangocairo": false,
       "use_pulseaudio": false,
       "use_system_libsync": false,
+      "use_thin_lto": true,
       "use_v8_context_snapshot": false,
       "use_vaapi": false
     }
@@ -286,6 +253,7 @@
   },
   "linux-chromeos-beta": {
     "gn_args": {
+      "exclude_unwind_tables": false,
       "is_chrome_branded": true,
       "is_official_build": true,
       "target_os": "chromeos",
@@ -303,6 +271,7 @@
   },
   "linux-chromeos-ltc": {
     "gn_args": {
+      "exclude_unwind_tables": false,
       "is_chrome_branded": true,
       "is_official_build": true,
       "target_os": "chromeos",
@@ -311,6 +280,7 @@
   },
   "linux-chromeos-lts": {
     "gn_args": {
+      "exclude_unwind_tables": false,
       "is_chrome_branded": true,
       "is_official_build": true,
       "target_os": "chromeos",
@@ -319,12 +289,20 @@
   },
   "linux-chromeos-stable": {
     "gn_args": {
+      "exclude_unwind_tables": false,
       "is_chrome_branded": true,
       "is_official_build": true,
       "target_os": "chromeos",
       "use_goma": true
     }
   },
+  "linux64-trunk": {
+    "gn_args": {
+      "is_chrome_branded": true,
+      "is_official_build": true,
+      "use_goma": true
+    }
+  },
   "mac-chrome": {
     "gn_args": {
       "ignore_missing_widevine_signing_cert": true,
diff --git a/chromium/tools/mb/mb_config_expectations/chrome.pgo.json b/chromium/tools/mb/mb_config_expectations/chrome.pgo.json
index 2f059a1bbf6..eba01ee81e4 100644
--- a/chromium/tools/mb/mb_config_expectations/chrome.pgo.json
+++ b/chromium/tools/mb/mb_config_expectations/chrome.pgo.json
@@ -1,5 +1,5 @@
 {
-  "linux-pgo-beta": {
+  "linux-pgo": {
     "gn_args": {
       "chrome_pgo_phase": 1,
       "is_chrome_branded": true,
@@ -10,7 +10,7 @@
       "use_goma": true
     }
   },
-  "linux-pgo-stable": {
+  "linux-pgo-beta": {
     "gn_args": {
       "chrome_pgo_phase": 1,
       "is_chrome_branded": true,
@@ -21,7 +21,7 @@
       "use_goma": true
     }
   },
-  "linux-pgo-trunk": {
+  "linux-pgo-stable": {
     "gn_args": {
       "chrome_pgo_phase": 1,
       "is_chrome_branded": true,
@@ -32,7 +32,7 @@
       "use_goma": true
     }
   },
-  "mac-pgo-beta": {
+  "mac-pgo": {
     "gn_args": {
       "chrome_pgo_phase": 1,
       "enable_keystone_registration_framework": false,
@@ -46,7 +46,7 @@
       "use_goma": true
     }
   },
-  "mac-pgo-stable": {
+  "mac-pgo-beta": {
     "gn_args": {
       "chrome_pgo_phase": 1,
       "enable_keystone_registration_framework": false,
@@ -60,7 +60,7 @@
       "use_goma": true
     }
   },
-  "mac-pgo-trunk": {
+  "mac-pgo-stable": {
     "gn_args": {
       "chrome_pgo_phase": 1,
       "enable_keystone_registration_framework": false,
@@ -74,7 +74,7 @@
       "use_goma": true
     }
   },
-  "win32-pgo-beta": {
+  "win32-pgo": {
     "gn_args": {
       "chrome_pgo_phase": 1,
       "enable_resource_allowlist_generation": false,
@@ -87,7 +87,7 @@
       "use_goma": true
     }
   },
-  "win32-pgo-stable": {
+  "win32-pgo-beta": {
     "gn_args": {
       "chrome_pgo_phase": 1,
       "enable_resource_allowlist_generation": false,
@@ -100,7 +100,7 @@
       "use_goma": true
     }
   },
-  "win32-pgo-trunk": {
+  "win32-pgo-stable": {
     "gn_args": {
       "chrome_pgo_phase": 1,
       "enable_resource_allowlist_generation": false,
@@ -113,7 +113,7 @@
       "use_goma": true
     }
   },
-  "win64-pgo-beta": {
+  "win64-pgo": {
     "gn_args": {
       "chrome_pgo_phase": 1,
       "enable_resource_allowlist_generation": false,
@@ -126,7 +126,7 @@
       "use_goma": true
     }
   },
-  "win64-pgo-stable": {
+  "win64-pgo-beta": {
     "gn_args": {
       "chrome_pgo_phase": 1,
       "enable_resource_allowlist_generation": false,
@@ -139,7 +139,7 @@
       "use_goma": true
     }
   },
-  "win64-pgo-trunk": {
+  "win64-pgo-stable": {
     "gn_args": {
       "chrome_pgo_phase": 1,
       "enable_resource_allowlist_generation": false,
diff --git a/chromium/tools/mb/mb_config_expectations/chromium.android.fyi.json b/chromium/tools/mb/mb_config_expectations/chromium.android.fyi.json
index 32d6f620336..6e586adc883 100644
--- a/chromium/tools/mb/mb_config_expectations/chromium.android.fyi.json
+++ b/chromium/tools/mb/mb_config_expectations/chromium.android.fyi.json
@@ -29,11 +29,24 @@
       "use_goma": true
     }
   },
-  "android-inverse-fieldtrials-pie-x86-fyi-rel": {
+  "android-pie-arm64-wpt-rel-non-cq": {
+    "gn_args": {
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "strip_debug_info": true,
+      "symbol_level": 1,
+      "system_webview_package_name": "com.google.android.webview",
+      "target_cpu": "arm64",
+      "target_os": "android",
+      "use_goma": true
+    }
+  },
+  "android-weblayer-pie-x86-wpt-fyi-rel": {
     "gn_args": {
       "disable_android_lint": true,
       "ffmpeg_branding": "Chrome",
-      "invert_fieldtrials": true,
       "is_component_build": false,
       "is_debug": false,
       "proprietary_codecs": true,
@@ -46,17 +59,18 @@
       "use_goma": true
     }
   },
-  "android-pie-arm64-wpt-rel-non-cq": {
+  "android-weblayer-with-aosp-webview-x86-fyi-rel": {
     "gn_args": {
+      "disable_android_lint": true,
       "ffmpeg_branding": "Chrome",
       "is_component_build": false,
       "is_debug": false,
       "proprietary_codecs": true,
       "strip_debug_info": true,
       "symbol_level": 1,
-      "system_webview_package_name": "com.google.android.webview",
-      "target_cpu": "arm64",
+      "target_cpu": "x86",
       "target_os": "android",
+      "use_errorprone_java_compiler": false,
       "use_goma": true
     }
   },
diff --git a/chromium/tools/mb/mb_config_expectations/chromium.angle.json b/chromium/tools/mb/mb_config_expectations/chromium.angle.json
new file mode 100644
index 00000000000..05f5fa2f982
--- /dev/null
+++ b/chromium/tools/mb/mb_config_expectations/chromium.angle.json
@@ -0,0 +1,231 @@
+{
+  "android-angle-arm64-builder": {
+    "gn_args": {
+      "build_angle_deqp_tests": true,
+      "build_angle_gles1_conform_tests": true,
+      "dcheck_always_on": true,
+      "is_component_build": true,
+      "is_debug": false,
+      "symbol_level": 1,
+      "target_cpu": "arm64",
+      "target_os": "android",
+      "use_goma": true
+    }
+  },
+  "android-angle-chromium-arm64-builder": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "disable_android_lint": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "target_cpu": "arm64",
+      "target_os": "android",
+      "use_errorprone_java_compiler": false,
+      "use_goma": true,
+      "use_static_angle": true
+    }
+  },
+  "android-angle-perf-arm64-builder": {
+    "gn_args": {
+      "android32_ndk_api_level": 29,
+      "android64_ndk_api_level": 29,
+      "build_angle_deqp_tests": true,
+      "build_angle_gles1_conform_tests": true,
+      "build_angle_trace_perf_tests": true,
+      "dcheck_always_on": false,
+      "enable_nacl": false,
+      "is_component_build": true,
+      "is_debug": false,
+      "symbol_level": 1,
+      "target_cpu": "arm64",
+      "target_os": "android",
+      "use_goma": true
+    }
+  },
+  "android-angle-vk-arm-builder": {
+    "gn_args": {
+      "android32_ndk_api_level": 29,
+      "android64_ndk_api_level": 29,
+      "build_angle_deqp_tests": true,
+      "build_angle_gles1_conform_tests": true,
+      "build_angle_trace_perf_tests": true,
+      "dcheck_always_on": true,
+      "enable_nacl": false,
+      "is_component_build": true,
+      "is_debug": false,
+      "symbol_level": 1,
+      "target_os": "android",
+      "use_goma": true
+    }
+  },
+  "android-angle-vk-arm64-builder": {
+    "gn_args": {
+      "android32_ndk_api_level": 29,
+      "android64_ndk_api_level": 29,
+      "build_angle_deqp_tests": true,
+      "build_angle_gles1_conform_tests": true,
+      "build_angle_trace_perf_tests": true,
+      "dcheck_always_on": true,
+      "enable_nacl": false,
+      "is_component_build": true,
+      "is_debug": false,
+      "symbol_level": 1,
+      "target_cpu": "arm64",
+      "target_os": "android",
+      "use_goma": true
+    }
+  },
+  "fuchsia-angle-builder": {
+    "gn_args": {
+      "build_angle_deqp_tests": true,
+      "build_angle_gles1_conform_tests": true,
+      "build_angle_trace_perf_tests": true,
+      "dcheck_always_on": true,
+      "enable_nacl": false,
+      "is_component_build": true,
+      "is_debug": false,
+      "symbol_level": 1,
+      "target_os": "fuchsia",
+      "use_goma": true
+    }
+  },
+  "ios-angle-builder": {
+    "gn_args": {
+      "build_angle_deqp_tests": true,
+      "build_angle_gles1_conform_tests": true,
+      "build_angle_trace_perf_tests": true,
+      "dcheck_always_on": true,
+      "enable_nacl": false,
+      "enable_run_ios_unittests_with_xctest": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
+      "is_component_build": false,
+      "is_debug": false,
+      "symbol_level": 1,
+      "target_cpu": "x64",
+      "target_environment": "simulator",
+      "target_os": "ios",
+      "use_goma": true
+    }
+  },
+  "linux-angle-builder": {
+    "gn_args": {
+      "build_angle_deqp_tests": true,
+      "build_angle_gles1_conform_tests": true,
+      "build_angle_trace_perf_tests": true,
+      "dcheck_always_on": true,
+      "enable_nacl": false,
+      "is_component_build": true,
+      "is_debug": false,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
+  "linux-angle-chromium-builder": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
+  "linux-ozone-angle-builder": {
+    "gn_args": {
+      "build_angle_deqp_tests": true,
+      "build_angle_gles1_conform_tests": true,
+      "build_angle_trace_perf_tests": true,
+      "dcheck_always_on": true,
+      "enable_nacl": false,
+      "is_component_build": true,
+      "is_debug": false,
+      "ozone_platform": "headless",
+      "symbol_level": 1,
+      "use_bundled_weston": true,
+      "use_goma": true,
+      "use_ozone": true,
+      "use_system_libdrm": true,
+      "use_system_minigbm": true,
+      "use_x11": false
+    }
+  },
+  "mac-angle-builder": {
+    "gn_args": {
+      "build_angle_deqp_tests": true,
+      "build_angle_gles1_conform_tests": true,
+      "build_angle_trace_perf_tests": true,
+      "dcheck_always_on": true,
+      "enable_nacl": false,
+      "is_component_build": true,
+      "is_debug": false,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
+  "mac-angle-chromium-builder": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "mac_deterministic_build": true,
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
+  "win-angle-chromium-x64-builder": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
+  "win-angle-chromium-x86-builder": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "target_cpu": "x86",
+      "use_goma": true
+    }
+  },
+  "win-angle-x64-builder": {
+    "gn_args": {
+      "build_angle_deqp_tests": true,
+      "build_angle_gles1_conform_tests": true,
+      "build_angle_trace_perf_tests": true,
+      "dcheck_always_on": true,
+      "enable_nacl": false,
+      "is_component_build": true,
+      "is_debug": false,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
+  "win-angle-x86-builder": {
+    "gn_args": {
+      "build_angle_deqp_tests": true,
+      "build_angle_gles1_conform_tests": true,
+      "build_angle_trace_perf_tests": true,
+      "dcheck_always_on": true,
+      "enable_nacl": false,
+      "is_component_build": true,
+      "is_debug": false,
+      "symbol_level": 1,
+      "target_cpu": "x86",
+      "use_goma": true
+    }
+  }
+}
\ No newline at end of file
diff --git a/chromium/tools/mb/mb_config_expectations/chromium.chromiumos.json b/chromium/tools/mb/mb_config_expectations/chromium.chromiumos.json
index 7f5cd35f65b..7b760d0205d 100644
--- a/chromium/tools/mb/mb_config_expectations/chromium.chromiumos.json
+++ b/chromium/tools/mb/mb_config_expectations/chromium.chromiumos.json
@@ -51,7 +51,7 @@
       "ozone_platform_wayland": true,
       "ozone_platform_x11": false,
       "rtc_use_pipewire": false,
-      "target_os": "linux",
+      "target_os": "chromeos",
       "use_custom_libcxx": false,
       "use_custom_libcxx_for_host": true,
       "use_evdev_gestures": false,
@@ -101,6 +101,71 @@
       "use_goma": true
     }
   },
+  "lacros-amd64-generic-binary-size-rel": {
+    "args_file": "//build/args/chromeos/amd64-generic.gni",
+    "gn_args": {
+      "chromeos_is_browser_only": true,
+      "cros_host_sysroot": "//build/linux/debian_sid_amd64-sysroot",
+      "cros_v8_snapshot_sysroot": "//build/linux/debian_sid_amd64-sysroot",
+      "enable_linux_installer": false,
+      "is_chromeos_device": true,
+      "ozone_platform_headless": true,
+      "ozone_platform_wayland": true,
+      "ozone_platform_x11": false,
+      "rtc_use_pipewire": false,
+      "target_os": "chromeos",
+      "use_custom_libcxx": false,
+      "use_custom_libcxx_for_host": true,
+      "use_evdev_gestures": false,
+      "use_gio": false,
+      "use_glib": false,
+      "use_goma": true,
+      "use_gtk": false,
+      "use_ozone": true,
+      "use_pangocairo": false,
+      "use_pulseaudio": false,
+      "use_system_libsync": false,
+      "use_v8_context_snapshot": false,
+      "use_vaapi": false
+    }
+  },
+  "lacros-amd64-generic-rel": {
+    "args_file": "//build/args/chromeos/amd64-generic.gni",
+    "gn_args": {
+      "chromeos_is_browser_only": true,
+      "cros_host_sysroot": "//build/linux/debian_sid_amd64-sysroot",
+      "cros_v8_snapshot_sysroot": "//build/linux/debian_sid_amd64-sysroot",
+      "enable_linux_installer": false,
+      "is_chromeos_device": true,
+      "ozone_platform_headless": true,
+      "ozone_platform_wayland": true,
+      "ozone_platform_x11": false,
+      "rtc_use_pipewire": false,
+      "target_os": "chromeos",
+      "use_custom_libcxx": false,
+      "use_custom_libcxx_for_host": true,
+      "use_evdev_gestures": false,
+      "use_gio": false,
+      "use_glib": false,
+      "use_goma": true,
+      "use_gtk": false,
+      "use_ozone": true,
+      "use_pangocairo": false,
+      "use_pulseaudio": false,
+      "use_system_libsync": false,
+      "use_v8_context_snapshot": false,
+      "use_vaapi": false
+    }
+  },
+  "linux-cfm-rel": {
+    "gn_args": {
+      "is_cfm": true,
+      "is_component_build": false,
+      "is_debug": false,
+      "target_os": "chromeos",
+      "use_goma": true
+    }
+  },
   "linux-chromeos-dbg": {
     "gn_args": {
       "ffmpeg_branding": "ChromeOS",
@@ -130,6 +195,7 @@
       "is_debug": false,
       "ozone_platform": "wayland",
       "ozone_platform_wayland": true,
+      "target_os": "chromeos",
       "use_goma": true,
       "use_gtk": false,
       "use_ozone": true
@@ -143,6 +209,7 @@
       "is_debug": false,
       "ozone_platform": "wayland",
       "ozone_platform_wayland": true,
+      "target_os": "chromeos",
       "use_goma": true,
       "use_gtk": false,
       "use_ozone": true
diff --git a/chromium/tools/mb/mb_config_expectations/chromium.clang.json b/chromium/tools/mb/mb_config_expectations/chromium.clang.json
index 5dd34efe393..c7818fd3a75 100644
--- a/chromium/tools/mb/mb_config_expectations/chromium.clang.json
+++ b/chromium/tools/mb/mb_config_expectations/chromium.clang.json
@@ -413,6 +413,7 @@
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
       "ios_enable_code_signing": false,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_clang": true,
       "is_component_build": false,
       "is_debug": false,
@@ -426,6 +427,7 @@
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
       "ios_code_signing_identity_description": "iPhone Developer",
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_clang": true,
       "is_debug": false,
       "llvm_force_head_revision": true,
@@ -434,15 +436,6 @@
       "target_os": "ios"
     }
   },
-  "UBSanVptr Linux": {
-    "gn_args": {
-      "is_component_build": false,
-      "is_debug": false,
-      "is_ubsan_no_recover": true,
-      "is_ubsan_vptr": true,
-      "use_goma": true
-    }
-  },
   "linux-win_cross-rel": {
     "gn_args": {
       "dcheck_always_on": true,
diff --git a/chromium/tools/mb/mb_config_expectations/chromium.fyi.json b/chromium/tools/mb/mb_config_expectations/chromium.fyi.json
index 2a787cc2788..5d58e0551c2 100644
--- a/chromium/tools/mb/mb_config_expectations/chromium.fyi.json
+++ b/chromium/tools/mb/mb_config_expectations/chromium.fyi.json
@@ -45,6 +45,21 @@
       "use_libfuzzer": true
     }
   },
+  "Libfuzzer Upload Linux ASan (reclient)": {
+    "gn_args": {
+      "enable_mojom_fuzzer": true,
+      "enable_nacl": false,
+      "ffmpeg_branding": "ChromeOS",
+      "is_asan": true,
+      "is_component_build": true,
+      "is_debug": false,
+      "optimize_for_fuzzing": true,
+      "pdf_enable_xfa": true,
+      "proprietary_codecs": true,
+      "use_libfuzzer": true,
+      "use_rbe": true
+    }
+  },
   "Libfuzzer Upload Linux ASan Debug": {
     "gn_args": {
       "archive_seed_corpus": false,
@@ -121,26 +136,39 @@
       "use_libfuzzer": true
     }
   },
-  "Linux Viz": {
+  "Linux Builder (reclient)": {
     "gn_args": {
-      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
       "is_component_build": false,
       "is_debug": false,
-      "symbol_level": 1,
-      "use_goma": true
+      "proprietary_codecs": true,
+      "use_rbe": true
     }
   },
-  "Linux remote_run Builder": {
+  "Linux TSan Builder (goma cache silo)": {
     "gn_args": {
+      "enable_nacl": false,
       "is_component_build": false,
       "is_debug": false,
+      "is_tsan": true,
       "use_goma": true
     }
   },
-  "Linux remote_run Tester": {
+  "Linux TSan Builder (reclient)": {
+    "gn_args": {
+      "enable_nacl": false,
+      "is_component_build": false,
+      "is_debug": false,
+      "is_tsan": true,
+      "use_rbe": true
+    }
+  },
+  "Linux Viz": {
     "gn_args": {
+      "dcheck_always_on": true,
       "is_component_build": false,
       "is_debug": false,
+      "symbol_level": 1,
       "use_goma": true
     }
   },
@@ -186,6 +214,25 @@
       "use_goma": true
     }
   },
+  "TSAN Debug (reclient)": {
+    "gn_args": {
+      "enable_nacl": false,
+      "is_component_build": true,
+      "is_debug": true,
+      "is_tsan": true,
+      "symbol_level": 1,
+      "use_rbe": true
+    }
+  },
+  "TSAN Release (reclient)": {
+    "gn_args": {
+      "enable_nacl": false,
+      "is_component_build": false,
+      "is_debug": false,
+      "is_tsan": true,
+      "use_rbe": true
+    }
+  },
   "VR Linux": {
     "gn_args": {
       "enable_vr": true,
@@ -231,7 +278,6 @@
       "is_debug": false,
       "is_java_debug": true,
       "proprietary_codecs": true,
-      "symbol_level": 1,
       "system_webview_package_name": "com.google.android.webview",
       "target_cpu": "arm64",
       "target_os": "android",
@@ -287,32 +333,15 @@
       "use_goma": true
     }
   },
-  "chromeos-amd64-generic-lacros-rel": {
-    "args_file": "//build/args/chromeos/amd64-generic.gni",
+  "fuchsia-code-coverage": {
     "gn_args": {
-      "chromeos_is_browser_only": true,
-      "cros_host_sysroot": "//build/linux/debian_sid_amd64-sysroot",
-      "cros_v8_snapshot_sysroot": "//build/linux/debian_sid_amd64-sysroot",
-      "enable_linux_installer": false,
-      "is_chromeos_device": true,
-      "ozone_platform_headless": true,
-      "ozone_platform_wayland": true,
-      "ozone_platform_x11": false,
-      "rtc_use_pipewire": false,
-      "target_os": "linux",
-      "use_custom_libcxx": false,
-      "use_custom_libcxx_for_host": true,
-      "use_evdev_gestures": false,
-      "use_gio": false,
-      "use_glib": false,
-      "use_goma": true,
-      "use_gtk": false,
-      "use_ozone": true,
-      "use_pangocairo": false,
-      "use_pulseaudio": false,
-      "use_system_libsync": false,
-      "use_v8_context_snapshot": false,
-      "use_vaapi": false
+      "is_clang": true,
+      "is_component_build": false,
+      "is_debug": false,
+      "symbol_level": 0,
+      "target_os": "fuchsia",
+      "use_clang_coverage": true,
+      "use_goma": true
     }
   },
   "fuchsia-fyi-arm64-dbg": {
@@ -334,6 +363,16 @@
       "use_goma": true
     }
   },
+  "fuchsia-fyi-arm64-size": {
+    "gn_args": {
+      "is_component_build": false,
+      "is_debug": false,
+      "is_official_build": true,
+      "target_cpu": "arm64",
+      "target_os": "fuchsia",
+      "use_goma": true
+    }
+  },
   "fuchsia-fyi-x64-dbg": {
     "gn_args": {
       "is_component_build": true,
@@ -354,6 +393,7 @@
   "ios-asan": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_asan": true,
       "is_component_build": false,
       "is_debug": false,
@@ -366,7 +406,7 @@
   "ios-simulator-code-coverage": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -379,6 +419,7 @@
   "ios-simulator-cr-recipe": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -401,6 +442,7 @@
       "enable_websockets": false,
       "include_transport_security_state_preload_list": false,
       "ios_deployment_target": "10.0",
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_cronet_build": true,
       "is_debug": true,
@@ -418,6 +460,7 @@
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
       "ios_enable_multi_window": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -430,7 +473,7 @@
   "ios-webkit-tot": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -443,6 +486,7 @@
   "ios13-beta-simulator": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -456,7 +500,7 @@
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
       "ios_enable_code_signing": false,
-      "ios_use_goma_rbe": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": false,
       "target_cpu": "arm64",
@@ -468,7 +512,7 @@
   "ios13-sdk-simulator": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -481,6 +525,7 @@
   "ios14-beta-simulator": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -493,7 +538,7 @@
   "ios14-sdk-simulator": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -503,6 +548,34 @@
       "use_goma": true
     }
   },
+  "lacros-amd64-generic-rel-fyi": {
+    "args_file": "//build/args/chromeos/amd64-generic.gni",
+    "gn_args": {
+      "chromeos_is_browser_only": true,
+      "cros_host_sysroot": "//build/linux/debian_sid_amd64-sysroot",
+      "cros_v8_snapshot_sysroot": "//build/linux/debian_sid_amd64-sysroot",
+      "enable_linux_installer": false,
+      "is_chromeos_device": true,
+      "ozone_platform_headless": true,
+      "ozone_platform_wayland": true,
+      "ozone_platform_x11": false,
+      "rtc_use_pipewire": false,
+      "target_os": "chromeos",
+      "use_custom_libcxx": false,
+      "use_custom_libcxx_for_host": true,
+      "use_evdev_gestures": false,
+      "use_gio": false,
+      "use_glib": false,
+      "use_goma": true,
+      "use_gtk": false,
+      "use_ozone": true,
+      "use_pangocairo": false,
+      "use_pulseaudio": false,
+      "use_system_libsync": false,
+      "use_v8_context_snapshot": false,
+      "use_vaapi": false
+    }
+  },
   "linux-annotator-rel": {
     "gn_args": {
       "is_component_build": false,
@@ -550,6 +623,17 @@
       "use_goma": true
     }
   },
+  "linux-blink-v8-oilpan": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "enable_blink_heap_use_v8_oilpan": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "use_goma": true
+    }
+  },
   "linux-chromeos-code-coverage": {
     "gn_args": {
       "ffmpeg_branding": "ChromeOS",
@@ -568,7 +652,8 @@
       "is_debug": false,
       "proprietary_codecs": true,
       "target_os": "chromeos",
-      "use_goma": true
+      "use_goma": true,
+      "use_javascript_coverage": true
     }
   },
   "linux-chromium-tests-staging-builder": {
@@ -588,21 +673,17 @@
       "use_goma": true
     }
   },
-  "linux-fieldtrial-rel": {
+  "linux-example-builder": {
     "gn_args": {
       "is_component_build": false,
       "is_debug": false,
-      "symbol_level": 1,
       "use_goma": true
     }
   },
-  "linux-inverse-fieldtrials-fyi-rel": {
+  "linux-fieldtrial-rel": {
     "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "invert_fieldtrials": true,
       "is_component_build": false,
       "is_debug": false,
-      "proprietary_codecs": true,
       "symbol_level": 1,
       "use_goma": true
     }
@@ -615,6 +696,7 @@
       "is_debug": false,
       "ozone_platform": "wayland",
       "ozone_platform_wayland": true,
+      "target_os": "chromeos",
       "use_goma": true,
       "use_gtk": false,
       "use_ozone": true
@@ -628,11 +710,33 @@
       "is_debug": false,
       "ozone_platform": "wayland",
       "ozone_platform_wayland": true,
+      "target_os": "chromeos",
       "use_goma": true,
       "use_gtk": false,
       "use_ozone": true
     }
   },
+  "linux-paeverywhere-x64-fyi-dbg": {
+    "gn_args": {
+      "is_component_build": true,
+      "is_debug": true,
+      "symbol_level": 1,
+      "target_cpu": "x64",
+      "use_allocator": "partition",
+      "use_goma": true
+    }
+  },
+  "linux-paeverywhere-x64-fyi-rel": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "is_component_build": false,
+      "is_debug": false,
+      "symbol_level": 1,
+      "target_cpu": "x64",
+      "use_allocator": "partition",
+      "use_goma": true
+    }
+  },
   "linux-perfetto-rel": {
     "gn_args": {
       "is_component_build": false,
@@ -664,7 +768,7 @@
       "use_goma": true
     }
   },
-  "linux-wpt-payments-fyi-rel": {
+  "linux-wpt-input-fyi-rel": {
     "gn_args": {
       "is_component_build": false,
       "is_debug": false,
@@ -689,6 +793,27 @@
       "use_goma": true
     }
   },
+  "mac-paeverywhere-x64-fyi-dbg": {
+    "gn_args": {
+      "is_component_build": true,
+      "is_debug": true,
+      "symbol_level": 1,
+      "target_cpu": "x64",
+      "use_allocator": "partition",
+      "use_goma": true
+    }
+  },
+  "mac-paeverywhere-x64-fyi-rel": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "is_component_build": false,
+      "is_debug": false,
+      "symbol_level": 1,
+      "target_cpu": "x64",
+      "use_allocator": "partition",
+      "use_goma": true
+    }
+  },
   "mac-upload-perfetto": {
     "gn_args": {
       "is_component_build": false,
@@ -777,17 +902,6 @@
       "use_goma": true
     }
   },
-  "win10-inverse-fieldtrials-fyi-rel": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "invert_fieldtrials": true,
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "symbol_level": 1,
-      "use_goma": true
-    }
-  },
   "win32-archive-rel-goma-rbe-canary": {
     "gn_args": {
       "is_component_build": false,
diff --git a/chromium/tools/mb/mb_config_expectations/chromium.goma.fyi.json b/chromium/tools/mb/mb_config_expectations/chromium.goma.fyi.json
index 318e43b0af6..9361b63580c 100644
--- a/chromium/tools/mb/mb_config_expectations/chromium.goma.fyi.json
+++ b/chromium/tools/mb/mb_config_expectations/chromium.goma.fyi.json
@@ -1,22 +1,4 @@
 {
-  "Linux Builder Goma Canary": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "use_goma": true
-    }
-  },
-  "Linux Builder Goma Latest Client": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "use_goma": true
-    }
-  },
   "Linux Builder Goma RBE Canary": {
     "gn_args": {
       "ffmpeg_branding": "Chrome",
@@ -35,46 +17,6 @@
       "use_goma": true
     }
   },
-  "Mac Builder (dbg) Goma Canary": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": true,
-      "is_debug": true,
-      "proprietary_codecs": true,
-      "symbol_level": 1,
-      "use_goma": true
-    }
-  },
-  "Mac Builder (dbg) Goma Canary (clobber)": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": true,
-      "is_debug": true,
-      "proprietary_codecs": true,
-      "symbol_level": 1,
-      "use_goma": true
-    }
-  },
-  "Mac Builder (dbg) Goma Latest Client": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": true,
-      "is_debug": true,
-      "proprietary_codecs": true,
-      "symbol_level": 1,
-      "use_goma": true
-    }
-  },
-  "Mac Builder (dbg) Goma Latest Client (clobber)": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": true,
-      "is_debug": true,
-      "proprietary_codecs": true,
-      "symbol_level": 1,
-      "use_goma": true
-    }
-  },
   "Mac Builder (dbg) Goma RBE Canary (clobber)": {
     "gn_args": {
       "ffmpeg_branding": "Chrome",
@@ -95,48 +37,6 @@
       "use_goma": true
     }
   },
-  "Mac Builder Goma Canary": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "symbol_level": 1,
-      "use_goma": true
-    }
-  },
-  "Mac Builder Goma Latest Client": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "symbol_level": 1,
-      "use_goma": true
-    }
-  },
-  "Win Builder (dbg) Goma Canary": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": true,
-      "is_debug": true,
-      "proprietary_codecs": true,
-      "symbol_level": 0,
-      "target_cpu": "x86",
-      "use_goma": true
-    }
-  },
-  "Win Builder (dbg) Goma Latest Client": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": true,
-      "is_debug": true,
-      "proprietary_codecs": true,
-      "symbol_level": 0,
-      "target_cpu": "x86",
-      "use_goma": true
-    }
-  },
   "Win Builder (dbg) Goma RBE Latest Client": {
     "gn_args": {
       "ffmpeg_branding": "Chrome",
@@ -148,28 +48,6 @@
       "use_goma": true
     }
   },
-  "Win Builder Goma Canary": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "symbol_level": 1,
-      "target_cpu": "x86",
-      "use_goma": true
-    }
-  },
-  "Win Builder Goma Latest Client": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "symbol_level": 1,
-      "target_cpu": "x86",
-      "use_goma": true
-    }
-  },
   "Win Builder Goma RBE Latest Client": {
     "gn_args": {
       "ffmpeg_branding": "Chrome",
@@ -181,68 +59,6 @@
       "use_goma": true
     }
   },
-  "Win7 Builder (dbg) Goma Canary": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": true,
-      "is_debug": true,
-      "proprietary_codecs": true,
-      "symbol_level": 0,
-      "target_cpu": "x86",
-      "use_goma": true
-    }
-  },
-  "Win7 Builder (dbg) Goma Latest Client": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": true,
-      "is_debug": true,
-      "proprietary_codecs": true,
-      "symbol_level": 0,
-      "target_cpu": "x86",
-      "use_goma": true
-    }
-  },
-  "Win7 Builder Goma Canary": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "symbol_level": 1,
-      "target_cpu": "x86",
-      "use_goma": true
-    }
-  },
-  "Win7 Builder Goma Latest Client": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "symbol_level": 1,
-      "target_cpu": "x86",
-      "use_goma": true
-    }
-  },
-  "android-archive-dbg-goma-canary": {
-    "gn_args": {
-      "is_component_build": true,
-      "is_debug": true,
-      "symbol_level": 1,
-      "target_os": "android",
-      "use_goma": true
-    }
-  },
-  "android-archive-dbg-goma-latest": {
-    "gn_args": {
-      "is_component_build": true,
-      "is_debug": true,
-      "symbol_level": 1,
-      "target_os": "android",
-      "use_goma": true
-    }
-  },
   "android-archive-dbg-goma-rbe-ats-canary": {
     "gn_args": {
       "is_component_build": true,
@@ -279,22 +95,6 @@
       "use_goma": true
     }
   },
-  "chromeos-amd64-generic-rel-goma-canary": {
-    "args_file": "//build/args/chromeos/amd64-generic.gni",
-    "gn_args": {
-      "is_chromeos_device": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
-  "chromeos-amd64-generic-rel-goma-latest": {
-    "args_file": "//build/args/chromeos/amd64-generic.gni",
-    "gn_args": {
-      "is_chromeos_device": true,
-      "ozone_platform_headless": true,
-      "use_goma": true
-    }
-  },
   "chromeos-amd64-generic-rel-goma-rbe-canary": {
     "args_file": "//build/args/chromeos/amd64-generic.gni",
     "gn_args": {
@@ -311,37 +111,11 @@
       "use_goma": true
     }
   },
-  "ios-device-goma-canary-clobber": {
-    "gn_args": {
-      "ios_code_signing_identity_description": "Apple Development",
-      "ios_enable_code_signing": false,
-      "is_component_build": false,
-      "is_debug": false,
-      "symbol_level": 0,
-      "target_cpu": "arm64",
-      "target_environment": "device",
-      "target_os": "ios",
-      "use_goma": true
-    }
-  },
-  "ios-device-goma-latest-clobber": {
-    "gn_args": {
-      "ios_code_signing_identity_description": "Apple Development",
-      "ios_enable_code_signing": false,
-      "is_component_build": false,
-      "is_debug": false,
-      "symbol_level": 0,
-      "target_cpu": "arm64",
-      "target_environment": "device",
-      "target_os": "ios",
-      "use_goma": true
-    }
-  },
   "ios-device-goma-rbe-canary-clobber": {
     "gn_args": {
       "ios_code_signing_identity_description": "Apple Development",
       "ios_enable_code_signing": false,
-      "ios_use_goma_rbe": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": false,
       "symbol_level": 0,
@@ -355,7 +129,7 @@
     "gn_args": {
       "ios_code_signing_identity_description": "Apple Development",
       "ios_enable_code_signing": false,
-      "ios_use_goma_rbe": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": false,
       "symbol_level": 0,
@@ -365,34 +139,6 @@
       "use_goma": true
     }
   },
-  "linux-archive-rel-goma-canary": {
-    "gn_args": {
-      "is_component_build": false,
-      "is_debug": false,
-      "use_goma": true
-    }
-  },
-  "linux-archive-rel-goma-canary-localoutputcache": {
-    "gn_args": {
-      "is_component_build": false,
-      "is_debug": false,
-      "use_goma": true
-    }
-  },
-  "linux-archive-rel-goma-latest": {
-    "gn_args": {
-      "is_component_build": false,
-      "is_debug": false,
-      "use_goma": true
-    }
-  },
-  "linux-archive-rel-goma-latest-localoutputcache": {
-    "gn_args": {
-      "is_component_build": false,
-      "is_debug": false,
-      "use_goma": true
-    }
-  },
   "linux-archive-rel-goma-rbe-ats-canary": {
     "gn_args": {
       "is_component_build": false,
@@ -421,42 +167,6 @@
       "use_goma": true
     }
   },
-  "mac-archive-rel-goma-canary": {
-    "gn_args": {
-      "enable_stripping": true,
-      "is_component_build": false,
-      "is_debug": false,
-      "symbol_level": 1,
-      "use_goma": true
-    }
-  },
-  "mac-archive-rel-goma-canary-localoutputcache": {
-    "gn_args": {
-      "enable_stripping": true,
-      "is_component_build": false,
-      "is_debug": false,
-      "symbol_level": 1,
-      "use_goma": true
-    }
-  },
-  "mac-archive-rel-goma-latest": {
-    "gn_args": {
-      "enable_stripping": true,
-      "is_component_build": false,
-      "is_debug": false,
-      "symbol_level": 1,
-      "use_goma": true
-    }
-  },
-  "mac-archive-rel-goma-latest-localoutputcache": {
-    "gn_args": {
-      "enable_stripping": true,
-      "is_component_build": false,
-      "is_debug": false,
-      "symbol_level": 1,
-      "use_goma": true
-    }
-  },
   "mac-archive-rel-goma-rbe-canary": {
     "gn_args": {
       "enable_stripping": true,
@@ -474,25 +184,5 @@
       "symbol_level": 1,
       "use_goma": true
     }
-  },
-  "win32-archive-rel-goma-canary-localoutputcache": {
-    "gn_args": {
-      "is_component_build": false,
-      "is_debug": false,
-      "skip_archive_compression": false,
-      "symbol_level": 1,
-      "target_cpu": "x86",
-      "use_goma": true
-    }
-  },
-  "win32-archive-rel-goma-latest-localoutputcache": {
-    "gn_args": {
-      "is_component_build": false,
-      "is_debug": false,
-      "skip_archive_compression": false,
-      "symbol_level": 1,
-      "target_cpu": "x86",
-      "use_goma": true
-    }
   }
 }
\ No newline at end of file
diff --git a/chromium/tools/mb/mb_config_expectations/chromium.goma.json b/chromium/tools/mb/mb_config_expectations/chromium.goma.json
index d9b484f851b..a0336917eed 100644
--- a/chromium/tools/mb/mb_config_expectations/chromium.goma.json
+++ b/chromium/tools/mb/mb_config_expectations/chromium.goma.json
@@ -153,6 +153,7 @@
     "gn_args": {
       "ios_code_signing_identity_description": "Apple Development",
       "ios_enable_code_signing": false,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": false,
       "symbol_level": 0,
diff --git a/chromium/tools/mb/mb_config_expectations/chromium.gpu.fyi.json b/chromium/tools/mb/mb_config_expectations/chromium.gpu.fyi.json
index 4b421acb39f..f5b59fe36d8 100644
--- a/chromium/tools/mb/mb_config_expectations/chromium.gpu.fyi.json
+++ b/chromium/tools/mb/mb_config_expectations/chromium.gpu.fyi.json
@@ -15,8 +15,8 @@
   },
   "Android FYI 32 Vk Release (Pixel 2)": {
     "gn_args": {
-      "android32_ndk_api_level": 26,
-      "android64_ndk_api_level": 26,
+      "android32_ndk_api_level": 29,
+      "android64_ndk_api_level": 29,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
       "ffmpeg_branding": "Chrome",
@@ -31,8 +31,8 @@
   },
   "Android FYI 32 dEQP Vk Release (Pixel 2)": {
     "gn_args": {
-      "android32_ndk_api_level": 26,
-      "android64_ndk_api_level": 26,
+      "android32_ndk_api_level": 29,
+      "android64_ndk_api_level": 29,
       "build_angle_deqp_tests": true,
       "dcheck_always_on": true,
       "ffmpeg_branding": "Chrome",
@@ -46,8 +46,8 @@
   },
   "Android FYI 64 Vk Release (Pixel 2)": {
     "gn_args": {
-      "android32_ndk_api_level": 26,
-      "android64_ndk_api_level": 26,
+      "android32_ndk_api_level": 29,
+      "android64_ndk_api_level": 29,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
       "ffmpeg_branding": "Chrome",
@@ -63,8 +63,8 @@
   },
   "Android FYI 64 dEQP Vk Release (Pixel 2)": {
     "gn_args": {
-      "android32_ndk_api_level": 26,
-      "android64_ndk_api_level": 26,
+      "android32_ndk_api_level": 29,
+      "android64_ndk_api_level": 29,
       "build_angle_deqp_tests": true,
       "dcheck_always_on": true,
       "ffmpeg_branding": "Chrome",
@@ -131,7 +131,7 @@
       "use_static_angle": true
     }
   },
-  "Android FYI Release (Nexus 6P)": {
+  "Android FYI Release (Nexus 9)": {
     "gn_args": {
       "dcheck_always_on": true,
       "ffmpeg_branding": "Chrome",
@@ -145,7 +145,7 @@
       "use_static_angle": true
     }
   },
-  "Android FYI Release (Nexus 9)": {
+  "Android FYI Release (Pixel 2)": {
     "gn_args": {
       "dcheck_always_on": true,
       "ffmpeg_branding": "Chrome",
@@ -153,13 +153,12 @@
       "is_debug": false,
       "proprietary_codecs": true,
       "symbol_level": 1,
-      "target_cpu": "arm64",
       "target_os": "android",
       "use_goma": true,
       "use_static_angle": true
     }
   },
-  "Android FYI Release (Pixel 2)": {
+  "Android FYI Release (Pixel 4)": {
     "gn_args": {
       "dcheck_always_on": true,
       "ffmpeg_branding": "Chrome",
@@ -241,11 +240,27 @@
       "use_goma": true
     }
   },
+  "GPU FYI Lacros x64 Builder": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "ozone_platform": "headless",
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_bundled_weston": true,
+      "use_goma": true,
+      "use_ozone": true,
+      "use_x11": false
+    }
+  },
   "GPU FYI Linux Builder": {
     "gn_args": {
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -259,6 +274,7 @@
     "gn_args": {
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": true,
@@ -303,6 +319,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -316,6 +333,7 @@
     "gn_args": {
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": true,
@@ -337,8 +355,8 @@
   },
   "GPU FYI Perf Android 64 Builder": {
     "gn_args": {
-      "android32_ndk_api_level": 26,
-      "android64_ndk_api_level": 26,
+      "android32_ndk_api_level": 29,
+      "android64_ndk_api_level": 29,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": false,
       "ffmpeg_branding": "Chrome",
@@ -357,6 +375,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -371,6 +390,7 @@
     "gn_args": {
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": true,
@@ -397,6 +417,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -410,6 +431,7 @@
     "gn_args": {
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": true,
@@ -424,6 +446,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "enable_vulkan": true,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
@@ -438,6 +461,7 @@
     "gn_args": {
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
+      "enable_nacl": false,
       "enable_vulkan": true,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
@@ -463,6 +487,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -522,6 +547,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
diff --git a/chromium/tools/mb/mb_config_expectations/chromium.infra.codesearch.json b/chromium/tools/mb/mb_config_expectations/chromium.infra.codesearch.json
index f5f71f51318..5de44b2b099 100644
--- a/chromium/tools/mb/mb_config_expectations/chromium.infra.codesearch.json
+++ b/chromium/tools/mb/mb_config_expectations/chromium.infra.codesearch.json
@@ -39,11 +39,12 @@
       "clang_use_chrome_plugins": false,
       "enable_kythe_annotations": true,
       "is_clang": true,
-      "is_component_build": true,
+      "is_component_build": false,
       "is_debug": true,
       "ozone_platform": "wayland",
       "ozone_platform_wayland": true,
       "symbol_level": 1,
+      "target_os": "chromeos",
       "use_goma": true,
       "use_gtk": false,
       "use_ozone": true
diff --git a/chromium/tools/mb/mb_config_expectations/chromium.linux.json b/chromium/tools/mb/mb_config_expectations/chromium.linux.json
index e0d7469ca02..787d1792a1e 100644
--- a/chromium/tools/mb/mb_config_expectations/chromium.linux.json
+++ b/chromium/tools/mb/mb_config_expectations/chromium.linux.json
@@ -148,6 +148,14 @@
       "use_goma": true
     }
   },
+  "linux-extended-tracing-rel": {
+    "gn_args": {
+      "extended_tracing_enabled": true,
+      "is_component_build": false,
+      "is_debug": false,
+      "use_goma": true
+    }
+  },
   "linux-gcc-rel": {
     "gn_args": {
       "is_clang": false,
diff --git a/chromium/tools/mb/mb_config_expectations/chromium.mac.json b/chromium/tools/mb/mb_config_expectations/chromium.mac.json
index 1a31f223e68..c7193abfffd 100644
--- a/chromium/tools/mb/mb_config_expectations/chromium.mac.json
+++ b/chromium/tools/mb/mb_config_expectations/chromium.mac.json
@@ -24,7 +24,7 @@
     "gn_args": {
       "ios_code_signing_identity_description": "Apple Development",
       "ios_enable_code_signing": false,
-      "ios_use_goma_rbe": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": false,
       "symbol_level": 0,
@@ -37,7 +37,7 @@
   "ios-simulator": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -50,6 +50,7 @@
   "ios-simulator-full-configs": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -62,7 +63,7 @@
   "ios-simulator-noncq": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
diff --git a/chromium/tools/mb/mb_config_expectations/chromium.memory.json b/chromium/tools/mb/mb_config_expectations/chromium.memory.json
index a683fab1df1..427a7250db5 100644
--- a/chromium/tools/mb/mb_config_expectations/chromium.memory.json
+++ b/chromium/tools/mb/mb_config_expectations/chromium.memory.json
@@ -134,6 +134,15 @@
       "use_goma": true
     }
   },
+  "linux-ubsan-vptr": {
+    "gn_args": {
+      "is_component_build": false,
+      "is_debug": false,
+      "is_ubsan_no_recover": true,
+      "is_ubsan_vptr": true,
+      "use_goma": true
+    }
+  },
   "win-asan": {
     "gn_args": {
       "enable_ipc_fuzzer": true,
diff --git a/chromium/tools/mb/mb_config_expectations/chromium.mojo.json b/chromium/tools/mb/mb_config_expectations/chromium.mojo.json
index b73f2bf6cad..b14f9c737c9 100644
--- a/chromium/tools/mb/mb_config_expectations/chromium.mojo.json
+++ b/chromium/tools/mb/mb_config_expectations/chromium.mojo.json
@@ -42,19 +42,6 @@
       "use_goma": true
     }
   },
-  "android-mojo-webview-rel": {
-    "gn_args": {
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "strip_debug_info": true,
-      "symbol_level": 1,
-      "target_cpu": "arm64",
-      "target_os": "android",
-      "use_goma": true
-    }
-  },
   "mac-mojo-rel": {
     "gn_args": {
       "dcheck_always_on": true,
diff --git a/chromium/tools/mb/mb_config_expectations/chromium.perf.fyi.json b/chromium/tools/mb/mb_config_expectations/chromium.perf.fyi.json
index 8625faf6094..a6136381710 100644
--- a/chromium/tools/mb/mb_config_expectations/chromium.perf.fyi.json
+++ b/chromium/tools/mb/mb_config_expectations/chromium.perf.fyi.json
@@ -1,6 +1,7 @@
 {
   "android-cfi-builder-perf-fyi": {
     "gn_args": {
+      "clang_use_default_sample_profile": false,
       "ffmpeg_branding": "Chrome",
       "is_chrome_branded": true,
       "is_official_build": true,
@@ -14,6 +15,7 @@
   },
   "android_arm64-cfi-builder-perf-fyi": {
     "gn_args": {
+      "clang_use_default_sample_profile": false,
       "ffmpeg_branding": "Chrome",
       "is_chrome_branded": true,
       "is_official_build": true,
@@ -29,9 +31,27 @@
   "chromeos-kevin-builder-perf-fyi": {
     "args_file": "//build/args/chromeos/kevin.gni",
     "gn_args": {
+      "exclude_unwind_tables": false,
+      "is_chrome_branded": true,
       "is_chromeos_device": true,
+      "is_official_build": true,
       "ozone_platform_headless": true,
       "use_goma": true
     }
+  },
+  "fuchsia-builder-perf-fyi": {
+    "gn_args": {
+      "ffmpeg_branding": "Chrome",
+      "fuchsia_additional_boot_images": [
+        "//third_party/fuchsia-sdk/images-internal/astro-release/"
+      ],
+      "is_chrome_branded": true,
+      "is_official_build": true,
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "target_cpu": "arm64",
+      "target_os": "fuchsia",
+      "use_goma": true
+    }
   }
 }
\ No newline at end of file
diff --git a/chromium/tools/mb/mb_config_expectations/chromium.perf.json b/chromium/tools/mb/mb_config_expectations/chromium.perf.json
index 0533de99b94..90af3c4f6c9 100644
--- a/chromium/tools/mb/mb_config_expectations/chromium.perf.json
+++ b/chromium/tools/mb/mb_config_expectations/chromium.perf.json
@@ -1,10 +1,13 @@
 {
   "Android Builder Perf": {
     "gn_args": {
+      "chrome_pgo_phase": 0,
+      "clang_use_default_sample_profile": false,
       "ffmpeg_branding": "Chrome",
       "is_chrome_branded": true,
       "is_official_build": true,
       "proprietary_codecs": true,
+      "strip_absolute_paths_from_debug_symbols": true,
       "symbol_level": 1,
       "target_os": "android",
       "use_goma": true
@@ -12,10 +15,13 @@
   },
   "Android arm64 Builder Perf": {
     "gn_args": {
+      "chrome_pgo_phase": 0,
+      "clang_use_default_sample_profile": false,
       "ffmpeg_branding": "Chrome",
       "is_chrome_branded": true,
       "is_official_build": true,
       "proprietary_codecs": true,
+      "strip_absolute_paths_from_debug_symbols": true,
       "symbol_level": 1,
       "target_cpu": "arm64",
       "target_os": "android",
@@ -24,10 +30,13 @@
   },
   "android-builder-perf": {
     "gn_args": {
+      "chrome_pgo_phase": 0,
+      "clang_use_default_sample_profile": false,
       "ffmpeg_branding": "Chrome",
       "is_chrome_branded": true,
       "is_official_build": true,
       "proprietary_codecs": true,
+      "strip_absolute_paths_from_debug_symbols": true,
       "symbol_level": 1,
       "target_os": "android",
       "use_goma": true
@@ -35,10 +44,13 @@
   },
   "android_arm64-builder-perf": {
     "gn_args": {
+      "chrome_pgo_phase": 0,
+      "clang_use_default_sample_profile": false,
       "ffmpeg_branding": "Chrome",
       "is_chrome_branded": true,
       "is_official_build": true,
       "proprietary_codecs": true,
+      "strip_absolute_paths_from_debug_symbols": true,
       "symbol_level": 1,
       "target_cpu": "arm64",
       "target_os": "android",
@@ -52,6 +64,7 @@
       "cros_host_sysroot": "//build/linux/debian_sid_amd64-sysroot",
       "cros_v8_snapshot_sysroot": "//build/linux/debian_sid_amd64-sysroot",
       "enable_linux_installer": false,
+      "is_cfi": true,
       "is_chrome_branded": true,
       "is_chromeos_device": true,
       "is_official_build": true,
@@ -59,7 +72,8 @@
       "ozone_platform_wayland": true,
       "ozone_platform_x11": false,
       "rtc_use_pipewire": false,
-      "target_os": "linux",
+      "symbol_level": 1,
+      "target_os": "chromeos",
       "use_custom_libcxx": false,
       "use_custom_libcxx_for_host": true,
       "use_evdev_gestures": false,
@@ -71,14 +85,28 @@
       "use_pangocairo": false,
       "use_pulseaudio": false,
       "use_system_libsync": false,
+      "use_thin_lto": true,
       "use_v8_context_snapshot": false,
       "use_vaapi": false
     }
   },
   "linux-builder-perf": {
     "gn_args": {
+      "chrome_pgo_phase": 0,
+      "is_chrome_branded": true,
+      "is_official_build": true,
+      "strip_absolute_paths_from_debug_symbols": true,
+      "symbol_level": 1,
+      "use_gnome_keyring": false,
+      "use_goma": true
+    }
+  },
+  "linux-builder-perf-rel": {
+    "gn_args": {
+      "chrome_pgo_phase": 0,
       "is_chrome_branded": true,
       "is_official_build": true,
+      "strip_absolute_paths_from_debug_symbols": true,
       "symbol_level": 1,
       "use_gnome_keyring": false,
       "use_goma": true
@@ -86,10 +114,12 @@
   },
   "mac-arm-builder-perf": {
     "gn_args": {
+      "chrome_pgo_phase": 0,
       "enable_keystone_registration_framework": false,
       "ignore_missing_widevine_signing_cert": true,
       "is_chrome_branded": true,
       "is_official_build": true,
+      "strip_absolute_paths_from_debug_symbols": true,
       "symbol_level": 2,
       "target_cpu": "arm64",
       "use_goma": true
@@ -97,18 +127,22 @@
   },
   "mac-builder-perf": {
     "gn_args": {
+      "chrome_pgo_phase": 0,
       "enable_keystone_registration_framework": false,
       "ignore_missing_widevine_signing_cert": true,
       "is_chrome_branded": true,
       "is_official_build": true,
+      "strip_absolute_paths_from_debug_symbols": true,
       "symbol_level": 2,
       "use_goma": true
     }
   },
   "win32-builder-perf": {
     "gn_args": {
+      "chrome_pgo_phase": 0,
       "is_chrome_branded": true,
       "is_official_build": true,
+      "strip_absolute_paths_from_debug_symbols": true,
       "symbol_level": 1,
       "target_cpu": "x86",
       "use_goma": true
@@ -116,8 +150,10 @@
   },
   "win64-builder-perf": {
     "gn_args": {
+      "chrome_pgo_phase": 0,
       "is_chrome_branded": true,
       "is_official_build": true,
+      "strip_absolute_paths_from_debug_symbols": true,
       "symbol_level": 1,
       "use_goma": true
     }
diff --git a/chromium/tools/mb/mb_config_expectations/chromium.updater.json b/chromium/tools/mb/mb_config_expectations/chromium.updater.json
index 5d1251890d2..2b7c3fa6654 100644
--- a/chromium/tools/mb/mb_config_expectations/chromium.updater.json
+++ b/chromium/tools/mb/mb_config_expectations/chromium.updater.json
@@ -1,14 +1,55 @@
 {
+  "mac-updater-builder-dbg": {
+    "gn_args": {
+      "is_component_build": true,
+      "is_debug": true,
+      "is_google_branded": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
   "mac-updater-builder-rel": {
     "gn_args": {
+      "is_component_build": false,
       "is_debug": false,
-      "is_google_branded": true
+      "is_google_branded": true,
+      "use_goma": true
+    }
+  },
+  "win-updater-builder-dbg": {
+    "gn_args": {
+      "is_component_build": true,
+      "is_debug": true,
+      "is_google_branded": true,
+      "symbol_level": 1,
+      "use_goma": true
     }
   },
   "win-updater-builder-rel": {
     "gn_args": {
+      "is_component_build": false,
+      "is_debug": false,
+      "is_google_branded": true,
+      "use_goma": true
+    }
+  },
+  "win32-updater-builder-dbg": {
+    "gn_args": {
+      "is_component_build": true,
+      "is_debug": true,
+      "is_google_branded": true,
+      "symbol_level": 1,
+      "target_cpu": "x86",
+      "use_goma": true
+    }
+  },
+  "win32-updater-builder-rel": {
+    "gn_args": {
+      "is_component_build": false,
       "is_debug": false,
-      "is_google_branded": true
+      "is_google_branded": true,
+      "target_cpu": "x86",
+      "use_goma": true
     }
   }
 }
\ No newline at end of file
diff --git a/chromium/tools/mb/mb_config_expectations/internal.chrome.fyi.json b/chromium/tools/mb/mb_config_expectations/internal.chrome.fyi.json
index 5e73395115a..fc5a748d81d 100644
--- a/chromium/tools/mb/mb_config_expectations/internal.chrome.fyi.json
+++ b/chromium/tools/mb/mb_config_expectations/internal.chrome.fyi.json
@@ -11,7 +11,7 @@
       "ozone_platform_wayland": true,
       "ozone_platform_x11": false,
       "rtc_use_pipewire": false,
-      "target_os": "linux",
+      "target_os": "chromeos",
       "use_custom_libcxx": false,
       "use_custom_libcxx_for_host": true,
       "use_evdev_gestures": false,
diff --git a/chromium/tools/mb/mb_config_expectations/internal.chromeos.fyi.json b/chromium/tools/mb/mb_config_expectations/internal.chromeos.fyi.json
index 66f34d8beb5..44dcb30efb9 100644
--- a/chromium/tools/mb/mb_config_expectations/internal.chromeos.fyi.json
+++ b/chromium/tools/mb/mb_config_expectations/internal.chromeos.fyi.json
@@ -11,6 +11,19 @@
       "use_real_dbus_clients": false
     }
   },
+  "chromeos-betty-pi-arc-chrome-dchecks": {
+    "args_file": "//build/args/chromeos/betty-pi-arc.gni",
+    "gn_args": {
+      "dcheck_always_on": true,
+      "exclude_unwind_tables": false,
+      "is_chrome_branded": true,
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true,
+      "use_real_dbus_clients": false
+    }
+  },
   "chromeos-eve-arc-r-chrome": {
     "args_file": "//build/args/chromeos/eve-arc-r.gni",
     "gn_args": {
@@ -21,5 +34,38 @@
       "ozone_platform_headless": true,
       "use_goma": true
     }
+  },
+  "lacros-amd64-generic-chrome-fyi": {
+    "args_file": "//build/args/chromeos/amd64-generic.gni",
+    "gn_args": {
+      "chromeos_is_browser_only": true,
+      "cros_host_sysroot": "//build/linux/debian_sid_amd64-sysroot",
+      "cros_v8_snapshot_sysroot": "//build/linux/debian_sid_amd64-sysroot",
+      "enable_linux_installer": false,
+      "is_cfi": true,
+      "is_chrome_branded": true,
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "ozone_platform_wayland": true,
+      "ozone_platform_x11": false,
+      "rtc_use_pipewire": false,
+      "symbol_level": 1,
+      "target_os": "chromeos",
+      "use_custom_libcxx": false,
+      "use_custom_libcxx_for_host": true,
+      "use_evdev_gestures": false,
+      "use_gio": false,
+      "use_glib": false,
+      "use_goma": true,
+      "use_gtk": false,
+      "use_ozone": true,
+      "use_pangocairo": false,
+      "use_pulseaudio": false,
+      "use_system_libsync": false,
+      "use_thin_lto": true,
+      "use_v8_context_snapshot": false,
+      "use_vaapi": false
+    }
   }
 }
\ No newline at end of file
diff --git a/chromium/tools/mb/mb_config_expectations/official.chrome.continuous.json b/chromium/tools/mb/mb_config_expectations/official.chrome.continuous.json
index 0c0f8ad5554..5e9ade0ea5b 100644
--- a/chromium/tools/mb/mb_config_expectations/official.chrome.continuous.json
+++ b/chromium/tools/mb/mb_config_expectations/official.chrome.continuous.json
@@ -6,6 +6,7 @@
       "cros_host_sysroot": "//build/linux/debian_sid_amd64-sysroot",
       "cros_v8_snapshot_sysroot": "//build/linux/debian_sid_amd64-sysroot",
       "enable_linux_installer": false,
+      "is_cfi": true,
       "is_chrome_branded": true,
       "is_chromeos_device": true,
       "is_official_build": true,
@@ -13,7 +14,8 @@
       "ozone_platform_wayland": true,
       "ozone_platform_x11": false,
       "rtc_use_pipewire": false,
-      "target_os": "linux",
+      "symbol_level": 1,
+      "target_os": "chromeos",
       "use_custom_libcxx": false,
       "use_custom_libcxx_for_host": true,
       "use_evdev_gestures": false,
@@ -25,6 +27,7 @@
       "use_pangocairo": false,
       "use_pulseaudio": false,
       "use_system_libsync": false,
+      "use_thin_lto": true,
       "use_v8_context_snapshot": false,
       "use_vaapi": false
     }
diff --git a/chromium/tools/mb/mb_config_expectations/official.chrome.json b/chromium/tools/mb/mb_config_expectations/official.chrome.json
index d7f17774ed7..460d39f706a 100644
--- a/chromium/tools/mb/mb_config_expectations/official.chrome.json
+++ b/chromium/tools/mb/mb_config_expectations/official.chrome.json
@@ -1,4 +1,22 @@
 {
+  "fuchsia-arm64": {
+    "args_file": "//build/custom_args.gn",
+    "gn_args": {
+      "is_chrome_branded": true,
+      "is_official_build": true,
+      "target_cpu": "arm64",
+      "target_os": "fuchsia"
+    }
+  },
+  "fuchsia-x64": {
+    "args_file": "//build/custom_args.gn",
+    "gn_args": {
+      "is_chrome_branded": true,
+      "is_official_build": true,
+      "target_cpu": "x64",
+      "target_os": "fuchsia"
+    }
+  },
   "lacros64": {
     "args_file": "//build/args/chromeos/amd64-generic.gni",
     "gn_args": {
@@ -6,6 +24,7 @@
       "cros_host_sysroot": "//build/linux/debian_sid_amd64-sysroot",
       "cros_v8_snapshot_sysroot": "//build/linux/debian_sid_amd64-sysroot",
       "enable_linux_installer": false,
+      "is_cfi": true,
       "is_chrome_branded": true,
       "is_chromeos_device": true,
       "is_official_build": true,
@@ -13,7 +32,8 @@
       "ozone_platform_wayland": true,
       "ozone_platform_x11": false,
       "rtc_use_pipewire": false,
-      "target_os": "linux",
+      "symbol_level": 1,
+      "target_os": "chromeos",
       "use_custom_libcxx": false,
       "use_custom_libcxx_for_host": true,
       "use_evdev_gestures": false,
@@ -25,6 +45,7 @@
       "use_pangocairo": false,
       "use_pulseaudio": false,
       "use_system_libsync": false,
+      "use_thin_lto": true,
       "use_v8_context_snapshot": false,
       "use_vaapi": false
     }
diff --git a/chromium/tools/mb/mb_config_expectations/tryserver.chrome.json b/chromium/tools/mb/mb_config_expectations/tryserver.chrome.json
index 7aa42fbf7e5..13701124f4e 100644
--- a/chromium/tools/mb/mb_config_expectations/tryserver.chrome.json
+++ b/chromium/tools/mb/mb_config_expectations/tryserver.chrome.json
@@ -51,6 +51,19 @@
       "use_real_dbus_clients": false
     }
   },
+  "chromeos-betty-pi-arc-chrome-dchecks": {
+    "args_file": "//build/args/chromeos/betty-pi-arc.gni",
+    "gn_args": {
+      "dcheck_always_on": true,
+      "exclude_unwind_tables": false,
+      "is_chrome_branded": true,
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "use_goma": true,
+      "use_real_dbus_clients": false
+    }
+  },
   "chromeos-eve-arc-r-chrome": {
     "args_file": "//build/args/chromeos/eve-arc-r.gni",
     "gn_args": {
@@ -106,6 +119,39 @@
       "use_goma": true
     }
   },
+  "lacros-amd64-generic-chrome": {
+    "args_file": "//build/args/chromeos/amd64-generic.gni",
+    "gn_args": {
+      "chromeos_is_browser_only": true,
+      "cros_host_sysroot": "//build/linux/debian_sid_amd64-sysroot",
+      "cros_v8_snapshot_sysroot": "//build/linux/debian_sid_amd64-sysroot",
+      "enable_linux_installer": false,
+      "is_cfi": true,
+      "is_chrome_branded": true,
+      "is_chromeos_device": true,
+      "is_official_build": true,
+      "ozone_platform_headless": true,
+      "ozone_platform_wayland": true,
+      "ozone_platform_x11": false,
+      "rtc_use_pipewire": false,
+      "symbol_level": 1,
+      "target_os": "chromeos",
+      "use_custom_libcxx": false,
+      "use_custom_libcxx_for_host": true,
+      "use_evdev_gestures": false,
+      "use_gio": false,
+      "use_glib": false,
+      "use_goma": true,
+      "use_gtk": false,
+      "use_ozone": true,
+      "use_pangocairo": false,
+      "use_pulseaudio": false,
+      "use_system_libsync": false,
+      "use_thin_lto": true,
+      "use_v8_context_snapshot": false,
+      "use_vaapi": false
+    }
+  },
   "linux-chrome": {
     "gn_args": {
       "is_chrome_branded": true,
diff --git a/chromium/tools/mb/mb_config_expectations/tryserver.chrome.pgo.json b/chromium/tools/mb/mb_config_expectations/tryserver.chrome.pgo.json
new file mode 100644
index 00000000000..1d89704a012
--- /dev/null
+++ b/chromium/tools/mb/mb_config_expectations/tryserver.chrome.pgo.json
@@ -0,0 +1,53 @@
+{
+  "linux-pgo": {
+    "gn_args": {
+      "chrome_pgo_phase": 1,
+      "is_chrome_branded": true,
+      "is_component_build": false,
+      "is_official_build": true,
+      "strip_absolute_paths_from_debug_symbols": true,
+      "symbol_level": 0,
+      "use_goma": true
+    }
+  },
+  "mac-pgo": {
+    "gn_args": {
+      "chrome_pgo_phase": 1,
+      "enable_keystone_registration_framework": false,
+      "enable_widevine_cdm_host_verification": false,
+      "ignore_missing_widevine_signing_cert": true,
+      "is_chrome_branded": true,
+      "is_component_build": false,
+      "is_official_build": true,
+      "strip_absolute_paths_from_debug_symbols": true,
+      "symbol_level": 0,
+      "use_goma": true
+    }
+  },
+  "win32-pgo": {
+    "gn_args": {
+      "chrome_pgo_phase": 1,
+      "enable_resource_allowlist_generation": false,
+      "is_chrome_branded": true,
+      "is_component_build": false,
+      "is_official_build": true,
+      "strip_absolute_paths_from_debug_symbols": true,
+      "symbol_level": 0,
+      "target_cpu": "x86",
+      "use_goma": true
+    }
+  },
+  "win64-pgo": {
+    "gn_args": {
+      "chrome_pgo_phase": 1,
+      "enable_resource_allowlist_generation": false,
+      "is_chrome_branded": true,
+      "is_component_build": false,
+      "is_official_build": true,
+      "strip_absolute_paths_from_debug_symbols": true,
+      "symbol_level": 0,
+      "target_cpu": "x64",
+      "use_goma": true
+    }
+  }
+}
\ No newline at end of file
diff --git a/chromium/tools/mb/mb_config_expectations/tryserver.chromium.android.json b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.android.json
index 705525915b8..eee5b5747bc 100644
--- a/chromium/tools/mb/mb_config_expectations/tryserver.chromium.android.json
+++ b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.android.json
@@ -386,6 +386,23 @@
       "use_goma": true
     }
   },
+  "android-weblayer-pie-x86-wpt-fyi-rel": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "disable_android_lint": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "strip_debug_info": true,
+      "symbol_level": 1,
+      "system_webview_package_name": "com.google.android.webview",
+      "target_cpu": "x86",
+      "target_os": "android",
+      "use_errorprone_java_compiler": false,
+      "use_goma": true
+    }
+  },
   "android-webview-marshmallow-arm64-dbg": {
     "gn_args": {
       "dcheck_always_on": true,
@@ -740,20 +757,6 @@
       "use_static_angle": true
     }
   },
-  "gpu-fyi-try-android-m-nexus-6p-64": {
-    "gn_args": {
-      "dcheck_always_on": true,
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "symbol_level": 1,
-      "target_cpu": "arm64",
-      "target_os": "android",
-      "use_goma": true,
-      "use_static_angle": true
-    }
-  },
   "gpu-fyi-try-android-m-nexus-9-64": {
     "gn_args": {
       "dcheck_always_on": true,
@@ -810,8 +813,8 @@
   },
   "gpu-fyi-try-android-q-pixel-2-deqp-vk-32": {
     "gn_args": {
-      "android32_ndk_api_level": 26,
-      "android64_ndk_api_level": 26,
+      "android32_ndk_api_level": 29,
+      "android64_ndk_api_level": 29,
       "build_angle_deqp_tests": true,
       "dcheck_always_on": true,
       "ffmpeg_branding": "Chrome",
@@ -825,8 +828,8 @@
   },
   "gpu-fyi-try-android-q-pixel-2-deqp-vk-64": {
     "gn_args": {
-      "android32_ndk_api_level": 26,
-      "android64_ndk_api_level": 26,
+      "android32_ndk_api_level": 29,
+      "android64_ndk_api_level": 29,
       "build_angle_deqp_tests": true,
       "dcheck_always_on": true,
       "ffmpeg_branding": "Chrome",
@@ -841,8 +844,8 @@
   },
   "gpu-fyi-try-android-q-pixel-2-vk-32": {
     "gn_args": {
-      "android32_ndk_api_level": 26,
-      "android64_ndk_api_level": 26,
+      "android32_ndk_api_level": 29,
+      "android64_ndk_api_level": 29,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
       "ffmpeg_branding": "Chrome",
@@ -857,8 +860,8 @@
   },
   "gpu-fyi-try-android-q-pixel-2-vk-64": {
     "gn_args": {
-      "android32_ndk_api_level": 26,
-      "android64_ndk_api_level": 26,
+      "android32_ndk_api_level": 29,
+      "android64_ndk_api_level": 29,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
       "ffmpeg_branding": "Chrome",
@@ -872,6 +875,19 @@
       "use_static_angle": true
     }
   },
+  "gpu-fyi-try-android-r-pixel-4-32": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "target_os": "android",
+      "use_goma": true,
+      "use_static_angle": true
+    }
+  },
   "gpu-try-android-m-nexus-5x-64": {
     "gn_args": {
       "dcheck_always_on": true,
diff --git a/chromium/tools/mb/mb_config_expectations/tryserver.chromium.angle.json b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.angle.json
index 3b50d9f327d..ebf11c26c8c 100644
--- a/chromium/tools/mb/mb_config_expectations/tryserver.chromium.angle.json
+++ b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.angle.json
@@ -29,8 +29,8 @@
   },
   "android_angle_vk32_deqp_rel_ng": {
     "gn_args": {
-      "android32_ndk_api_level": 26,
-      "android64_ndk_api_level": 26,
+      "android32_ndk_api_level": 29,
+      "android64_ndk_api_level": 29,
       "build_angle_deqp_tests": true,
       "dcheck_always_on": true,
       "ffmpeg_branding": "Chrome",
@@ -44,8 +44,8 @@
   },
   "android_angle_vk32_rel_ng": {
     "gn_args": {
-      "android32_ndk_api_level": 26,
-      "android64_ndk_api_level": 26,
+      "android32_ndk_api_level": 29,
+      "android64_ndk_api_level": 29,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
       "ffmpeg_branding": "Chrome",
@@ -60,8 +60,8 @@
   },
   "android_angle_vk64_deqp_rel_ng": {
     "gn_args": {
-      "android32_ndk_api_level": 26,
-      "android64_ndk_api_level": 26,
+      "android32_ndk_api_level": 29,
+      "android64_ndk_api_level": 29,
       "build_angle_deqp_tests": true,
       "dcheck_always_on": true,
       "ffmpeg_branding": "Chrome",
@@ -76,8 +76,8 @@
   },
   "android_angle_vk64_rel_ng": {
     "gn_args": {
-      "android32_ndk_api_level": 26,
-      "android64_ndk_api_level": 26,
+      "android32_ndk_api_level": 29,
+      "android64_ndk_api_level": 29,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
       "ffmpeg_branding": "Chrome",
@@ -96,6 +96,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -106,11 +107,30 @@
       "use_goma": true
     }
   },
+  "ios-angle-try-intel": {
+    "gn_args": {
+      "build_angle_deqp_tests": true,
+      "build_angle_gles1_conform_tests": true,
+      "build_angle_trace_perf_tests": true,
+      "dcheck_always_on": true,
+      "enable_nacl": false,
+      "enable_run_ios_unittests_with_xctest": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
+      "is_component_build": false,
+      "is_debug": false,
+      "symbol_level": 1,
+      "target_cpu": "x64",
+      "target_environment": "simulator",
+      "target_os": "ios",
+      "use_goma": true
+    }
+  },
   "linux-angle-rel": {
     "gn_args": {
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -150,11 +170,24 @@
       "use_x11": false
     }
   },
+  "mac-angle-chromium-try": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "mac_deterministic_build": true,
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
   "mac-angle-rel": {
     "gn_args": {
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -164,6 +197,30 @@
       "use_goma": true
     }
   },
+  "mac-angle-try": {
+    "gn_args": {
+      "build_angle_deqp_tests": true,
+      "build_angle_gles1_conform_tests": true,
+      "build_angle_trace_perf_tests": true,
+      "dcheck_always_on": true,
+      "enable_nacl": false,
+      "is_component_build": true,
+      "is_debug": false,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
+  "win-angle-chromium-x64-try": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
   "win-angle-deqp-rel-32": {
     "gn_args": {
       "build_angle_deqp_tests": true,
@@ -190,6 +247,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -205,6 +263,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -213,5 +272,18 @@
       "symbol_level": 1,
       "use_goma": true
     }
+  },
+  "win-angle-x64-try": {
+    "gn_args": {
+      "build_angle_deqp_tests": true,
+      "build_angle_gles1_conform_tests": true,
+      "build_angle_trace_perf_tests": true,
+      "dcheck_always_on": true,
+      "enable_nacl": false,
+      "is_component_build": true,
+      "is_debug": false,
+      "symbol_level": 1,
+      "use_goma": true
+    }
   }
 }
\ No newline at end of file
diff --git a/chromium/tools/mb/mb_config_expectations/tryserver.chromium.chromiumos.json b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.chromiumos.json
index 234b57f733e..241a51699ab 100644
--- a/chromium/tools/mb/mb_config_expectations/tryserver.chromium.chromiumos.json
+++ b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.chromiumos.json
@@ -90,6 +90,45 @@
       "use_goma": true
     }
   },
+  "lacros-amd64-generic-rel": {
+    "args_file": "//build/args/chromeos/amd64-generic.gni",
+    "gn_args": {
+      "chromeos_is_browser_only": true,
+      "cros_host_sysroot": "//build/linux/debian_sid_amd64-sysroot",
+      "cros_v8_snapshot_sysroot": "//build/linux/debian_sid_amd64-sysroot",
+      "enable_linux_installer": false,
+      "is_chromeos_device": true,
+      "ozone_platform_headless": true,
+      "ozone_platform_wayland": true,
+      "ozone_platform_x11": false,
+      "rtc_use_pipewire": false,
+      "target_os": "chromeos",
+      "use_custom_libcxx": false,
+      "use_custom_libcxx_for_host": true,
+      "use_evdev_gestures": false,
+      "use_gio": false,
+      "use_glib": false,
+      "use_goma": true,
+      "use_gtk": false,
+      "use_ozone": true,
+      "use_pangocairo": false,
+      "use_pulseaudio": false,
+      "use_system_libsync": false,
+      "use_v8_context_snapshot": false,
+      "use_vaapi": false
+    }
+  },
+  "linux-cfm-rel": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "is_cfm": true,
+      "is_component_build": false,
+      "is_debug": false,
+      "symbol_level": 1,
+      "target_os": "chromeos",
+      "use_goma": true
+    }
+  },
   "linux-chromeos-compile-dbg": {
     "gn_args": {
       "ffmpeg_branding": "ChromeOS",
@@ -112,6 +151,35 @@
       "use_goma": true
     }
   },
+  "linux-chromeos-inverse-fieldtrials-fyi-rel": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "ChromeOS",
+      "invert_fieldtrials": true,
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "symbol_level": 0,
+      "target_os": "chromeos",
+      "use_goma": true
+    }
+  },
+  "linux-chromeos-js-code-coverage": {
+    "gn_args": {
+      "coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "ChromeOS",
+      "is_component_build": false,
+      "is_debug": false,
+      "optimize_webui": false,
+      "proprietary_codecs": true,
+      "symbol_level": 0,
+      "target_os": "chromeos",
+      "use_clang_coverage": true,
+      "use_goma": true,
+      "use_javascript_coverage": true
+    }
+  },
   "linux-chromeos-rel": {
     "gn_args": {
       "coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
@@ -136,6 +204,7 @@
       "ozone_platform": "wayland",
       "ozone_platform_wayland": true,
       "symbol_level": 1,
+      "target_os": "chromeos",
       "use_goma": true,
       "use_gtk": false,
       "use_ozone": true
diff --git a/chromium/tools/mb/mb_config_expectations/tryserver.chromium.codesearch.json b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.codesearch.json
index c54105a29a1..949dd6804ed 100644
--- a/chromium/tools/mb/mb_config_expectations/tryserver.chromium.codesearch.json
+++ b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.codesearch.json
@@ -39,11 +39,12 @@
       "clang_use_chrome_plugins": false,
       "enable_kythe_annotations": true,
       "is_clang": true,
-      "is_component_build": true,
+      "is_component_build": false,
       "is_debug": true,
       "ozone_platform": "wayland",
       "ozone_platform_wayland": true,
       "symbol_level": 1,
+      "target_os": "chromeos",
       "use_goma": true,
       "use_gtk": false,
       "use_ozone": true
diff --git a/chromium/tools/mb/mb_config_expectations/tryserver.chromium.linux.json b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.linux.json
index 80447e67e59..10c420644f6 100644
--- a/chromium/tools/mb/mb_config_expectations/tryserver.chromium.linux.json
+++ b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.linux.json
@@ -1,4 +1,12 @@
 {
+  "cast-binary-size": {
+    "gn_args": {
+      "is_chromecast": true,
+      "is_official_build": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
   "cast_shell_audio_linux": {
     "gn_args": {
       "dcheck_always_on": true,
@@ -122,11 +130,42 @@
       "use_goma": true
     }
   },
+  "gpu-fyi-try-lacros-amd-rel": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "ozone_platform": "headless",
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_bundled_weston": true,
+      "use_goma": true,
+      "use_ozone": true,
+      "use_x11": false
+    }
+  },
+  "gpu-fyi-try-lacros-intel-rel": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "ozone_platform": "headless",
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_bundled_weston": true,
+      "use_goma": true,
+      "use_ozone": true,
+      "use_x11": false
+    }
+  },
   "gpu-fyi-try-linux-amd-rel": {
     "gn_args": {
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -151,6 +190,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -165,6 +205,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -192,6 +233,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -205,6 +247,7 @@
     "gn_args": {
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": true,
@@ -229,6 +272,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -243,6 +287,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -257,6 +302,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -371,6 +417,18 @@
       "use_goma": true
     }
   },
+  "linux-blink-v8-oilpan": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "enable_blink_heap_use_v8_oilpan": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
   "linux-blink-web-tests-force-accessibility-rel": {
     "gn_args": {
       "dcheck_always_on": true,
@@ -406,6 +464,25 @@
       "use_goma": true
     }
   },
+  "linux-example-builder": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "is_component_build": false,
+      "is_debug": false,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
+  "linux-extended-tracing-rel": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "extended_tracing_enabled": true,
+      "is_component_build": false,
+      "is_debug": false,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
   "linux-gcc-rel": {
     "gn_args": {
       "is_clang": false,
@@ -440,6 +517,7 @@
       "ozone_platform": "wayland",
       "ozone_platform_wayland": true,
       "symbol_level": 1,
+      "target_os": "chromeos",
       "use_goma": true,
       "use_gtk": false,
       "use_ozone": true
@@ -454,15 +532,6 @@
       "use_goma": true
     }
   },
-  "linux-layout-tests-fragment-item": {
-    "gn_args": {
-      "dcheck_always_on": true,
-      "is_component_build": false,
-      "is_debug": false,
-      "symbol_level": 1,
-      "use_goma": true
-    }
-  },
   "linux-libfuzzer-asan-rel": {
     "gn_args": {
       "dcheck_always_on": true,
@@ -480,6 +549,30 @@
       "use_libfuzzer": true
     }
   },
+  "linux-mbi-mode-per-render-process-host-rel": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "mbi_mode": "per_render_process_host",
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
+  "linux-mbi-mode-per-site-instance-rel": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "mbi_mode": "per_site_instance",
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
   "linux-ozone-rel": {
     "gn_args": {
       "dcheck_always_on": true,
@@ -516,20 +609,6 @@
       "use_goma": true
     }
   },
-  "linux-rel-builderful": {
-    "gn_args": {
-      "coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
-      "dcheck_always_on": true,
-      "ffmpeg_branding": "Chrome",
-      "is_component_build": false,
-      "is_debug": false,
-      "proprietary_codecs": true,
-      "symbol_level": 0,
-      "use_clang_coverage": true,
-      "use_dummy_lastchange": true,
-      "use_goma": true
-    }
-  },
   "linux-trusty-rel": {
     "gn_args": {
       "dcheck_always_on": true,
@@ -578,7 +657,7 @@
       "use_goma": true
     }
   },
-  "linux-wpt-payments-fyi-rel": {
+  "linux-wpt-input-fyi-rel": {
     "gn_args": {
       "dcheck_always_on": true,
       "is_component_build": false,
@@ -769,6 +848,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
diff --git a/chromium/tools/mb/mb_config_expectations/tryserver.chromium.mac.json b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.mac.json
index 5e33d584abf..0dfe375ddfc 100644
--- a/chromium/tools/mb/mb_config_expectations/tryserver.chromium.mac.json
+++ b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.mac.json
@@ -14,6 +14,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -27,6 +28,7 @@
     "gn_args": {
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": true,
@@ -41,6 +43,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -55,6 +58,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -69,6 +73,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -99,6 +104,7 @@
     "gn_args": {
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": true,
@@ -123,6 +129,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -137,6 +144,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -151,6 +159,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -164,6 +173,7 @@
     "gn_args": {
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": true,
@@ -178,6 +188,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -192,6 +203,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -225,7 +237,7 @@
     "gn_args": {
       "ios_code_signing_identity_description": "Apple Development",
       "ios_enable_code_signing": false,
-      "ios_use_goma_rbe": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": false,
       "symbol_level": 0,
@@ -237,40 +249,14 @@
   },
   "ios-simulator": {
     "gn_args": {
-      "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
-      "is_component_build": false,
-      "is_debug": true,
-      "symbol_level": 1,
-      "target_cpu": "x64",
-      "target_environment": "simulator",
-      "target_os": "ios",
-      "use_goma": true
-    }
-  },
-  "ios-simulator-code-coverage": {
-    "gn_args": {
-      "coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
-      "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
-      "is_component_build": false,
-      "is_debug": true,
-      "symbol_level": 1,
-      "target_cpu": "x64",
-      "target_os": "ios",
-      "use_clang_coverage": true,
-      "use_goma": true
-    }
-  },
-  "ios-simulator-coverage-exp": {
-    "gn_args": {
       "coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
       "use_clang_coverage": true,
       "use_goma": true
@@ -279,6 +265,7 @@
   "ios-simulator-cr-recipe": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -301,6 +288,7 @@
       "enable_websockets": false,
       "include_transport_security_state_preload_list": false,
       "ios_deployment_target": "10.0",
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_cronet_build": true,
       "is_debug": true,
@@ -316,27 +304,30 @@
   },
   "ios-simulator-full-configs": {
     "gn_args": {
+      "coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
       "enable_run_ios_unittests_with_xctest": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
       "target_environment": "simulator",
       "target_os": "ios",
+      "use_clang_coverage": true,
       "use_goma": true
     }
   },
-  "ios-simulator-full-configs-coverage-exp": {
+  "ios-simulator-inverse-fieldtrials-fyi": {
     "gn_args": {
-      "coverage_instrumentation_input_file": "//.code-coverage/files_to_instrument.txt",
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
+      "invert_fieldtrials": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
       "target_cpu": "x64",
+      "target_environment": "simulator",
       "target_os": "ios",
-      "use_clang_coverage": true,
       "use_goma": true
     }
   },
@@ -344,6 +335,7 @@
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
       "ios_enable_multi_window": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -356,7 +348,7 @@
   "ios-simulator-noncq": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -369,7 +361,7 @@
   "ios13-beta-simulator": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -382,7 +374,7 @@
   "ios13-sdk-simulator": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -395,7 +387,7 @@
   "ios14-beta-simulator": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -408,7 +400,7 @@
   "ios14-sdk-simulator": {
     "gn_args": {
       "enable_run_ios_unittests_with_xctest": true,
-      "ios_use_goma_rbe": true,
+      "ios_set_attributes_for_xcode_project_generation": false,
       "is_component_build": false,
       "is_debug": true,
       "symbol_level": 1,
@@ -428,6 +420,19 @@
       "use_goma": true
     }
   },
+  "mac-inverse-fieldtrials-fyi-rel": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "invert_fieldtrials": true,
+      "is_component_build": false,
+      "is_debug": false,
+      "mac_deterministic_build": true,
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
   "mac-osxbeta-rel": {
     "gn_args": {
       "dcheck_always_on": true,
@@ -454,6 +459,18 @@
       "use_goma": true
     }
   },
+  "mac_chromium_10.11_rel_ng": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "ffmpeg_branding": "Chrome",
+      "is_component_build": false,
+      "is_debug": false,
+      "mac_deterministic_build": true,
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
   "mac_chromium_10.12_rel_ng": {
     "gn_args": {
       "dcheck_always_on": true,
@@ -559,6 +576,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
diff --git a/chromium/tools/mb/mb_config_expectations/tryserver.chromium.perf.json b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.perf.json
index 38357d0b4a9..6fbabdb223d 100644
--- a/chromium/tools/mb/mb_config_expectations/tryserver.chromium.perf.json
+++ b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.perf.json
@@ -1,10 +1,13 @@
 {
   "Android Compile Perf": {
     "gn_args": {
+      "chrome_pgo_phase": 0,
+      "clang_use_default_sample_profile": false,
       "ffmpeg_branding": "Chrome",
       "is_chrome_branded": true,
       "is_official_build": true,
       "proprietary_codecs": true,
+      "strip_absolute_paths_from_debug_symbols": true,
       "symbol_level": 1,
       "target_os": "android",
       "use_goma": true
@@ -12,20 +15,40 @@
   },
   "Android arm64 Compile Perf": {
     "gn_args": {
+      "chrome_pgo_phase": 0,
+      "clang_use_default_sample_profile": false,
       "ffmpeg_branding": "Chrome",
       "is_chrome_branded": true,
       "is_official_build": true,
       "proprietary_codecs": true,
+      "strip_absolute_paths_from_debug_symbols": true,
       "symbol_level": 1,
       "target_cpu": "arm64",
       "target_os": "android",
       "use_goma": true
     }
   },
+  "Fuchsia Builder Perf": {
+    "gn_args": {
+      "ffmpeg_branding": "Chrome",
+      "fuchsia_additional_boot_images": [
+        "//third_party/fuchsia-sdk/images-internal/astro-release/"
+      ],
+      "is_chrome_branded": true,
+      "is_official_build": true,
+      "proprietary_codecs": true,
+      "symbol_level": 1,
+      "target_cpu": "arm64",
+      "target_os": "fuchsia",
+      "use_goma": true
+    }
+  },
   "Linux Builder Perf": {
     "gn_args": {
+      "chrome_pgo_phase": 0,
       "is_chrome_branded": true,
       "is_official_build": true,
+      "strip_absolute_paths_from_debug_symbols": true,
       "symbol_level": 1,
       "use_gnome_keyring": false,
       "use_goma": true
@@ -33,18 +56,35 @@
   },
   "Mac Builder Perf": {
     "gn_args": {
+      "chrome_pgo_phase": 0,
       "enable_keystone_registration_framework": false,
       "ignore_missing_widevine_signing_cert": true,
       "is_chrome_branded": true,
       "is_official_build": true,
+      "strip_absolute_paths_from_debug_symbols": true,
       "symbol_level": 2,
       "use_goma": true
     }
   },
+  "Mac arm Builder Perf": {
+    "gn_args": {
+      "chrome_pgo_phase": 0,
+      "enable_keystone_registration_framework": false,
+      "ignore_missing_widevine_signing_cert": true,
+      "is_chrome_branded": true,
+      "is_official_build": true,
+      "strip_absolute_paths_from_debug_symbols": true,
+      "symbol_level": 2,
+      "target_cpu": "arm64",
+      "use_goma": true
+    }
+  },
   "Win Builder Perf": {
     "gn_args": {
+      "chrome_pgo_phase": 0,
       "is_chrome_branded": true,
       "is_official_build": true,
+      "strip_absolute_paths_from_debug_symbols": true,
       "symbol_level": 1,
       "target_cpu": "x86",
       "use_goma": true
@@ -52,8 +92,10 @@
   },
   "Win x64 Builder Perf": {
     "gn_args": {
+      "chrome_pgo_phase": 0,
       "is_chrome_branded": true,
       "is_official_build": true,
+      "strip_absolute_paths_from_debug_symbols": true,
       "symbol_level": 1,
       "use_goma": true
     }
diff --git a/chromium/tools/mb/mb_config_expectations/tryserver.chromium.updater.json b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.updater.json
new file mode 100644
index 00000000000..f20dddff818
--- /dev/null
+++ b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.updater.json
@@ -0,0 +1,40 @@
+{
+  "mac-updater-try-builder-dbg": {
+    "gn_args": {
+      "is_component_build": true,
+      "is_debug": true,
+      "is_google_branded": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
+  "mac-updater-try-builder-rel": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "is_component_build": false,
+      "is_debug": false,
+      "is_google_branded": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
+  "win-updater-try-builder-dbg": {
+    "gn_args": {
+      "is_component_build": true,
+      "is_debug": true,
+      "is_google_branded": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  },
+  "win-updater-try-builder-rel": {
+    "gn_args": {
+      "dcheck_always_on": true,
+      "is_component_build": false,
+      "is_debug": false,
+      "is_google_branded": true,
+      "symbol_level": 1,
+      "use_goma": true
+    }
+  }
+}
\ No newline at end of file
diff --git a/chromium/tools/mb/mb_config_expectations/tryserver.chromium.win.json b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.win.json
index 1007b13ad47..86512e77390 100644
--- a/chromium/tools/mb/mb_config_expectations/tryserver.chromium.win.json
+++ b/chromium/tools/mb/mb_config_expectations/tryserver.chromium.win.json
@@ -4,6 +4,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -28,6 +29,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -42,6 +44,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -55,6 +58,7 @@
     "gn_args": {
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": true,
@@ -78,6 +82,7 @@
     "gn_args": {
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
+      "enable_nacl": false,
       "enable_vulkan": true,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
@@ -93,6 +98,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "enable_vulkan": true,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
@@ -108,6 +114,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -122,6 +129,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -137,6 +145,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -163,6 +172,7 @@
     "gn_args": {
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": true,
@@ -189,6 +199,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -214,6 +225,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -229,6 +241,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
@@ -282,9 +295,10 @@
       "use_libfuzzer": true
     }
   },
-  "win10-inverse-fieldtrials-fyi-rel": {
+  "win10_chromium_inverse_fieldtrials_x64_fyi_rel_ng": {
     "gn_args": {
       "dcheck_always_on": true,
+      "enable_resource_allowlist_generation": true,
       "ffmpeg_branding": "Chrome",
       "invert_fieldtrials": true,
       "is_component_build": false,
@@ -411,6 +425,7 @@
       "build_angle_gles1_conform_tests": true,
       "build_angle_trace_perf_tests": true,
       "dcheck_always_on": true,
+      "enable_nacl": false,
       "ffmpeg_branding": "Chrome",
       "internal_gles2_conform_tests": true,
       "is_component_build": false,
diff --git a/chromium/tools/mb/mb_unittest.py b/chromium/tools/mb/mb_unittest.py
index a868c0e89a9..824df7cc3fb 100755
--- a/chromium/tools/mb/mb_unittest.py
+++ b/chromium/tools/mb/mb_unittest.py
@@ -151,12 +151,12 @@ class FakeFile(object):
 
 TEST_CONFIG = """\
 {
-  'masters': {
+  'builder_groups': {
     'chromium': {},
-    'fake_master': {
+    'fake_builder_group': {
       'fake_builder': 'rel_bot',
       'fake_debug_builder': 'debug_goma',
-      'fake_args_bot': '//build/args/bots/fake_master/fake_args_bot.gn',
+      'fake_args_bot': '//build/args/bots/fake_builder_group/fake_args_bot.gn',
       'fake_multi_phase': { 'phase_1': 'phase_1', 'phase_2': 'phase_2'},
       'fake_args_file': 'args_file_goma',
       'fake_ios_error': 'ios_error',
@@ -205,7 +205,7 @@ TEST_BAD_CONFIG = """\
     'rel_bot_1': ['rel', 'chrome_with_codecs'],
     'rel_bot_2': ['rel', 'bad_nested_config'],
   },
-  'masters': {
+  'builder_groups': {
     'chromium': {
       'a': 'rel_bot_1',
       'b': 'rel_bot_2',
@@ -229,9 +229,9 @@ TEST_BAD_CONFIG = """\
 
 TEST_ARGS_FILE_TWICE_CONFIG = """\
 {
-  'masters': {
+  'builder_groups': {
     'chromium': {},
-    'fake_master': {
+    'fake_builder_group': {
       'fake_args_file_twice': 'args_file_twice',
     },
   },
@@ -249,9 +249,9 @@ TEST_ARGS_FILE_TWICE_CONFIG = """\
 
 TEST_DUP_CONFIG = """\
 {
-  'masters': {
+  'builder_groups': {
     'chromium': {},
-    'fake_master': {
+    'fake_builder_group': {
       'fake_builder': 'some_config',
       'other_builder': 'some_other_config',
     },
@@ -270,7 +270,7 @@ TEST_DUP_CONFIG = """\
 
 TRYSERVER_CONFIG = """\
 {
-  'masters': {
+  'builder_groups': {
     'not_a_tryserver': {
       'fake_builder': 'fake_config',
     },
@@ -301,7 +301,7 @@ class UnitTest(unittest.TestCase):
         },
       }''')
     mbw.files.setdefault(
-        mbw.ToAbsPath('//build/args/bots/fake_master/fake_args_bot.gn'),
+        mbw.ToAbsPath('//build/args/bots/fake_builder_group/fake_args_bot.gn'),
         'is_debug = false\n')
     if files:
       for path, contents in files.items():
@@ -319,7 +319,9 @@ class UnitTest(unittest.TestCase):
       actual_ret = mbw.Main(args)
     finally:
       os.environ = prev_env
-    self.assertEqual(actual_ret, ret)
+    self.assertEqual(
+        actual_ret, ret,
+        "ret: %s, out: %s, err: %s" % (actual_ret, mbw.out, mbw.err))
     if out is not None:
       self.assertEqual(mbw.out, out)
     if err is not None:
@@ -451,17 +453,17 @@ class UnitTest(unittest.TestCase):
         '--check', mbw.out)
 
     mbw = self.fake_mbw()
-    self.check(['gen', '-m', 'fake_master', '-b', 'fake_args_bot',
+    self.check(['gen', '-m', 'fake_builder_group', '-b', 'fake_args_bot',
                 '//out/Debug'],
                mbw=mbw, ret=0)
     # TODO(https://crbug.com/1093038): This assert is inappropriately failing.
     # self.assertEqual(
     #     mbw.files['/fake_src/out/Debug/args.gn'],
-    #     'import("//build/args/bots/fake_master/fake_args_bot.gn")\n')
+    #     'import("//build/args/bots/fake_builder_group/fake_args_bot.gn")\n')
 
   def test_gen_args_file_mixins(self):
     mbw = self.fake_mbw()
-    self.check(['gen', '-m', 'fake_master', '-b', 'fake_args_file',
+    self.check(['gen', '-m', 'fake_builder_group', '-b', 'fake_args_file',
                 '//out/Debug'], mbw=mbw, ret=0)
 
     self.assertEqual(
@@ -472,7 +474,7 @@ class UnitTest(unittest.TestCase):
   def test_gen_args_file_twice(self):
     mbw = self.fake_mbw()
     mbw.files[mbw.default_config] = TEST_ARGS_FILE_TWICE_CONFIG
-    self.check(['gen', '-m', 'fake_master', '-b', 'fake_args_file_twice',
+    self.check(['gen', '-m', 'fake_builder_group', '-b', 'fake_args_file_twice',
                 '//out/Debug'], mbw=mbw, ret=1)
 
   def test_gen_fails(self):
@@ -635,13 +637,20 @@ class UnitTest(unittest.TestCase):
                 'base_unittests'], files=files, ret=0)
 
     # test running isolate on an existing build_dir
-    files['/fake_src/out/Default/args.gn'] = 'is_debug = True\n'
+    files['/fake_src/out/Default/args.gn'] = 'is_debug = true\n'
     self.check(['isolate', '//out/Default', 'base_unittests'],
                files=files, ret=0)
 
     self.check(['isolate', '//out/Default', 'base_unittests'],
                files=files, ret=0)
 
+    # Existing build dir that uses a .gni import.
+    files['/fake_src/out/Default/args.gn'] = 'import("//import/args.gni")\n'
+    files['/fake_src/import/args.gni'] = 'is_debug = true\n'
+    self.check(['isolate', '//out/Default', 'base_unittests'],
+               files=files,
+               ret=0)
+
   def test_isolate_dir(self):
     files = {
         '/fake_src/out/Default/toolchain.ninja':
@@ -714,7 +723,12 @@ class UnitTest(unittest.TestCase):
          "/some/vpython/pkg  git_revision:deadbeef\n"),
     }
 
+    task_json = json.dumps({'tasks': [{'task_id': '00000'}]})
+    collect_json = json.dumps({'00000': {'results': {}}})
+
     mbw = self.fake_mbw(files=files)
+    mbw.files[mbw.PathJoin(mbw.TempDir(), 'task.json')] = task_json
+    mbw.files[mbw.PathJoin(mbw.TempDir(), 'collect_output.json')] = collect_json
     original_impl = mbw.ToSrcRelPath
 
     def to_src_rel_path_stub(path):
@@ -726,9 +740,59 @@ class UnitTest(unittest.TestCase):
 
     self.check(['run', '-s', '-c', 'debug_goma', '//out/Default',
                 'base_unittests'], mbw=mbw, ret=0)
+    mbw = self.fake_mbw(files=files)
+    mbw.files[mbw.PathJoin(mbw.TempDir(), 'task.json')] = task_json
+    mbw.files[mbw.PathJoin(mbw.TempDir(), 'collect_output.json')] = collect_json
+    mbw.ToSrcRelPath = to_src_rel_path_stub
     self.check(['run', '-s', '-c', 'debug_goma', '-d', 'os', 'Win7',
                 '//out/Default', 'base_unittests'], mbw=mbw, ret=0)
 
+  def test_run_swarmed_task_failure(self):
+    files = {
+        '/fake_src/testing/buildbot/gn_isolate_map.pyl':
+        ("{'base_unittests': {"
+         "  'label': '//base:base_unittests',"
+         "  'type': 'console_test_launcher',"
+         "}}\n"),
+        '/fake_src/out/Default/base_unittests.runtime_deps':
+        ("base_unittests\n"),
+        '/fake_src/out/Default/base_unittests.archive.json':
+        ("{\"base_unittests\":\"fake_hash\"}"),
+        '/fake_src/third_party/depot_tools/cipd_manifest.txt':
+        ("# vpython\n"
+         "/some/vpython/pkg  git_revision:deadbeef\n"),
+    }
+
+    task_json = json.dumps({'tasks': [{'task_id': '00000'}]})
+    collect_json = json.dumps({'00000': {'results': {'exit_code': 1}}})
+
+    mbw = self.fake_mbw(files=files)
+    mbw.files[mbw.PathJoin(mbw.TempDir(), 'task.json')] = task_json
+    mbw.files[mbw.PathJoin(mbw.TempDir(), 'collect_output.json')] = collect_json
+    original_impl = mbw.ToSrcRelPath
+
+    def to_src_rel_path_stub(path):
+      if path.endswith('base_unittests.archive.json'):
+        return 'base_unittests.archive.json'
+      return original_impl(path)
+
+    mbw.ToSrcRelPath = to_src_rel_path_stub
+
+    self.check(
+        ['run', '-s', '-c', 'debug_goma', '//out/Default', 'base_unittests'],
+        mbw=mbw,
+        ret=1)
+    mbw = self.fake_mbw(files=files)
+    mbw.files[mbw.PathJoin(mbw.TempDir(), 'task.json')] = task_json
+    mbw.files[mbw.PathJoin(mbw.TempDir(), 'collect_output.json')] = collect_json
+    mbw.ToSrcRelPath = to_src_rel_path_stub
+    self.check([
+        'run', '-s', '-c', 'debug_goma', '-d', 'os', 'Win7', '//out/Default',
+        'base_unittests'
+    ],
+               mbw=mbw,
+               ret=1)
+
   def test_lookup(self):
     self.check(['lookup', '-c', 'debug_goma'], ret=0,
                out=('\n'
@@ -766,27 +830,27 @@ class UnitTest(unittest.TestCase):
 
   def test_multiple_phases(self):
     # Check that not passing a --phase to a multi-phase builder fails.
-    mbw = self.check(['lookup', '-m', 'fake_master', '-b', 'fake_multi_phase'],
-                     ret=1)
+    mbw = self.check(['lookup', '-m', 'fake_builder_group', '-b',
+                      'fake_multi_phase'], ret=1)
     self.assertIn('Must specify a build --phase', mbw.out)
 
     # Check that passing a --phase to a single-phase builder fails.
-    mbw = self.check(['lookup', '-m', 'fake_master', '-b', 'fake_builder',
-                      '--phase', 'phase_1'], ret=1)
+    mbw = self.check(['lookup', '-m', 'fake_builder_group', '-b',
+                      'fake_builder', '--phase', 'phase_1'], ret=1)
     self.assertIn('Must not specify a build --phase', mbw.out)
 
     # Check that passing a wrong phase key to a multi-phase builder fails.
-    mbw = self.check(['lookup', '-m', 'fake_master', '-b', 'fake_multi_phase',
-                      '--phase', 'wrong_phase'], ret=1)
+    mbw = self.check(['lookup', '-m', 'fake_builder_group', '-b',
+                      'fake_multi_phase', '--phase', 'wrong_phase'], ret=1)
     self.assertIn('Phase wrong_phase doesn\'t exist', mbw.out)
 
     # Check that passing a correct phase key to a multi-phase builder passes.
-    mbw = self.check(['lookup', '-m', 'fake_master', '-b', 'fake_multi_phase',
-                      '--phase', 'phase_1'], ret=0)
+    mbw = self.check(['lookup', '-m', 'fake_builder_group', '-b',
+                      'fake_multi_phase', '--phase', 'phase_1'], ret=0)
     self.assertIn('phase = 1', mbw.out)
 
-    mbw = self.check(['lookup', '-m', 'fake_master', '-b', 'fake_multi_phase',
-                      '--phase', 'phase_2'], ret=0)
+    mbw = self.check(['lookup', '-m', 'fake_builder_group', '-b',
+                      'fake_multi_phase', '--phase', 'phase_2'], ret=0)
     self.assertIn('phase = 2', mbw.out)
 
   def test_recursive_lookup(self):
@@ -796,7 +860,7 @@ class UnitTest(unittest.TestCase):
           'enable_antidoom_banana = true\n'
         )
     }
-    self.check(['lookup', '-m', 'fake_master', '-b', 'fake_args_file',
+    self.check(['lookup', '-m', 'fake_builder_group', '-b', 'fake_args_file',
                 '--recursive'], files=files, ret=0,
                out=('enable_antidoom_banana = true\n'
                     'enable_doom_melon = true\n'
@@ -806,7 +870,7 @@ class UnitTest(unittest.TestCase):
     mbw = self.fake_mbw()
     temp_dir = mbw.TempDir()
     self.check(['train', '--expectations-dir', temp_dir], mbw=mbw, ret=0)
-    self.assertIn(os.path.join(temp_dir, 'fake_master.json'), mbw.files)
+    self.assertIn(os.path.join(temp_dir, 'fake_builder_group.json'), mbw.files)
 
   def test_validate(self):
     mbw = self.fake_mbw()
@@ -840,7 +904,7 @@ class UnitTest(unittest.TestCase):
     temp_dir = mbw.TempDir()
     self.check(['train', '--expectations-dir', temp_dir], mbw=mbw, ret=0)
     # Remove one of the expectation files.
-    mbw.files.pop(os.path.join(temp_dir, 'fake_master.json'))
+    mbw.files.pop(os.path.join(temp_dir, 'fake_builder_group.json'))
     # Now validating should fail.
     self.check(['validate', '--expectations-dir', temp_dir], mbw=mbw, ret=1)
     self.assertIn('Expectations out of date', mbw.out)
@@ -882,11 +946,11 @@ class UnitTest(unittest.TestCase):
   def test_ios_error_config_with_ios_json(self):
     """Ensures that ios_error config finds the correct iOS JSON file for args"""
     files = {
-        '/fake_src/ios/build/bots/fake_master/fake_ios_error.json':
+        '/fake_src/ios/build/bots/fake_builder_group/fake_ios_error.json':
         ('{"gn_args": ["is_debug=true"]}\n')
     }
     mbw = self.fake_mbw(files)
-    self.check(['lookup', '-m', 'fake_master', '-b', 'fake_ios_error'],
+    self.check(['lookup', '-m', 'fake_builder_group', '-b', 'fake_ios_error'],
                mbw=mbw,
                ret=0,
                out=('\n'
@@ -902,11 +966,11 @@ class UnitTest(unittest.TestCase):
     checked.
     """
     files = {
-        '/fake_src/ios/build/bots/fake_master/fake_ios_bot.json':
+        '/fake_src/ios/build/bots/fake_builder_group/fake_ios_bot.json':
         ('{"gn_args": ["is_debug=true"]}\n')
     }
     mbw = self.fake_mbw(files)
-    self.check(['lookup', '-m', 'fake_master', '-b', 'fake_ios_bot'],
+    self.check(['lookup', '-m', 'fake_builder_group', '-b', 'fake_ios_bot'],
                mbw=mbw,
                ret=0,
                out=('\n'
@@ -922,7 +986,7 @@ class UnitTest(unittest.TestCase):
     is ios_error, but there is no iOS JSON definition for it.
     """
     mbw = self.fake_mbw()
-    self.check(['lookup', '-m', 'fake_master', '-b', 'fake_ios_error'],
+    self.check(['lookup', '-m', 'fake_builder_group', '-b', 'fake_ios_error'],
                mbw=mbw,
                ret=1)
     self.assertIn('MBErr: No iOS definition was found.', mbw.out)
@@ -934,10 +998,10 @@ class UnitTest(unittest.TestCase):
     doesn't exist at all.
     """
     mbw = self.fake_mbw()
-    self.check(['lookup', '-m', 'fake_master', '-b', 'random_bot'],
+    self.check(['lookup', '-m', 'fake_builder_group', '-b', 'random_bot'],
                mbw=mbw,
                ret=1)
-    self.assertIn('MBErr: Builder name "random_bot"  not found under masters',
+    self.assertIn('MBErr: Builder name "random_bot"  not found under groups',
                   mbw.out)
 
 
diff --git a/chromium/tools/mb/mb_validation_unittest.py b/chromium/tools/mb/mb_validation_unittest.py
index a5273e556b0..9ae766ed4b5 100755
--- a/chromium/tools/mb/mb_validation_unittest.py
+++ b/chromium/tools/mb/mb_validation_unittest.py
@@ -26,8 +26,8 @@ TEST_UNREFERENCED_MIXIN_CONFIG = """\
     'rel_bot_1': ['rel'],
     'rel_bot_2': ['rel'],
   },
-  'masters': {
-    'fake_master_a': {
+  'builder_groups': {
+    'fake_builder_group_a': {
       'fake_builder_a': 'rel_bot_1',
       'fake_builder_b': 'rel_bot_2',
     },
@@ -50,8 +50,8 @@ TEST_UNKNOWNMIXIN_CONFIG = """\
     'rel_bot_1': ['rel'],
     'rel_bot_2': ['rel', 'unknown_mixin'],
   },
-  'masters': {
-    'fake_master_a': {
+  'builder_groups': {
+    'fake_builder_group_a': {
       'fake_builder_a': 'rel_bot_1',
       'fake_builder_b': 'rel_bot_2',
     },
@@ -71,8 +71,8 @@ TEST_UNKNOWN_NESTED_MIXIN_CONFIG = """\
     'rel_bot_1': ['rel', 'nested_mixin'],
     'rel_bot_2': ['rel'],
   },
-  'masters': {
-    'fake_master_a': {
+  'builder_groups': {
+    'fake_builder_group_a': {
       'fake_builder_a': 'rel_bot_1',
       'fake_builder_b': 'rel_bot_2',
     },
@@ -96,14 +96,14 @@ TEST_UNKNOWN_NESTED_MIXIN_CONFIG = """\
 class UnitTest(unittest.TestCase):
   def test_GetAllConfigs(self):
     configs = ast.literal_eval(mb_unittest.TEST_CONFIG)
-    all_configs = validation.GetAllConfigs(configs['masters'])
-    self.assertEqual(all_configs['rel_bot'], 'fake_master')
-    self.assertEqual(all_configs['debug_goma'], 'fake_master')
+    all_configs = validation.GetAllConfigs(configs['builder_groups'])
+    self.assertEqual(all_configs['rel_bot'], 'fake_builder_group')
+    self.assertEqual(all_configs['debug_goma'], 'fake_builder_group')
 
   def test_CheckAllConfigsAndMixinsReferenced_ok(self):
     configs = ast.literal_eval(mb_unittest.TEST_CONFIG)
     errs = []
-    all_configs = validation.GetAllConfigs(configs['masters'])
+    all_configs = validation.GetAllConfigs(configs['builder_groups'])
     config_configs = configs['configs']
     mixins = configs['mixins']
 
@@ -115,7 +115,7 @@ class UnitTest(unittest.TestCase):
   def test_CheckAllConfigsAndMixinsReferenced_unreferenced(self):
     configs = ast.literal_eval(TEST_UNREFERENCED_MIXIN_CONFIG)
     errs = []
-    all_configs = validation.GetAllConfigs(configs['masters'])
+    all_configs = validation.GetAllConfigs(configs['builder_groups'])
     config_configs = configs['configs']
     mixins = configs['mixins']
 
@@ -127,7 +127,7 @@ class UnitTest(unittest.TestCase):
   def test_CheckAllConfigsAndMixinsReferenced_unknown(self):
     configs = ast.literal_eval(TEST_UNKNOWNMIXIN_CONFIG)
     errs = []
-    all_configs = validation.GetAllConfigs(configs['masters'])
+    all_configs = validation.GetAllConfigs(configs['builder_groups'])
     config_configs = configs['configs']
     mixins = configs['mixins']
 
@@ -140,7 +140,7 @@ class UnitTest(unittest.TestCase):
   def test_CheckAllConfigsAndMixinsReferenced_unknown_nested(self):
     configs = ast.literal_eval(TEST_UNKNOWN_NESTED_MIXIN_CONFIG)
     errs = []
-    all_configs = validation.GetAllConfigs(configs['masters'])
+    all_configs = validation.GetAllConfigs(configs['builder_groups'])
     config_configs = configs['configs']
     mixins = configs['mixins']
 
@@ -154,7 +154,7 @@ class UnitTest(unittest.TestCase):
   def test_CheckAllConfigsAndMixinsReferenced_unused(self):
     configs = ast.literal_eval(TEST_UNKNOWN_NESTED_MIXIN_CONFIG)
     errs = []
-    all_configs = validation.GetAllConfigs(configs['masters'])
+    all_configs = validation.GetAllConfigs(configs['builder_groups'])
     config_configs = configs['configs']
     mixins = configs['mixins']
 
@@ -168,11 +168,12 @@ class UnitTest(unittest.TestCase):
   def test_EnsureNoProprietaryMixins(self):
     bad_configs = ast.literal_eval(mb_unittest.TEST_BAD_CONFIG)
     errs = []
-    masters = bad_configs['masters']
+    builder_groups = bad_configs['builder_groups']
     mixins = bad_configs['mixins']
     config_configs = bad_configs['configs']
 
-    validation.EnsureNoProprietaryMixins(errs, masters, config_configs, mixins)
+    validation.EnsureNoProprietaryMixins(errs, builder_groups, config_configs,
+                                         mixins)
 
     self.assertIn(
         'Public artifact builder "a" '
@@ -186,7 +187,7 @@ class UnitTest(unittest.TestCase):
     configs = ast.literal_eval(mb_unittest.TEST_CONFIG)
     config_configs = configs['configs']
     mixins = configs['mixins']
-    grouping = configs['masters']
+    grouping = configs['builder_groups']
     errs = []
 
     validation.CheckDuplicateConfigs(errs, config_configs, mixins, grouping,
@@ -198,7 +199,7 @@ class UnitTest(unittest.TestCase):
     configs = ast.literal_eval(mb_unittest.TEST_DUP_CONFIG)
     config_configs = configs['configs']
     mixins = configs['mixins']
-    grouping = configs['masters']
+    grouping = configs['builder_groups']
     errs = []
 
     validation.CheckDuplicateConfigs(errs, config_configs, mixins, grouping,
diff --git a/chromium/tools/media_engagement_preload/OWNERS b/chromium/tools/media_engagement_preload/OWNERS
index 70313512d0c..2d282460822 100644
--- a/chromium/tools/media_engagement_preload/OWNERS
+++ b/chromium/tools/media_engagement_preload/OWNERS
@@ -1,2 +1 @@
-beccahughes@chromium.org
 mlamouri@chromium.org
diff --git a/chromium/tools/memory/asan/blacklist.txt b/chromium/tools/memory/asan/blacklist.txt
deleted file mode 100644
index 35fa055dec4..00000000000
--- a/chromium/tools/memory/asan/blacklist.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# The rules in this file are only applied at compile time. If you can modify the
-# source in question, consider function attributes to disable instrumentation.
-#
-# Please think twice before you add or remove these rules.
diff --git a/chromium/tools/memory/asan/blacklist_win.txt b/chromium/tools/memory/asan/blocklist_win.txt
index 065d43a212d..065d43a212d 100644
--- a/chromium/tools/memory/asan/blacklist_win.txt
+++ b/chromium/tools/memory/asan/blocklist_win.txt
diff --git a/chromium/tools/metrics/BUILD.gn b/chromium/tools/metrics/BUILD.gn
index 846d5248bfa..c9e8df25e11 100644
--- a/chromium/tools/metrics/BUILD.gn
+++ b/chromium/tools/metrics/BUILD.gn
@@ -20,11 +20,6 @@ copy("actions_xml") {
   outputs = [ "$root_out_dir/actions.xml" ]
 }
 
-copy("rappor_xml") {
-  sources = [ "rappor/rappor.xml" ]
-  outputs = [ "$root_out_dir/rappor.xml" ]
-}
-
 copy("ukm_xml") {
   sources = [ "ukm/ukm.xml" ]
   outputs = [ "$root_out_dir/ukm.xml" ]
@@ -34,7 +29,6 @@ group("metrics_metadata") {
   deps = [
     ":actions_xml",
     ":histograms_xml",
-    ":rappor_xml",
     ":ukm_xml",
   ]
 }
@@ -107,9 +101,6 @@ group("metrics_python_tests") {
     "//tools/metrics/histograms/pretty_print.py",
     "//tools/metrics/histograms/pretty_print_test.py",
 
-    "//tools/metrics/rappor/rappor_model.py",
-    "//tools/metrics/rappor/rappor_model_test.py",
-
     "//tools/metrics/ukm/ukm.xml",
     "//tools/metrics/ukm/codegen.py",
     "//tools/metrics/ukm/codegen_test.py",
diff --git a/chromium/tools/metrics/actions/README.md b/chromium/tools/metrics/actions/README.md
index 7228a7748f1..b32b92538a0 100644
--- a/chromium/tools/metrics/actions/README.md
+++ b/chromium/tools/metrics/actions/README.md
@@ -1,198 +1,191 @@
 # User Action Guidelines
 
-This document gives the best practices on how to use user actions in code and
-how to document them for the dashboard.  User actions come with only a name and
-a timestamp.  They are best used when you care about a sequence--which actions
-happen in what order.  If you don't care about the order, you should be using
+This document covers the best practices on using user actions in code and
+documenting them for the dashboard. User actions come with only a name and
+a timestamp. They are best used when you care about a sequence—which actions
+happen in what order. If you don't care about the order, you should be using
 [histograms](https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/metrics/histograms/README.md)
 (likely [enumerated histograms](https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/metrics/histograms/README.md#Enum-Histograms)).
 
-Often, you want both user actions and histogram logging in your code.  They
-enable different analyses.  They're complementary.
+Often, you want both user actions and histogram logging in your code. They
+enable different analyses. They're complementary.
 
 [TOC]
 
-## Coding (Emitting to User Actions)
+## Coding (emitting to user actions)
 
-Generally you'll want to call `base::RecordAction()`, which is defined in
+Generally you should call `base::RecordAction()`, which is defined in
 [user_metrics.h](https://cs.chromium.org/chromium/src/base/metrics/user_metrics.h).
 
 
-### Emit at a High-Level, not Deep in the Implementation
+### Emit at a high level, not deep in the implementation
 
 Prefer to emit at the highest level reasonable, closest to the code that handles
-the UI interaction.  Emitting deep in implementation code can cause problems
+the UI interaction. Emitting deep in implementation code can cause problems
 because that code may get reused (and thus called more times in more places) or
-may get called fewer times (due to caching for example).  In cases like this,
-the logged user action will not longer correspond with a meaningful action by
-the user.
+may get called fewer times (due to caching for example). In cases like this,
+the logged user action would no longer correspond to a meaningful action
+performed by the user.
 
-### Don't Use Same String in Multiple Places
+### Don't use the same string in multiple places
 
-Generally a logged user action should correspond with a single event.  As such,
-they should probably only appear in a single place in the code.  If the same
+Generally a logged user action should correspond to a single event. Thus, the
+logging should probably only appear in a single place in the code. If the same
 user action needs to be logged in multiple places, consider whether you should
 be using different user action names for these separate call paths.
 
-That said, if you truly need to record the same user action in multiple places,
-that's okay.  Use a compile-time constant of appropriate scope that can be
-referenced everywhere.  Using inline strings in multiple places can lead to
-errors if you ever need to revise the name and you update one one location and
-forget another.
+In rare cases, the same user action can be recorded in multiple places as long
+as only one of the places can be reached. This may be necessary if the user
+action is logged in platform-specific code or if one implementation is being
+replaced with another. When recording an action in multiple places, use a
+compile-time constant of appropriate scope that can be referenced everywhere.
+Using inline strings in multiple places can lead to errors if you ever need to
+revise the name and you update one location but forget another.
 
 ### Efficiency
 
 Due to the practices about when and how often to emit a user action, actions
-should not be emitted often enough to cause efficiency issues.  (If actions are
+should not be emitted often enough to cause efficiency issues. (If actions are
 emitted often enough to cause a problem, they're not being emitted at
-appropriate times.  See advice below.)
+appropriate times. See advice below.)
 
-## Emitting Strategies
+## Emitting strategies
 
-### Emit Once Per Action
+### Emit once per action
 
-A user action should be tied to a single event, such a user doing something or
-a user seeing something new.  Each meaningful unit should cause one emit.
+A user action should be tied to a single event, such as a user doing something
+or a user seeing something new. Each meaningful unit should cause one emit.
 For example, showing the history page is a meaningful unit; querying the
-history database -- which might need to be queried multiple times to fill
-the page -- is probably not a meaningful unit for most use cases.
+history database—which might need to be queried multiple times to fill
+the page—is probably not a meaningful unit for most use cases.
 
-### Try To Avoid Emitting Redundantly
+### Try to avoid redundant emits
 
-Generally a meaningful user action should cause only one emit.  This advice
-is mainly because user action sequences are easier to analyze without redudancy.
+A meaningful user action should usually cause only one emit. This advice is
+mainly because user action sequences are easier to analyze without redudancy.
 
-For example, if the browser already has a "Back" user action, avoid add a
-"BackViaKeyboardShortcut" user action--it's mostly redundant--unless it's
+For example, if the browser already has a "Back" user action, avoid adding a
+"BackViaKeyboardShortcut" user action—it's mostly redundant—unless it's
 necessary because you care about how the different types of Back button work in
-sequences of user actions.  If you don't care about how BackViaKeyboardShortcut
-works in a sequence and only want to count them / determine the breakdown of
+sequences of user actions. If you don't care about how BackViaKeyboardShortcut
+works in a sequence and only want to count them or determine the breakdown of
 keyboard-shortcut backs versus all backs, use a histogram.
 
-### Do Not Emit Excessively
+### Do not emit excessively
 
-Again, choose an appropriately-sized meaningful unit.  For example, emit
-"DragScrolled" for a whole scroll action.  Don't emit this action every time the
+Again, choose an appropriately-sized meaningful unit. For example, emit
+"DragScrolled" for a whole scroll action. Don't emit this action every time the
 user pauses scrolling if the user remains in the process of scrolling (mouse
-button still down).  That said, if you trying need to understand the sequence of
-partial scrolls, emitting this for each scroll pause is acceptable.
+button still down). However, if you need to understand the sequence of partial
+scrolls, emitting this for each scroll pause is acceptable.
 
 As another example, you may want to emit "FocusOmnibox" (upon focus),
 "OmniboxEditInProgress" (upon first keystroke), and "OmniboxUse" (upon going
-somwhere) but forswear "OmniboxKeystroke".  That's probably more detailed than
+somewhere) but skip "OmniboxKeystroke". That's probably more detailed than
 you need.
 
-### Emitting Impressions Is Okay
+### Emitting impressions is okay
 
 It's okay to emit user actions such as "ShowTranslateInfobar" or
-"DisplayedImageLinkContextMenu".  Remember to mark them as
+"DisplayedImageLinkContextMenu". Remember to mark them as
 [not_user_triggered](#not_user_triggered) and please try to make sure they're
-not excessive.  For example, don't emit "ShowedSecureIconNextToOmnibox" because
-that's likely to appear on most pages.  That said, if you need
+not excessive. For example, don't emit "ShowedSecureIconNextToOmnibox" because
+that's likely to appear on most pages. That said, if you need
 ShowedSecureIconNextToOmnibox logged in order to analyze a sequence of user
 actions that include it, go ahead.
 
 ## Testing
 
-Test your user actions using *chrome://user-actions*.  Make sure they're being
-emitted when you expect and not emitted at other times.
+Test your user actions using `chrome://user-actions`. Make sure they're being
+emitted when you expect and not emitted otherwise.
 
-If this is a general UI surface, please try to check every platform.  In
+If this is a general UI surface, please try to check every platform. In
 particular, check Windows (Views-based platforms), Mac (non-Views), Android
-phone (yet other UI wrapper code), Android tablet (often triggers lookalike but
+phone (yet other UI wrapper code), Android tablet (often triggers look-alike but
 different menus), and iOS (yet more different UI wrapper code).
 
-Also, check that your new user action is not mostly redundant with other user
-actions (see [advice above](#Do-Not-Emit-Redundantly)) and not emitted
-excessively (see [advice above](#Do-Not-Emit-Excessively)).
+Also, check that your new user action is not mostly redundant in light of
+existing user actions (see [advice above](#Try-to-avoid-redundant-emits)) and
+not emitted excessively (see [advice above](#Do-not-emit-excessively)).
 
-In addition to testing interactively, you can have unit tests check the number
-of times a user action was emitted.  See [user_action_tester.h](https://cs.chromium.org/chromium/src/base/test/metrics/user_action_tester.h)
+In addition to testing interactively, unit tests can check the number of times a
+user action was emitted. See [user_action_tester.h](https://cs.chromium.org/chromium/src/base/test/metrics/user_action_tester.h)
 for details.
 
-## Interpreting the Resulting Data
+## Interpreting the resulting data
 
 The top of [go/uma-guide](http://go/uma-guide) has good advice on how to go
-about analyzing and interpreting the results of UMA data uploaded by users.  If
+about analyzing and interpreting the results of UMA data uploaded by users. If
 you're reading this page, you've probably just finished adding a user action to
 the Chromium source code and you're waiting for users to update their version of
-Chrome to a version that includes your code.  In this case, the best advice is
-to remind you that users who update frequently / quickly are biased.  Best take
+Chrome to a version that includes your code. In this case, the best advice is
+to remind you that users who update frequently or quickly are biased. Best take
 the initial statistics with a grain of salt; they're probably *mostly* right but
 not entirely so.
 
-## Revising User Actions
+## Revising user actions
 
 When changing the semantics of a user action (when it's emitted), make it into
-a new user action with a new name.  Otherwise the dashboard will be mixing two
+a new user action with a new name. Otherwise the dashboard will mix two
 different interpretations of the data and make no sense.
 
-## Documenting User Actions
+## Documenting user actions
 
-Document user actions in [actions.xml](./actions.xml).  There is also a
-[google-internal version of the file](http://go/chrome-user-actions-internal)
-for the rare case when the user action is confidential (added only to Chrome
-code, not Chromium code; or, an accurate description about how to interpret the
-user action would reveal information about Google's plans).
+Document user actions in [actions.xml](./actions.xml). There is also a
+[Google-internal version of the file](http://go/chrome-user-actions-internal)
+for user actions that exist in Google-internal codebases. Confidential actions
+are added only to Chrome code, not Chromium code.
 
-### Add User Actions and Documentation in the Same Changelist
+### Add user actions and documentation in the same changelist
 
 If possible, please add the actions.xml description in the same changelist in
-which you add the user-action-emitting code.  This has several benefits.  One,
+which you add the user-action-emitting code. This has several benefits. One,
 it sometimes happens that the actions.xml reviewer has questions or concerns
 about the user action description that reveal problems with interpretation of
-the data and call for a different recording strategy.  Two, it allows the user
+the data and call for a different recording strategy. Two, it allows the user
 action reviewer to easily review the emission code to see if it comports with
 these best practices, and to look for other errors.
 
-### Understandable to Everyone
+### Understandable to everyone
 
-User actions descriptions should be understandable to someone not familiar with
-your feature.  Please add a sentence or two of background if necessary.
+User action descriptions should be understandable to someone not familiar with
+your feature. Please add a sentence or two of background if necessary.
 
-It is good practice to note caveats associated with your user actions in this
+It's a good practice to note caveats associated with your user actions in this
 section, such as which platforms are supported (if the set of supported
-platforms is surprising).  E.g., a desktop feature that happens not to be logged
-on Mac.
+platforms is surprising, such as a desktop feature that happens to not be logged
+on Mac).
 
-### State When It Is Emitted
+### State when it is emitted
 
 User action descriptions should clearly state when the action is emitted.
 
 ### Owners
 
-User actions need to have owners, who are the current experts on the metric. The
-owners are the contact points for any questions or maintenance tasks. It's a
-best practice to list multiple owners, so that there's no single point of
-failure for such communication.
+Each user action needs owners, who are the current expert on the metric. Owners
+are responsible for answering questions about the metric, handling any
+maintenance tasks, and deprecating the metric if it has outlived its usefulness.
+If you are using a metric heavily and understand it intimately, feel free to add
+yourself as an owner. @chromium.org email addresses are preferred.
 
-Being an owner means you are responsible for answering questions about the
-metric, handling the maintenance if there are functional changes, and
-deprecating the metric if it outlives its usefulness. If you are using a metric
-heavily and understand it intimately, feel free to add yourself as an owner.
-@chromium.org email addresses are preferred.
+The primary owner must be an individual, who is ultimately responsible for the
+metric. It's a best practice to list multiple owners, which makes it less likely
+that maintenance tasks will slip through the cracks. This is important because
+the metrics team may file bugs related to user actions, and such bugs need to be
+triaged by someone familiar with the metric. If an appropriate mailing list or
+team email is available, it's a good idea to list it as a secondary owner.
 
-If an appropriate mailing list is available, it's a good idea to include the
-mailing list as a secondary owner. However, it's always a best practice to list
-an individual as the primary owner. Listing an individual owner makes it clearer
-who is ultimately most responsible for maintaining the metric, which makes it
-less likely that such maintenance tasks will slip through the cracks.
-
-Notably, owners are asked to evaluate whether user actions have outlived their
-usefulness. The metrics team may file a bug in Monorail. It's important that
-somebody familiar with the user action notices and triages such bugs!
-
-### Set `not_user_triggered="true"` When Appropriate {#not_user_triggered}
+### Set `not_user_triggered="true"` when appropriate {#not_user_triggered}
 
 actions.xml allows you to annotate an action as `not_user_triggered="true"`.
-Use it when appropriate.  For example, showing a notification is not user
-triggered.  However, please remember: Before adding something marked as
+Use it when appropriate. For example, showing a notification is not user
+triggered. However, please remember: Before adding something marked as
 `not_user_triggered="true"`, consider whether you need to analyze sequences of
-actions.  If not, please use a histogram to count these events instead.
+actions. If not, please use a histogram to count these events instead.
 
-## Cleaning Up User Action Entries
+## Cleaning up user action entries
 
-Do not delete actions from actions.xml.  Instead, mark unused user actions as
+Do not delete actions from actions.xml. Instead, mark unused user actions as
 obsolete, annotating them with the associated date or milestone in the obsolete
 tag entry.
 
@@ -201,7 +194,7 @@ If the user action is being replaced by a new version:
 * Note in the `<obsolete>` message the name of the replacement action.
 
 * Make sure the descriptions of the original and replacement user actions
-  are different.  It's never appropriate for them to be identical.  Either
+  are different. It's never appropriate for them to be identical. Either
   the old description was wrong, and it should be revised to explain what
   it actually measured, or the old user action was measuring something not
   as useful as the replacement, in which case the new user action is
@@ -211,8 +204,8 @@ A changelist that marks a user action as obsolete should be reviewed by all
 current owners.
 
 Deleting user action entries would be bad if someone accidentally reused your
-old user action name and which therefore corrupts new data with whatever old
-data is still coming in.  It's also useful to keep obsolete user action
-descriptions in actions.xml--that way, if someone is searching for a user action
-to answer a particular question, they can learn if there was a user action at
-some point that did so even if it isn't active now.
+old user action name. If this happened, new data would be corrupted by whatever
+old data was still coming in. It's also useful to keep obsolete user action
+descriptions in actions.xml. That way, someone searching for a user action to
+answer a particular question can learn if there was a user action at some point
+that did so—even if it isn't active now.
diff --git a/chromium/tools/metrics/actions/actions.xml b/chromium/tools/metrics/actions/actions.xml
index b24ad3a3bd6..8a7065bd971 100644
--- a/chromium/tools/metrics/actions/actions.xml
+++ b/chromium/tools/metrics/actions/actions.xml
@@ -901,6 +901,13 @@ should be able to be added at any place in this file.
   <description>Please enter the description of this user action.</description>
 </action>
 
+<action name="Accel_Open_Diagnostics">
+  <owner>cros-peripherals@google.com</owner>
+  <description>
+    Records how often diagnostics is launched from accelerator.
+  </description>
+</action>
+
 <action name="Accel_Open_Feedback_Page">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <description>Please enter the description of this user action.</description>
@@ -1061,6 +1068,15 @@ should be able to be added at any place in this file.
   <description>Please enter the description of this user action.</description>
 </action>
 
+<action name="Accel_Show_Emoji_Picker">
+  <owner>jopalmer@chromium.org</owner>
+  <owner>essential-inputs-team@google.com</owner>
+  <description>
+    Number of times the user has opened the emoji picker using a keyboard
+    acccelerator.
+  </description>
+</action>
+
 <action name="Accel_Show_Ime_Menu_Bubble">
   <owner>azurewei@chromium.org</owner>
   <description>
@@ -1501,6 +1517,18 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="Accessibility.CrosSelectToSpeak.PauseSpeech">
+  <owner>ajitnarayanan@google.com</owner>
+  <description>A Chrome OS user manually pauses Select To Speak.</description>
+</action>
+
+<action name="Accessibility.CrosSelectToSpeak.ResumeSpeech">
+  <owner>ajitnarayanan@google.com</owner>
+  <description>
+    A Chrome OS user manually resumes Select To Speak after pausing.
+  </description>
+</action>
+
 <action name="Accessibility.CrosSelectToSpeak.StartSpeech">
   <owner>katie@chromium.org</owner>
   <description>A Chrome OS user manually starts Select To Speak.</description>
@@ -1644,6 +1672,44 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="AltBasedKeyRewrite_Delete">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>
+    User pressed Alt+Backspace to produce the Delete key.
+  </description>
+</action>
+
+<action name="AltBasedKeyRewrite_End">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>
+    User pressed Alt+Ctrl+DownArrow to produce the End key.
+  </description>
+</action>
+
+<action name="AltBasedKeyRewrite_Home">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>
+    User pressed Alt+Ctrl+UpArrow to produce the Home key.
+  </description>
+</action>
+
+<action name="AltBasedKeyRewrite_PageDown">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>
+    User pressed Alt+DownArrow to produce the PageDown key.
+  </description>
+</action>
+
+<action name="AltBasedKeyRewrite_PageUp">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>User pressed Alt+UpArrow to produce the PageUp key.</description>
+</action>
+
 <action name="AltClickMappedToRightClick">
   <owner>zentaro@chromium.org</owner>
   <description>
@@ -2894,6 +2960,15 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="Autofill_OfferNotificationInfoBar_DeepLinkClicked">
+  <owner>siashah@chromium.org</owner>
+  <owner>siyua@chromium.org</owner>
+  <description>
+    This user action is logged when user clicks on the &quot;See details&quot;
+    link shown in the Offer Notification InfoBar on mobile.
+  </description>
+</action>
+
 <action name="Autofill_OnWillSubmitForm">
   <owner>battre@chromium.org</owner>
   <description>
@@ -4627,6 +4702,11 @@ should be able to be added at any place in this file.
   <description>Please enter the description of this user action.</description>
 </action>
 
+<action name="ClearBrowsingData_SameSiteNoneData" not_user_triggered="true">
+  <owner>dylancutler@google.com</owner>
+  <description>SameSite=None cookies were deleted.</description>
+</action>
+
 <action name="ClearBrowsingData_ServerBoundCerts">
   <obsolete>This has been renamed ClearBrowsingData_ChannelIDs.</obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
@@ -5026,12 +5106,31 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="ContentSuggestions.Feed.CardAction.ManageActivity">
+  <owner>harringtond@chromium.org</owner>
+  <owner>carlosk@chromium.org</owner>
+  <owner>feed@chromium.org</owner>
+  <description>
+    The user selected the 'manage activity' option from the Feed header menu.
+  </description>
+</action>
+
 <action name="ContentSuggestions.Feed.CardAction.ManageInterests">
   <owner>harringtond@chromium.org</owner>
   <owner>carlosk@chromium.org</owner>
   <owner>feed@chromium.org</owner>
   <description>
-    The user selected the 'manage interests' option for a Feed card.
+    The user selected the 'manage interests' option from the Feed header menu.
+  </description>
+</action>
+
+<action name="ContentSuggestions.Feed.CardAction.ManageReactions">
+  <owner>harringtond@chromium.org</owner>
+  <owner>carlosk@chromium.org</owner>
+  <owner>feed@chromium.org</owner>
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <description>
+    The user selected the 'manage reactions' option from the Feed header menu.
   </description>
 </action>
 
@@ -5060,6 +5159,15 @@ should be able to be added at any place in this file.
   <description>The user tapped on a card in the Feed.</description>
 </action>
 
+<action name="ContentSuggestions.Feed.CardAction.Open.StartSurface">
+  <owner>hanxi@chromium.org</owner>
+  <owner>spdonghao@chromium.org</owner>
+  <owner>clank-start@google.com</owner>
+  <description>
+    The user tapped on a card in the Feed on the start surface.
+  </description>
+</action>
+
 <action name="ContentSuggestions.Feed.CardAction.OpenInNewIncognitoTab">
   <owner>harringtond@chromium.org</owner>
   <owner>carlosk@chromium.org</owner>
@@ -5881,6 +5989,32 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="DesktopReadingList.AddItem.FromBookmarkIcon">
+  <owner>corising@chromium.org</owner>
+  <owner>chrome-desktop-ui-sea@google.com</owner>
+  <description>
+    The user added to the reading list from the Bookmark icon entry point
+    (Desktop only).
+  </description>
+</action>
+
+<action name="DesktopReadingList.AddItem.FromTabContextMenu">
+  <owner>corising@chromium.org</owner>
+  <owner>chrome-desktop-ui-sea@google.com</owner>
+  <description>
+    The user added to the reading list from the tab context menu entry point
+    (Desktop only).
+  </description>
+</action>
+
+<action name="DesktopReadingList.OpenReadingList">
+  <owner>corising@chromium.org</owner>
+  <owner>chrome-desktop-ui-sea@google.com</owner>
+  <description>
+    The user clicked the Desktop reading list button to open the reading list.
+  </description>
+</action>
+
 <action name="DesktopSearch">
   <obsolete>
     Deprecated 05/2016 because desktop searches are no longer opened in the
@@ -7625,6 +7759,15 @@ should be able to be added at any place in this file.
   <description>The user opened incognito menu.</description>
 </action>
 
+<action name="IncognitoMode_Started">
+  <owner>rhalavati@chromium.org</owner>
+  <owner>chrome-incognito@google.com</owner>
+  <description>
+    An Incognito session is started. Recorded when an Incognito profile is
+    created.
+  </description>
+</action>
+
 <action name="IncompatibleApplicationsPage.ApplicationRemoved">
   <owner>pmonette@chromium.org</owner>
   <description>
@@ -9136,6 +9279,16 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="IOS.DefaultBrowserFullscreenPromo.RemindMeTapped">
+  <owner>thegreenfrog@chromium.org</owner>
+  <owner>rohitrao@chromium.org</owner>
+  <description>
+    The user tapped the &quot;Remind Me Later&quot; button in the default
+    browser fullscreen promo modal that takes the user to the Settings app. iOS
+    only.
+  </description>
+</action>
+
 <action name="IOS.DefaultBrowserNTPPromoTapped">
   <owner>thegreenfrog@chromium.org</owner>
   <owner>rohitrao@chromium.org</owner>
@@ -9158,7 +9311,7 @@ should be able to be added at any place in this file.
 
 <action name="IOS.OpenIn">
   <obsolete>Renamed to IOS.OpenIn.Tapped, 08/2020</obsolete>
-  <owner>eugenebut@chromium.org</owner>
+  <owner>ewannpv@chromium.org</owner>
   <owner>mrefaat@chromium.org</owner>
   <description>
     Recorded when the user taps on OPEN IN... button to share the page
@@ -9167,7 +9320,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="IOS.OpenIn.Presented" not_user_triggered="true">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>mrefaat@chromium.org</owner>
   <owner>ewannpv@chromium.org</owner>
   <description>
     Recorded when the user loads a web page containing a file that can be
@@ -9176,7 +9329,6 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="IOS.OpenIn.Tapped">
-  <owner>eugenebut@chromium.org</owner>
   <owner>mrefaat@chromium.org</owner>
   <owner>ewannpv@chromium.org</owner>
   <description>
@@ -9205,7 +9357,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="IOS.SearchEngines.RecentlyViewed.Delete">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>sczs@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <description>
     Recorded when user deletes for recently viewed search engines. iOS only.
@@ -9213,7 +9365,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="IOS.SearchEngines.RecentlyViewed.Edit">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>sczs@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <description>
     Recorded when user enters edit mode for recently viewed search engines. iOS
@@ -9231,7 +9383,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="IOSBookmarkManagerCloseWithSwipe">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>rohitrao@chromium.org</owner>
   <owner>sczs@chromium.org</owner>
   <description>
     Recorded when a user closes bookmark manager by swiping down. iOS-only.
@@ -9249,7 +9401,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="IOSDownloadClose">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>ewannpv@chromium.org</owner>
   <owner>sdefresne@chromium.org</owner>
   <description>
     User closed Download Manager UI by tapping x button when download was not
@@ -9258,7 +9410,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="IOSDownloadConfirmClose">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>ewannpv@chromium.org</owner>
   <owner>sdefresne@chromium.org</owner>
   <description>
     User confirmed download closure by tapping &quot;Stop&quot; on &quot;Stop
@@ -9267,7 +9419,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="IOSDownloadConfirmReplace">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>ewannpv@chromium.org</owner>
   <owner>sdefresne@chromium.org</owner>
   <description>
     User confirmed download replacement by tapping &quot;OK&quot; on &quot;Start
@@ -9276,7 +9428,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="IOSDownloadDoNotClose">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>ewannpv@chromium.org</owner>
   <owner>sdefresne@chromium.org</owner>
   <description>
     User rejected download closure by tapping &quot;Continue&quot; on &quot;Stop
@@ -9285,7 +9437,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="IOSDownloadDoNotReplace">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>ewannpv@chromium.org</owner>
   <owner>sdefresne@chromium.org</owner>
   <description>
     User rejected download replacement by tapping &quot;Cancel&quot; on
@@ -9294,13 +9446,13 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="IOSDownloadInstallGoogleDrive">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>ewannpv@chromium.org</owner>
   <owner>sdefresne@chromium.org</owner>
   <description>User tapped on Install Google Drive promo.</description>
 </action>
 
 <action name="IOSDownloadOpenIn">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>ewannpv@chromium.org</owner>
   <owner>sdefresne@chromium.org</owner>
   <description>
     User tapped on Open In... button after in Download Manager after download
@@ -9309,13 +9461,13 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="IOSDownloadStartDownload">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>ewannpv@chromium.org</owner>
   <owner>sdefresne@chromium.org</owner>
   <description>User started the download in Download Manager.</description>
 </action>
 
 <action name="IOSDownloadTryCloseWhenInProgress">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>ewannpv@chromium.org</owner>
   <owner>sdefresne@chromium.org</owner>
   <description>
     User tapped x button when download was in-progress. The Download Manager did
@@ -9335,7 +9487,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="IOSHistoryCloseWithSwipe">
-  <owner>eugenebut@google.com</owner>
+  <owner>rohitrao@chromium.org</owner>
   <owner>sczs@chromium.org</owner>
   <description>
     Recorded when a user closes History using swipe down gesture. iOS-only.
@@ -9343,7 +9495,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="IOSInspectPageVisited">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>rohitrao@chromium.org</owner>
   <owner>michaeldo@chromium.org</owner>
   <description>
     Recorded when the user loads the chrome://inspect page on iOS.
@@ -9351,7 +9503,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="IOSLanguagesSettingsCloseWithSwipe">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>sczs@chromium.org</owner>
   <owner>pkl@chromium.org</owner>
   <description>
     Reported when Languages Settings UI was dismissed using swipe down gesture.
@@ -9400,7 +9552,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="IOSReadingListCloseWithSwipe">
-  <owner>eugenebut@google.com</owner>
+  <owner>rohitrao@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <description>
     Recorded when a user closes Reading List with swipe down gesture. iOS-only.
@@ -12025,6 +12177,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="ManagedUsers_Chromeos_Sync_Recovered">
+  <obsolete>Legacy supervised users are deprecated</obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <description>Please enter the description of this user action.</description>
 </action>
@@ -12058,29 +12211,32 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="ManagedUsers_Whitelist_Added">
+  <obsolete>Deprecated as of 11/2020.</obsolete>
   <owner>bauerb@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <owner>pam@chromium.org</owner>
   <description>
-    A new whitelist has been installed for a supervised user.
+    A new allowlist has been installed for a supervised user.
   </description>
 </action>
 
 <action name="ManagedUsers_Whitelist_Removed">
+  <obsolete>Deprecated as of 11/2020.</obsolete>
   <owner>bauerb@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <owner>pam@chromium.org</owner>
   <description>
-    A whitelist has been uninstalled for a supervised user.
+    An allowlist has been uninstalled for a supervised user.
   </description>
 </action>
 
 <action name="ManagedUsers_Whitelist_UncleanUninstall">
+  <obsolete>Deprecated as of 11/2020.</obsolete>
   <owner>bauerb@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <owner>pam@chromium.org</owner>
   <description>
-    Recorded at startup if an unregistered whitelist has been found. This
+    Recorded at startup if an unregistered allowlist has been found. This
     usually means that an uninstallation did not complete.
   </description>
 </action>
@@ -12904,6 +13060,19 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="Mobile.SystemNotification.Content.Click.Downloads_Files">
+  <owner>xingliu@chromium.org</owner>
+  <owner>chrome-analysis-team@google.com</owner>
+  <description>
+    The user clicked on the body of an Android notification for a file download.
+    This is logged at the same time as the 'Downloads - File' value is logged to
+    Mobile.SystemNotification.Content.Click.
+
+    This action is of special interest to the chrome-analysis-team@. Do not
+    change its semantics or retire it without talking to them first.
+  </description>
+</action>
+
 <action name="Mobile_FocusedDefocusedOmnibox_WithNoAction">
   <owner>stkhapugin@chromium.org</owner>
   <description>
@@ -12913,7 +13082,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileAboutSettingsBack">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>sczs@chromium.org</owner>
   <description>
     Reported when user goes back from Chrome About Settings UI to root Settings
@@ -12922,7 +13091,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileAboutSettingsClose">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>sczs@chromium.org</owner>
   <description>
     Reported when Chrome About Settings UI was dismissed. iOS only.
@@ -13040,6 +13209,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileAddCreditCard.UseCameraButton">
+  <obsolete>Removed from code in November 2020</obsolete>
   <owner>gambard@chromium.org</owner>
   <description>
     User tapped on &quot;Use Camera&quot; from the settings add credit card
@@ -13065,7 +13235,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileBandwidthSettingsBack">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>sczs@chromium.org</owner>
   <description>
     Reported when user goes back from Bandwidth Settings UI to root Settings
@@ -13074,7 +13244,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileBandwidthSettingsClose">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>sczs@chromium.org</owner>
   <description>
     Reported when Bandwidth Settings UI was dismissed. iOS only.
@@ -13400,7 +13570,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileContentSettingsBack">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>sczs@chromium.org</owner>
   <description>
     Reported when user goes back from Content Settings UI to root Settings
@@ -13409,7 +13579,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileContentSettingsClose">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>sczs@chromium.org</owner>
   <description>
     s Reported when Content Settings UI was dismissed. iOS only.
@@ -13531,6 +13701,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileCreditCardScanner.Close">
+  <obsolete>Removed from code in November 2020</obsolete>
   <owner>gambard@chromium.org</owner>
   <description>
     User closed the Credit Card Scanner without scanning a credit card.
@@ -13538,6 +13709,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileCreditCardScanner.Error">
+  <obsolete>Removed from code in November 2020</obsolete>
   <owner>gambard@chromium.org</owner>
   <description>
     User closed the Credit Card Scanner from an error dialog.
@@ -13545,6 +13717,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileCreditCardScanner.ScannedCard">
+  <obsolete>Removed from code in November 2020</obsolete>
   <owner>gambard@chromium.org</owner>
   <description>
     User scanned a credit card using the Credit Card Scanner.
@@ -13552,6 +13725,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileCreditCardScanner.ScannedCardNumberModified">
+  <obsolete>Removed from code in November 2020</obsolete>
   <owner>gambard@chromium.org</owner>
   <description>
     User scanned a credit card using the Credit Card Scanner and scanned card
@@ -13560,6 +13734,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileCreditCardScanner.ScannedExpiryMonthModified">
+  <obsolete>Removed from code in November 2020</obsolete>
   <owner>gambard@chromium.org</owner>
   <description>
     User scanned a credit card using the Credit Card Scanner and scanned card
@@ -13568,6 +13743,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileCreditCardScanner.ScannedExpiryYearModified">
+  <obsolete>Removed from code in November 2020</obsolete>
   <owner>gambard@chromium.org</owner>
   <description>
     User scanned a credit card using the Credit Card Scanner and scanned card
@@ -13626,7 +13802,7 @@ should be able to be added at any place in this file.
   <obsolete>
     Removed in 12/2019 after adds of IOSDownloadFileUIGoogleDrive's histogram.
   </obsolete>
-  <owner>eugenebut@chromium.org</owner>
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <description>
     User has requested installation of Google Drive app from the Download file
     UI.
@@ -13637,7 +13813,7 @@ should be able to be added at any place in this file.
   <obsolete>
     Removed as of 11/2019 after adds of DownloadFileUI's histogram.
   </obsolete>
-  <owner>eugenebut@chromium.org</owner>
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <description>User was presented with the Download file UI.</description>
 </action>
 
@@ -13658,7 +13834,8 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileDownloadRetryDownload">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>ewannpv@chromium.org</owner>
+  <owner>sdefresne@chromium.org</owner>
   <description>
     User attempted to retry downloading a file after the download failed.
   </description>
@@ -13697,6 +13874,13 @@ should be able to be added at any place in this file.
   <description>User pressed the fakebox on NTP. iOS only.</description>
 </action>
 
+<action name="MobileFakeViewNTPTapped">
+  <owner>gambard@chromium.org</owner>
+  <description>
+    User pressed the fake view on the top of NTP. iOS only.
+  </description>
+</action>
+
 <action name="MobileFirstEditInOmnibox">
   <obsolete>Deprecated as of 12/2015</obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
@@ -13764,7 +13948,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileGoogleServicesSettingsBack">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>sczs@chromium.org</owner>
   <description>
     Reported when user goes back from Google Services Settings UI to root
@@ -13810,7 +13994,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileHistoryClose">
-  <owner>eugenebut@google.com</owner>
+  <owner>rohitrao@chromium.org</owner>
   <owner>sczs@chromium.org</owner>
   <description>Recorded when a user closes History on iOS.</description>
 </action>
@@ -13840,16 +14024,16 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileHttpAuthCancel">
-  <owner>eugenebut@chromium.org</owner>
-  <owner>kkhorimoto@chromium.org</owner>
+  <owner>ajuma@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <description>
     User cancelled HTTP Authentication dialog. iOS only.
   </description>
 </action>
 
 <action name="MobileHttpAuthSignIn">
-  <owner>eugenebut@chromium.org</owner>
-  <owner>kkhorimoto@chromium.org</owner>
+  <owner>ajuma@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <description>
     User confirmed provided credentials in HTTP Authentication dialog. iOS only.
   </description>
@@ -13999,6 +14183,15 @@ should be able to be added at any place in this file.
   <description>User pressed 'New tab' in the app menu.</description>
 </action>
 
+<action name="MobileMenuNewTab.StartSurfaceFinale">
+  <owner>hanxi@chromium.org</owner>
+  <owner>spdonghao@chromium.org</owner>
+  <owner>clank-start@google.com</owner>
+  <description>
+    User pressed 'New tab' in the app menu when start surface finale is enabled.
+  </description>
+</action>
+
 <action name="MobileMenuOpenTabs">
   <obsolete>This action was renamed to MobileMenuRecentTabs.</obsolete>
   <owner>aurimas@chromium.org</owner>
@@ -14487,6 +14680,15 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="MobileOmniboxLens">
+  <owner>yusuyoutube@google.com</owner>
+  <owner>benwgold@google.com</owner>
+  <owner>fgorski@chromium.org</owner>
+  <owner>wylieb@chromium.org</owner>
+  <owner>lens-chrome@google.com</owner>
+  <description>Mobile Omnibox Lens button clicked.</description>
+</action>
+
 <action name="MobileOmniboxRefineSuggestion">
   <obsolete>
     Deprecated 07/2017. Replaced by MobileOmniboxRefineSuggestion.Query and
@@ -14575,6 +14777,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileOmniboxUse.GridTabSwitcher">
+  <obsolete>From 04/2021 use MobileOmniboxUse.StartSurface instead.</obsolete>
   <owner>mattsimmons@chromium.org</owner>
   <owner>memex-team@google.com</owner>
   <description>
@@ -14582,6 +14785,15 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="MobileOmniboxUse.StartSurface">
+  <owner>hanxi@chromium.org</owner>
+  <owner>spdonghao@chromium.org</owner>
+  <owner>clank-start@google.com</owner>
+  <description>
+    User used the omnibox while it is showing on the start surface.
+  </description>
+</action>
+
 <action name="MobileOmniboxVoiceSearch">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <description>Please enter the description of this user action.</description>
@@ -14603,7 +14815,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobilePasswordsSettingsBack">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>kazinova@google.com</owner>
   <owner>sczs@chromium.org</owner>
   <description>
     Reported when user goes back from Passwords Settings UI to root Settings
@@ -14676,7 +14888,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobilePullGestureCloseTab">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>rkgibson@chromium.org</owner>
   <owner>michaeldo@chromium.org</owner>
   <description>
     Emitted on iOS when over-scroll action touch gesture closes current tab.
@@ -14686,7 +14898,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobilePullGestureNewTab">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>rkgibson@chromium.org</owner>
   <owner>michaeldo@chromium.org</owner>
   <description>
     Emitted on iOS when over-scroll action touch gesture opens a new tab. This
@@ -14696,7 +14908,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobilePullGestureReload">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>rkgibson@chromium.org</owner>
   <owner>tedchoc@chromium.org</owner>
   <description>
     Emitted on Android and iOS when a pull-to-refresh touch gesture initiates a
@@ -14733,7 +14945,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileReadingListClose">
-  <owner>eugenebut@google.com</owner>
+  <owner>rohitrao@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <description>Recorded when a user closes Reading List on iOS.</description>
 </action>
@@ -14870,7 +15082,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileReportAnIssueClosed">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>rohitrao@chromium.org</owner>
   <owner>sdefresne@chromium.org</owner>
   <description>
     The user dismissed Report An Issue screen by cancelling or submitting
@@ -14887,7 +15099,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileSearchEngineSettingsBack">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>sczs@chromium.org</owner>
   <description>
     Reported when user goes back from Search Engine Settings UI to root Settings
@@ -14896,7 +15108,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileSearchEngineSettingsClose">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>sczs@chromium.org</owner>
   <description>
     Reported when Search Engine Settings UI was dismissed. iOS only.
@@ -15660,6 +15872,15 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="MobileTopToolbarOptionalButtonNewTab">
+  <owner>bttk@chromium.org</owner>
+  <owner>clank-app-team@google.com</owner>
+  <description>
+    The user tapped on the top toolbar's optional button acting as a new tab
+    button.
+  </description>
+</action>
+
 <action name="MobileTopToolbarShareButton">
   <owner>jeffreycohen@chromium.org</owner>
   <owner>tgupta@chromium.org</owner>
@@ -15732,7 +15953,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileWebContextMenuCopyImage">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>michaeldo@chromium.org</owner>
   <description>
     Recorded when user taps Copy Image in context menu. iOS only.
@@ -15740,7 +15961,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileWebContextMenuCopyLink">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>michaeldo@chromium.org</owner>
   <description>
     Recorded when user taps Copy Link in context menu. iOS only.
@@ -15748,7 +15969,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileWebContextMenuImageImpression">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>michaeldo@chromium.org</owner>
   <description>
     Recorded when user invokes context menu for web contents image. iOS only.
@@ -15756,7 +15977,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileWebContextMenuLinkImpression">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>michaeldo@chromium.org</owner>
   <description>
     Recorded when user invokes context menu for web contents link. iOS only.
@@ -15764,7 +15985,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileWebContextMenuOpenImage">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>michaeldo@chromium.org</owner>
   <description>
     Recorded when user taps Open Image in context menu. iOS only.
@@ -15772,7 +15993,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileWebContextMenuOpenImageInNewTab">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>michaeldo@chromium.org</owner>
   <description>
     Recorded when user taps Open Image In New Tab in context menu. iOS only.
@@ -15780,7 +16001,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileWebContextMenuOpenInIncognitoTab">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>michaeldo@chromium.org</owner>
   <description>
     Recorded when user taps Open In Incognito Tab in context menu. iOS only.
@@ -15788,7 +16009,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileWebContextMenuOpenInNewTab">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>michaeldo@chromium.org</owner>
   <description>
     Recorded when user taps Open In New Tab in context menu. iOS only.
@@ -15804,15 +16025,18 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileWebContextMenuOpenJS">
-  <owner>eugenebut@chromium.org</owner>
+  <obsolete>
+    Deprecated as of 2021/01/26 as the feature has been removed.
+  </obsolete>
   <owner>michaeldo@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <description>
     Recorded when user taps Open Java Script in context menu. iOS only.
   </description>
 </action>
 
 <action name="MobileWebContextMenuReadLater">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>michaeldo@chromium.org</owner>
   <description>
     Recorded when user taps Read Later in context menu. iOS only.
@@ -15820,7 +16044,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileWebContextMenuSaveImage">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>michaeldo@chromium.org</owner>
   <description>
     Recorded when user taps Save Image in context menu. iOS only.
@@ -15828,7 +16052,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileWebContextMenuSearchByImage">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>michaeldo@chromium.org</owner>
   <description>
     Recorded when user taps Search By Image in context menu. iOS only.
@@ -15855,7 +16079,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="MobileWillEnterForeground">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>olivierrobin@chromium.org</owner>
   <owner>marq@chromium.org</owner>
   <description>
     App transitioned from background to foreground. This action is directly or
@@ -16147,7 +16371,7 @@ should be able to be added at any place in this file.
 
 <action name="NativeFileSystemAPI.OpenedBubble">
   <owner>mek@chromium.org</owner>
-  <owner>src/content/browser/native_file_system/OWNERS</owner>
+  <owner>src/content/browser/file_system_access/OWNERS</owner>
   <description>
     Recorded any time the user opens the usage indicator bubble for the Native
     File System API.
@@ -16156,7 +16380,7 @@ should be able to be added at any place in this file.
 
 <action name="NativeFileSystemAPI.RevokePermissions">
   <owner>mek@chromium.org</owner>
-  <owner>src/content/browser/native_file_system/OWNERS</owner>
+  <owner>src/content/browser/file_system_access/OWNERS</owner>
   <description>
     Recorded any time the user revokes all Native File System API permissions
     from the usage indicator bubble.
@@ -16178,12 +16402,36 @@ should be able to be added at any place in this file.
   <description>Please enter the description of this user action.</description>
 </action>
 
+<action name="Navigation.Home.NotChromeInternal">
+  <owner>mpearson@chromium.org</owner>
+  <owner>amaralp@chromium.org</owner>
+  <owner>chrome-analysis-team@google.com</owner>
+  <description>
+    Emitted every time a user uses a Home button to go to their home page and
+    their the page is not chrome-internal (such as an actual web site instead of
+    the New Tab Page or about:blank). For the purpose of this action, about:,
+    chrome: and chrome-native: are considered chrome-internal; everything else
+    is not.
+
+    This is logged at the same time that the Navigation.Home.IsChromeInternal
+    histogram is logged.
+
+    This action is of special interest to the chrome-analysis-team@. Do not
+    change its semantics or retire it without talking to them first.
+  </description>
+</action>
+
 <action name="Net.URLRequest_StartJob_InvalidReferrer">
   <obsolete>Deprecated 6/2018.</obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <description>Please enter the description of this user action.</description>
 </action>
 
+<action name="NewGuestWindow">
+  <owner>rhalavati@chromium.org</owner>
+  <description>The user opened a Guest window.</description>
+</action>
+
 <action name="NewIncognitoTabTipTargetSelected">
   <owner>gambard@chromium.org</owner>
   <description>
@@ -16193,8 +16441,15 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="NewIncognitoWindow">
-  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
-  <description>Please enter the description of this user action.</description>
+  <owner>rhalavati@chromium.org</owner>
+  <description>
+    The user opened an off-the-record window (Incognito or Guest).
+  </description>
+</action>
+
+<action name="NewIncognitoWindow2">
+  <owner>rhalavati@chromium.org</owner>
+  <description>The user opened an Incognito window.</description>
 </action>
 
 <action name="NewProfileWindowByIndex">
@@ -16212,6 +16467,64 @@ should be able to be added at any place in this file.
   <description>Please enter the description of this user action.</description>
 </action>
 
+<action name="NewTabPage.Carts.HideModule">
+  <owner>wychen@chromium.org</owner>
+  <owner>yuezhanggg@chromium.org</owner>
+  <owner>chrome-shopping@google.com</owner>
+  <description>
+    The 'Hide these carts' option is clicked in the cart module menu to
+    temporarily hide the module.
+  </description>
+</action>
+
+<action name="NewTabPage.Carts.LeftScrollClick">
+  <owner>wychen@chromium.org</owner>
+  <owner>yuezhanggg@chromium.org</owner>
+  <owner>chrome-shopping@google.com</owner>
+  <description>
+    The scroll button on the left side of the module is clicked in order to see
+    carts on the left.
+  </description>
+</action>
+
+<action name="NewTabPage.Carts.RemoveModule">
+  <owner>wychen@chromium.org</owner>
+  <owner>yuezhanggg@chromium.org</owner>
+  <owner>chrome-shopping@google.com</owner>
+  <description>
+    The 'Never show carts' option is clicked in the cart module menu to
+    permanently remove the module.
+  </description>
+</action>
+
+<action name="NewTabPage.Carts.RightScrollClick">
+  <owner>wychen@chromium.org</owner>
+  <owner>yuezhanggg@chromium.org</owner>
+  <owner>chrome-shopping@google.com</owner>
+  <description>
+    The scroll button on the right side of the module is clicked in order to see
+    carts on the right.
+  </description>
+</action>
+
+<action name="NewTabPage.Carts.UndoHideModule">
+  <owner>wychen@chromium.org</owner>
+  <owner>yuezhanggg@chromium.org</owner>
+  <owner>chrome-shopping@google.com</owner>
+  <description>
+    An attempt to temporarily hide the cart module is undone.
+  </description>
+</action>
+
+<action name="NewTabPage.Carts.UndoRemoveModule">
+  <owner>wychen@chromium.org</owner>
+  <owner>yuezhanggg@chromium.org</owner>
+  <owner>chrome-shopping@google.com</owner>
+  <description>
+    An attempt to permanently remove the cart module is undone.
+  </description>
+</action>
+
 <action name="NewTabPage.LinkOpenedFromContextMenu.WebUI">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
@@ -16261,6 +16574,18 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="NewTabPage.SearchBox.Lens">
+  <owner>yusuyoutube@google.com</owner>
+  <owner>benwgold@google.com</owner>
+  <owner>fgorski@chromium.org</owner>
+  <owner>wylieb@chromium.org</owner>
+  <owner>lens-chrome@google.com</owner>
+  <description>
+    Recorded when the user taps the Lens button in the search box on the new tab
+    page.
+  </description>
+</action>
+
 <action name="NewTabPage_ContentSuggestions_ArticlesUsage"
     not_user_triggered="true">
   <owner>markusheintz@chromium.org</owner>
@@ -16454,6 +16779,9 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Notifications.WebPlatform.ActionButton.Click">
+  <obsolete>
+    From 2021-03 use Notifications.WebPlatformV2 instead; it's equivalent.
+  </obsolete>
   <owner>peconn@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <description>
@@ -16463,6 +16791,9 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Notifications.WebPlatform.ActionButton.Close">
+  <obsolete>
+    From 2021-03 use Notifications.WebPlatformV2 instead; it's equivalent.
+  </obsolete>
   <owner>peconn@chromium.org</owner>
   <owner>beverloo@chromium.org</owner>
   <description>
@@ -16472,6 +16803,9 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Notifications.WebPlatform.ActionButton.FocusActivity">
+  <obsolete>
+    From 2021-03 use Notifications.WebPlatformV2 instead; it's equivalent.
+  </obsolete>
   <owner>peconn@chromium.org</owner>
   <owner>beverloo@chromium.org</owner>
   <description>
@@ -16481,6 +16815,9 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Notifications.WebPlatform.ActionButton.NewActivity">
+  <obsolete>
+    From 2021-03 use Notifications.WebPlatformV2 instead; it's equivalent.
+  </obsolete>
   <owner>peconn@chromium.org</owner>
   <owner>beverloo@chromium.org</owner>
   <description>
@@ -16490,14 +16827,18 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Notifications.WebPlatform.Body.Click">
+  <obsolete>From 2021-03 use Notifications.WebPlatformV2 instead.</obsolete>
   <owner>peconn@chromium.org</owner>
   <owner>beverloo@chromium.org</owner>
   <description>
     Recorded when the user clicks on the body of a web platform notification.
+    This metric had a bug where it also counted cases where the user dismissed
+    the notification, invalidating this and related actions.
   </description>
 </action>
 
 <action name="Notifications.WebPlatform.Body.Close">
+  <obsolete>From 2021-03 use Notifications.WebPlatformV2 instead.</obsolete>
   <owner>peconn@chromium.org</owner>
   <owner>beverloo@chromium.org</owner>
   <description>
@@ -16507,6 +16848,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Notifications.WebPlatform.Body.FocusActivity">
+  <obsolete>From 2021-03 use Notifications.WebPlatformV2 instead.</obsolete>
   <owner>peconn@chromium.org</owner>
   <owner>beverloo@chromium.org</owner>
   <description>
@@ -16516,6 +16858,78 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Notifications.WebPlatform.Body.NewActivity">
+  <obsolete>From 2021-03 use Notifications.WebPlatformV2 instead.</obsolete>
+  <owner>peconn@chromium.org</owner>
+  <owner>beverloo@chromium.org</owner>
+  <description>
+    Recorded when the user clicks on the body of a web platform notification,
+    and the notification opens a new Activity.
+  </description>
+</action>
+
+<action name="Notifications.WebPlatformV2.ActionButton.Click">
+  <owner>peconn@chromium.org</owner>
+  <owner>peter@chromium.org</owner>
+  <description>
+    Recorded when the user clicks on the action button of a web platform
+    notification.
+  </description>
+</action>
+
+<action name="Notifications.WebPlatformV2.ActionButton.Close">
+  <owner>peconn@chromium.org</owner>
+  <owner>beverloo@chromium.org</owner>
+  <description>
+    Recorded when the user clicks on the action button of a web platform
+    notification, and the notification closes.
+  </description>
+</action>
+
+<action name="Notifications.WebPlatformV2.ActionButton.FocusActivity">
+  <owner>peconn@chromium.org</owner>
+  <owner>beverloo@chromium.org</owner>
+  <description>
+    Recorded when the user clicks on the action button of a web platform
+    notification, and the notification focuses an Activity.
+  </description>
+</action>
+
+<action name="Notifications.WebPlatformV2.ActionButton.NewActivity">
+  <owner>peconn@chromium.org</owner>
+  <owner>beverloo@chromium.org</owner>
+  <description>
+    Recorded when the user clicks on the action button of a web platform
+    notification, and the notification opens a new Activity.
+  </description>
+</action>
+
+<action name="Notifications.WebPlatformV2.Body.Click">
+  <owner>peconn@chromium.org</owner>
+  <owner>beverloo@chromium.org</owner>
+  <description>
+    Recorded when the user clicks on the body of a web platform notification.
+  </description>
+</action>
+
+<action name="Notifications.WebPlatformV2.Body.Close">
+  <owner>peconn@chromium.org</owner>
+  <owner>beverloo@chromium.org</owner>
+  <description>
+    Recorded when the user clicks on the body of a web platform notification,
+    and the notification closes.
+  </description>
+</action>
+
+<action name="Notifications.WebPlatformV2.Body.FocusActivity">
+  <owner>peconn@chromium.org</owner>
+  <owner>beverloo@chromium.org</owner>
+  <description>
+    Recorded when the user clicks on the body of a web platform notification,
+    and the notification focuses an Activity.
+  </description>
+</action>
+
+<action name="Notifications.WebPlatformV2.Body.NewActivity">
   <owner>peconn@chromium.org</owner>
   <owner>beverloo@chromium.org</owner>
   <description>
@@ -19042,7 +19456,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="OverscrollActionCloseTab">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>rkgibson@chromium.org</owner>
   <owner>kkhorimoto@chromium.org</owner>
   <description>
     Called when the user closes the tab using overscroll action.
@@ -19863,16 +20277,19 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="PPAPI.BrokerInfobarClickedAllow">
+  <obsolete>Deprecated since the feature is deprecated.</obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <description>Please enter the description of this user action.</description>
 </action>
 
 <action name="PPAPI.BrokerInfobarClickedDeny">
+  <obsolete>Deprecated since the feature is deprecated.</obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <description>Please enter the description of this user action.</description>
 </action>
 
 <action name="PPAPI.BrokerInfobarDisplayed">
+  <obsolete>Deprecated since the feature is deprecated.</obsolete>
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <description>Please enter the description of this user action.</description>
 </action>
@@ -20288,6 +20705,22 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="RenderViewContextMenu.Used.IDC_CONTENT_CONTEXT_SEARCHWEBFOR">
+  <owner>avi@chromium.org</owner>
+  <owner>mpearson@chromium.org</owner>
+  <owner>chrome-analysis-team@google.com</owner>
+  <description>
+    Emitted whenever the IDC_CONTENT_CONTEXT_SEARCHWEBFOR context menu item is
+    used.
+
+    This is logged at the same time that the RenderViewContextMenu.Used
+    histogram is logged.
+
+    This action is of special interest to the chrome-analysis-team@. Do not
+    change its semantics or retire it without talking to them first.
+  </description>
+</action>
+
 <action name="ReportBug">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <description>Please enter the description of this user action.</description>
@@ -20733,6 +21166,22 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="Search.ContextualSearch.All.ResultsSeen.true">
+  <owner>donnd@chromium.org</owner>
+  <owner>contextual-search-eng@google.com</owner>
+  <owner>chrome-analysis-team@google.com</owner>
+  <description>
+    Records that the user opened the contextual search panel when it was shown.
+    Implemented for Android.
+
+    This is logged at the same time that a true value is logged to the
+    Search.ContextualSearch.All.ResultsSeen histogram.
+
+    This action is of special interest to the chrome-analysis-team@. Do not
+    change its semantics or retire it without talking to them first.
+  </description>
+</action>
+
 <action name="Search.QueryTiles.NTP.FakeSearchBox.Chip.Cleared">
   <owner>shaktisahu@chromium.org</owner>
   <owner>chrome-upboarding@google.com</owner>
@@ -20769,6 +21218,54 @@ should be able to be added at any place in this file.
   <description>User interacts with an answer card.</description>
 </action>
 
+<action name="SearchBasedKeyRewrite_Delete">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>
+    User pressed Search+Backspace to produce the Delete key.
+  </description>
+</action>
+
+<action name="SearchBasedKeyRewrite_End">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>
+    User pressed Search+RightArrow to produce the End key.
+  </description>
+</action>
+
+<action name="SearchBasedKeyRewrite_Home">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>
+    User pressed Search+LeftArrow to produce the Home key.
+  </description>
+</action>
+
+<action name="SearchBasedKeyRewrite_Insert">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>
+    User pressed Search+Period to produce the Insert key.
+  </description>
+</action>
+
+<action name="SearchBasedKeyRewrite_PageDown">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>
+    User pressed Search+DownArrow to produce the PageDown key.
+  </description>
+</action>
+
+<action name="SearchBasedKeyRewrite_PageUp">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>
+    User pressed Search+UpArrow to produce the PageUp key.
+  </description>
+</action>
+
 <action name="SearchClickMappedToRightClick">
   <owner>zentaro@chromium.org</owner>
   <description>
@@ -20844,6 +21341,78 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="SearchPlusDigitRewrite_F1">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>User pressed Search+1 to produce the F1 key.</description>
+</action>
+
+<action name="SearchPlusDigitRewrite_F10">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>User pressed Search+0 to produce the F10 key.</description>
+</action>
+
+<action name="SearchPlusDigitRewrite_F11">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>User pressed Search+Minus to produce the F11 key.</description>
+</action>
+
+<action name="SearchPlusDigitRewrite_F12">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>User pressed Search+Equals to produce the F12 key.</description>
+</action>
+
+<action name="SearchPlusDigitRewrite_F2">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>User pressed Search+2 to produce the F2 key.</description>
+</action>
+
+<action name="SearchPlusDigitRewrite_F3">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>User pressed Search+3 to produce the F3 key.</description>
+</action>
+
+<action name="SearchPlusDigitRewrite_F4">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>User pressed Search+4 to produce the F4 key.</description>
+</action>
+
+<action name="SearchPlusDigitRewrite_F5">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>User pressed Search+5 to produce the F5 key.</description>
+</action>
+
+<action name="SearchPlusDigitRewrite_F6">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>User pressed Search+6 to produce the F6 key.</description>
+</action>
+
+<action name="SearchPlusDigitRewrite_F7">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>User pressed Search+7 to produce the F7 key.</description>
+</action>
+
+<action name="SearchPlusDigitRewrite_F8">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>User pressed Search+8 to produce the F8 key.</description>
+</action>
+
+<action name="SearchPlusDigitRewrite_F9">
+  <owner>zentaro@chromium.org</owner>
+  <owner>jimmyxgong@chromium.org</owner>
+  <description>User pressed Search+9 to produce the F9 key.</description>
+</action>
+
 <action name="SearchWidget.SearchMade">
   <owner>yusufo@chromium.org</owner>
   <description>
@@ -20962,7 +21531,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="SessionCrashedInfobarClose">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <description>
     Logged when user taps on close button that dismisses tab restoration UI when
@@ -20971,7 +21540,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="SessionCrashedInfobarRestore">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <description>
     Logged when user taps on Restore button that restores tabs when the app was
@@ -20980,7 +21549,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Settings.Bandwidth">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>sczs@chromium.org</owner>
   <description>
     Reported when user navigates to Bandwidth Settings. iOS only.
@@ -20988,7 +21557,7 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Settings.ContentSettings">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <owner>sczs@chromium.org</owner>
   <description>
     Reported when user navigates to Content Settings. iOS only.
@@ -21075,6 +21644,67 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="Settings.PrivacySandbox.ApisDisabled">
+  <owner>rainhard@chromium.org</owner>
+  <owner>sauski@google.com</owner>
+  <owner>msramek@chromium.org</owner>
+  <description>
+    User disables the privacy sandbox APIs in the privacy sandbox page.
+  </description>
+</action>
+
+<action name="Settings.PrivacySandbox.ApisEnabled">
+  <owner>rainhard@chromium.org</owner>
+  <owner>sauski@google.com</owner>
+  <owner>msramek@chromium.org</owner>
+  <description>
+    User enables the privacy sandbox APIs in the privacy sandbox page.
+  </description>
+</action>
+
+<action name="Settings.PrivacySandbox.Block3PCookies">
+  <owner>rainhard@chromium.org</owner>
+  <owner>sauski@google.com</owner>
+  <owner>msramek@chromium.org</owner>
+  <description>
+    User changes cookie setting and moves from a state where 3P cookies are
+    enabled, to one where 3P cookies are disabled. Only recorded if the privacy
+    sandox feature is enabled, and the privacy sandbox API preference is
+    enabled. A toast linking the provacy sandbox page is shown immediately
+    following this action.
+  </description>
+</action>
+
+<action name="Settings.PrivacySandbox.OpenedFromCookiesPageToast">
+  <owner>rainhard@chromium.org</owner>
+  <owner>sauski@google.com</owner>
+  <owner>msramek@chromium.org</owner>
+  <description>
+    User clicks the toast shown on the cookies page after blocking 3P cookies to
+    open the privacy sandbox page.
+  </description>
+</action>
+
+<action name="Settings.PrivacySandbox.OpenedFromSettingsParent">
+  <owner>rainhard@chromium.org</owner>
+  <owner>sauski@google.com</owner>
+  <owner>msramek@chromium.org</owner>
+  <description>
+    User clicks the privacy sandbox row in the privacy page to open the privacy
+    sandbox page.
+  </description>
+</action>
+
+<action name="Settings.PrivacySandbox.OpenExplainer">
+  <owner>rainhard@chromium.org</owner>
+  <owner>sauski@google.com</owner>
+  <owner>msramek@chromium.org</owner>
+  <description>
+    User clicks the details button in the privacy sandbox page to see the
+    privacy sandbox explainer.
+  </description>
+</action>
+
 <action name="Settings.SafetyCheck.ChromeCleanerCaretNavigation">
   <owner>rainhard@chromium.org</owner>
   <owner>msramek@chromium.org</owner>
@@ -21105,7 +21735,8 @@ should be able to be added at any place in this file.
   <owner>andzaytsev@google.com</owner>
   <owner>msramek@chromium.org</owner>
   <description>
-    User clicks the manage passwords button in safety check.
+    User clicks the manage passwords button in safety check when compromised
+    passwords have been found.
   </description>
 </action>
 
@@ -21132,6 +21763,15 @@ should be able to be added at any place in this file.
   <description>User clicks the safe browsing row in safety check.</description>
 </action>
 
+<action name="Settings.SafetyCheck.ManageWeakPasswords">
+  <owner>rainhard@chromium.org</owner>
+  <owner>msramek@chromium.org</owner>
+  <description>
+    User clicks the manage passwords button in safety check when weak passwords
+    have been found.
+  </description>
+</action>
+
 <action name="Settings.SafetyCheck.RelaunchAfterUpdates">
   <owner>rainhard@chromium.org</owner>
   <owner>andzaytsev@google.com</owner>
@@ -21421,6 +22061,27 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="SharingHubAndroid.LinkGeneration.Failure">
+  <owner>cheickcisse@google.com</owner>
+  <description>
+    The user request to share link-to-text in the sharing hub failed.
+  </description>
+</action>
+
+<action name="SharingHubAndroid.LinkGeneration.Link">
+  <owner>cheickcisse@google.com</owner>
+  <description>
+    The user requested sharing the link-to-text in the sharing hub.
+  </description>
+</action>
+
+<action name="SharingHubAndroid.LinkGeneration.Text">
+  <owner>cheickcisse@google.com</owner>
+  <description>
+    The user requested sharing the text only in the sharing hub.
+  </description>
+</action>
+
 <action name="SharingHubAndroid.LinkToTextSelected">
   <owner>gayane@chromium.org</owner>
   <owner>src/components/send_tab_to_self/OWNERS</owner>
@@ -21429,6 +22090,14 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="SharingHubAndroid.LongScreenshotSelected">
+  <owner>kmilka@chromium.org</owner>
+  <owner>src/components/send_tab_to_self/OWNERS</owner>
+  <description>
+    The &quot;Long Screenshot&quot; option was selected in the sharing hub.
+  </description>
+</action>
+
 <action name="SharingHubAndroid.MoreSelected">
   <owner>kmilka@chromium.org</owner>
   <owner>src/components/send_tab_to_self/OWNERS</owner>
@@ -21799,6 +22468,11 @@ should be able to be added at any place in this file.
   <description>Please enter the description of this user action.</description>
 </action>
 
+<action name="ShowKaleidoscope">
+  <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
+  <description>Please enter the description of the metric.</description>
+</action>
+
 <action name="ShowModalDialog">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <description>Please enter the description of this user action.</description>
@@ -22000,6 +22674,16 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="Signin_Impression_FromKaleidoscope">
+  <owner>beccahughes@chromium.org</owner>
+  <owner>steimel@chromium.org</owner>
+  <owner>mlamouri@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
+  <description>
+    Recorded when showing a sign-in page from Kaleidoscope.
+  </description>
+</action>
+
 <action name="Signin_Impression_FromManageCardsBubble"
     not_user_triggered="true">
   <owner>manasverma@google.com</owner>
@@ -22089,6 +22773,15 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="Signin_Impression_FromUserManager" not_user_triggered="true">
+  <owner>jkrcal@chromium.org</owner>
+  <owner>droger@chromium.org</owner>
+  <description>
+    Recorded when showing sign in entry in the profile creation flow (as part of
+    the profile picker).
+  </description>
+</action>
+
 <action name="Signin_ImpressionWithAccount_FromAvatarBubbleSignin"
     not_user_triggered="true">
   <owner>msarda@chromium.org</owner>
@@ -24852,6 +25545,9 @@ should be able to be added at any place in this file.
 </action>
 
 <action name="Suggestions.Tile.Tapped.GridTabSwitcher">
+  <obsolete>
+    From 04/2021 use Suggestions.Tile.Tapped.StartSurface instead.
+  </obsolete>
   <owner>mattsimmons@chromium.org</owner>
   <owner>memex-team@google.com</owner>
   <description>
@@ -24860,6 +25556,16 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="Suggestions.Tile.Tapped.StartSurface">
+  <owner>hanxi@chromium.org</owner>
+  <owner>spdonghao@chromium.org</owner>
+  <owner>clank-start@google.com</owner>
+  <description>
+    User tapped on a suggestions tile while viewing the start surface.
+    Android-only.
+  </description>
+</action>
+
 <action name="SupervisedUsers_Extensions_ApprovalGranted">
   <owner>tobyhuang@chromium.org</owner>
   <owner>agawronska@chromium.org</owner>
@@ -25788,6 +26494,18 @@ should be able to be added at any place in this file.
   <description>Please enter the description of this user action.</description>
 </action>
 
+<action name="TasksSurface.FakeBox.Lens">
+  <owner>yusuyoutube@google.com</owner>
+  <owner>benwgold@google.com</owner>
+  <owner>fgorski@chromium.org</owner>
+  <owner>wylieb@chromium.org</owner>
+  <owner>lens-chrome@google.com</owner>
+  <description>
+    Recorded when the user taps the Lens button in the fake box on the tasks
+    surface on Android.
+  </description>
+</action>
+
 <action name="TasksSurface.FakeBox.LongPressed">
   <owner>gogerald@chromium.org</owner>
   <description>
@@ -26934,6 +27652,29 @@ should be able to be added at any place in this file.
   </description>
 </action>
 
+<action name="WindowNaming_Cleared">
+  <owner>ellyjones@chromium.org</owner>
+  <description>
+    Logged when the user accepts the &quot;Name Window...&quot; prompt to clear
+    a custom name for a browser window.
+  </description>
+</action>
+
+<action name="WindowNaming_DialogShown">
+  <owner>ellyjones@chromium.org</owner>
+  <description>
+    Logged when the user opens the &quot;Name Window...&quot; prompt.
+  </description>
+</action>
+
+<action name="WindowNaming_Set">
+  <owner>ellyjones@chromium.org</owner>
+  <description>
+    Logged when the user accepts the &quot;Name Window...&quot; prompt to set a
+    custom name for a browser window.
+  </description>
+</action>
+
 <action name="WindowSelector_ActiveWindowChanged">
   <owner>tbuckley@chromium.org</owner>
   <description>
@@ -27083,6 +27824,10 @@ should be able to be added at any place in this file.
 
 <action name="XR.ARCoreDeviceProviderFactory.NotInstalled"
     not_user_triggered="true">
+  <obsolete>
+    The code that caused the issue this action was meant to track is no longer
+    present.
+  </obsolete>
   <owner>bialpio@chromium.org</owner>
   <description>
     Raised when XR service was unable to obtain necessary component. The action
@@ -27177,14 +27922,19 @@ should be able to be added at any place in this file.
   <suffix name="MediaDownload" label="For MediaDownload feature."/>
   <suffix name="NewIncognitoTabTip" label="For NewIncognitoTabTip feature."/>
   <suffix name="NewTab" label="For NewTab feature."/>
-  <suffix name="NewTabPageButton" label="For NewTabPageButton feature."/>
+  <suffix name="NewTabPageButton" label="Deprecated in M79-."/>
+  <suffix name="NewTabPageHomeButton"
+      label="For NewTabPageHomeButton feature."/>
   <suffix name="NewTabTip" label="For NewTabTip feature."/>
+  <suffix name="PageInfo" label="In product help for opening PageInfo."/>
   <suffix name="PasswordsAccountStorage"
       label="For PasswordsAccountStorage feature."/>
   <suffix name="PreviewsOmniboxUI"
       label="For the Previews UI in the Android Omnibox feature."/>
   <suffix name="QuietNotificationPrompts"
       label="For the quiet notification prompts feature."/>
+  <suffix name="ReadingListDiscovery"
+      label="For ReadingListDiscoveryFeature feature."/>
   <suffix name="ReopenTab" label="For ReopenTab feature."/>
   <suffix name="TabGroupsDragAndDrop" label="For drop-to-merge in tab group."/>
   <suffix name="TabGroupsQuicklyComparePages"
@@ -27192,6 +27942,7 @@ should be able to be added at any place in this file.
   <suffix name="TabGroupsTapToSeeAnotherTab" label="For tab strip."/>
   <suffix name="TabGroupsYourTabsTogether"
       label="For tab switcher with tab groups."/>
+  <suffix name="TabSwitcherButton" label="For tab switcher button."/>
   <suffix name="TranslateMenuButton" label="For translate menu button."/>
   <suffix name="VideoTutorial_NTP_ChromeIntro"
       label="For Chrome intro video tutorial."/>
diff --git a/chromium/tools/metrics/actions/extract_actions.py b/chromium/tools/metrics/actions/extract_actions.py
index 11982d5995c..d94bcbc5b85 100755
--- a/chromium/tools/metrics/actions/extract_actions.py
+++ b/chromium/tools/metrics/actions/extract_actions.py
@@ -25,7 +25,6 @@ from __future__ import print_function
 
 __author__ = 'evanm (Evan Martin)'
 
-from HTMLParser import HTMLParser
 import logging
 import os
 import re
@@ -33,6 +32,11 @@ import shutil
 import sys
 from xml.dom import minidom
 
+if sys.version_info.major == 2:
+  from HTMLParser import HTMLParser
+else:
+  from html.parser import HTMLParser
+
 import action_utils
 import actions_model
 
@@ -372,7 +376,7 @@ def GrepForActions(path, actions):
       if not action_name:
         break
       actions.add(action_name)
-    except InvalidStatementException, e:
+    except InvalidStatementException as e:
       logging.warning(str(e))
 
   if action_re != USER_METRICS_ACTION_RE:
@@ -439,7 +443,7 @@ def GrepForWebUIActions(path, actions):
     # ensure the path of the file being parsed gets printed if that happens.
     close_called = True
     parser.close()
-  except Exception, e:
+  except Exception as e:
     print("Error encountered for path %s" % path)
     raise e
   finally:
@@ -468,7 +472,7 @@ def GrepForDevToolsActions(path, actions):
       if not action_name:
         break
       actions.add(action_name)
-    except InvalidStatementException, e:
+    except InvalidStatementException as e:
       logging.warning(str(e))
 
 def WalkDirectory(root_path, actions, extensions, callback):
diff --git a/chromium/tools/metrics/common/diff_util.py b/chromium/tools/metrics/common/diff_util.py
index def7e2d59e6..7ee91c802b7 100644
--- a/chromium/tools/metrics/common/diff_util.py
+++ b/chromium/tools/metrics/common/diff_util.py
@@ -10,6 +10,7 @@ from __future__ import print_function
 
 import logging
 import os
+import sys
 import webbrowser
 
 from difflib import HtmlDiff
@@ -38,11 +39,15 @@ def PromptUserToAcceptDiff(old_text, new_text, prompt):
       todesc='Updated', context=True, numlines=5)
   temp = NamedTemporaryFile(suffix='.html', delete=False)
   try:
+    html_diff = html_diff.encode()
     temp.write(html_diff)
     temp.close()  # Close the file so the browser process can access it.
     webbrowser.open('file://' + temp.name)
     print(prompt)
-    response = raw_input('(Y/n): ').strip().lower()
+    if sys.version_info.major == 2:
+      response = raw_input('(Y/n): ').strip().lower()
+    else:
+      response = input('(Y/n): ').strip().lower()
   finally:
     temp.close()  # May be called on already closed file.
     os.remove(temp.name)
diff --git a/chromium/tools/metrics/common/etree_util.py b/chromium/tools/metrics/common/etree_util.py
index cbfcbe8ab40..e8ff91a305a 100644
--- a/chromium/tools/metrics/common/etree_util.py
+++ b/chromium/tools/metrics/common/etree_util.py
@@ -4,6 +4,7 @@
 
 """Utility functions for parsing XML strings into ElementTree nodes."""
 
+import sys
 import xml.etree.ElementTree as ET
 import xml.sax
 
@@ -49,7 +50,7 @@ class _FirstTagFinder(xml.sax.ContentHandler):
 
 
 class _CommentedXMLParser(ET.XMLParser):
-  """An ElementTree builder that preserves comments."""
+  """A Python 2 compatible ElementTree builder that preserves comments."""
 
   def __init__(self, *args, **kwargs):
     super(_CommentedXMLParser, self).__init__(*args, **kwargs)
@@ -91,4 +92,8 @@ def GetTopLevelContent(file_content):
 
 def ParseXMLString(raw_xml):
   """Parses raw_xml and returns an ElementTree node that includes comments."""
-  return ET.fromstring(raw_xml, _CommentedXMLParser())
+  if sys.version_info.major == 2:
+    return ET.fromstring(raw_xml, _CommentedXMLParser())
+  else:
+    return ET.fromstring(
+        raw_xml, ET.XMLParser(target=ET.TreeBuilder(insert_comments=True)))
diff --git a/chromium/tools/metrics/common/models.py b/chromium/tools/metrics/common/models.py
index 625bbe2ff1c..eda57205b79 100644
--- a/chromium/tools/metrics/common/models.py
+++ b/chromium/tools/metrics/common/models.py
@@ -58,7 +58,7 @@ def PutCommentsInNode(doc, node, comments):
 
 
 def GetChildrenByTag(node, tag):
-  """Get all children of a particular tag type.
+  """Gets all children of a particular tag type.
 
   Args:
     node: The DOM node to write comments to.
@@ -69,6 +69,13 @@ def GetChildrenByTag(node, tag):
   return [child for child in node.childNodes if child.nodeName == tag]
 
 
+def GetUnexpectedChildren(node, tags):
+  """Gets a set of unexpected children from |node|."""
+  # Ingore text and comment nodes.
+  return (set(child.nodeName for child in node.childNodes) - set(tags) - set(
+      ('#comment', '#text')))
+
+
 class NodeType(object):
   """Base type for a type of XML node.
 
@@ -198,6 +205,12 @@ class TextNodeType(NodeType):
     text = node.firstChild.nodeValue
     obj[TEXT_KEY] = '\n\n'.join(pretty_print_xml.SplitParagraphs(text))
 
+    # TextNode shouldn't have any child.
+    unexpected = GetUnexpectedChildren(node, set())
+    if unexpected:
+      raise ValueError("Unexpected children: %s in <%s> node" %
+                       (','.join(unexpected), self.tag))
+
     return obj
 
   def Marshall(self, doc, obj):
@@ -325,6 +338,12 @@ class ObjectNodeType(NodeType):
       elif nodes:
         obj[child.attr] = child.node_type.Unmarshall(nodes[0])
 
+    unexpected = GetUnexpectedChildren(
+        node, set([child.node_type.tag for child in self.children]))
+    if unexpected:
+      raise ValueError("Unexpected children: %s in <%s> node" %
+                       (','.join(unexpected), self.tag))
+
     return obj
 
   def Marshall(self, doc, obj):
diff --git a/chromium/tools/metrics/common/presubmit_util.py b/chromium/tools/metrics/common/presubmit_util.py
index 2013bc2c10b..904514f1a13 100644
--- a/chromium/tools/metrics/common/presubmit_util.py
+++ b/chromium/tools/metrics/common/presubmit_util.py
@@ -62,11 +62,13 @@ def DoPresubmit(argv,
     original_xml = f.read()
 
   # Check there are no CR ('\r') characters in the file.
-  if '\r' in original_xml:
+  if b'\r' in original_xml:
     logging.error('DOS-style line endings (CR characters) detected - these are '
                   'not allowed. Please run dos2unix %s', original_filename)
     return 1
 
+  original_xml = original_xml.decode('utf-8')
+
   try:
     pretty = prettyFn(original_xml)
   except Exception as e:
@@ -98,6 +100,7 @@ def DoPresubmit(argv,
   logging.info('Creating backup file: %s', backup_filename)
   shutil.move(xml_path, os.path.join(xml_dir, backup_filename))
 
+  pretty = pretty.encode('utf-8')
   with open(xml_path, 'wb') as f:
     f.write(pretty)
   logging.info('Updated %s. Don\'t forget to add it to your changelist',
diff --git a/chromium/tools/metrics/histograms/README.md b/chromium/tools/metrics/histograms/README.md
index 926501edaf1..51ff260900e 100644
--- a/chromium/tools/metrics/histograms/README.md
+++ b/chromium/tools/metrics/histograms/README.md
@@ -671,11 +671,11 @@ As [with histogram entries](#Cleaning-Up-Histogram-Entries), never delete
 variants. If the variant expansion is no longer used, mark it as `<obsolete>`.
 
 *** promo
-Tip: You can run `print_expanded_histogram.py --pattern=` to show all generated
+Tip: You can run `print_expanded_histograms.py --pattern=` to show all generated
 histograms by patterned histograms or histogram suffixes including their
 summaries and owners. For example, this can be run (from the repo root) as:
 ```
-./tools/metrics/histograms/print_expanded_histogram.py --pattern=^UMA.A.B
+./tools/metrics/histograms/print_expanded_histograms.py --pattern=^UMA.A.B
 ```
 ***
 
diff --git a/chromium/tools/metrics/histograms/enums.xml b/chromium/tools/metrics/histograms/enums.xml
index 32193621027..b1256b43af1 100644
--- a/chromium/tools/metrics/histograms/enums.xml
+++ b/chromium/tools/metrics/histograms/enums.xml
@@ -181,6 +181,19 @@ uploading your change for review.  These are checked by presubmit scripts.
   <int value="3" label="Disabled"/>
 </enum>
 
+<enum name="AccessibilityImageLabelModeAndroid">
+  <summary>
+    Tracks what mode the user has selected for accessibility image labels on
+    Android, either always enabled, always enabled but only on Wi-Fi, just once,
+    just once and don't ask again, or if they cancel.
+  </summary>
+  <int value="0" label="Enabled (always)"/>
+  <int value="1" label="Enabled (Only on WiFi)"/>
+  <int value="2" label="Just once"/>
+  <int value="3" label="Just once (Don't ask again)"/>
+  <int value="4" label="Cancel"/>
+</enum>
+
 <enum name="AccessibilityModeFlagEnum">
   <summary>Track individual accessibility mode flags that are enabled.</summary>
   <int value="0" label="Native APIs"/>
@@ -190,6 +203,21 @@ uploading your change for review.  These are checked by presubmit scripts.
   <int value="4" label="HTML"/>
 </enum>
 
+<enum name="AccessibilityTreeUnserializeError">
+  <summary>
+    Tracks the type of failure that occured when unserializing the accessibility
+    tree.
+  </summary>
+  <int value="0" label="No Root"/>
+  <int value="1" label="Not In Tree"/>
+  <int value="2" label="Creation Pending"/>
+  <int value="3" label="Duplicate Child"/>
+  <int value="4" label="Creation Pending For Child"/>
+  <int value="5" label="Reparent"/>
+  <int value="6" label="Pending Nodes"/>
+  <int value="7" label="Pending Changes"/>
+</enum>
+
 <enum name="AccessibilityWinAPIEnum">
   <summary>
     Track which Windows accessibility APIs are being called by clients.
@@ -1001,6 +1029,31 @@ Unknown properties are collapsed to zero. -->
     User has completed the account addition flow triggered from the bottom
     sheet.
   </int>
+  <int value="16" label="SuppressedConsecutiveDismissals">
+    The bottom sheet was suppressed as the user hit consecutive active dismissal
+    limit.
+  </int>
+</enum>
+
+<enum name="AccountConsistencyPromoAfterDismissal">
+  <int value="0" label="SignedInOnWebWithDefaultDeviceAccount">
+    User signed in with the default device account. This account is the first
+    account in the cookies.
+  </int>
+  <int value="1" label="SignedInOnWebWithNonDefaultDeviceAccount">
+    User signed in with non-default device account.
+  </int>
+  <int value="2" label="SignedInOnWebWithOtherAccount">
+    User signed in with an account not present on device.
+  </int>
+</enum>
+
+<enum name="AccountManagerAccountAdditionResultStatus">
+  <int value="0" label="Success"/>
+  <int value="1" label="Already in progress"/>
+  <int value="2" label="Cancelled by user"/>
+  <int value="3" label="Network error"/>
+  <int value="4" label="Unexpected response"/>
 </enum>
 
 <enum name="AccountManagerAccountAdditionSource">
@@ -1159,6 +1212,14 @@ Unknown properties are collapsed to zero. -->
   <int value="2" label="Failed (missing product details)"/>
 </enum>
 
+<enum name="AdaptiveToolbarButtonVariant">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="None"/>
+  <int value="2" label="New tab"/>
+  <int value="3" label="Share"/>
+  <int value="4" label="Voice"/>
+</enum>
+
 <enum name="AdbSideloadingPromptEvent">
   <int value="0" label="Prompt shown"/>
   <int value="1" label="Prompt skipped"/>
@@ -1284,6 +1345,9 @@ Unknown properties are collapsed to zero. -->
 
 <enum name="AdsViolations">
   <int value="0" label="kMobileAdDensityByHeightAbove30"/>
+  <int value="1" label="kHeavyAdsInterventionAtHostLimit"/>
+  <int value="2" label="kLargeStickyAd"/>
+  <int value="3" label="kOverlayPopupAd"/>
 </enum>
 
 <enum name="AdUserActivationStatus">
@@ -1392,8 +1456,22 @@ Unknown properties are collapsed to zero. -->
   <int value="4" label="Not QUIC, destination different from origin"/>
 </enum>
 
+<enum name="AltTabMode">
+  <int value="0" label="All Desks"/>
+  <int value="1" label="Current Desk"/>
+</enum>
+
+<enum name="AltTabModeSwitchSource">
+  <int value="0" label="Click"/>
+  <int value="1" label="Keyboard"/>
+</enum>
+
 <enum name="AmbientModePhotoSource">
-  <int value="0" label="Default"/>
+  <int value="0" label="Default">
+    This is when user clicked on the top level Screen Saver toggle but did not
+    click on any of photo source categories. The system will default show Art
+    Gallery with a default list of art sub categories.
+  </int>
   <int value="1" label="Art Gallery"/>
   <int value="2" label="Google Photos Recent Highlights Only"/>
   <int value="3" label="Google Photos Personal Albums Only"/>
@@ -1406,6 +1484,48 @@ Unknown properties are collapsed to zero. -->
   <int value="1" label="In Session Idle"/>
 </enum>
 
+<enum name="AMDDeviceId">
+  <int value="5592" label="0x15D8, Picasso"/>
+  <int value="5597"
+      label="0x15DD, Raven Ridge [Radeon Vega Series / Radeon Vega Mobile
+             Series]"/>
+  <int value="5686" label="0x1636, Renoir"/>
+  <int value="26112" label="0x6600, Mars [Radeon HD 8670A/8670M/8750M]"/>
+  <int value="26113" label="0x6601, Mars [Radeon HD 8730M]"/>
+  <int value="26129"
+      label="0x6611, Oland [Radeon HD 8570 / R5 430 OEM / R7 240/340 / Radeon
+             520 OEM]"/>
+  <int value="26208"
+      label="0x6660, Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 /
+             Radeon 520 Mobile]"/>
+  <int value="26213"
+      label="0x6665, Jet PRO [Radeon R5 M230 / R7 M260DX / Radeon 520 Mobile]"/>
+  <int value="26223" label="0x666F, Sun LE [Radeon HD 8550M / R5 M230]"/>
+  <int value="26464" label="0x6760, Seymour [Radeon HD 6400M/7400M Series]"/>
+  <int value="26591"
+      label="0x67DF, Ellesmere [Radeon RX 470/480/570/570X/580/580X/590]"/>
+  <int value="26607"
+      label="0x67EF, Baffin [Radeon RX 460/560D / Pro
+             450/455/460/555/555X/560/560X]"/>
+  <int value="26657"
+      label="0x6821, Venus XT [Radeon HD 8870M / R9 M270X/M370X]"/>
+  <int value="26688" label="0x6840, Thames [Radeon HD 7500M/7600M Series]"/>
+  <int value="26873"
+      label="0x68F9, Cedar [Radeon HD 5000/6000/7350/8350 Series]"/>
+  <int value="26880"
+      label="0x6900, Topaz XT [Radeon R7 M260/M265 / M340/M360 / M440/M445 /
+             530/535 / 620/625 Mobile]"/>
+  <int value="27015"
+      label="0x6987, Lexa [Radeon 540X/550X/630 / RX 640 / E9171 MCM]"/>
+  <int value="27039"
+      label="0x699F, Lexa PRO [Radeon 540/540X/550/550X / RX 540X/550/550X]"/>
+  <int value="27055" label="0x69AF, Vega 12 [Radeon Pro Vega 20]"/>
+  <int value="29471"
+      label="0x731F, Navi 10 [Radeon RX 5600 OEM/5600 XT / 5700/5700 XT]"/>
+  <int value="29504"
+      label="0x7340, Navi 14 [Radeon RX 5500/5500M / Pro 5500M]"/>
+</enum>
+
 <enum name="Android.ChildProcessBindingStateCombination">
   <int value="0" label="No waived no moderate no strong"/>
   <int value="1" label="No waived no moderate has strong"/>
@@ -1484,6 +1604,12 @@ Unknown properties are collapsed to zero. -->
   <int value="8" label="onLowMemory()"/>
 </enum>
 
+<enum name="Android.ThemeColor">
+  <int value="0" label="No color set"/>
+  <int value="1" label="Color set and applied"/>
+  <int value="2" label="Color set but not applied"/>
+</enum>
+
 <enum name="AndroidActivityId">
   <int value="1" label="Unknown"/>
   <int value="2" label="Main"/>
@@ -1573,6 +1699,9 @@ Unknown properties are collapsed to zero. -->
 </enum>
 
 <enum name="AndroidDefaultBrowserPromoUserActionType">
+  <obsolete>
+    Removed Dec 2020; experiment is done and the data isn't useful.
+  </obsolete>
   <int value="0" label="Change Default"/>
   <int value="1" label="No Thanks"/>
 </enum>
@@ -1924,6 +2053,16 @@ Unknown properties are collapsed to zero. -->
   <int value="3" label="LowMemory"/>
 </enum>
 
+<enum name="AndroidMultiWindowActivityType">
+  <int value="0" label="Enter"/>
+  <int value="1" label="Exit"/>
+</enum>
+
+<enum name="AndroidMultiWindowState">
+  <int value="0" label="SingleWindow"/>
+  <int value="1" label="MultiWindow"/>
+</enum>
+
 <enum name="AndroidProcessedCrashCounts">
   <int value="0" label="Gpu foreground OOM">
     GPU is killed by Android due to OOM while app is foreground.
@@ -2078,11 +2217,23 @@ Unknown properties are collapsed to zero. -->
 </enum>
 
 <enum name="AndroidWebViewActualUiThread">
+  <obsolete>
+    Removed 02/2020. The ActualUiThread metric has been removed.
+  </obsolete>
   <int value="0" label="The thread on which the first WebView was constructed"/>
   <int value="1" label="The main looper"/>
   <int value="2" label="Some other thread"/>
 </enum>
 
+<enum name="AndroidWebViewAndroidProtocolHandlerResources">
+  <int value="0" label="GetIdentifier"/>
+  <int value="1" label="Reflection"/>
+  <int value="2" label="ResourcesNotFound_ID_0"/>
+  <int value="3" label="ClassNotFoundException"/>
+  <int value="4" label="NoSuchFieldException"/>
+  <int value="5" label="IllegalAccessException"/>
+</enum>
+
 <enum name="AndroidWebViewClientSafeBrowsingThreatType">
   <obsolete>
     Removed 04/2020. These metrics are tracked generally for SafeBrowsing, and
@@ -2207,6 +2358,11 @@ Unknown properties are collapsed to zero. -->
   <int value="2" label="DIRECT"/>
 </enum>
 
+<enum name="AndroidWebViewSingleOrMultiProcess">
+  <int value="0" label="SINGLE_PROCESS"/>
+  <int value="1" label="MULTI_PROCESS"/>
+</enum>
+
 <enum name="AndroidWebViewSslErrorType">
   <obsolete>
     Removed 09/2020. These are no longer being tracked.
@@ -2405,6 +2561,9 @@ Unknown properties are collapsed to zero. -->
 </enum>
 
 <enum name="AnnouncementNotificationEvent">
+  <obsolete>
+    Deprecated 11/2020
+  </obsolete>
   <int value="0" label="Start"/>
   <int value="1" label="Show notification"/>
   <int value="2" label="Click"/>
@@ -2979,7 +3138,7 @@ Unknown properties are collapsed to zero. -->
   <int value="25" label="Omnibox, Assistant"/>
   <int value="26" label="Omnibox, Search History"/>
   <int value="27" label="Omnibox, Search Suggest"/>
-  <int value="28" label="Omnibox, Personalzied Suggestion"/>
+  <int value="28" label="Omnibox, Personalized Suggestion"/>
   <int value="29" label="Zero State Local File"/>
   <int value="30" label="Drive Quick Access"/>
   <int value="31" label="Assistant"/>
@@ -2989,6 +3148,10 @@ Unknown properties are collapsed to zero. -->
   <int value="35" label="Remote App"/>
   <int value="36" label="Borealis App"/>
   <int value="37" label="Help App"/>
+  <int value="38" label="Omnibox, Search Suggest Entity"/>
+  <int value="39" label="Omnibox, Navsuggest"/>
+  <int value="40" label="Omnibox Rich Entity, Answer"/>
+  <int value="41" label="Omnibox Rich Entity, Image Entity"/>
 </enum>
 
 <enum name="AppListSearchResultDisplayType">
@@ -3213,6 +3376,17 @@ Unknown properties are collapsed to zero. -->
   <int value="2" label="Can not install host code"/>
 </enum>
 
+<enum name="ArcClipboardDragDropEvent">
+  <int value="0" label="Text clipboard set from Chrome"/>
+  <int value="1" label="Image clipboard set from Chrome"/>
+  <int value="2" label="Text clipboard set from ARC"/>
+  <int value="3" label="Image clipboard set from ARC"/>
+  <int value="4" label="Text dropped from Chrome"/>
+  <int value="5" label="Image dropped from Chrome"/>
+  <int value="6" label="Text dropped from ARC"/>
+  <int value="7" label="Image dropped from ARC"/>
+</enum>
+
 <enum name="ArcCodeRelocationResult">
   <int value="0" label="Success"/>
   <int value="1" label="Error bootlockboxd not ready"/>
@@ -3439,6 +3613,13 @@ Unknown properties are collapsed to zero. -->
   <int value="9" label="Timeout"/>
 </enum>
 
+<enum name="ArcProvisioningCheckInError">
+  <summary>Defines ARC GMS check-in failure reasons</summary>
+  <int value="1" label="Check-in failed"/>
+  <int value="2" label="Timeout"/>
+  <int value="3" label="Internal error"/>
+</enum>
+
 <!-- These values must be in sync with ProvisionConstants in CloudDPC code -->
 
 <enum name="ArcProvisioningCloudFlowError">
@@ -3480,6 +3661,9 @@ Unknown properties are collapsed to zero. -->
 </enum>
 
 <enum name="ArcProvisioningResult">
+  <obsolete>
+    Removed in Dec 2020. Replaced by ArcProvisioningStatus.
+  </obsolete>
   <summary>Defines Arc Provisioning success and failure reasons</summary>
   <int value="0" label="Success"/>
   <int value="1" label="Unclassified failure"/>
@@ -3508,6 +3692,34 @@ Unknown properties are collapsed to zero. -->
   <int value="24" label="Cloud provision flow failed"/>
 </enum>
 
+<enum name="ArcProvisioningSignInError">
+  <summary>Defines ARC GMS sign-in failure reasons</summary>
+  <int value="1" label="Network error"/>
+  <int value="2" label="Sign-in service unavailble"/>
+  <int value="3" label="Bad authentication"/>
+  <int value="4" label="Unknown error"/>
+  <int value="5" label="Timeout"/>
+  <int value="6" label="Internal error"/>
+</enum>
+
+<enum name="ArcProvisioningStatus">
+  <summary>Defines ARC GMS check-in failure reasons</summary>
+  <int value="0" label="Success"/>
+  <int value="1" label="Unclassified failure"/>
+  <int value="2" label="GMS sign-in failed"/>
+  <int value="3" label="GMS check-in failed"/>
+  <int value="4" label="Cloud provision flow failed"/>
+  <int value="5" label="Mojo version mistmached"/>
+  <int value="6" label="ARC provisioning timeout"/>
+  <int value="7" label="Chrome provisioning timeout"/>
+  <int value="8" label="ARC instance is stopped before complete provisioning"/>
+  <int value="9" label="Disabled"/>
+  <int value="10" label="Chrome server communication error"/>
+  <int value="11" label="Network is unavailable"/>
+  <int value="12" label="Unsupported account type"/>
+  <int value="13" label="Account is not present in Chrome"/>
+</enum>
+
 <enum name="ArcSdkVersionUpgradeType">
   <summary>Defines the types of ARC SDK version upgrade</summary>
   <int value="0" label="NO_UPGRADE"/>
@@ -3592,6 +3804,7 @@ Unknown properties are collapsed to zero. -->
   <int value="19" label="Interaction with gamepad"/>
   <int value="20" label="App started from URL in the Omnibox"/>
   <int value="21" label="App started from sharesheet"/>
+  <int value="22" label="App started from full restore"/>
 </enum>
 
 <enum name="ArcVideoDecodeAcceleratorResult">
@@ -3604,6 +3817,27 @@ Unknown properties are collapsed to zero. -->
   <int value="5" label="INSUFFICIENT_RESOURCES"/>
 </enum>
 
+<enum name="ArmCpuPart">
+  <summary>
+    Defines a subset of ARM CPU (implementer, part-number) pairs composed as a
+    20-bit number. This is a non-exhaustive enumeration.
+  </summary>
+  <int value="269320" label="ARM Cortex-A8"/>
+  <int value="269321" label="ARM Cortex-A9"/>
+  <int value="269326" label="ARM Cortex-A17"/>
+  <int value="269327" label="ARM Cortex-A15"/>
+  <int value="269335" label="ARM Cortex-R7"/>
+  <int value="269336" label="ARM Cortex-R8"/>
+  <int value="269575" label="ARM Cortex-A57"/>
+  <int value="269576" label="ARM Cortex-A72"/>
+  <int value="269577" label="ARM Cortex-A73"/>
+  <int value="269578" label="ARM Cortex-A75"/>
+  <int value="269579" label="ARM Cortex-A76"/>
+  <int value="269580" label="ARM Neoverse N1"/>
+  <int value="269581" label="ARM Cortex-A77"/>
+  <int value="269633" label="ARM Cortex-A78"/>
+</enum>
+
 <enum name="AshAutoNightLightNotificationState">
   <summary>
     Defines the possible states of the Auto Night Light notification as a result
@@ -3735,6 +3969,14 @@ others/histograms.xml -->
   <int value="7" label="kBackInLauncherDeprecated"/>
 </enum>
 
+<enum name="AssistantConsentOutcome">
+  <int value="0" label="ACCEPTED-VIA-BUTTON"/>
+  <int value="1" label="ACCEPTED-VIA-SETTINGS"/>
+  <int value="2" label="REJECTED-VIA-BUTTON"/>
+  <int value="3" label="REJECTED-VIA-SETTINGS"/>
+  <int value="4" label="REJECTED-VIA-DISMISS"/>
+</enum>
+
 <enum name="AssistantEntryPoint">
   <int value="0" label="kUnspecified"/>
   <int value="1" label="kDeepLink"/>
@@ -3827,6 +4069,9 @@ others/histograms.xml -->
 </enum>
 
 <enum name="AsyncDNSConfigParsePosix">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <int value="0" label="OK"/>
   <int value="1" label="RES_INIT_FAILED"/>
   <int value="2" label="RES_INIT_UNSET"/>
@@ -3839,6 +4084,9 @@ others/histograms.xml -->
 </enum>
 
 <enum name="AsyncDNSConfigParseWin">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <int value="0" label="OK"/>
   <int value="1" label="READ_IPHELPER"/>
   <int value="2" label="READ_POLICY_SEARCHLIST"/>
@@ -3855,6 +4103,9 @@ others/histograms.xml -->
 </enum>
 
 <enum name="AsyncDNSHostsParseWin">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <int value="0" label="OK"/>
   <int value="1" label="UNREADABLE_HOSTS_FILE"/>
   <int value="2" label="COMPUTER_NAME_FAILED"/>
@@ -3863,6 +4114,9 @@ others/histograms.xml -->
 </enum>
 
 <enum name="AsyncDNSNameServersType">
+  <obsolete>
+    Removed unknown date before 2021-01.
+  </obsolete>
   <summary>Type of nameservers in the DNS config.</summary>
   <int value="0" label="NONE">No nameservers configured.</int>
   <int value="1" label="GOOGLE_PUBLIC_DNS">
@@ -3882,6 +4136,9 @@ others/histograms.xml -->
 </enum>
 
 <enum name="AsyncDNSParseResult">
+  <obsolete>
+    Removed unknown date before 2021-01.
+  </obsolete>
   <summary>Results of DnsResponse::ParseToAddressList.</summary>
   <int value="0" label="SUCCESS"/>
   <int value="1" label="MALFORMED_RESPONSE"/>
@@ -3894,12 +4151,18 @@ others/histograms.xml -->
 </enum>
 
 <enum name="AsyncDNSPrefDefaultSource">
+  <obsolete>
+    Removed unknown date before 2021-01.
+  </obsolete>
   <int value="0" label="PLATFORM"/>
   <int value="1" label="FIELD_TRIAL"/>
   <int value="2" label="HARD_CODED_DEFAULT"/>
 </enum>
 
 <enum name="AsyncDNSPrefSource">
+  <obsolete>
+    Removed unknown date before 2021-01.
+  </obsolete>
   <int value="0" label="MANAGED_PREF"/>
   <int value="1" label="SUPERVISED_PREF"/>
   <int value="2" label="EXTENSION_PREF"/>
@@ -3911,6 +4174,9 @@ others/histograms.xml -->
 </enum>
 
 <enum name="AsyncDNSRcode">
+  <obsolete>
+    Removed unknown date before 2021-01.
+  </obsolete>
   <summary>
     https://www.iana.org/assignments/dns-parameters/dns-parameters.xhtml#dns-parameters-6
   </summary>
@@ -3923,6 +4189,9 @@ others/histograms.xml -->
 </enum>
 
 <enum name="AsyncDNSResolveStatus">
+  <obsolete>
+    Removed unknown date before 2021-01.
+  </obsolete>
   <int value="0" label="DNS_SUCCESS">Succeeded with async DNS.</int>
   <int value="1" label="PROC_SUCCESS">
     Succeeded with getaddrinfo after async DNS failed.
@@ -3934,6 +4203,9 @@ others/histograms.xml -->
 </enum>
 
 <enum name="AsyncDNSWatchStatus">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <int value="0" label="STARTED">Started.</int>
   <int value="1" label="FAILED_TO_START_CONFIG">
     Failed to start watching config.
@@ -3994,6 +4266,38 @@ others/histograms.xml -->
   <int value="12" label="Other error (file missing)"/>
 </enum>
 
+<enum name="AttestationFlowStatus">
+<!--
+  Uninteresting/unused values are not labeled.
+  See "ChromeOS.Attestation.AttestationFlowStatus" histogram
+-->
+
+  <int value="10" label="Failure w/o proxy"/>
+  <int value="11" label="Fallback w/o proxy"/>
+  <int value="12" label="Success w/o proxy"/>
+  <int value="34" label="Failure w/ default flow being skipped w/ proxy"/>
+  <int value="35" label="Success w/ default flow being skipped w/ proxy"/>
+</enum>
+
+<enum name="AttestationStatus">
+<!--
+  The alias of `enum AttestationStatus` defined in
+  `system_api/dbus/attestation/interface.proto` in
+  `chromiumos/platform2` repository.
+-->
+
+  <int value="0" label="STATUS_SUCCESS"/>
+  <int value="1" label="STATUS_UNEXPECTED_DEVICE_ERROR"/>
+  <int value="2" label="STATUS_NOT_AVAILABLE"/>
+  <int value="3" label="STATUS_NOT_READY"/>
+  <int value="4" label="STATUS_NOT_ALLOWED"/>
+  <int value="5" label="STATUS_INVALID_PARAMETER"/>
+  <int value="6" label="STATUS_REQUEST_DENIED_BY_CA"/>
+  <int value="7" label="STATUS_CA_NOT_AVAILABLE"/>
+  <int value="8" label="STATUS_NOT_SUPPORTED"/>
+  <int value="9" label="STATUS_DBUS_ERROR"/>
+</enum>
+
 <enum name="AudioCaptureDeviceError">
   <int value="0" label="No error"/>
   <int value="1" label="Error during stream creation"/>
@@ -4247,6 +4551,7 @@ others/histograms.xml -->
   <int value="10" label="192 kHz"/>
   <int value="11" label="24 kHz"/>
   <int value="12" label="384 kHz"/>
+  <int value="13" label="768 kHz"/>
 </enum>
 
 <enum name="AudioServiceProcessTerminationStatus">
@@ -4305,6 +4610,9 @@ others/histograms.xml -->
 </enum>
 
 <enum name="AuthenticatedLaunchUserEvent">
+  <obsolete>
+    Removed in M90.
+  </obsolete>
   <int value="0" label="Local Reauth Dialog"/>
   <int value="1" label="Gaia Reauth Dialog"/>
   <int value="2" label="Supervised Profile Blocked Warning"/>
@@ -4318,6 +4626,7 @@ others/histograms.xml -->
   <int value="2" label="Smartlock"/>
   <int value="3" label="Fingerprint"/>
   <int value="4" label="Challenge-response"/>
+  <int value="5" label="Nothing"/>
 </enum>
 
 <enum name="AuthMethodSwitchType">
@@ -4334,6 +4643,11 @@ others/histograms.xml -->
   <int value="10" label="Fingerprint to PIN"/>
   <int value="11" label="Fingerprint to Smartlock"/>
   <int value="12" label="Password to Challenge-response"/>
+  <int value="13" label="Nothing to Fingerprint"/>
+  <int value="14" label="Nothing to Password"/>
+  <int value="15" label="Nothing to PIN"/>
+  <int value="16" label="Nothing to Smartlock"/>
+  <int value="17" label="Nothing to Challenge-response"/>
 </enum>
 
 <enum name="AuthPolicyErrorType">
@@ -4665,6 +4979,20 @@ others/histograms.xml -->
   <int value="3" label="Initially incomplete &amp; Failure"/>
 </enum>
 
+<enum name="AutofillAssistantTriggerUIType">
+  <int value="0" label="UNSPECIFIED_TRIGGER_UI_TYPE"/>
+  <int value="1" label="CART_FIRST_TIME_USER"/>
+  <int value="2" label="CART_RETURNING_USER"/>
+  <int value="3" label="CHECKOUT_FIRST_TIME_USER"/>
+  <int value="4" label="CHECKOUT_RETURNING_TIME_USER"/>
+</enum>
+
+<enum name="AutofillAwGSuggestionAvailability">
+  <int value="0" label="No suggestion"/>
+  <int value="1" label="Has suggestion, user doesn't select it"/>
+  <int value="2" label="Has suggestion, user selects it"/>
+</enum>
+
 <enum name="AutofillCardholderNameFixFlowPromptEvent">
   <int value="0" label="Shown"/>
   <int value="1" label="Accepted"/>
@@ -5210,126 +5538,186 @@ others/histograms.xml -->
   <int value="2055" label="Country: False Positive (Empty)"/>
   <int value="2056" label="Country: False Negative (Mismatch)"/>
   <int value="2057" label="Country: False Negative (Unknown)"/>
-  <int value="2304" label="Phone: True Positive"/>
-  <int value="2305" label="Phone: True Negative (Ambiguous)"/>
-  <int value="2306" label="Phone: True Negative (Unknown)"/>
-  <int value="2307" label="Phone: True Negative (Empty)"/>
-  <int value="2308" label="Phone: False Positive (Mismatch)"/>
-  <int value="2309" label="Phone: False Positive (Ambiguous)"/>
-  <int value="2310" label="Phone: False Positive (Unknown)"/>
-  <int value="2311" label="Phone: False Positive (Empty)"/>
-  <int value="2312" label="Phone: False Negative (Mismatch)"/>
-  <int value="2313" label="Phone: False Negative (Unknown)"/>
-  <int value="2560" label="Fax: True Positive"/>
-  <int value="2561" label="Fax: True Negative (Ambiguous)"/>
-  <int value="2562" label="Fax: True Negative (Unknown)"/>
-  <int value="2563" label="Fax: True Negative (Empty)"/>
-  <int value="2564" label="Fax: False Positive (Mismatch)"/>
-  <int value="2565" label="Fax: False Positive (Ambiguous)"/>
-  <int value="2566" label="Fax: False Positive (Unknown)"/>
-  <int value="2567" label="Fax: False Positive (Empty)"/>
-  <int value="2568" label="Fax: False Negative (Mismatch)"/>
-  <int value="2569" label="Fax: False Negative (Unknown)"/>
-  <int value="2816" label="Email: True Positive"/>
-  <int value="2817" label="Email: True Negative (Ambiguous)"/>
-  <int value="2818" label="Email: True Negative (Unknown)"/>
-  <int value="2819" label="Email: True Negative (Empty)"/>
-  <int value="2820" label="Email: False Positive (Mismatch)"/>
-  <int value="2821" label="Email: False Positive (Ambiguous)"/>
-  <int value="2822" label="Email: False Positive (Unknown)"/>
-  <int value="2823" label="Email: False Positive (Empty)"/>
-  <int value="2824" label="Email: False Negative (Mismatch)"/>
-  <int value="2825" label="Email: False Negative (Unknown)"/>
-  <int value="3072" label="CC Name: True Positive"/>
-  <int value="3073" label="CC Name: True Negative (Ambiguous)"/>
-  <int value="3074" label="CC Name: True Negative (Unknown)"/>
-  <int value="3075" label="CC Name: True Negative (Empty)"/>
-  <int value="3076" label="CC Name: False Positive (Mismatch)"/>
-  <int value="3077" label="CC Name: False Positive (Ambiguous)"/>
-  <int value="3078" label="CC Name: False Positive (Unknown)"/>
-  <int value="3079" label="CC Name: False Positive (Empty)"/>
-  <int value="3080" label="CC Name: False Negative (Mismatch)"/>
-  <int value="3081" label="CC Name: False Negative (Unknown)"/>
-  <int value="3328" label="CC Number: True Positive"/>
-  <int value="3329" label="CC Number: True Negative (Ambiguous)"/>
-  <int value="3330" label="CC Number: True Negative (Unknown)"/>
-  <int value="3331" label="CC Number: True Negative (Empty)"/>
-  <int value="3332" label="CC Number: False Positive (Mismatch)"/>
-  <int value="3333" label="CC Number: False Positive (Ambiguous)"/>
-  <int value="3334" label="CC Number: False Positive (Unknown)"/>
-  <int value="3335" label="CC Number: False Positive (Empty)"/>
-  <int value="3336" label="CC Number: False Negative (Mismatch)"/>
-  <int value="3337" label="CC Number: False Negative (Unknown)"/>
-  <int value="3584" label="CC Expiry: True Positive"/>
-  <int value="3585" label="CC Expiry: True Negative (Ambiguous)"/>
-  <int value="3586" label="CC Expiry: True Negative (Unknown)"/>
-  <int value="3587" label="CC Expiry: True Negative (Empty)"/>
-  <int value="3588" label="CC Expiry: False Positive (Mismatch)"/>
-  <int value="3589" label="CC Expiry: False Positive (Ambiguous)"/>
-  <int value="3590" label="CC Expiry: False Positive (Unknown)"/>
-  <int value="3591" label="CC Expiry: False Positive (Empty)"/>
-  <int value="3592" label="CC Expiry: False Negative (Mismatch)"/>
-  <int value="3593" label="CC Expiry: False Negative (Unknown)"/>
-  <int value="3840" label="CC Type: True Positive"/>
-  <int value="3841" label="CC Type: True Negative (Ambiguous)"/>
-  <int value="3842" label="CC Type: True Negative (Unknown)"/>
-  <int value="3843" label="CC Type: True Negative (Empty)"/>
-  <int value="3844" label="CC Type: False Positive (Mismatch)"/>
-  <int value="3845" label="CC Type: False Positive (Ambiguous)"/>
-  <int value="3846" label="CC Type: False Positive (Unknown)"/>
-  <int value="3847" label="CC Type: False Positive (Empty)"/>
-  <int value="3848" label="CC Type: False Negative (Mismatch)"/>
-  <int value="3849" label="CC Type: False Negative (Unknown)"/>
-  <int value="4096" label="Password: True Positive"/>
-  <int value="4097" label="Password: True Negative (Ambiguous)"/>
-  <int value="4098" label="Password: True Negative (Unknown)"/>
-  <int value="4099" label="Password: True Negative (Empty)"/>
-  <int value="4100" label="Password: False Positive (Mismatch)"/>
-  <int value="4101" label="Password: False Positive (Ambiguous)"/>
-  <int value="4102" label="Password: False Positive (Unknown)"/>
-  <int value="4103" label="Password: False Positive (Empty)"/>
-  <int value="4104" label="Password: False Negative (Mismatch)"/>
-  <int value="4105" label="Password: False Negative (Unknown)"/>
-  <int value="4352" label="Address Line 3: True Positive"/>
-  <int value="4353" label="Address Line 3: True Negative (Ambiguous)"/>
-  <int value="4354" label="Address Line 3: True Negative (Unknown)"/>
-  <int value="4355" label="Address Line 3: True Negative (Empty)"/>
-  <int value="4356" label="Address Line 3: False Positive (Mismatch)"/>
-  <int value="4357" label="Address Line 3: False Positive (Ambiguous)"/>
-  <int value="4358" label="Address Line 3: False Positive (Unknown)"/>
-  <int value="4359" label="Address Line 3: False Positive (Empty)"/>
-  <int value="4360" label="Address Line 3: False Negative (Mismatch)"/>
-  <int value="4361" label="Address Line 3: False Negative (Unknown)"/>
-  <int value="4608" label="Username: True Positive"/>
-  <int value="4609" label="Username: True Negative (Ambiguous)"/>
-  <int value="4610" label="Username: True Negative (Unknown)"/>
-  <int value="4611" label="Username: True Negative (Empty)"/>
-  <int value="4612" label="Username: False Positive (Mismatch)"/>
-  <int value="4613" label="Username: False Positive (Ambiguous)"/>
-  <int value="4614" label="Username: False Positive (Unknown)"/>
-  <int value="4615" label="Username: False Positive (Empty)"/>
-  <int value="4616" label="Username: False Negative (Mismatch)"/>
-  <int value="4617" label="Username: False Negative (Unknown)"/>
-  <int value="4864" label="Street Address: True Positive"/>
-  <int value="4865" label="Street Address: True Negative (Ambiguous)"/>
-  <int value="4866" label="Street Address: True Negative (Unknown)"/>
-  <int value="4867" label="Street Address: True Negative (Empty)"/>
-  <int value="4868" label="Street Address: False Positive (Mismatch)"/>
-  <int value="4869" label="Street Address: False Positive (Ambiguous)"/>
-  <int value="4870" label="Street Address: False Positive (Unknown)"/>
-  <int value="4871" label="Street Address: False Positive (Empty)"/>
-  <int value="4872" label="Street Address: False Negative (Mismatch)"/>
-  <int value="4873" label="Street Address: False Negative (Unknown)"/>
-  <int value="5120" label="CVC: True Positive"/>
-  <int value="5121" label="CVC: True Negative (Ambiguous)"/>
-  <int value="5122" label="CVC: True Negative (Unknown)"/>
-  <int value="5123" label="CVC: True Negative (Empty)"/>
-  <int value="5124" label="CVC: False Positive (Mismatch)"/>
-  <int value="5125" label="CVC: False Positive (Ambiguous)"/>
-  <int value="5126" label="CVC: False Positive (Unknown)"/>
-  <int value="5127" label="CVC: False Positive (Empty)"/>
-  <int value="5128" label="CVC: False Negative (Mismatch)"/>
-  <int value="5129" label="CVC: False Negative (Unknown)"/>
+  <int value="2304" label="Street Name: True Positive"/>
+  <int value="2305" label="Street Name: True Negative (Ambiguous)"/>
+  <int value="2306" label="Street Name: True Negative (Unknown)"/>
+  <int value="2307" label="Street Name: True Negative (Empty)"/>
+  <int value="2308" label="Street Name: False Positive (Mismatch)"/>
+  <int value="2309" label="Street Name: False Positive (Ambiguous)"/>
+  <int value="2310" label="Street Name: False Positive (Unknown)"/>
+  <int value="2311" label="Street Name: False Positive (Empty)"/>
+  <int value="2312" label="Street Name: False Negative (Mismatch)"/>
+  <int value="2313" label="Street Name: False Negative (Unknown)"/>
+  <int value="2560" label="Dependent Street Name: True Positive"/>
+  <int value="2561" label="Dependent Street Name: True Negative (Ambiguous)"/>
+  <int value="2562" label="Dependent Street Name: True Negative (Unknown)"/>
+  <int value="2563" label="Dependent Street Name: True Negative (Empty)"/>
+  <int value="2564" label="Dependent Street Name: False Positive (Mismatch)"/>
+  <int value="2565" label="Dependent Street Name: False Positive (Ambiguous)"/>
+  <int value="2566" label="Dependent Street Name: False Positive (Unknown)"/>
+  <int value="2567" label="Dependent Street Name: False Positive (Empty)"/>
+  <int value="2568" label="Dependent Street Name: False Negative (Mismatch)"/>
+  <int value="2569" label="Dependent Street Name: False Negative (Unknown)"/>
+  <int value="2816" label="House Number: True Positive"/>
+  <int value="2817" label="House Number: True Negative (Ambiguous)"/>
+  <int value="2818" label="House Number: True Negative (Unknown)"/>
+  <int value="2819" label="House Number: True Negative (Empty)"/>
+  <int value="2820" label="House Number: False Positive (Mismatch)"/>
+  <int value="2821" label="House Number: False Positive (Ambiguous)"/>
+  <int value="2822" label="House Number: False Positive (Unknown)"/>
+  <int value="2823" label="House Number: False Positive (Empty)"/>
+  <int value="2824" label="House Number: False Negative (Mismatch)"/>
+  <int value="2825" label="House Number: False Negative (Unknown)"/>
+  <int value="3072" label="Premise Name: True Positive"/>
+  <int value="3073" label="Premise Name: True Negative (Ambiguous)"/>
+  <int value="3074" label="Premise Name: True Negative (Unknown)"/>
+  <int value="3075" label="Premise Name: True Negative (Empty)"/>
+  <int value="3076" label="Premise Name: False Positive (Mismatch)"/>
+  <int value="3077" label="Premise Name: False Positive (Ambiguous)"/>
+  <int value="3078" label="Premise Name: False Positive (Unknown)"/>
+  <int value="3079" label="Premise Name: False Positive (Empty)"/>
+  <int value="3080" label="Premise Name: False Negative (Mismatch)"/>
+  <int value="3081" label="Premise Name: False Negative (Unknown)"/>
+  <int value="3328" label="Sub Premise: True Positive"/>
+  <int value="3329" label="Sub Premise: True Negative (Ambiguous)"/>
+  <int value="3330" label="Sub Premise: True Negative (Unknown)"/>
+  <int value="3331" label="Sub Premise: True Negative (Empty)"/>
+  <int value="3332" label="Sub Premise: False Positive (Mismatch)"/>
+  <int value="3333" label="Sub Premise: False Positive (Ambiguous)"/>
+  <int value="3334" label="Sub Premise: False Positive (Unknown)"/>
+  <int value="3335" label="Sub Premise: False Positive (Empty)"/>
+  <int value="3336" label="Sub Premise: False Negative (Mismatch)"/>
+  <int value="3337" label="Sub Premise: False Negative (Unknown)"/>
+  <int value="3584" label="Phone: True Positive"/>
+  <int value="3585" label="Phone: True Negative (Ambiguous)"/>
+  <int value="3586" label="Phone: True Negative (Unknown)"/>
+  <int value="3587" label="Phone: True Negative (Empty)"/>
+  <int value="3588" label="Phone: False Positive (Mismatch)"/>
+  <int value="3589" label="Phone: False Positive (Ambiguous)"/>
+  <int value="3590" label="Phone: False Positive (Unknown)"/>
+  <int value="3591" label="Phone: False Positive (Empty)"/>
+  <int value="3592" label="Phone: False Negative (Mismatch)"/>
+  <int value="3593" label="Phone: False Negative (Unknown)"/>
+  <int value="3840" label="Fax: True Positive"/>
+  <int value="3841" label="Fax: True Negative (Ambiguous)"/>
+  <int value="3842" label="Fax: True Negative (Unknown)"/>
+  <int value="3843" label="Fax: True Negative (Empty)"/>
+  <int value="3844" label="Fax: False Positive (Mismatch)"/>
+  <int value="3845" label="Fax: False Positive (Ambiguous)"/>
+  <int value="3846" label="Fax: False Positive (Unknown)"/>
+  <int value="3847" label="Fax: False Positive (Empty)"/>
+  <int value="3848" label="Fax: False Negative (Mismatch)"/>
+  <int value="3849" label="Fax: False Negative (Unknown)"/>
+  <int value="4096" label="Email: True Positive"/>
+  <int value="4097" label="Email: True Negative (Ambiguous)"/>
+  <int value="4098" label="Email: True Negative (Unknown)"/>
+  <int value="4099" label="Email: True Negative (Empty)"/>
+  <int value="4100" label="Email: False Positive (Mismatch)"/>
+  <int value="4101" label="Email: False Positive (Ambiguous)"/>
+  <int value="4102" label="Email: False Positive (Unknown)"/>
+  <int value="4103" label="Email: False Positive (Empty)"/>
+  <int value="4104" label="Email: False Negative (Mismatch)"/>
+  <int value="4105" label="Email: False Negative (Unknown)"/>
+  <int value="4352" label="CC Name: True Positive"/>
+  <int value="4353" label="CC Name: True Negative (Ambiguous)"/>
+  <int value="4354" label="CC Name: True Negative (Unknown)"/>
+  <int value="4355" label="CC Name: True Negative (Empty)"/>
+  <int value="4356" label="CC Name: False Positive (Mismatch)"/>
+  <int value="4357" label="CC Name: False Positive (Ambiguous)"/>
+  <int value="4358" label="CC Name: False Positive (Unknown)"/>
+  <int value="4359" label="CC Name: False Positive (Empty)"/>
+  <int value="4360" label="CC Name: False Negative (Mismatch)"/>
+  <int value="4361" label="CC Name: False Negative (Unknown)"/>
+  <int value="4608" label="CC Number: True Positive"/>
+  <int value="4609" label="CC Number: True Negative (Ambiguous)"/>
+  <int value="4610" label="CC Number: True Negative (Unknown)"/>
+  <int value="4611" label="CC Number: True Negative (Empty)"/>
+  <int value="4612" label="CC Number: False Positive (Mismatch)"/>
+  <int value="4613" label="CC Number: False Positive (Ambiguous)"/>
+  <int value="4614" label="CC Number: False Positive (Unknown)"/>
+  <int value="4615" label="CC Number: False Positive (Empty)"/>
+  <int value="4616" label="CC Number: False Negative (Mismatch)"/>
+  <int value="4617" label="CC Number: False Negative (Unknown)"/>
+  <int value="4864" label="CC Expiry: True Positive"/>
+  <int value="4865" label="CC Expiry: True Negative (Ambiguous)"/>
+  <int value="4866" label="CC Expiry: True Negative (Unknown)"/>
+  <int value="4867" label="CC Expiry: True Negative (Empty)"/>
+  <int value="4868" label="CC Expiry: False Positive (Mismatch)"/>
+  <int value="4869" label="CC Expiry: False Positive (Ambiguous)"/>
+  <int value="4870" label="CC Expiry: False Positive (Unknown)"/>
+  <int value="4871" label="CC Expiry: False Positive (Empty)"/>
+  <int value="4872" label="CC Expiry: False Negative (Mismatch)"/>
+  <int value="4873" label="CC Expiry: False Negative (Unknown)"/>
+  <int value="5120" label="CC Type: True Positive"/>
+  <int value="5121" label="CC Type: True Negative (Ambiguous)"/>
+  <int value="5122" label="CC Type: True Negative (Unknown)"/>
+  <int value="5123" label="CC Type: True Negative (Empty)"/>
+  <int value="5124" label="CC Type: False Positive (Mismatch)"/>
+  <int value="5125" label="CC Type: False Positive (Ambiguous)"/>
+  <int value="5126" label="CC Type: False Positive (Unknown)"/>
+  <int value="5127" label="CC Type: False Positive (Empty)"/>
+  <int value="5128" label="CC Type: False Negative (Mismatch)"/>
+  <int value="5129" label="CC Type: False Negative (Unknown)"/>
+  <int value="5376" label="Password: True Positive"/>
+  <int value="5377" label="Password: True Negative (Ambiguous)"/>
+  <int value="5378" label="Password: True Negative (Unknown)"/>
+  <int value="5379" label="Password: True Negative (Empty)"/>
+  <int value="5380" label="Password: False Positive (Mismatch)"/>
+  <int value="5381" label="Password: False Positive (Ambiguous)"/>
+  <int value="5382" label="Password: False Positive (Unknown)"/>
+  <int value="5383" label="Password: False Positive (Empty)"/>
+  <int value="5384" label="Password: False Negative (Mismatch)"/>
+  <int value="5385" label="Password: False Negative (Unknown)"/>
+  <int value="5632" label="Address Line 3: True Positive"/>
+  <int value="5633" label="Address Line 3: True Negative (Ambiguous)"/>
+  <int value="5634" label="Address Line 3: True Negative (Unknown)"/>
+  <int value="5635" label="Address Line 3: True Negative (Empty)"/>
+  <int value="5636" label="Address Line 3: False Positive (Mismatch)"/>
+  <int value="5637" label="Address Line 3: False Positive (Ambiguous)"/>
+  <int value="5638" label="Address Line 3: False Positive (Unknown)"/>
+  <int value="5639" label="Address Line 3: False Positive (Empty)"/>
+  <int value="5640" label="Address Line 3: False Negative (Mismatch)"/>
+  <int value="5641" label="Address Line 3: False Negative (Unknown)"/>
+  <int value="5888" label="Username: True Positive"/>
+  <int value="5889" label="Username: True Negative (Ambiguous)"/>
+  <int value="5890" label="Username: True Negative (Unknown)"/>
+  <int value="5891" label="Username: True Negative (Empty)"/>
+  <int value="5892" label="Username: False Positive (Mismatch)"/>
+  <int value="5893" label="Username: False Positive (Ambiguous)"/>
+  <int value="5894" label="Username: False Positive (Unknown)"/>
+  <int value="5895" label="Username: False Positive (Empty)"/>
+  <int value="5896" label="Username: False Negative (Mismatch)"/>
+  <int value="5897" label="Username: False Negative (Unknown)"/>
+  <int value="6144" label="Street Address: True Positive"/>
+  <int value="6145" label="Street Address: True Negative (Ambiguous)"/>
+  <int value="6146" label="Street Address: True Negative (Unknown)"/>
+  <int value="6147" label="Street Address: True Negative (Empty)"/>
+  <int value="6148" label="Street Address: False Positive (Mismatch)"/>
+  <int value="6149" label="Street Address: False Positive (Ambiguous)"/>
+  <int value="6150" label="Street Address: False Positive (Unknown)"/>
+  <int value="6151" label="Street Address: False Positive (Empty)"/>
+  <int value="6152" label="Street Address: False Negative (Mismatch)"/>
+  <int value="6153" label="Street Address: False Negative (Unknown)"/>
+  <int value="6400" label="CVC: True Positive"/>
+  <int value="6401" label="CVC: True Negative (Ambiguous)"/>
+  <int value="6402" label="CVC: True Negative (Unknown)"/>
+  <int value="6403" label="CVC: True Negative (Empty)"/>
+  <int value="6404" label="CVC: False Positive (Mismatch)"/>
+  <int value="6405" label="CVC: False Positive (Ambiguous)"/>
+  <int value="6406" label="CVC: False Positive (Unknown)"/>
+  <int value="6407" label="CVC: False Positive (Empty)"/>
+  <int value="6408" label="CVC: False Negative (Mismatch)"/>
+  <int value="6409" label="CVC: False Negative (Unknown)"/>
+  <int value="6656" label="Unfillable: True Positive"/>
+  <int value="6657" label="Unfillable: True Negative (Ambiguous)"/>
+  <int value="6658" label="Unfillable: True Negative (Unknown)"/>
+  <int value="6659" label="Unfillable: True Negative (Empty)"/>
+  <int value="6660" label="Unfillable: False Positive (Mismatch)"/>
+  <int value="6661" label="Unfillable: False Positive (Ambiguous)"/>
+  <int value="6662" label="Unfillable: False Positive (Unknown)"/>
+  <int value="6663" label="Unfillable: False Positive (Empty)"/>
+  <int value="6664" label="Unfillable: False Negative (Mismatch)"/>
+  <int value="6665" label="Unfillable: False Negative (Unknown)"/>
 </enum>
 
 <enum name="AutofillFormDynamicity">
@@ -5509,6 +5897,19 @@ others/histograms.xml -->
       label="Not migrated (Unexpected primary account id with email format)."/>
 </enum>
 
+<enum name="AutofillOfferNotificationBubbleResult">
+  <int value="0" label="User closed bubble via OK button"/>
+  <int value="1" label="User closed bubble via corner X"/>
+  <int value="2" label="User did not interact with the bubble"/>
+  <int value="3" label="Bubble lost focus and was deactivated"/>
+</enum>
+
+<enum name="AutofillOfferNotificationInfoBarResult">
+  <int value="0" label="User closed infobar via OK button"/>
+  <int value="1" label="User closed infobar via corner X"/>
+  <int value="2" label="User did not interact with the infobar"/>
+</enum>
+
 <enum name="AutofillPredictionSource">
   <int value="0" label="PREDICTION_SOURCE_UNKNOWN"/>
   <int value="1" label="PREDICTION_SOURCE_HEURISTIC"/>
@@ -5585,6 +5986,10 @@ others/histograms.xml -->
 </enum>
 
 <enum name="AutofillSaveCreditCardPrompt">
+  <obsolete>
+    Deprecated in 02/2021. The corresponding histogram has been replaced by new
+    ones.
+  </obsolete>
   <int value="0" label="Show requested"/>
   <int value="1" label="Shown"/>
   <int value="2" label="Ended, invalid legal message"/>
@@ -5716,6 +6121,12 @@ others/histograms.xml -->
   <int value="99" label="NOT_PASSWORD"/>
 </enum>
 
+<enum name="AutofillServerPredictionAvailability">
+  <int value="0" label="Not available"/>
+  <int value="1" label="Available on session start"/>
+  <int value="2" label="Available after session start"/>
+</enum>
+
 <enum name="AutofillSessionStates">
   <int value="0" label="Unknown"/>
   <int value="1" label="No callback from framework"/>
@@ -6056,7 +6467,7 @@ others/histograms.xml -->
   <int value="10" label="Renderer debug URL"/>
   <int value="11" label="Not enabled and not needed for back-forward cache"/>
   <int value="14" label="Same-document navigation"/>
-  <int value="15" label="Same-page navigation"/>
+  <int value="15" label="Same-URL navigation"/>
   <int value="16" label="The current history entry will get replaced"/>
   <int value="17" label="Reload"/>
   <int value="18" label="Guest"/>
@@ -6178,6 +6589,12 @@ others/histograms.xml -->
       label="BackForwardCache is disabled through command line (may include
              cases where the embedder disabled it due to, e.g., enterprise
              policy)"/>
+  <int value="36" label="kFrameTreeNodeStateReset (removed)"/>
+  <int value="37" label="Network request datapipe drained"/>
+  <int value="38" label="Network request redirected"/>
+  <int value="39" label="Network request timed out"/>
+  <int value="40" label="Network request exceeds buffer limit"/>
+  <int value="41" label="Navigation was cancelled while restoring"/>
 </enum>
 
 <enum name="BackForwardCacheReloadsAfterHistoryNavigation">
@@ -6190,6 +6607,14 @@ others/histograms.xml -->
   <int value="1" label="ReloadAfterHistoryNavigation"/>
 </enum>
 
+<enum name="BackForwardCacheRendererEvictionReason">
+  <int value="0" label="JavaScript"/>
+  <int value="1" label="NetworkRequestDatapipeDrained"/>
+  <int value="2" label="NetworkRequestRedirected"/>
+  <int value="3" label="NetworkRequestTimeout"/>
+  <int value="4" label="NetworkExceedsBufferLimit"/>
+</enum>
+
 <enum name="BackForwardCacheSameSiteNavigationDidSwap">
   <int value="0" label="Did not swap BrowsingInstances"/>
   <int value="1" label="Swapped BrowsingInstances"/>
@@ -6394,6 +6819,7 @@ Called by update_bad_message_reasons.py.-->
   <int value="1" label="PPH_EXTRA_PREVIEW_MESSAGE"/>
   <int value="2" label="PMF_INVALID_INITIATOR_ORIGIN"/>
   <int value="3" label="RFH_INVALID_WEB_UI_CONTROLLER"/>
+  <int value="4" label="RFH_DISPLAY_CAPTURE_PERMISSION_MISSING"/>
 </enum>
 
 <enum name="BadMessageReasonContent">
@@ -6650,6 +7076,14 @@ Called by update_bad_message_reasons.py.-->
   <int value="233" label="RWH_CLOSE_PORTAL"/>
   <int value="234" label="MSDH_INVALID_STREAM_TYPE"/>
   <int value="235" label="RFH_CREATE_CHILD_FRAME_TOKENS_NOT_FOUND"/>
+  <int value="236" label="ASGH_ASSOCIATED_INTERFACE_REQUEST"/>
+  <int value="237" label="ASGH_RECEIVED_CONTROL_MESSAGE"/>
+  <int value="238" label="CSDH_BAD_OWNER"/>
+  <int value="239" label="SYNC_COMPOSITOR_NO_LOCAL_SURFACE_ID"/>
+  <int value="240" label="WCI_INVALID_FULLSCREEN_OPTIONS"/>
+  <int value="241" label="PAYMENTS_WITHOUT_PERMISSION"/>
+  <int value="242" label="WEB_BUNDLE_INVALID_NAVIGATION_URL"/>
+  <int value="243" label="WCI_INVALID_DOWNLOAD_IMAGE_RESULT"/>
 </enum>
 
 <enum name="BadMessageReasonExtensions">
@@ -6739,6 +7173,16 @@ Called by update_bad_message_reasons.py.-->
   <int value="10" label="IMAGE_REL_BASED_DIR64"/>
 </enum>
 
+<enum name="BatteryDischargeMode">
+  <int value="0" label="Battery discharging"/>
+  <int value="1" label="Battery plugged-in"/>
+  <int value="2" label="Power state changed"/>
+  <int value="3" label="Charge level unavailable"/>
+  <int value="4" label="No battery"/>
+  <int value="5" label="Invalid discharge rate"/>
+  <int value="6" label="Invalid interval"/>
+</enum>
+
 <enum name="BatteryInfoSampleResult">
   <int value="0" label="Read"/>
   <int value="1" label="Good"/>
@@ -6796,6 +7240,16 @@ Called by update_bad_message_reasons.py.-->
   <int value="5" label="Blacklist disabled."/>
 </enum>
 
+<enum name="BlinkSubresourceRedirectIneligibility">
+  <int value="0" label="Javascript created, same-origin resource"/>
+  <int value="1" label="Javascript created, cross-origin resource"/>
+  <int value="2"
+      label="Restricted by Content-Security-Policy default-src directive"/>
+  <int value="3"
+      label="Restricted by Content-Security-Policy img-src directive"/>
+  <int value="4" label="Crossorigin attribute was set"/>
+</enum>
+
 <enum name="BloatedRendererHandlingInBrowser">
   <int value="0" label="Reloaded the bloated tab"/>
   <int value="1" label="Cannot reload the bloated tab"/>
@@ -6851,6 +7305,28 @@ Called by update_bad_message_reasons.py.-->
   <int value="2" label="BLOCK_STATUS_ALL_DOMAINS_BLOCKED"/>
 </enum>
 
+<enum name="BluetoothAdapterConnectToServiceInsecurelyResult">
+  <int value="0" label="Success"/>
+  <int value="1" label="Error: Invalid arguments"/>
+  <int value="2" label="Error: Operation already in progress"/>
+  <int value="3" label="Error: Already exists"/>
+  <int value="4" label="Error: Operation is not supported"/>
+  <int value="5" label="Error: Not connected"/>
+  <int value="6" label="Error: Already connected"/>
+  <int value="7" label="Error: Operation currently not available"/>
+  <int value="8" label="Error: Does not exist"/>
+  <int value="9" label="Error: Operation not authorized"/>
+  <int value="10" label="Error: Not permitted"/>
+  <int value="11" label="Error: No such adapter"/>
+  <int value="12" label="Error: Agent not available"/>
+  <int value="13" label="Error: Resource not ready"/>
+  <int value="14" label="Error: Failed"/>
+  <int value="15" label="Error: Failed to create receiving Mojo pipe"/>
+  <int value="16" label="Error: Failed to create sending Mojo pipe"/>
+  <int value="17" label="Error: Could not connect to device"/>
+  <int value="18" label="Error: Unknown"/>
+</enum>
+
 <enum name="BluetoothAvailability">
   <int value="0" label="Unexpected error"/>
   <int value="1" label="Not available"/>
@@ -7106,6 +7582,14 @@ Called by update_bad_message_reasons.py.-->
   <int value="4" label="Unknown"/>
 </enum>
 
+<enum name="BlueZResultOfAdvertisementMonitor">
+  <int value="0" label="Success"/>
+  <int value="1" label="Unknown Error"/>
+  <int value="2" label="Invalid Parameters"/>
+  <int value="3" label="No Resource"/>
+  <int value="4" label="Busy"/>
+</enum>
+
 <enum name="BlueZResultOfAdvertisementRegistration">
   <int value="1" label="Success"/>
   <int value="2" label="LE unsupported"/>
@@ -7148,6 +7632,7 @@ Called by update_bad_message_reasons.py.-->
   <int value="10" label="Authentication cancelled"/>
   <int value="11" label="Authentication timeout"/>
   <int value="12" label="Unknown"/>
+  <int value="13" label="BT IO connection failed"/>
 </enum>
 
 <enum name="BlueZResultOfPerProfileConnection">
@@ -7220,6 +7705,27 @@ Called by update_bad_message_reasons.py.-->
   <int value="24" label="From out-of-scope app window to popup."/>
 </enum>
 
+<enum name="BookmarkBarPrefAndState">
+  <summary>
+    The Boomarks bar pref state and whether the user is on the NTP when the
+    reading list is opened.
+  </summary>
+  <int value="0"
+      label="Bookmarks bar pref is set to shown and user is opening the
+             reading list from the NTP"/>
+  <int value="1"
+      label="Bookmarks bar pref is set to hidden and user is opening the
+             reading list from the NTP"/>
+  <int value="2"
+      label="Bookmarks bar pref is set to shown and user is not opening the
+             reading list from the NTP"/>
+</enum>
+
+<enum name="BookmarkBarState">
+  <int value="0" label="Bookmark bar hidden"/>
+  <int value="1" label="Bookmark bar shown"/>
+</enum>
+
 <enum name="BookmarkGUIDSource">
   <summary>
     Whether a GUID came from BookmarkSpecifics, or, in case it was missing,
@@ -7358,6 +7864,11 @@ Called by update_bad_message_reasons.py.-->
   <int value="1" label="Prevented"/>
 </enum>
 
+<enum name="BooleanAffected">
+  <int value="0" label="Not Affected"/>
+  <int value="1" label="Affected"/>
+</enum>
+
 <enum name="BooleanAllowed">
   <int value="0" label="Not Allowed"/>
   <int value="1" label="Allowed"/>
@@ -7997,6 +8508,16 @@ Called by update_bad_message_reasons.py.-->
   <int value="1" label="HTTPS"/>
 </enum>
 
+<enum name="BooleanHTTPVsJS">
+  <int value="0" label="JS"/>
+  <int value="1" label="HTTP"/>
+</enum>
+
+<enum name="BooleanHung">
+  <int value="0" label="Is not hung"/>
+  <int value="1" label="Is hung"/>
+</enum>
+
 <enum name="BooleanIgnored">
   <int value="0" label="Not ignored"/>
   <int value="1" label="Ignored"/>
@@ -8067,6 +8588,11 @@ Called by update_bad_message_reasons.py.-->
   <int value="1" label="Is malware"/>
 </enum>
 
+<enum name="BooleanIsMimeTypeApk">
+  <int value="0" label="Not apk"/>
+  <int value="1" label="Apk"/>
+</enum>
+
 <enum name="BooleanIsMobileOptimized">
   <int value="0" label="Not mobile optimized web page"/>
   <int value="1" label="Mobile optimized web page"/>
@@ -8130,6 +8656,11 @@ Called by update_bad_message_reasons.py.-->
   <int value="1" label="Latched"/>
 </enum>
 
+<enum name="BooleanLegacySupervisedUserHidden">
+  <int value="0" label="Displayed on login screen"/>
+  <int value="1" label="Hidden on login screen"/>
+</enum>
+
 <enum name="BooleanLoadCollided">
   <int value="0" label="Load did not collide"/>
   <int value="1" label="Load collided"/>
@@ -8150,6 +8681,11 @@ Called by update_bad_message_reasons.py.-->
   <int value="1" label="Main frame"/>
 </enum>
 
+<enum name="BooleanManagedPref">
+  <int value="0" label="Unmanaged Pref"/>
+  <int value="1" label="Managed Pref"/>
+</enum>
+
 <enum name="BooleanMarkedForReload">
   <int value="0" label="Not marked for reload"/>
   <int value="1" label="Marked for reload"/>
@@ -8235,6 +8771,11 @@ Called by update_bad_message_reasons.py.-->
   <int value="1" label="NSObject is nil"/>
 </enum>
 
+<enum name="BooleanNoisedAgeOver21Under85">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="Noised age between 21 and 85 inclusive"/>
+</enum>
+
 <enum name="BooleanNull">
   <int value="0" label="Is not a nullptr"/>
   <int value="1" label="Is a nullptr"/>
@@ -8438,6 +8979,11 @@ Called by update_bad_message_reasons.py.-->
   <int value="1" label="Reloaded"/>
 </enum>
 
+<enum name="BooleanRelroAvailableImmediately">
+  <int value="0" label="Available Later"/>
+  <int value="1" label="Available Immediately"/>
+</enum>
+
 <enum name="BooleanRemoved">
   <int value="0" label="Not removed"/>
   <int value="1" label="Removed"/>
@@ -8523,6 +9069,11 @@ Called by update_bad_message_reasons.py.-->
   <int value="1" label="Sent"/>
 </enum>
 
+<enum name="BooleanSet">
+  <int value="0" label="Not set"/>
+  <int value="1" label="Set"/>
+</enum>
+
 <enum name="BooleanShareGroup">
   <int value="0" label="No share group"/>
   <int value="1" label="Using share group"/>
@@ -8586,6 +9137,11 @@ Called by update_bad_message_reasons.py.-->
   <int value="1" label="Suppressed"/>
 </enum>
 
+<enum name="BooleanSystemNotifications">
+  <int value="0" label="Using Chrome notifications"/>
+  <int value="1" label="Using system notifications"/>
+</enum>
+
 <enum name="BooleanTabDiscard">
   <int value="0" label="Memory OK, no discards"/>
   <int value="1" label="Memory low, tabs discarded"/>
@@ -8636,6 +9192,11 @@ Called by update_bad_message_reasons.py.-->
   <int value="1" label="Translated"/>
 </enum>
 
+<enum name="BooleanUnavailable">
+  <int value="0" label="Available"/>
+  <int value="1" label="Unavailable"/>
+</enum>
+
 <enum name="BooleanUnderlay">
   <int value="0" label="Overlay Mode"/>
   <int value="1" label="Underlay Mode"/>
@@ -8769,6 +9330,7 @@ Called by update_bad_message_reasons.py.-->
              Borealis DLC"/>
   <int value="8" label="Device needs more space to use Borealis DLC"/>
   <int value="9" label="DLC faced an unknown error"/>
+  <int value="10" label="Device is offline"/>
 </enum>
 
 <enum name="BorealisStartupResult">
@@ -8881,9 +9443,10 @@ Called by update_bad_message_reasons.py.-->
 <enum name="BrowserProfileType">
   <int value="0" label="Regular"/>
   <int value="1" label="Incognito"/>
-  <int value="2" label="Guest"/>
+  <int value="2" label="Guest (OTR)"/>
   <int value="3" label="System"/>
   <int value="4" label="Other Off The Record"/>
+  <int value="5" label="Guest (Ephemeral)"/>
 </enum>
 
 <enum name="BrowserServicesVerificationResult">
@@ -8932,6 +9495,9 @@ Called by update_bad_message_reasons.py.-->
 </enum>
 
 <enum name="BubbleDismissalReason">
+  <obsolete>
+    Deprecated 12/2020 as it is no longer used for analysis.
+  </obsolete>
   <int value="0" label="The timer dismissed the bubble."/>
   <int value="1" label="A tap inside the bubble caused dismissal."/>
   <int value="2" label="A tap outside the bubble caused dismissal."/>
@@ -8986,6 +9552,8 @@ Called by update_bad_message_reasons.py.-->
   <int value="21" label="kKeysImplBackendClosed"/>
   <int value="22" label="kCreateBackendDidCreateFailed"/>
   <int value="23" label="kStorageGetAllMatchedEntriesBackendClosed"/>
+  <int value="24" label="kStorageHandleNull"/>
+  <int value="25" label="kWriteSideDataDidWriteMetadataWrongBytes"/>
 </enum>
 
 <enum name="CacheStorageErrorType">
@@ -9041,6 +9609,12 @@ Called by update_bad_message_reasons.py.-->
   <int value="27" label="Too many quads."/>
 </enum>
 
+<enum name="CameraPrivacySwitchEvent">
+  <int value="0" label="Camera privacy switch toggled on"/>
+  <int value="1" label="Camera privacy switch toggled off"/>
+  <int value="2" label="Camera privacy switch on notification shown"/>
+</enum>
+
 <enum name="CancelableTaskStatus">
   <int value="0" label="Live, on same sequence"/>
   <int value="1" label="Live, on other sequence"/>
@@ -9109,6 +9683,7 @@ Called by update_bad_message_reasons.py.-->
   <int value="5" label="HTML Video Element"/>
   <int value="6" label="OffscreenCanvas"/>
   <int value="7" label="SVG Image Element"/>
+  <int value="8" label="VideoFrame"/>
 </enum>
 
 <enum name="CanvasDisplayListFallbackReason">
@@ -9315,6 +9890,8 @@ Called by update_bad_message_reasons.py.-->
   <int value="2" label="Quick Settings"/>
   <int value="3" label="Stylus Palette"/>
   <int value="4" label="Power Menu"/>
+  <int value="5" label="Snip Key"/>
+  <int value="6" label="Full Screenshot Accelerator"/>
 </enum>
 
 <enum name="CapturePixelFormat">
@@ -9333,6 +9910,12 @@ Called by update_bad_message_reasons.py.-->
   <int value="9" label="TEXTURE"/>
 </enum>
 
+<enum name="CaptureQuickAction">
+  <int value="0" label="Edit file in backlight"/>
+  <int value="1" label="Go to file location"/>
+  <int value="2" label="Delete file"/>
+</enum>
+
 <enum name="CaptureStartupResult">
   <obsolete>
     Deprecated as of 02/2017.
@@ -9366,6 +9949,12 @@ Called by update_bad_message_reasons.py.-->
   <int value="2" label="Missing"/>
 </enum>
 
+<enum name="CastNotificationControls">
+  <int value="0" label="Resume"/>
+  <int value="1" label="Pause"/>
+  <int value="2" label="Stop"/>
+</enum>
+
 <enum name="CastOverlayEvents">
   <int value="0" label="Created"/>
   <int value="1" label="Shown"/>
@@ -9741,6 +10330,13 @@ histogram as enum -->
   <int value="2" label="Startup"/>
 </enum>
 
+<enum name="ChromeLabsSelectedLab">
+  <int value="0" label="User selected an unspecified lab"/>
+  <int value="1" label="User selected the Read Later lab"/>
+  <int value="2" label="User selected the Tab Search lab"/>
+  <int value="3" label="User selected the Tab Scrolling lab"/>
+</enum>
+
 <enum name="ChromeMLServiceDecisionTreePredictionResult">
   <int value="0" label="Unknown"/>
   <int value="1" label="True"/>
@@ -9765,6 +10361,16 @@ histogram as enum -->
   <int value="2" label="First service disabled"/>
 </enum>
 
+<enum name="ChromeOSCameraClientType">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="Testing"/>
+  <int value="2" label="Chrome"/>
+  <int value="3" label="Android"/>
+  <int value="4" label="PluginVM"/>
+  <int value="5" label="AshChrome"/>
+  <int value="6" label="LacrosChrome"/>
+</enum>
+
 <enum name="ChromeOSCameraErrorType">
   <int value="1" label="Device"/>
   <int value="2" label="Request"/>
@@ -9794,6 +10400,13 @@ histogram as enum -->
   <int value="3" label="Reading"/>
 </enum>
 
+<enum name="ChromeOSHiddenUserPodsOfflineLogin">
+  <summary>Tracks if offline user login is allowed.</summary>
+  <int value="0" label="Enabled"/>
+  <int value="1" label="Blocked by time limit expired"/>
+  <int value="2" label="Blocked by invalid sync token"/>
+</enum>
+
 <enum name="ChromeOSJankinessTriggerStatus">
   <int value="0" label="CollectionAttempted"/>
   <int value="1" label="Throttled"/>
@@ -9904,6 +10517,41 @@ histogram as enum -->
   </int>
 </enum>
 
+<enum name="ChromeOSProfileRecordStatus">
+  <int value="0" label="Metrics recording is disabled">
+    Profile data was not recorded since metric recording is disabled.
+  </int>
+  <int value="1" label="Profile manager is unset">
+    Profile data was redacted since the profile manager used to obtain user
+    profile(s) is unset.
+  </int>
+  <int value="2" label="No loaded user profile is found">
+    Profile data was redacted since there is no user profile initialized. When
+    looking at user profile(s), the Default profile in Chrome OS is skipped.
+  </int>
+  <int value="3" label="App sync is disabled">
+    Profile data was redacted since App Sync is disabled.
+  </int>
+  <int value="4" label="App sync is enabled">
+    Profile data was recorded in full since App Sync is enabled.
+  </int>
+  <int value="5" label="Sync service is unavailable">
+    Profile data was redacted since sync service is unavailable.
+  </int>
+  <int value="6" label="Chrome sync feature is disabled">
+    Profile data was redacted since Chrome sync feature is disabled.
+  </int>
+  <int value="7" label="Chrome App Sync is disabled">
+    Profile data was redacted since Chrome App Sync is disabled.
+  </int>
+  <int value="8" label="Chrome OS sync feature is disabled">
+    Profile data was redacted since Chrome OS sync feature is disabled.
+  </int>
+  <int value="9" label="Chrome OS App Sync is disabled">
+    Profile data was redacted since Chrome OS App Sync is disabled.
+  </int>
+</enum>
+
 <enum name="ChromeOSRecoveryReason">
   <summary>
     Reason for entering Recovery Mode. See
@@ -10024,9 +10672,34 @@ histogram as enum -->
 
 <enum name="ChromeOSSharesheetAction">
   <summary>Defines Chrome OS sharesheet actions.</summary>
-  <int value="0" label="Cancelled by user"/>
+  <int value="0" label="Cancelled by user clicking outside bubble"/>
   <int value="1" label="Launch ARC app"/>
-  <int value="2" label="Launch share action"/>
+  <int value="2" label="Launch Nearby Share action"/>
+  <int value="3" label="Cancelled by user pressing Esc key"/>
+  <int value="4" label="Launch Web app"/>
+  <int value="5" label="Launch Drive share action"/>
+</enum>
+
+<enum name="ChromeOSSharesheetFormFactor">
+  <summary>Different form factors.</summary>
+  <int value="0" label="Tablet form factor"/>
+  <int value="1" label="Clamshell form factor"/>
+</enum>
+
+<enum name="ChromeOSSharesheetLaunchSource">
+  <summary>The source from which sharesheet is invoked.</summary>
+  <int value="0" label="Invoked from an unknown source"/>
+  <int value="1" label="Invoked from the share button in the Files app"/>
+  <int value="2" label="Invoked from the context menu in the Files app"/>
+  <int value="3" label="Invoked through WebShare"/>
+</enum>
+
+<enum name="ChromeOSSharesheetShareAction">
+  <summary>
+    The types of share actions present in the sharesheet when it is invoked.
+  </summary>
+  <int value="2" label="Nearby Share Action"/>
+  <int value="5" label="Drive Share Action"/>
 </enum>
 
 <enum name="ChromeOSUICommands">
@@ -10109,8 +10782,8 @@ histogram as enum -->
   <int value="4" label="FitToWidth"/>
   <int value="5" label="FitToPageFirst"/>
   <int value="6" label="FitToPage"/>
-  <int value="7" label="OpenBookmarksPanelFirst"/>
-  <int value="8" label="OpenBookmarksPanel"/>
+  <int value="7" label="OpenBookmarksPanelFirst (deprecated)"/>
+  <int value="8" label="OpenBookmarksPanel (deprecated)"/>
   <int value="9" label="FollowBookmarkFirst"/>
   <int value="10" label="FollowBookmark"/>
   <int value="11" label="PageSelectorNavigateFirst"/>
@@ -10163,6 +10836,10 @@ histogram as enum -->
   <int value="58" label="SelectSidenavOutline"/>
   <int value="59" label="ToggleDisplayAnnotationsFirst"/>
   <int value="60" label="ToggleDisplayAnnotations"/>
+  <int value="61" label="PresentFirst"/>
+  <int value="62" label="Present"/>
+  <int value="63" label="PropertiesFirst"/>
+  <int value="64" label="Properties"/>
 </enum>
 
 <enum name="ChromePDFViewerAnnotationType">
@@ -10222,6 +10899,17 @@ histogram as enum -->
   <int value="1" label="A hash is saved"/>
 </enum>
 
+<enum name="ChromeStartupDelegateFailureType">
+  <int value="0" label="Other"/>
+  <int value="1" label="Service Missing"/>
+  <int value="2" label="Service Version Update Required"/>
+  <int value="3" label="Service Disabled"/>
+  <int value="4" label="Network Error"/>
+  <int value="5" label="Service Invalid"/>
+  <int value="6" label="Developer Error"/>
+  <int value="7" label="API Unavailable"/>
+</enum>
+
 <enum name="ChromeStartupDelegateResult">
   <int value="0" label="Failure"/>
   <int value="1" label="Allow"/>
@@ -10910,26 +11598,48 @@ histogram as enum -->
   <int value="-2014954614" label="so"/>
   <int value="-2005166181" label="ja-Latn"/>
   <int value="-1999171202" label="lv"/>
+  <int value="-1998337622" label="es-CL"/>
   <int value="-1994870905" label="lt"/>
+  <int value="-1986814580" label="om"/>
+  <int value="-1920649864" label="an"/>
   <int value="-1898669966" label="zh-CN"/>
+  <int value="-1872667487" label="rm"/>
   <int value="-1855113037" label="vi"/>
   <int value="-1828586117" label="de"/>
   <int value="-1823968882" label="zh"/>
+  <int value="-1797669833" label="it-IT"/>
   <int value="-1791051166" label="ha"/>
+  <int value="-1787999070" label="wa"/>
+  <int value="-1776903256" label="es-ES"/>
+  <int value="-1767491741" label="es-HN"/>
   <int value="-1760672594" label="mr"/>
+  <int value="-1741747229" label="es-419"/>
   <int value="-1735828230" label="zh-TW"/>
+  <int value="-1734070684" label="en-NZ"/>
+  <int value="-1731398502" label="wo"/>
   <int value="-1696927720" label="la"/>
   <int value="-1690250140" label="ja"/>
+  <int value="-1683177340" label="qu"/>
+  <int value="-1662603770" label="es-VE"/>
+  <int value="-1625830957" label="ln"/>
+  <int value="-1612285087" label="en-ZA"/>
   <int value="-1566592213" label="hi-Latn"/>
+  <int value="-1558307126" label="es-CO"/>
   <int value="-1532548885" label="pa"/>
   <int value="-1515310228" label="ps"/>
   <int value="-1453785110" label="rw"/>
+  <int value="-1452189651" label="es-CR"/>
+  <int value="-1346992143" label="nn"/>
   <int value="-1284862637" label="ru"/>
   <int value="-1273588087" label="kn"/>
+  <int value="-1242903543" label="es-UY"/>
+  <int value="-1230368678" label="kok"/>
   <int value="-1211529228" label="gd"/>
   <int value="-1159958698" label="tl"/>
+  <int value="-1136256351" label="zh-HK"/>
   <int value="-1117024738" label="zh-Latn"/>
   <int value="-1100371650" label="sn"/>
+  <int value="-1086322569" label="es-AR"/>
   <int value="-1052948093" label="jw"/>
   <int value="-1048980531" label="ur"/>
   <int value="-1042449480" label="cy"/>
@@ -10938,14 +11648,19 @@ histogram as enum -->
   <int value="-1010619188" label="ru-Latn"/>
   <int value="-1000295094" label="no"/>
   <int value="-950444864" label="tk"/>
+  <int value="-926982267" label="de-AT"/>
   <int value="-887258309" label="hu"/>
+  <int value="-873154203" label="en-CA"/>
   <int value="-862298602" label="st"/>
   <int value="-851607677" label="sm"/>
+  <int value="-846401046" label="chr"/>
   <int value="-838275151" label="xh"/>
   <int value="-812926878" label="ug"/>
+  <int value="-780984386" label="fr-CA"/>
   <int value="-750267977" label="bg"/>
   <int value="-742603342" label="ca"/>
   <int value="-740941224" label="ku"/>
+  <int value="-739605699" label="de-LI"/>
   <int value="-734032818" label="km"/>
   <int value="-717751759" label="lb"/>
   <int value="-659007214" label="el"/>
@@ -10954,17 +11669,25 @@ histogram as enum -->
   <int value="-644560085" label="su"/>
   <int value="-598481752" label="et"/>
   <int value="-548175087" label="tt"/>
+  <int value="-450972170" label="oc"/>
   <int value="-442590807" label="sd"/>
   <int value="-441493751" label="el-Latn"/>
+  <int value="-439564761" label="he"/>
+  <int value="-433923634" label="en-US"/>
+  <int value="-429718906" label="sh"/>
   <int value="-426630965" label="ga"/>
   <int value="-415677801" label="it"/>
   <int value="-403118581" label="sw"/>
+  <int value="-371077109" label="fr-FR"/>
   <int value="-349113427" label="am"/>
   <int value="-342591258" label="sq"/>
+  <int value="-302282167" label="ti"/>
   <int value="-226066958" label="bg-Latn"/>
   <int value="-219674420" label="ta"/>
+  <int value="-183664425" label="pt-PT"/>
   <int value="-181870943" label="bn"/>
   <int value="-110306666" label="sr"/>
+  <int value="-91748674" label="tn"/>
   <int value="-78164291" label="kk"/>
   <int value="-74147910" label="en"/>
   <int value="-35182995" label="fi"/>
@@ -10976,6 +11699,7 @@ histogram as enum -->
   <int value="124739394" label="lo"/>
   <int value="132594104" label="be"/>
   <int value="134866094" label="ka"/>
+  <int value="142304335" label="gn"/>
   <int value="142313505" label="ro"/>
   <int value="145030010" label="gu"/>
   <int value="162326141" label="sl"/>
@@ -10989,37 +11713,58 @@ histogram as enum -->
   <int value="522435458" label="hr"/>
   <int value="526531379" label="ml"/>
   <int value="538270200" label="uk"/>
+  <int value="549800655" label="de-CH"/>
+  <int value="584710092" label="nb"/>
   <int value="596295208" label="bs"/>
   <int value="632444664" label="yue-HK"/>
   <int value="673577439" label="cs"/>
+  <int value="720107264" label="es-PE"/>
   <int value="729519028" label="or"/>
   <int value="796588925" label="yo"/>
   <int value="804120371" label="jv"/>
   <int value="873647701" label="th"/>
   <int value="910795716" label="ne"/>
+  <int value="911100675" label="de-DE"/>
   <int value="925733725" label="ms"/>
+  <int value="1062172280" label="en-IN"/>
   <int value="1092864716" label="ht"/>
   <int value="1110169461" label="hmn"/>
   <int value="1119752109" label="te"/>
   <int value="1140816756" label="ar"/>
+  <int value="1152813109" label="to"/>
   <int value="1166708194" label="is"/>
+  <int value="1196096274" label="es-US"/>
+  <int value="1199169847" label="en-AU"/>
   <int value="1214473765" label="unknown"/>
+  <int value="1228519432" label="fo"/>
+  <int value="1282439493" label="es-MX"/>
   <int value="1311313702" label="pt"/>
   <int value="1312638242" label="pl"/>
   <int value="1437205305" label="uz"/>
   <int value="1482920614" label="yi"/>
   <int value="1483760478" label="tg"/>
   <int value="1552733612" label="da"/>
+  <int value="1628170778" label="pt-BR"/>
   <int value="1638257274" label="sk"/>
   <int value="1670494558" label="ko"/>
   <int value="1704087523" label="ky"/>
   <int value="1704315002" label="fr"/>
+  <int value="1708437566" label="it-CH"/>
   <int value="1717583602" label="co"/>
+  <int value="1724977738" label="ia"/>
   <int value="1754979806" label="fy"/>
   <int value="1853848431" label="tr"/>
+  <int value="1884922344" label="ckb"/>
+  <int value="1921155040" label="br"/>
+  <int value="1988450082" label="tw"/>
   <int value="2039992295" label="ig"/>
+  <int value="2077417554" label="fr-CH"/>
+  <int value="2078974161" label="ast"/>
   <int value="2087142539" label="mn"/>
+  <int value="2094171128" label="mo"/>
+  <int value="2098003573" label="as"/>
   <int value="2119087611" label="nl"/>
+  <int value="2147270293" label="en-GB"/>
 </enum>
 
 <enum name="ClearBrowsingDataTab">
@@ -11133,6 +11878,7 @@ histogram as enum -->
   <int value="6" label="CustomData"/>
   <int value="7" label="WebSmartPaste"/>
   <int value="8" label="Svg"/>
+  <int value="9" label="Filenames"/>
 </enum>
 
 <enum name="ClipboardFormatWrite">
@@ -11145,12 +11891,33 @@ histogram as enum -->
   <int value="6" label="CustomData"/>
   <int value="7" label="WebSmartPaste"/>
   <int value="8" label="Svg"/>
+  <int value="9" label="Filenames"/>
 </enum>
 
 <enum name="ClipboardHistoryDisplayFormat">
   <int value="0" label="Text"/>
   <int value="1" label="Bitmap"/>
   <int value="2" label="Html"/>
+  <int value="3" label="File"/>
+</enum>
+
+<enum name="ClipboardHistoryOperation">
+  <int value="0" label="Copy"/>
+  <int value="1" label="Paste (from clipboard and clipboard history)"/>
+</enum>
+
+<enum name="ClipboardHistoryPlaceholderStringType">
+  <int value="0" label="Bitmap"/>
+  <int value="1" label="Html"/>
+  <int value="2" label="Rtf"/>
+  <int value="3" label="Web Smart Paste"/>
+</enum>
+
+<enum name="ClipboardHistoryTriggerType">
+  <int value="0" label="Accelerator"/>
+  <int value="1" label="Render View Context Menu"/>
+  <int value="2" label="Textfield Context Menu"/>
+  <int value="3" label="Virtual Keyboard"/>
 </enum>
 
 <enum name="ClockdriftLevel">
@@ -11301,7 +12068,8 @@ Called by update_net_error_codes.py.-->
   <int value="-603" label="FTP_TRANSFER_ABORTED"/>
   <int value="-602" label="FTP_SERVICE_UNAVAILABLE"/>
   <int value="-601" label="FTP_FAILED"/>
-  <int value="-507" label="TRUST_TOKEN_OPERATION_CACHE_HIT"/>
+  <int value="-507"
+      label="TRUST_TOKEN_OPERATION_SUCCESS_WITHOUT_SENDING_REQUEST"/>
   <int value="-506" label="TRUST_TOKEN_OPERATION_FAILED"/>
   <int value="-505" label="INVALID_WEB_BUNDLE"/>
   <int value="-504" label="INVALID_SIGNED_EXCHANGE"/>
@@ -11707,13 +12475,6 @@ Called by update_net_error_codes.py.-->
   <int value="1" label="deflate"/>
 </enum>
 
-<enum name="CompromiseType">
-  <int value="0"
-      label="Leaked - If the credentials was leaked by a data breach."/>
-  <int value="1"
-      label="Phished - If the credentials was reused on a phishing site."/>
-</enum>
-
 <enum name="ComputeCurrentSigninStatus">
   <obsolete>
     Deprecated as of Jun 2016. The enum was added for debugging purpose and is
@@ -11955,6 +12716,16 @@ Called by update_net_error_codes.py.-->
   <int value="13" label="TLS-1.2">An SSL connection that uses TLS 1.2</int>
 </enum>
 
+<enum name="ConnectivityDetectorConnectionState">
+  <int value="0" label="Initial state or connection state can't be evaluated"/>
+  <int value="1" label="The network is disconnected"/>
+  <int value="2"
+      label="The network is connected, but it can't reach the Internet"/>
+  <int value="3"
+      label="The network is connected, but capitive portal is detected"/>
+  <int value="4" label="The network is validated"/>
+</enum>
+
 <enum name="ConnectivityDiagnosticsTestVerdict">
   <int value="0" label="NO_PROBLEM"/>
   <int value="1" label="POTENTIAL_PROBLEM"/>
@@ -12284,6 +13055,7 @@ Called by update_net_error_codes.py.-->
   <int value="69" label="Window placement"/>
   <int value="70" label="Insecure private network requests"/>
   <int value="71" label="Font Access"/>
+  <int value="74" label="Display Capture"/>
 </enum>
 
 <enum name="ContentTypeParseableResult">
@@ -12318,6 +13090,7 @@ Called by update_net_error_codes.py.-->
   <int value="14" label="CONTEXT_LOST_SET_DRAW_RECTANGLE_FAILED"/>
   <int value="15" label="CONTEXT_LOST_DIRECT_COMPOSITION_OVERLAY_FAILED"/>
   <int value="16" label="CONTEXT_LOST_SWAP_FAILED"/>
+  <int value="17" label="CONTEXT_LOST_BEGIN_PAINT_FAILED"/>
 </enum>
 
 <enum name="ContextMenuDelayedElementDetails">
@@ -12391,6 +13164,10 @@ Called by update_net_error_codes.py.-->
 </enum>
 
 <enum name="ContextMenuLensSupportStatus">
+  <obsolete>
+    Deprecated. Switch to use LensSupportStatus to support all Lens entry
+    points.
+  </obsolete>
   <summary>Whether lens is supported and if not the reason why.</summary>
   <int value="0" label="Lens Search Supported"/>
   <int value="1" label="Not Google Search Engine"/>
@@ -12401,6 +13178,8 @@ Called by update_net_error_codes.py.-->
   <int value="6" label="Invalid Package"/>
   <int value="7" label="Lens Shop Supported"/>
   <int value="8" label="Lens Search And Shop Supported"/>
+  <int value="9" label="Camera Not Available"/>
+  <int value="10" label="Low End Device"/>
 </enum>
 
 <enum name="ContextMenuOption">
@@ -12481,13 +13260,14 @@ Called by update_net_error_codes.py.-->
   <int value="25" label="Preview image (Ephemeral tab)"/>
   <int value="26" label="Share Link (DirectShare)"/>
   <int value="27" label="Share Image (DirectShare)"/>
-  <int value="28" label="Search with Google Lens"/>
+  <int value="28" label="Search Image with Google Lens"/>
   <int value="29" label="Copy image"/>
   <int value="30" label="Shop Similar Products"/>
   <int value="31" label="Shop image with Google Lens"/>
   <int value="32" label="Search Similar Products"/>
   <int value="33" label="Read later"/>
   <int value="34" label="Shop with Google Lens Chip"/>
+  <int value="35" label="Translate with Google Lens Chip"/>
 </enum>
 
 <enum name="ContextMenuOptionDesktop">
@@ -12513,6 +13293,7 @@ Called by update_net_error_codes.py.-->
   <int value="18" label="Paste text"/>
   <int value="19" label="Go to URL"/>
   <int value="20" label="Copy link to text"/>
+  <int value="21" label="Search Image with Google Lens"/>
 </enum>
 
 <enum name="ContextMenuOptionIOS">
@@ -12889,6 +13670,14 @@ Called by update_net_error_codes.py.-->
   <int value="2" label="External non-200 HTTP error"/>
 </enum>
 
+<enum name="ConversionStorageSqlInitStatus">
+  <int value="0" label="Success"/>
+  <int value="1" label="Failed to open DB in memory"/>
+  <int value="2" label="Failed to open DB file"/>
+  <int value="3" label="Failed to create directory"/>
+  <int value="4" label="Failed to initialize schema"/>
+</enum>
+
 <enum name="CookieCommitProblem">
   <int value="0" label="Entry encryption failed"/>
   <int value="1" label="Adding cookie to DB failed."/>
@@ -13518,6 +14307,8 @@ Called by update_net_error_codes.py.-->
   <int value="5" label="CRAS_CLIENT_TYPE_ARC"/>
   <int value="6" label="CRAS_CLIENT_TYPE_CROSVM"/>
   <int value="7" label="CRAS_CLIENT_TYPE_SERVER_STREAM"/>
+  <int value="8" label="CRAS_CLIENT_TYPE_LACROS"/>
+  <int value="9" label="CRAS_CLIENT_TYPE_PLUGIN"/>
 </enum>
 
 <enum name="CrasDeviceType">
@@ -13709,7 +14500,11 @@ to ensure that the crash string is shown properly on the user-facing crash UI.
   <int value="0" label="CRAS_HFP_BATTERY_INDICATOR_NONE"/>
   <int value="1" label="CRAS_HFP_BATTERY_INDICATOR_HFP"/>
   <int value="2" label="CRAS_HFP_BATTERY_INDICATOR_APPLE"/>
-  <int value="3" label="CRAS_HFP_BATTERY_INDICATOR_BOTH"/>
+  <int value="3" label="CRAS_HFP_BATTERY_INDICATOR_HFP_APPLE"/>
+  <int value="4" label="CRAS_HFP_BATTERY_INDICATOR_PLANTRONICS"/>
+  <int value="5" label="CRAS_HFP_BATTERY_INDICATOR_HFP_PLANTRONICS"/>
+  <int value="6" label="CRAS_HFP_BATTERY_INDICATOR_APPLE_PLANTRONICS"/>
+  <int value="7" label="CRAS_HFP_BATTERY_INDICATOR_ALL"/>
 </enum>
 
 <enum name="CrasHfpCodec">
@@ -14056,6 +14851,11 @@ to ensure that the crash string is shown properly on the user-facing crash UI.
   <int value="3" label="User disabled"/>
 </enum>
 
+<enum name="CrosCdmType">
+  <int value="0" label="Chrome CDM"/>
+  <int value="1" label="Platform CDM"/>
+</enum>
+
 <enum name="CrosComponentManagerError">
   <int value="0" label="NONE"/>
   <int value="1" label="UNKNOWN_COMPONENT"/>
@@ -14088,6 +14888,13 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="13" label="AlreadyUploaded"/>
 </enum>
 
+<enum name="CrosDiagnosticsRoutineResult">
+  <int value="0" label="TestPassed"/>
+  <int value="1" label="TestFailed"/>
+  <int value="2" label="ExecutionError"/>
+  <int value="3" label="UnableToRun"/>
+</enum>
+
 <enum name="CrosDictationToggleDictationMethod">
   <int value="0" label="Search+D"/>
   <int value="1" label="Click onscreen button"/>
@@ -14285,6 +15092,20 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="2" label="Finished with &quot;Keep Exploring&quot; button"/>
 </enum>
 
+<enum name="CrosSelectToSpeakActivationMethod">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="Canceled with menu button"/>
+  <int value="2" label="Canceled with keyboard shortcut"/>
+</enum>
+
+<enum name="CrosSelectToSpeakOverrideSpeechRateMultiplier">
+  <int value="50" label="0.5"/>
+  <int value="100" label="1.0"/>
+  <int value="120" label="1.2"/>
+  <int value="150" label="1.5"/>
+  <int value="200" label="2.0"/>
+</enum>
+
 <enum name="CrosSelectToSpeakSpeechPitch">
   <obsolete>
     Deprecated 7/2018 in Issue 866550 in favor of using global Text-to-Speech
@@ -14464,6 +15285,7 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="5" label="DISK_STATUS_DESTROYED"/>
   <int value="6" label="DISK_STATUS_IN_PROGRESS"/>
   <int value="7" label="DISK_STATUS_RESIZED"/>
+  <int value="8" label="DISK_STATUS_NOT_ENOUGH_SPACE"/>
 </enum>
 
 <!-- Keep this in sync with CrostiniDiskImageType in crostini_simple_types.h -->
@@ -14492,6 +15314,27 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="5" label="Failed Insufficient Space"/>
 </enum>
 
+<enum name="CrostiniInstallerState">
+<!-- Keep this in sync with InstallerState in crostini_types.mojom -->
+
+  <int value="0" label="Start"/>
+  <int value="1" label="InstallImageLoader"/>
+  <int value="2" label="CreateDiskImage"/>
+  <int value="3" label="StartTerminaVm"/>
+  <int value="4" label="StartLxd"/>
+  <int value="5" label="CreateContainer"/>
+  <int value="6" label="SetupContainer"/>
+  <int value="7" label="StartContainer"/>
+  <int value="8" label="FetchSshKeys"/>
+  <int value="9" label="MountContainer"/>
+  <int value="10" label="ConfigureContainer"/>
+</enum>
+
+<enum name="CrostiniInstallSource">
+  <int value="0" label="Component"/>
+  <int value="1" label="DLC"/>
+</enum>
+
 <enum name="CrostiniResult">
   <int value="0" label="SUCCESS"/>
   <int value="4" label="CREATE_DISK_IMAGE_FAILED"/>
@@ -14535,6 +15378,16 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="49" label="NEVER_FINISHED"/>
   <int value="50" label="CONTAINER_SETUP_FAILED"/>
   <int value="51" label="START_LXD_FAILED"/>
+  <int value="52" label="INSTALL_IMAGE_LOADER_TIMED_OUT"/>
+  <int value="53" label="CREATE_DISK_IMAGE_TIMED_OUT"/>
+  <int value="54" label="START_TERMINA_VM_TIMED_OUT"/>
+  <int value="55" label="START_LXD_TIMED_OUT"/>
+  <int value="56" label="CREATE_CONTAINER_TIMED_OUT"/>
+  <int value="57" label="SETUP_CONTAINER_TIMED_OUT"/>
+  <int value="58" label="START_CONTAINER_TIMED_OUT"/>
+  <int value="59" label="FETCH_SSH_KEYS_TIMED_OUT"/>
+  <int value="60" label="MOUNT_CONTAINER_TIMED_OUT"/>
+  <int value="61" label="UNKNOWN_STATE_TIMED_OUT"/>
 </enum>
 
 <enum name="CrostiniSettingsEvent">
@@ -14570,6 +15423,8 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="24" label="User Cancelled While Configuring Container"/>
   <int value="25" label="Error Creating Container"/>
   <int value="26" label="Bug - Failed without capturing error code"/>
+  <int value="27" label="User Cancelled While Starting LXD"/>
+  <int value="28" label="Error Starting LXD"/>
 </enum>
 
 <enum name="CrostiniTerminalSetting">
@@ -14960,6 +15815,107 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="5" label="VerifyBootLockbox"/>
   <int value="6" label="FinalizeBootLockbox"/>
   <int value="7" label="TpmIsBeingOwned"/>
+  <int value="8" label="ProxyIsMounted"/>
+  <int value="9" label="ProxyIsMountedForUser"/>
+  <int value="10" label="ProxyListKeysEx"/>
+  <int value="11" label="ProxyCheckKeyEx"/>
+  <int value="12" label="ProxyRemoveKeyEx"/>
+  <int value="13" label="ProxyMassRemoveKeys"/>
+  <int value="14" label="ProxyGetKeyDataEx"/>
+  <int value="15" label="ProxyMigrateKeyEx"/>
+  <int value="16" label="ProxyAddKeyEx"/>
+  <int value="17" label="ProxyAddDataRestoreKey"/>
+  <int value="18" label="ProxyRemoveEx"/>
+  <int value="19" label="ProxyGetSystemSalt"/>
+  <int value="20" label="ProxyGetSanitizedUsername"/>
+  <int value="21" label="ProxyMountEx"/>
+  <int value="22" label="ProxyMountGuestEx"/>
+  <int value="23" label="ProxyRenameCryptohome"/>
+  <int value="24" label="ProxyGetAccountDiskUsage"/>
+  <int value="25" label="ProxyUnmountEx"/>
+  <int value="26" label="ProxyUpdateCurrentUserActivityTimestamp"/>
+  <int value="27" label="ProxyTpmIsReady"/>
+  <int value="28" label="ProxyTpmIsEnabled"/>
+  <int value="29" label="ProxyTpmGetPassword"/>
+  <int value="30" label="ProxyTpmIsOwned"/>
+  <int value="31" label="ProxyTpmIsBeingOwned"/>
+  <int value="32" label="ProxyTpmCanAttemptOwnership"/>
+  <int value="33" label="ProxyTpmClearStoredPassword"/>
+  <int value="34" label="ProxyTpmIsAttestationPrepared"/>
+  <int value="35" label="ProxyTpmAttestationGetEnrollmentPreparationsEx"/>
+  <int value="36" label="ProxyTpmVerifyAttestationData"/>
+  <int value="37" label="ProxyTpmVerifyEK"/>
+  <int value="38" label="ProxyTpmAttestationCreateEnrollRequest"/>
+  <int value="39" label="ProxyAsyncTpmAttestationCreateEnrollRequest"/>
+  <int value="40" label="ProxyTpmAttestationEnroll"/>
+  <int value="41" label="ProxyAsyncTpmAttestationEnroll"/>
+  <int value="42" label="ProxyTpmAttestationEnrollEx"/>
+  <int value="43" label="ProxyAsyncTpmAttestationEnrollEx"/>
+  <int value="44" label="ProxyTpmAttestationCreateCertRequest"/>
+  <int value="45" label="ProxyAsyncTpmAttestationCreateCertRequest"/>
+  <int value="46" label="ProxyTpmAttestationFinishCertRequest"/>
+  <int value="47" label="ProxyAsyncTpmAttestationFinishCertRequest"/>
+  <int value="48" label="ProxyTpmAttestationGetCertificateEx"/>
+  <int value="49" label="ProxyAsyncTpmAttestationGetCertificateEx"/>
+  <int value="50" label="ProxyTpmIsAttestationEnrolled"/>
+  <int value="51" label="ProxyTpmAttestationDoesKeyExist"/>
+  <int value="52" label="ProxyTpmAttestationGetCertificate"/>
+  <int value="53" label="ProxyTpmAttestationGetPublicKey"/>
+  <int value="54" label="ProxyTpmAttestationGetEnrollmentId"/>
+  <int value="55" label="ProxyTpmAttestationRegisterKey"/>
+  <int value="56" label="ProxyTpmAttestationSignEnterpriseChallenge"/>
+  <int value="57" label="ProxyTpmAttestationSignEnterpriseVaChallenge"/>
+  <int value="58" label="ProxyTpmAttestationSignEnterpriseVaChallengeV2"/>
+  <int value="59" label="ProxyTpmAttestationSignSimpleChallenge"/>
+  <int value="60" label="ProxyTpmAttestationGetKeyPayload"/>
+  <int value="61" label="ProxyTpmAttestationSetKeyPayload"/>
+  <int value="62" label="ProxyTpmAttestationDeleteKeys"/>
+  <int value="63" label="ProxyTpmAttestationDeleteKey"/>
+  <int value="64" label="ProxyTpmAttestationGetEK"/>
+  <int value="65" label="ProxyTpmAttestationResetIdentity"/>
+  <int value="66" label="ProxyTpmGetVersionStructured"/>
+  <int value="67" label="ProxyPkcs11IsTpmTokenReady"/>
+  <int value="68" label="ProxyPkcs11GetTpmTokenInfo"/>
+  <int value="69" label="ProxyPkcs11GetTpmTokenInfoForUser"/>
+  <int value="70" label="ProxyPkcs11Terminate"/>
+  <int value="71" label="ProxyGetStatusString"/>
+  <int value="72" label="ProxyInstallAttributesGet"/>
+  <int value="73" label="ProxyInstallAttributesSet"/>
+  <int value="74" label="ProxyInstallAttributesCount"/>
+  <int value="75" label="ProxyInstallAttributesFinalize"/>
+  <int value="76" label="ProxyInstallAttributesIsReady"/>
+  <int value="77" label="ProxyInstallAttributesIsSecure"/>
+  <int value="78" label="ProxyInstallAttributesIsInvalid"/>
+  <int value="79" label="ProxyInstallAttributesIsFirstInstall"/>
+  <int value="80" label="ProxySignBootLockbox"/>
+  <int value="81" label="ProxyVerifyBootLockbox"/>
+  <int value="82" label="ProxyFinalizeBootLockbox"/>
+  <int value="83" label="ProxyGetBootAttribute"/>
+  <int value="84" label="ProxySetBootAttribute"/>
+  <int value="85" label="ProxyFlushAndSignBootAttributes"/>
+  <int value="86" label="ProxyGetLoginStatus"/>
+  <int value="87" label="ProxyGetTpmStatus"/>
+  <int value="88" label="ProxyGetEndorsementInfo"/>
+  <int value="89" label="ProxyInitializeCastKey"/>
+  <int value="90" label="ProxyStartFingerprintAuthSession"/>
+  <int value="91" label="ProxyEndFingerprintAuthSession"/>
+  <int value="92" label="ProxyGetWebAuthnSecret"/>
+  <int value="93" label="ProxyGetFirmwareManagementParameters"/>
+  <int value="94" label="ProxySetFirmwareManagementParameters"/>
+  <int value="95" label="ProxyRemoveFirmwareManagementParameters"/>
+  <int value="96" label="ProxyMigrateToDircrypto"/>
+  <int value="97" label="ProxyNeedsDircryptoMigration"/>
+  <int value="98" label="ProxyGetSupportedKeyPolicies"/>
+  <int value="99" label="ProxyIsQuotaSupported"/>
+  <int value="100" label="ProxyGetCurrentSpaceForUid"/>
+  <int value="101" label="ProxyGetCurrentSpaceForGid"/>
+  <int value="102" label="ProxyGetCurrentSpaceForProjectId"/>
+  <int value="103" label="ProxySetProjectId"/>
+  <int value="104" label="ProxyLockToSingleUserMountUntilReboot"/>
+  <int value="105" label="ProxyGetRsuDeviceId"/>
+  <int value="106" label="ProxyCheckHealth"/>
+  <int value="107" label="ProxyStartAuthSession"/>
+  <int value="108" label="ProxyAuthenticateAuthSession"/>
 </enum>
 
 <enum name="CryptohomeDiskCleanupProgress">
@@ -14995,6 +15951,14 @@ metrics consent we also won't be able to send UMA metrics. -->
   </int>
 </enum>
 
+<enum name="CryptohomeDiskCleanupResult">
+  <int value="1" label="Success">Cleanup performed successfully.</int>
+  <int value="2" label="Error">Cleanup failed.</int>
+  <int value="3" label="Skip">
+    Cleanup skipped, enough free space is available.
+  </int>
+</enum>
+
 <enum name="CryptohomeError">
   <int value="1" label="TPM returned TPM_E_FAIL"/>
   <int value="2" label="TCS key load failed"/>
@@ -16288,6 +17252,8 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="37" label="YouTube"/>
   <int value="38" label="YouTube Music"/>
   <int value="40" label="Stadia"/>
+  <int value="41" label="ScanningApp"/>
+  <int value="42" label="DiagnosticsApp"/>
 </enum>
 
 <enum name="DefaultBrowserAsyncAttemptResult">
@@ -16470,6 +17436,8 @@ metrics consent we also won't be able to send UMA metrics. -->
 <enum name="DesksMoveWindowFromActiveDeskSource">
   <int value="0" label="Drag and drop"/>
   <int value="1" label="Move-window-to-desk keyboard shortcut"/>
+  <int value="2" label="Send to desk menu"/>
+  <int value="3" label="Assign to desk menu"/>
 </enum>
 
 <enum name="DesksSwitchSource">
@@ -16580,6 +17548,13 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="1" label="Portrait"/>
 </enum>
 
+<!-- This is not accessible from where the above enum is defined in code. -->
+
+<enum name="DeviceOrientation2">
+  <int value="0" label="Landscape"/>
+  <int value="1" label="Portrait"/>
+</enum>
+
 <enum name="DeviceOrientationSensorTypeAndroid">
   <int value="0" label="Not Available"/>
   <int value="1" label="ROTATION_VECTOR"/>
@@ -16594,6 +17569,12 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="3" label="Cancel"/>
 </enum>
 
+<enum name="DeviceSettingsFeatureFlagsMigrationStatus">
+  <int value="0" label="No feature flags present"/>
+  <int value="1" label="Migration already completed previously"/>
+  <int value="2" label="Migration has been performed"/>
+</enum>
+
 <enum name="DeviceSettingsStatus">
   <int value="0" label="STORE_SUCCESS"/>
   <int value="1" label="STORE_KEY_UNAVAILABLE"/>
@@ -16697,6 +17678,7 @@ metrics consent we also won't be able to send UMA metrics. -->
 <enum name="DevToolsColorPickerFixedColor">
   <int value="0" label="AA"/>
   <int value="1" label="AAA"/>
+  <int value="2" label="APCA"/>
 </enum>
 
 <enum name="DevToolsComputedStyleGrouping">
@@ -16707,6 +17689,36 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="1" label="Grouping disabled"/>
 </enum>
 
+<enum name="DevToolsCssEditorOpened">
+  <int value="0" label="Color Picker opened"/>
+  <int value="1" label="Shadow Editor opened"/>
+  <int value="2" label="Bezier Editor opened"/>
+  <int value="3" label="Font Editor opened"/>
+</enum>
+
+<enum name="DevToolsDeveloperResourceLoaded">
+  <int value="0" label="LoadThroughPageViaTarget"/>
+  <int value="1" label="LoadThroughPageViaFrame"/>
+  <int value="2" label="LoadThroughPageFailure"/>
+  <int value="3" label="LoadThroughPageFallback"/>
+  <int value="4" label="FallbackAfterFailure"/>
+  <int value="5" label="FallbackPerOverride"/>
+  <int value="6" label="FallbackPerProtocol"/>
+  <int value="7" label="FallbackFailure"/>
+</enum>
+
+<enum name="DevToolsDeveloperResourceScheme">
+  <int value="0" label="SchemeOther"/>
+  <int value="1" label="SchemeUnknown"/>
+  <int value="2" label="SchemeHttp"/>
+  <int value="3" label="SchemeHttps"/>
+  <int value="4" label="SchemeHttpLocalhost"/>
+  <int value="5" label="SchemeHttpsLocalhost"/>
+  <int value="6" label="SchemeData"/>
+  <int value="7" label="SchemeFile"/>
+  <int value="8" label="SchemeBlob"/>
+</enum>
+
 <enum name="DevToolsDualScreenDeviceEmulated">
   <int value="0" label="Dual-screen or fold device selected"/>
   <int value="1" label="Dual-screen span mode selected"/>
@@ -16754,14 +17766,26 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="37" label="showWebVitalsInPerformancePanel"/>
   <int value="38" label="recorder"/>
   <int value="39" label="APCA"/>
+  <int value="40" label="cspViolationsView"/>
+  <int value="41" label="fontEditor"/>
+  <int value="42" label="fullAccessibilityTree"/>
+  <int value="43" label="ignoreListJSFramesOnTimeline"/>
+  <int value="44" label="contrastIssues"/>
+  <int value="45" label="experimentalCookieFeatures"/>
 </enum>
 
 <enum name="DevToolsGridOverlayOpenedFrom">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <int value="0" label="Adorner"/>
   <int value="1" label="Layout pane"/>
 </enum>
 
 <enum name="DevtoolsGridSettingChanged">
+  <obsolete>
+    Superseded by DevtoolsGridSettingChanged2.
+  </obsolete>
   <int value="0" label="showGridBorder.none"/>
   <int value="1" label="showGridBorder.dashed"/>
   <int value="2" label="showGridBorder.solid"/>
@@ -16786,6 +17810,9 @@ metrics consent we also won't be able to send UMA metrics. -->
 </enum>
 
 <enum name="DevtoolsGridSettingChanged2">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <int value="0" label="showGridLineLabels.none"/>
   <int value="1" label="showGridLineLabels.lineNumbers"/>
   <int value="2" label="showGridLineLabels.lineNames"/>
@@ -16798,6 +17825,9 @@ metrics consent we also won't be able to send UMA metrics. -->
 </enum>
 
 <enum name="DevToolsHighlightedPersistentCSSGridCount">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <int value="0" label="0"/>
   <int value="1" label="1"/>
   <int value="2" label="2"/>
@@ -16809,6 +17839,79 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="8" label="More than 50"/>
 </enum>
 
+<enum name="DevToolsIssueCreated">
+  <int value="0" label="MixedContentIssue"/>
+  <int value="1" label="ContentSecurityPolicyIssue::kInlineViolation"/>
+  <int value="2" label="ContentSecurityPolicyIssue::kEvalViolation"/>
+  <int value="3" label="ContentSecurityPolicyIssue::kURLViolation"/>
+  <int value="4"
+      label="ContentSecurityPolicyIssue::kTrustedTypesSinkViolation"/>
+  <int value="5"
+      label="ContentSecurityPolicyIssue::kTrustedTypesPolicyViolation"/>
+  <int value="6" label="HeavyAdIssue::NetworkTotalLimit"/>
+  <int value="7" label="HeavyAdIssue::CpuTotalLimit"/>
+  <int value="8" label="HeavyAdIssue::CpuPeakLimit"/>
+  <int value="9"
+      label="CrossOriginEmbedderPolicyIssue::CoepFrameResourceNeedsCoepHeader"/>
+  <int value="10"
+      label="CrossOriginEmbedderPolicyIssue::CoopSandboxedIFrameCannotNavigateToCoopPage"/>
+  <int value="11" label="CrossOriginEmbedderPolicyIssue::CorpNotSameOrigin"/>
+  <int value="12"
+      label="CrossOriginEmbedderPolicyIssue::CorpNotSameOriginAfterDefaultedToSameOriginByCoep"/>
+  <int value="13" label="CrossOriginEmbedderPolicyIssue::CorpNotSameSite"/>
+  <int value="14"
+      label="SameSiteCookieIssue::ExcludeSameSiteNoneInsecure::ReadCookie"/>
+  <int value="15"
+      label="SameSiteCookieIssue::ExcludeSameSiteNoneInsecure::SetCookie"/>
+  <int value="16"
+      label="SameSiteCookieIssue::WarnSameSiteNoneInsecure::ReadCookie"/>
+  <int value="17"
+      label="SameSiteCookieIssue::WarnSameSiteNoneInsecure::SetCookie"/>
+  <int value="18"
+      label="SameSiteCookieIssue::WarnSameSiteStrictLaxDowngradeStrict::Secure"/>
+  <int value="19"
+      label="SameSiteCookieIssue::WarnSameSiteStrictLaxDowngradeStrict::Insecure"/>
+  <int value="20"
+      label="SameSiteCookieIssue::WarnCrossDowngrade::ReadCookie::Secure"/>
+  <int value="21"
+      label="SameSiteCookieIssue::WarnCrossDowngrade::ReadCookie::Insecure"/>
+  <int value="22"
+      label="SameSiteCookieIssue::WarnCrossDowngrade::SetCookie::Secure"/>
+  <int value="23"
+      label="SameSiteCookieIssue::WarnCrossDowngrade::SetCookie::Insecure"/>
+  <int value="24"
+      label="SameSiteCookieIssue::ExcludeNavigationContextDowngrade::Secure"/>
+  <int value="25"
+      label="SameSiteCookieIssue::ExcludeNavigationContextDowngrade::Insecure"/>
+  <int value="26"
+      label="SameSiteCookieIssue::ExcludeContextDowngrade::ReadCookie::Secure"/>
+  <int value="27"
+      label="SameSiteCookieIssue::ExcludeContextDowngrade::ReadCookie::Insecure"/>
+  <int value="28"
+      label="SameSiteCookieIssue::ExcludeContextDowngrade::SetCookie::Secure"/>
+  <int value="29"
+      label="SameSiteCookieIssue::ExcludeContextDowngrade::SetCookie::Insecure"/>
+  <int value="30"
+      label="SameSiteCookieIssue::ExcludeSameSiteUnspecifiedTreatedAsLax::ReadCookie"/>
+  <int value="31"
+      label="SameSiteCookieIssue::ExcludeSameSiteUnspecifiedTreatedAsLax::SetCookie"/>
+  <int value="32"
+      label="SameSiteCookieIssue::WarnSameSiteUnspecifiedLaxAllowUnsafe::ReadCookie"/>
+  <int value="33"
+      label="SameSiteCookieIssue::WarnSameSiteUnspecifiedLaxAllowUnsafe::SetCookie"/>
+  <int value="34"
+      label="SameSiteCookieIssue::WarnSameSiteUnspecifiedCrossSiteContext::ReadCookie"/>
+  <int value="35"
+      label="SameSiteCookieIssue::WarnSameSiteUnspecifiedCrossSiteContext::SetCookie"/>
+  <int value="36" label="SharedArrayBufferIssue::TransferIssue"/>
+  <int value="37" label="SharedArrayBufferIssue::CreationIssue"/>
+  <int value="38" label="TrustedWebActivityIssue::kHttpError"/>
+  <int value="39" label="TrustedWebActivityIssue::kUnavailableOffline"/>
+  <int value="40" label="TrustedWebActivityIssue::kDigitalAssetLinks"/>
+  <int value="41" label="LowTextContrastIssue"/>
+  <int value="42" label="CorsIssue"/>
+</enum>
+
 <enum name="DevToolsIssuesPanelIssueExpanded">
   <int value="0" label="CrossOriginEmbedderPolicy"/>
   <int value="1" label="MixedContent"/>
@@ -16824,6 +17927,7 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="2" label="Status Bar Issues Counter"/>
   <int value="3" label="Hamburger Menu"/>
   <int value="4" label="Adorner"/>
+  <int value="5" label="Command Menu"/>
 </enum>
 
 <enum name="DevToolsIssuesPanelResourceOpened">
@@ -17028,6 +18132,16 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="7" label="Elements - Accessibility"/>
 </enum>
 
+<enum name="DexFixerReason">
+  <int value="0" label="Os.stat() failed"/>
+  <int value="1" label="Runtime.exec() failed"/>
+  <int value="2" label="Dexopt not needed"/>
+  <int value="5" label="Preemptive Dexopt after app updated"/>
+  <int value="6" label="DexFile.isDexOptNeeded() returned true"/>
+  <int value="7" label="DexFile.isDexOptNeeded() threw"/>
+  <int value="8" label="Dex files not world-readable"/>
+</enum>
+
 <enum name="DiagnosticsRecoveryRun">
   <int value="0" label="Recovery not run"/>
   <int value="1" label="Recovery run because of crash"/>
@@ -17143,8 +18257,8 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="72" label="Tab Modal Confirm"/>
   <int value="73" label="Task Manager"/>
   <int value="74" label="Teleport Warning"/>
-  <int value="75" label="User Manager"/>
-  <int value="76" label="User Manager Profile"/>
+  <int value="75" label="User Manager (Obsolete)"/>
+  <int value="76" label="User Manager Profile (Obsolete)"/>
   <int value="77" label="Validation Message"/>
   <int value="78" label="Web Share Target Picker"/>
   <int value="79" label="Zoom"/>
@@ -17172,7 +18286,11 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="101" label="App Uninstall"/>
   <int value="102" label="Print Job Confirmation"/>
   <int value="103" label="Crostini Recovery Dialog"/>
-  <int value="104" label="Signin Reauth Dialog"/>
+  <int value="104" label="Parent Permission ChromeOS"/>
+  <int value="105" label="Signin Reauth Dialog"/>
+  <int value="106"
+      label="Confirmation Box for getCurrentBrowsingContextMedia API"/>
+  <int value="107" label="Profile picker force signin"/>
 </enum>
 
 <enum name="DialogOriginRelationship">
@@ -17289,6 +18407,16 @@ metrics consent we also won't be able to send UMA metrics. -->
   <int value="1" label="Failed"/>
 </enum>
 
+<enum name="DirectSocketPermissionFailureType">
+  <int value="0" label="PermissionsPolicy"/>
+  <int value="1" label="TransientActivation"/>
+  <int value="2" label="UserDialog"/>
+  <int value="3" label="ResolvingToNonPublic"/>
+  <int value="4" label="RateLimiting"/>
+  <int value="5" label="CORS"/>
+  <int value="6" label="EnterprisePolicy"/>
+</enum>
+
 <enum name="DirectWriteFontFallbackResult">
   <int value="0" label="Failed: no font matched"/>
   <int value="1" label="Success: mapped from cache"/>
@@ -17478,7 +18606,7 @@ metrics consent we also won't be able to send UMA metrics. -->
 <enum name="DistillRejection">
   <int value="0" label="Not an article"/>
   <int value="1" label="Mobile-friendly"/>
-  <int value="2" label="Domain is blacklisted"/>
+  <int value="2" label="Domain is filtered"/>
   <int value="3" label="Predicted to be short"/>
   <int value="4" label="Not rejected"/>
 </enum>
@@ -17598,6 +18726,9 @@ metrics consent we also won't be able to send UMA metrics. -->
 </enum>
 
 <enum name="DNS.UdpIdMismatchStatus">
+  <obsolete>
+    Metrics removed from code 2021-01.
+  </obsolete>
   <int value="0" label="Successfully parsed response with matching ID"/>
   <int value="1"
       label="ID mismatch with the response ID recognized as a
@@ -17691,6 +18822,10 @@ Called by update_document_policy_enum.py.-->
   <int value="8" label="LayoutAnimations"/>
   <int value="9" label="DocumentWrite"/>
   <int value="10" label="SyncScript"/>
+  <int value="11" label="JSProfiling"/>
+  <int value="12" label="SyncXHR"/>
+  <int value="13" label="DocumentDomain"/>
+  <int value="14" label="DocumentDomain"/>
 </enum>
 
 <enum name="DocumentScanSaneBackend">
@@ -17925,6 +19060,15 @@ Called by update_document_policy_enum.py.-->
   <int value="1" label="Failed over to another collector"/>
 </enum>
 
+<enum name="DomainReliabilityBeaconOutcome">
+  <int value="0" label="Unknown (should not be recorded)"/>
+  <int value="1" label="Uploaded successfully"/>
+  <int value="2" label="Expired"/>
+  <int value="3" label="Evicted"/>
+  <int value="4" label="Browsing data cleared"/>
+  <int value="5" label="Deleted at shutdown"/>
+</enum>
+
 <enum name="DoodleConfigDownloadOutcome">
   <obsolete>
     Removed from code 2017-08.
@@ -19193,7 +20337,7 @@ Called by update_document_policy_enum.py.-->
   <int value="6" label="USER_VALIDATED"/>
   <int value="7" label="DANGEROUS_HOST"/>
   <int value="8" label="POTENTIALLY_UNWANTED"/>
-  <int value="9" label="WHITELISTED_BY_POLICY"/>
+  <int value="9" label="ALLOWLISTED_BY_POLICY"/>
   <int value="10" label="ASYNC_SCANNING"/>
   <int value="11" label="BLOCKED_PASSWORD_PROTECTED"/>
   <int value="12" label="BLOCKED_TOO_LARGE"/>
@@ -19349,6 +20493,7 @@ Called by update_document_policy_enum.py.-->
   <int value="0" label="Opened with plaform handler by default"/>
   <int value="1" label="Opened in browser by default"/>
   <int value="2" label="Opened with plaform handler by user choice"/>
+  <int value="3" label="Opened with an alternate rename handler"/>
 </enum>
 
 <enum name="DownloadOriginStateOnResumption">
@@ -19444,6 +20589,9 @@ Called by update_document_policy_enum.py.-->
 </enum>
 
 <enum name="DragContent">
+  <obsolete>
+    Deprecated 12/2020.
+  </obsolete>
   <int value="0" label="Unknown"/>
   <int value="1" label="Image"/>
   <int value="2" label="URL"/>
@@ -19521,6 +20669,9 @@ Called by update_document_policy_enum.py.-->
 </enum>
 
 <enum name="DriveFileError">
+  <obsolete>
+    Deprecated February 2021.
+  </obsolete>
   <int value="0" label="UNKNOWN"/>
   <int value="1" label="FILE_ERROR_OK"/>
   <int value="2" label="FILE_ERROR_FAILED"/>
@@ -19709,6 +20860,36 @@ Called by update_document_policy_enum.py.-->
   <int value="1" label="D3D11"/>
 </enum>
 
+<enum name="DXVALifetimeProgression">
+  <int value="0" label="kInitializeStarted">
+    A decoder has started the initialization step.
+  </int>
+  <int value="1" label="kDX11InitializeSucceeded">
+    A decoder has completed the initialization step for DX11 successfully.
+  </int>
+  <int value="2" label="kDX11PlaybackFailedBeforeFirstFrame">
+    A decoder failed DX11 playback without sending a frame to the client.
+  </int>
+  <int value="3" label="kDX11PlaybackFailedAfterFirstFrame">
+    A decoder failed DX11 playback after sending a frame to the client.
+  </int>
+  <int value="4" label="kDX11PlaybackSucceeded">
+    A decoder has finished playing with DX11.
+  </int>
+  <int value="5" label="kDX9InitializeSucceeded">
+    A decoder has completed the initialization step for DX9 successfully.
+  </int>
+  <int value="6" label="kDX9PlaybackFailedBeforeFirstFrame">
+    A decoder failed DX9 playback without sending a frame to the client.
+  </int>
+  <int value="7" label="kDX9PlaybackFailedAfterFirstFrame">
+    A decoder failed DX9 playback after sending a frame to the client.
+  </int>
+  <int value="8" label="kDX9PlaybackSucceeded">
+    A decoder has finished playing with DX9.
+  </int>
+</enum>
+
 <enum name="EAPInnerProtocol">
   <int value="0" label="UNKNOWN"/>
   <int value="1" label="NONE"/>
@@ -19911,6 +21092,15 @@ Called by update_document_policy_enum.py.-->
   <int value="5" label="Flow Completed"/>
 </enum>
 
+<enum name="EduCoexistenceFlowV2Result">
+  <int value="0" label="Flow Launched"/>
+  <int value="1" label="Consent Valid Received"/>
+  <int value="2" label="Edu Account Authorized"/>
+  <int value="3" label="Consent Logged Recived"/>
+  <int value="4" label="Account Succesfully Added"/>
+  <int value="5" label="Error"/>
+</enum>
+
 <enum name="EffectiveResolution">
   <summary>
     The enum index of each resolution is the product of its dimensions. A
@@ -20228,6 +21418,10 @@ Called by update_document_policy_enum.py.-->
   <int value="4" label="CHROME_NOT_GOOGLE_SIGNED"/>
   <int value="5" label="AGSA_NOT_GOOGLE_SIGNED"/>
   <int value="6" label="ACCOUNT_MISMATCH"/>
+  <int value="7" label="NON_GOOGLE_SEARCH_ENGINE"/>
+  <int value="8" label="NO_CHROME_ACCOUNT"/>
+  <int value="9" label="LOW_END_DEVICE"/>
+  <int value="10" label="MULTIPLE_ACCOUNTS_ON_DEVICE"/>
 </enum>
 
 <enum name="EmbeddedWorkerStartingPhase">
@@ -20257,6 +21451,13 @@ Called by update_document_policy_enum.py.-->
   <int value="8" label="MediaKeySession.remove()"/>
 </enum>
 
+<enum name="EmeSessionType">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="Temporary"/>
+  <int value="2" label="Persistent License"/>
+  <int value="3" label="Persistent Usage Record"/>
+</enum>
+
 <enum name="EmmcLifeUsed">
   <int value="0" label="Not defined"/>
   <int value="1" label="0% - 10% device life time used"/>
@@ -21480,6 +22681,19 @@ Called by update_document_policy_enum.py.-->
   <int value="902" label="SERVICE_POLICY_NOT_FOUND"/>
 </enum>
 
+<enum name="EnterpriseDlpPolicyRestriction">
+  <summary>
+    Type of restriction enforced by Data Leak Prevention policy.
+  </summary>
+  <int value="0" label="Unknown"/>
+  <int value="1" label="Clipboard"/>
+  <int value="2" label="Screenshot"/>
+  <int value="3" label="Printing"/>
+  <int value="4" label="Privacy Screen"/>
+  <int value="5" label="Screenshare"/>
+  <int value="6" label="Files"/>
+</enum>
+
 <enum name="EnterpriseDMServerRequestSuccess">
   <summary>
     Number of DeviceManagementServer request retries as defined in
@@ -22520,7 +23734,7 @@ Called by update_document_policy_enum.py.-->
   <int value="716" label="CrostiniPortForwardingAllowed"/>
   <int value="717" label="VirtualKeyboardFeatures"/>
   <int value="718" label="PinUnlockAutosubmitEnabled"/>
-  <int value="719" label="SamlLockScreenReauthenticationEnabled"/>
+  <int value="719" label="LockScreenReauthenticationEnabled"/>
   <int value="720" label="DeletePrintJobHistoryAllowed"/>
   <int value="721" label="EmojiSuggestionEnabled"/>
   <int value="722" label="AutoLaunchProtocolsFromOrigins"/>
@@ -22608,8 +23822,30 @@ Called by update_document_policy_enum.py.-->
   <int value="804" label="FullscreenAlertEnabled"/>
   <int value="805" label="NTPCardsVisible"/>
   <int value="806" label="BasicAuthOverHttpEnabled"/>
+  <int value="807" label="SystemFeaturesDisableMode"/>
+  <int value="808" label="IntegratedWebAuthenticationAllowed"/>
+  <int value="809" label="ClearBrowsingDataOnExitList"/>
   <int value="810" label="ProfilePickerOnStartupAvailability"/>
   <int value="811" label="SigninInterceptionEnabled"/>
+  <int value="812" label="RemoteAccessHostAllowRemoteAccessConnections"/>
+  <int value="813" label="ManagedConfigurationPerOrigin"/>
+  <int value="814" label="RemoteAccessHostMaximumSessionDurationMinutes"/>
+  <int value="815" label="EnableDeprecatedPrivetPrinting"/>
+  <int value="816" label="BrowserLabsEnabled"/>
+  <int value="817" label="WindowOcclusionEnabled"/>
+  <int value="818" label="DeviceAllowMGSToStoreDisplayProperties"/>
+  <int value="819" label="SSLErrorOverrideAllowedForOrigins"/>
+  <int value="820" label="WebXRImmersiveArEnabled"/>
+  <int value="821" label="GaiaOfflineSigninTimeLimitDays"/>
+  <int value="822" label="SendDownloadToCloudEnterpriseConnector"/>
+  <int value="823" label="DeviceSystemWideTracingEnabled"/>
+  <int value="824" label="WebAppSettings"/>
+  <int value="825" label="DevicePciPeripheralDataAccessEnabled"/>
+  <int value="826" label="ContextAwareAccessSignalsAllowlist"/>
+  <int value="827" label="FetchKeepaliveDurationOnShutdown"/>
+  <int value="828" label="AllowSystemNotifications"/>
+  <int value="829" label="SuppressDifferentOriginSubframeJSDialogs"/>
+  <int value="836" label="AudioProcessHighPriorityEnabled"/>
 </enum>
 
 <enum name="EnterprisePolicyDeviceIdValidity">
@@ -22835,6 +24071,9 @@ Called by update_document_policy_enum.py.-->
 </enum>
 
 <enum name="EnterpriseUserPolicyChromeOSSessionAbortType">
+  <obsolete>
+    Deprecated 11/2020.
+  </obsolete>
   <int value="0" label="Initialization, Google cloud management">
     Abort of asynchronous user policy initialization when the user is managed
     with the Google cloud management.
@@ -23059,6 +24298,10 @@ Called by update_document_policy_enum.py.-->
   <int value="18" label="GestureTapUnconfirmed"/>
   <int value="19" label="GestureTwoFingerTap"/>
   <int value="20" label="FirstGestureScrollUpdate"/>
+  <int value="21" label="MouseDragged"/>
+  <int value="22" label="GesturePinchBegin"/>
+  <int value="23" label="GesturePinchEnd"/>
+  <int value="24" label="GesturePinchUpdate"/>
 </enum>
 
 <enum name="EventLatencyScrollInputType">
@@ -23328,6 +24571,7 @@ Called by update_document_policy_enum.py.-->
   <int value="131072" label="DEPRECATED_BLOCKED_MATURE"/>
   <int value="262144" label="DISABLE_REMOTELY_FOR_MALWARE"/>
   <int value="524288" label="DISABLE_REINSTALL"/>
+  <int value="1048576" label="DISABLE_NOT_ALLOWLISTED"/>
 </enum>
 
 <enum name="ExtensionEvents">
@@ -23698,7 +24942,7 @@ Called by update_extension_histograms.py.-->
   <int value="353" label="WEB_VIEW_INTERNAL_ON_CONSOLE_MESSAGE"/>
   <int value="354" label="WEB_VIEW_INTERNAL_ON_CONTENT_LOAD"/>
   <int value="355" label="WEB_VIEW_INTERNAL_ON_DIALOG"/>
-  <int value="356" label="WEB_VIEW_INTERNAL_ON_DROP_LINK"/>
+  <int value="356" label="DELETED_WEB_VIEW_INTERNAL_ON_DROP_LINK"/>
   <int value="357" label="WEB_VIEW_INTERNAL_ON_EXIT"/>
   <int value="358" label="WEB_VIEW_INTERNAL_ON_EXIT_FULLSCREEN"/>
   <int value="359" label="WEB_VIEW_INTERNAL_ON_FIND_REPLY"/>
@@ -23737,7 +24981,7 @@ Called by update_extension_histograms.py.-->
       label="DELETED_EASY_UNLOCK_PRIVATE_ON_CONNECTION_STATUS_CHANGED"/>
   <int value="390" label="DELETED_EASY_UNLOCK_PRIVATE_ON_DATA_RECEIVED"/>
   <int value="391" label="DELETED_EASY_UNLOCK_PRIVATE_ON_SEND_COMPLETED"/>
-  <int value="392" label="DISPLAY_SOURCE_ON_SINKS_UPDATED"/>
+  <int value="392" label="DELETED_DISPLAY_SOURCE_ON_SINKS_UPDATED"/>
   <int value="393" label="INPUT_IME_ON_COMPOSITION_BOUNDS_CHANGED"/>
   <int value="394" label="INPUT_METHOD_PRIVATE_ON_IME_MENU_ACTIVATION_CHANGED"/>
   <int value="395" label="INPUT_METHOD_PRIVATE_ON_IME_MENU_LIST_CHANGED"/>
@@ -23774,7 +25018,7 @@ Called by update_extension_histograms.py.-->
   <int value="421"
       label="ACCESSIBILITY_PRIVATE_ON_SELECT_TO_SPEAK_STATE_CHANGE_REQUESTED"/>
   <int value="422" label="INPUT_METHOD_PRIVATE_ON_FOCUS"/>
-  <int value="423" label="SYSTEM_POWER_SOURCE_ONPOWERCHANGED"/>
+  <int value="423" label="DELETED_SYSTEM_POWER_SOURCE_ONPOWERCHANGED"/>
   <int value="424" label="WEB_REQUEST_ON_ACTION_IGNORED"/>
   <int value="425" label="ARC_APPS_PRIVATE_ON_INSTALLED"/>
   <int value="426" label="FILE_MANAGER_PRIVATE_ON_CROSTINI_CHANGED"/>
@@ -23826,6 +25070,17 @@ Called by update_extension_histograms.py.-->
   <int value="464" label="ACCESSIBILITY_PRIVATE_ON_MAGNIFIER_BOUNDS_CHANGED"/>
   <int value="465" label="FILE_MANAGER_PRIVATE_ON_PIN_TRANSFERS_UPDATED"/>
   <int value="466" label="ACCESSIBILITY_PRIVATE_ON_POINT_SCAN_SET"/>
+  <int value="467"
+      label="ACCESSIBILITY_PRIVATE_ON_SELECT_TO_SPEAK_PANEL_ACTION"/>
+  <int value="468" label="FILE_MANAGER_PRIVATE_ON_TABLET_MODE_CHANGED"/>
+  <int value="469"
+      label="VIRTUAL_KEYBOARD_PRIVATE_ON_CLIPBOARD_HISTORY_CHANGED"/>
+  <int value="470" label="VIRTUAL_KEYBOARD_PRIVATE_ON_CLIPBOARD_ITEM_UPDATED"/>
+  <int value="471" label="TAB_GROUPS_ON_CREATED"/>
+  <int value="472" label="TAB_GROUPS_ON_MOVED"/>
+  <int value="473" label="TAB_GROUPS_ON_REMOVED"/>
+  <int value="474" label="TAB_GROUPS_ON_UPDATED"/>
+  <int value="475" label="FILE_MANAGER_PRIVATE_ON_DRIVE_CONFIRM_DIALOG"/>
 </enum>
 
 <enum name="ExtensionFileWriteResult">
@@ -23899,7 +25154,7 @@ Called by update_extension_histograms.py.-->
   <int value="48" label="DELETED_EXPERIMENTAL_RLZ_RECORDPRODUCTEVENT"/>
   <int value="49" label="BOOKMARKS_GETRECENT"/>
   <int value="50" label="APP_CURRENTWINDOWINTERNAL_SETBOUNDS"/>
-  <int value="51" label="CLOUDPRINTPRIVATE_SETUPCONNECTOR"/>
+  <int value="51" label="DELETED_CLOUDPRINTPRIVATE_SETUPCONNECTOR"/>
   <int value="52" label="SERIAL_SETCONTROLSIGNALS"/>
   <int value="53" label="DELETED_FILEMANAGERPRIVATE_SETLASTMODIFIED"/>
   <int value="54" label="IDLE_SETDETECTIONINTERVAL"/>
@@ -23962,7 +25217,7 @@ Called by update_extension_histograms.py.-->
   <int value="111" label="FONTSETTINGS_CLEARDEFAULTFIXEDFONTSIZE"/>
   <int value="112" label="MEDIAPLAYERPRIVATE_CLOSEWINDOW"/>
   <int value="113" label="WEBREQUESTINTERNAL_ADDEVENTLISTENER"/>
-  <int value="114" label="CLOUDPRINTPRIVATE_GETPRINTERS"/>
+  <int value="114" label="DELETED_CLOUDPRINTPRIVATE_GETPRINTERS"/>
   <int value="115" label="STORAGE_SET"/>
   <int value="116" label="FONTSETTINGS_GETDEFAULTFONTSIZE"/>
   <int value="117" label="EXTENSION_SETUPDATEURLDATA"/>
@@ -24049,7 +25304,7 @@ Called by update_extension_histograms.py.-->
   <int value="197" label="BROWSERACTION_ENABLE"/>
   <int value="198" label="METRICSPRIVATE_RECORDMEDIUMTIME"/>
   <int value="199" label="PAGEACTION_SETTITLE"/>
-  <int value="200" label="CLOUDPRINTPRIVATE_GETHOSTNAME"/>
+  <int value="200" label="DELETED_CLOUDPRINTPRIVATE_GETHOSTNAME"/>
   <int value="201" label="CONTENTSETTINGS_GETRESOURCEIDENTIFIERS"/>
   <int value="202" label="SOCKET_CREATE"/>
   <int value="203" label="DEVELOPERPRIVATE_RELOAD"/>
@@ -24275,7 +25530,7 @@ Called by update_extension_histograms.py.-->
   <int value="423" label="DELETED_DEVELOPERPRIVATE_ALLOWINCOGNITO"/>
   <int value="424" label="INPUT_IME_DELETESURROUNDINGTEXT"/>
   <int value="425" label="DELETED_FILEMANAGERPRIVATE_OPENNEWWINDOW"/>
-  <int value="426" label="CLOUDPRINTPRIVATE_GETCLIENTID"/>
+  <int value="426" label="DELETED_CLOUDPRINTPRIVATE_GETCLIENTID"/>
   <int value="427" label="ECHOPRIVATE_GETUSERCONSENT"/>
   <int value="428" label="SYNCFILESYSTEM_SETCONFLICTRESOLUTIONPOLICY"/>
   <int value="429" label="SYNCFILESYSTEM_GETCONFLICTRESOLUTIONPOLICY"/>
@@ -24869,7 +26124,7 @@ Called by update_extension_histograms.py.-->
   <int value="993" label="WEBVIEWINTERNAL_SETZOOMMODE"/>
   <int value="994" label="WEBVIEWINTERNAL_GETZOOMMODE"/>
   <int value="995" label="LAUNCHERSEARCHPROVIDER_SETSEARCHRESULTS"/>
-  <int value="996" label="DATAREDUCTIONPROXY_CLEARDATASAVINGS"/>
+  <int value="996" label="DELETED_DATAREDUCTIONPROXY_CLEARDATASAVINGS"/>
   <int value="997" label="BLUETOOTHPRIVATE_SETDISCOVERYFILTER"/>
   <int value="998" label="FILESYSTEM_GETVOLUMELIST"/>
   <int value="999" label="NETWORKINGPRIVATE_GETDEVICESTATES"/>
@@ -24969,7 +26224,7 @@ Called by update_extension_histograms.py.-->
   <int value="1087"
       label="DELETED_EASYUNLOCKPRIVATE_SETUPCONNECTIONDISCONNECT"/>
   <int value="1088" label="DELETED_EASYUNLOCKPRIVATE_SETUPCONNECTIONSEND"/>
-  <int value="1089" label="DATAREDUCTIONPROXY_GETDATAUSAGE"/>
+  <int value="1089" label="DELETED_DATAREDUCTIONPROXY_GETDATAUSAGE"/>
   <int value="1090"
       label="DELETED_EASYUNLOCKPRIVATE_SETUPCONNECTIONGETDEVICEADDRESS"/>
   <int value="1091" label="TABCAPTURE_CAPTUREOFFSCREENTAB"/>
@@ -24979,8 +26234,8 @@ Called by update_extension_histograms.py.-->
   <int value="1095" label="SETTINGSPRIVATE_SETDEFAULTZOOMFUNCTION"/>
   <int value="1096" label="BLUETOOTHPRIVATE_CONNECT"/>
   <int value="1097" label="BLUETOOTHPRIVATE_FORGETDEVICE"/>
-  <int value="1098" label="DISPLAYSOURCE_GETAVAILABLESINKS"/>
-  <int value="1099" label="DISPLAYSOURCE_REQUESTAUTHENTICATION"/>
+  <int value="1098" label="DELETED_DISPLAYSOURCE_GETAVAILABLESINKS"/>
+  <int value="1099" label="DELETED_DISPLAYSOURCE_REQUESTAUTHENTICATION"/>
   <int value="1100" label="WEBRTCLOGGINGPRIVATE_STARTAUDIODEBUGRECORDINGS"/>
   <int value="1101" label="WEBRTCLOGGINGPRIVATE_STOPAUDIODEBUGRECORDINGS"/>
   <int value="1102" label="TERMINALPRIVATE_ACKOUTPUT"/>
@@ -25146,8 +26401,8 @@ Called by update_extension_histograms.py.-->
   <int value="1256" label="USERSPRIVATE_GETCURRENTUSER"/>
   <int value="1257" label="WALLPAPERPRIVATE_GETSURPRISEMEIMAGE"/>
   <int value="1258" label="VIRTUALKEYBOARDPRIVATE_SETOCCLUDEDBOUNDS"/>
-  <int value="1259" label="SYSTEM_POWER_SOURCE_GETPOWERSOURCEINFO"/>
-  <int value="1260" label="SYSTEM_POWER_SOURCE_REQUESTSTATUSUPDATE"/>
+  <int value="1259" label="DELETED_SYSTEM_POWER_SOURCE_GETPOWERSOURCEINFO"/>
+  <int value="1260" label="DELETED_SYSTEM_POWER_SOURCE_REQUESTSTATUSUPDATE"/>
   <int value="1261" label="INPUTMETHODPRIVATE_GETSURROUNDINGTEXT"/>
   <int value="1262" label="USERSPRIVATE_GETLOGINSTATUS"/>
   <int value="1263" label="FILEMANAGERPRIVATEINTERNAL_INSTALLLINUXPACKAGE"/>
@@ -25173,7 +26428,7 @@ Called by update_extension_histograms.py.-->
   <int value="1282" label="AUTOTESTPRIVATE_RUNCROSTINIUNINSTALLER"/>
   <int value="1283" label="AUTOTESTPRIVATE_TAKESCREENSHOT"/>
   <int value="1284" label="ACCESSIBILITY_PRIVATE_TOGGLEDICTATION"/>
-  <int value="1285" label="ACCESSIBILITY_PRIVATE_ENABLECHROMEVOXMOUSEEVENTS"/>
+  <int value="1285" label="ACCESSIBILITY_PRIVATE_ENABLEMOUSEEVENTS"/>
   <int value="1286" label="ACCESSIBILITY_PRIVATE_SENDSYNTHETICMOUSEEVENT"/>
   <int value="1287" label="FILEMANAGERPRIVATE_DETECTCHARACTERENCODING"/>
   <int value="1288" label="FILEMANAGERPRIVATEINTERNAL_GETLINUXPACKAGEINFO"/>
@@ -25418,7 +26673,7 @@ Called by update_extension_histograms.py.-->
   <int value="1517" label="FILEMANAGERPRIVATEINTERNAL_GETPDFTHUMBNAIL"/>
   <int value="1518" label="AUTOTESTPRIVATE_REMOVEALLNOTIFICATIONS"/>
   <int value="1519" label="VIRTUALKEYBOARDPRIVATE_OPENSUGGESTIONSETTINGS"/>
-  <int value="1520" label="ACCESSIBILITY_PRIVATE_ACTIVATEPOINTSCAN"/>
+  <int value="1520" label="ACCESSIBILITY_PRIVATE_SETPOINTSCANSTATE"/>
   <int value="1521" label="AUTOTESTPRIVATE_ACTIVATEADJACENTDESKSTOTARGETINDEX"/>
   <int value="1522" label="DECLARATIVENETREQUEST_GETAVAILABLESTATICRULECOUNT"/>
   <int value="1523" label="CHROMEOSINFOPRIVATE_ISTABLETMODEENABLED"/>
@@ -25435,6 +26690,14 @@ Called by update_extension_histograms.py.-->
   <int value="1533" label="DECLARATIVENETREQUEST_UPDATESESSIONRULES"/>
   <int value="1534" label="DECLARATIVENETREQUEST_GETSESSIONRULES"/>
   <int value="1535" label="SCRIPTING_INSERTCSS"/>
+  <int value="1536" label="VIRTUALKEYBOARDPRIVATE_PASTECLIPBOARDITEM"/>
+  <int value="1537" label="VIRTUALKEYBOARDPRIVATE_GETCLIPBOARDHISTORY"/>
+  <int value="1538" label="VIRTUALKEYBOARDPRIVATE_DELETECLIPBOARDITEM"/>
+  <int value="1539" label="FILEMANAGERPRIVATE_ISTABLETMODEENABLED"/>
+  <int value="1540" label="FILEMANAGERPRIVATE_NOTIFYDRIVEDIALOGRESULT"/>
+  <int value="1541" label="ENTERPRISEREPORTINGPRIVATE_GETCONTEXTINFO"/>
+  <int value="1542" label="SCRIPTING_REMOVECSS"/>
+  <int value="1543" label="FILEMANAGERPRIVATEINTERNAL_GETVOLUMEROOT"/>
 </enum>
 
 <enum name="ExtensionIconState">
@@ -25544,6 +26807,7 @@ Called by update_extension_histograms.py.-->
   <int value="25" label="CRX_FETCH_URL_EMPTY"/>
   <int value="26" label="CRX_FETCH_URL_INVALID"/>
   <int value="27" label="OVERRIDEN_BY_SETTINGS"/>
+  <int value="28" label="REPLACED_BY_SYSTEM_APP"/>
 </enum>
 
 <enum name="ExtensionInstallationStage">
@@ -25836,7 +27100,7 @@ Called by update_extension_permission.py.-->
   <int value="26" label="kChromeosInfoPrivate"/>
   <int value="27" label="kClipboardRead"/>
   <int value="28" label="kClipboardWrite"/>
-  <int value="29" label="kCloudPrintPrivate"/>
+  <int value="29" label="kDeleted_CloudPrintPrivate"/>
   <int value="30" label="kCommandLinePrivate"/>
   <int value="31" label="kCommandsAccessibility"/>
   <int value="32" label="kContentSettings"/>
@@ -25845,7 +27109,7 @@ Called by update_extension_permission.py.-->
   <int value="35" label="kDeleted_Copresence"/>
   <int value="36" label="kDeleted_CopresencePrivate"/>
   <int value="37" label="kCryptotokenPrivate"/>
-  <int value="38" label="kDataReductionProxy"/>
+  <int value="38" label="kDeleted_DataReductionProxy"/>
   <int value="39" label="kDiagnostics"/>
   <int value="40" label="kDeleted_Dial"/>
   <int value="41" label="kDebugger"/>
@@ -26006,7 +27270,7 @@ Called by update_extension_permission.py.-->
   <int value="196" label="kEnterpriseDeviceAttributes"/>
   <int value="197" label="kCertificateProvider"/>
   <int value="198" label="kResourcesPrivate"/>
-  <int value="199" label="kDisplaySource"/>
+  <int value="199" label="kDeleted_DisplaySource"/>
   <int value="200" label="kClipboard"/>
   <int value="201" label="kNetworkingOnc"/>
   <int value="202" label="kVirtualKeyboard"/>
@@ -26021,7 +27285,7 @@ Called by update_extension_permission.py.-->
   <int value="211" label="kCecPrivate"/>
   <int value="212" label="kSafeBrowsingPrivate"/>
   <int value="213" label="kFileSystemRequestDownloads"/>
-  <int value="214" label="kSystemPowerSource"/>
+  <int value="214" label="kDeleted_SystemPowerSource"/>
   <int value="215" label="kArcAppsPrivate"/>
   <int value="216" label="kEnterpriseHardwarePlatform"/>
   <int value="217" label="kLoginScreenUi"/>
@@ -26116,19 +27380,31 @@ Called by update_extension_permission.py.-->
   <int value="25" label="INVALID_PATH_FOR_BITMAP_IMAGE"/>
   <int value="26" label="ERROR_RE_ENCODING_THEME_IMAGE"/>
   <int value="27" label="ERROR_SAVING_THEME_IMAGE"/>
-  <int value="28" label="COULD_NOT_READ_CATALOG_DATA_FROM_DISK"/>
-  <int value="29" label="INVALID_CATALOG_DATA"/>
-  <int value="30" label="INVALID_PATH_FOR_CATALOG"/>
-  <int value="31" label="ERROR_SERIALIZING_CATALOG"/>
-  <int value="32" label="ERROR_SAVING_CATALOG"/>
-  <int value="33" label="CRX_HASH_VERIFICATION_FAILED"/>
-  <int value="34" label="CRX_FILE_IS_DELTA_UPDATE"/>
-  <int value="35" label="CRX_EXPECTED_HASH_INVALID"/>
+  <int value="28" label="DEPRECATED_ABORTED_DUE_TO_SHUTDOWN"/>
+  <int value="29" label="COULD_NOT_READ_CATALOG_DATA_FROM_DISK"/>
+  <int value="30" label="INVALID_CATALOG_DATA"/>
+  <int value="31" label="INVALID_PATH_FOR_CATALOG"/>
+  <int value="32" label="ERROR_SERIALIZING_CATALOG"/>
+  <int value="33" label="ERROR_SAVING_CATALOG"/>
+  <int value="34" label="CRX_HASH_VERIFICATION_FAILED"/>
+  <int value="35" label="UNZIP_FAILED"/>
+  <int value="36" label="DIRECTORY_MOVE_FAILED"/>
+  <int value="37" label="CRX_FILE_IS_DELTA_UPDATE"/>
+  <int value="38" label="CRX_EXPECTED_HASH_INVALID"/>
+  <int value="39" label="DEPRECATED_ERROR_PARSING_DNR_RULESET"/>
+  <int value="40" label="ERROR_INDEXING_DNR_RULESET"/>
+  <int value="41" label="CRX_REQUIRED_PROOF_MISSING"/>
+  <int value="42" label="CRX_HEADER_VERIFIED_CONTENTS_UNCOMPRESSING_FAILURE"/>
+  <int value="43" label="MALFORMED_VERIFIED_CONTENTS"/>
+  <int value="44" label="COULD_NOT_CREATE_METADATA_DIRECTORY"/>
+  <int value="45" label="COULD_NOT_WRITE_VERIFIED_CONTENTS_INTO_FILE"/>
 </enum>
 
 <enum name="ExtensionUpdateCheckDataKey">
   <int value="0" label="No update check keys (no action taken)"/>
   <int value="1" label="Malware"/>
+  <int value="2" label="Potentially UWS"/>
+  <int value="3" label="Policy Violation"/>
 </enum>
 
 <enum name="ExtensionUpdaterUpdateResult">
@@ -26266,6 +27542,13 @@ Called by update_extension_permission.py.-->
   <int value="3" label="Service error"/>
 </enum>
 
+<enum name="FamilyLinkManagedSiteList">
+  <int value="0" label="Empty"/>
+  <int value="1" label="Approved List Only"/>
+  <int value="2" label="Blocked List Only"/>
+  <int value="3" label="Both"/>
+</enum>
+
 <enum name="FamilyLinkUserLogSegment">
   <summary>
     Filters family link user metrics into categories of interest.
@@ -26275,12 +27558,19 @@ Called by update_extension_permission.py.-->
   <int value="2" label="Over Age of Consent"/>
 </enum>
 
+<enum name="FamilyLinkWebFilterType">
+  <int value="0" label="Allow All Sites"/>
+  <int value="1" label="Try To Block Mature Sites"/>
+  <int value="2" label="Only allow Certain Sites"/>
+</enum>
+
 <enum name="FamilyUserLogSegment">
   <summary>Filters family user metrics into categories of interest.</summary>
   <int value="0" label="Other"/>
   <int value="1" label="Supervised User"/>
   <int value="2" label="Supervised Student"/>
   <int value="3" label="Student at Home"/>
+  <int value="4" label="Regular User"/>
 </enum>
 
 <enum name="FaultTolerantHeap">
@@ -26935,7 +28225,7 @@ Called by update_use_counter_feature_enum.py.-->
       label="WebkitEditableContentChangedOnContentEditableObsolete"/>
   <int value="454" label="WebkitEditableContentChangedOnNotNodeObsolete"/>
   <int value="455" label="HTMLImports"/>
-  <int value="456" label="ElementCreateShadowRoot"/>
+  <int value="456" label="OBSOLETE_ElementCreateShadowRoot"/>
   <int value="457" label="DocumentRegisterElement"/>
   <int value="458" label="EditingAppleInterchangeNewline"/>
   <int value="459" label="EditingAppleConvertedSpace"/>
@@ -26946,11 +28236,11 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="464" label="FontFaceSetReady"/>
   <int value="465" label="XMLHttpRequestSynchronous"/>
   <int value="466" label="CSSSelectorPseudoUnresolved"/>
-  <int value="467" label="CSSSelectorPseudoShadow"/>
-  <int value="468" label="CSSSelectorPseudoContent"/>
+  <int value="467" label="OBSOLETE_CSSSelectorPseudoShadow"/>
+  <int value="468" label="OBSOLETE_CSSSelectorPseudoContent"/>
   <int value="469" label="CSSSelectorPseudoHost"/>
   <int value="470" label="CSSSelectorPseudoHostContext"/>
-  <int value="471" label="CSSDeepCombinator"/>
+  <int value="471" label="OBSOLETE_CSSDeepCombinator"/>
   <int value="472" label="SyncXHRWithCredentials"/>
   <int value="473" label="UseAsm"/>
   <int value="474" label="KeyEventNotAllowedInFullScreen"/>
@@ -27813,7 +29103,7 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="1306" label="MediaStreamTrackRemote"/>
   <int value="1307" label="V8Node_IsConnected_AttributeGetter"/>
   <int value="1308" label="ShadowRootDelegatesFocus"/>
-  <int value="1309" label="MixedShadowRootV0AndV1"/>
+  <int value="1309" label="OBSOLETE_MixedShadowRootV0AndV1"/>
   <int value="1310" label="ImageDocumentInFrame"/>
   <int value="1311" label="MediaDocument"/>
   <int value="1312" label="MediaDocumentInFrame"/>
@@ -27878,7 +29168,7 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="1372" label="UntrustedEventDefaultHandled"/>
   <int value="1373" label="FixedRasterScaleBlurryContent"/>
   <int value="1374" label="FixedRasterScalePotentialPerformanceRegression"/>
-  <int value="1375" label="CSSDeepCombinatorAndShadow"/>
+  <int value="1375" label="OBSOLETE_CSSDeepCombinatorAndShadow"/>
   <int value="1376" label="OpacityWithPreserve3DQuirk"/>
   <int value="1377" label="CSSSelectorPseudoReadOnly"/>
   <int value="1378" label="CSSSelectorPseudoReadWrite"/>
@@ -27926,7 +29216,7 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="1420" label="OBSOLETE_DocumentOpen"/>
   <int value="1421" label="ElementRequestPointerLockInShadow"/>
   <int value="1422" label="ShadowRootPointerLockElement"/>
-  <int value="1423" label="DocumentPointerLockElementInV0Shadow"/>
+  <int value="1423" label="OBSOLETE_DocumentPointerLockElementInV0Shadow"/>
   <int value="1424" label="TextAreaMaxLength"/>
   <int value="1425" label="TextAreaMinLength"/>
   <int value="1426" label="TopNavigationFromSubFrame"/>
@@ -27937,7 +29227,7 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="1431" label="PointerEventSetCapture"/>
   <int value="1432" label="PointerEventDispatch"/>
   <int value="1433" label="MIDIMessageEventReceivedTime"/>
-  <int value="1434" label="SummaryElementWithDisplayBlockAuthorRule"/>
+  <int value="1434" label="OBSOLETE_SummaryElementWithDisplayBlockAuthorRule"/>
   <int value="1435" label="V8MediaStream_Active_AttributeGetter"/>
   <int value="1436" label="BeforeInstallPromptEvent"/>
   <int value="1437" label="BeforeInstallPromptEventUserChoice"/>
@@ -28171,7 +29461,7 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="1662" label="RTCConfigurationIceTransportPolicy"/>
   <int value="1663" label="RTCConfigurationIceTransportPolicyNone"/>
   <int value="1664" label="RTCConfigurationIceTransports"/>
-  <int value="1665" label="DocumentFullscreenElementInV0Shadow"/>
+  <int value="1665" label="OBSOLETE_DocumentFullscreenElementInV0Shadow"/>
   <int value="1666" label="ScriptWithCSPBypassingSchemeParserInserted"/>
   <int value="1667" label="ScriptWithCSPBypassingSchemeNotParserInserted"/>
   <int value="1668" label="DocumentCreateElement2ndArgStringHandling"/>
@@ -28408,8 +29698,8 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="1893" label="WebBluetoothRemoteServerGetPrimaryServices"/>
   <int value="1894" label="WebBluetoothRemoteServiceGetCharacteristic"/>
   <int value="1895" label="WebBluetoothRemoteServiceGetCharacteristics"/>
-  <int value="1896" label="HTMLContentElement"/>
-  <int value="1897" label="HTMLShadowElement"/>
+  <int value="1896" label="OBSOLETE_HTMLContentElement"/>
+  <int value="1897" label="OBSOLETE_HTMLShadowElement"/>
   <int value="1898" label="HTMLSlotElement"/>
   <int value="1899" label="AccelerometerConstructor"/>
   <int value="1900" label="AbsoluteOrientationSensorConstructor"/>
@@ -28693,8 +29983,8 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="2161"
       label="V8LineOrParagraphSeparatorAsLineTerminator (obsolete)"/>
   <int value="2162" label="AnimationSetPlaybackRateCompensatorySeek"/>
-  <int value="2163" label="DeepCombinatorInStaticProfile"/>
-  <int value="2164" label="PseudoShadowInStaticProfile"/>
+  <int value="2163" label="OBSOLETE_DeepCombinatorInStaticProfile"/>
+  <int value="2164" label="OBSOLETE_PseudoShadowInStaticProfile"/>
   <int value="2165" label="SchemeBypassesCSP"/>
   <int value="2166" label="InnerSchemeBypassesCSP"/>
   <int value="2167" label="SameOriginApplicationOctetStream"/>
@@ -28773,7 +30063,7 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="2242" label="V8MediaCapabilitiesInfo_Smooth_AttributeGetter"/>
   <int value="2243"
       label="V8MediaCapabilitiesInfo_PowerEfficient_AttributeGetter"/>
-  <int value="2244" label="WindowEventInV0ShadowTree"/>
+  <int value="2244" label="OBSOLETE_WindowEventInV0ShadowTree"/>
   <int value="2245"
       label="OBSOLETE_HTMLAnchorElementDownloadInSandboxWithUserGesture"/>
   <int value="2246"
@@ -29563,8 +30853,8 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="2968" label="SVGSMILDiscardElementParsed"/>
   <int value="2969" label="SVGSMILDiscardElementTriggered"/>
   <int value="2971" label="V8PointerEvent_GetPredictedEvents_Method"/>
-  <int value="2972" label="ScrollSnapOnViewportBreaks"/>
-  <int value="2973" label="ScrollPaddingOnViewportBreaks"/>
+  <int value="2972" label="OBSOLETE_ScrollSnapOnViewportBreaks"/>
+  <int value="2973" label="OBSOLETE_ScrollPaddingOnViewportBreaks"/>
   <int value="2974" label="DownloadInAdFrame"/>
   <int value="2975" label="DownloadInSandbox"/>
   <int value="2976" label="DownloadWithoutUserGesture"/>
@@ -29725,7 +31015,7 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="3124" label="WebkitBoxPackCenterDoesSomething"/>
   <int value="3125" label="WebkitBoxPackEndDoesSomething"/>
   <int value="3126" label="V8KeyframeEffect_Constructor"/>
-  <int value="3127" label="WebNfcAPI"/>
+  <int value="3127" label="OBSOLETE_WebNfcAPI"/>
   <int value="3128" label="HostCandidateAttributeGetter"/>
   <int value="3129" label="CSPWithReasonableObjectRestrictions"/>
   <int value="3130" label="CSPWithReasonableBaseRestrictions"/>
@@ -29803,12 +31093,12 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="3202" label="V8Document_HasTrustToken_Method"/>
   <int value="3203" label="ForceLoadAtTop"/>
   <int value="3204" label="OBSOLETE_LegacyLayoutByButton"/>
-  <int value="3205" label="LegacyLayoutByDeprecatedFlexBox"/>
+  <int value="3205" label="OBSOLETE_LegacyLayoutByDeprecatedFlexBox"/>
   <int value="3206" label="LegacyLayoutByDetailsMarker"/>
   <int value="3207" label="LegacyLayoutByEditing"/>
-  <int value="3208" label="LegacyLayoutByFieldSet"/>
+  <int value="3208" label="OBSOLETE_LegacyLayoutByFieldSet"/>
   <int value="3209" label="OBSOLETE_LegacyLayoutByFileUploadControl"/>
-  <int value="3210" label="LegacyLayoutByFlexBox"/>
+  <int value="3210" label="OBSOLETE_LegacyLayoutByFlexBox"/>
   <int value="3211" label="LegacyLayoutByFrameSet"/>
   <int value="3212" label="LegacyLayoutByGrid"/>
   <int value="3213" label="OBSOLETE_LegacyLayoutByMenuList"/>
@@ -29816,12 +31106,13 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="3215" label="LegacyLayoutByPrinting"/>
   <int value="3216" label="OBSOLETE_LegacyLayoutByRuby"/>
   <int value="3217" label="LegacyLayoutBySVG"/>
-  <int value="3218" label="LegacyLayoutBySlider"/>
+  <int value="3218" label="OBSOLETE_LegacyLayoutBySlider"/>
   <int value="3219" label="LegacyLayoutByTable"/>
   <int value="3220" label="LegacyLayoutByTextCombine"/>
   <int value="3221" label="LegacyLayoutByTextControl"/>
   <int value="3222" label="LegacyLayoutByVTTCue"/>
-  <int value="3223" label="LegacyLayoutByWebkitBoxWithoutVerticalLineClamp"/>
+  <int value="3223"
+      label="OBSOLETE_LegacyLayoutByWebkitBoxWithoutVerticalLineClamp"/>
   <int value="3224"
       label="LegacyLayoutByTableFlexGridBlockInNGFragmentationContext"/>
   <int value="3225" label="DocumentPolicyHeader"/>
@@ -29888,7 +31179,7 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="3283" label="OBSOLETE_LocationFragmentDirectiveAccessed"/>
   <int value="3284" label="CanvasRenderingContext"/>
   <int value="3285" label="SchemefulSameSiteContextDowngrade"/>
-  <int value="3286" label="OriginIsolationHeader"/>
+  <int value="3286" label="OriginAgentClusterHeader"/>
   <int value="3287" label="V8WasmSimdOpcodes"/>
   <int value="3288" label="GridRowGapPercent"/>
   <int value="3289" label="GridRowGapPercentIndefinite"/>
@@ -29940,7 +31231,7 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="3334" label="ContentVisibilityHiddenMatchable"/>
   <int value="3335" label="InlineOverflowAutoWithInlineEndPadding"/>
   <int value="3336" label="InlineOverflowScrollWithInlineEndPadding"/>
-  <int value="3337" label="CSSSelectorPseudoWebKitDetailsMarker"/>
+  <int value="3337" label="OBSOLETE_CSSSelectorPseudoWebKitDetailsMarker"/>
   <int value="3338" label="SerialPortGetInfo"/>
   <int value="3339" label="FileSystemPickerMethod"/>
   <int value="3340" label="V8Window_ShowOpenFilePicker_Method"/>
@@ -29949,7 +31240,7 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="3343" label="V8Window_GetOriginPrivateDirectory_Method"/>
   <int value="3344" label="RTCConstraintEnableRtpDataChannelsTrue"/>
   <int value="3345" label="RTCConstraintEnableRtpDataChannelsFalse"/>
-  <int value="3346" label="NativeFileSystemDragAndDrop"/>
+  <int value="3346" label="FileSystemAccessDragAndDrop"/>
   <int value="3347" label="RTCAdaptivePtime"/>
   <int value="3348"
       label="HTMLMetaElementReferrerPolicyMultipleTokensAffectingRequest"/>
@@ -29960,7 +31251,7 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="3353"
       label="CrossBrowsingContextGroupMainFrameNulledNonEmptyNameAccessed"/>
   <int value="3354" label="PositionSticky"/>
-  <int value="3355" label="CommaSeparatorInAllowAttribute"/>
+  <int value="3355" label="OBSOLETE_CommaSeparatorInAllowAttribute"/>
   <int value="3359" label="MainFrameCSPViaHTTP"/>
   <int value="3360" label="MainFrameCSPViaMeta"/>
   <int value="3361" label="MainFrameCSPViaOriginPolicy"/>
@@ -30076,10 +31367,10 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="3470" label="OBSOLETE_ElementAttachInternalsBeforeConstructor"/>
   <int value="3471" label="SMILElementHasRepeatNEventListener"/>
   <int value="3472" label="WebTransport"/>
-  <int value="3473" label="WebkitPrerenderStartEventFired"/>
-  <int value="3474" label="WebkitPrerenderStopEventFired"/>
-  <int value="3475" label="WebkitPrerenderLoadEventFired"/>
-  <int value="3476" label="WebkitPrerenderDOMContentLoadedEventFired"/>
+  <int value="3473" label="OBSOLETE_WebkitPrerenderStartEventFired"/>
+  <int value="3474" label="OBSOLETE_WebkitPrerenderStopEventFired"/>
+  <int value="3475" label="OBSOLETE_WebkitPrerenderLoadEventFired"/>
+  <int value="3476" label="OBSOLETE_WebkitPrerenderDOMContentLoadedEventFired"/>
   <int value="3477" label="IdleDetectionPermissionRequested"/>
   <int value="3478" label="IdentifiabilityStudyReserved3478"/>
   <int value="3479" label="SpeechSynthesis_GetVoices_Method"/>
@@ -30189,7 +31480,7 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="3579" label="ForcedDarkMode"/>
   <int value="3580" label="PreferredColorSchemeDark"/>
   <int value="3581" label="PreferredColorSchemeDarkSetting"/>
-  <int value="3582" label="IdentifiabilityStudyReserved3582"/>
+  <int value="3582" label="IdentifiabilityMediaDevicesEnumerateDevices"/>
   <int value="3583" label="IdentifiabilityStudyReserved3583"/>
   <int value="3584" label="IdentifiabilityStudyReserved3584"/>
   <int value="3585" label="IdentifiabilityStudyReserved3585"/>
@@ -30292,21 +31583,29 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="3682" label="UndeferrableThirdPartySubresourceRequestWithCookie"/>
   <int value="3683" label="XRDepthSensing"/>
   <int value="3684" label="XRFrameGetDepthInformation"/>
-  <int value="3685" label="XRDepthInformationGetDepth"/>
-  <int value="3686" label="XRDepthInformationDataAttribute"/>
+  <int value="3685" label="XRCPUDepthInformationGetDepth"/>
+  <int value="3686" label="XRCPUDepthInformationDataAttribute"/>
   <int value="3687" label="InterestCohortAPI_interestCohort_Method"/>
-  <int value="3688" label="AddressSpaceLocalEmbeddedInPrivateSecureContext"/>
-  <int value="3689" label="AddressSpaceLocalEmbeddedInPrivateNonSecureContext"/>
-  <int value="3690" label="AddressSpaceLocalEmbeddedInPublicSecureContext"/>
-  <int value="3691" label="AddressSpaceLocalEmbeddedInPublicNonSecureContext"/>
-  <int value="3692" label="AddressSpaceLocalEmbeddedInUnknownSecureContext"/>
-  <int value="3693" label="AddressSpaceLocalEmbeddedInUnknownNonSecureContext"/>
-  <int value="3694" label="AddressSpacePrivateEmbeddedInPublicSecureContext"/>
+  <int value="3688"
+      label="OBSOLETE_AddressSpaceLocalEmbeddedInPrivateSecureContext"/>
+  <int value="3689"
+      label="OBSOLETE_AddressSpaceLocalEmbeddedInPrivateNonSecureContext"/>
+  <int value="3690"
+      label="OBSOLETE_AddressSpaceLocalEmbeddedInPublicSecureContext"/>
+  <int value="3691"
+      label="OBSOLETE_AddressSpaceLocalEmbeddedInPublicNonSecureContext"/>
+  <int value="3692"
+      label="OBSOLETE_AddressSpaceLocalEmbeddedInUnknownSecureContext"/>
+  <int value="3693"
+      label="OBSOLETE_AddressSpaceLocalEmbeddedInUnknownNonSecureContext"/>
+  <int value="3694"
+      label="OBSOLETE_AddressSpacePrivateEmbeddedInPublicSecureContext"/>
   <int value="3695"
-      label="AddressSpacePrivateEmbeddedInPublicNonSecureContext"/>
-  <int value="3696" label="AddressSpacePrivateEmbeddedInUnknownSecureContext"/>
+      label="OBSOLETE_AddressSpacePrivateEmbeddedInPublicNonSecureContext"/>
+  <int value="3696"
+      label="OBSOLETE_AddressSpacePrivateEmbeddedInUnknownSecureContext"/>
   <int value="3697"
-      label="AddressSpacePrivateEmbeddedInUnknownNonSecureContext"/>
+      label="OBSOLETE_AddressSpacePrivateEmbeddedInUnknownNonSecureContext"/>
   <int value="3698" label="ThirdPartyAccess"/>
   <int value="3699" label="ThirdPartyActivation"/>
   <int value="3700" label="ThirdPartyAccessAndActivation"/>
@@ -30341,6 +31640,120 @@ Called by update_use_counter_feature_enum.py.-->
   <int value="3729" label="MediaStreamTrackProcessor"/>
   <int value="3730" label="AddEventListenerWithAbortSignal"/>
   <int value="3731" label="XRSessionRequestLightProbe"/>
+  <int value="3732" label="BeforematchRevealedHiddenMatchable"/>
+  <int value="3733" label="AddSourceBufferUsingConfig"/>
+  <int value="3734" label="ChangeTypeUsingConfig"/>
+  <int value="3735" label="V8SourceBuffer_AppendEncodedChunks_Method"/>
+  <int value="3736" label="OversrollBehaviorOnViewportBreaks"/>
+  <int value="3737" label="SameOriginJsonTypeForScript"/>
+  <int value="3738" label="CrossOriginJsonTypeForScript"/>
+  <int value="3739" label="SameOriginStrictNosniffWouldBlock"/>
+  <int value="3740" label="CrossOriginStrictNosniffWouldBlock"/>
+  <int value="3741" label="CSSSelectorPseudoDir"/>
+  <int value="3742" label="CrossOriginSubframeWithoutEmbeddingControl"/>
+  <int value="3743" label="ReadableStreamWithByteSource"/>
+  <int value="3744" label="ReadableStreamBYOBReader"/>
+  <int value="3745" label="EmbedElementWithoutTypeSrcChanged"/>
+  <int value="3746" label="SamePartyCookieAttribute"/>
+  <int value="3747" label="SamePartyCookieExclusionOverruledSameSite"/>
+  <int value="3748" label="SamePartyCookieInclusionOverruledSameSite"/>
+  <int value="3749" label="EmbedElementWithoutTypeSrcChanged"/>
+  <int value="3750" label="PaymentHandlerStandardizedPaymentMethodIdentifier"/>
+  <int value="3751" label="WebCodecsAudioEncoder"/>
+  <int value="3752" label="EmbeddedCrossOriginFrameWithoutFrameAncestorsOrXFO"/>
+  <int value="3753" label="AddressSpacePrivateSecureContextEmbeddedLocal"/>
+  <int value="3754" label="AddressSpacePrivateNonSecureContextEmbeddedLocal"/>
+  <int value="3755" label="AddressSpacePublicSecureContextEmbeddedLocal"/>
+  <int value="3756" label="AddressSpacePublicNonSecureContextEmbeddedLocal"/>
+  <int value="3757" label="AddressSpacePublicSecureContextEmbeddedPrivate"/>
+  <int value="3758" label="AddressSpacePublicNonSecureContextEmbeddedPrivate"/>
+  <int value="3759" label="AddressSpaceUnknownSecureContextEmbeddedLocal"/>
+  <int value="3760" label="AddressSpaceUnknownNonSecureContextEmbeddedLocal"/>
+  <int value="3761" label="AddressSpaceUnknownSecureContextEmbeddedPrivate"/>
+  <int value="3762" label="AddressSpaceUnknownNonSecureContextEmbeddedPrivate"/>
+  <int value="3763" label="AddressSpacePrivateSecureContextNavigatedToLocal"/>
+  <int value="3764"
+      label="AddressSpacePrivateNonSecureContextNavigatedToLocal"/>
+  <int value="3765" label="AddressSpacePublicSecureContextNavigatedToLocal"/>
+  <int value="3766" label="AddressSpacePublicNonSecureContextNavigatedToLocal"/>
+  <int value="3767" label="AddressSpacePublicSecureContextNavigatedToPrivate"/>
+  <int value="3768"
+      label="AddressSpacePublicNonSecureContextNavigatedToPrivate"/>
+  <int value="3769" label="AddressSpaceUnknownSecureContextNavigatedToLocal"/>
+  <int value="3770"
+      label="AddressSpaceUnknownNonSecureContextNavigatedToLocal"/>
+  <int value="3771" label="AddressSpaceUnknownSecureContextNavigatedToPrivate"/>
+  <int value="3772"
+      label="AddressSpaceUnknownNonSecureContextNavigatedToPrivate"/>
+  <int value="3773" label="RTCPeerConnectionSdpSemanticsPlanB"/>
+  <int value="3774" label="FetchRespondWithNoResponseWithUsedRequestBody"/>
+  <int value="3775" label="V8TCPSocket_Close_Method"/>
+  <int value="3776" label="V8TCPSocket_Readable_AttributeGetter"/>
+  <int value="3777" label="V8TCPSocket_Writable_AttributeGetter"/>
+  <int value="3778" label="V8TCPSocket_RemoteAddress_AttributeGetter"/>
+  <int value="3779" label="V8TCPSocket_RemotePort_AttributeGetter"/>
+  <int value="3780" label="CSSSelectorTargetText"/>
+  <int value="3781" label="PopupElement"/>
+  <int value="3782" label="V8HTMLPopupElement_Show_Method"/>
+  <int value="3783" label="V8HTMLPopupElement_Hide_Method"/>
+  <int value="3784" label="WindowOpenWithAdditionalBoolParameter"/>
+  <int value="3785" label="RTCPeerConnectionConstructedWithPlanB"/>
+  <int value="3786" label="RTCPeerConnectionConstructedWithUnifiedPlan"/>
+  <int value="3787" label="RTCPeerConnectionUsingComplexPlanB"/>
+  <int value="3788" label="RTCPeerConnectionUsingComplexUnifiedPlan"/>
+  <int value="3789" label="WindowScreenIsExtended"/>
+  <int value="3790" label="WindowScreenChange"/>
+  <int value="3791" label="XRWebGLDepthInformationTextureAttribute"/>
+  <int value="3792" label="XRWebGLBindingGetDepthInformation"/>
+  <int value="3793" label="SessionStorageFirstUsedBeforeFcp"/>
+  <int value="3794" label="SessionStorageFirstUsedAfterFcp"/>
+  <int value="3795" label="GravitySensorConstructor"/>
+  <int value="3796" label="ElementInternalsStates"/>
+  <int value="3797" label="WebPImage"/>
+  <int value="3798" label="AVIFImage"/>
+  <int value="3799" label="SVGTextEdited"/>
+  <int value="3800" label="V8WasmExceptionHandling"/>
+  <int value="3801" label="WasmModuleSharing"/>
+  <int value="3802" label="CrossOriginWasmModuleSharing"/>
+  <int value="3803" label="OverflowClipAlongEitherAxis"/>
+  <int value="3804" label="CreateJSONModuleScript"/>
+  <int value="3805" label="CreateCSSModuleScript"/>
+  <int value="3806" label="InsertHTMLCommandOnInput"/>
+  <int value="3807" label="InsertHTMLCommandOnTextarea"/>
+  <int value="3808" label="InsertHTMLCommandOnReadWritePlainText"/>
+  <int value="3809" label="CSSAtRuleCounterStyle"/>
+  <int value="3810" label="CanvasUseColorSpace"/>
+  <int value="3811" label="SelectMenuElement"/>
+  <int value="3812"
+      label="RTCPeerConnectionSdpSemanticsPlanBWithReverseOriginTrial"/>
+  <int value="3813" label="WebAppManifestCaptureLinks"/>
+  <int value="3814" label="SanitizerAPICreated"/>
+  <int value="3815" label="SanitizerAPIDefaultConfiguration"/>
+  <int value="3816" label="SanitizerAPIToString"/>
+  <int value="3817" label="SanitizerAPIToFragment"/>
+  <int value="3818" label="SanitizerAPIActionTaken"/>
+  <int value="3819" label="SanitizerAPIFromString"/>
+  <int value="3820" label="SanitizerAPIFromDocument"/>
+  <int value="3821" label="SanitizerAPIFromFragment"/>
+  <int value="3822" label="StorageFoundationOpen"/>
+  <int value="3823" label="StorageFoundationRead"/>
+  <int value="3824" label="StorageFoundationReadSync"/>
+  <int value="3825" label="StorageFoundationWrite"/>
+  <int value="3826" label="StorageFoundationWriteSync"/>
+  <int value="3827" label="StorageFoundationFlush"/>
+  <int value="3828" label="StorageFoundationFlushSync"/>
+  <int value="3829" label="UnrestrictedSharedArrayBuffer"/>
+  <int value="3830" label="FeaturePolicyJSAPIAllowsFeatureIFrame"/>
+  <int value="3831" label="FeaturePolicyJSAPIAllowsFeatureDocument"/>
+  <int value="3832" label="FeaturePolicyJSAPIAllowsFeatureOriginIFrame"/>
+  <int value="3833" label="FeaturePolicyJSAPIAllowsFeatureOriginDocument"/>
+  <int value="3834" label="FeaturePolicyJSAPIAllowedFeaturesIFrame"/>
+  <int value="3835" label="FeaturePolicyJSAPIAllowedFeaturesDocument"/>
+  <int value="3836" label="FeaturePolicyJSAPIFeaturesIFrame"/>
+  <int value="3837" label="FeaturePolicyJSAPIFeaturesDocument"/>
+  <int value="3838" label="FeaturePolicyJSAPIGetAllowlistIFrame"/>
+  <int value="3839" label="FeaturePolicyJSAPIGetAllowlistDocument"/>
+  <int value="3871" label="PaymentRequestCSPViolation"/>
 </enum>
 
 <enum name="FeaturePolicyAllowlistType">
@@ -30440,6 +31853,9 @@ Called by update_feature_policy_enum.py.-->
   <int value="77" label="ClipboardWrite"/>
   <int value="78" label="WebShare"/>
   <int value="79" label="Gamepad"/>
+  <int value="80" label="OTPCredentials"/>
+  <int value="81" label="DisplayCapture"/>
+  <int value="82" label="InterestCohort"/>
 </enum>
 
 <enum name="FeaturePolicyImageCompressionFormat">
@@ -30548,6 +31964,10 @@ Called by update_feature_policy_enum.py.-->
   <int value="17" label="Failed - feed is disabled by enterprise policy"/>
   <int value="18"
       label="Failed - network fetch failed or returned a non-200 status"/>
+  <int value="19" label="Failed - cannot load more, no next page token"/>
+  <int value="20" label="Failed - data in store is stale, last refresh missed"/>
+  <int value="21" label="Success loading stale data, after network failure"/>
+  <int value="22" label="Failed - data in store is expired"/>
 </enum>
 
 <enum name="FeedRequestReason">
@@ -30614,7 +32034,7 @@ Called by update_feature_policy_enum.py.-->
 
 <enum name="FeedUserActionType">
   <int value="0" label="Tapped on card"/>
-  <int value="1" label="Shown card"/>
+  <int value="1" label="Shown card (REMOVED, never reported)"/>
   <int value="2" label="Tapped Send Feedback"/>
   <int value="3" label="Tapped Learn More"/>
   <int value="4" label="Tapped Hide Story"/>
@@ -30641,10 +32061,17 @@ Called by update_feature_policy_enum.py.-->
   <int value="20" label="Open Dialog e.g. Report Content Dialog"/>
   <int value="21" label="Close Dialog e.g. Report Content Dialog"/>
   <int value="22" label="Show Snackbar"/>
-  <int value="23" label="Opened native context menu. (iOS Only)"/>
+  <int value="23" label="Opened native back-of-card action sheet. (iOS Only)"/>
+  <int value="24" label="Opened native back-of-card context menu. (iOS Only)"/>
+  <int value="25" label="Closed native back-of-card context menu. (iOS Only)"/>
+  <int value="26" label="Opened native back-of-card pulldown menu. (iOS Only)"/>
+  <int value="27" label="Closed native back-of-card pulldown menu. (iOS Only)"/>
+  <int value="28" label="Tapped manage reactions"/>
 </enum>
 
-<enum name="FeedUserCommandType"/>
+<enum name="FeedUserCommandType">
+  <int value="0" label="Enum placerholder. See crbug/1179826"/>
+</enum>
 
 <enum name="FeedZeroStateShowReason">
   <int value="0" label="ERROR"/>
@@ -30683,6 +32110,9 @@ Called by update_feature_policy_enum.py.-->
 </enum>
 
 <enum name="FetchFontName">
+  <obsolete>
+    Removed Jan 2021.
+  </obsolete>
   <int value="0" label="Other"/>
   <int value="1" label="Google Sans Regular"/>
   <int value="2" label="Google Sans Medium"/>
@@ -30690,6 +32120,9 @@ Called by update_feature_policy_enum.py.-->
 </enum>
 
 <enum name="FetchFontResult">
+  <obsolete>
+    Removed Jan 2021.
+  </obsolete>
   <int value="0" label="Success"/>
   <int value="1" label="Failed due to unexpected font name"/>
   <int value="2" label="Failed with non-OK status code on result"/>
@@ -31715,6 +33148,7 @@ Called by update_feature_policy_enum.py.-->
   <int value="24" label="RECENT_AUDIO"/>
   <int value="25" label="RECENT_IMAGES"/>
   <int value="26" label="RECENT_VIDEOS"/>
+  <int value="27" label="TRASH"/>
 </enum>
 
 <enum name="FileManagerTaskType">
@@ -31860,6 +33294,12 @@ Called by update_feature_policy_enum.py.-->
   <int value="3" label="Service Worker"/>
 </enum>
 
+<enum name="FileStorageRequestType">
+  <int value="0" label="Save Request"/>
+  <int value="1" label="Restore Request"/>
+  <int value="2" label="Delete Request"/>
+</enum>
+
 <enum name="FileSystemDatabaseInitResult">
   <int value="0" label="OK"/>
   <int value="1" label="Corruption"/>
@@ -31933,6 +33373,16 @@ Called by update_feature_policy_enum.py.-->
   <int value="2" label="Record format version with validation value"/>
 </enum>
 
+<enum name="FingerprintScanResult">
+  <int value="0" label="Success"/>
+  <int value="1" label="Partial"/>
+  <int value="2" label="Insufficient"/>
+  <int value="3" label="Sensor Dirty"/>
+  <int value="4" label="Too Slow"/>
+  <int value="5" label="Too Fast"/>
+  <int value="6" label="Immobile"/>
+</enum>
+
 <enum name="FingerprintSensorMode">
   <int value="0" label="None"/>
   <int value="1" label="Deepsleep"/>
@@ -31951,7 +33401,9 @@ Called by update_feature_policy_enum.py.-->
 <enum name="FingerprintSetupScreenUserAction">
   <summary>Actions which happen on the screen.</summary>
   <int value="0" label="Setup done button clicked"/>
-  <int value="1" label="Skipped button clicked"/>
+  <int value="1" label="Skipped button clicked">
+    Obsolete, splited into skip in flow and skip on start actions in M90.
+  </int>
   <int value="2" label="Do it later button clicked">
     Obsolete, the button is removed.
   </int>
@@ -31959,6 +33411,16 @@ Called by update_feature_policy_enum.py.-->
   <int value="4" label="Show sensor location button clicked">
     Obsolete, the button in removed.
   </int>
+  <int value="5" label="Skip button clicked on starting page"/>
+  <int value="6" label="Skip button clicked in flow"/>
+</enum>
+
+<enum name="FingerprintUnlockResult">
+  <int value="0" label="Success"/>
+  <int value="1" label="Fingerprint auth not available"/>
+  <int value="2" label="Authentication is temporarily disabled"/>
+  <int value="3" label="Fingerprint match failed"/>
+  <int value="4" label="Fingerprint match is not of the the primary user"/>
 </enum>
 
 <enum name="FingerprintUpdaterReason">
@@ -32049,6 +33511,7 @@ Called by update_feature_policy_enum.py.-->
   <int value="4" label="Have SSO account, Successful"/>
   <int value="5" label="Have SSO account, Gave Up"/>
   <int value="6" label="Could not create FirstRun Sentinel - deprecated"/>
+  <int value="7" label="Skipped by policy"/>
 </enum>
 
 <enum name="FirstUserActionType">
@@ -32310,6 +33773,10 @@ Called by update_feature_policy_enum.py.-->
 </enum>
 
 <enum name="FramePrioritiesSeen">
+  <obsolete>
+    Obsoleted on 2021-01-22 as corresponding experiment code was removed and the
+    experiment wrapped up.
+  </obsolete>
   <int value="0" label="No frames seen."/>
   <int value="1" label="Low and normal priority frames seen."/>
   <int value="2" label="Only low priority frames seen."/>
@@ -32405,6 +33872,12 @@ Called by update_feature_policy_enum.py.-->
   <int value="2" label="Failed / credentials rejected"/>
 </enum>
 
+<enum name="FulfillTrustTokenIssuanceAnswerStatus">
+  <int value="0" label="Ok"/>
+  <int value="1" label="NotFound"/>
+  <int value="2" label="UnknownError"/>
+</enum>
+
 <enum name="FuseZipError">
   <int value="0" label="Success">Hardcoded in fuse-zip</int>
   <int value="11" label="Multipart ZIP">
@@ -32446,6 +33919,7 @@ Called by update_feature_policy_enum.py.-->
   <int value="0" label="Gaia cookie is present"/>
   <int value="1" label="Gaia cookie is missing from Google-associated domain"/>
   <int value="2" label="Gaia cookie is missing from Add Session"/>
+  <int value="3" label="Gaia cookie is restored, Infobar shown"/>
 </enum>
 
 <enum name="GaiaPasswordChangedScreenUserAction">
@@ -34463,6 +35937,7 @@ Called by update_feature_policy_enum.py.-->
 
 <enum name="GenericEnum">
   <summary>Generic enums where the label is just the raw number</summary>
+  <int value="0" label="Enum placerholder. See crbug/1179826"/>
 </enum>
 
 <enum name="GeolocationAuthorizationAction">
@@ -34629,16 +36104,16 @@ Called by update_feature_policy_enum.py.-->
   <int value="0" label="Success"/>
   <int value="1" label="kInvalidClientId"/>
   <int value="2" label="kEmptyScopes"/>
-  <int value="3" label="kOAuth2InvalidScopes"/>
-  <int value="4" label="kGaiaFlowAuthFailure"/>
+  <int value="3" label="kOAuth2InvalidScopes (deprecated 02/2021)"/>
+  <int value="4" label="kGaiaFlowAuthFailure (deprecated 02/2021)"/>
   <int value="5" label="kMintTokenAuthFailure"/>
   <int value="6" label="kGetAccessTokenAuthFailure"/>
-  <int value="7" label="kOAuth2Failure"/>
+  <int value="7" label="kOAuth2Failure (deprecated 02/2021)"/>
   <int value="8" label="kNoGrant"/>
   <int value="9" label="kInteractionRequired"/>
   <int value="10" label="kInteractionAlreadyRunning"/>
-  <int value="11" label="kOAuth2AccessDenied"/>
-  <int value="12" label="kGaiaFlowRejected"/>
+  <int value="11" label="kOAuth2AccessDenied (deprecated 02/2021)"/>
+  <int value="12" label="kGaiaFlowRejected (deprecated 02/2021)"/>
   <int value="13" label="kRemoteConsentFlowRejected"/>
   <int value="14" label="kUserNotSignedIn"/>
   <int value="15" label="kNotAllowlistedInPublicSession"/>
@@ -34647,9 +36122,9 @@ Called by update_feature_policy_enum.py.-->
   <int value="18" label="kUserNonPrimary"/>
   <int value="19" label="kRemoteConsentUserNonPrimary"/>
   <int value="20" label="kBrowserSigninNotAllowed"/>
-  <int value="21" label="kInvalidRedirect"/>
+  <int value="21" label="kInvalidRedirect (deprecated 02/2021)"/>
   <int value="22" label="kOffTheRecord"/>
-  <int value="23" label="kPageLoadFailure"/>
+  <int value="23" label="kPageLoadFailure (deprecated 02/2021)"/>
   <int value="24" label="kRemoteConsentPageLoadFailure"/>
   <int value="25" label="kSetAccountsInCookieFailure"/>
   <int value="26" label="kInvalidConsentResult"/>
@@ -34657,9 +36132,29 @@ Called by update_feature_policy_enum.py.-->
 </enum>
 
 <enum name="GetChangePasswordUrlMetric">
-  <int value="0" label="Gstatic file was not fetched yet"/>
+  <int value="0" label="Url override was not fetched yet"/>
   <int value="1" label="Url override was available and used"/>
   <int value="2" label="No url override was available"/>
+  <int value="3" label="Url override was available in the FacetGroup and used"/>
+</enum>
+
+<enum name="GetCurrentBrowsingContextMediaExplicitSelectionUserInteraction">
+  <int value="0" label="kDialogDismissed"/>
+  <int value="1" label="kUserCancelled"/>
+  <int value="2" label="kUserSelectedScreen"/>
+  <int value="3" label="kUserSelectedWindow"/>
+  <int value="4" label="kUserSelectedOtherTab"/>
+  <int value="5" label="kUserSelectedThisTabAsGenericTab"/>
+  <int value="6" label="kUserSelectedThisTab"/>
+</enum>
+
+<enum name="GetDisplayMediaUserInteraction">
+  <int value="0" label="kDialogDismissed"/>
+  <int value="1" label="kUserCancelled"/>
+  <int value="2" label="kUserSelectedScreen"/>
+  <int value="3" label="kUserSelectedWindow"/>
+  <int value="4" label="kUserSelectedOtherTab"/>
+  <int value="5" label="kUserSelectedThisTab"/>
 </enum>
 
 <enum name="GetEncryptionKeyAction">
@@ -34983,147 +36478,147 @@ Called by update_feature_policy_enum.py.-->
   <int value="2" label="Disabled Force"/>
 </enum>
 
-<enum name="GPUBlacklistFeatureTestResults">
+<enum name="GPUBlocklistFeatureTestResults">
   <summary>
-    Results of testing against a GPU feature being allowed/blacklisted/disabled.
+    Results of testing against a GPU feature being allowed/blocklisted/disabled.
   </summary>
   <int value="0" label="Allowed"/>
-  <int value="1" label="Blacklisted"/>
+  <int value="1" label="Blocklisted"/>
   <int value="2" label="User-disabled"/>
 </enum>
 
-<enum name="GPUBlacklistFeatureTestResultsWin">
+<enum name="GPUBlocklistFeatureTestResultsWin">
   <summary>
-    Results of testing against a GPU feature being blacklisted or not in various
+    Results of testing against a GPU feature being blocklisted or not in various
     Windows sub-versions.
   </summary>
   <int value="0" label="Allowed Others"/>
-  <int value="1" label="Blacklisted Others"/>
+  <int value="1" label="Blocklisted Others"/>
   <int value="2" label="Allowed XP"/>
-  <int value="3" label="Blacklisted XP"/>
+  <int value="3" label="Blocklisted XP"/>
   <int value="4" label="Allowed Vista"/>
-  <int value="5" label="Blacklisted Vista"/>
+  <int value="5" label="Blocklisted Vista"/>
   <int value="6" label="Allowed Win7"/>
-  <int value="7" label="Blacklisted Win7"/>
+  <int value="7" label="Blocklisted Win7"/>
 </enum>
 
-<enum name="GPUBlacklistFeatureTestResultsWindows">
+<enum name="GPUBlocklistFeatureTestResultsWindows">
   <obsolete>
-    Replaced by GPUBlacklistFeatureTestResultsWindows2 in M67.
+    Replaced by GPUBlocklistFeatureTestResultsWindows2 in M67.
   </obsolete>
   <summary>
-    Results of testing against a GPU feature being allowed/blacklisted/disabled
+    Results of testing against a GPU feature being allowed/blocklisted/disabled
     in various Windows sub-versions.
   </summary>
   <int value="0" label="Allowed Others"/>
-  <int value="1" label="Blacklisted Others"/>
+  <int value="1" label="Blocklisted Others"/>
   <int value="2" label="User-disabled Others"/>
   <int value="3" label="Allowed XP"/>
-  <int value="4" label="Blacklisted XP"/>
+  <int value="4" label="Blocklisted XP"/>
   <int value="5" label="User-disabled XP"/>
   <int value="6" label="Allowed Vista"/>
-  <int value="7" label="Blacklisted Vista"/>
+  <int value="7" label="Blocklisted Vista"/>
   <int value="8" label="User-disabled Vista"/>
   <int value="9" label="Allowed Win7"/>
-  <int value="10" label="Blacklisted Win7"/>
+  <int value="10" label="Blocklisted Win7"/>
   <int value="11" label="User-disabled Win7"/>
   <int value="12" label="Allowed Win8"/>
-  <int value="13" label="Blacklisted Win8"/>
+  <int value="13" label="Blocklisted Win8"/>
   <int value="14" label="User-disabled Win8"/>
 </enum>
 
-<enum name="GPUBlacklistFeatureTestResultsWindows2">
+<enum name="GPUBlocklistFeatureTestResultsWindows2">
   <obsolete>
     Removed in Oct 2020.
   </obsolete>
   <summary>
-    Results of testing against a GPU feature being allowed, blacklisted,
+    Results of testing against a GPU feature being allowed, blocklisted,
     disabled, fallback to software, or undefined in various Windows
     sub-versions.
   </summary>
   <int value="0" label="Enabled PRE_XP"/>
-  <int value="1" label="Blacklisted PRE_XP"/>
+  <int value="1" label="Blocklisted PRE_XP"/>
   <int value="2" label="User Disabled PRE_XP"/>
   <int value="3" label="Fallback to Software PRE_XP"/>
   <int value="4" label="Status Unknown PRE_XP"/>
   <int value="5" label="Enabled XP"/>
-  <int value="6" label="Blacklisted XP"/>
+  <int value="6" label="Blocklisted XP"/>
   <int value="7" label="User Disabled XP"/>
   <int value="8" label="Fallback to Software XP"/>
   <int value="9" label="Status Unknown XP"/>
   <int value="10" label="Enabled SERVER_2003"/>
-  <int value="11" label="Blacklisted SERVER_2003"/>
+  <int value="11" label="Blocklisted SERVER_2003"/>
   <int value="12" label="User Disabled SERVER_2003"/>
   <int value="13" label="Fallback to Software SERVER_2003"/>
   <int value="14" label="Status Unknown SERVER_2003"/>
   <int value="15" label="Enabled VISTA"/>
-  <int value="16" label="Blacklisted VISTA"/>
+  <int value="16" label="Blocklisted VISTA"/>
   <int value="17" label="User Disabled VISTA"/>
   <int value="18" label="Fallback to Software VISTA"/>
   <int value="19" label="Status Unknown VISTA"/>
   <int value="20" label="Enabled WIN7"/>
-  <int value="21" label="Blacklisted WIN7"/>
+  <int value="21" label="Blocklisted WIN7"/>
   <int value="22" label="User Disabled WIN7"/>
   <int value="23" label="Fallback to Software WIN7"/>
   <int value="24" label="Status Unknown WIN7"/>
   <int value="25" label="Enabled WIN8"/>
-  <int value="26" label="Blacklisted WIN8"/>
+  <int value="26" label="Blocklisted WIN8"/>
   <int value="27" label="User Disabled WIN8"/>
   <int value="28" label="Fallback to Software WIN8"/>
   <int value="29" label="Status Unknown WIN8"/>
   <int value="30" label="Enabled WIN8_1"/>
-  <int value="31" label="Blacklisted WIN8_1"/>
+  <int value="31" label="Blocklisted WIN8_1"/>
   <int value="32" label="User Disabled WIN8_1"/>
   <int value="33" label="Fallback to Software WIN8_1"/>
   <int value="34" label="Status Unknown WIN8_1"/>
   <int value="35" label="Enabled WIN10"/>
-  <int value="36" label="Blacklisted WIN10"/>
+  <int value="36" label="Blocklisted WIN10"/>
   <int value="37" label="User Disabled WIN10"/>
   <int value="38" label="Fallback to Software WIN10"/>
   <int value="39" label="Status Unknown WIN10"/>
   <int value="40" label="Enabled WIN10_TH2"/>
-  <int value="41" label="Blacklisted WIN10_TH2"/>
+  <int value="41" label="Blocklisted WIN10_TH2"/>
   <int value="42" label="User Disabled WIN10_TH2"/>
   <int value="43" label="Fallback to Software WIN10_TH2"/>
   <int value="44" label="Status Unknown WIN10_TH2"/>
   <int value="45" label="Enabled WIN10_RS1"/>
-  <int value="46" label="Blacklisted WIN10_RS1"/>
+  <int value="46" label="Blocklisted WIN10_RS1"/>
   <int value="47" label="User Disabled WIN10_RS1"/>
   <int value="48" label="Fallback to Software WIN10_RS1"/>
   <int value="49" label="Status Unknown WIN10_RS1"/>
   <int value="50" label="Enabled WIN10_RS2"/>
-  <int value="51" label="Blacklisted WIN10_RS2"/>
+  <int value="51" label="Blocklisted WIN10_RS2"/>
   <int value="52" label="User Disabled WIN10_RS2"/>
   <int value="53" label="Fallback to Software WIN10_RS2"/>
   <int value="54" label="Status Unknown WIN10_RS2"/>
   <int value="55" label="Enabled WIN10_RS3"/>
-  <int value="56" label="Blacklisted WIN10_RS3"/>
+  <int value="56" label="Blocklisted WIN10_RS3"/>
   <int value="57" label="User Disabled WIN10_RS3"/>
   <int value="58" label="Fallback to Software WIN10_RS3"/>
   <int value="59" label="Status Unknown WIN10_RS3"/>
   <int value="60" label="Enabled WIN10_RS4"/>
-  <int value="61" label="Blacklisted WIN10_RS4"/>
+  <int value="61" label="Blocklisted WIN10_RS4"/>
   <int value="62" label="User Disabled WIN10_RS4"/>
   <int value="63" label="Fallback to Software WIN10_RS4"/>
   <int value="64" label="Status Unknown WIN10_RS4"/>
   <int value="65" label="Enabled WIN10_RS5"/>
-  <int value="66" label="Blacklisted WIN10_RS5"/>
+  <int value="66" label="Blocklisted WIN10_RS5"/>
   <int value="67" label="User Disabled WIN10_RS5"/>
   <int value="68" label="Fallback to Software WIN10_RS5"/>
   <int value="69" label="Status Unknown WIN10_RS5"/>
   <int value="70" label="Enabled WIN10_19H1"/>
-  <int value="71" label="Blacklisted WIN10_19H1"/>
+  <int value="71" label="Blocklisted WIN10_19H1"/>
   <int value="72" label="User Disabled WIN10_19H1"/>
   <int value="73" label="Fallback to Software WIN10_19H1"/>
   <int value="74" label="Status Unknown WIN10_19H1"/>
   <int value="75" label="Enabled WIN10_20H1"/>
-  <int value="76" label="Blacklisted WIN10_20H1"/>
+  <int value="76" label="Blocklisted WIN10_20H1"/>
   <int value="77" label="User Disabled WIN10_20H1"/>
   <int value="78" label="Fallback to Software WIN10_20H1"/>
   <int value="79" label="Status Unknown WIN10_20H1"/>
 </enum>
 
-<enum name="GPUBlacklistTestResultPerEntry">
+<enum name="GPUBlocklistTestResultPerEntry">
   <summary>Results of testing against the GPU blacklist entries.</summary>
   <int value="0" label="TotalCount"/>
   <int value="1" label="Mac/ATI/Radeon X1900"/>
@@ -35853,8 +37348,8 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="1" label="Kill"/>
   <int value="2" label="MoreThreadTime"/>
   <int value="3" label="ProgressAfterMoreThreadTime"/>
-  <int value="4" label="TimeoutWait"/>
-  <int value="5" label="ProgressAfterWait"/>
+  <int value="4" label="TimeoutWait (deprecated)"/>
+  <int value="5" label="ProgressAfterWait (deprecated)"/>
   <int value="6" label="ContinueOnNonHostServerTty"/>
   <int value="7" label="LessThanFullThreadTimeAfterCapped"/>
   <int value="8" label="KillOnLessThreadTime"/>
@@ -36390,6 +37885,9 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
 </enum>
 
 <enum name="HistoryUrlType">
+  <obsolete>
+    Removed Jan 2021 as the only user has expired
+  </obsolete>
   <int value="0" label="Empty"/>
   <int value="1" label="Same as baseUrl"/>
   <int value="2" label="Different from baseUrl"/>
@@ -36399,6 +37897,10 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="0" label="kClick"/>
 </enum>
 
+<enum name="HoldingSpaceFilesAppChipAction">
+  <int value="0" label="kClick"/>
+</enum>
+
 <enum name="HoldingSpaceItemAction">
   <int value="0" label="kCopy"/>
   <int value="1" label="kDrag"/>
@@ -36406,6 +37908,7 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="3" label="kPin"/>
   <int value="4" label="kShowInFolder"/>
   <int value="5" label="kUnpin"/>
+  <int value="6" label="kRemove"/>
 </enum>
 
 <enum name="HoldingSpaceItemType">
@@ -36418,11 +37921,14 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
 
 <enum name="HoldingSpacePodAction">
   <int value="0" label="kClick (Deprecated)"/>
-  <int value="1" label="kShow"/>
-  <int value="2" label="kClose"/>
+  <int value="1" label="kShowBubble"/>
+  <int value="2" label="kCloseBubble"/>
   <int value="3" label="kShowContextMenu"/>
   <int value="4" label="kShowPreviews"/>
   <int value="5" label="kHidePreviews"/>
+  <int value="6" label="kShowPod"/>
+  <int value="7" label="kHidePod"/>
+  <int value="8" label="kDragAndDropToPin"/>
 </enum>
 
 <enum name="HomeButtonPreferenceStateType">
@@ -37446,6 +38952,21 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="12" label="Load image metadata"/>
 </enum>
 
+<enum name="ImageSelectionOutcome">
+  <int value="0" label="Image node was the topmost node."/>
+  <int value="1" label="Image node was below topmost node"/>
+  <int value="2" label="Blocking opaque node was found"/>
+  <int value="3" label="Context menu listener was found"/>
+  <int value="4" label="Blocking cross frame node was found"/>
+</enum>
+
+<enum name="ImageSmoothingQuality">
+  <int value="0" label="Image smoothing quality sets to None"/>
+  <int value="1" label="Image smoothing quality sets to Low"/>
+  <int value="2" label="Image smoothing quality sets to Medium"/>
+  <int value="3" label="Image smoothing quality sets to High"/>
+</enum>
+
 <enum name="IMEAssistiveAction">
   <int value="0" label="GENERIC_ACTION"/>
   <int value="1" label="PERSONAL_EMAIL"/>
@@ -37457,6 +38978,9 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="7" label="PERSONAL_NUMBER"/>
   <int value="8" label="PERSONAL_FIRST_NAME"/>
   <int value="9" label="PERSONAL_LAST_NAME"/>
+  <int value="10" label="AUTOCORRECT_SHOWN"/>
+  <int value="11" label="AUTOCORRECT_UNDERLINED"/>
+  <int value="12" label="AUTOCORRECT_REVERTED"/>
 </enum>
 
 <enum name="IMEAssistiveDisabledReason">
@@ -37471,6 +38995,7 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="0" label="WINDOW_SHOWN"/>
   <int value="1" label="UNDERLINED"/>
   <int value="2" label="REVERTED"/>
+  <int value="3" label="USER_ACCEPTED_AUTOCORRECT"/>
 </enum>
 
 <enum name="IMECommitType">
@@ -37650,6 +39175,13 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="7" label="SuspiciousModule"/>
 </enum>
 
+<enum name="IncognitoCCTCallerId">
+  <int value="0" label="Other Apps"/>
+  <int value="1" label="Google Apps"/>
+  <int value="2" label="Chrome - Other features"/>
+  <int value="3" label="Chrome - Reader mode"/>
+</enum>
+
 <enum name="Inconsistencies">
   <int value="1" label="RangeChecksum"/>
   <int value="2" label="BucketOrder"/>
@@ -37690,7 +39222,7 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
 </enum>
 
 <enum name="InfoBarIdentifier">
-  <int value="1" label="APP_BANNER_INFOBAR_DELEGATE"/>
+  <int value="1" label="APP_BANNER_INFOBAR_DELEGATE (Obsolete)"/>
   <int value="2" label="APP_BANNER_INFOBAR_DELEGATE_DESKTOP (Obsolete)"/>
   <int value="3"
       label="ANDROID_DOWNLOAD_MANAGER_OVERWRITE_INFOBAR_DELEGATE (Obsolete)"/>
@@ -37761,7 +39293,8 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="65" label="AUTOFILL_CC_ASSIST_INFOBAR_DELEGATE"/>
   <int value="66" label="ADS_BLOCKED_INFOBAR_DELEGATE_ANDROID"/>
   <int value="67" label="INSTANT_APPS_INFOBAR_DELEGATE_ANDROID"/>
-  <int value="68" label="DATA_REDUCTION_PROXY_PREVIEW_INFOBAR_DELEGATE"/>
+  <int value="68"
+      label="DATA_REDUCTION_PROXY_PREVIEW_INFOBAR_DELEGATE (Obsolete)"/>
   <int value="69" label="SCREEN_CAPTURE_INFOBAR_DELEGATE_ANDROID"/>
   <int value="70" label="GROUPED_PERMISSION_INFOBAR_DELEGATE_ANDROID"/>
   <int value="71" label="OFFLINE_PAGE_INFOBAR_DELEGATE_ANDROID"/>
@@ -37775,11 +39308,12 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="78" label="SURVEY_INFOBAR_ANDROID"/>
   <int value="79" label="NEAR_OOM_INFOBAR_ANDROID"/>
   <int value="80" label="INSTALLABLE_AMBIENT_BADGE_INFOBAR_DELEGATE"/>
-  <int value="81" label="PAGE_LOAD_CAPPING_INFOBAR_DELEGATE"/>
+  <int value="81" label="PAGE_LOAD_CAPPING_INFOBAR_DELEGATE (Obsolete)"/>
   <int value="82" label="DOWNLOAD_PROGRESS_INFOBAR_ANDROID"/>
   <int value="83" label="AR_CORE_UPGRADE_ANDROID"/>
   <int value="84" label="BLOATED_RENDERER_INFOBAR_DELEGATE"/>
-  <int value="85" label="SUPERVISED_USERS_DEPRECATED_INFOBAR_DELEGATE"/>
+  <int value="85"
+      label="SUPERVISED_USERS_DEPRECATED_INFOBAR_DELEGATE (Obsolete)"/>
   <int value="86" label="NEAR_OOM_REDUCTION_INFOBAR_ANDROID"/>
   <int value="87" label="LITE_PAGE_PREVIEWS_INFOBAR"/>
   <int value="88" label="MODULE_INSTALL_FAILURE_INFOBAR_ANDROID"/>
@@ -37795,9 +39329,11 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="98" label="MIXED_CONTENT_DOWNLOAD_INFOBAR_DELEGATE_ANDROID"/>
   <int value="99" label="CONDITIONAL_TAB_STRIP_INFOBAR_ANDROID"/>
   <int value="100" label="LITE_MODE_HTTPS_IMAGE_COMPRESSION_INFOBAR_ANDROID"/>
-  <int value="101" label="SYSTEM_INFOBAR_DELEGATE_MAC"/>
+  <int value="101" label="SYSTEM_INFOBAR_DELEGATE_MAC (Obsolete)"/>
   <int value="102" label="EXPERIMENTAL_INFOBAR_DELEGATE_LACROS"/>
   <int value="103" label="ROSETTA_REQUIRED_INFOBAR_DELEGATE"/>
+  <int value="104" label="WEBID_PERMISSION_INFOBAR_DELEGATE"/>
+  <int value="105" label="AUTOFILL_OFFER_NOTIFICATION_INFOBAR_DELEGATE"/>
 </enum>
 
 <enum name="InfoBarResponse">
@@ -37876,6 +39412,13 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="9" label="Canceled"/>
 </enum>
 
+<enum name="InputEventTypeForResponsivenessMetric">
+  <int value="0" label="mousedown"/>
+  <int value="1" label="click"/>
+  <int value="2" label="keydown"/>
+  <int value="3" label="pointerup"/>
+</enum>
+
 <enum name="InputMethodCategory">
   <int value="0" label="Unkown"/>
   <int value="1" label="XKB">XKeyboard</int>
@@ -37902,549 +39445,174 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
 </enum>
 
 <enum name="InputMethodID">
-  <int value="109700" label="xkb:am:phonetic:arm">
-    Armenian Phonetic keyboard
-  </int>
-  <int value="109800" label="xkb:be::fra">Belgian keyboard</int>
-  <int value="109801" label="xkb:be::ger">Belgian keyboard</int>
-  <int value="109802" label="xkb:be::nld">Belgian keyboard</int>
-  <int value="109803" label="xkb:bg::bul">Bulgarian keyboard</int>
-  <int value="109804" label="xkb:bg:phonetic:bul">
-    Bulgarian Phonetic keyboard
-  </int>
-  <int value="109805" label="xkb:br::por">Brazilian keyboard</int>
-  <int value="109806" label="xkb:by::bel">Belarusian keyboard</int>
-  <int value="109900" label="xkb:ca::fra">Canadian French keyboard</int>
-  <int value="109901" label="xkb:ca:eng:eng">Canadian English keyboard</int>
-  <int value="109902" label="xkb:ca:multix:fra">
-    Canadian Multilingual keyboard
-  </int>
-  <int value="109903" label="xkb:ch::ger">Swiss keyboard</int>
-  <int value="109904" label="xkb:ch:fr:fra">Swiss French keyboard</int>
-  <int value="109905" label="xkb:cz::cze">Czech keyboard</int>
-  <int value="109906" label="xkb:cz:qwerty:cze">Czech QWERTY keyboard</int>
-  <int value="110000" label="xkb:de::ger">German keyboard</int>
-  <int value="110001" label="xkb:de:neo:ger">German NEO 2 keyboard</int>
-  <int value="110002" label="xkb:dk::dan">Danish keyboard</int>
-  <int value="110100" label="xkb:ee::est">Estonian keyboard</int>
-  <int value="110101" label="xkb:es::spa">Spanish keyboard</int>
-  <int value="110102" label="xkb:es:cat:cat">Catalan keyboard</int>
-  <int value="110200" label="xkb:fi::fin">Finnish keyboard</int>
-  <int value="110201" label="xkb:fr::fra">French keyboard</int>
-  <int value="110300" label="xkb:gb:dvorak:eng">UK Dvorak keyboard</int>
-  <int value="110301" label="xkb:gb:extd:eng">UK keyboard</int>
-  <int value="110302" label="xkb:ge::geo">Georgian keyboard</int>
-  <int value="110303" label="xkb:gr::gre">Greek keyboard</int>
-  <int value="110400" label="xkb:hr::scr">Croatian keyboard</int>
-  <int value="110401" label="xkb:hu::hun">Hungarian keyboard</int>
-  <int value="110500" label="xkb:ie::ga">Irish keyboard</int>
-  <int value="110501" label="xkb:il::heb">Hebrew keyboard</int>
-  <int value="110502" label="xkb:is::ice">Icelandic keyboard</int>
-  <int value="110503" label="xkb:it::ita">Italian keyboard</int>
-  <int value="110600" label="xkb:jp::jpn">Japanese keyboard</int>
-  <int value="110800" label="xkb:latam::spa">Latin American keyboard</int>
-  <int value="110801" label="xkb:lt::lit">Lithuanian keyboard</int>
-  <int value="110802" label="xkb:lv:apostrophe:lav">Latvian keyboard</int>
-  <int value="110900" label="xkb:mn::mon">Mongolian keyboard</int>
-  <int value="111000" label="xkb:no::nob">Norwegian keyboard</int>
-  <int value="111200" label="xkb:pl::pol">Polish keyboard</int>
-  <int value="111201" label="xkb:pt::por">Portuguese keyboard</int>
-  <int value="111400" label="xkb:ro::rum">Romanian keyboard</int>
-  <int value="111401" label="xkb:ro:std:rum">Romanian Standard keyboard</int>
-  <int value="111402" label="xkb:rs::srp">Serbian keyboard</int>
-  <int value="111403" label="xkb:ru::rus">Russian keyboard</int>
-  <int value="111404" label="xkb:ru:phonetic:rus">
-    Russian Phonetic keyboard
-  </int>
-  <int value="111500" label="xkb:se::swe">Swedish keyboard</int>
-  <int value="111501" label="xkb:si::slv">Slovenian keyboard</int>
-  <int value="111502" label="xkb:sk::slo">Slovakian keyboard</int>
-  <int value="111600" label="xkb:tr::tur">Turkish keyboard</int>
-  <int value="111700" label="xkb:ua::ukr">Ukrainian keyboard</int>
-  <int value="111701" label="xkb:us::eng">US keyboard</int>
-  <int value="111702" label="xkb:us::fil">US keyboard</int>
-  <int value="111703" label="xkb:us::ind">US keyboard</int>
-  <int value="111704" label="xkb:us::msa">US keyboard</int>
-  <int value="111705" label="xkb:us:altgr-intl:eng">US Extended keyboard</int>
-  <int value="111706" label="xkb:us:colemak:eng">US Colemak keyboard</int>
-  <int value="111707" label="xkb:us:dvorak:eng">US Dvorak keyboard</int>
-  <int value="111708" label="xkb:us:intl:eng">US International keyboard</int>
-  <int value="111709" label="xkb:us:intl:nld">US International keyboard</int>
-  <int value="111710" label="xkb:us:intl:por">US International keyboard</int>
-  <int value="209700" label="zh-hant-t-i0-array-1992">Array input method</int>
-  <int value="209900" label="zh-hant-t-i0-cangjie-1987">
-    Cangjie input method
-  </int>
-  <int value="209901" label="zh-hant-t-i0-cangjie-1987-x-m0-simplified">
-    Quick input method
-  </int>
-  <int value="210000" label="zh-hant-t-i0-dayi-1988">Dayi input method</int>
-  <int value="211200" label="zh-hant-t-i0-pinyin">
-    Traditional Pinyin input method
-  </int>
-  <int value="211201" label="zh-t-i0-pinyin">Pinyin input method</int>
-  <int value="211700" label="zh-hant-t-i0-und">Zhuyin input method</int>
-  <int value="211900" label="zh-t-i0-wubi-1986">Wubi input method</int>
-  <int value="310600" label="nacl_mozc_jp">
-    Google Japanese Input (for Japanese keyboard)
-  </int>
-  <int value="311700" label="nacl_mozc_us">
-    Google Japanese Input (for US keyboard)
-  </int>
-  <int value="405000" label="hangul_2set">Hangul 2 Set</int>
-  <int value="405100" label="hangul_3set390">Hangul 3 Set (390)</int>
-  <int value="405101" label="hangul_3setfinal">Hangul 3 Set (Final)</int>
-  <int value="405102" label="hangul_3setnoshift">Hangul 3 Set (No Shift)</int>
-  <int value="409700" label="hangul_ahnmatae">Hangul Ahnmatae</int>
-  <int value="411400" label="hangul_romaja">Hangul Romaja</int>
-  <int value="509700" label="vkd_ar">Arabic keyboard</int>
-  <int value="509800" label="vkd_bn_phone">Bengali keyboard (Phonetic)</int>
-  <int value="509900" label="vkd_ckb_ar">
-    Sorani Kurdish Arabic-based keyboard
-  </int>
-  <int value="509901" label="vkd_ckb_en">
-    Sorani Kurdish English-based keyboard
-  </int>
-  <int value="510000" label="vkd_deva_phone">
-    Devanagari keyboard (Phonetic)
-  </int>
-  <int value="510100" label="vkd_ethi">Ethiopic keyboard</int>
-  <int value="510200" label="vkd_fa">Persian keyboard</int>
-  <int value="510300" label="vkd_gu_phone">Gujarati keyboard (Phonetic)</int>
-  <int value="510700" label="vkd_km">Khmer keyboard</int>
-  <int value="510701" label="vkd_kn_phone">Kannada keyboard (Phonetic)</int>
-  <int value="510800" label="vkd_lo">Lao keyboard</int>
-  <int value="510900" label="vkd_ml_phone">Malayalam keyboard (Phonetic)</int>
-  <int value="510901" label="vkd_my">Myanmar keyboard</int>
-  <int value="510902" label="vkd_my_myansan">Myanmar Myansan keyboard</int>
-  <int value="511000" label="vkd_ne_inscript">Nepali keyboard (InScript)</int>
-  <int value="511001" label="vkd_ne_phone">Nepali keyboard (Phonetic)</int>
-  <int value="511500" label="vkd_si">Sinhala keyboard</int>
-  <int value="511600" label="vkd_ta_inscript">Tamil keyboard (InScript)</int>
-  <int value="511601" label="vkd_ta_itrans">Tamil keyboard (itrans)</int>
-  <int value="511602" label="vkd_ta_phone">Tamil keyboard (Phonetic)</int>
-  <int value="511603" label="vkd_ta_tamil99">Tamil keyboard (Tamil99)</int>
-  <int value="511604" label="vkd_ta_typewriter">
-    Tamil keyboard (Typewriter)
-  </int>
-  <int value="511605" label="vkd_te_phone">Telugu keyboard (Phonetic)</int>
-  <int value="511606" label="vkd_th">Thai keyboard (Kedmanee)</int>
-  <int value="511607" label="vkd_th_pattajoti">Thai keyboard (Pattachote)</int>
-  <int value="511608" label="vkd_th_tis">Thai keyboard (TIS 820-2531)</int>
-  <int value="511800" label="vkd_vi_tcvn">Vietnamese keyboard (TCVN)</int>
-  <int value="511801" label="vkd_vi_telex">Vietnamese keyboard (Telex)</int>
-  <int value="511802" label="vkd_vi_viqr">Vietnamese keyboard (VIQR)</int>
-  <int value="511803" label="vkd_vi_vni">Vietnamese keyboard (VNI)</int>
-  <int value="609700" label="am-t-i0-und">Transliteration Amharic</int>
-  <int value="609701" label="ar-t-i0-und">Transliteration Arabic</int>
-  <int value="609800" label="bn-t-i0-und">Transliteration Bengali</int>
-  <int value="609801" label="braille">Braille Keyboard</int>
-  <int value="610100" label="el-t-i0-und">Transliteration Greek</int>
-  <int value="610200" label="fa-t-i0-und">Transliteration Persian</int>
-  <int value="610300" label="gu-t-i0-und">Transliteration Gujarati</int>
-  <int value="610400" label="he-t-i0-und">Transliteration Hebrew</int>
-  <int value="610401" label="hi-t-i0-und">Transliteration Hindi</int>
-  <int value="610700" label="kn-t-i0-und">Transliteration Kannada</int>
-  <int value="610900" label="ml-t-i0-und">Transliteration Malayalam</int>
-  <int value="610901" label="mr-t-i0-und">Transliteration Marathi</int>
-  <int value="611000" label="ne-t-i0-und">Transliteration Nepali</int>
-  <int value="611100" label="or-t-i0-und">Transliteration Oriya</int>
-  <int value="611200" label="pa-t-i0-und">Transliteration Punjabi</int>
-  <int value="611500" label="sa-t-i0-und">Transliteration Sanskrit</int>
-  <int value="611501" label="sr-t-i0-und">Transliteration Serbian</int>
-  <int value="611600" label="ta-t-i0-und">Transliteration Tamil</int>
-  <int value="611601" label="te-t-i0-und">Transliteration Telugu</int>
-  <int value="611602" label="ti-t-i0-und">Transliteration Tigrinya</int>
-  <int value="611700" label="ur-t-i0-und">Transliteration Urdu</int>
+  <obsolete>
+    Only applicable to InputMethod.ID histogram that was deprecated at M46.
+  </obsolete>
 </enum>
 
 <enum name="InputMethodID2">
-  <int value="-2082426075" label="xkb:cz:qwerty:cze">Czech QWERTY keyboard</int>
-  <int value="-2039513744" label="xkb:ru::rus">Russian keyboard</int>
-  <int value="-2030885731" label="vkd_fa">Persian keyboard</int>
-  <int value="-2004968165" label="xkb:gb:dvorak:eng">UK Dvorak keyboard</int>
-  <int value="-2004834194" label="xkb:ca:multix:fra">
-    Canadian Multilingual keyboard
-  </int>
-  <int value="-1992142310" label="xkb:dk::dan">Danish keyboard</int>
-  <int value="-1989523479" label="pa-t-i0-und">Punjabi transliteration</int>
-  <int value="-1972379678" label="vkd_deva_phone_old">
-    Devanagari keyboard (Phonetic) (obsolete)
-  </int>
-  <int value="-1957398030" label="ta-t-i0-und_old">
-    Tamil transliteration (obsolete)
-  </int>
-  <int value="-1955862460" label="xkb:ro::rum">Romanian keyboard</int>
-  <int value="-1953637256" label="xkb:us:workman-intl:eng">
-    US Workman International Keyboard
-  </int>
-  <int value="-1951732875" label="xkb:be::nld">Belgian keyboard</int>
-  <int value="-1931838225"
-      label="zh-hant-t-i0-cangjie-1987-x-m0-simplified_old">
-    Quick input method (obsolete)
-  </int>
-  <int value="-1899483055" label="vkd_my_old">Myanmar keyboard (obsolete)</int>
-  <int value="-1856842164" label="xkb:ge::geo">Georgian keyboard</int>
-  <int value="-1856063724" label="vkd_km_old">Khmer keyboard (obsolete)</int>
-  <int value="-1793755122" label="zh-hant-t-i0-cangjie-1987-x-m0-simplified">
-    Quick input method
-  </int>
-  <int value="-1749961581" label="vkd_ta_inscript_old">
-    Tamil keyboard (InScript) (obsolete)
-  </int>
-  <int value="-1710145174" label="xkb:am:phonetic:arm">
-    Armenian Phonetic keyboard
-  </int>
-  <int value="-1709647399" label="xkb:mn::mon">Mongolian keyboard</int>
-  <int value="-1668610460" label="xkb:us:dvp:eng">
-    US Programmer Dvorak keyboard
-  </int>
-  <int value="-1667829653" label="zh-hant-t-i0-cangjie-1987_old">
-    Cangjie input method (obsolete)
-  </int>
-  <int value="-1622129313" label="sr-t-i0-und">Serbian transliteration</int>
-  <int value="-1616253108" label="ta-t-i0-und">Tamil transliteration</int>
-  <int value="-1608984043" label="vkd_my_myansan">Myanmar Myansan keyboard</int>
-  <int value="-1591721678" label="vkd_ne_inscript_old">
-    Nepali keyboard (InScript) (obsolete)
-  </int>
-  <int value="-1520893793" label="vkd_te_phone">Telugu keyboard (Phonetic)</int>
-  <int value="-1474243589" label="xkb:it::ita">Italian keyboard</int>
-  <int value="-1466408010" label="hi-t-i0-und">Hindi transliteration</int>
-  <int value="-1408581676" label="xkb:gb:extd:eng">UK keyboard</int>
-  <int value="-1402880636" label="xkb:se::swe">Swedish keyboard</int>
-  <int value="-1396156987" label="vkd_ru_phone_aatseel_old">
-    Russian Phonetic (AATSEEL) keyboard (obsolete)
-  </int>
-  <int value="-1386518472" label="vkd_ru_phone_aatseel">
-    Russian Phonetic (AATSEEL) keyboard
-  </int>
-  <int value="-1362493117" label="zh-hant-t-i0-dayi-1988">
-    Dayi input method
-  </int>
-  <int value="-1356599825" label="bn-t-i0-und">Bengali transliteration</int>
-  <int value="-1346114248" label="vkd_vi_vni">Vietnamese keyboard (VNI)</int>
-  <int value="-1338032348" label="xkb:de:neo:ger">German NEO 2 keyboard</int>
-  <int value="-1288127107" label="vkd_vi_telex_old">
-    Vietnamese keyboard (Telex) (obsolete)
-  </int>
-  <int value="-1263201701" label="hi-t-i0-und_old">
-    Hindi transliteration (obsolete)
-  </int>
-  <int value="-1242404917" label="sr-t-i0-und_old">
-    Serbian transliteration (obsolete)
-  </int>
-  <int value="-1148371254" label="xkb:us:intl:por">
-    US International keyboard
-  </int>
-  <int value="-1105197074" label="vkd_ar_old">Arabic keyboard (obsolete)</int>
-  <int value="-1096071752" label="vkd_fa_old">Persian keyboard (obsolete)</int>
-  <int value="-1093390778" label="vkd_ml_phone">
-    Malayalam keyboard (Phonetic)
-  </int>
-  <int value="-1084450354" label="gu-t-i0-und">Gujarati transliteration</int>
-  <int value="-1065120196" label="vkd_th_old">
-    Thai keyboard (Kedmanee) (obsolete)
-  </int>
-  <int value="-1053378431" label="xkb:tr::tur">Turkish keyboard</int>
-  <int value="-1044696009" label="ar-t-i0-und">Arabic transliteration</int>
-  <int value="-1032532014" label="xkb:bg:phonetic:bul">
-    Bulgarian Phonetic keyboard
-  </int>
-  <int value="-1024152574" label="xkb:ca:eng:eng">
-    Canadian English keyboard
-  </int>
-  <int value="-1021036210" label="xkb:us::ind">US keyboard</int>
-  <int value="-1018545698" label="vkd_ckb_en_old">
-    Sorani Kurdish English-based keyboard (obsolete)
-  </int>
-  <int value="-1011117789" label="vkd_ta_itrans">Tamil keyboard (itrans)</int>
-  <int value="-994915284" label="xkb:ch:fr:fra">Swiss French keyboard</int>
-  <int value="-955047705" label="xkb:sk::slo">Slovakian keyboard</int>
-  <int value="-942739805" label="xkb:tr:f:tur">Turkish-F keyboard</int>
-  <int value="-923332388" label="xkb:ua::ukr">Ukrainian keyboard</int>
-  <int value="-917118451" label="vkd_vi_tcvn_old">
-    Vietnamese keyboard (TCVN) (obsolete)
-  </int>
-  <int value="-848378885" label="vkd_ethi_old">
-    Ethiopic keyboard (obsolete)
-  </int>
-  <int value="-827208209" label="xkb:hu::hun">Hungarian keyboard</int>
-  <int value="-797137387" label="ml-t-i0-und_old">
-    Malayalam transliteration (obsolete)
-  </int>
-  <int value="-769279084" label="xkb:us:intl_pc:eng">
-    US International (PC) keyboard
-  </int>
-  <int value="-694112343" label="vkd_ne_phone">Nepali keyboard (Phonetic)</int>
-  <int value="-676861102" label="vkd_vi_viqr_old">
-    Vietnamese keyboard (VIQR) (obsolete)
-  </int>
-  <int value="-666585286" label="xkb:bg::bul">Bulgarian keyboard</int>
-  <int value="-650362029" label="xkb:ie::ga">Irish keyboard</int>
-  <int value="-639620912" label="te-t-i0-und_old">
-    Telugu transliteration (obsolete)
-  </int>
-  <int value="-622670909" label="zh-hant-t-i0-dayi-1988_old">
-    Dayi input method (obsolete)
-  </int>
-  <int value="-607101895" label="zh-t-i0-pinyin">Pinyin input method</int>
-  <int value="-547772150" label="xkb:ro:std:rum">
-    Romanian standard keyboard
-  </int>
-  <int value="-545936253" label="zh-hant-t-i0-array-1992">
-    Array input method
-  </int>
-  <int value="-537214862" label="xkb:us:intl_pc:eng">
-    US International (PC) keyboard
-  </int>
-  <int value="-535089160" label="xkb:us::msa">US keyboard</int>
-  <int value="-519506383" label="he-t-i0-und_old">
-    Hebrew transliteration (obsolete)
-  </int>
-  <int value="-512360986" label="xkb:us:altgr-intl:eng">
-    US Extended keyboard
-  </int>
-  <int value="-498028381" label="sa-t-i0-und_old">
-    Sanskrit transliteration (obsolete)
-  </int>
-  <int value="-496003957" label="xkb:de::ger">German keyboard</int>
-  <int value="-489436211" label="xkb:us:intl_pc:nld">
-    US International (PC) keyboard
-  </int>
-  <int value="-456651526" label="kn-t-i0-und">Kannada transliteration</int>
-  <int value="-439432295" label="vkd_ru_phone_yazhert_old">
-    Russian Phonetic (YaZHert) keyboard (obsolete)
-  </int>
-  <int value="-428164685" label="ml-t-i0-und_old">
-    Malayalam transliteration (obsolete)
-  </int>
-  <int value="-383640577" label="or-t-i0-und">Oriya transliteration</int>
-  <int value="-378677550" label="vkd_bn_phone_old">
-    Bengali keyboard (Phonetic) (obsolete)
-  </int>
-  <int value="-366323598" label="fa-t-i0-und">Persian transliteration</int>
-  <int value="-352571373" label="xkb:rs::srp">Serbian keyboard</int>
-  <int value="-329596558" label="te-t-i0-und">Telugu transliteration</int>
-  <int value="-299716106" label="xkb:si::slv">Slovenian keyboard</int>
-  <int value="-292687390" label="xkb:fi::fin">Finnish keyboard</int>
-  <int value="-280690349" label="vkd_vi_vni_old">
-    Vietnamese keyboard (VNI) (obsolete)
-  </int>
-  <int value="-263932473" label="xkb:ch::ger">Swiss keyboard</int>
-  <int value="-244167850" label="nacl_mozc_jp">
-    Google Japanese Input (for Japanese keyboard)
-  </int>
-  <int value="-231610124" label="ne-t-i0-und_old">
-    Nepali transliteration (obsolete)
-  </int>
-  <int value="-225482038" label="vkd_si_old">Sinhala keyboard (obsolete)</int>
-  <int value="-219542410" label="ko-t-i0-und_old">
-    Korean input method (obsolete)
-  </int>
-  <int value="-202781885" label="xkb:us:intl:eng">
-    US International keyboard
-  </int>
-  <int value="-193738949" label="gu-t-i0-und_old">
-    Gujarati transliteration (obsolete)
-  </int>
-  <int value="-176093583" label="vkd_bn_phone">Bengali keyboard (Phonetic)</int>
-  <int value="-147742988" label="mr-t-i0-und_old">
-    Marathi transliteration (obsolete)
-  </int>
-  <int value="-119597715" label="mr-t-i0-und">Marathi transliteration</int>
-  <int value="-83634292" label="vkd_my_myansan_old">
-    Myanmar Myansan keyboard (obsolete)
-  </int>
-  <int value="-70827301" label="xkb:be::fra">Belgian keyboard</int>
-  <int value="-69316526" label="fa-t-i0-und_old">
-    Persian transliteration (obsolete)
-  </int>
-  <int value="2215666" label="xkb:jp::jpn">Japanese keyboard</int>
-  <int value="23642603" label="yue-hant-t-i0-und">Cantonese input method</int>
-  <int value="28549849" label="xkb:pt::por">Portuguese keyboard</int>
-  <int value="60054916" label="xkb:fo::fao">Faroese keyboard</int>
-  <int value="68243712" label="vkd_si">Sinhala keyboard</int>
-  <int value="87135772" label="xkb:fr::fra">French keyboard</int>
-  <int value="132261074" label="ti-t-i0-und">Tigrinya transliteration</int>
-  <int value="150803493" label="vkd_ta_phone_old">
-    Tamil keyboard (Phonetic) (obsolete)
-  </int>
-  <int value="193122406" label="xkb:gr::gre">Greek keyboard</int>
-  <int value="197116831" label="xkb:es::spa">Spanish keyboard</int>
-  <int value="214846098" label="zh-t-i0-wubi-1986_old">
-    Wubi input method (obsolete)
-  </int>
-  <int value="233227876" label="vkd_km">Khmer keyboard</int>
-  <int value="319509360" label="xkb:be::ger">Belgian keyboard</int>
-  <int value="374544129" label="vkd_th_pattajoti">
-    Thai keyboard (Pattachote)
-  </int>
-  <int value="382485416" label="xkb:lv:apostrophe:lav">Latvian keyboard</int>
-  <int value="398887705" label="ti-t-i0-und_old">
-    Tigrinya transliteration (obsolete)
-  </int>
-  <int value="400837283" label="yue-hant-t-i0-und_old">
-    Cantonese input method (obsolete)
-  </int>
-  <int value="414827905" label="vkd_ta_typewriter_old">
-    Tamil keyboard (Typewriter) (obsolete)
-  </int>
-  <int value="428624332" label="zh-t-i0-pinyin_old">
-    Pinyin input method (obsolete)
-  </int>
-  <int value="452111434" label="kn-t-i0-und_old">
-    Kannada transliteration (obsolete)
-  </int>
-  <int value="467269371" label="el-t-i0-und_old">
-    Greek transliteration (obsolete)
-  </int>
-  <int value="469000663" label="xkb:es:cat:cat">Catalan keyboard</int>
-  <int value="472995125" label="vkd_ta_phone">Tamil keyboard (Phonetic)</int>
-  <int value="484753645" label="xkb:us:workman:eng">US Workman Keyboard</int>
-  <int value="490329655" label="zh-t-i0-wubi-1986">Wubi input method</int>
-  <int value="520496071" label="vkd_ckb_en">
-    Sorani Kurdish English-based keyboard
-  </int>
-  <int value="520692028" label="vkd_ta_itrans_old">
-    Tamil keyboard (itrans) (obsolete)
-  </int>
-  <int value="535728072" label="ne-t-i0-und">Nepali transliteration</int>
-  <int value="537062379" label="vkd_ru_phone_yazhert">
-    Russian Phonetic (YaZHert) keyboard
-  </int>
-  <int value="601883646" label="vkd_th_tis_old">
-    Thai keyboard (TIS 820-2531) (obsolete)
-  </int>
-  <int value="602570138" label="xkb:mk::mkd">Macedonian keyboard</int>
-  <int value="612541362" label="vkd_ar">Arabic keyboard</int>
-  <int value="629336408" label="vkd_ckb_ar_old">
-    Sorani Kurdish Arabic-based keyboard (obsolete)
-  </int>
-  <int value="629711326" label="xkb:il::heb">Hebrew keyboard</int>
-  <int value="683071754" label="xkb:hr::scr">Croatian keyboard</int>
-  <int value="774753710" label="vkd_th_tis">Thai keyboard (TIS 820-2531)</int>
-  <int value="787164771" label="vkd_lo">Lao keyboard</int>
-  <int value="789603234" label="xkb:by::bel">Belarusian keyboard</int>
-  <int value="789867412" label="vkd_ethi">Ethiopic keyboard</int>
-  <int value="822222165" label="xkb:ru:phonetic:rus">
-    Russian Phonetic keyboard
-  </int>
-  <int value="825747412" label="xkb:latam::spa">Latin American keyboard</int>
-  <int value="828287201" label="vkd_ta_inscript">Tamil keyboard (InScript)</int>
-  <int value="843503620" label="ur-t-i0-und">Urdu transliteration</int>
-  <int value="871656925" label="xkb:us::fil">US keyboard</int>
-  <int value="1024422775" label="vkd_ml_phone_old">
-    Malayalam keyboard (Phonetic) (obsolete)
-  </int>
-  <int value="1028639984" label="he-t-i0-und">Hebrew transliteration</int>
-  <int value="1091977227" label="vkd_my">Myanmar keyboard</int>
-  <int value="1127372618" label="vkd_ta_tamil99_old">
-    Tamil keyboard (Tamil99) (obsolete)
-  </int>
-  <int value="1190741118" label="am-t-i0-und">Amharic transliteration</int>
-  <int value="1194237527" label="bn-t-i0-und_old">
-    Bengali transliteration (obsolete)
-  </int>
-  <int value="1196273343" label="vkd_te_phone_old">
-    Telugu keyboard (Phonetic) (obsolete)
-  </int>
-  <int value="1201986464" label="pa-t-i0-und_old">
-    Punjabi transliteration (obsolete)
-  </int>
-  <int value="1203226200" label="vkd_kn_phone">Kannada keyboard (Phonetic)</int>
-  <int value="1241606786" label="vkd_gu_phone_old">
-    Gujarati keyboard (Phonetic) (obsolete)
-  </int>
-  <int value="1275989482" label="xkb:ee::est">Estonian keyboard</int>
-  <int value="1292575742" label="el-t-i0-und">Greek transliteration</int>
-  <int value="1321401457" label="zh-hant-t-i0-pinyin">
-    Traditional Pinyin input method
-  </int>
-  <int value="1342665179" label="or-t-i0-und_old">
-    Oriya transliteration (obsolete)
-  </int>
-  <int value="1346294191" label="vkd_vi_tcvn">Vietnamese keyboard (TCVN)</int>
-  <int value="1355267172" label="nacl_mozc_jp_old">
-    Google Japanese Input (for Japanese keyboard) (obsolete)
-  </int>
-  <int value="1364126694" label="vkd_vi_viqr">Vietnamese keyboard (VIQR)</int>
-  <int value="1376109158" label="zh-hant-t-i0-pinyin_old">
-    Traditional Pinyin input method (obsolete)
-  </int>
-  <int value="1391164751" label="vkd_ne_phone_old">
-    Nepali keyboard (Phonetic) (obsolete)
-  </int>
-  <int value="1409029247" label="xkb:ca::fra">Canadian French keyboard</int>
-  <int value="1411091864" label="vkd_th">Thai keyboard (Kedmanee)</int>
-  <int value="1425002521" label="vkd_ckb_ar">
-    Sorani Kurdish Arabic-based keyboard
-  </int>
-  <int value="1486336701" label="zh-hant-t-i0-und_old">
-    Zhuyin input method (obsolete)
-  </int>
-  <int value="1530194498" label="vkd_deva_phone">
-    Devanagari keyboard (Phonetic)
-  </int>
-  <int value="1624346366" label="zh-hant-t-i0-und">Zhuyin input method</int>
-  <int value="1643737979" label="xkb:fr:bepo:fra">French Bepo keyboard</int>
-  <int value="1680967466" label="sa-t-i0-und">Sanskrit transliteration</int>
-  <int value="1683010298" label="xkb:is::ice">Icelandic keyboard</int>
-  <int value="1691327142" label="vkd_gu_phone">
-    Gujarati keyboard (Phonetic)
-  </int>
-  <int value="1698488657" label="ar-t-i0-und_old">
-    Arabic transliteration (obsolete)
-  </int>
-  <int value="1718072990" label="xkb:us::eng">US keyboard</int>
-  <int value="1756602568" label="zh-hant-t-i0-array-1992_old">
-    Array input method (obsolete)
-  </int>
-  <int value="1763643144" label="xkb:lt::lit">Lithuanian keyboard</int>
-  <int value="1772226972" label="ur-t-i0-und_old">
-    Urdu transliteration (obsolete)
-  </int>
-  <int value="1783807851" label="nacl_mozc_us_old">
-    Google Japanese Input (for US keyboard) (obsolete)
-  </int>
-  <int value="1842376130" label="vkd_ta_typewriter">
-    Tamil keyboard (Typewriter)
-  </int>
-  <int value="1847701260" label="xkb:pl::pol">Polish keyboard</int>
-  <int value="1851658441" label="xkb:hu:qwerty:hun">
-    Hungarian QWERTY keyboard
-  </int>
-  <int value="1882667893" label="xkb:us:colemak:eng">US Colemak keyboard</int>
-  <int value="1925299009" label="xkb:br::por">Brazilian keyboard</int>
-  <int value="1934249765" label="vkd_th_pattajoti_old">
-    Thai keyboard (Pattachote) (obsolete)
-  </int>
-  <int value="1952551273" label="vkd_ta_tamil99">Tamil keyboard (Tamil99)</int>
-  <int value="1957701631" label="am-t-i0-und_old">
-    Amharic transliteration (obsolete)
-  </int>
-  <int value="1960657481" label="vkd_vi_telex">Vietnamese keyboard (Telex)</int>
-  <int value="1970923579" label="xkb:us:intl:nld">Netherlands keyboard</int>
-  <int value="1983264676" label="xkb:no::nob">Norwegian keyboard</int>
-  <int value="2007323478" label="xkb:cz::cze">Czech keyboard</int>
-  <int value="2014669693" label="xkb:kz::kaz">Kazakh keyboard</int>
-  <int value="2018878326" label="zh-hant-t-i0-cangjie-1987">
-    Cangjie input method
-  </int>
-  <int value="2024146574" label="vkd_lo_old">Lao keyboard (obsolete)</int>
-  <int value="2029882285" label="vkd_kn_phone_old">
-    Kannada keyboard (Phonetic) (obsolete)
-  </int>
-  <int value="2031967946" label="xkb:mt::mlt">Maltese keyboard</int>
-  <int value="2051698871" label="nacl_mozc_us_old">
-    Google Japanese Input (for US keyboard) (obsolete)
-  </int>
-  <int value="2060414855" label="braille">Braille Keyboard</int>
-  <int value="2077260254" label="ko-t-i0-und">Korean input method</int>
-  <int value="2121258069" label="xkb:us:dvorak:eng">US Dvorak keyboard</int>
-  <int value="2143389015" label="vkd_ne_inscript">
-    Nepali keyboard (InScript)
-  </int>
+<!--
+    Mappings for input method IDs of first-party Chrome OS IME extension ONLY
+    (i.e. extension with ID "jkghodnilhceideoidjikpgommlajknk" and defined in
+    google_xkb_manifest.json [1]), although InputMethod.ID2 histogram is
+    recorded for open-source Chromium OS and third-party IME extensions as well.
+    [1] https://source.chromium.org/chromium/chromium/src/+/master:chrome/browser/resources/chromeos/input_method/google_xkb_manifest.json?q=google_xkb_manifest.json
+  -->
+
+  <int value="-2082426075" label="xkb:cz:qwerty:cze"/>
+  <int value="-2039513744" label="xkb:ru::rus"/>
+  <int value="-2030885731" label="vkd_fa"/>
+  <int value="-2004968165" label="xkb:gb:dvorak:eng"/>
+  <int value="-2004834194" label="xkb:ca:multix:fra"/>
+  <int value="-1992142310" label="xkb:dk::dan"/>
+  <int value="-1989523479" label="pa-t-i0-und"/>
+  <int value="-1955862460" label="xkb:ro::rum"/>
+  <int value="-1953637256" label="xkb:us:workman-intl:eng"/>
+  <int value="-1951732875" label="xkb:be::nld"/>
+  <int value="-1856842164" label="xkb:ge::geo"/>
+  <int value="-1793755122" label="zh-hant-t-i0-cangjie-1987-x-m0-simplified"/>
+  <int value="-1710308694" label="experimental_layout-es_lang-ca"/>
+  <int value="-1710145174" label="xkb:am:phonetic:arm"/>
+  <int value="-1709647399" label="xkb:mn::mon"/>
+  <int value="-1668610460" label="xkb:us:dvp:eng"/>
+  <int value="-1622129313" label="sr-t-i0-und"/>
+  <int value="-1616253108" label="ta-t-i0-und"/>
+  <int value="-1608984043" label="vkd_my_myansan"/>
+  <int value="-1595218901" label="experimental_layout-gb(extd)_lang-sv"/>
+  <int value="-1530423498" label="experimental_layout-no_lang-sv"/>
+  <int value="-1520893793" label="vkd_te_phone"/>
+  <int value="-1474243589" label="xkb:it::ita"/>
+  <int value="-1466408010" label="hi-t-i0-und"/>
+  <int value="-1408581676" label="xkb:gb:extd:eng"/>
+  <int value="-1402880636" label="xkb:se::swe"/>
+  <int value="-1386518472" label="vkd_ru_phone_aatseel"/>
+  <int value="-1362493117" label="zh-hant-t-i0-dayi-1988"/>
+  <int value="-1356599825" label="bn-t-i0-und"/>
+  <int value="-1346177950" label="experimental_layout-us_lang-nl"/>
+  <int value="-1346114248" label="vkd_vi_vni"/>
+  <int value="-1338032348" label="xkb:de:neo:ger"/>
+  <int value="-1148371254" label="xkb:us:intl:por"/>
+  <int value="-1093390778" label="vkd_ml_phone"/>
+  <int value="-1084450354" label="gu-t-i0-und"/>
+  <int value="-1083153469" label="experimental_layout-gb(extd)_lang-nl"/>
+  <int value="-1053378431" label="xkb:tr::tur"/>
+  <int value="-1044696009" label="ar-t-i0-und"/>
+  <int value="-1032532014" label="xkb:bg:phonetic:bul"/>
+  <int value="-1024152574" label="xkb:ca:eng:eng"/>
+  <int value="-1021036210" label="xkb:us::ind"/>
+  <int value="-1011117789" label="vkd_ta_itrans"/>
+  <int value="-994915284" label="xkb:ch:fr:fra"/>
+  <int value="-955047705" label="xkb:sk::slo"/>
+  <int value="-942739805" label="xkb:tr:f:tur"/>
+  <int value="-923332388" label="xkb:ua::ukr"/>
+  <int value="-827208209" label="xkb:hu::hun"/>
+  <int value="-769279084" label="xkb:us:intl_pc:eng"/>
+  <int value="-762849066" label="experimental_layout-us_lang-es-ES"/>
+  <int value="-694112343" label="vkd_ne_phone"/>
+  <int value="-666585286" label="xkb:bg::bul"/>
+  <int value="-650362029" label="xkb:ie::ga"/>
+  <int value="-607101895" label="zh-t-i0-pinyin"/>
+  <int value="-547772150" label="xkb:ro:std:rum"/>
+  <int value="-545936253" label="zh-hant-t-i0-array-1992"/>
+  <int value="-537214862" label="xkb:us:intl_pc:eng"/>
+  <int value="-535089160" label="xkb:us::msa"/>
+  <int value="-512360986" label="xkb:us:altgr-intl:eng"/>
+  <int value="-496003957" label="xkb:de::ger"/>
+  <int value="-489436211" label="xkb:us:intl_pc:nld"/>
+  <int value="-456651526" label="kn-t-i0-und"/>
+  <int value="-383640577" label="or-t-i0-und"/>
+  <int value="-366323598" label="fa-t-i0-und"/>
+  <int value="-352571373" label="xkb:rs::srp"/>
+  <int value="-329596558" label="te-t-i0-und"/>
+  <int value="-299716106" label="xkb:si::slv"/>
+  <int value="-292687390" label="xkb:fi::fin"/>
+  <int value="-263932473" label="xkb:ch::ger"/>
+  <int value="-244167850" label="nacl_mozc_jp"/>
+  <int value="-202781885" label="xkb:us:intl:eng"/>
+  <int value="-176093583" label="vkd_bn_phone"/>
+  <int value="-119597715" label="mr-t-i0-und"/>
+  <int value="-70827301" label="xkb:be::fra"/>
+  <int value="-6069851" label="experimental_layout-us_lang-fr-FR"/>
+  <int value="2215666" label="xkb:jp::jpn"/>
+  <int value="23642603" label="yue-hant-t-i0-und"/>
+  <int value="28549849" label="xkb:pt::por"/>
+  <int value="60054916" label="xkb:fo::fao"/>
+  <int value="68243712" label="vkd_si"/>
+  <int value="71141287" label="experimental_layout-se_lang-da"/>
+  <int value="87135772" label="xkb:fr::fra"/>
+  <int value="132261074" label="ti-t-i0-und"/>
+  <int value="191937478" label="experimental_layout-dk_lang-sv"/>
+  <int value="193122406" label="xkb:gr::gre"/>
+  <int value="197116831" label="xkb:es::spa"/>
+  <int value="233227876" label="vkd_km"/>
+  <int value="319509360" label="xkb:be::ger"/>
+  <int value="374544129" label="vkd_th_pattajoti"/>
+  <int value="382485416" label="xkb:lv:apostrophe:lav"/>
+  <int value="469000663" label="xkb:es:cat:cat"/>
+  <int value="472995125" label="vkd_ta_phone"/>
+  <int value="484753645" label="xkb:us:workman:eng"/>
+  <int value="490329655" label="zh-t-i0-wubi-1986"/>
+  <int value="520496071" label="vkd_ckb_en"/>
+  <int value="535728072" label="ne-t-i0-und"/>
+  <int value="537062379" label="vkd_ru_phone_yazhert"/>
+  <int value="575092141" label="experimental_layout-gb(extd)_lang-fr-FR"/>
+  <int value="602570138" label="xkb:mk::mkd"/>
+  <int value="612541362" label="vkd_ar"/>
+  <int value="629711326" label="xkb:il::heb"/>
+  <int value="683071754" label="xkb:hr::scr"/>
+  <int value="774753710" label="vkd_th_tis"/>
+  <int value="787164771" label="vkd_lo"/>
+  <int value="789603234" label="xkb:by::bel"/>
+  <int value="789867412" label="vkd_ethi"/>
+  <int value="822222165" label="xkb:ru:phonetic:rus"/>
+  <int value="825747412" label="xkb:latam::spa"/>
+  <int value="828287201" label="vkd_ta_inscript"/>
+  <int value="843503620" label="ur-t-i0-und"/>
+  <int value="871656925" label="xkb:us::fil"/>
+  <int value="1028639984" label="he-t-i0-und"/>
+  <int value="1091977227" label="vkd_my"/>
+  <int value="1190741118" label="am-t-i0-und"/>
+  <int value="1203226200" label="vkd_kn_phone"/>
+  <int value="1213876678" label="experimental_layout-se_lang-no"/>
+  <int value="1275989482" label="xkb:ee::est"/>
+  <int value="1292575742" label="el-t-i0-und"/>
+  <int value="1299470210" label="experimental_layout-gb(extd)_lang-es-ES"/>
+  <int value="1321401457" label="zh-hant-t-i0-pinyin"/>
+  <int value="1346294191" label="vkd_vi_tcvn"/>
+  <int value="1364126694" label="vkd_vi_viqr"/>
+  <int value="1409029247" label="xkb:ca::fra"/>
+  <int value="1411091864" label="vkd_th"/>
+  <int value="1425002521" label="vkd_ckb_ar"/>
+  <int value="1480758122" label="experimental_layout-us_lang-fr-CA"/>
+  <int value="1518946305" label="experimental_layout-us_lang-sv"/>
+  <int value="1530194498" label="vkd_deva_phone"/>
+  <int value="1624346366" label="zh-hant-t-i0-und"/>
+  <int value="1643737979" label="xkb:fr:bepo:fra"/>
+  <int value="1680967466" label="sa-t-i0-und"/>
+  <int value="1683010298" label="xkb:is::ice"/>
+  <int value="1691327142" label="vkd_gu_phone"/>
+  <int value="1718072990" label="xkb:us::eng"/>
+  <int value="1763643144" label="xkb:lt::lit"/>
+  <int value="1783807851" label="nacl_mozc_us"/>
+  <int value="1842376130" label="vkd_ta_typewriter"/>
+  <int value="1847701260" label="xkb:pl::pol"/>
+  <int value="1851658441" label="xkb:hu:qwerty:hun"/>
+  <int value="1882667893" label="xkb:us:colemak:eng"/>
+  <int value="1925299009" label="xkb:br::por"/>
+  <int value="1942788456" label="experimental_layout-no_lang-da"/>
+  <int value="1952551273" label="vkd_ta_tamil99"/>
+  <int value="1960579818" label="experimental_layout-dk_lang-no"/>
+  <int value="1960657481" label="vkd_vi_telex"/>
+  <int value="1970923579" label="xkb:us:intl:nld"/>
+  <int value="1983264676" label="xkb:no::nob"/>
+  <int value="2007323478" label="xkb:cz::cze"/>
+  <int value="2014669693" label="xkb:kz::kaz"/>
+  <int value="2018878326" label="zh-hant-t-i0-cangjie-1987"/>
+  <int value="2031967946" label="xkb:mt::mlt"/>
+  <int value="2060414855" label="braille"/>
+  <int value="2077260254" label="ko-t-i0-und"/>
+  <int value="2121258069" label="xkb:us:dvorak:eng"/>
+  <int value="2143389015" label="vkd_ne_inscript"/>
 </enum>
 
 <enum name="InsecureContentType">
@@ -38486,6 +39654,13 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="35" label="Ran by google.com/intl/ (deprecated)"/>
 </enum>
 
+<enum name="InsecureCredentialsType">
+  <int value="0" label="Leaked"/>
+  <int value="1" label="Phished"/>
+  <int value="2" label="Weak"/>
+  <int value="3" label="Reused"/>
+</enum>
+
 <enum name="InsecureDownloadExtensions">
   <int value="0" label="kUnknown"/>
   <int value="1" label="kNone"/>
@@ -38602,7 +39777,16 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
              PackageManager"/>
 </enum>
 
+<enum name="InstalledAppsDialogActions">
+  <int value="0" label="User closed dialog"/>
+  <int value="1" label="User clicked cancel button on dialog"/>
+  <int value="2" label="User clicked clear data button on dialog"/>
+</enum>
+
 <enum name="InstalledVersionPollType">
+  <obsolete>
+    Removed in M90.
+  </obsolete>
   <int value="0" label="Process startup"/>
   <int value="1" label="InstalledVersionMonitor notification"/>
   <int value="2" label="Periodic poll"/>
@@ -39103,6 +40287,9 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
 </enum>
 
 <enum name="InvalidatorState">
+  <obsolete>
+    Deprecated in M89 since it's no longer being used for metrics collection.
+  </obsolete>
   <int value="0" label="Enabled"/>
   <int value="1" label="Error"/>
   <int value="2" label="Credentials Rejected"/>
@@ -39187,14 +40374,15 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
 <enum name="IOSDefaultBrowserFullscreenPromoAction">
   <int value="0" label="Action Button"/>
   <int value="1" label="Cancel"/>
+  <int value="2" label="Remind Me Later"/>
 </enum>
 
 <enum name="IOSDeviceThermalState">
-  <int value="0" label="Unknown"/>
-  <int value="1" label="Nominal"/>
-  <int value="2" label="Fair"/>
-  <int value="3" label="Serious"/>
-  <int value="4" label="Critical"/>
+  <int value="0" label="0-Unknown"/>
+  <int value="1" label="1-Nominal"/>
+  <int value="2" label="2-Fair"/>
+  <int value="3" label="3-Serious"/>
+  <int value="4" label="4-Critical"/>
 </enum>
 
 <enum name="IOSExternalURLRequestStatus">
@@ -39264,6 +40452,16 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="4" label="Authorized when Chrome is in use"/>
 </enum>
 
+<enum name="IOSMainThreadFreezeDetectionNotRunningAfterReportBlock">
+  <int value="0" label="After Breakpad Ref">
+    Freeze detection stopped after obtaining the breakpad lock.
+  </int>
+  <int value="1" label="After FileManager UTE move">
+    Freeze detection stopped after moving the hang report out of the Breakpad
+    directory and into the |UTE| directory.
+  </int>
+</enum>
+
 <enum name="IOSMenuAction">
   <int value="0" label="Open in New Tab"/>
   <int value="1" label="Open in New Incognito Tab"/>
@@ -39276,6 +40474,10 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="8" label="Delete"/>
   <int value="9" label="Remove"/>
   <int value="10" label="Hide"/>
+  <int value="11" label="Mark as Read"/>
+  <int value="12" label="Mark as Unread"/>
+  <int value="13" label="View Offline"/>
+  <int value="14" label="Open (JavaScript evaluation)"/>
 </enum>
 
 <enum name="IOSMenuScenario">
@@ -39286,6 +40488,9 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="4" label="Recent Tabs Entry"/>
   <int value="5" label="History Entry"/>
   <int value="6" label="Most Visited Entry"/>
+  <int value="7" label="Image on a Web page"/>
+  <int value="8" label="Image-Link on a Web page"/>
+  <int value="9" label="Link on a Web page"/>
 </enum>
 
 <enum name="IOSMultiWindowConfiguration">
@@ -39428,6 +40633,19 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="3" label="Actions"/>
 </enum>
 
+<enum name="IOSStabilityUserVisibleTerminationType">
+  <summary>
+    One of several separate stability metrics. The values are non-contiguous as
+    they are a subset of values matching fields of the Stability proto (from the
+    SystemProfile).
+  </summary>
+  <int value="0"
+      label="Termination caused by system signal (f.e. EXC_BAD_ACCESS)"/>
+  <int value="1"
+      label="Termination caused by Hang / UI Thread freeze (ui thread was
+             locked for 9+ seconds and the app was quit by OS or the user)."/>
+</enum>
+
 <enum name="IOSTabSwitcherPageChangeInteraction">
   <int value="0" label="Unknown Interaction"/>
   <int value="1" label="Scroll View Drag"/>
@@ -39454,9 +40672,13 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="0" label="Dino game widget"/>
   <int value="1" label="Search widget"/>
   <int value="2" label="Quick actions widget"/>
+  <int value="3" label="A widget that has become obsolete"/>
 </enum>
 
 <enum name="IOSWKWebViewLinkPreviewAction">
+  <obsolete>
+    Deprecated 12/2020 as it is no longer used for analysis.
+  </obsolete>
   <summary>
     This enum is used to track the user actions that occur when previewing links
     using the WKWebView 3D touch API. This feature is not currently supported,
@@ -39680,6 +40902,13 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="2" label="User typed or autofilled values"/>
 </enum>
 
+<enum name="JobProtocolErrorLocation">
+  <int value="0" label="SessionStartReadingFailed"/>
+  <int value="1" label="CreateSessionFailed"/>
+  <int value="2" label="CryptoConnectFailedSync"/>
+  <int value="3" label="CryptoConnectFailedAsync"/>
+</enum>
+
 <enum name="JpegColorSpace">
   <int value="0" label="Unknown color space">
     This is the bucket that counts the images that did not fall under any of the
@@ -40115,10 +41344,16 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="1" label="Cache Miss"/>
 </enum>
 
+<enum name="KaleidoscopeDialogClosedBoolean">
+  <int value="0" label="The user did not open a watch action"/>
+  <int value="1" label="The user did open a watch action"/>
+</enum>
+
 <enum name="KaleidoscopeFirstRunProgress">
   <int value="0" label="Completed"/>
   <int value="1" label="Provider Selection"/>
   <int value="2" label="Media Feeds Consent"/>
+  <int value="3" label="Welcome Screen"/>
 </enum>
 
 <enum name="KaleidoscopeNavigation">
@@ -40229,6 +41464,12 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="6" label="Migration stopped"/>
 </enum>
 
+<enum name="KeyPermissionsManagerArcUsageUpdateStatus">
+  <int value="0" label="kStarted"/>
+  <int value="1" label="kSucceeded"/>
+  <int value="2" label="kFailed"/>
+</enum>
+
 <enum name="KeyPermissionsManagerMigrationStatus">
   <int value="0" label="kStarted"/>
   <int value="1" label="kSucceeded"/>
@@ -40814,9 +42055,17 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="8026721" label="Zaza"/>
 </enum>
 
+<enum name="LanguageDetectionModelState">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="Model File Invalid"/>
+  <int value="2" label="Model File Valid and Available"/>
+</enum>
+
 <enum name="LanguageSettingsActionType">
   <int value="0" label="Unknown"/>
-  <int value="1" label="Click on the 'Add Language' button"/>
+  <int value="1" label="Click on the 'Add Language' button">
+    Removed from Android in M89 and Desktop in M90. Still on iOS.
+  </int>
   <int value="2" label="Language added"/>
   <int value="3" label="Language removed"/>
   <int value="4" label="Disable global 'Offer to translate' by switch"/>
@@ -40824,12 +42073,40 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="6" label="Disable 'Offer to translate' for single language"/>
   <int value="7" label="Enable 'Offer to translate' for single language"/>
   <int value="8" label="Language list reordered"/>
+  <int value="9" label="Change Chrome Language">Windows and Android only</int>
+  <int value="10" label="Change Target Language"/>
 </enum>
 
 <enum name="LanguageSettingsPageType">
   <int value="0" label="Main"/>
   <int value="1" label="Add Language"/>
   <int value="2" label="Language Details">iOS only.</int>
+  <int value="3" label="Chrome Language">Windows and Android only</int>
+  <int value="4" label="Advanced Language Settings"/>
+  <int value="5" label="Target Language"/>
+  <int value="6" label="Language Overflow Menu Opened">Desktop only</int>
+</enum>
+
+<enum name="LanguageUsage.UI.Android.Availability">
+  <int value="0" label="Top Available">Top Android language is available.</int>
+  <int value="1" label="Only Default Available">
+    Top Android language is not available but another one is.
+  </int>
+  <int value="2" label="None Available"/>
+  <int value="3" label="Overridden">
+    Overridden languages must be avaliable.
+  </int>
+</enum>
+
+<enum name="LanguageUsage.UI.Android.Correctness">
+  <int value="0" label="Correct"/>
+  <int value="1" label="Incorrect"/>
+  <int value="2" label="Not Available">
+    Languages that are not available cannot be correct.
+  </int>
+  <int value="3" label="Only Java Correct">
+    The Java UI language is correct but native UI language not.
+  </int>
 </enum>
 
 <enum name="LargestContentfulPaint.TerminationState">
@@ -40870,6 +42147,29 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="8" label="HandleUpdateOrigins Invalid"/>
 </enum>
 
+<enum name="LaunchCause">
+  <int value="0" label="Other - External"/>
+  <int value="1" label="Chrome Custom Tab"/>
+  <int value="2" label="Trusted Web Activity"/>
+  <int value="3" label="Recents (aka App Overview)"/>
+  <int value="4" label="Recents or Back"/>
+  <int value="5" label="Foreground when Locked (Power Button)"/>
+  <int value="6" label="Main Chrome Launcher Icon"/>
+  <int value="7"
+      label="Main Chrome Launcher Icon Shortcuts (New Tab shortcuts)"/>
+  <int value="8" label="Home screen widget (eg. Search or Bookmarks)"/>
+  <int value="9" label="Open In Browser CCT Menu"/>
+  <int value="10"
+      label="External Search Intent (eg. Third Party Voice Search results)"/>
+  <int value="11"
+      label="Notification (eg. SW Notification, Media Controls, etc.)"/>
+  <int value="12" label="External VIEW intent"/>
+  <int value="13" label="Other - From Chrome"/>
+  <int value="14" label="WebApk installed by Chrome"/>
+  <int value="15" label="WebApk not installed by Chrome"/>
+  <int value="16" label="Homescreen shortcut (Add To Homescreen)"/>
+</enum>
+
 <enum name="LauncherRankingItemType">
   <summary>
     The type of a result in the Chrome OS launcher, simplified to fewer
@@ -41095,14 +42395,16 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
 <enum name="LensClassifyResultState">
   <int value="0" label="Unknown"/>
   <int value="1" label="Success: shoppy image"/>
-  <int value="2" label="Success: not shoppy image - other intent type"/>
-  <int value="3" label="Success: not shoppy image - empty Lens result"/>
-  <int value="4" label="Success: not shoppy image - empty intent type"/>
+  <int value="2" label="Success: unknown intent type"/>
+  <int value="3" label="Success: empty Lens result"/>
+  <int value="4" label="Success: empty intent type"/>
   <int value="5" label="Error: invalid callback"/>
   <int value="6" label="Error: invalid package signature"/>
   <int value="7" label="Error: invalid image uri"/>
   <int value="8" label="Error: early terminated"/>
   <int value="9" label="Disabled"/>
+  <int value="10" label="Error: additional web context malformed (nonfatal)"/>
+  <int value="11" label="Success: Image is translatable"/>
 </enum>
 
 <enum name="LensSdkError">
@@ -41115,6 +42417,25 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="7" label="Classification error"/>
 </enum>
 
+<enum name="LensSupportStatus">
+  <summary>Whether lens is supported and if not the reason why.</summary>
+  <int value="0" label="Lens Search Supported"/>
+  <int value="1" label="Not Google Search Engine"/>
+  <int value="2" label="Activity Not Accessible"/>
+  <int value="3" label="Out of Date"/>
+  <int value="4" label="Search by Image Unavailable"/>
+  <int value="5" label="OS Below Android O"/>
+  <int value="6" label="Invalid Package"/>
+  <int value="7" label="Lens Shop Supported"/>
+  <int value="8" label="Lens Search And Shop Supported"/>
+  <int value="9" label="Camera Not Available"/>
+  <int value="10" label="Disabled on Low End Device"/>
+  <int value="11" label="Disabled by Feature Flag"/>
+  <int value="12" label="AGSA Version Not Supported"/>
+  <int value="13" label="Disabled on Incognito"/>
+  <int value="14" label="Disabled on Tablet"/>
+</enum>
+
 <enum name="LevelDBCorruptionRestoreValue">
   <int value="0" label="Database Delete Success"/>
   <int value="1" label="Database Delete Failure"/>
@@ -41262,6 +42583,7 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="9" label="Unknown"/>
   <int value="10" label="Iframe"/>
   <int value="11" label="Timeout"/>
+  <int value="12" label="BlockList"/>
 </enum>
 
 <enum name="LinkMonitorFailureType">
@@ -41271,6 +42593,15 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="3" label="Failure Threshold Reached"/>
 </enum>
 
+<enum name="LinkToTextShouldOfferResult">
+  <int value="0" label="Success"/>
+  <int value="1" label="Rejected in JavaScript"/>
+  <int value="2" label="Blocklisted"/>
+  <int value="3" label="Unable to invoke JavaScript"/>
+  <int value="4" label="Web layer task timeout"/>
+  <int value="5" label="Dispatched timeout"/>
+</enum>
+
 <enum name="LinuxAudioIO">
   <int value="0" label="PulseAudio"/>
   <int value="1" label="ALSA"/>
@@ -41674,6 +43005,11 @@ Called by update_gpu_driver_bug_workaround_entries.py.-->
   <int value="2" label="Throttled but stopped due to rebuffer"/>
 </enum>
 
+<enum name="LiveCaptionExpandBubbleEvent">
+  <int value="0" label="Bubble collapsed"/>
+  <int value="1" label="Bubble expanded"/>
+</enum>
+
 <enum name="LiveCaptionSessionEvent">
   <int value="0" label="Stream started"/>
   <int value="1" label="Stream finished"/>
@@ -41988,6 +43324,7 @@ from previous Chrome versions.
       label="AutofillUseImprovedLabelDisambiguation:enabled"/>
   <int value="-2129940395" label="WebAssemblySimd:disabled"/>
   <int value="-2128705444" label="AssistantAppSupport:enabled"/>
+  <int value="-2127319228" label="enable-media-internals:disabled"/>
   <int value="-2126697213" label="EnablePalmSuppression:disabled"/>
   <int value="-2124839789"
       label="OmniboxUIExperimentHideSteadyStateUrlSchemeAndSubdomains:enabled"/>
@@ -42015,11 +43352,13 @@ from previous Chrome versions.
   <int value="-2111196530" label="EnableAssistantLauncherUI:disabled"/>
   <int value="-2108564200" label="AutofillUpstream:disabled"/>
   <int value="-2106960993" label="HarfBuzzPDFSubsetter:disabled"/>
+  <int value="-2106763275" label="ArcRtVcpuQuadCore:enabled"/>
   <int value="-2105498697" label="EnableImeSandbox:disabled"/>
   <int value="-2105133782" label="GesturePropertiesDBusService:enabled"/>
   <int value="-2104950596" label="HandwritingGesture:enabled"/>
-  <int value="-2104654357" label="GamesHub:enabled"/>
+  <int value="-2102286055" label="WebViewVulkanIntermediateBuffer:disabled"/>
   <int value="-2101682955" label="EnableNotificationIndicator:enabled"/>
+  <int value="-2101338272" label="EnablePciguardUi:disabled"/>
   <int value="-2101337189" label="AutofillOffNoServerData:disabled"/>
   <int value="-2099486626" label="DownloadLater:enabled"/>
   <int value="-2099457894" label="Mash:enabled"/>
@@ -42069,6 +43408,7 @@ from previous Chrome versions.
       label="AllowDownloadResumptionWithoutStrongValidators:disabled"/>
   <int value="-2058656447" label="ContextualSearchUrlActions:enabled"/>
   <int value="-2056351013" label="AutofillUpdatedCardUnmaskPromptUi:enabled"/>
+  <int value="-2056198604" label="InterestFeedV2Hearts:disabled"/>
   <int value="-2054612904" label="BuiltInModuleInfra:enabled"/>
   <int value="-2053860791" label="XGEOVisibleNetworks:enabled"/>
   <int value="-2048927838" label="AutoplayWhitelistSettings:enabled"/>
@@ -42104,9 +43444,11 @@ from previous Chrome versions.
   <int value="-2026156288"
       label="LookalikeUrlNavigationSuggestionsUI:disabled"/>
   <int value="-2025367104" label="enable-material-design-ntp"/>
+  <int value="-2022956008" label="ExternalPciDevicesAllowed:disabled"/>
   <int value="-2021954068" label="TapVisualizerApp:disabled"/>
   <int value="-2020721975" label="smart-virtual-keyboard"/>
   <int value="-2020024440" label="scroll-end-effect"/>
+  <int value="-2018579114" label="ImprovedKeyboardShortcuts:enabled"/>
   <int value="-2017953534" label="enable-hosted-app-shim-creation"/>
   <int value="-2017778637" label="PrintSaveToDrive:disabled"/>
   <int value="-2015293660" label="AccessibilityExposeDisplayNone:disabled"/>
@@ -42159,6 +43501,7 @@ from previous Chrome versions.
   <int value="-1972219399" label="NTPSaveToOffline:enabled"/>
   <int value="-1971086581" label="print-scaling"/>
   <int value="-1969636234" label="OmniboxRefinedFocusState:disabled"/>
+  <int value="-1966445414" label="StylusBatteryStatus:disabled"/>
   <int value="-1965587041" label="omnibox-tab-switch-suggestions"/>
   <int value="-1964261747" label="WebVrVsyncAlign:disabled"/>
   <int value="-1963838301"
@@ -42178,6 +43521,7 @@ from previous Chrome versions.
   <int value="-1956349722" label="disable-smooth-scrolling"/>
   <int value="-1956231275" label="ForceSpectreVariant2Mitigation:enabled"/>
   <int value="-1955923385" label="EnableGamepadButtonAxisEvents:enabled"/>
+  <int value="-1954918413" label="AccountManagementFlowsV2:disabled"/>
   <int value="-1954246274"
       label="enable-experimental-accessibility-switch-access"/>
   <int value="-1953145846" label="TargetEmbeddingLookalikes:disabled"/>
@@ -42200,7 +43544,6 @@ from previous Chrome versions.
   <int value="-1940806558" label="enable-syncfs-directory-operation"/>
   <int value="-1940377152" label="MacRTL:enabled"/>
   <int value="-1940291343" label="SpeculativeResourcePrefetching:enabled"/>
-  <int value="-1939533266" label="LauncherSettingsSearch:enabled"/>
   <int value="-1939525844" label="AssistantTimersV2:enabled"/>
   <int value="-1939016096"
       label="OmniboxUIExperimentHideSuggestionUrlTrivialSubdomains:enabled"/>
@@ -42208,6 +43551,7 @@ from previous Chrome versions.
   <int value="-1938263248" label="enable-extension-info-dialog"/>
   <int value="-1937077699" label="http-form-warning"/>
   <int value="-1936032607" label="enable-experimental-webassembly-features"/>
+  <int value="-1935787681" label="SystemNotifications:disabled"/>
   <int value="-1935055754" label="WebShare:enabled"/>
   <int value="-1934661084" label="ForceUnifiedConsentBump:disabled"/>
   <int value="-1933425042" label="OfflinePreviews:enabled"/>
@@ -42231,6 +43575,7 @@ from previous Chrome versions.
   <int value="-1919683750" label="EnableOopPrintDrivers:disabled"/>
   <int value="-1919199528"
       label="AlwaysShowServerCardsInSyncTransport:disabled"/>
+  <int value="-1917031398" label="OmniboxNativeVoiceSuggestProvider:disabled"/>
   <int value="-1916060206" label="enable-display-zoom-setting"/>
   <int value="-1915854488" label="enable-offline-pages"/>
   <int value="-1913801713"
@@ -42274,11 +43619,13 @@ from previous Chrome versions.
   <int value="-1886713568"
       label="AutofillGetPaymentsIdentityFromSync:disabled"/>
   <int value="-1885074774" label="ShelfScrollable:enabled"/>
+  <int value="-1884845660" label="PreferConstantFrameRate:enabled"/>
   <int value="-1883170077" label="EnableHtmlBaseUsernameDetector:disabled"/>
   <int value="-1882330924" label="NTPArticleSuggestions:enabled"/>
   <int value="-1880355454" label="disable-topchrome-md"/>
   <int value="-1879877238" label="disable-cancel-all-touches"/>
   <int value="-1878958319" label="ScrollableTabStripButtons:disabled"/>
+  <int value="-1876955850" label="EnablePciguardUi:enabled"/>
   <int value="-1876881908"
       label="disable-infobar-for-protected-media-identifier"/>
   <int value="-1875383510" label="UseGoogleLocalNtp:disabled"/>
@@ -42304,6 +43651,8 @@ from previous Chrome versions.
   <int value="-1863020461" label="PasswordChangeInSettings:enabled"/>
   <int value="-1861814223" label="MidiManagerDynamicInstantiation:enabled"/>
   <int value="-1860481724" label="ChromeHomeExpandButton:enabled"/>
+  <int value="-1859437916"
+      label="enable-experimental-accessibility-dictation-offline"/>
   <int value="-1859421131" label="BackForwardCache:disabled"/>
   <int value="-1859095876" label="Previews:disabled"/>
   <int value="-1858284725" label="TabGroupsFeedback:enabled"/>
@@ -42332,12 +43681,13 @@ from previous Chrome versions.
   <int value="-1837401779" label="EnableFileManagerFormatDialog:enabled"/>
   <int value="-1837329460" label="NewEncodeCpuLoadEstimator:enabled"/>
   <int value="-1836854634" label="CloseTabSuggestions:enabled"/>
+  <int value="-1836511093"
+      label="QueryTilesRemoveTrendingAfterInactivity:enabled"/>
   <int value="-1836412886" label="UseChimeAndroidSdk:disabled"/>
   <int value="-1835975804" label="disable-offline-auto-reload"/>
   <int value="-1835905702" label="FilesZipNoNaCl:enabled"/>
   <int value="-1835608319" label="EnableHeuristicPalmDetectionFilter:disabled"/>
   <int value="-1834841895" label="CrostiniWebUIUpgrader:enabled"/>
-  <int value="-1834536026" label="AppServiceIntentHandling:enabled"/>
   <int value="-1834151268" label="OmniboxDynamicMaxAutocomplete:disabled"/>
   <int value="-1833149810" label="enable-accessibility-tab-switcher"/>
   <int value="-1832575380" label="show-saved-copy"/>
@@ -42373,10 +43723,11 @@ from previous Chrome versions.
   <int value="-1799801575" label="CookieDeprecationMessages:enabled"/>
   <int value="-1798337879" label="enable-md-downloads"/>
   <int value="-1797739460" label="brotli-encoding:disabled"/>
-  <int value="-1794276584" label="OnDeviceAssistant:enabled"/>
+  <int value="-1794783272" label="PdfViewerDocumentProperties:disabled"/>
   <int value="-1791226955" label="BreakingNewsPush:enabled"/>
   <int value="-1790227231" label="show-autofill-signatures"/>
   <int value="-1789139269" label="SmbFs:disabled"/>
+  <int value="-1784831690" label="Bento:disabled"/>
   <int value="-1784788154" label="NewRemotePlaybackPipeline:disabled"/>
   <int value="-1780306716"
       label="OmniboxSpeculativeServiceWorkerStartOnQueryInput:enabled"/>
@@ -42397,6 +43748,7 @@ from previous Chrome versions.
   <int value="-1766648764" label="OmniboxShortBookmarkSuggestions:disabled"/>
   <int value="-1766162197" label="AppServiceInstanceRegistry:enabled"/>
   <int value="-1766129470" label="DataSaverLiteModeRebranding:disabled"/>
+  <int value="-1763899404" label="LayoutNGTable:enabled"/>
   <int value="-1760624380"
       label="ImprovedCookieControlsForThirdPartyCookieBlocking:enabled"/>
   <int value="-1758468685" label="DownloadHomeV2:disabled"/>
@@ -42405,17 +43757,18 @@ from previous Chrome versions.
   <int value="-1753458842" label="OfflinePagesLivePageSharing:disabled"/>
   <int value="-1752853388"
       label="OmniboxUIExperimentElideToRegistrableDomain:enabled"/>
+  <int value="-1752118355" label="DesktopDetailedLanguageSettings:enabled"/>
   <int value="-1751928267" label="disable-icon-ntp"/>
   <int value="-1750008152" label="UsernameFirstFlow:enabled"/>
   <int value="-1749689559" label="SelectToSpeakNavigationControl:disabled"/>
   <int value="-1749176684" label="PauseBackgroundTabs:disabled"/>
-  <int value="-1748485814" label="SuggestedContentToggle:disabled"/>
   <int value="-1747383699" label="QueryTilesInNTP:disabled"/>
   <int value="-1746767834" label="ssl-interstitial-v2-gray"/>
   <int value="-1746708491" label="RemoteCopyPersistentNotification:disabled"/>
   <int value="-1746255521" label="NewOverviewUi:enabled"/>
   <int value="-1743079191" label="SyncPseudoUSSPriorityPreferences:enabled"/>
   <int value="-1742376665" label="SyncPseudoUSSPasswords:disabled"/>
+  <int value="-1741061558" label="AndroidLayoutChangeTabReparenting:enabled"/>
   <int value="-1740519217" label="disable-software-rasterizer"/>
   <int value="-1740093155" label="UnifiedMediaView:disabled"/>
   <int value="-1738416948" label="OptimizationHints:enabled"/>
@@ -42494,9 +43847,11 @@ from previous Chrome versions.
   <int value="-1669486359" label="ImportantSitesInCBD:enabled"/>
   <int value="-1668306615" label="CrostiniUseDlc:enabled"/>
   <int value="-1667822423" label="ContextMenuGoogleLensChip:disabled"/>
+  <int value="-1666652919" label="MagnifierPanningImprovements:disabled"/>
   <int value="-1665720309"
       label="ArcNativeBridge64BitSupportExperiment:disabled"/>
   <int value="-1664795930" label="StorageAccessAPI:disabled"/>
+  <int value="-1664290318" label="ComputePressure:enabled"/>
   <int value="-1663410466" label="top-document-isolation"/>
   <int value="-1663125441" label="OptInImeMenu:enabled"/>
   <int value="-1662646099" label="NTPOfflinePageSuggestions:enabled"/>
@@ -42514,6 +43869,7 @@ from previous Chrome versions.
   <int value="-1648216169" label="NewOmniboxAnswerTypes:disabled"/>
   <int value="-1646016597" label="IsolatePrerenders:disabled"/>
   <int value="-1645071473" label="ChromeColors:disabled"/>
+  <int value="-1644308778" label="WASAPIRawAudioCapture:disabled"/>
   <int value="-1643933608" label="SyncAutofillWalletOfferData:enabled"/>
   <int value="-1641832607" label="DragToPinTabs:enabled"/>
   <int value="-1639050182" label="NavigationPredictorRendererWarmup:enabled"/>
@@ -42533,9 +43889,13 @@ from previous Chrome versions.
       label="AutofillUpstreamEditableCardholderName:disabled"/>
   <int value="-1624854957" label="enable-es3-apis"/>
   <int value="-1624593106" label="NewTabPageBackgrounds:enabled"/>
+  <int value="-1624412478" label="OptimizationGuideModelDownloading:disabled"/>
+  <int value="-1623003151"
+      label="SafeBrowsingkRealTimeUrlLookupEnterpriseGaEndpoint:disabled"/>
   <int value="-1621963267" label="EnableAssistantLauncherUI:enabled"/>
   <int value="-1620804800" label="NoScriptPreviews:disabled"/>
   <int value="-1620568042" label="FeaturePolicy:disabled"/>
+  <int value="-1620230777" label="StylusBatteryStatus:enabled"/>
   <int value="-1620046590" label="UseMediaHistoryStore:enabled"/>
   <int value="-1619757314" label="touch-scrolling-mode"/>
   <int value="-1619146163" label="OverrideSitePrefsForHrefTranslate:disabled"/>
@@ -42556,6 +43916,7 @@ from previous Chrome versions.
   <int value="-1607691647" label="MojoVideoEncodeAccelerator:disabled"/>
   <int value="-1607297082" label="ash-enable-persistent-window-bounds"/>
   <int value="-1607175130" label="force-enable-metrics-reporting"/>
+  <int value="-1605920602" label="AVFoundationCaptureV2:disabled"/>
   <int value="-1605567628" label="disable-overlay-scrollbar"/>
   <int value="-1604051051" label="SpecialLocale:disabled"/>
   <int value="-1603404046" label="V8VmFuture:disabled"/>
@@ -42581,6 +43942,7 @@ from previous Chrome versions.
   <int value="-1578677451" label="EnableAppGridGhost:disabled"/>
   <int value="-1578503491" label="EnableContinueReading:disabled"/>
   <int value="-1578295753" label="UserMediaScreenCapturing:disabled"/>
+  <int value="-1576408607" label="ChromeTipsInMainMenu:enabled"/>
   <int value="-1575868447" label="RemoveNtpFakebox:enabled"/>
   <int value="-1575772949" label="DesktopPWAsLinkCapturing:disabled"/>
   <int value="-1575554415" label="AndroidPaymentAppsFilter:enabled"/>
@@ -42591,13 +43953,14 @@ from previous Chrome versions.
   <int value="-1572010356" label="enable-privet-v3"/>
   <int value="-1571841513" label="enable-devtools-experiments"/>
   <int value="-1571525676" label="FilesSWA:disabled"/>
+  <int value="-1569571629"
+      label="AutofillEnableOffersInClankKeyboardAccessory:disabled"/>
   <int value="-1568737447" label="InsecureFormSubmissionInterstitial:enabled"/>
   <int value="-1568559155" label="WebSocketHandshakeReuseConnection:enabled"/>
   <int value="-1567727398" label="DesktopPWAsWithoutExtensions:disabled"/>
   <int value="-1564232131"
       label="OmniboxOnDeviceHeadProviderNonIncognito:enabled"/>
   <int value="-1562065709" label="ForceEnableDevicesPage:enabled"/>
-  <int value="-1561360053" label="LauncherSettingsSearch:disabled"/>
   <int value="-1561252720" label="AutofillCreditCardUploadFeedback:disabled"/>
   <int value="-1560729847" label="AutofillCacheQueryResponses:enabled"/>
   <int value="-1560650271" label="WasmCodeCache:disabled"/>
@@ -42608,6 +43971,7 @@ from previous Chrome versions.
   <int value="-1553477903" label="ash-disable-text-filtering-in-overview-mode"/>
   <int value="-1553280810" label="PromoBrowserCommands:enabled"/>
   <int value="-1552898031" label="SingleTabMode:enabled"/>
+  <int value="-1551197844" label="AssistMultiWord:enabled"/>
   <int value="-1550760918" label="PipRoundedCorners:disabled"/>
   <int value="-1550675387" label="CriticalPersistedTabData:enabled"/>
   <int value="-1550541457" label="DisplayIdentification:disabled"/>
@@ -42619,6 +43983,7 @@ from previous Chrome versions.
   <int value="-1546351452" label="CrossOriginIsolated:enabled"/>
   <int value="-1546029755" label="OverrideTranslateTriggerInIndia:enabled"/>
   <int value="-1545595496" label="RendererSideResourceScheduler:enabled"/>
+  <int value="-1545384766" label="SignInProfileCreation:disabled"/>
   <int value="-1544248549" label="ArcUseAuthEndpoint:enabled"/>
   <int value="-1543316040"
       label="DisplayPersistenceToggleInPermissionPrompts:disabled"/>
@@ -42640,16 +44005,14 @@ from previous Chrome versions.
   <int value="-1532014193" label="disable-encryption-migration"/>
   <int value="-1530711962" label="PrivacyElevatedAndroid:disabled"/>
   <int value="-1529907580" label="ImeServiceConnectable:disabled"/>
-  <int value="-1529899201" label="H264DecoderBufferIsCompleteFrame:disabled"/>
   <int value="-1529631789" label="enable-unsafe-fast-js-calls"/>
   <int value="-1529140321" label="ReadLater:enabled"/>
   <int value="-1528455406" label="OmniboxPedalSuggestions:enabled"/>
+  <int value="-1527094429" label="ArcRtVcpuQuadCore:disabled"/>
   <int value="-1525129540"
       label="OmniboxUIExperimentRevealSteadyStateUrlPathQueryAndRefOnHover:disabled"/>
   <int value="-1524323669" label="InstalledAppsInCbd:enabled"/>
   <int value="-1521339691" label="UseGles2ForOopR:disabled"/>
-  <int value="-1521296022"
-      label="UpdateNotificationScheduleServiceImmediateShowOption:disabled"/>
   <int value="-1521160841" label="DismissNtpPromos:enabled"/>
   <int value="-1520952503" label="SearchReadyOmnibox:enabled"/>
   <int value="-1520855274" label="PWAFullCodeCache:disabled"/>
@@ -42671,11 +44034,15 @@ from previous Chrome versions.
   <int value="-1497450774" label="TreatUnsafeDownloadsAsActive:disabled"/>
   <int value="-1497338981" label="disable-accelerated-overflow-scroll"/>
   <int value="-1496106797" label="IPH_PasswordsAccountStorage:enabled"/>
+  <int value="-1495973732"
+      label="ResamplingScrollEventsExperimentalPrediction:disabled"/>
   <int value="-1492934655" label="TabSwitcherOnReturn:enabled"/>
   <int value="-1492609320"
       label="TurnOffStreamingMediaCachingOnBattery:disabled"/>
   <int value="-1492589689" label="ContentSuggestionsCategories:enabled"/>
   <int value="-1492211482" label="EnableWindowsGamingInputDataFetcher:enabled"/>
+  <int value="-1491705891"
+      label="EnableBluetoothVerboseLogsForGooglers:disabled"/>
   <int value="-1491417046" label="enable-fullscreen-toolbar-reveal"/>
   <int value="-1491304576" label="ProgressBarThrottle:disabled"/>
   <int value="-1490298774" label="enable-captive-portal-bypass-proxy-option"/>
@@ -42691,6 +44058,7 @@ from previous Chrome versions.
   <int value="-1480926949" label="MaterialDesignBookmarks:enabled"/>
   <int value="-1480866718" label="ash-disable-login-dim-and-blur"/>
   <int value="-1480606359" label="AssistantIntentPageUrl:enabled"/>
+  <int value="-1478929417" label="MojoLinuxChannelSharedMem:enabled"/>
   <int value="-1478876902" label="disable-permission-action-reporting"/>
   <int value="-1478137998" label="lite-video-default-downlink-bandwidth-kbps"/>
   <int value="-1477686864" label="OmniboxRichAutocompletion:enabled"/>
@@ -42700,6 +44068,7 @@ from previous Chrome versions.
       label="OverrideLanguagePrefsForHrefTranslate:enabled"/>
   <int value="-1473878093" label="HideArcMediaNotifications:disabled"/>
   <int value="-1473668019" label="token-binding:disabled"/>
+  <int value="-1473537658" label="DeprecateLowUsageCodecs:disabled"/>
   <int value="-1473136627" label="enable-web-payments"/>
   <int value="-1472825316" label="ContextualSearchLongpressResolve:enabled"/>
   <int value="-1471021059"
@@ -42723,6 +44092,7 @@ from previous Chrome versions.
   <int value="-1461261930" label="OutOfBlinkCORS:disabled"/>
   <int value="-1460598402"
       label="EnterpriseReportingApiKeychainRecreation:disabled"/>
+  <int value="-1460561942" label="SystemEmojiPicker:disabled"/>
   <int value="-1460462432" label="disable-media-source"/>
   <int value="-1457775295" label="PasswordSearchMobile:disabled"/>
   <int value="-1456789591" label="MediaFoundationVideoCapture:enabled"/>
@@ -42741,6 +44111,7 @@ from previous Chrome versions.
   <int value="-1450657485" label="EnableHardwareMirrorMode:enabled"/>
   <int value="-1450576851" label="OmniboxUIExperimentVerticalLayout:enabled"/>
   <int value="-1449590570" label="RestrictGamepadAccess:enabled"/>
+  <int value="-1449358747" label="RemoveStatusBarInWebApps:enabled"/>
   <int value="-1448511207" label="UseMessagesStagingUrl:disabled"/>
   <int value="-1447147245" label="VideoPlayerNativeControls:enabled"/>
   <int value="-1446625028" label="CrostiniUsbAllowUnsupported:enabled"/>
@@ -42763,9 +44134,11 @@ from previous Chrome versions.
   <int value="-1431563697" label="WebPaymentsMethodSectionOrderV2:enabled"/>
   <int value="-1430090822" label="EnableSharedImageForWebview:disabled"/>
   <int value="-1428589407" label="WebRTCPipeWireCapturer:disabled"/>
+  <int value="-1426911497" label="CCTIncognitoAvailableToThirdParty:enabled"/>
   <int value="-1426817842" label="BlockTabUnders:enabled"/>
   <int value="-1426150007" label="ignore-previews-blacklist"/>
   <int value="-1426034869" label="NoCreditCardAbort:enabled"/>
+  <int value="-1425919952" label="EnableLauncherSearchNormalization:enabled"/>
   <int value="-1423348289" label="NupPrinting:disabled"/>
   <int value="-1423193305"
       label="AutofillRationalizeRepeatedServerPredictions:enabled"/>
@@ -42779,8 +44152,6 @@ from previous Chrome versions.
   <int value="-1416184931" label="TranslateRankerEnforcement:enabled"/>
   <int value="-1412230070" label="query-tiles-instant-background-task"/>
   <int value="-1411733990" label="OmniboxDedupeGoogleDriveURLs:disabled"/>
-  <int value="-1411219910"
-      label="enable-experimental-accessibility-chromevox-annotations"/>
   <int value="-1411003295" label="disable-encrypted-media"/>
   <int value="-1410394131" label="EvDetailsInPageInfo:enabled"/>
   <int value="-1410001116"
@@ -42798,7 +44169,10 @@ from previous Chrome versions.
   <int value="-1399753480" label="disable-harfbuzz-rendertext"/>
   <int value="-1399419572" label="enable-app-list"/>
   <int value="-1396974542" label="UserMediaScreenCapturing:enabled"/>
+  <int value="-1396434715" label="AssistMultiWord:disabled"/>
   <int value="-1392689905" label="ServiceWorkerLongRunningMessage:enabled"/>
+  <int value="-1392673888"
+      label="PolicyBlocklistThrottleRequiresPoliciesLoaded:enabled"/>
   <int value="-1392562498" label="disable-origin-chip"/>
   <int value="-1391728260" label="ContextualSearchDefinitions:enabled"/>
   <int value="-1391693054"
@@ -42808,6 +44182,7 @@ from previous Chrome versions.
       label="SyncPseudoUSSHistoryDeleteDirectives:enabled"/>
   <int value="-1390005994" label="AppCache:disabled"/>
   <int value="-1388817073" label="OmniboxReverseAnswers:disabled"/>
+  <int value="-1388044691" label="ContentLanguagesInLanguagePicker:enabled"/>
   <int value="-1386966873" label="disable-mac-views-native-app-windows"/>
   <int value="-1386790338" label="ImeMozcProto:disabled"/>
   <int value="-1386776772" label="FilesZipPack:disabled"/>
@@ -42911,11 +44286,14 @@ from previous Chrome versions.
   <int value="-1302859198" label="enable-stylus-virtual-keyboard:disabled"/>
   <int value="-1301804101"
       label="AutofillEnableInfoBarAccountIndicationFooterForSingleAccountUsers:disabled"/>
+  <int value="-1301167148" label="WebViewZeroCopyVideo:disabled"/>
   <int value="-1297079591" label="EnableRemovingAllThirdPartyCookies:disabled"/>
+  <int value="-1295288468" label="MemoriesDebug:enabled"/>
   <int value="-1294050129" label="ContentFullscreen:disabled"/>
   <int value="-1293987566" label="OmniboxZeroSuggestionsOnNTPRealbox:disabled"/>
   <int value="-1292615467"
       label="OmniboxSuggestionTransparencyOptions:disabled"/>
+  <int value="-1291963295" label="ComputePressure:disabled"/>
   <int value="-1290471006"
       label="EnableHistoryFaviconsGoogleServerQuery:enabled"/>
   <int value="-1290053302"
@@ -42931,6 +44309,7 @@ from previous Chrome versions.
   <int value="-1282992935"
       label="AutofillLocalCardMigrationShowFeedback:disabled"/>
   <int value="-1281465357" label="MacV2GPUSandbox:disabled"/>
+  <int value="-1280673966" label="PluginVmFullscreen:disabled"/>
   <int value="-1278796760" label="QueryInOmnibox:enabled"/>
   <int value="-1276912933" label="enable-quick-unlock-pin"/>
   <int value="-1276579737" label="PictureInPictureAPI:disabled"/>
@@ -42952,6 +44331,7 @@ from previous Chrome versions.
   <int value="-1261263046"
       label="RemoveUsageOfDeprecatedGaiaSigninEndpoint:disabled"/>
   <int value="-1259901957" label="VrBrowserKeyboard:disabled"/>
+  <int value="-1259627326" label="AllowRepeatedUpdates:disabled"/>
   <int value="-1258141852" label="ScrollUnification:enabled"/>
   <int value="-1256823053" label="WebRtcHWVP9Encoding:enabled"/>
   <int value="-1256747007"
@@ -42963,6 +44343,7 @@ from previous Chrome versions.
   <int value="-1254221389" label="AssistantBetterOnboarding:enabled"/>
   <int value="-1254070521" label="enable-slimming-paint-invalidation"/>
   <int value="-1253608371" label="IncognitoStrings:disabled"/>
+  <int value="-1252978870" label="TextFragmentColorChange:disabled"/>
   <int value="-1252976780" label="ShillSandboxing:disabled"/>
   <int value="-1252706530" label="AutoFetchOnNetErrorPage:disabled"/>
   <int value="-1251411236" label="disable-new-md-input-view"/>
@@ -42977,13 +44358,17 @@ from previous Chrome versions.
   <int value="-1241868814" label="WebAuthenticationPhoneSupport:disabled"/>
   <int value="-1241747717" label="enable-android-password-link"/>
   <int value="-1241002324" label="FocusMode:enabled"/>
+  <int value="-1239515260" label="OmniboxDisableCGIParamMatching:disabled"/>
   <int value="-1239262870" label="TextFragmentAnchor:enabled"/>
   <int value="-1238992816" label="ShelfDimming:enabled"/>
   <int value="-1237921078" label="SyncUSSNigori:enabled"/>
+  <int value="-1237821073" label="SharedHighlightingUseBlocklist:enabled"/>
   <int value="-1237621246" label="WebXRGamepadSupport:disabled"/>
   <int value="-1236065190" label="HardwareMediaKeyHandling:disabled"/>
   <int value="-1235586511" label="enable-datasaver-prompt"/>
   <int value="-1234740672" label="UsePdfCompositorServiceForPrint:disabled"/>
+  <int value="-1234518922" label="ChromeLabs:disabled"/>
+  <int value="-1234385389" label="TextFragmentColorChange:enabled"/>
   <int value="-1232629319" label="ResamplingScrollEvents:disabled"/>
   <int value="-1231507397" label="NtpZeroSuggest:enabled"/>
   <int value="-1230610048" label="SyncWifiConfigurations:disabled"/>
@@ -43031,7 +44416,10 @@ from previous Chrome versions.
   <int value="-1197245070" label="CookieDeprecationMessages:disabled"/>
   <int value="-1197035323" label="ZeroSuggestRedirectToChrome:disabled"/>
   <int value="-1195194959" label="XGEOVisibleNetworks:disabled"/>
+  <int value="-1195034892" label="ContinuousSearch:disabled"/>
   <int value="-1194129602" label="ClientSideDetectionModelOnAndroid:disabled"/>
+  <int value="-1192790333" label="ArcUseHighMemoryDalvikProfile:disabled"/>
+  <int value="-1191671217" label="TabGroupsNewBadgePromo:disabled"/>
   <int value="-1191258368" label="PageInfoPerformanceHints:disabled"/>
   <int value="-1190174011" label="enable-hdr"/>
   <int value="-1186760297" label="ForceSpectreVariant2Mitigation:disabled"/>
@@ -43043,6 +44431,7 @@ from previous Chrome versions.
   <int value="-1182777927" label="ShareButtonInTopToolbar:enabled"/>
   <int value="-1182087678"
       label="CrossOriginOpenerPolicyAccessReporting:disabled"/>
+  <int value="-1179917414" label="DefaultChromeAppUninstallSync:disabled"/>
   <int value="-1178350793" label="RemoteCopyReceiver:disabled"/>
   <int value="-1177802205" label="enable-hosted-app-quit-notification"/>
   <int value="-1176748003"
@@ -43052,6 +44441,7 @@ from previous Chrome versions.
   <int value="-1173361620" label="CCTModulePostMessage:disabled"/>
   <int value="-1172572865" label="NTPShowGoogleGInOmnibox:enabled"/>
   <int value="-1172204005" label="enable-offline-auto-reload-visible-only"/>
+  <int value="-1170286604" label="Commander:disabled"/>
   <int value="-1168910727"
       label="enable-experimental-accessibility-language-detection-dynamic"/>
   <int value="-1167992523" label="DesktopPWAsCustomTabUI:disabled"/>
@@ -43069,13 +44459,14 @@ from previous Chrome versions.
   <int value="-1159563774" label="enable-accessibility-script-injection"/>
   <int value="-1159369873" label="TabGroupsUiImprovementsAndroid:disabled"/>
   <int value="-1159154050" label="FilesSinglePartitionFormat:enabled"/>
+  <int value="-1159151875" label="RecordWebAppDebugInfo:disabled"/>
   <int value="-1158993534" label="PrintScaling:enabled"/>
+  <int value="-1156950420"
+      label="CryptAuthV2DeviceActivityStatusUseConnectivity:enabled"/>
   <int value="-1156179600" label="OmniboxRichEntitySuggestions:enabled"/>
   <int value="-1155543191" label="CopylessPaste:disabled"/>
   <int value="-1154834060" label="OmniboxRichAutocompletion:disabled"/>
   <int value="-1154819618" label="FilesNG:enabled"/>
-  <int value="-1154394293"
-      label="UpdateNotificationScheduleServiceImmediateShowOption:enabled"/>
   <int value="-1154343236" label="VrBrowsingTabsView:disabled"/>
   <int value="-1153892430"
       label="AlignFontDisplayAutoTimeoutWithLCPGoal:enabled"/>
@@ -43087,6 +44478,7 @@ from previous Chrome versions.
   <int value="-1145905507" label="SendTabToSelfWhenSignedIn:disabled"/>
   <int value="-1145702446" label="ChromeHomeInactivitySheetExpansion:enabled"/>
   <int value="-1145246849" label="ThirdPartyDoodles:enabled"/>
+  <int value="-1144754105" label="ScalableStatusArea:enabled"/>
   <int value="-1144501989" label="UserActivityPredictionMlService:disabled"/>
   <int value="-1143496217" label="enable-oop-rasterization"/>
   <int value="-1143007275" label="EnableNewStyleLauncher:disabled"/>
@@ -43098,6 +44490,7 @@ from previous Chrome versions.
   <int value="-1136627751" label="ignore-autocomplete-off-autofill"/>
   <int value="-1136509631" label="ssl-interstitial-v1"/>
   <int value="-1134420065" label="CriticalPersistedTabData:disabled"/>
+  <int value="-1134412904" label="PrivacySandboxSettings:disabled"/>
   <int value="-1134307340" label="stop-loading-in-background:enabled"/>
   <int value="-1132704128" label="AndroidPaymentAppsFilter:disabled"/>
   <int value="-1128912963" label="MediaControlsExpandGesture:disabled"/>
@@ -43120,6 +44513,7 @@ from previous Chrome versions.
   <int value="-1114080030" label="ResourceLoadingHints:enabled"/>
   <int value="-1112782121" label="AndroidSigninPromos:disabled"/>
   <int value="-1109826787" label="AccessibilityExposeDisplayNone:enabled"/>
+  <int value="-1108636917" label="DetectedSourceLanguageOption:enabled"/>
   <int value="-1107762575" label="enable-data-reduction-proxy-config-client"/>
   <int value="-1107103335" label="FsNosymfollow:enabled"/>
   <int value="-1105637876" label="FilteringScrollPrediction:enabled"/>
@@ -43134,6 +44528,7 @@ from previous Chrome versions.
       label="SupervisedUserCommittedInterstitials:enabled"/>
   <int value="-1096595907" label="disable-new-virtual-keyboard-behavior"/>
   <int value="-1095947169" label="ModalPermissionDialogView:disabled"/>
+  <int value="-1093135462" label="DesktopPWAsAttentionBadgingCrOS:disabled"/>
   <int value="-1092211161" label="BluetoothWbsDogfood:disabled"/>
   <int value="-1088804127" label="DuetTabStripIntegrationAndroid:disabled"/>
   <int value="-1086728979" label="kids-management-url-classification:enabled"/>
@@ -43163,12 +44558,17 @@ from previous Chrome versions.
   <int value="-1064733740" label="ui-show-composited-layer-borders"/>
   <int value="-1064302126"
       label="OmniboxAlternateMatchDescriptionSeparator:enabled"/>
+  <int value="-1062534902" label="SyncingCompromisedCredentials:disabled"/>
   <int value="-1062119671" label="enable-password-force-saving"/>
   <int value="-1061203892" label="VideoToolboxVp9Decoding:disabled"/>
+  <int value="-1060574877"
+      label="PolicyBlocklistThrottleRequiresPoliciesLoaded:disabled"/>
   <int value="-1060541241" label="ForcePreferredIntervalForVideo:enabled"/>
   <int value="-1060395248" label="PasswordSearchMobile:enabled"/>
+  <int value="-1057056167" label="VirtualKeyboardMultipaste:enabled"/>
   <int value="-1056860259"
       label="OmniboxEnableClipboardProviderImageSuggestions:enabled"/>
+  <int value="-1056629722" label="AssistantIntentTranslateInfo:enabled"/>
   <int value="-1056310158" label="disable-memory-pressure-chromeos"/>
   <int value="-1055845287" label="SensorContentSetting:enabled"/>
   <int value="-1052782474" label="enable-cloud-devices"/>
@@ -43182,16 +44582,17 @@ from previous Chrome versions.
   <int value="-1046627610" label="password-import:enabled"/>
   <int value="-1045900007" label="NoCreditCardAbort:disabled"/>
   <int value="-1045882995" label="UseNewDoodleApi:enabled"/>
-  <int value="-1044244605"
-      label="UpdateNotificationSchedulingIntegration:enabled"/>
   <int value="-1043883835" label="Sharesheet:enabled"/>
   <int value="-1042723808"
       label="HappinessTrackingSurveysForDesktopSettingsPrivacy:enabled"/>
   <int value="-1042579955" label="ChromeOSParentalControlsSettings:enabled"/>
   <int value="-1041650038" label="enable-forced-migration-to-tabbed-mode"/>
+  <int value="-1041150041" label="ContextualSearchLiteralSearchTap:disabled"/>
   <int value="-1040000888" label="ContextMenuSearchWithGoogleLens:disabled"/>
   <int value="-1039889738" label="NativeNotifications:enabled"/>
   <int value="-1039555838" label="GamepadExtensions:enabled"/>
+  <int value="-1037950113"
+      label="ResamplingScrollEventsExperimentalPrediction:enabled"/>
   <int value="-1037128156" label="HomeLauncherGestures:disabled"/>
   <int value="-1035346097" label="SyncErrorInfoBarAndroid:enabled"/>
   <int value="-1035140982" label="ClientSideDetectionModelOnAndroid:enabled"/>
@@ -43199,6 +44600,8 @@ from previous Chrome versions.
   <int value="-1033738911" label="enable-mac-views-dialogs"/>
   <int value="-1032884201" label="HeavyAdPrivacyMitigations:enabled"/>
   <int value="-1031350684" label="PdfIsolation:disabled"/>
+  <int value="-1030530357" label="PwaInstallUseBottomSheet:disabled"/>
+  <int value="-1030513821" label="DetectedSourceLanguageOption:disabled"/>
   <int value="-1029920490" label="IdleTimeSpellChecking:enabled"/>
   <int value="-1028733699" label="MacViewsWebUIDialogs:disabled"/>
   <int value="-1028251580" label="GamepadPollingInterval:disabled"/>
@@ -43207,6 +44610,7 @@ from previous Chrome versions.
   <int value="-1026192558" label="OopRasterizationDDL:enabled"/>
   <int value="-1025125875" label="AssistantTimersV2:disabled"/>
   <int value="-1022971520" label="enable-search-button-in-omnibox-for-str"/>
+  <int value="-1022281869" label="ArcRtVcpuDualCore:enabled"/>
   <int value="-1022165708" label="BreakingNewsPush:disabled"/>
   <int value="-1021097344" label="PolicyAtomicGroup:disabled"/>
   <int value="-1020450980" label="gesture-deletion"/>
@@ -43225,7 +44629,9 @@ from previous Chrome versions.
   <int value="-1011390415" label="AutofillRejectCompanyBirthyear:enabled"/>
   <int value="-1010588306" label="SlideTopChromeWithPageScrolls:disabled"/>
   <int value="-1008511612" label="EnableCustomMacPaperSizes:disabled"/>
+  <int value="-1007961880" label="PrivacySandboxSettings:enabled"/>
   <int value="-1005164075" label="ContextualSearchTranslations:enabled"/>
+  <int value="-1002537430" label="HudDisplayForPerformanceMetrics:disabled"/>
   <int value="-1001837588" label="EnableAppReinstallZeroState:enabled"/>
   <int value="-1000671573" label="TemporaryUnexpireFlagsM80:enabled"/>
   <int value="-998731974" label="WinUseBrowserSpellChecker:enabled"/>
@@ -43240,12 +44646,14 @@ from previous Chrome versions.
   <int value="-993476089" label="AutoScreenBrightness:disabled"/>
   <int value="-992785453" label="ExplicitLanguageAsk:disabled"/>
   <int value="-992554993" label="TemporaryHoldingSpacePreviews:disabled"/>
+  <int value="-991416218" label="PdfViewerPresentationMode:enabled"/>
   <int value="-991253797"
       label="OmniboxSpeculativeServiceWorkerStartOnQueryInput:disabled"/>
   <int value="-990187062" label="SendTabToSelfShowSendingUI:enabled"/>
   <int value="-989671895" label="OfflineIndicatorAlwaysHttpProbe:enabled"/>
   <int value="-989050085" label="AppStoreBillingDebug:enabled"/>
   <int value="-987470173" label="ClickToCallOpenDialerDirectly:disabled"/>
+  <int value="-987191098" label="FontAccessPersistent:disabled"/>
   <int value="-984052166" label="DoodlesOnLocalNtp:enabled"/>
   <int value="-983342281" label="TabSwitcherLongpressMenu:disabled"/>
   <int value="-981237342" label="SyncUSSAutofillWalletMetadata:disabled"/>
@@ -43285,6 +44693,7 @@ from previous Chrome versions.
   <int value="-957200826" label="enable-spdy-proxy-auth"/>
   <int value="-956696029" label="scheduler-configuration"/>
   <int value="-953215709" label="StorageAccessAPI:enabled"/>
+  <int value="-952996862" label="ArcUseHighMemoryDalvikProfile:enabled"/>
   <int value="-951394314" label="top-chrome-md"/>
   <int value="-950793721" label="TranslateUI2016Q2:disabled"/>
   <int value="-950411190"
@@ -43298,6 +44707,7 @@ from previous Chrome versions.
   <int value="-939676447" label="CrostiniResetLxdDb:enabled"/>
   <int value="-938178614" label="enable-suggestions-with-substring-match"/>
   <int value="-937430451" label="IntensiveWakeUpThrottling:disabled"/>
+  <int value="-934163513" label="EcheSWA:enabled"/>
   <int value="-933377608"
       label="OmniboxUIExperimentHideSteadyStateUrlScheme:enabled"/>
   <int value="-933316841" label="enable-permissions-blacklist"/>
@@ -43314,6 +44724,7 @@ from previous Chrome versions.
   <int value="-920204598" label="ScrollAnchorSerialization:enabled"/>
   <int value="-918900957" label="AutofillCreditCardAssist:disabled"/>
   <int value="-918618075" label="enable-service-worker"/>
+  <int value="-916780902" label="ExternalPciDevicesAllowed:enabled"/>
   <int value="-915328316" label="CupsIppPrintingBackend:disabled"/>
   <int value="-915035507" label="ArcPrintSpoolerExperiment:enabled"/>
   <int value="-914210146" label="enable-web-based-signin"/>
@@ -43327,6 +44738,7 @@ from previous Chrome versions.
   <int value="-907234795" label="NewAudioRenderingMixingStrategy:disabled"/>
   <int value="-905538983" label="SimplifyHttpsIndicator:disabled"/>
   <int value="-902125579" label="ImmersiveUiMode:disabled"/>
+  <int value="-899915066" label="ImprovedKeyboardShortcuts:disabled"/>
   <int value="-899393472" label="enable-new-app-menu-icon"/>
   <int value="-899334103" label="disable-fast-text-autosizing"/>
   <int value="-899265865" label="DismissNtpPromos:disabled"/>
@@ -43346,6 +44758,7 @@ from previous Chrome versions.
   <int value="-887094098" label="ForcedColors:enabled"/>
   <int value="-886912558" label="ChromeHomePromo:enabled"/>
   <int value="-886898803" label="CooperativeScheduling:enabled"/>
+  <int value="-886509859" label="DefaultChromeAppUninstallSync:enabled"/>
   <int value="-885601782" label="enable-contextual-search"/>
   <int value="-885209667" label="FilesZipMount:disabled"/>
   <int value="-884864731" label="WebPaymentsSingleAppUiSkip:enabled"/>
@@ -43363,8 +44776,10 @@ from previous Chrome versions.
       label="OmniboxEnableClipboardProviderTextSuggestions:enabled"/>
   <int value="-874602599" label="HorizontalTabSwitcherAndroid:enabled"/>
   <int value="-872764392" label="ContextualSuggestionsBottomSheet:disabled"/>
+  <int value="-871784177" label="DeprecateMenagerieAPI:enabled"/>
   <int value="-871520682"
       label="AccessibilityInternalsPageImprovements:enabled"/>
+  <int value="-870994173" label="NtpChromeCartModule:enabled"/>
   <int value="-870120067" label="EnableSearchBoxSelection:enabled"/>
   <int value="-868138290" label="CrostiniPortForwarding:disabled"/>
   <int value="-867087281" label="enable-virtual-keyboard"/>
@@ -43380,6 +44795,7 @@ from previous Chrome versions.
   <int value="-860534647" label="SiteDetails:enabled"/>
   <int value="-858280894" label="DelayCompetingLowPriorityRequests:disabled"/>
   <int value="-856915246" label="enable-new-audio-rendering-mixing-strategy"/>
+  <int value="-856407187" label="OnDeviceGrammarCheck:disabled"/>
   <int value="-856146376"
       label="disable_idle_sockets_close_on_memory_pressure:disabled"/>
   <int value="-856016114" label="NTPOfflinePages:disabled"/>
@@ -43389,6 +44805,8 @@ from previous Chrome versions.
   <int value="-854716639" label="TranslateAndroidManualTrigger:enabled"/>
   <int value="-854519621" label="PointerLockOptions:disabled"/>
   <int value="-853594220" label="disable-new-avatar-menu"/>
+  <int value="-853455968"
+      label="OmniboxDefaultTypedNavigationsToHttps:disabled"/>
   <int value="-850821337" label="WebContentsForceDark:enabled"/>
   <int value="-848691867" label="DesktopPWAWindowing:enabled"/>
   <int value="-847216521" label="ChromeDuplex:enabled"/>
@@ -43411,6 +44829,8 @@ from previous Chrome versions.
   <int value="-824199802" label="ContextualSearchSimplifiedServer:enabled"/>
   <int value="-823394398" label="TargetEmbeddingLookalikes:enabled"/>
   <int value="-823165021" label="MaterialDesignUserMenu:enabled"/>
+  <int value="-822712881"
+      label="ContextualSearchThinWebViewImplementation:enabled"/>
   <int value="-821635312" label="EyeDropper:enabled"/>
   <int value="-820041355" label="enable-transition-compositing"/>
   <int value="-819165158" label="ScrollableTabStripButtons:enabled"/>
@@ -43426,6 +44846,7 @@ from previous Chrome versions.
   <int value="-810684526"
       label="AutofillToolkitViewsCreditCardDialogsMac:disabled"/>
   <int value="-810110236" label="EditPasswordsInSettings:enabled"/>
+  <int value="-809456392" label="WebViewVulkanIntermediateBuffer:enabled"/>
   <int value="-808486493" label="NewWallpaperPicker:disabled"/>
   <int value="-806549905"
       label="TabbedAppOverflowMenuThreeButtonActionbar:disabled"/>
@@ -43434,6 +44855,7 @@ from previous Chrome versions.
   <int value="-803233334" label="AutofillRefreshStyleAndroid:disabled"/>
   <int value="-803206774" label="TabbedAppOverflowMenuActionBar:disabled"/>
   <int value="-802348444" label="disable-site-engagement-service"/>
+  <int value="-802309777" label="ChromeTipsInMainMenu:disabled"/>
   <int value="-799931058" label="UseMultiloginEndpoint:disabled"/>
   <int value="-798187384" label="try-supported-channel-layouts"/>
   <int value="-797520931" label="ExtensionsToolbarMenu:disabled"/>
@@ -43489,9 +44911,10 @@ from previous Chrome versions.
   <int value="-747919789" label="VideoToolboxVp9Decoding:enabled"/>
   <int value="-747463111" label="ContentSuggestionsNotifications:disabled"/>
   <int value="-747072690" label="NtpRepeatableQueries:disabled"/>
-  <int value="-746482855" label="GuestOsExternalProtocol:disabled"/>
   <int value="-746328467" label="ExpensiveBackgroundTimerThrottling:disabled"/>
   <int value="-745082968" label="SyncDeviceInfoInTransportMode:disabled"/>
+  <int value="-745005043"
+      label="enable-experimental-accessibility-switch-access-setup-guide"/>
   <int value="-744159181" label="disable-spdy-proxy-dev-auth-origin"/>
   <int value="-743590125" label="TabEngagementReportingAndroid:enabled"/>
   <int value="-743103250" label="enable-linkable-ephemeral-apps"/>
@@ -43510,6 +44933,7 @@ from previous Chrome versions.
   <int value="-728461030" label="AutofillPruneSuggestions:disabled"/>
   <int value="-727860269" label="WebAuthenticationBle:disabled"/>
   <int value="-726892130" label="AndroidMessagesIntegration:disabled"/>
+  <int value="-726567328" label="disable-virtual-keyboard"/>
   <int value="-723224470" label="enable-password-force-saving:enabled"/>
   <int value="-722474177" label="browser-side-navigation:disabled"/>
   <int value="-721685663" label="WebViewMixedContentAutoupgrades:enabled"/>
@@ -43528,14 +44952,19 @@ from previous Chrome versions.
   <int value="-714710496" label="VideoFullscreenOrientationLock:disabled"/>
   <int value="-714543772" label="enable-gpu-service-logging"/>
   <int value="-714043324" label="OutOfBlinkCORS:enabled"/>
+  <int value="-713104676"
+      label="DisablePeripheralDataAccessProtection:enabled"/>
   <int value="-711991950" label="SiteExplorationUi:enabled"/>
   <int value="-711890895" label="enable-website-settings-manager"/>
+  <int value="-711422585" label="kSignInProfileCreationEnterprise:disabled"/>
   <int value="-709058455" label="ui-slow-animations"/>
   <int value="-706733351" label="enable-floating-virtual-keyboard:enabled"/>
   <int value="-706159808" label="QuickAnswersOnEditableText:disabled"/>
   <int value="-705746939" label="ChromeDuet:enabled"/>
+  <int value="-704459022" label="ContinuousSearch:enabled"/>
   <int value="-704232562" label="UseMonitorColorSpace:enabled"/>
   <int value="-702477233" label="ContentFullscreen:enabled"/>
+  <int value="-700762821" label="RequestDesktopSiteForTablets:disabled"/>
   <int value="-700300613" label="use-fake-device-for-media-stream:disabled"/>
   <int value="-699767107" label="enable-sync-app-list"/>
   <int value="-699198009" label="KeyboardShortcutViewer:enabled"/>
@@ -43556,6 +44985,7 @@ from previous Chrome versions.
   <int value="-683370370" label="EnableAppDataSearch:enabled"/>
   <int value="-683306022" label="OverscrollHistoryNavigation:enabled"/>
   <int value="-682580680" label="DisableOfficeEditingComponentApp:disabled"/>
+  <int value="-681434111" label="WebFeed:disabled"/>
   <int value="-680787130" label="ExperimentalVRFeatures:disabled"/>
   <int value="-680589442" label="MacRTL:disabled"/>
   <int value="-679500267" label="UseXpsForPrinting:disabled"/>
@@ -43569,8 +44999,10 @@ from previous Chrome versions.
   <int value="-667517406" label="overscroll-history-navigation"/>
   <int value="-667018797"
       label="OmniboxUIExperimentBlueTitlesAndGrayUrlsOnPageSuggestions:disabled"/>
+  <int value="-666712735" label="FeedShare:disabled"/>
   <int value="-666508951" label="CrOSContainer:enabled"/>
   <int value="-665514294" label="FontAccess:disabled"/>
+  <int value="-665006585" label="Bento:enabled"/>
   <int value="-663476391" label="enable-pixel-canvas-recording:enabled"/>
   <int value="-662720891" label="PreviewsCoinFlipHoldback_UKMOnly:enabled"/>
   <int value="-662314979"
@@ -43578,6 +45010,7 @@ from previous Chrome versions.
   <int value="-662064703" label="MediaSessionService:enabled"/>
   <int value="-661978438" label="enable-data-reduction-proxy-lo-fi"/>
   <int value="-660160292" label="enable-apps-show-on-first-paint"/>
+  <int value="-658319177" label="VaapiAV1Decoder:disabled"/>
   <int value="-657808907" label="CopyLinkToText:disabled"/>
   <int value="-654196854" label="PasswordsKeyboardAccessory:enabled"/>
   <int value="-653616608" label="MacSyscallSandbox:disabled"/>
@@ -43586,8 +45019,10 @@ from previous Chrome versions.
   <int value="-650176557" label="OfflinePagesSvelteConcurrentLoading:enabled"/>
   <int value="-649956990" label="enable-harfbuzz-rendertext"/>
   <int value="-648925189" label="ExploreSites:enabled"/>
+  <int value="-648593261" label="Memories:enabled"/>
   <int value="-645455405" label="MacViewsNativeDialogs:enabled"/>
   <int value="-643217597" label="EduCoexistenceConsentLog:enabled"/>
+  <int value="-642346675" label="DesktopPWAsAttentionBadgingCrOS:enabled"/>
   <int value="-641820371" label="EnableCustomMacPaperSizes:enabled"/>
   <int value="-641719457" label="disable-compositor-touch-hit-testing"/>
   <int value="-640191786" label="DesktopPWAsWithoutExtensions:enabled"/>
@@ -43595,6 +45030,7 @@ from previous Chrome versions.
   <int value="-639026783" label="disable-gpu-appcontainer"/>
   <int value="-638952203" label="RendererSideResourceScheduler:disabled"/>
   <int value="-637215276" label="QuickAnswersOnEditableText:enabled"/>
+  <int value="-634865673" label="ThemeRefactorAndroid:enabled"/>
   <int value="-634122679" label="GoogleBrandedContextMenu:enabled"/>
   <int value="-634116286"
       label="OmniboxUIExperimentUnboldSuggestionText:enabled"/>
@@ -43609,6 +45045,7 @@ from previous Chrome versions.
   <int value="-623364791" label="ClickToCallReceiver:disabled"/>
   <int value="-622685174" label="enable-pdf-material-ui"/>
   <int value="-621382525" label="VizDisplayCompositor:enabled"/>
+  <int value="-620902693" label="PageInfoHistory:disabled"/>
   <int value="-620030047" label="CrosCompUpdates:disabled"/>
   <int value="-619740638" label="ListAllDisplayModes:enabled"/>
   <int value="-619665653" label="DisableKeepaliveFetch:disabled"/>
@@ -43623,6 +45060,7 @@ from previous Chrome versions.
   <int value="-612480090" label="FasterLocationReload:enabled"/>
   <int value="-610411643" label="enable-printer-app-search"/>
   <int value="-608775184" label="PasswordsWeaknessCheck:enabled"/>
+  <int value="-607925721" label="WebViewVulkan:disabled"/>
   <int value="-606898702" label="MaterialDesignSettings:disabled"/>
   <int value="-606696801" label="TabGroupsUiImprovementsAndroid:enabled"/>
   <int value="-606431158" label="DrawVerticallyEdgeToEdge:enabled"/>
@@ -43633,12 +45071,14 @@ from previous Chrome versions.
   <int value="-603649079" label="ContextualSearchRankerQuery:enabled"/>
   <int value="-601384286" label="disable-contextual-search"/>
   <int value="-600792432" label="WebVrAutopresentFromIntent:disabled"/>
+  <int value="-600726805" label="DeprecateMenagerieAPI:disabled"/>
   <int value="-599932554" label="DoodlesOnLocalNtp:disabled"/>
   <int value="-599005750" label="ScanningUI:disabled"/>
   <int value="-598050737" label="disable-es3-apis"/>
   <int value="-596337171" label="disable-ash-sidebar"/>
   <int value="-595819071"
       label="OmniboxUIExperimentBlueTitlesOnPageSuggestions:disabled"/>
+  <int value="-595353721" label="RecordWebAppDebugInfo:enabled"/>
   <int value="-594076614" label="PluginVmShowCameraPermissions:disabled"/>
   <int value="-593536514" label="ExperimentalTabController:enabled"/>
   <int value="-591874964" label="LiteVideo:enabled"/>
@@ -43650,6 +45090,7 @@ from previous Chrome versions.
   <int value="-579192400" label="disable-input-view"/>
   <int value="-577982497" label="CupsPrintersUiOverhaul:enabled"/>
   <int value="-574354898" label="PostQuantumCECPQ2:enabled"/>
+  <int value="-574217217" label="kSignInProfileCreationEnterprise:enabled"/>
   <int value="-574000901" label="AVIF:enabled"/>
   <int value="-573570330" label="QuickAnswersTranslationCloudAPI:disabled"/>
   <int value="-572112724" label="DialogTouchBar:disabled"/>
@@ -43687,6 +45128,7 @@ from previous Chrome versions.
   <int value="-534221085" label="LazyImageLoading:disabled"/>
   <int value="-533552313"
       label="AutofillUpstreamEditableCardholderName:enabled"/>
+  <int value="-532827723" label="AVFoundationCaptureV2:enabled"/>
   <int value="-531810064" label="saveas-menu-label"/>
   <int value="-531792555" label="UseModernMediaControls:disabled"/>
   <int value="-531651776" label="NewRemotePlaybackPipeline:enabled"/>
@@ -43724,12 +45166,13 @@ from previous Chrome versions.
   <int value="-505679399" label="FontCacheScaling:enabled"/>
   <int value="-503601144" label="UserDataSnapshot:disabled"/>
   <int value="-503430431" label="XRSandbox:enabled"/>
-  <int value="-502156595" label="AutofillCacheServerCardInfo:disabled"/>
   <int value="-499723386" label="EnableFilesAppCopyImage:disabled"/>
   <int value="-499186481"
       label="OmniboxGroupSuggestionsBySearchVsUrl:disabled"/>
   <int value="-498740735" label="ArcUsbHost:disabled"/>
   <int value="-498463128" label="MacSystemShareMenu:enabled"/>
+  <int value="-496989565"
+      label="DesktopPWAsFlashAppNameInsteadOfOrigin:disabled"/>
   <int value="-496119023" label="WebXR:enabled"/>
   <int value="-495585885" label="enable-spdy-proxy-dev-auth-origin"/>
   <int value="-494722408" label="ContentSuggestionsLargeThumbnail:enabled"/>
@@ -43737,6 +45180,7 @@ from previous Chrome versions.
   <int value="-492864618" label="NTPForeignSessionsSuggestions:disabled"/>
   <int value="-491546546" label="MeteredShowToggle:enabled"/>
   <int value="-491131428" label="OmniboxNewAnswerLayout:disabled"/>
+  <int value="-490652941" label="WebViewZeroCopyVideo:enabled"/>
   <int value="-488779992" label="blink-settings"/>
   <int value="-488744544" label="PromoBrowserCommands:disabled"/>
   <int value="-488449930" label="SafetyCheckAndroid:enabled"/>
@@ -43784,6 +45228,7 @@ from previous Chrome versions.
   <int value="-450976085"
       label="AutofillSaveCreditCardUsesImprovedMessaging:disabled"/>
   <int value="-449465495" label="disable-browser-task-scheduler"/>
+  <int value="-447148659" label="ContextMenuTranslateWithGoogleLens:enabled"/>
   <int value="-446560063" label="finch-seed-min-update-period"/>
   <int value="-446220201" label="EnableIncognitoShortcutOnDesktop:enabled"/>
   <int value="-444867364" label="Metal:enabled"/>
@@ -43794,11 +45239,15 @@ from previous Chrome versions.
   <int value="-433879402"
       label="EnableAmbientAuthenticationInIncognito:disabled"/>
   <int value="-432612065" label="AImageReader:enabled"/>
+  <int value="-431553693" label="ChangePasswordAffiliationInfo:disabled"/>
   <int value="-430369215" label="AssistPersonalInfo:disabled"/>
   <int value="-430360431" label="disable-password-generation"/>
   <int value="-428599163" label="NTPDownloadSuggestions:enabled"/>
+  <int value="-428082036" label="AnimatedImageResume:disabled"/>
+  <int value="-427163069" label="isolation-by-default"/>
   <int value="-426815606" label="HomepageTile:enabled"/>
   <int value="-424701311" label="SignedHTTPExchange:disabled"/>
+  <int value="-424584720" label="ClipboardFilenames:enabled"/>
   <int value="-424134004" label="WebPaymentsExperimentalFeatures:disabled"/>
   <int value="-419733676" label="IsolatePrerendersMustProbeOrigin:disabled"/>
   <int value="-418868128" label="enable-experimental-web-platform-features"/>
@@ -43853,6 +45302,7 @@ from previous Chrome versions.
   <int value="-374423260" label="OmniboxTabSwitchSuggestions:disabled"/>
   <int value="-373233195" label="SyncUSSAutofillWalletData:enabled"/>
   <int value="-372171039" label="BlinkGenPropertyTrees:disabled"/>
+  <int value="-371397346" label="ChromeOSSharingHub:enabled"/>
   <int value="-370876369" label="ContextualSearchLiteralTapSearch:enabled"/>
   <int value="-367474066" label="DialogTouchBar:enabled"/>
   <int value="-366949535" label="KeyboardShortcutViewerApp:enabled"/>
@@ -43883,6 +45333,7 @@ from previous Chrome versions.
   <int value="-345838366" label="enable-hosted-apps-in-windows"/>
   <int value="-345324571" label="enable-quirks-client"/>
   <int value="-345181892" label="new-tab-button-position"/>
+  <int value="-345156835" label="OmniboxDisableCGIParamMatching:enabled"/>
   <int value="-344357771"
       label="WebAuthenticationCrosPlatformAuthenticator:enabled"/>
   <int value="-344343842" label="disable-experimental-app-list"/>
@@ -43918,6 +45369,7 @@ from previous Chrome versions.
   <int value="-314910380" label="disable-distance-field-text"/>
   <int value="-314605926" label="protect-sync-credential-on-reauth:enabled"/>
   <int value="-313812707" label="VideoTutorials:disabled"/>
+  <int value="-312144677" label="TFLiteLanguageDetectionEnabled:disabled"/>
   <int value="-311148335" label="v8-pac-mojo-out-of-process"/>
   <int value="-310908854" label="new-wallpaper-picker"/>
   <int value="-310615515" label="EnableSuggestedFiles:disabled"/>
@@ -43928,9 +45380,11 @@ from previous Chrome versions.
   <int value="-304886342" label="QuickAnswersTranslation:disabled"/>
   <int value="-304777110" label="PreconnectToSearch:disabled"/>
   <int value="-303992327" label="SwipeToMoveCursor:disabled"/>
+  <int value="-301228557" label="PageInfoDiscoverability:disabled"/>
   <int value="-300542825" label="ChromeShareQRCode:disabled"/>
   <int value="-300018686" label="disable-cloud-import"/>
   <int value="-299841473" label="top-document-isolation:enabled"/>
+  <int value="-298458993" label="SystemNotifications:enabled"/>
   <int value="-297716805"
       label="CrossOriginMediaPlaybackRequiresUserGesture:disabled"/>
   <int value="-296762162" label="ExoOrdinalMotion:enabled"/>
@@ -43974,6 +45428,7 @@ from previous Chrome versions.
   <int value="-263645996" label="InteractiveWindowCycleList:enabled"/>
   <int value="-263150202" label="BundledConnectionHelp:disabled"/>
   <int value="-262122630" label="ArcEnableDocumentsProviderInFilesApp:enabled"/>
+  <int value="-261398170" label="ChromeLabs:enabled"/>
   <int value="-258081634" label="AutofillAssistantDirectActions:disabled"/>
   <int value="-257478609" label="TextfieldFocusOnTapUp:enabled"/>
   <int value="-256940675" label="HelpAppSearchServiceIntegration:disabled"/>
@@ -44009,6 +45464,8 @@ from previous Chrome versions.
       label="disable_idle_sockets_close_on_memory_pressure:enabled"/>
   <int value="-220599034" label="UsePdfCompositorServiceForPrint:enabled"/>
   <int value="-217885320" label="CdmFactoryDaemon:disabled"/>
+  <int value="-216532115"
+      label="ClearCrossBrowsingContextGroupMainFrameName:enabled"/>
   <int value="-216219963" label="ash-shelf-color-scheme"/>
   <int value="-215580565"
       label="OmniboxEnableClipboardProviderImageSuggestions:disabled"/>
@@ -44024,6 +45481,7 @@ from previous Chrome versions.
   <int value="-202007318" label="AndroidAIAFetching:enabled"/>
   <int value="-201633741" label="DisplayAlignAssist:enabled"/>
   <int value="-200805659" label="ContextualSuggestionsButton:enabled"/>
+  <int value="-200160012" label="RelatedSearchesUi:disabled"/>
   <int value="-199690952" label="PageInfoV2:enabled"/>
   <int value="-198002129" label="MetricsSettingsAndroid:disabled"/>
   <int value="-196110497" label="force-text-direction"/>
@@ -44078,6 +45536,7 @@ from previous Chrome versions.
   <int value="-152632720" label="RuntimeHostPermissions:enabled"/>
   <int value="-152439608" label="download-later-debug-on-wifi"/>
   <int value="-150077791" label="FontAccessChooser:disabled"/>
+  <int value="-148356419" label="PdfViewerPresentationMode:disabled"/>
   <int value="-147283486" label="enable-network-portal-notification"/>
   <int value="-146552997" label="enable-affiliation-based-matching"/>
   <int value="-146315671" label="PrivacyAdvisor:enabled"/>
@@ -44097,6 +45556,7 @@ from previous Chrome versions.
   <int value="-135584175" label="EnableAggregatedMlAppRanking:enabled"/>
   <int value="-135223364" label="AutofillShowTypePredictions:disabled"/>
   <int value="-133098377" label="SyncPseudoUSSSearchEngines:disabled"/>
+  <int value="-132082004" label="CacheOneGoogleBar:enabled"/>
   <int value="-131673218" label="FileHandlingAPI:disabled"/>
   <int value="-131257916" label="OmniboxCompactSuggestions:disabled"/>
   <int value="-130318058" label="ExoGamepadVibration:enabled"/>
@@ -44115,6 +45575,7 @@ from previous Chrome versions.
   <int value="-115834377" label="EnableUnifiedMultiDeviceSetup:disabled"/>
   <int value="-114807608" label="TerminalSystemApp:disabled"/>
   <int value="-114768488" label="ImmersiveFullscreen:enabled"/>
+  <int value="-113855291" label="RelatedSearchesUi:enabled"/>
   <int value="-112459802" label="WebXrRenderPath:enabled"/>
   <int value="-112335255" label="FormControlsRefresh:enabled"/>
   <int value="-111160804" label="ChromeShareLongScreenshot:disabled"/>
@@ -44127,7 +45588,9 @@ from previous Chrome versions.
   <int value="-108468535" label="ChromeColorsCustomColorPicker:disabled"/>
   <int value="-106631643" label="TurnOffStreamingMediaCachingAlways:disabled"/>
   <int value="-106373261" label="PaintPreviewDemo:enabled"/>
+  <int value="-104106119" label="WebViewJavaJsBridgeMojo:disabled"/>
   <int value="-102537270" label="extension-content-verification"/>
+  <int value="-102387656" label="FillingAcrossAffiliatedWebsites:disabled"/>
   <int value="-102227288" label="PasswordExport:disabled"/>
   <int value="-100148609" label="EvDetailsInPageInfo:disabled"/>
   <int value="-99781021" label="disable-roboto-font-ui"/>
@@ -44144,6 +45607,7 @@ from previous Chrome versions.
   <int value="-89434839" label="SystemTrayMicGainSetting:enabled"/>
   <int value="-88822940" label="ssl-version-min"/>
   <int value="-88273414" label="ContentSuggestionsShowSummary:enabled"/>
+  <int value="-87405369" label="PageInfoDiscoverability:enabled"/>
   <int value="-86788587" label="allow-autofill-sync-credential"/>
   <int value="-86243376" label="LayoutNG:enabled"/>
   <int value="-85706353" label="VirtualDesksGestures:enabled"/>
@@ -44201,12 +45665,14 @@ from previous Chrome versions.
   <int value="-37966026" label="PermissionPredictions:enabled"/>
   <int value="-36503306" label="HomepageLocationPolicy:enabled"/>
   <int value="-36234530" label="PluginVmShowMicrophonePermissions:enabled"/>
+  <int value="-36077995" label="SplitCacheByNetworkIsolationKey:disabled"/>
   <int value="-35745997" label="TabSearch:enabled"/>
   <int value="-35388407" label="AshNewSystemMenu:disabled"/>
   <int value="-35256214" label="InterestFeedNoticeCardAutoDismiss:enabled"/>
   <int value="-32385086" label="NtpRecipeTasksModule:disabled"/>
   <int value="-31444029" label="MediaInspectorLogging:disabled"/>
   <int value="-30966385" label="enable-hardware-overlays"/>
+  <int value="-30208692" label="webview-enable-modern-cookie-same-site"/>
   <int value="-29877377" label="TabHoverCardImages:disabled"/>
   <int value="-29847483" label="MemoryAblation:enabled"/>
   <int value="-29507521" label="ContextualNudges:disabled"/>
@@ -44233,6 +45699,8 @@ from previous Chrome versions.
       label="OmniboxUIExperimentUnboldSuggestionText:disabled"/>
   <int value="-13918890" label="disable-download-notification"/>
   <int value="-12225998" label="ShareButtonInTopToolbar:disabled"/>
+  <int value="-11983392"
+      label="MagnifierContinuousMouseFollowingModeSetting:enabled"/>
   <int value="-11260186" label="enable-offline-pages-as-saved-pages"/>
   <int value="-10709540"
       label="OmniboxUIExperimentHideSuggestionUrlScheme:enabled"/>
@@ -44252,6 +45720,7 @@ from previous Chrome versions.
   <int value="1558582" label="ResamplingInputEvents:enabled"/>
   <int value="2070488" label="EnablePasswordsAccountStorageSavingUi:disabled"/>
   <int value="3826348" label="DarkenWebsitesCheckboxInThemesSetting:disabled"/>
+  <int value="4588113" label="CacheOneGoogleBar:disabled"/>
   <int value="5654819" label="CrostiniGpuSupport:disabled"/>
   <int value="7444737" label="NTPSuggestionsStandaloneUI:disabled"/>
   <int value="7533886" label="disable-offer-store-unmasked-wallet-cards"/>
@@ -44264,6 +45733,7 @@ from previous Chrome versions.
   <int value="19629326" label="OmniboxExperimentalKeywordMode:enabled"/>
   <int value="19815558" label="EnableSettingsShortcutSearch:disabled"/>
   <int value="21055794" label="OpenXR:enabled"/>
+  <int value="23121136" label="MobileIdentityConsistencyVar:enabled"/>
   <int value="23556595" label="MarkHttpAs:enabled"/>
   <int value="26875005" label="disable-explicit-dma-fences"/>
   <int value="26945819" label="EnhancedDeskAnimations:disabled"/>
@@ -44291,6 +45761,7 @@ from previous Chrome versions.
   <int value="44088203" label="ExpensiveBackgroundTimerThrottling:enabled"/>
   <int value="44240181" label="SharingQRCodeGenerator:disabled"/>
   <int value="48159177" label="reduced-referrer-granularity"/>
+  <int value="50643563" label="MBIMode:enabled"/>
   <int value="51793504" label="protect-sync-credential-on-reauth:disabled"/>
   <int value="52150780" label="OsSettingsPolymer3:disabled"/>
   <int value="52368742" label="enable-pixel-canvas-recording:disabled"/>
@@ -44308,7 +45779,9 @@ from previous Chrome versions.
   <int value="58727839" label="WebAssemblyLazyCompilation:enabled"/>
   <int value="59784035" label="ImeThread:disabled"/>
   <int value="59964519" label="OmniboxEnableClipboardProvider:disabled"/>
+  <int value="59992411" label="ChangePasswordAffiliationInfo:enabled"/>
   <int value="60023885" label="AutofillNoLocalSaveOnUnmaskSuccess:disabled"/>
+  <int value="60442188" label="MultilingualTyping:enabled"/>
   <int value="61130490" label="WebViewBrotliSupport:enabled"/>
   <int value="61205887" label="enable-text-input-focus-manager"/>
   <int value="61466986" label="AsyncDns:disabled"/>
@@ -44320,6 +45793,7 @@ from previous Chrome versions.
   <int value="75207621" label="enable-stylus-virtual-keyboard:enabled"/>
   <int value="75237697" label="ash-enable-new-overview-ui"/>
   <int value="75747474" label="disable-webview-signin-flow"/>
+  <int value="77886794" label="AllowRepeatedUpdates:enabled"/>
   <int value="78998551" label="disable-hosted-app-shim-creation"/>
   <int value="79094339" label="VrLaunchIntents:enabled"/>
   <int value="79503461" label="disable-account-consistency"/>
@@ -44332,6 +45806,7 @@ from previous Chrome versions.
   <int value="84911198" label="ScanCardsInWebPayments:disabled"/>
   <int value="87886288" label="DiagnosticsApp:enabled"/>
   <int value="88437020" label="FeaturePolicy:enabled"/>
+  <int value="89357752" label="PdfXfaSupport:enabled"/>
   <int value="89758831" label="FontAccessChooser:enabled"/>
   <int value="89785725"
       label="DataReductionProxyEnabledWithNetworkService:disabled"/>
@@ -44356,6 +45831,7 @@ from previous Chrome versions.
   <int value="114657517" label="SecurePaymentConfirmationDebug:disabled"/>
   <int value="115915570"
       label="OmniboxUIExperimentHideSteadyStateUrlPathQueryAndRef:enabled"/>
+  <int value="115999065" label="ContextualSearchForceCaption:disabled"/>
   <int value="116287989"
       label="ignore-litepage-redirect-optimization-blacklist"/>
   <int value="116697601" label="OmniboxSuggestionButtonRow:disabled"/>
@@ -44368,6 +45844,8 @@ from previous Chrome versions.
   <int value="120519004" label="NavigationPredictor:disabled"/>
   <int value="121684313" label="QuickUnlockPin:enabled"/>
   <int value="121858954" label="enable-supervised-user-safesites"/>
+  <int value="121911155" label="DesktopPWAsElidedExtensionsMenu:enabled"/>
+  <int value="122959683" label="WebViewJavaJsBridgeMojo:enabled"/>
   <int value="123097915" label="FaviconsFromWebManifest:enabled"/>
   <int value="125581289" label="WebRtcHWVP8Encoding:disabled"/>
   <int value="125934378" label="enable-password-link"/>
@@ -44387,6 +45865,7 @@ from previous Chrome versions.
   <int value="139569991" label="SharingDeviceExpiration:disabled"/>
   <int value="143725809" label="DownloadProgressInfoBar:enabled"/>
   <int value="146229312" label="WebPaymentsExperimentalFeatures:enabled"/>
+  <int value="146553675" label="BookmarkBottomSheet:disabled"/>
   <int value="147342055" label="ChromeHomeClearUrlOnOpen:disabled"/>
   <int value="147373243" label="enable-deferred-image-decoding"/>
   <int value="147645817" label="DnsHttpssvc:enabled"/>
@@ -44395,17 +45874,19 @@ from previous Chrome versions.
       label="SafeBrowsingEnhancedProtectionMessageInInterstitials:enabled"/>
   <int value="151022756" label="ArcAvailableForChildAccount:disabled"/>
   <int value="151101719" label="HtmlBaseUsernameDetector:enabled"/>
+  <int value="151173516" label="CellularUseAttachApn:enabled"/>
   <int value="151630887" label="WebUIA11yEnhancements:disabled"/>
   <int value="153347646" label="SmartDimModelV3:disabled"/>
   <int value="155977192" label="EnableFileManagerFormatDialog:disabled"/>
   <int value="157217034" label="enable-tab-for-desktop-share"/>
   <int value="157318016" label="AutomaticTabDiscarding:enabled"/>
+  <int value="160506687" label="ArcRtVcpuDualCore:disabled"/>
   <int value="160524775" label="PDFTwoUpView:disabled"/>
   <int value="160838658" label="SmartDimModelV3:enabled"/>
   <int value="161409456" label="AutofillUseMobileLabelDisambiguation:disabled"/>
   <int value="161694478" label="OmniboxNewAnswerLayout:enabled"/>
   <int value="168429629" label="ContentIndexingNTP:enabled"/>
-  <int value="168627257" label="AppServiceIntentHandling:disabled"/>
+  <int value="168887810" label="ReadLaterReminderNotification:disabled"/>
   <int value="173288154" label="PrintPdfAsImage:enabled"/>
   <int value="173339199" label="SmsReceiverCrossDevice:disabled"/>
   <int value="174759256" label="LockScreenMediaControls:enabled"/>
@@ -44414,18 +45895,22 @@ from previous Chrome versions.
   <int value="176773784" label="EnableHardwareMirrorMode:disabled"/>
   <int value="178337215" label="enable-md-history"/>
   <int value="178693406" label="LockScreenMediaControls:disabled"/>
+  <int value="179871410" label="ui-debug-tools:disabled"/>
   <int value="180074362" label="memory-pressure-thresholds"/>
   <int value="181150000" label="CrosVmCupsProxy:enabled"/>
   <int value="182788555" label="DecoupleSyncFromAndroidMasterSync:disabled"/>
   <int value="183208826" label="TabGroups:enabled"/>
   <int value="185991204" label="enable-webrtc-srtp-encrypted-headers"/>
   <int value="186463628" label="DnsOverHttps:disabled"/>
+  <int value="187109402" label="SyncingCompromisedCredentials:enabled"/>
   <int value="188610022" label="NewMessageListView:enabled"/>
   <int value="189728101" label="FasterLocationReload:disabled"/>
   <int value="189777537" label="DisableInitialMostVisitedFadeIn:enabled"/>
   <int value="191737931" label="enable-mark-http-as"/>
   <int value="192167036" label="LogJsConsoleMessages:disabled"/>
   <int value="192320180" label="ignore-gpu-blocklist"/>
+  <int value="192693676"
+      label="QueryTilesRemoveTrendingAfterInactivity:disabled"/>
   <int value="194573877" label="MacViewsNativeDialogs:disabled"/>
   <int value="194895489" label="passive-listeners-default"/>
   <int value="195335115" label="AudioWorkletRealtimeThread:disabled"/>
@@ -44441,6 +45926,7 @@ from previous Chrome versions.
       label="OmniboxUIExperimentBlueSearchLoopAndSearchQuery:enabled"/>
   <int value="209792775" label="TabGroupsAndroid:enabled"/>
   <int value="212489101" label="AutofillAssistantChromeEntry:enabled"/>
+  <int value="212977039" label="MediaFoundationD3D11VideoCapture:disabled"/>
   <int value="215328738" label="ImprovedGeoLanguageData:disabled"/>
   <int value="215528151" label="NearbySharingWebRtc:enabled"/>
   <int value="217455219" label="SyncStandaloneTransport:enabled"/>
@@ -44474,6 +45960,7 @@ from previous Chrome versions.
   <int value="259812169" label="OmniboxSuggestionsWrapAround:disabled"/>
   <int value="261245835" label="ContextualSearchLiteralTapSearch:disabled"/>
   <int value="262382944" label="GuestViewCrossProcessFrames:disabled"/>
+  <int value="265140282" label="Prerender2:disabled"/>
   <int value="265830810" label="BackgroundTaskComponentUpdate:enabled"/>
   <int value="266322815" label="ChromeModernDesign:disabled"/>
   <int value="266702296" label="disable-plugin-power-saver"/>
@@ -44496,6 +45983,7 @@ from previous Chrome versions.
   <int value="283182071" label="SecurityInterstitialsDarkMode:enabled"/>
   <int value="283232244" label="OmniboxUIExperimentNarrowDropdown:enabled"/>
   <int value="285387302" label="AvatarToolbarButton:enabled"/>
+  <int value="286001833" label="TabGroupsNewBadgePromo:enabled"/>
   <int value="286717452" label="ContextualSearchDebug:disabled"/>
   <int value="287932297" label="AutofillSettingsCardTypeSplit:enabled"/>
   <int value="288012253" label="CrostiniFiles:enabled"/>
@@ -44530,6 +46018,7 @@ from previous Chrome versions.
   <int value="304588364" label="TextureLayerSkipWaitForActivation:enabled"/>
   <int value="304901781" label="NewUsbBackend:enabled"/>
   <int value="305356014" label="WebViewMeasureScreenCoverage:disabled"/>
+  <int value="306565540" label="UseOfHashAffiliationFetcher:enabled"/>
   <int value="306641800" label="AndroidSiteSettingsUIRefresh:disabled"/>
   <int value="306834044" label="webui-tab-strip"/>
   <int value="307543404" label="disable-team-drives"/>
@@ -44542,6 +46031,7 @@ from previous Chrome versions.
   <int value="313303258" label="WebPaymentsModifiers:disabled"/>
   <int value="316182183" label="MediaDocumentDownloadButton:disabled"/>
   <int value="317432596" label="DisplayLocking:disabled"/>
+  <int value="317889969" label="AutofillAddressProfileSavePrompt:disabled"/>
   <int value="319683583" label="ContentSuggestionsDebugLog:enabled"/>
   <int value="320121752" label="DelegateOverscrollSwipes:disabled"/>
   <int value="321366101" label="WebXRARDOMOverlay:enabled"/>
@@ -44558,6 +46048,7 @@ from previous Chrome versions.
   <int value="330653520" label="ChromeShareHighlightsAndroid:enabled"/>
   <int value="331770879" label="CrostiniAppSearch:disabled"/>
   <int value="332391072" label="cs-contextual-cards-bar-integration"/>
+  <int value="332960119" label="PdfXfaSupport:disabled"/>
   <int value="334802038" label="OfflinePreviews:disabled"/>
   <int value="335976733" label="NotificationStackingBarRedesign:enabled"/>
   <int value="336429189" label="DisallowUnsafeHttpDownloads:disabled"/>
@@ -44583,7 +46074,6 @@ from previous Chrome versions.
   <int value="351005753" label="enable-experimental-accessibility-autoclick"/>
   <int value="352191859" label="disabled-new-style-notification"/>
   <int value="352937987" label="OverflowIconsForMediaControls:disabled"/>
-  <int value="354523543" label="GuestOsExternalProtocol:enabled"/>
   <int value="354631905" label="RecoverFromNeverSaveAndroid:disabled"/>
   <int value="357138275" label="enable-floating-virtual-keyboard:disabled"/>
   <int value="358399482" label="enable-high-dpi-fixed-position-compositing"/>
@@ -44628,7 +46118,7 @@ from previous Chrome versions.
   <int value="388328387" label="WindowsMixedReality:enabled"/>
   <int value="388786873" label="EnableUnifiedMultiDeviceSettings:enabled"/>
   <int value="388996324" label="CustomContextMenu:disabled"/>
-  <int value="389340238" label="AutofillCacheServerCardInfo:enabled"/>
+  <int value="391632490" label="NtpDriveModule:enabled"/>
   <int value="392782890" label="SafeBrowsingTelemetryForApkDownloads:enabled"/>
   <int value="393704200" label="account-consistency"/>
   <int value="398903399" label="GenericSensorExtraClasses:disabled"/>
@@ -44638,13 +46128,17 @@ from previous Chrome versions.
       label="OmniboxUIExperimentVerticalMarginLimitToNonTouchOnly:enabled"/>
   <int value="400272381" label="LazyFrameLoading:disabled"/>
   <int value="400322063" label="ash-disable-screen-orientation-lock"/>
+  <int value="401606992" label="AnimatedImageResume:enabled"/>
   <int value="401983950" label="enable-spdy4"/>
   <int value="402143634" label="enable-search-button-in-omnibox-always"/>
   <int value="403288255" label="enable-wheel-scroll-latching"/>
+  <int value="403554154" label="SafetyCheckWeakPasswords:enabled"/>
   <int value="405329388"
       label="FramebustingNeedsSameOriginOrUserGesture:enabled"/>
+  <int value="407491045" label="ShowDateInTrayButton:enabled"/>
   <int value="408190863" label="OmniboxDisableInstantExtendedLimit:disabled"/>
   <int value="409566604" label="IntentPickerPWAPersistence:enabled"/>
+  <int value="409622437" label="disable-buffer-bw-compression"/>
   <int value="411250226" label="AutoplayMutedVideos:disabled"/>
   <int value="412957264" label="tab-close-buttons-hidden-with-touch"/>
   <int value="413062443" label="MessagesForAndroidInfrastructure:disabled"/>
@@ -44655,25 +46149,32 @@ from previous Chrome versions.
   <int value="414937629" label="MediaNotificationsCounter:enabled"/>
   <int value="415154056" label="enable-physical-keyboard-autocorrect"/>
   <int value="415395210" label="TrimOnMemoryPressure:enabled"/>
+  <int value="416116189" label="DeprecateLowUsageCodecs:enabled"/>
   <int value="416691040" label="SendTabToSelfOmniboxSendingAnimation:disabled"/>
+  <int value="416760194" label="ExoLockNotification:disabled"/>
   <int value="416887895" label="enable-password-change-support"/>
   <int value="417709910"
       label="AutofillSendExperimentIdsInPaymentsRPCs:disabled"/>
   <int value="418769094" label="MixedContentSiteSetting:enabled"/>
   <int value="420160748" label="CornerShortcuts:enabled"/>
+  <int value="420682005" label="AdaptiveButtonInTopToolbar:enabled"/>
   <int value="422307097" label="PhysicalWeb:disabled"/>
+  <int value="422670720" label="ContextualSearchLongpressPanelHelp:disabled"/>
   <int value="423615350" label="enable-tab-audio-muting"/>
   <int value="423855924" label="enable-tab-switcher-theme-colors"/>
   <int value="425072496" label="GridLayoutForNtpShortcuts:enabled"/>
+  <int value="426199960" label="Commander:enabled"/>
+  <int value="427184788" label="WebFeed:enabled"/>
   <int value="430776375" label="TextureLayerSkipWaitForActivation:disabled"/>
   <int value="430959979" label="SyncStandaloneTransport:disabled"/>
   <int value="431691805" label="MediaDocumentDownloadButton:enabled"/>
-  <int value="433667885" label="OnDeviceAssistant:disabled"/>
   <int value="434033638" label="PwaPersistentNotification:disabled"/>
   <int value="434530296"
       label="HappinessTrackingSurveysForDesktopMigration:disabled"/>
   <int value="436249288" label="ImeMojoDecoder:disabled"/>
   <int value="436682243" label="TabGroupsAndroid:disabled"/>
+  <int value="436980707" label="ContextualSearchForceCaption:enabled"/>
+  <int value="438307192" label="FirstPartySets:disabled"/>
   <int value="439525862" label="GlobalMediaControlsForCast:disabled"/>
   <int value="444411390" label="enable-incognito-shortcut-on-desktop"/>
   <int value="444754854" label="LegacyTLSWarnings:disabled"/>
@@ -44685,6 +46186,7 @@ from previous Chrome versions.
   <int value="453017472"
       label="IntentBlockExternalFormRedirectsNoGesture:disabled"/>
   <int value="453102772" label="OfflinePagesLoadSignalCollecting:disabled"/>
+  <int value="455140116" label="CCTIncognitoAvailableToThirdParty:disabled"/>
   <int value="455698038"
       label="disable-gesture-requirement-for-media-playback"/>
   <int value="455754036" label="MirroringService:disabled"/>
@@ -44700,6 +46202,7 @@ from previous Chrome versions.
   <int value="468901900" label="AppStoreBillingDebug:disabled"/>
   <int value="468959230"
       label="enable-non-validating-reload-on-refresh-content"/>
+  <int value="469999350" label="NotificationScheduleService:disabled"/>
   <int value="470011024" label="NonValidatingReloadOnNormalReload:enabled"/>
   <int value="471224152" label="WinUseHybridSpellChecker:enabled"/>
   <int value="471519375" label="NewOsSettingsSearch:disabled"/>
@@ -44735,11 +46238,13 @@ from previous Chrome versions.
   <int value="500947367"
       label="WebAuthenticationCrosPlatformAuthenticator:disabled"/>
   <int value="501477022" label="DrawOcclusion:enabled"/>
+  <int value="501899677" label="SystemEmojiPicker:enabled"/>
   <int value="502551931" label="IncognitoStrings:enabled"/>
   <int value="503189154" label="ViewsBrowserWindows:disabled"/>
   <int value="503245473" label="disable-translate-new-ux"/>
   <int value="504549229" label="WebViewDisplayCutout:disabled"/>
   <int value="504717928" label="PasswordsWeaknessCheck:disabled"/>
+  <int value="504946061" label="WebAppEnableUrlHandlers:disabled"/>
   <int value="504994663" label="GenericSensor:disabled"/>
   <int value="505561325" label="OpenXR:disabled"/>
   <int value="506680761" label="WebNFC:disabled"/>
@@ -44755,6 +46260,7 @@ from previous Chrome versions.
   <int value="513728926" label="OsSettingsPolymer3:enabled"/>
   <int value="514406112" label="WebUIOmniboxPopup:disabled"/>
   <int value="514569020" label="RemoteCopyImageNotification:enabled"/>
+  <int value="516143995" label="EnableAriaElementReflection:enabled"/>
   <int value="516603570" label="QuickAnswersRichUi:disabled"/>
   <int value="517429103" label="AutofillImportDynamicForms:enabled"/>
   <int value="517568645" label="AnimatedAppMenuIcon:disabled"/>
@@ -44767,10 +46273,13 @@ from previous Chrome versions.
   <int value="535131384" label="OmniboxTailSuggestions:enabled"/>
   <int value="535194142" label="TemporaryHoldingSpacePreviews:enabled"/>
   <int value="535976218" label="enable-plugin-power-saver"/>
+  <int value="536948426" label="COLRV1Fonts:enabled"/>
   <int value="537857256" label="PipRoundedCorners:enabled"/>
   <int value="538468149" label="OfflinePagesCT:enabled"/>
   <int value="538600423" label="OmniboxDocumentProvider:enabled"/>
   <int value="538685995" label="InstallableInkDrop:enabled"/>
+  <int value="541667888" label="ContentLanguagesInLanguagePicker:disabled"/>
+  <int value="542930298" label="WebAppEnableLinkCapturing:disabled"/>
   <int value="542960889" label="HeavyAdIntervention:enabled"/>
   <int value="544443920" label="QuickAnswers:disabled"/>
   <int value="546043947" label="ImplicitRootScroller:enabled"/>
@@ -44788,6 +46297,8 @@ from previous Chrome versions.
       label="AutofillDoNotUploadSaveUnsupportedCards:disabled"/>
   <int value="557200974" label="WebSocketHandshakeReuseConnection:disabled"/>
   <int value="557915559" label="CCTModuleCustomRequestHeader:enabled"/>
+  <int value="558249253"
+      label="ContextualSearchThinWebViewImplementation:disabled"/>
   <int value="558873715" label="SiteDetails:disabled"/>
   <int value="559695461" label="UseChimeAndroidSdk:enabled"/>
   <int value="561374433" label="SCTAuditing:disabled"/>
@@ -44833,11 +46344,11 @@ from previous Chrome versions.
   <int value="602117675" label="NTPBookmarkSuggestions:enabled"/>
   <int value="603326800" label="UsePasswordSeparatedSigninFlow:enabled"/>
   <int value="603988014" label="NetworkService:enabled"/>
+  <int value="604334859" label="Prerender2:enabled"/>
   <int value="605150752" label="WebUSB:disabled"/>
-  <int value="606061406"
-      label="UpdateNotificationSchedulingIntegration:disabled"/>
   <int value="606288133" label="enable-print-preview-register-promos"/>
   <int value="606512202" label="AutofillCreditCardPopupLayout:enabled"/>
+  <int value="606611135" label="ContextMenuTranslateWithGoogleLens:disabled"/>
   <int value="606723570" label="SharingUseDeviceInfo:disabled"/>
   <int value="606834606" label="force-color-profile"/>
   <int value="606969417" label="DiscoverApp:enabled"/>
@@ -44847,6 +46358,7 @@ from previous Chrome versions.
   <int value="610545308" label="enable-potentially-annoying-security-features"/>
   <int value="613629912" label="LookalikeUrlNavigationSuggestions:enabled"/>
   <int value="614174812" label="GlobalMediaControlsOverlayControls:disabled"/>
+  <int value="616609955" label="ActionableContentSettings:enabled"/>
   <int value="616660621" label="ImeInputLogicFst:disabled"/>
   <int value="617762656" label="FirstScrollLatencyMeasurement:enabled"/>
   <int value="618532343" label="DesktopPWAsLocalUpdating:disabled"/>
@@ -44854,6 +46366,7 @@ from previous Chrome versions.
   <int value="620989380" label="ImeInputLogicFst:enabled"/>
   <int value="621484660" label="ReorderBookmarks:disabled"/>
   <int value="623772100" label="EnableIncognitoWindowCounter:disabled"/>
+  <int value="623796513" label="AndroidLayoutChangeTabReparenting:disabled"/>
   <int value="624317932" label="print-pdf-as-image"/>
   <int value="624368375" label="OmniboxEntitySuggestions:enabled"/>
   <int value="625273056" label="disable-boot-animation"/>
@@ -44863,6 +46376,7 @@ from previous Chrome versions.
   <int value="628570445" label="AndroidAutofillAccessibility:enabled"/>
   <int value="629549626" label="ContextualSearchMlTapSuppression:enabled"/>
   <int value="630244477" label="ServiceWorkerPaymentApps:enabled"/>
+  <int value="630308195" label="SignInProfileCreation:enabled"/>
   <int value="630776247" label="USBGuard:disabled"/>
   <int value="630947363" label="touch-events"/>
   <int value="632340413" label="network-settings-config"/>
@@ -44870,10 +46384,12 @@ from previous Chrome versions.
   <int value="634789085" label="LayeredAPI:disabled"/>
   <int value="635076832" label="MarkHttpAs:disabled"/>
   <int value="635533110" label="ReleaseNotes:disabled"/>
+  <int value="635947051" label="DesktopRestructuredLanguageSettings:enabled"/>
   <int value="635971109" label="PrintPdfAsImage:disabled"/>
   <int value="636341169" label="ExploreSites:disabled"/>
   <int value="636413416" label="OmniboxKeywordSearchButton:disabled"/>
   <int value="636425179" label="mhtml-generator-option"/>
+  <int value="636909796" label="VaapiAV1Decoder:enabled"/>
   <int value="637396292" label="AllBookmarks:enabled"/>
   <int value="637452937" label="ChromeHomeSurvey:enabled"/>
   <int value="638845342"
@@ -44893,6 +46409,7 @@ from previous Chrome versions.
   <int value="649111851" label="MidiManagerCros:enabled"/>
   <int value="649508040" label="AutofillEnableCompanyName:enabled"/>
   <int value="651421878" label="VideoRotateToFullscreen:enabled"/>
+  <int value="651471603" label="MediaFoundationD3D11VideoCapture:enabled"/>
   <int value="651562604" label="RawClipboard:enabled"/>
   <int value="651844675" label="EasyUnlockPromotions:enabled"/>
   <int value="652561231" label="CustomContextMenu:enabled"/>
@@ -44938,6 +46455,7 @@ from previous Chrome versions.
   <int value="693012666" label="QuickUnlockPin:disabled"/>
   <int value="693545401"
       label="AutofillEnableInfoBarAccountIndicationFooter:enabled"/>
+  <int value="694016981" label="query-tiles-more-trending"/>
   <int value="694985670" label="OmniboxUIExperimentNarrowDropdown:disabled"/>
   <int value="695385040" label="enable-external-drive-rename"/>
   <int value="696261973" label="GaiaActionButtons:enabled"/>
@@ -44948,6 +46466,8 @@ from previous Chrome versions.
   <int value="699149897" label="ContentSuggestionsDebugLog:disabled"/>
   <int value="700346797" label="WheelEventRegions:enabled"/>
   <int value="701766325" label="PerNavigationMojoInterface:enabled"/>
+  <int value="701795774" label="WebAppEnableUrlHandlers:enabled"/>
+  <int value="702060507" label="SafetyCheckWeakPasswords:disabled"/>
   <int value="703469777" label="AndroidNightModeTabReparenting:enabled"/>
   <int value="705407202" label="AutofillSaveCardImprovedUserConsent:disabled"/>
   <int value="705411729" label="AccessiblePDFForm:disabled"/>
@@ -45047,10 +46567,15 @@ from previous Chrome versions.
   <int value="783270752" label="AndroidHistoryManager:enabled"/>
   <int value="787080596" label="DynamicTcmallocTuning:enabled"/>
   <int value="787385958" label="RegionalLocalesAsDisplayUI:enabled"/>
+  <int value="792307132"
+      label="KeyboardBasedDisplayArrangementInSettings:enabled"/>
   <int value="792884862" label="EnableSharedImageForWebview:enabled"/>
+  <int value="793816915" label="MessagesForAndroidPopupBlocked:disabled"/>
   <int value="798696013" label="ImeInputLogicMozc:enabled"/>
   <int value="799680074" label="ContextualSearchTranslationModel:enabled"/>
+  <int value="802463708" label="WebViewSurfaceControl:enabled"/>
   <int value="803282885" label="PreferHtmlOverPlugins:disabled"/>
+  <int value="804958673" label="LensCameraAssistedSearch:enabled"/>
   <int value="805882800" label="SafetyCheckChromeCleanerChild:disabled"/>
   <int value="806035639" label="EnableNeuralPalmDetectionFilter:disabled"/>
   <int value="806334184" label="AndroidSpellChecker:enabled"/>
@@ -45062,6 +46587,7 @@ from previous Chrome versions.
   <int value="811374216" label="disable-new-bookmark-apps"/>
   <int value="811726957" label="SlideTopChromeWithPageScrolls:enabled"/>
   <int value="812710781" label="SyncUSSBookmarks:disabled"/>
+  <int value="813302293" label="RemoveStatusBarInWebApps:disabled"/>
   <int value="813999334" label="HistoryManipulationIntervention:enabled"/>
   <int value="816907702" label="GlobalMediaControlsSeamlessTransfer:disabled"/>
   <int value="817393533" label="GlobalMediaControlsModernUI:disabled"/>
@@ -45071,10 +46597,10 @@ from previous Chrome versions.
   <int value="828092263" label="TemporaryUnexpireFlagsM78:enabled"/>
   <int value="830282555" label="DecodeJpeg420ImagesToYUV:enabled"/>
   <int value="832142463" label="WebAssemblyStreaming:enabled"/>
+  <int value="832711367" label="RequestDesktopSiteForTablets:enabled"/>
   <int value="834033186" label="enable-data-reduction-proxy-dev"/>
   <int value="834326277" label="enable-answers-in-suggest"/>
   <int value="835018878" label="disable-quic"/>
-  <int value="835265739" label="SuggestedContentToggle:enabled"/>
   <int value="835726069" label="NtpWebUI:disabled"/>
   <int value="836406476" label="EnableTouchableAppContextMenu:enabled"/>
   <int value="838887742" label="manual-enhanced-bookmarks"/>
@@ -45084,6 +46610,7 @@ from previous Chrome versions.
   <int value="841276069" label="ChromeHomeDoodle:disabled"/>
   <int value="841343322" label="disable-new-korean-ime"/>
   <int value="841779535" label="password-export:enabled"/>
+  <int value="842158411" label="PdfViewerDocumentProperties:enabled"/>
   <int value="842432903" label="CaptureThumbnailOnNavigatingAway:enabled"/>
   <int value="842789526" label="CloudPrinterHandler:disabled"/>
   <int value="843896452" label="UserActivationV2:enabled"/>
@@ -45103,6 +46630,7 @@ from previous Chrome versions.
   <int value="855746780" label="disable-physical-keyboard-autocorrect"/>
   <int value="857391671" label="BluetoothNextHandsfreeProfile:disabled"/>
   <int value="857445869" label="enable-captive-portal-bypass-proxy"/>
+  <int value="859449217" label="MagnifierPanningImprovements:enabled"/>
   <int value="860336036" label="ChromeModernDesign:enabled"/>
   <int value="862453793" label="TranslateUI2016Q2:enabled"/>
   <int value="864024033" label="IsolatePrerendersMustProbeOrigin:enabled"/>
@@ -45126,6 +46654,7 @@ from previous Chrome versions.
   <int value="879699575" label="disable-gesture-tap-highlight"/>
   <int value="879992337" label="disable-pull-to-refresh-effect"/>
   <int value="880510010" label="enable-permissions-bubbles"/>
+  <int value="882893584" label="UseOfHashAffiliationFetcher:disabled"/>
   <int value="883190338" label="PrintWithReducedRasterization:disabled"/>
   <int value="884106779" label="supervised-user-safesites"/>
   <int value="885186849" label="finch-seed-expiration-age"/>
@@ -45154,6 +46683,7 @@ from previous Chrome versions.
   <int value="913138924" label="RecurrentInterstitialFeature:disabled"/>
   <int value="913855453" label="VirtualKeyboardFloatingResizable:disabled"/>
   <int value="916316159" label="disable-new-app-list-mixer"/>
+  <int value="917285134" label="AutofillAddressProfileSavePrompt:enabled"/>
   <int value="917561046" label="ConversionMeasurement:disabled"/>
   <int value="918046854" label="NtlmV2Enabled:disabled"/>
   <int value="918608729" label="finch-seed-min-download-period"/>
@@ -45164,6 +46694,7 @@ from previous Chrome versions.
   <int value="926852901" label="DataReductionProxyMainMenu:disabled"/>
   <int value="928900043" label="OmniboxLooseMaxLimitOnDedicatedRows:disabled"/>
   <int value="929462705" label="disable-link-disambiguation-popup"/>
+  <int value="934139985" label="WallpaperWebUI:enabled"/>
   <int value="934236781" label="OmniboxSuggestionsRecyclerView:enabled"/>
   <int value="934292666" label="DownloadRename:enabled"/>
   <int value="934805020" label="CornerShortcuts:disabled"/>
@@ -45179,9 +46710,11 @@ from previous Chrome versions.
   <int value="941883332" label="ProactiveTabFreezeAndDiscard:disabled"/>
   <int value="942807728" label="NewTabstripAnimation:disabled"/>
   <int value="943319566" label="enable-intent-picker"/>
+  <int value="943447234" label="NtpDriveModule:disabled"/>
   <int value="944484780" label="EnableEmbeddedAssistantUI:enabled"/>
   <int value="946185008" label="EnableAppDataSearch:disabled"/>
   <int value="946688335" label="OmniboxSpareRenderer:disabled"/>
+  <int value="948351976" label="WallpaperWebUI:disabled"/>
   <int value="952558794" label="enable-remote-assistance"/>
   <int value="955340765" label="ChromeHomeOptOutSnackbar:enabled"/>
   <int value="955425932" label="EnterpriseReportingInChromeOS:enabled"/>
@@ -45230,6 +46763,7 @@ from previous Chrome versions.
   <int value="998748600" label="SyncErrorInfoBarAndroid:disabled"/>
   <int value="1000045846" label="OverlayNewLayout:disabled"/>
   <int value="1000587036" label="OfflinePagesDescriptiveFailStatus:disabled"/>
+  <int value="1000630368" label="lacros-stability"/>
   <int value="1000706989" label="AutomaticTabDiscarding:disabled"/>
   <int value="1002585107" label="emphasize-titles-in-omnibox-dropdown"/>
   <int value="1003002105" label="MaterialDesignBookmarks:disabled"/>
@@ -45244,6 +46778,7 @@ from previous Chrome versions.
   <int value="1007444341" label="enable-prefixed-encrypted-media"/>
   <int value="1008677979"
       label="AutofillUseImprovedLabelDisambiguation:disabled"/>
+  <int value="1009437086" label="AutofillEnableOfferNotification:disabled"/>
   <int value="1009976778" label="SidePanel:disabled"/>
   <int value="1012942422" label="HorizontalTabSwitcherAndroid:disabled"/>
   <int value="1014740148" label="FilesCameraFolder:enabled"/>
@@ -45255,6 +46790,7 @@ from previous Chrome versions.
   <int value="1019623058" label="ash-enable-shelf-model-synchronization"/>
   <int value="1019857902"
       label="disable-hide-inactive-stacked-tab-close-buttons"/>
+  <int value="1021848000" label="SharedHighlightingUseBlocklist:disabled"/>
   <int value="1022424308" label="SignedExchangeSubresourcePrefetch:enabled"/>
   <int value="1022992701" label="enable-origin-chip-always"/>
   <int value="1023668536" label="PrintServerUi:enabled"/>
@@ -45264,11 +46800,15 @@ from previous Chrome versions.
   <int value="1028817487"
       label="OmniboxOnFocusSuggestionsContextualWeb:disabled"/>
   <int value="1030608602" label="AutofillAssistantProactiveHelp:enabled"/>
+  <int value="1031281564"
+      label="DisablePeripheralDataAccessProtection:disabled"/>
   <int value="1033148287" label="NTPShortcuts:disabled"/>
   <int value="1033412163" label="OmniboxDisplayTitleForCurrentUrl:enabled"/>
   <int value="1033597574" label="disable-layer-squashing"/>
   <int value="1036068554" label="enable-android-pay-integration-v2"/>
   <int value="1036565901" label="AssistPersonalInfo:enabled"/>
+  <int value="1036958177"
+      label="enable-experimental-accessibility-dictation-extension"/>
   <int value="1037961753" label="CCTIncognito:disabled"/>
   <int value="1038264914" label="PerDeskShelf:enabled"/>
   <int value="1042202617" label="RemoteCopyReceiver:enabled"/>
@@ -45322,6 +46862,7 @@ from previous Chrome versions.
   <int value="1084365949" label="ReleaseNotesNotification:disabled"/>
   <int value="1084972292" label="WebXRAnchors:enabled"/>
   <int value="1085130793" label="LongPressBackForHistory:disabled"/>
+  <int value="1086592430" label="WebAppEnableLinkCapturing:enabled"/>
   <int value="1087235172" label="file-manager-enable-new-audio-player"/>
   <int value="1088915385" label="new-password-form-parsing:enabled"/>
   <int value="1089913432" label="VirtualDesksGestures:disabled"/>
@@ -45348,10 +46889,13 @@ from previous Chrome versions.
   <int value="1105439588" label="enable-swipe-selection"/>
   <int value="1106307305" label="AutofillPrimaryInfoStyleExperiment:enabled"/>
   <int value="1106579567" label="ProfilesUIRevamp:enabled"/>
+  <int value="1106890743"
+      label="SafeBrowsingkRealTimeUrlLookupEnterpriseGaEndpoint:enabled"/>
   <int value="1107543566" label="enable-one-copy"/>
   <int value="1108663108" label="disable-device-discovery-notifications"/>
   <int value="1109907837"
       label="PrefetchMainResourceNetworkIsolationKey:enabled"/>
+  <int value="1110683161" label="ShowDateInTrayButton:disabled"/>
   <int value="1111871757" label="ForceUnifiedConsentBump:enabled"/>
   <int value="1112051724" label="DetectingHeavyPages:enabled"/>
   <int value="1112817963" label="WebViewConnectionlessSafeBrowsing:enabled"/>
@@ -45367,25 +46911,30 @@ from previous Chrome versions.
       label="ForceSecurePaymentConfirmationDialog:disabled"/>
   <int value="1117795262" label="BloatedRendererDetection:disabled"/>
   <int value="1118109174" label="enable-launcher-search-provider-api"/>
+  <int value="1118339487" label="MemoriesDebug:disabled"/>
   <int value="1120428727" label="TabGridLayoutAndroid:enabled"/>
   <int value="1126061778" label="CaptureThumbnailOnLoadFinished:enabled"/>
   <int value="1126956909" label="UseXpsForPrintingFromPdf:disabled"/>
   <int value="1127085005" label="TreatUnsafeDownloadsAsActive:enabled"/>
   <int value="1127183523" label="PassiveEventListenersDueToFling:enabled"/>
   <int value="1127427821" label="OmniboxEntitySuggestions:disabled"/>
+  <int value="1128874009" label="ScalableStatusArea:disabled"/>
   <int value="1129542111" label="CastAllowAllIPs:disabled"/>
   <int value="1129888794" label="ash-touch-hud"/>
   <int value="1132521402" label="ConnectivityDiagnosticsWebUi:enabled"/>
   <int value="1133207726" label="MediaInspectorLogging:enabled"/>
   <int value="1133635187" label="force-gpu-rasterization"/>
   <int value="1135728116" label="PluginVmShowCameraPermissions:enabled"/>
+  <int value="1138345742" label="PreferConstantFrameRate:disabled"/>
   <int value="1138349838" label="EnableMDRoundedCornersOnDialogs:disabled"/>
   <int value="1138690502" label="PreconnectToSearch:enabled"/>
   <int value="1139226452" label="enable-nacl-debug"/>
   <int value="1139363314" label="disable-supervised-user-blacklist"/>
   <int value="1139756271" label="WebOTPCrossDevice:enabled"/>
   <int value="1140541604" label="WinrtGeolocationImplementation:enabled"/>
+  <int value="1141918949" label="ContextualSearchLongpressPanelHelp:enabled"/>
   <int value="1142515376" label="enable-nacl"/>
+  <int value="1142752111" label="CellularUseAttachApn:disabled"/>
   <int value="1142788238" label="FontCacheScaling:disabled"/>
   <int value="1142970266"
       label="SignedExchangePrefetchCacheForNavigations:disabled"/>
@@ -45417,12 +46966,15 @@ from previous Chrome versions.
   <int value="1167613030" label="enable-permission-action-reporting"/>
   <int value="1168226627" label="OmniboxMaxZeroSuggestMatches:enabled"/>
   <int value="1169418814" label="ManualFallbacksFilling:enabled"/>
+  <int value="1170030686" label="BookmarkBottomSheet:enabled"/>
   <int value="1173244409" label="AutofillUseMobileLabelDisambiguation:enabled"/>
   <int value="1174088940" label="enable-wasm"/>
   <int value="1177120582" label="InstallableInkDrop:disabled"/>
+  <int value="1177174300" label="LayoutNGTable:disabled"/>
   <int value="1177628103" label="GaiaActionButtons:disabled"/>
   <int value="1179013979"
       label="OmniboxUIExperimentMaxAutocompleteMatches:enabled"/>
+  <int value="1179407596" label="PreemptiveLinkToTextGeneration:enabled"/>
   <int value="1179936481" label="enable-android-pay-integration-v1"/>
   <int value="1180722846" label="OculusVR:disabled"/>
   <int value="1181056275" label="enable-cloud-backup"/>
@@ -45452,6 +47004,7 @@ from previous Chrome versions.
   <int value="1203821857" label="Vulkan:disabled"/>
   <int value="1205849612" label="enable-sync-synced-notifications"/>
   <int value="1205929554" label="SendTabToSelfOmniboxSendingAnimation:enabled"/>
+  <int value="1210298193" label="FontAccessPersistent:enabled"/>
   <int value="1210343926" label="enable-drop-sync-credential"/>
   <int value="1211284676" label="V8NoTurbo:enabled"/>
   <int value="1211756417"
@@ -45476,8 +47029,10 @@ from previous Chrome versions.
   <int value="1222017136" label="WebRtcUseEchoCanceller3:disabled"/>
   <int value="1222032915"
       label="kAutofillRationalizeRepeatedServerPredictions:enabled"/>
+  <int value="1222309415" label="SplitCacheByNetworkIsolationKey:enabled"/>
   <int value="1222808563" label="DisableInitialMostVisitedFadeIn:disabled"/>
   <int value="1226624874" label="Mus:disabled"/>
+  <int value="1227633129" label="NtpChromeCartModule:disabled"/>
   <int value="1228115769" label="SiteCharacteristicsDatabase:disabled"/>
   <int value="1229299518" label="SingleTabMode:disabled"/>
   <int value="1229388323" label="AutofillEnableGoogleIssuedCard:disabled"/>
@@ -45491,6 +47046,7 @@ from previous Chrome versions.
   <int value="1238190462" label="PerDeskShelf:disabled"/>
   <int value="1239720601" label="OmniboxZeroSuggestionsOnNTPRealbox:enabled"/>
   <int value="1240073971" label="ash-disable-smooth-screen-rotation"/>
+  <int value="1241162639" label="debug-chime-notification"/>
   <int value="1242100010" label="AutofillProfileClientValidation:disabled"/>
   <int value="1242632259" label="ContentSuggestionsCategoryOrder:disabled"/>
   <int value="1243180545" label="HarfBuzzPDFSubsetter:enabled"/>
@@ -45499,6 +47055,7 @@ from previous Chrome versions.
   <int value="1247293682" label="topchrome-md"/>
   <int value="1249215617" label="SelectToSpeakNavigationControl:enabled"/>
   <int value="1250071868" label="disable-timezone-tracking-option"/>
+  <int value="1253001092" label="FeedShare:enabled"/>
   <int value="1253698118" label="ash-disable-stable-overview-order"/>
   <int value="1254472299" label="PrivacySettingsRedesign:disabled"/>
   <int value="1257482622" label="PageAlmostIdle:enabled"/>
@@ -45528,6 +47085,7 @@ from previous Chrome versions.
   <int value="1272923911" label="NewMessageListView:disabled"/>
   <int value="1274717741" label="top-chrome-touch-ui"/>
   <int value="1275507565" label="OfflinePagesRenovations:enabled"/>
+  <int value="1276120671" label="AutofillEnableOfferNotification:enabled"/>
   <int value="1276209777" label="ntp-switch-to-existing-tab"/>
   <int value="1277386636" label="QueryInOmnibox:disabled"/>
   <int value="1278512661" label="SmartDimNewMlAgent:disabled"/>
@@ -45542,6 +47100,7 @@ from previous Chrome versions.
   <int value="1285169797" label="ClipboardHistoryNudgeSessionReset:disabled"/>
   <int value="1285905715" label="WebXRHitTest:enabled"/>
   <int value="1287625114" label="EnableIncognitoShortcutOnDesktop:disabled"/>
+  <int value="1288612648" label="PluginVmFullscreen:enabled"/>
   <int value="1289433604" label="RecoverFromNeverSaveAndroid:enabled"/>
   <int value="1289495171" label="AssistantBetterOnboarding:disabled"/>
   <int value="1291257442" label="TabsInCBD:disabled"/>
@@ -45563,6 +47122,7 @@ from previous Chrome versions.
   <int value="1307003774" label="AutofillEnableCompanyName:disabled"/>
   <int value="1308537004" label="force-pnacl-subzero"/>
   <int value="1310000273" label="ReleaseNotesNotificationAllChannels:disabled"/>
+  <int value="1310316934" label="OptimizationGuideModelDownloading:enabled"/>
   <int value="1311860720" label="ChromeHomeNtpRedesign:disabled"/>
   <int value="1312025202" label="NTPOfflinePageSuggestions:disabled"/>
   <int value="1313476409" label="ReportFeedUserActions:disabled"/>
@@ -45601,6 +47161,7 @@ from previous Chrome versions.
   <int value="1343516821" label="ignore-previews-blocklist"/>
   <int value="1343713259" label="ArcPrintSpoolerExperiment:disabled"/>
   <int value="1344833841" label="ImeThread:enabled"/>
+  <int value="1345192233" label="VaapiVideoDecoder:enabled"/>
   <int value="1346994602" label="SyncPseudoUSSDictionary:enabled"/>
   <int value="1349100152"
       label="AutofillEnablePasswordInfoBarAccountIndicationFooter:disabled"/>
@@ -45625,6 +47186,7 @@ from previous Chrome versions.
   <int value="1361073386" label="ContentSuggestionsNotifications:enabled"/>
   <int value="1363136936" label="VrCustomTabBrowsing:enabled"/>
   <int value="1363151585" label="SyncPseudoUSSAppList:enabled"/>
+  <int value="1367406392" label="VaapiVideoDecoder:disabled"/>
   <int value="1367467733" label="AutoplayIgnoreWebAudio:enabled"/>
   <int value="1367487214" label="VaapiJpegImageDecodeAcceleration:enabled"/>
   <int value="1367529437" label="NTPAssetDownloadSuggestions:enabled"/>
@@ -45656,11 +47218,14 @@ from previous Chrome versions.
       label="OmniboxUIExperimentHideSuggestionUrlTrivialSubdomains:disabled"/>
   <int value="1387356699" label="PolicyAtomicGroup:enabled"/>
   <int value="1389729816" label="data-reduction-proxy-lo-fi"/>
+  <int value="1392836587" label="DesktopPWAsElidedExtensionsMenu:disabled"/>
   <int value="1392935139" label="KidsManagementUrlClassification:enabled"/>
   <int value="1393413889" label="SeparatePointingStickSettings:disabled"/>
   <int value="1393500952" label="EnableVirtualKeyboardUkm:disabled"/>
   <int value="1393722373" label="SaveEditedPDFForm:disabled"/>
   <int value="1394896630" label="PrinterStatusDialog:enabled"/>
+  <int value="1394925480" label="SharesheetContentPreviews:enabled"/>
+  <int value="1397053154" label="ContextualSearchLiteralSearchTap:enabled"/>
   <int value="1397069250" label="NetworkService:disabled"/>
   <int value="1398049903" label="WebUIDarkMode:disabled"/>
   <int value="1398148960" label="LanguageSettingsUpdate:disabled"/>
@@ -45682,17 +47247,21 @@ from previous Chrome versions.
       label="PrefetchMainResourceNetworkIsolationKey:disabled"/>
   <int value="1411679884"
       label="AutofillLocalCardMigrationUsesStrikeSystemV2:enabled"/>
+  <int value="1412874669" label="EnableRestrictedWebApis:enabled"/>
   <int value="1413158119" label="WebRtcRemoteEventLog:disabled"/>
   <int value="1413334779" label="WebPaymentsMinimalUI:enabled"/>
   <int value="1413948819" label="NupPrinting:enabled"/>
   <int value="1414918327" label="enable-accelerated-video-decode"/>
   <int value="1416592483" label="ash-enable-mirrored-screen"/>
   <int value="1418054870" label="SpecialLocale:enabled"/>
+  <int value="1419984081"
+      label="DesktopPWAsFlashAppNameInsteadOfOrigin:enabled"/>
   <int value="1421620678" label="simple-clear-browsing-data-support-string"/>
   <int value="1424775876" label="ToolbarIphAndroid:enabled"/>
   <int value="1427905064" label="CreditCardAutofillTouchBar:enabled"/>
   <int value="1428004502" label="PaymentRequestOptionalTotal:enabled"/>
   <int value="1428221397" label="QueryTilesInNTP:enabled"/>
+  <int value="1429923065" label="enable-media-internals:enabled"/>
   <int value="1431050645" label="PayWithGoogleV1:disabled"/>
   <int value="1431934725" label="OmniboxAutocompleteTitles:disabled"/>
   <int value="1434515920" label="ReaderModeInCCT:enabled"/>
@@ -45705,6 +47274,8 @@ from previous Chrome versions.
       label="OmniboxRemoveSuggestionsFromClipboard:disabled"/>
   <int value="1442798825" label="enable-quic"/>
   <int value="1442830837" label="MemoryAblation:disabled"/>
+  <int value="1446349255" label="ArcEnableUsap:disabled"/>
+  <int value="1446946673" label="DesktopRestructuredLanguageSettings:disabled"/>
   <int value="1447295459" label="SyncPseudoUSSApps:enabled"/>
   <int value="1448684258" label="TabHoverCardImages:enabled"/>
   <int value="1449177114"
@@ -45713,6 +47284,7 @@ from previous Chrome versions.
   <int value="1454006695" label="BlinkHeapUnifiedGarbageCollection:disabled"/>
   <int value="1454028829" label="EnhancedProtectionPromoCard:disabled"/>
   <int value="1454143461" label="CaptureThumbnailOnNavigatingAway:disabled"/>
+  <int value="1454295160" label="LensCameraAssistedSearch:disabled"/>
   <int value="1454363479" label="disable-storage-manager"/>
   <int value="1454527518" label="ArcNativeBridgeExperiment:enabled"/>
   <int value="1455881930" label="V8VmFuture:enabled"/>
@@ -45726,6 +47298,7 @@ from previous Chrome versions.
   <int value="1460747747" label="GdiTextPrinting:enabled"/>
   <int value="1460958818" label="NTPForeignSessionsSuggestions:enabled"/>
   <int value="1461581256" label="MovablePartialScreenshot:enabled"/>
+  <int value="1463230871" label="ArcEnableUsap:enabled"/>
   <int value="1464028544" label="WinUseHybridSpellChecker:disabled"/>
   <int value="1464610065" label="TabbedAppOverflowMenuRegroup:disabled"/>
   <int value="1465624446" label="disable-zero-copy"/>
@@ -45744,8 +47317,11 @@ from previous Chrome versions.
   <int value="1479248574" label="disable-voice-input"/>
   <int value="1481562816" label="disable-password-link"/>
   <int value="1482039233" label="SearchSuggestionsOnLocalNtp:disabled"/>
+  <int value="1482245628" label="OmniboxNativeVoiceSuggestProvider:enabled"/>
   <int value="1482839038" label="AutofillCreditCardAuthentication:enabled"/>
   <int value="1483980996" label="MacSyscallSandbox:enabled"/>
+  <int value="1486092162"
+      label="AutofillEnableOffersInClankKeyboardAccessory:enabled"/>
   <int value="1486171015" label="disable-fill-on-account-select"/>
   <int value="1486784197" label="MouseSubframeNoImplicitCapture:disabled"/>
   <int value="1487341558" label="MacViewsAutofillPopup:enabled"/>
@@ -45755,11 +47331,13 @@ from previous Chrome versions.
   <int value="1489915799" label="disable-permissions-blacklist"/>
   <int value="1490043732" label="enable-fill-on-account-select"/>
   <int value="1490255042" label="enable-overlay-scrollbar"/>
+  <int value="1492255992" label="OnDeviceGrammarCheck:enabled"/>
   <int value="1492541927" label="QuickAnswersTranslationCloudAPI:enabled"/>
   <int value="1495341532" label="disable-mtp-write-support"/>
   <int value="1495748045" label="SignedHTTPExchange:enabled"/>
   <int value="1496135626" label="UploadCrashReportsUsingJobScheduler:enabled"/>
   <int value="1496571153" label="enable-webapk"/>
+  <int value="1497284913" label="WASAPIRawAudioCapture:enabled"/>
   <int value="1497609106" label="ContextualNudges:enabled"/>
   <int value="1497924954" label="js-flags"/>
   <int value="1498398756" label="TemporaryHoldingSpace:disabled"/>
@@ -45782,6 +47360,7 @@ from previous Chrome versions.
   <int value="1514158607" label="NearbySharingDeviceContacts:enabled"/>
   <int value="1515196403" label="fast-user-switching"/>
   <int value="1517863401" label="history-entry-requires-user-gesture"/>
+  <int value="1519067750" label="ActionableContentSettings:disabled"/>
   <int value="1520181151" label="PrintServerScaling:disabled"/>
   <int value="1524178643" label="AppServiceExternalProtocol:enabled"/>
   <int value="1526718531"
@@ -45809,6 +47388,7 @@ from previous Chrome versions.
   <int value="1552753678" label="DnsHttpssvc:disabled"/>
   <int value="1553310752" label="AccessibilityCursorColor:enabled"/>
   <int value="1553422694" label="EnablePalmOnMaxTouchMajor:enabled"/>
+  <int value="1553777815" label="enable-search-prefetch-service"/>
   <int value="1556554961" label="DriveFsBidirectionalNativeMessaging:enabled"/>
   <int value="1558410842" label="FilesZipNoNaCl:disabled"/>
   <int value="1559034872" label="AutofillPrefilledFields:enabled"/>
@@ -45830,6 +47410,8 @@ from previous Chrome versions.
   <int value="1579461102" label="MemoryCoordinator:disabled"/>
   <int value="1581002467" label="enable-explicit-dma-fences"/>
   <int value="1582400283" label="VideoTutorials:enabled"/>
+  <int value="1583950482"
+      label="ClearCrossBrowsingContextGroupMainFrameName:disabled"/>
   <int value="1584039096" label="highlight-all-webviews"/>
   <int value="1584425198" label="NtpModules:enabled"/>
   <int value="1584536816" label="LimitAltTabToActiveDesk:enabled"/>
@@ -45842,6 +47424,7 @@ from previous Chrome versions.
       label="AutofillSendExperimentIdsInPaymentsRPCs:enabled"/>
   <int value="1590300329" label="CCTModulePostMessage:enabled"/>
   <int value="1591653786" label="SpeculativePreconnect:enabled"/>
+  <int value="1592391721" label="DesktopDetailedLanguageSettings:disabled"/>
   <int value="1593720927" label="GamepadVibration:disabled"/>
   <int value="1593883073" label="OfflineIndicatorV2:disabled"/>
   <int value="1593917165" label="SimplifiedNTP:disabled"/>
@@ -45852,6 +47435,7 @@ from previous Chrome versions.
   <int value="1597972555" label="ChromeSharingHubV15:enabled"/>
   <int value="1600850069" label="MobileIdentityConsistency:disabled"/>
   <int value="1600926040" label="TranslateCompactUI:enabled"/>
+  <int value="1601231448" label="VirtualKeyboardMultipaste:disabled"/>
   <int value="1601582484" label="enable-crash-reporter-for-testing"/>
   <int value="1602627012" label="OverrideSitePrefsForHrefTranslate:enabled"/>
   <int value="1602869271" label="ChromeShareScreenshot:disabled"/>
@@ -45861,6 +47445,7 @@ from previous Chrome versions.
   <int value="1605611615" label="enable-webrtc-srtp-aes-gcm"/>
   <int value="1609059016" label="CupsIppPrintingBackend:enabled"/>
   <int value="1611522475" label="AutofillPrimaryInfoStyleExperiment:disabled"/>
+  <int value="1611838284" label="CellularUseExternalEuicc:enabled"/>
   <int value="1612206633" label="CCTModuleCustomHeader:enabled"/>
   <int value="1612446645" label="enable-weak-memorycache"/>
   <int value="1612871297" label="WebPayments:disabled"/>
@@ -45874,7 +47459,6 @@ from previous Chrome versions.
       label="OmniboxUIExperimentWhiteBackgroundOnBlur:disabled"/>
   <int value="1617187093" label="enable-improved-a2hs"/>
   <int value="1618633341" label="MashOopViz:enabled"/>
-  <int value="1619516032" label="GamesHub:disabled"/>
   <int value="1619842095" label="ColorProviderRedirection:enabled"/>
   <int value="1620369597" label="enable-unsafe-webgpu"/>
   <int value="1621298798" label="VrBrowserKeyboard:enabled"/>
@@ -45906,6 +47490,7 @@ from previous Chrome versions.
   <int value="1638927687" label="AutofillRichMetadataQueries:disabled"/>
   <int value="1639190590" label="UseMessagesGoogleComDomain:enabled"/>
   <int value="1639314588" label="LookalikeUrlNavigationSuggestions:disabled"/>
+  <int value="1639728471" label="ThemeRefactorAndroid:disabled"/>
   <int value="1640386037" label="ContextualSuggestionsSlimPeekUI:disabled"/>
   <int value="1643626730" label="PrinterStatus:disabled"/>
   <int value="1643712769" label="PrintWithReducedRasterization:enabled"/>
@@ -45926,6 +47511,7 @@ from previous Chrome versions.
   <int value="1661925474" label="silent-debugger-extension-api"/>
   <int value="1663574600" label="WebViewDisplayCutout:enabled"/>
   <int value="1664401033" label="ColorCorrectRendering:enabled"/>
+  <int value="1664463407" label="FirstPartySets:enabled"/>
   <int value="1665349789" label="spurious-power-button-window"/>
   <int value="1665400247" label="OsSettingsDeepLinking:enabled"/>
   <int value="1667584730" label="WebXR:disabled"/>
@@ -45934,6 +47520,7 @@ from previous Chrome versions.
   <int value="1670161209" label="ClickToOpenPDFPlaceholder:enabled"/>
   <int value="1670799163" label="ChromeHomeShowGoogleGWhenUrlCleared:enabled"/>
   <int value="1671021713" label="AutofillImportDynamicForms:disabled"/>
+  <int value="1671985641" label="WebViewVulkan:enabled"/>
   <int value="1673427566" label="ChromeHomeExpandButton:disabled"/>
   <int value="1677167062" label="AutomaticPasswordGeneration:enabled"/>
   <int value="1677258310" label="DragAppsInTabletMode:disabled"/>
@@ -45966,15 +47553,16 @@ from previous Chrome versions.
   <int value="1701972870" label="NTPSnippetsIncreasedVisibility:enabled"/>
   <int value="1702090999" label="ClearOldBrowsingData:disabled"/>
   <int value="1703927420" label="PiexWasm:enabled"/>
-  <int value="1705332854" label="H264DecoderBufferIsCompleteFrame:enabled"/>
   <int value="1705724232" label="use-android-midi-api"/>
   <int value="1706682238" label="ContextualSearchTranslations:disabled"/>
   <int value="1707283026" label="SyncPseudoUSSExtensions:disabled"/>
   <int value="1708118086" label="TextFragmentAnchor:disabled"/>
   <int value="1711286384" label="ContextMenuCopyImage:disabled"/>
+  <int value="1712622545" label="Memories:disabled"/>
   <int value="1712880335" label="FiltersInRecents:enabled"/>
   <int value="1713230497" label="ColorCorrectRendering:disabled"/>
   <int value="1714016217" label="EnableHeuristicPalmDetectionFilter:enabled"/>
+  <int value="1714520147" label="MBIMode:disabled"/>
   <int value="1714922056" label="GlobalMediaControls:disabled"/>
   <int value="1715338237" label="ContextualSearchSecondTap:disabled"/>
   <int value="1715382788" label="ElasticOverscrollWin:disabled"/>
@@ -46016,6 +47604,7 @@ from previous Chrome versions.
       label="OmniboxUIExperimentVerticalMarginLimitToNonTouchOnly:disabled"/>
   <int value="1760946944" label="MacViewsAutofillPopup:disabled"/>
   <int value="1762320532" label="AutofillKeyboardAccessory:enabled"/>
+  <int value="1764618580" label="MojoLinuxChannelSharedMem:disabled"/>
   <int value="1766676896" label="affiliation-based-matching:disabled"/>
   <int value="1767411597" label="DisallowUnsafeHttpDownloads:enabled"/>
   <int value="1768759000" label="AutofillProfileServerValidation:disabled"/>
@@ -46027,6 +47616,7 @@ from previous Chrome versions.
   <int value="1775730290" label="OmniboxKeywordSearchButton:enabled"/>
   <int value="1776475705" label="show-composited-layer-borders"/>
   <int value="1777059507" label="trust-autofill-server-name-types"/>
+  <int value="1777241671" label="EnableAriaElementReflection:disabled"/>
   <int value="1777695562" label="SendTabToSelfShowSendingUI:disabled"/>
   <int value="1777806335" label="UsePasswordSeparatedSigninFlow:disabled"/>
   <int value="1779530254"
@@ -46050,9 +47640,11 @@ from previous Chrome versions.
       label="AutofillEnableInfoBarAccountIndicationFooterForSingleAccountUsers:enabled"/>
   <int value="1795186324" label="SyncPseudoUSSExtensionSettings:disabled"/>
   <int value="1796592669" label="InstalledAppsInCbd:disabled"/>
+  <int value="1797872070" label="CellularUseExternalEuicc:disabled"/>
   <int value="1798347197"
       label="ContextualSuggestionsIPHReverseScroll:disabled"/>
   <int value="1799521026" label="LegacyTLSEnforced:disabled"/>
+  <int value="1799526742" label="PreemptiveLinkToTextGeneration:disabled"/>
   <int value="1801585504" label="ContextMenuShopWithGoogleLens:enabled"/>
   <int value="1802874714" label="QueryTilesEnableQueryEditing:disabled"/>
   <int value="1803465156" label="enable-zero-suggest-most-visited"/>
@@ -46062,6 +47654,7 @@ from previous Chrome versions.
   <int value="1809940714" label="SpeculativeLaunchServiceWorker:disabled"/>
   <int value="1810258949" label="DisplayLocking:enabled"/>
   <int value="1810311887" label="WebAssemblyThreads:enabled"/>
+  <int value="1811744551" label="InterestFeedV2Hearts:enabled"/>
   <int value="1812368073" label="enable-new-app-list-mixer"/>
   <int value="1813370929"
       label="MigrateDefaultChromeAppToWebAppsNonGSuite:enabled"/>
@@ -46165,34 +47758,41 @@ from previous Chrome versions.
   <int value="1896527497" label="ImmersiveUiMode:enabled"/>
   <int value="1898231011" label="enable-native-notifications"/>
   <int value="1899248188" label="MediaApp:disabled"/>
-  <int value="1900153036" label="CookiesPageRedesign:disabled"/>
   <int value="1900529524" label="disable-touch-drag-drop"/>
+  <int value="1901640438" label="EnableLauncherSearchNormalization:disabled"/>
   <int value="1905465678" label="ContextualSearchSingleActions:enabled"/>
   <int value="1906942630" label="enable-easy-unlock"/>
   <int value="1907273605" label="NtpZeroSuggest:disabled"/>
   <int value="1910240042" label="enable-experimental-fullscreen-exit-ui"/>
+  <int value="1911002680" label="TFLiteLanguageDetectionEnabled:enabled"/>
   <int value="1913263516" label="OculusVR:enabled"/>
   <int value="1913298816" label="OverlayScrollbar:enabled"/>
   <int value="1913926782" label="ChromeModernAlternateCardLayout:disabled"/>
   <int value="1914347357" label="AutofillEnableVirtualCard:disabled"/>
   <int value="1915028326" label="BuiltInModuleKvStorage:disabled"/>
   <int value="1915178511" label="disable-blink-features"/>
+  <int value="1915956064" label="SharesheetContentPreviews:disabled"/>
   <int value="1916637435" label="TranslateSubFrames:enabled"/>
   <int value="1918984253"
       label="OmniboxUIExperimentBlueSearchLoopAndSearchQuery:disabled"/>
   <int value="1919917329" label="ImplicitRootScroller:disabled"/>
   <int value="1920894670"
       label="OmniboxPreserveDefaultMatchAgainstAsyncUpdate:enabled"/>
+  <int value="1921543515" label="ExoLockNotification:enabled"/>
   <int value="1923052799" label="CrostiniUseDlc:disabled"/>
+  <int value="1923496816" label="AssistantIntentTranslateInfo:disabled"/>
   <int value="1923780021" label="PrivacyReorderedAndroid:enabled"/>
   <int value="1924192543" label="ProactiveTabFreezeAndDiscard:enabled"/>
+  <int value="1925213304" label="FillingAcrossAffiliatedWebsites:enabled"/>
   <int value="1925627218" label="FullscreenToolbarReveal:disabled"/>
   <int value="1926524951" label="SystemWebApps:disabled"/>
   <int value="1927218315" label="ShelfNewUi:disabled"/>
   <int value="1927259098" label="TranslateLanguageByULP:enabled"/>
   <int value="1927374573" label="EnterpriseRealtimeExtensionRequest:enabled"/>
-  <int value="1928407249" label="NewPhotoPicker:enabled"/>
+  <int value="1929535031" label="LanguageSettingsUpdate2:enabled"/>
   <int value="1929603041" label="HideShelfControlsInTabletMode:disabled"/>
+  <int value="1930185502"
+      label="EnableBluetoothVerboseLogsForGooglers:enabled"/>
   <int value="1930901873" label="disable-sync-app-list"/>
   <int value="1931309368" label="fill-on-account-select:disabled"/>
   <int value="1932204471" label="SyncPseudoUSSThemes:disabled"/>
@@ -46201,13 +47801,18 @@ from previous Chrome versions.
   <int value="1933376478" label="IsolatePrerenders:enabled"/>
   <int value="1935405622" label="AppServiceInstanceRegistry:disabled"/>
   <int value="1936810062" label="WebVrVsyncAlign:enabled"/>
+  <int value="1937357350" label="MultilingualTyping:disabled"/>
   <int value="1938279796" label="PromosOnLocalNtp:disabled"/>
   <int value="1939413645" label="enable-invalid-cert-collection"/>
   <int value="1939884866" label="web-otp-backend"/>
   <int value="1940625534" label="NewOverviewUi:disabled"/>
   <int value="1941845443" label="ScrollableTabStrip:enabled"/>
   <int value="1942911276" label="enable-grouped-history"/>
+  <int value="1943083555" label="NotificationScheduleService:enabled"/>
   <int value="1944156526" label="sync-url"/>
+  <int value="1945031120" label="LanguageSettingsUpdate2:disabled"/>
+  <int value="1946014982"
+      label="MagnifierContinuousMouseFollowingModeSetting:disabled"/>
   <int value="1947350992" label="drop-sync-credential:disabled"/>
   <int value="1948978490" label="PaintPreviewDemo:disabled"/>
   <int value="1949019439"
@@ -46220,14 +47825,15 @@ from previous Chrome versions.
   <int value="1951645673" label="PasswordsKeyboardAccessory:disabled"/>
   <int value="1952339754"
       label="SignedExchangePrefetchCacheForNavigations:enabled"/>
+  <int value="1954778883" label="COLRV1Fonts:disabled"/>
   <int value="1955238689" label="OmniboxMaxURLMatches:disabled"/>
+  <int value="1955669770" label="MessagesForAndroidPopupBlocked:enabled"/>
   <int value="1957273171" label="PageAlmostIdle:disabled"/>
   <int value="1957358530" label="ContextualSearchSecondTap:enabled"/>
   <int value="1957472162"
       label="AutofillUpstreamEditableExpirationDate:disabled"/>
   <int value="1958387645" label="ScanCardsInWebPayments:enabled"/>
   <int value="1959148757" label="OffMainThreadFetch:enabled"/>
-  <int value="1960169775" label="NewPhotoPicker:disabled"/>
   <int value="1961068026"
       label="EnableEphemeralGuestProfilesOnDesktop:enabled"/>
   <int value="1961425320" label="force-qtkit"/>
@@ -46255,6 +47861,7 @@ from previous Chrome versions.
   <int value="1979472169" label="TabGroupsFeedback:disabled"/>
   <int value="1980011075" label="debug-packed-apps"/>
   <int value="1980648371" label="PointerEventV1SpecCapturing:enabled"/>
+  <int value="1985584246" label="PageInfoHistory:enabled"/>
   <int value="1986031201" label="SwipingFromLeftEdgeToGoBack:disabled"/>
   <int value="1988506961" label="EnableManualSaving:enabled"/>
   <int value="1988810119" label="AutofillDropdownLayout:enabled"/>
@@ -46281,8 +47888,10 @@ from previous Chrome versions.
   <int value="2000291475"
       label="AutofillEnableInfoBarAccountIndicationFooterForSyncUsers:enabled"/>
   <int value="2001505416" label="CorbAllowlistAlsoAppliesToOorCors:enabled"/>
+  <int value="2001520126" label="AccountManagementFlowsV2:enabled"/>
   <int value="2001562962"
       label="enable-manual-fallback-for-password-saving:enabled"/>
+  <int value="2002113900" label="AdaptiveButtonInTopToolbar:disabled"/>
   <int value="2002573873" label="ChromeHomeMenuItemsExpandSheet:enabled"/>
   <int value="2003568209" label="TouchpadAndWheelScrollLatching:disabled"/>
   <int value="2003811018" label="enable-touch-support-for-screen-magnifier"/>
@@ -46307,7 +47916,10 @@ from previous Chrome versions.
   <int value="2015547864" label="NetworkServiceInProcess:enabled"/>
   <int value="2018956925" label="UseAAudioDriver:disabled"/>
   <int value="2020107447" label="AndroidPayIntegrationV1:enabled"/>
+  <int value="2020898714" label="HudDisplayForPerformanceMetrics:enabled"/>
+  <int value="2022153130" label="MobileIdentityConsistencyVar:disabled"/>
   <int value="2022294878" label="WifiSyncAndroid:enabled"/>
+  <int value="2022716687" label="ReadLaterReminderNotification:enabled"/>
   <int value="2024172900" label="KidsManagementUrlClassification:disabled"/>
   <int value="2024298022"
       label="AutofillEnableInfoBarAccountIndicationFooterForSyncUsers:disabled"/>
@@ -46327,6 +47939,8 @@ from previous Chrome versions.
   <int value="2049432745" label="VaapiWebPImageDecodeAcceleration:enabled"/>
   <int value="2050985807" label="AllowPopupsDuringPageUnload:enabled"/>
   <int value="2051403297" label="ShowBluetoothDeviceBattery:disabled"/>
+  <int value="2051886966" label="PwaInstallUseBottomSheet:enabled"/>
+  <int value="2052194225" label="ChromeOSSharingHub:disabled"/>
   <int value="2056572020" label="EnableUsernameCorrection:disabled"/>
   <int value="2058148069" label="UseMessagesStagingUrl:enabled"/>
   <int value="2058283872" label="CCTModuleCache:disabled"/>
@@ -46354,13 +47968,18 @@ from previous Chrome versions.
   <int value="2077917024"
       label="enable-supervised-user-managed-bookmarks-folder"/>
   <int value="2078599705" label="ShelfAppScaling:enabled"/>
+  <int value="2078879219"
+      label="CryptAuthV2DeviceActivityStatusUseConnectivity:disabled"/>
   <int value="2079672348" label="ExperimentalKeyboardLockUI:disabled"/>
+  <int value="2080666644"
+      label="KeyboardBasedDisplayArrangementInSettings:disabled"/>
   <int value="2081154375" label="AssistantKeyRemapping:disabled"/>
   <int value="2084477383" label="CrostiniDiskResizing:enabled"/>
   <int value="2084638930"
       label="AutofillEnforceMinRequiredFieldsForUpload:enabled"/>
   <int value="2085186092" label="BulkPrinters:disabled"/>
   <int value="2085438501" label="ChromeHome:enabled"/>
+  <int value="2087069781" label="ui-debug-tools:enabled"/>
   <int value="2088446947" label="enable-ephemeral-guest-profiles-on-desktop"/>
   <int value="2089897928" label="enable-audio-focus"/>
   <int value="2091002949" label="RemoveNavigationHistory:disabled"/>
@@ -46378,7 +47997,8 @@ from previous Chrome versions.
   <int value="2099945365" label="OmniboxAssistantVoiceSearch:enabled"/>
   <int value="2101151142" label="disable-direct-write"/>
   <int value="2104340988" label="CrostiniUsername:disabled"/>
-  <int value="2104718356" label="CookiesPageRedesign:enabled"/>
+  <int value="2104439359"
+      label="OmniboxDefaultTypedNavigationsToHttps:enabled"/>
   <int value="2104788328" label="use-winrt-midi-api"/>
   <int value="2106798283" label="SafetyTip:disabled"/>
   <int value="2106855416" label="HostWindowsInAppShimProcess:enabled"/>
@@ -46394,6 +48014,7 @@ from previous Chrome versions.
   <int value="2121550859" label="PreferHtmlOverPlugins:enabled"/>
   <int value="2121776031" label="auto-virtual-keyboard"/>
   <int value="2122023503" label="enable-win32k-lockdown-mimetypes"/>
+  <int value="2122863344" label="WebViewSurfaceControl:disabled"/>
   <int value="2122876605" label="enable-bleeding-edge-rendering-fast-paths"/>
   <int value="2123183411" label="BlinkHeapIncrementalMarking:enabled"/>
   <int value="2123567684" label="OptimizeLoadingIPCForSmallResources:enabled"/>
@@ -46402,8 +48023,10 @@ from previous Chrome versions.
   <int value="2129184006" label="NTPOfflinePageDownloadSuggestions:enabled"/>
   <int value="2129524809" label="PasswordCheck:disabled"/>
   <int value="2129929643" label="enable-use-zoom-for-dsf"/>
+  <int value="2132335798" label="EcheSWA:disabled"/>
   <int value="2132595171" label="OmniboxSearchEngineLogo:enabled"/>
   <int value="2133594095" label="CryptAuthV2DeviceActivityStatus:disabled"/>
+  <int value="2133647636" label="ClipboardFilenames:disabled"/>
   <int value="2134480727" label="MediaSessionAccelerators:disabled"/>
   <int value="2135408204" label="OverscrollHistoryNavigation:disabled"/>
   <int value="2137113620"
@@ -46413,6 +48036,7 @@ from previous Chrome versions.
   <int value="2137599770" label="enable-win32k-renderer-lockdown"/>
   <int value="2138146331" label="OmniboxVoiceSearchAlwaysVisible:enabled"/>
   <int value="2139048614" label="UseSurfaceLayerForVideo:enabled"/>
+  <int value="2139520082" label="EnableRestrictedWebApis:disabled"/>
   <int value="2140453427"
       label="MigrateDefaultChromeAppToWebAppsGSuite:enabled"/>
   <int value="2141067485" label="SystemWebApps:enabled"/>
@@ -46433,6 +48057,7 @@ from previous Chrome versions.
   <int value="8" label="Commit transaction error"/>
   <int value="9" label="Initialization of compromised credentials error"/>
   <int value="10" label="Init field info table error"/>
+  <int value="11" label="Foreign key init error"/>
 </enum>
 
 <enum name="LoginDetectionType">
@@ -46467,6 +48092,7 @@ from previous Chrome versions.
   <int value="13" label="Cryptohome missing from disk"/>
   <int value="14" label="Authentication disabled for user"/>
   <int value="15" label="TPM firmware update is required"/>
+  <int value="16" label="Cryptohome is corrupted"/>
 </enum>
 
 <enum name="LoginIsKnownUser">
@@ -46568,6 +48194,13 @@ from previous Chrome versions.
     the user through the online flow until user updates their cryptohome
     password or agrees to start the new cryptohome.
   </int>
+  <int value="9" label="SamlPwdSyncTokenValidationFailed"/>
+  <int value="10" label="UnrecoverableCryptohome">
+    Cryptohome was corrupted and deemed unrecoverable.
+  </int>
+  <int value="11" label="GAIA_REAUTH_POLICY">
+    Admin policy required re-auth for Gaia without SAML users.
+  </int>
 </enum>
 
 <enum name="LoginScreenUserClickTarget">
@@ -46714,6 +48347,11 @@ from previous Chrome versions.
   <int value="9" label="EXECUTION_ERROR"/>
 </enum>
 
+<enum name="MachineLearningServiceGrammarCheckResultEvent">
+  <int value="0" label="OK"/>
+  <int value="1" label="ERROR"/>
+</enum>
+
 <enum name="MachineLearningServiceLoadHandwritingModelResultEvent">
   <int value="0" label="OK"/>
   <int value="1" label="DEPRECATED_MODEL_SPEC_ERROR"/>
@@ -47054,10 +48692,16 @@ from previous Chrome versions.
 </enum>
 
 <enum name="MacThermalState">
-  <int value="0" label="Nominal"/>
-  <int value="1" label="Fair"/>
-  <int value="2" label="Serious"/>
-  <int value="3" label="Critical"/>
+  <int value="0" label="0-Nominal"/>
+  <int value="1" label="1-Fair"/>
+  <int value="2" label="2-Serious"/>
+  <int value="3" label="3-Critical"/>
+</enum>
+
+<enum name="MagnifierMouseFollowingMode">
+  <int value="0" label="Continuous"/>
+  <int value="1" label="Centered"/>
+  <int value="2" label="Edge"/>
 </enum>
 
 <enum name="MainFrameDownloadSandboxGesture">
@@ -47084,19 +48728,19 @@ from previous Chrome versions.
 <enum name="MainThreadScrollingReason">
   <int value="0" label="Not scrolling on main"/>
   <int value="1" label="Background attachment fixed"/>
-  <int value="2" label="Non layer viewport constrained"/>
+  <int value="2" label="Non layer viewport constrained (obsolete)"/>
   <int value="3" label="Threaded scrolling disabled"/>
   <int value="4" label="Scrollbar scrolling"/>
-  <int value="5" label="Frame overlay"/>
+  <int value="5" label="Frame overlay (obsolete)"/>
   <int value="6" label="Non-fast scrollable region"/>
   <int value="7" label="Event handlers (obsolete)"/>
   <int value="8" label="Failed hit test"/>
   <int value="9" label="No scrolling layer"/>
   <int value="10" label="Not scrollable"/>
-  <int value="11" label="Continuing main thread scroll"/>
+  <int value="11" label="Continuing main thread scroll (obsolete)"/>
   <int value="12" label="Non-invertible transform"/>
-  <int value="13" label="Page based scrolling"/>
-  <int value="14" label="Animating scroll on main thread"/>
+  <int value="13" label="Page based scrolling (obsolete)"/>
+  <int value="14" label="Animating scroll on main thread (obsolete)"/>
   <int value="15" label="Has sticky position objects (obsolete)"/>
   <int value="16" label="Requires hit testing on custom scrollbars (obsolete)"/>
   <int value="17" label="Has opacity (obsolete)"/>
@@ -47903,6 +49547,10 @@ Called by update_use_counter_css.py.-->
   <int value="688" label="symbols"/>
   <int value="689" label="additive-symbols"/>
   <int value="690" label="speak-as"/>
+  <int value="691" label="border-start-start-radius"/>
+  <int value="692" label="border-start-end-radius"/>
+  <int value="693" label="border-end-start-radius"/>
+  <int value="694" label="border-end-end-radius"/>
 </enum>
 
 <enum name="MappedEditingCommands">
@@ -48589,6 +50237,7 @@ Called by update_use_counter_css.py.-->
   <int value="3" label="Connection retry"/>
   <int value="4" label="First by mDNS, then by DIAL"/>
   <int value="5" label="First by DIAL, then by mDNS"/>
+  <int value="6" label="Connection retry on error"/>
 </enum>
 
 <enum name="MediaRouterCreateRouteOutcome">
@@ -48608,9 +50257,10 @@ Called by update_use_counter_css.py.-->
 
 <enum name="MediaRouterDialFetchAppInfoResult">
   <int value="0" label="Success"/>
-  <int value="1" label="Not found"/>
+  <int value="1" label="(Deprecated) Not found"/>
   <int value="2" label="Network error"/>
   <int value="3" label="Parse error"/>
+  <int value="4" label="HTTP error"/>
 </enum>
 
 <enum name="MediaRouterDialogActivationLocationAndCastMode">
@@ -48786,6 +50436,121 @@ Called by update_use_counter_css.py.-->
   <int value="0" label="AMEDIA_OK"/>
 </enum>
 
+<enum name="MediaStatusCode">
+  <int value="0" label="Ok"/>
+  <int value="1" label="Aborted"/>
+  <int value="2" label="InvalidArgument"/>
+  <int value="257" label="DecoderInitializeNeverCompleted"/>
+  <int value="258" label="DecoderFailedDecode"/>
+  <int value="259" label="DecoderUnsupportedProfile"/>
+  <int value="260" label="DecoderUnsupportedCodec"/>
+  <int value="261" label="DecoderUnsupportedConfig"/>
+  <int value="262" label="EncryptedContentUnsupported"/>
+  <int value="263" label="ClearContentUnsupported"/>
+  <int value="264" label="DecoderMissingCdmForEncryptedContent"/>
+  <int value="266" label="DecoderCantChangeCodec"/>
+  <int value="268" label="InitializationUnspecifiedFailure"/>
+  <int value="269" label="DecoderVideoFrameConstructionFailed"/>
+  <int value="270" label="MakeContextCurrentFailed"/>
+  <int value="271" label="DecodeErrorDoNotUse"/>
+  <int value="513" label="WindowsWrappedHresult"/>
+  <int value="514" label="WindowsApiNotAvailible"/>
+  <int value="515" label="WindowsD3D11Error"/>
+  <int value="769" label="PostTextureFailed"/>
+  <int value="770" label="PostAcquireStreamFailed"/>
+  <int value="771" label="CreateEglStreamFailed"/>
+  <int value="772" label="CreateEglStreamConsumerFailed"/>
+  <int value="773" label="CreateEglStreamProducerFailed"/>
+  <int value="774" label="CreateTextureSelectorFailed"/>
+  <int value="775" label="QueryID3D11MultithreadFailed"/>
+  <int value="776" label="GetDecoderConfigCountFailed"/>
+  <int value="777" label="GetDecoderConfigFailed"/>
+  <int value="778" label="ProcessTextureFailed"/>
+  <int value="779" label="UnsupportedTextureFormatForBind"/>
+  <int value="780" label="CreateDecoderOutputViewFailed"/>
+  <int value="781" label="AllocateTextureForCopyingWrapperFailed"/>
+  <int value="782" label="CreateDecoderOutputTextureFailed"/>
+  <int value="783" label="CreateVideoProcessorInputViewFailed"/>
+  <int value="784" label="VideoProcessorBltFailed"/>
+  <int value="785" label="CreateVideoProcessorOutputViewFailed"/>
+  <int value="786" label="CreateVideoProcessorEnumeratorFailed"/>
+  <int value="787" label="CreateVideoProcessorFailed"/>
+  <int value="788" label="QueryVideoContextFailed"/>
+  <int value="789" label="AcceleratorFlushFailed"/>
+  <int value="790" label="TryAgainNotSupported"/>
+  <int value="791" label="CryptoConfigFailed"/>
+  <int value="792" label="DecoderBeginFrameFailed"/>
+  <int value="793" label="ReleaseDecoderBufferFailed"/>
+  <int value="800" label="GetPicParamBufferFailed"/>
+  <int value="801" label="ReleasePicParamBufferFailed"/>
+  <int value="802" label="GetBitstreamBufferFailed"/>
+  <int value="803" label="ReleaseBitstreamBufferFailed"/>
+  <int value="804" label="GetSliceControlBufferFailed"/>
+  <int value="805" label="ReleaseSliceControlBufferFailed"/>
+  <int value="806" label="DecoderEndFrameFailed"/>
+  <int value="807" label="SubmitDecoderBuffersFailed"/>
+  <int value="808" label="GetQuantBufferFailed"/>
+  <int value="809" label="ReleaseQuantBufferFailed"/>
+  <int value="816" label="SliceTooBigForBitstreamBuffer"/>
+  <int value="1025" label="MojoDecoderNoWrappedDecoder"/>
+  <int value="1026" label="MojoDecoderStoppedBeforeInitDone"/>
+  <int value="1027" label="MojoDecoderUnsupported"/>
+  <int value="1028" label="MojoDecoderNoConnection"/>
+  <int value="1029" label="MojoDecoderDeletedWithoutInitialization"/>
+  <int value="1281" label="ChromeOSVideoDecoderNoDecoders"/>
+  <int value="1282" label="V4l2NoDevice"/>
+  <int value="1283" label="V4l2FailedToStopStreamQueue"/>
+  <int value="1284" label="V4l2NoDecoder"/>
+  <int value="1285" label="V4l2FailedFileCapabilitiesCheck"/>
+  <int value="1286" label="V4l2FailedResourceAllocation"/>
+  <int value="1287" label="V4l2BadFormat"/>
+  <int value="1288" label="V4L2FailedToStartStreamQueue"/>
+  <int value="1289" label="VaapiReinitializedDuringDecode"/>
+  <int value="1296" label="VaapiFailedAcceleratorCreation"/>
+  <int value="1537" label="EncoderInitializeNeverCompleted"/>
+  <int value="1538" label="EncoderInitializeTwice"/>
+  <int value="1539" label="EncoderFailedEncode"/>
+  <int value="1540" label="EncoderUnsupportedProfile"/>
+  <int value="1541" label="EncoderUnsupportedCodec"/>
+  <int value="1542" label="EncoderUnsupportedConfig"/>
+  <int value="1543" label="EncoderInitializationError"/>
+  <int value="1544" label="EncoderFailedFlush"/>
+  <int value="1793" label="VaapiBadContext"/>
+  <int value="1794" label="VaapiNoBuffer"/>
+  <int value="1795" label="VaapiNoBufferHandle"/>
+  <int value="1796" label="VaapiNoPixmap"/>
+  <int value="1797" label="VaapiNoImage"/>
+  <int value="1798" label="VaapiNoSurface"/>
+  <int value="1799" label="VaapiFailedToInitializeImage"/>
+  <int value="1800" label="VaapiFailedToBindTexture"/>
+  <int value="1801" label="VaapiFailedToBindImage"/>
+  <int value="1802" label="VaapiUnsupportedFormat"/>
+  <int value="1803" label="VaapiFailedToExportImage"/>
+  <int value="1804" label="VaapiBadImageSize"/>
+  <int value="1805" label="VaapiNoTexture"/>
+  <int value="2049" label="H264ParsingError"/>
+  <int value="2050" label="H264BufferTooSmall"/>
+  <int value="2306" label="PipelineErrorNetwork"/>
+  <int value="2307" label="PipelineErrorDecode"/>
+  <int value="2309" label="PipelineErrorAbort"/>
+  <int value="2310" label="PipelineErrorInitializationFailed"/>
+  <int value="2312" label="PipelineErrorCouldNotRender"/>
+  <int value="2313" label="PipelineErrorRead"/>
+  <int value="2315" label="PipelineErrorInvalidState"/>
+  <int value="2316" label="PipelineErrorDemuxerErrorCouldNotOpen"/>
+  <int value="2317" label="PipelineErrorDemuxerErrorCouldNotParse"/>
+  <int value="2318" label="PipelineErrorDemuxerErrorNoSupportedStreams"/>
+  <int value="2319" label="PipelineErrorDecoderErrorNotSupported"/>
+  <int value="2320" label="PipelineErrorChuckDemuxerErrorAppendFailed"/>
+  <int value="2321" label="PipelineErrorChunkDemuxerErrorEosStatusDecodeError"/>
+  <int value="2322"
+      label="PipelineErrorChunkDemuxerErrorEosStatusNetworkError"/>
+  <int value="2323" label="PipelineErrorAudioRendererError"/>
+  <int value="2325" label="PipelineErrorExternalRendererFailed"/>
+  <int value="2326" label="PipelineErrorDemuxerErrorDetectedHLS"/>
+  <int value="2561" label="UnsupportedFrameFormatError"/>
+</enum>
+
 <enum name="MediaStreamRequestResult">
   <int value="0" label="OK"/>
   <int value="1" label="Permission Denied"/>
@@ -48828,6 +50593,16 @@ Called by update_use_counter_css.py.-->
   <int value="2" label="Pending Media Tracks"/>
 </enum>
 
+<enum name="MediaStreamType">
+  <int value="0" label="Local element capture"/>
+  <int value="1" label="Local device capture"/>
+  <int value="2" label="Local tab capture"/>
+  <int value="3" label="Local desktop capture"/>
+  <int value="4" label="Local display capture"/>
+  <int value="5" label="Remote media stream"/>
+  <int value="6" label="None"/>
+</enum>
+
 <enum name="MediaTimelineAbsTimeDelta">
   <int value="0" label="[0, 1ms)"/>
   <int value="1" label="[1ms, 16ms)"/>
@@ -49773,7 +51548,7 @@ Called by update_use_counter_css.py.-->
   </int>
 </enum>
 
-<enum name="ModuleBlacklistCacheReadResult">
+<enum name="ModuleBlocklistCacheReadResult">
   <int value="0" label="Success"/>
   <int value="1" label="Failed to open the file"/>
   <int value="2" label="Failed to read the metadata"/>
@@ -49784,8 +51559,8 @@ Called by update_use_counter_css.py.-->
   <int value="7" label="Invalid MD5 digest"/>
 </enum>
 
-<enum name="ModuleBlacklistStatus">
-  <int value="0" label="Newly blacklisted"/>
+<enum name="ModuleBlocklistStatus">
+  <int value="0" label="Newly blocklisted"/>
   <int value="1" label="Blocked"/>
 </enum>
 
@@ -50026,6 +51801,23 @@ Called by update_use_counter_css.py.-->
   <int value="5" label="Authentication Error"/>
 </enum>
 
+<enum name="MultiDeviceNearbyDisconnectionReason">
+  <int value="0" label="Disconnection requested by client"/>
+  <int value="1" label="Failed discovery"/>
+  <int value="2" label="Timeout during discovery"/>
+  <int value="3" label="Failed requesting connection"/>
+  <int value="4" label="Timeout during RequestConnection() call"/>
+  <int value="5" label="Failed accepting connection"/>
+  <int value="6" label="Timeout during AcceptConnection() call"/>
+  <int value="7" label="Connection rejected"/>
+  <int value="8" label="Timeout waiting for connection to be accepted"/>
+  <int value="9" label="SendMessage() failed"/>
+  <int value="10" label="Received unexpected payload type"/>
+  <int value="11" label="Connection lost"/>
+  <int value="12" label="Nearby process crash"/>
+  <int value="13" label="Nearby process Mojo dependency disconnection"/>
+</enum>
+
 <enum name="MultiDeviceNearbyMessageAction">
   <int value="0" label="Message Sent"/>
   <int value="1" label="Message Received"/>
@@ -50035,6 +51827,8 @@ Called by update_use_counter_css.py.-->
   <int value="0" label="New user, potential host exists"/>
   <int value="1" label="Existing user, host switched"/>
   <int value="2" label="Existing user, new Chromebook added"/>
+  <int value="3" label="Unknown (error case)"/>
+  <int value="4" label="Wi-Fi Sync Announcement"/>
 </enum>
 
 <enum name="MultiDeviceSetupOOBEUserChoice">
@@ -50504,6 +52298,34 @@ Called by update_use_counter_css.py.-->
   <int value="17" label="externalfile"/>
 </enum>
 
+<enum name="NavigationSuggestionDigitalAssetLinkValidationEvent">
+  <int value="0" label="kNone"/>
+  <int value="1" label="kStarted">
+    A digital asset link validation started. Recorded once for a lookalike and
+    target site pair.
+  </int>
+  <int value="2" label="kLookalikeManifestFailed">
+    Failed to fetch the lookalike site's manifest. This could be because the
+    lookalike site doesn't serve a manifest, serves an invalid manifest or a
+    manifest that doesn't match the target site.
+  </int>
+  <int value="3" label="kLookalikeManifestTimedOut">
+    Timed out while fetching the lookalike site's manifest.
+  </int>
+  <int value="4" label="kTargetManifestFailed">
+    Failed to fetch the target site's manifest. This could be because the target
+    site doesn't serve a manifest, serves an invalid manifest or a manifest that
+    doesn't match the lookalike site.
+  </int>
+  <int value="5" label="kTargetManifestTimedOut">
+    Timed out while fetching the lookalike site's manifest.
+  </int>
+  <int value="6" label="kValidationSucceeded">
+    Validation of lookalike and target manifests succeeded, no need to show a
+    lookalike warning.
+  </int>
+</enum>
+
 <enum name="NavigationSuggestionEvent">
   <int value="0" label="None"/>
   <int value="1" label="Infobar shown"/>
@@ -50585,6 +52407,52 @@ Called by update_use_counter_css.py.-->
   <int value="9" label="WebRTC"/>
 </enum>
 
+<enum name="NearbyConnectionsStatus">
+  <int value="0" label="Success"/>
+  <int value="1" label="Error"/>
+  <int value="2" label="Out-of-order API call"/>
+  <int value="3" label="Already have active strategy"/>
+  <int value="4" label="Already advertising"/>
+  <int value="5" label="Already discovering"/>
+  <int value="6" label="Endpoint IO error"/>
+  <int value="7" label="Endpoint unknown"/>
+  <int value="8" label="Connection rejected"/>
+  <int value="9" label="Already connected to endpoint"/>
+  <int value="10" label="Not connected to endpoint"/>
+  <int value="11" label="Bluetooth error"/>
+  <int value="12" label="BLE error"/>
+  <int value="13" label="Wi-Fi LAN error"/>
+  <int value="14" label="Payload unknown"/>
+</enum>
+
+<enum name="NearbyConnectionsUtilityProcessMojoDependencyName">
+  <int value="0" label="Nearby Connections"/>
+  <int value="1" label="Bluetooth Adapter"/>
+  <int value="2" label="Socket Manager"/>
+  <int value="3" label="MDNS Responder"/>
+  <int value="4" label="ICE Config Fetcher"/>
+  <int value="5" label="WebRTC Signaling Messenger"/>
+</enum>
+
+<enum name="NearbyConnectionsUtilityProcessShutdownReason">
+  <int value="0" label="Normal"/>
+  <int value="1" label="Crash"/>
+  <int value="2" label="Mojo pipe disconnection"/>
+</enum>
+
+<enum name="NearbyShareAttachmentType">
+  <int value="0" label="Unknown File Type"/>
+  <int value="1" label="Unknown Text Type"/>
+  <int value="2" label="Image"/>
+  <int value="3" label="Video"/>
+  <int value="4" label="App"/>
+  <int value="5" label="Audio"/>
+  <int value="6" label="Text"/>
+  <int value="7" label="URL"/>
+  <int value="8" label="Address"/>
+  <int value="9" label="Phone number"/>
+</enum>
+
 <enum name="NearbyShareCertificateManagerGetDecryptedPublicCertificateResult">
   <int value="0" label="Success"/>
   <int value="1" label="No Match"/>
@@ -50599,6 +52467,13 @@ Called by update_use_counter_css.py.-->
   <int value="4" label="Invalid Operation"/>
 </enum>
 
+<enum name="NearbyShareDeviceType">
+  <int value="0" label="Unknown device type"/>
+  <int value="1" label="Phone"/>
+  <int value="2" label="Tablet"/>
+  <int value="3" label="Laptop"/>
+</enum>
+
 <enum name="NearbyShareDiscoveryProgress">
   <int value="0" label="Discovery not attempted"/>
   <int value="1" label="Failed to start discovery"/>
@@ -50617,7 +52492,7 @@ Called by update_use_counter_css.py.-->
   <int value="4" label="Disallowed by policy"/>
 </enum>
 
-<enum name="NearbyShareFinalPayloadStatus">
+<enum name="NearbyShareFinalStatus">
   <int value="0" label="Success"/>
   <int value="1" label="Failure"/>
   <int value="2" label="Canceled"/>
@@ -50641,6 +52516,7 @@ Called by update_use_counter_css.py.-->
   <int value="2" label="Out-of-order API call"/>
   <int value="3" label="Already stopped"/>
   <int value="4" label="Transfer already in progress"/>
+  <int value="5" label="No available connection medium"/>
 </enum>
 
 <enum name="NearbyShareStartAdvertisingFailureReason">
@@ -50654,6 +52530,19 @@ Called by update_use_counter_css.py.-->
   <int value="7" label="WiFiLAN error"/>
 </enum>
 
+<enum name="NearbyShareTransferFinalStatus">
+  <int value="0" label="Complete"/>
+  <int value="1" label="Unknown"/>
+  <int value="2" label="Awaiting remote acceptance failed"/>
+  <int value="3" label="Failed"/>
+  <int value="4" label="Rejected"/>
+  <int value="5" label="Cancelled"/>
+  <int value="6" label="Timed out"/>
+  <int value="7" label="Media unavailable"/>
+  <int value="8" label="Not enough space"/>
+  <int value="9" label="Unsupported attachment type"/>
+</enum>
+
 <enum name="NearbyShareTransferNotCompletedReason">
   <int value="0" label="Unknown"/>
   <int value="1" label="Awaiting remote acceptance failed"/>
@@ -50666,6 +52555,27 @@ Called by update_use_counter_css.py.-->
   <int value="8" label="Unsupported attachment type"/>
 </enum>
 
+<enum name="NearbyShareUpgradedMedium">
+  <int value="0" label="Unknown upgraded medium"/>
+  <int value="1" label="mDNS"/>
+  <int value="2" label="Bluetooth"/>
+  <int value="3" label="WiFi hotspot"/>
+  <int value="4" label="BLE"/>
+  <int value="5" label="WiFi LAN"/>
+  <int value="6" label="WiFi Aware"/>
+  <int value="7" label="NFC"/>
+  <int value="8" label="WiFi Direct"/>
+  <int value="9" label="WebRTC"/>
+  <int value="10" label="No upgrade"/>
+</enum>
+
+<enum name="NearbyShareVisibility">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="No one"/>
+  <int value="2" label="All contacts"/>
+  <int value="3" label="Selected contacts"/>
+</enum>
+
 <enum name="NearOomDetectionEndReason">
   <obsolete>
     Removed in Feb 2020.
@@ -50703,6 +52613,16 @@ Called by update_use_counter_css.py.-->
       label="Histogram active sample wrapped 2^31 during accumulation."/>
 </enum>
 
+<enum name="NeighborLinkMonitorFailureType">
+  <int value="0" label="Unknown type of failure"/>
+  <int value="1" label="IPv4 gateway neighbor lost"/>
+  <int value="2" label="IPv4 DNS server neighbor lost"/>
+  <int value="3" label="IPv4 gateway and DNS server neighbor lost"/>
+  <int value="4" label="IPv6 gateway neighbor lost"/>
+  <int value="5" label="IPv6 DNS server neighbor lost"/>
+  <int value="6" label="IPv6 gateway and DNS server neighbor lost"/>
+</enum>
+
 <enum name="NetCacheState">
   <int value="0" label="FROM_CACHE"/>
   <int value="1" label="STILL_VALID"/>
@@ -50977,7 +52897,8 @@ Called by update_net_error_codes.py.-->
   <int value="504" label="INVALID_SIGNED_EXCHANGE"/>
   <int value="505" label="INVALID_WEB_BUNDLE"/>
   <int value="506" label="TRUST_TOKEN_OPERATION_FAILED"/>
-  <int value="507" label="TRUST_TOKEN_OPERATION_CACHE_HIT"/>
+  <int value="507"
+      label="TRUST_TOKEN_OPERATION_SUCCESS_WITHOUT_SENDING_REQUEST"/>
   <int value="601" label="FTP_FAILED"/>
   <int value="602" label="FTP_SERVICE_UNAVAILABLE"/>
   <int value="603" label="FTP_TRANSFER_ABORTED"/>
@@ -52671,6 +54592,18 @@ Called by update_net_trust_anchors.py.-->
   <int value="1" label="User Disconnect"/>
 </enum>
 
+<enum name="NetworkEligibilityStatus">
+  <int value="0" label="Network Is Eligible"/>
+  <int value="1" label="No Metedata"/>
+  <int value="2" label="Prohibited By Policy"/>
+  <int value="3" label="Invalid Password"/>
+  <int value="4" label="Not Connectable"/>
+  <int value="5" label="Not Configured By User"/>
+  <int value="6" label="Unsupported Security Type"/>
+  <int value="7" label="No Wifi Networks Available"/>
+  <int value="8" label="Hidden SSID"/>
+</enum>
+
 <enum name="NetworkErrorType">
   <int value="0" label="Unknown"/>
   <int value="1" label="Portal"/>
@@ -53012,6 +54945,12 @@ Called by update_net_trust_anchors.py.-->
   <int value="6" label="URL blocked for supervised user"/>
 </enum>
 
+<enum name="NewUserAdded">
+  <int value="0" label="Other user added"/>
+  <int value="1" label="Family Link user added"/>
+  <int value="2" label="Regular user added"/>
+</enum>
+
 <enum name="NewUserPriorityPrefsSyncResult">
   <int value="0" label="Succeeded"/>
   <int value="1" label="Timed out"/>
@@ -53396,6 +55335,21 @@ Called by update_net_trust_anchors.py.-->
   <int value="2" label="Other, not at startup"/>
 </enum>
 
+<enum name="NtpModules">
+  <summary>
+    Hash values for the IDs of NTP modules. Each of these values is computed by
+    casting the output of base::PersistentHash(module_id) to
+    base::HistogramBase::Sample.
+  </summary>
+  <int value="-1996945391" label="chrome_cart"/>
+  <int value="-1985729288" label="recipe_tasks"/>
+  <int value="-1870686922" label="drive"/>
+  <int value="-1810591528" label="shopping_tasks"/>
+  <int value="-505117227" label="dummy2"/>
+  <int value="301684683" label="kaleidoscope (deprecated)"/>
+  <int value="1976054971" label="dummy"/>
+</enum>
+
 <enum name="NtpMostVisitedScheme">
   <obsolete>
     Deprecated 2016-05.
@@ -53703,6 +55657,44 @@ Called by update_net_trust_anchors.py.-->
   <int value="4" label="Navigated Away Through Browser History"/>
 </enum>
 
+<enum name="NvidiaDeviceId">
+  <int value="1600" label="0x0640, GeForce 9500 GT"/>
+  <int value="2601" label="0x0A29, GeForce GT 330M"/>
+  <int value="4053" label="0x0FD5, GeForce GT 650M Mac Edition"/>
+  <int value="4056" label="0x0FD8, GeForce GT 640M Mac Edition"/>
+  <int value="4073" label="0x0FE9, GeForce GT 750M Mac Edition"/>
+  <int value="4074" label="0x0FEA, GeForce GT 755M Mac Edition"/>
+  <int value="4416"
+      label="0x1140, GeForce 610M/710M/810M/820M / GT 620M/625M/630M/720M"/>
+  <int value="4509" label="0x119D, GeForce GTX 775M Mac Edition"/>
+  <int value="4510" label="0x119E, GeForce GTX 780M Mac Edition"/>
+  <int value="4514" label="0x11A2, GeForce GTX 675MX Mac Edition"/>
+  <int value="4515" label="0x11A3, GeForce GTX 680MX"/>
+  <int value="4761" label="0x1299, GeForce 920M"/>
+  <int value="4929" label="0x1341, GeForce 840M"/>
+  <int value="4935" label="0x1347, GeForce 940M"/>
+  <int value="4941" label="0x134D, GeForce 940MX"/>
+  <int value="4943" label="0x134F, GeForce 920MX"/>
+  <int value="5018" label="0x139A, GeForce GTX 950M"/>
+  <int value="5019" label="0x139B, GeForce GTX 960M"/>
+  <int value="5965" label="0x174D, GeForce MX130"/>
+  <int value="5966" label="0x174E, GeForce MX110"/>
+  <int value="7171" label="0x1C03, GeForce GTX 1060 6GB"/>
+  <int value="7200" label="0x1C20, GeForce GTX 1060 Mobile"/>
+  <int value="7298" label="0x1C82, GeForce GTX 1050 Ti"/>
+  <int value="7308" label="0x1C8C, GeForce GTX 1050 Ti Mobile"/>
+  <int value="7309" label="0x1C8D, GeForce GTX 1050 Mobile"/>
+  <int value="7440" label="0x1D10, GeForce MX150"/>
+  <int value="7441" label="0x1D11, GeForce MX230"/>
+  <int value="7443" label="0x1D13, GeForce MX250"/>
+  <int value="7825" label="0x1E91, GeForce RTX 2070 SUPER Mobile / Max-Q"/>
+  <int value="7957" label="0x1F15, GeForce RTX 2060 Mobile"/>
+  <int value="8081" label="0x1F91, GeForce GTX 1650 Mobile / Max-Q"/>
+  <int value="8085" label="0x1F95, GeForce GTX 1650 Ti Mobile"/>
+  <int value="8089" label="0x1F99, GeForce ?"/>
+  <int value="8593" label="0x2191, GeForce GTX 1660 Ti Mobile"/>
+</enum>
+
 <enum name="OAuth2BadRequestError">
   <int value="0" label="invalid_request"/>
   <int value="1" label="invalid_client"/>
@@ -53729,16 +55721,17 @@ Called by update_net_trust_anchors.py.-->
 
 <enum name="OAuth2MintTokenApiCallResult">
   <int value="0" label="Mint token success"/>
-  <int value="1" label="Issue advice success"/>
+  <int value="1" label="Issue advice success (deprecated 02/2021)"/>
   <int value="2" label="Remote consent success"/>
   <int value="3" label="Api call failure"/>
   <int value="4" label="Parse JSON failure"/>
   <int value="5" label="&quot;issueAdvice&quot; key not found"/>
   <int value="6" label="Parse mint token failure"/>
-  <int value="7" label="Parse issue advice failure"/>
+  <int value="7" label="Parse issue advice failure (deprecated 02/2021)"/>
   <int value="8" label="Remote consent fallback (deprecated 06/2020)"/>
   <int value="9" label="Parse remote consent failure"/>
-  <int value="10" label="Mint token success with fallback scopes"/>
+  <int value="10"
+      label="Mint token success with fallback scopes (deprecated 02/2021)"/>
 </enum>
 
 <enum name="OAuthMultiloginResponseStatus">
@@ -54709,6 +56702,9 @@ Called by update_net_trust_anchors.py.-->
 </enum>
 
 <enum name="OmniboxUserTextCleared">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <int value="0" label="cleared by editing"/>
   <int value="1" label="cleared with escape"/>
 </enum>
@@ -54779,6 +56775,31 @@ Called by update_net_trust_anchors.py.-->
       label="Missing glyph path, but a fallback was found (deprecated)"/>
 </enum>
 
+<enum name="OpaqueResponseBlocking_ResponseHeadersHeuristic">
+  <summary>
+    Initial decision taken by Opaque Response Blocking (ORB, see also
+    https://github.com/annevk/orb) based on just the response headers.
+  </summary>
+  <int value="0" label="NonOpaqueResponse">
+    ORB only applies to opaque respones - the NonOpaqueResponse value covers:
+    mode != no-cors (e.g. mode=navigate or mode=cors) and browser-initiated
+    requests.
+  </int>
+  <int value="1" label="ProcessedBasedOnHeaders">
+    ORB algorithm is *surely* able to make a decision based on the response
+    headers. The ProcessedBasedOnHeaders enum value covers all subresource
+    requests: scripts, images, video, etc. (both same-origin and cross-origin
+    requests).
+  </int>
+  <int value="2" label="RequiresJavascriptParsing">
+    ORB algorithm *might* requires parsing the response body as Javascript.
+
+    This might be a false positive if the response: 1) sniffs as an
+    audio/image/video format 2) represents a valid range response for a media
+    element
+  </int>
+</enum>
+
 <enum name="OpenBrowserType">
   <summary>App categories for the app that opens the browser.</summary>
   <int value="0" label="Arc"/>
@@ -54991,6 +57012,47 @@ Called by update_net_trust_anchors.py.-->
   </int>
 </enum>
 
+<enum name="OptimizationGuidePredictionModelDownloadStatus">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="Success">
+    The download was successfully verified and processed.
+  </int>
+  <int value="2" label="Failed to verify download">
+    The download failed verification.
+  </int>
+  <int value="3" label="Failed to create unzip directory">
+    The download was successfully verified but a directory to unzip the file to
+    could not be created.
+  </int>
+  <int value="4" label="Failed to unzip file">
+    The download was successfully verified but it failed to be unzipped.
+  </int>
+  <int value="5" label="Failed to read model info file">
+    The download was successfully verified, but the expected model info file
+    could not be read.
+  </int>
+  <int value="6" label="Failed to parse model info file">
+    The download was successfully verified, but the expected model info file
+    could not be parsed.
+  </int>
+  <int value="7" label="Failed to find expected model file">
+    The download and model info files were successfully verified and processed,
+    but the expected model file was not found.
+  </int>
+  <int value="8" label="Failed to process expected model file">
+    The download and model info files were successfully verified and processed,
+    but the expected model file failed to be processed.
+  </int>
+  <int value="9" label="Failed to validate model info file">
+    The download was successfully verified, but the model info contained in the
+    model info file was invalid.
+  </int>
+  <int value="10" label="Failed to verify download publisher">
+    The download was a valid CRX file but came from a publisher that is
+    untrusted.
+  </int>
+</enum>
+
 <enum name="OptimizationGuideProcessHintsResult">
   <int value="0" label="Success">
     Hints were processed and at least one supported hint was stored.
@@ -55070,6 +57132,13 @@ Called by update_net_trust_anchors.py.-->
   </int>
 </enum>
 
+<enum name="OriginAgentClusterEndResult">
+  <int value="0" label="Not requested and not origin-keyed"/>
+  <int value="1" label="Not requested but origin-keyed"/>
+  <int value="2" label="Requested but not origin-keyed"/>
+  <int value="3" label="Requested and origin-keyed"/>
+</enum>
+
 <enum name="OriginTrialEnableResult">
   <obsolete>
     Obsolete as of M54 and replaced by OriginTrialTokenStatus.
@@ -55159,6 +57228,10 @@ Called by update_net_trust_anchors.py.-->
   <int value="211" label="Phone Hub Notification Badge: On/Off (Deprecated)"/>
   <int value="212" label="Phone Hub Task Continuation: On/Off"/>
   <int value="213" label="Wifi Sync: On/Off"/>
+  <int value="214" label="Nearby Share: Device Name"/>
+  <int value="215" label="Nearby Share: Device Visibility"/>
+  <int value="216" label="Nearby Share: Contacts"/>
+  <int value="217" label="Nearby Share: Data Usage"/>
   <int value="300" label="Add Account"/>
   <int value="301" label="Remove Account"/>
   <int value="302" label="Split Sync On/Off"/>
@@ -55214,6 +57287,9 @@ Called by update_net_trust_anchors.py.-->
   <int value="432" label="Night Light Color Temperature"/>
   <int value="433" label="Power Idle Behavior While On Battery"/>
   <int value="434" label="Display: Overscan"/>
+  <int value="435" label="Pointing Stick: Speed"/>
+  <int value="436" label="Pointing Stick: Acceleration"/>
+  <int value="437" label="Pointing Stick: Swap Primary Buttons"/>
   <int value="500" label="Open Wallpaper"/>
   <int value="501" label="Ambient Mode On/Off"/>
   <int value="502" label="Ambient Mode Source"/>
@@ -55222,7 +57298,7 @@ Called by update_net_trust_anchors.py.-->
   <int value="600" label="Preferred Search Engine"/>
   <int value="601" label="Assistant: On/Off"/>
   <int value="602" label="Assistant: Related Info"/>
-  <int value="603" label="Assistant: Quick Answers"/>
+  <int value="603" label="Assistant: Quick Answers (Deprecated)"/>
   <int value="604" label="Assistant: Ok Google"/>
   <int value="605" label="Assistant: Notifications"/>
   <int value="606" label="Assistant: Voice Input"/>
@@ -55243,6 +57319,17 @@ Called by update_net_trust_anchors.py.-->
   <int value="1101" label="Verified Access"/>
   <int value="1102" label="Keep Wi-Fi On During Sleep (Deprecated)"/>
   <int value="1103" label="Usage Stats And Crash Reports"/>
+  <int value="1104" label="Privacy: Guest Browsing V2"/>
+  <int value="1105" label="Privacy: Show Usernames And Photos At Sign In V2"/>
+  <int value="1106" label="Privacy: Restrict Sign In V2"/>
+  <int value="1107" label="Privacy: Add To User Allowlist V2"/>
+  <int value="1108" label="Privacy: Remove From User Allowlist V2"/>
+  <int value="1109" label="Privacy: Lock Screen V2"/>
+  <int value="1110" label="Privacy: Change Auth Pin V2"/>
+  <int value="1111" label="Privacy: Add Fingerprint V2"/>
+  <int value="1112" label="Privacy: Remove Fingerprint V2"/>
+  <int value="1113"
+      label="Privacy: Enable/Disable peripheral data access protection"/>
   <int value="1200" label="Add Language"/>
   <int value="1201" label="Show Input Options In Shelf"/>
   <int value="1202" label="Show Personal Information Suggestions"/>
@@ -55255,6 +57342,7 @@ Called by update_net_trust_anchors.py.-->
   <int value="1400" label="Add Printer"/>
   <int value="1401" label="Saved Printers"/>
   <int value="1402" label="Print Jobs"/>
+  <int value="1403" label="Scanning App"/>
   <int value="1500" label="A11y Quick Settings"/>
   <int value="1501" label="Chrome Vox"/>
   <int value="1502" label="Select To Speak"/>
@@ -55285,6 +57373,7 @@ Called by update_net_trust_anchors.py.-->
   <int value="1527" label="Live Captions"/>
   <int value="1528" label="Cursor Colors: On/Off"/>
   <int value="1529" label="Fullscreen Magnifier Focus Following"/>
+  <int value="1530" label="Fullscreen Magnifier Mouse Following Mode"/>
   <int value="1600" label="Powerwash"/>
   <int value="1700" label="Change Chrome Channel"/>
   <int value="1701" label="Copy Detailed Build Info"/>
@@ -55293,9 +57382,11 @@ Called by update_net_trust_anchors.py.-->
   <int value="1704" label="Get Help with Chrome OS"/>
   <int value="1705" label="Report an Issue"/>
   <int value="1706" label="View Terms of Service"/>
+  <int value="1707" label="Open Diagnostics App"/>
   <int value="1800" label="View Add Kerberos Ticket V2"/>
   <int value="1801" label="Remove Kerberos Ticket V2"/>
   <int value="1802" label="Set Active Kerberos Ticket V2"/>
+  <int value="1900" label="Restore Apps And Pages On Startup"/>
 </enum>
 
 <enum name="OsSettingSearchBoxUserAction">
@@ -55354,6 +57445,7 @@ Called by update_net_trust_anchors.py.-->
   <int value="16" label="Reset"/>
   <int value="17" label="About Chrome OS"/>
   <int value="18" label="Kerberos"/>
+  <int value="19" label="On Startup"/>
 </enum>
 
 <enum name="OsSettingsSubpage">
@@ -55390,6 +57482,7 @@ Called by update_net_trust_anchors.py.-->
   <int value="502" label="Ambient Mode Photos (Deprecated)"/>
   <int value="503" label="Ambient Mode Google Photos Album"/>
   <int value="504" label="Ambient Mode Art Gallery Album"/>
+  <int value="505" label="Wallpaper"/>
   <int value="600" label="Assistant"/>
   <int value="700" label="App Management"/>
   <int value="701" label="App Details"/>
@@ -55403,6 +57496,9 @@ Called by update_net_trust_anchors.py.-->
   <int value="804" label="Crostini Develop Android Apps"/>
   <int value="805" label="Crostini Port Forwarding"/>
   <int value="1000" label="Time Zone"/>
+  <int value="1100" label="Manage Other People V2"/>
+  <int value="1101" label="Security And Sign In V2"/>
+  <int value="1102" label="Fingerprint V2"/>
   <int value="1200" label="Languages And Input Details"/>
   <int value="1201" label="Manage Input Methods"/>
   <int value="1202" label="Smart Inputs"/>
@@ -55672,6 +57768,9 @@ Called by update_net_trust_anchors.py.-->
 </enum>
 
 <enum name="OtherPossibleUsernamesUsage">
+  <obsolete>
+    Obsolete since M90.
+  </obsolete>
   <int value="0" label="Nothing to Autofill"/>
   <int value="1" label="No other possible usernames"/>
   <int value="2" label="Other possible usernames present, but none were shown"/>
@@ -55741,6 +57840,21 @@ Called by update_net_trust_anchors.py.-->
   <int value="20" label="Tap Suppress"/>
 </enum>
 
+<enum name="OverlayQuadMaterial">
+  <int value="0" label="Invalid"/>
+  <int value="1" label="DebugBorder"/>
+  <int value="2" label="PictureContent"/>
+  <int value="3" label="CompositorRenderPass"/>
+  <int value="4" label="AggregatedRenderPass"/>
+  <int value="5" label="SolidColor"/>
+  <int value="6" label="StreamVideoContent"/>
+  <int value="7" label="SurfaceContent"/>
+  <int value="8" label="TextureContent"/>
+  <int value="9" label="TiledContent"/>
+  <int value="10" label="YuvVideoContent"/>
+  <int value="11" label="VideoHole"/>
+</enum>
+
 <enum name="OverlayStrategies">
   <int value="0" label="Unknown"/>
   <int value="1" label="No overlay"/>
@@ -55748,6 +57862,8 @@ Called by update_net_trust_anchors.py.-->
   <int value="3" label="SingleOnTop"/>
   <int value="4" label="Underlay"/>
   <int value="5" label="Underlay Cast"/>
+  <int value="6" label="All overlays failed"/>
+  <int value="7" label="Overlays failed min"/>
 </enum>
 
 <enum name="OverlaySupportFlag">
@@ -55895,6 +58011,9 @@ Called by update_net_trust_anchors.py.-->
   <int value="10" label="END_HIDDEN">
     Page became hidden, but is still active.
   </int>
+  <int value="11" label="END_APP_BACKGROUND">
+    The metrics were flushed because the app entered the background.
+  </int>
 </enum>
 
 <enum name="PageLifecycleStateTransition">
@@ -56248,6 +58367,14 @@ Called by update_net_trust_anchors.py.-->
   <int value="5" label="Reauthentication"/>
 </enum>
 
+<enum name="ParentAccessCodeValidationResult">
+  <summary>Result of the parent access code validation</summary>
+  <int value="0" label="Valid"/>
+  <int value="1" label="Invalid"/>
+  <int value="2" label="No config"/>
+  <int value="3" label="Internal error"/>
+</enum>
+
 <enum name="ParentFrameKnown">
   <int value="0" label="Parent Frame Not Known"/>
   <int value="1" label="Parent Frame Known"/>
@@ -57565,7 +59692,7 @@ Called by update_net_trust_anchors.py.-->
   <int value="3" label="Clicked 'Never'"/>
   <int value="4" label="Clicked 'Manage passwords'"/>
   <int value="5" label="Clicked 'Done' (obsolete)"/>
-  <int value="6" label="Clicked 'Unblacklist' (obsolete)"/>
+  <int value="6" label="Clicked 'Unblocklist' (obsolete)"/>
   <int value="7" label="Clicked 'OK' (obsolete)"/>
   <int value="8" label="Clicked on a credential (obsolete)"/>
   <int value="9" label="Auto-signin toast timeout"/>
@@ -57581,6 +59708,13 @@ Called by update_net_trust_anchors.py.-->
   <int value="3" label="Warning string with org name"/>
 </enum>
 
+<enum name="PasswordProtectionReferringAppSource">
+  <int value="0" label="Source unspecified"/>
+  <int value="1" label="Known app id"/>
+  <int value="2" label="Unknown app id"/>
+  <int value="3" label="Activity referrer"/>
+</enum>
+
 <enum name="PasswordProtectionRequestOutcome">
   <int value="0" label="Unknown"/>
   <int value="1" label="Succeeded"/>
@@ -57763,6 +59897,7 @@ Called by update_net_trust_anchors.py.-->
     payment sheet. The cardinality is not too high since the total number of
     used bits is less than 4.
   </summary>
+  <int value="0" label="Enum placerholder. See crbug/1179826"/>
 </enum>
 
 <enum name="PaymentRequestMissingPaymentFields">
@@ -57771,6 +59906,7 @@ Called by update_net_trust_anchors.py.-->
     payment sheet. The cardinality is not too high since the total number of
     used bits is less than 6.
   </summary>
+  <int value="0" label="Enum placerholder. See crbug/1179826"/>
 </enum>
 
 <enum name="PaymentRequestMissingShippingFields">
@@ -57779,6 +59915,7 @@ Called by update_net_trust_anchors.py.-->
     payment sheet. The cardinality is not too high since the total number of
     used bits is less than 4.
   </summary>
+  <int value="0" label="Enum placerholder. See crbug/1179826"/>
 </enum>
 
 <enum name="PaymentRequestNoShowReason">
@@ -57819,6 +59956,18 @@ Called by update_net_trust_anchors.py.-->
   <int value="2" label="Regular"/>
 </enum>
 
+<enum name="PciePeripheralConnectivityResult">
+<!-- This must be kept current with PciePeripheralConnectivityResults
+        located in ash/components/pcie_peripheral/pcie_peripheral_manager.cc -->
+
+  <int value="0" label="TBT-supported peripheral connected and allowed"/>
+  <int value="1" label="TBT-only peripheral connected and blocked by Pciguard"/>
+  <int value="2"
+      label="TBT-only peripheral connected and blocked due to guest session"/>
+  <int value="3" label="Alt-mode fallback due to Pciguard"/>
+  <int value="4" label="Alt-mode fallback in guest session"/>
+</enum>
+
 <enum name="PdfCompositionStatus">
   <int value="0" label="PDF compositor service finished successfully"/>
   <int value="1" label="PDF compositor service encountered memory map error"/>
@@ -57866,6 +60015,24 @@ Called by update_net_trust_anchors.py.-->
   <int value="9" label="SetLocalAnswerResolved"/>
 </enum>
 
+<enum name="PeerConnectionBundlePolicy">
+  <int value="0" label="balanced"/>
+  <int value="1" label="max-bundle"/>
+  <int value="2" label="max-compat"/>
+</enum>
+
+<enum name="PeerConnectionBundleUsage">
+  <int value="0" label="There are no m-lines"/>
+  <int value="1" label="No BUNDLE, datachannel-only"/>
+  <int value="2" label="No BUNDLE, at most one audio/video m-line"/>
+  <int value="3" label="No BUNDLE, more than one audio/video m-line"/>
+  <int value="4" label="Using BUNDLE, datachannel-only"/>
+  <int value="5" label="Using BUNDLE, at most one audio/video m-line"/>
+  <int value="6" label="Using BUNDLE, more than one audio/video m-line"/>
+  <int value="7" label="No BUNDLE, legacy plan-b"/>
+  <int value="8" label="Using BUNDLE, legacy plan-b"/>
+</enum>
+
 <enum name="PeerConnectionCallSetupState">
   <int value="0" label="NotStarted"/>
   <int value="1" label="Started"/>
@@ -58421,14 +60588,16 @@ Called by update_net_trust_anchors.py.-->
 
 <enum name="PhoneHubScreen">
   <int value="0" label="BluetoothOrWifiDisabled"/>
-  <int value="1" label="ConnectionError"/>
-  <int value="2" label="InitialConnecting"/>
-  <int value="3" label="Reconnecting"/>
+  <int value="1" label="PhoneDisconnected"/>
+  <int value="2" label="InitialConnecting (Deprecated)"/>
+  <int value="3" label="Reconnecting (Deprecated)"/>
   <int value="4" label="Onboarding.ExistingMultideviceUser"/>
   <int value="5" label="Onboarding.NewMultideviceUser"/>
   <int value="6" label="PhoneConnected"/>
   <int value="7" label="OnboardingDismissPrompt"/>
   <int value="8" label="Invalid"/>
+  <int value="9" label="PhoneConnecting"/>
+  <int value="10" label="PhoneTetherConnectionPending"/>
 </enum>
 
 <enum name="PhoneHubTetherConnectionResult">
@@ -58437,7 +60606,7 @@ Called by update_net_trust_anchors.py.-->
 </enum>
 
 <enum name="PhoneHubUserAction">
-  <int value="0" label="UI opened"/>
+  <int value="0" label="UI opened while connected"/>
   <int value="1" label="Tether connection attempted"/>
   <int value="2" label="Do Not Disturb toggled"/>
   <int value="3" label="Find My Device toggled"/>
@@ -58610,6 +60779,13 @@ Called by update_net_trust_anchors.py.-->
   <int value="5" label="Uncompleted"/>
 </enum>
 
+<enum name="PinSetupScreenUserAction">
+  <summary>Actions which happen on the screen.</summary>
+  <int value="0" label="Done button clicked"/>
+  <int value="1" label="Skip button clicked on starting page"/>
+  <int value="2" label="Skip button clicked in flow"/>
+</enum>
+
 <enum name="PipelineStatus">
   <int value="0" label="PIPELINE_OK"/>
   <int value="1" label="PIPELINE_ERROR_URL_NOT_FOUND"/>
@@ -58828,11 +61004,17 @@ Called by update_net_trust_anchors.py.-->
   <int value="3"
       label="PluginVM DLC not installed as dlcservice/update_engine is busy."/>
   <int value="4" label="PluginVM DLC not installed due to reboot required."/>
+  <int value="5"
+      label="PluginVM DLC not installed due to insufficient disk space."/>
 </enum>
 
 <enum name="PluginVmLaunchResult">
   <int value="0" label="Success"/>
   <int value="1" label="Error"/>
+  <int value="2" label="Invalid license"/>
+  <int value="3" label="VM missing"/>
+  <int value="4" label="Expired license"/>
+  <int value="5" label="Network error"/>
 </enum>
 
 <enum name="PluginVmSetupFailureReason">
@@ -58859,6 +61041,8 @@ Called by update_net_trust_anchors.py.-->
   <int value="23" label="INSUFFICIENT_DISK_SPACE"/>
   <int value="24" label="INVALID_LICENSE"/>
   <int value="25" label="OFFLINE"/>
+  <int value="26" label="LIST_VM_DISKS_FAILED"/>
+  <int value="27" label="OUT_OF_DISK_SPACE"/>
 </enum>
 
 <enum name="PluginVmSetupResult">
@@ -58880,6 +61064,7 @@ Called by update_net_trust_anchors.py.-->
   <int value="14" label="User cancelled without starting installation"/>
   <int value="15"
       label="User cancelled setup while validating Plugin VM license"/>
+  <int value="16" label="User cancelled while starting the dispatcher"/>
 </enum>
 
 <enum name="PNaClOptionsOptLevelEnum">
@@ -58895,6 +61080,11 @@ Called by update_net_trust_anchors.py.-->
   <int value="1" label="Hit"/>
 </enum>
 
+<enum name="PointerPrimaryButton">
+  <int value="0" label="Left"/>
+  <int value="1" label="Right"/>
+</enum>
+
 <enum name="PointerSensitivity">
   <int value="1" label="1"/>
   <int value="2" label="2"/>
@@ -59498,6 +61688,8 @@ Called by update_net_trust_anchors.py.-->
   <int value="25" label="Subresource throttled"/>
   <int value="26" label="Prediction position not eligible"/>
   <int value="27" label="Prefetch Not Eligible: Retry-After not elasped"/>
+  <int value="28" label="Connecting to the prefetch proxy previously failed"/>
+  <int value="29" label="Decoy request"/>
 </enum>
 
 <enum name="PrefetchRedirect">
@@ -59696,6 +61888,12 @@ Called by update_net_trust_anchors.py.-->
   <int value="63" label="LINK REL NEXT NOT ALLOWED"/>
 </enum>
 
+<enum name="PrerenderHostFinalStatus">
+  <int value="0" label="kActivated"/>
+  <int value="1" label="kDestroyed"/>
+  <int value="2" label="kLowEndDevice"/>
+</enum>
+
 <enum name="PrerenderHoverEvent">
   <obsolete>
     deprecated May 10 2012
@@ -60464,6 +62662,11 @@ Called by update_net_trust_anchors.py.-->
   <int value="1" label="PriorityChanged"/>
 </enum>
 
+<enum name="PrivacySandboxReferrer">
+  <int value="0" label="Privacy Settings"/>
+  <int value="1" label="Cookie Settings Snackbar"/>
+</enum>
+
 <enum name="PrivacyScreenToggleUISurface">
   <int value="0" label="KeyboardShortcut"/>
   <int value="1" label="FeaturePod"/>
@@ -60776,13 +62979,36 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
 </enum>
 
 <enum name="ProfileAddNewUser">
-  <int value="0" label="(Deprecated) Add new user from icon menu"/>
-  <int value="1" label="(Deprecated) Add new user from title bar menu"/>
-  <int value="2" label="Add new user from settings dialog"/>
-  <int value="3" label="Add new user from the Profile picker"/>
+  <int value="0" label="(Deprecated) Add new profile from icon menu"/>
+  <int value="1" label="(Deprecated) Add new profile from title bar menu"/>
+  <int value="2" label="Add new profile from the old create profile dialog"/>
+  <int value="3" label="Add new local profile from the Profile picker"/>
   <int value="4" label="Auto-created after deleting last user"/>
-  <int value="5" label="Add new user from sign-in interception"/>
-  <int value="6" label="Add new user from the sync flow (to avoid data clash)"/>
+  <int value="5" label="Add new profile from sign-in interception"/>
+  <int value="6"
+      label="Add new profile from the sync flow (to avoid data clash)"/>
+  <int value="7" label="Add new signed-in profile from the Profile picker"/>
+</enum>
+
+<enum name="ProfileAddSignInFlowOutcome">
+  <int value="0" label="A consumer account is added and syncing"/>
+  <int value="1" label="A consumer account is added without sync"/>
+  <int value="2"
+      label="A consumer account is added with sync manually configured"/>
+  <int value="3" label="An enterprise account is added and syncing"/>
+  <int value="4" label="An enterprise account is added without sync"/>
+  <int value="5"
+      label="An enterprise account is added with no link data consent"/>
+  <int value="6"
+      label="An enterprise account is added with sync manually configured"/>
+  <int value="7" label="An enterprise account is added but sync is disabled"/>
+  <int value="8" label="An account is added with some login error">
+    This includes the case that the account is already syncing in another
+    profile.
+  </int>
+  <int value="9" label="The SAML sign-in flow stated (with unclear outcome)."/>
+  <int value="10" label="The flow got aborted before successful sign-in."/>
+  <int value="11" label="The flow got aborted after successful sign-in."/>
 </enum>
 
 <enum name="ProfileAllAccountsCategories">
@@ -60903,6 +63129,9 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
 </enum>
 
 <enum name="ProfileCreateResult">
+  <obsolete>
+    Removed M90.
+  </obsolete>
   <int value="0" label="Failed locally"/>
   <int value="1" label="Failed remotely"/>
   <int value="2" label="Created but not initialized (should never happen)"/>
@@ -61032,6 +63261,24 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   </int>
 </enum>
 
+<enum name="ProfileKeepAliveOrigin">
+  <int value="0" label="kWaitingForFirstBrowserWindow"/>
+  <int value="1" label="kBrowserWindow"/>
+  <int value="2" label="kBackgroundMode"/>
+  <int value="3" label="kOffTheRecordProfile"/>
+  <int value="4" label="kDownloadInProgress"/>
+  <int value="5" label="kAppControllerMac"/>
+  <int value="6" label="kClearingBrowsingData"/>
+  <int value="7" label="kAppWindow"/>
+  <int value="8" label="kBackgroundSync"/>
+  <int value="9" label="kNotification"/>
+  <int value="10" label="kPendingNotificationClickEvent"/>
+  <int value="11" label="kInFlightPushMessage"/>
+  <int value="12" label="kSessionRestore"/>
+  <int value="13" label="kChromeViewsDelegate"/>
+  <int value="14" label="kDevToolsWindow"/>
+</enum>
+
 <enum name="ProfileMenuActionableItem">
   <int value="0" label="Manage your Google Account button"/>
   <int value="1" label="Passwords button"/>
@@ -61148,6 +63395,9 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="2" label="Add new profile button in the profile menu"/>
   <int value="3" label="Open new window after profile deletion"/>
   <int value="4" label="New session while running (e.g. from Windows tray)"/>
+  <int value="5" label="Profile locked"/>
+  <int value="6" label="Unable to create a browser"/>
+  <int value="7" label="Background mode manager"/>
 </enum>
 
 <enum name="ProfilePickerPages">
@@ -61155,6 +63405,7 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="1" label="profileTypeChoice"/>
   <int value="2" label="localProfileCustomization"/>
   <int value="3" label="loadSignIn"/>
+  <int value="4" label="loadForceSignIn"/>
 </enum>
 
 <enum name="ProfileResetRequestOriginEnum">
@@ -61179,8 +63430,8 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="2" label="Signed in to sync from secondary profile"/>
   <int value="3" label="Customized sync options"/>
   <int value="4" label="Chose what to sync"/>
-  <int value="5" label="Encrypted all data"/>
-  <int value="6" label="Selected a passphrase"/>
+  <int value="5" label="Encrypted data with new passphrase"/>
+  <int value="6" label="Entered existing passphrase"/>
 </enum>
 
 <enum name="ProfileSyncCustomize">
@@ -61213,6 +63464,8 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
 
 <enum name="PromoBrowserCommandEnum">
   <int value="0" label="Unknown Command"/>
+  <int value="1" label="Open Safety Check"/>
+  <int value="2" label="Open SafeBrowsing Enhanced Protection"/>
 </enum>
 
 <enum name="ProtectorError">
@@ -61362,6 +63615,11 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="4" label="PROXY_HAS_RULES"/>
 </enum>
 
+<enum name="PsmHashDanceDifferentResultsComparison">
+  <int value="0" label="Hash dance true and PSM false"/>
+  <int value="1" label="PSM true and Hash dance false"/>
+</enum>
+
 <enum name="PublicKeyPinFailedDomain">
   <int value="0" label="DOMAIN_NOT_PINNED"/>
   <int value="1" label="DOMAIN_GOOGLE_COM"/>
@@ -62061,6 +64319,19 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="189" label="QUIC_QPACK_DECODER_STREAM_IMPOSSIBLE_INSERT_COUNT"/>
   <int value="190" label="QUIC_QPACK_DECODER_STREAM_INCORRECT_ACKNOWLEDGEMENT"/>
   <int value="191" label="QUIC_MAX_AGE_TIMEOUT"/>
+  <int value="192" label="QUIC_INVALID_0RTT_PACKET_NUMBER_OUT_OF_ORDER"/>
+  <int value="193" label="QUIC_INVALID_PRIORITY_UPDATE"/>
+  <int value="194" label="QUIC_PEER_PORT_CHANGE_HANDSHAKE_UNCONFIRMED"/>
+  <int value="195" label="QUIC_TLS_BAD_CERTIFICATE"/>
+  <int value="196" label="QUIC_TLS_UNSUPPORTED_CERTIFICATE"/>
+  <int value="197" label="QUIC_TLS_CERTIFICATE_REVOKED"/>
+  <int value="198" label="QUIC_TLS_CERTIFICATE_EXPIRED"/>
+  <int value="199" label="QUIC_TLS_CERTIFICATE_UNKNOWN"/>
+  <int value="200" label="QUIC_TLS_INTERNAL_ERROR"/>
+  <int value="201" label="QUIC_TLS_UNRECOGNIZED_NAME"/>
+  <int value="202" label="QUIC_TLS_CERTIFICATE_REQUIRED"/>
+  <int value="203" label="QUIC_CONNECTION_ID_LIMIT_ERROR"/>
+  <int value="204" label="QUIC_TOO_MANY_CONNECTION_ID_WAITING_TO_RETIRE"/>
 </enum>
 
 <enum name="QuicFailToSerializePacketLocation">
@@ -62363,7 +64634,7 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="4" label="CONNECTION_ERROR"/>
   <int value="5" label="PEER_GOING_AWAY"/>
   <int value="6" label="CANCELLED"/>
-  <int value="7" label="RST_FLOW_CONTROL_ACCOUNTING"/>
+  <int value="7" label="RST_ACKNOWLEDGEMENT"/>
   <int value="8" label="REFUSED"/>
   <int value="9" label="INVALID_PROMISE_URL"/>
   <int value="10" label="UNAUTHORIZED_PROMISE_URL"/>
@@ -62372,6 +64643,26 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="13" label="INVALID_PROMISE_METHOD"/>
   <int value="14" label="PUSH_STREAM_TIMED_OUT"/>
   <int value="15" label="HEADERS_TOO_LARGE"/>
+  <int value="16" label="TTL_EXPIRED"/>
+  <int value="17" label="DATA_AFTER_CLOSE_OFFSET"/>
+  <int value="18" label="GENERAL_PROTOCOL_ERROR"/>
+  <int value="19" label="INTERNAL_ERROR"/>
+  <int value="20" label="CREATION_ERROR"/>
+  <int value="21" label="CLOSED_CRITICAL_STREAM"/>
+  <int value="22" label="FRAME_UNEXPECTED"/>
+  <int value="23" label="FRAME_ERROR"/>
+  <int value="24" label="EXCESSIVE_LOAD"/>
+  <int value="25" label="ID_ERROR"/>
+  <int value="26" label="SETTINGS_ERROR"/>
+  <int value="27" label="MISSING_SETTINGS"/>
+  <int value="28" label="REQUEST_REJECTED"/>
+  <int value="29" label="REQUEST_INCOMPLETE"/>
+  <int value="30" label="CONNECT_ERROR"/>
+  <int value="31" label="VERSION_FALLBACK"/>
+  <int value="32" label="DECOMPRESSION_FAILED"/>
+  <int value="33" label="ENCODER_STREAM_ERROR"/>
+  <int value="34" label="DECODER_STREAM_ERROR"/>
+  <int value="35" label="UNKNOWN_APPLICATION_ERROR_CODE"/>
 </enum>
 
 <enum name="QuicServerConfigState">
@@ -63446,6 +65737,9 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
 </enum>
 
 <enum name="RelaunchNotificationShowResult">
+  <obsolete>
+    Removed in M90.
+  </obsolete>
   <int value="0" label="Shown"/>
   <int value="1" label="Not shown for unknown reason (deprecated)"/>
   <int value="2"
@@ -63475,6 +65769,7 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
       label="The bookmark's GUID did not match the originator client item ID
              or client tag"/>
   <int value="10" label="Parent node is not a folder"/>
+  <int value="11" label="GUID changed for an already-tracked server ID"/>
 </enum>
 
 <enum name="RemoteCommandExecutionStatus">
@@ -63518,11 +65813,19 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
 </enum>
 
 <enum name="RemotePlaybackDeviceType">
+  <obsolete>
+    Dprecated as of 2021/01.
+  </obsolete>
   <int value="0" label="Cast Generic Media Player"/>
   <int value="1" label="Cast YouTube Player"/>
   <int value="2" label="Non-Cast YouTube Player"/>
 </enum>
 
+<enum name="RemotePlaybackInitiationLocation">
+  <int value="0" label="RemotePlayback API implemented by the sites"/>
+  <int value="1" label="Cast button in the HTML media element"/>
+</enum>
+
 <enum name="RemotePlaybackUrlResolveResult">
   <int value="0" label="Successfully Resolved"/>
   <int value="1" label="Malformed or empty Url"/>
@@ -63554,6 +65857,17 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="14" label="User refused to terminate process"/>
 </enum>
 
+<enum name="RemotingCompatibility">
+  <int value="0" label="Compatible"/>
+  <int value="1" label="Incompatible, no audio nor video"/>
+  <int value="2" label="Incompatible, encrypted video"/>
+  <int value="3" label="Incompatible video codec"/>
+  <int value="4" label="Incompatible, encrypted audio"/>
+  <int value="5" label="Incompatible audio codec"/>
+  <int value="6" label="Incompatible, disabled by page"/>
+  <int value="7" label="Incompatible, duration below threshold"/>
+</enum>
+
 <enum name="RemotingStartTrigger">
   <int value="0" label="Unknown start trigger"/>
   <int value="1" label="Entered fullscreen"/>
@@ -63596,10 +65910,24 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="3" label="Audio and video"/>
 </enum>
 
+<enum name="RemotingVideoPixelRateSupport">
+  <int value="0"
+      label="Supported; pixels-per-second is equivalent to at most 1080p
+             30fps"/>
+  <int value="1"
+      label="Supported; equivalent to more than 1080p 30fps and at most 2160p
+             30fps"/>
+  <int value="2"
+      label="Not supported; equivalent to more than 1080p 30fps and at most
+             2160p 30fps"/>
+  <int value="3" label="Not supported; equivalent to more than 2160p 30fps"/>
+</enum>
+
 <enum name="RemoveCompromisedCredentialsReason">
   <int value="0" label="Update - If the credentials was updated."/>
   <int value="1" label="Remove - If the credentials was removed."/>
   <int value="2" label="The site was marked as legitimate."/>
+  <int value="3" label="Update Sync - If the credentials was updated via Sync"/>
 </enum>
 
 <enum name="RendererSchedulerFrameOriginType">
@@ -63755,6 +66083,7 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="71" label="InternalHighPriorityLocalFrame"/>
   <int value="72" label="JavascriptTimerImmediate"/>
   <int value="73" label="JavascriptTimerDelayedLowNesting"/>
+  <int value="76" label="WakeLock"/>
 </enum>
 
 <enum name="RendererSchedulerTaskUseCase">
@@ -63817,7 +66146,7 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
     Enumerates names of Mojo interfaces that are requests through
     RenderFrameHostImpl::GetInterface.
   </summary>
-  <int value="4595745" label="blink.mojom.NativeFileSystemManager"/>
+  <int value="4595745" label="blink.mojom.FileSystemAccessManager"/>
   <int value="28688772" label="snippets_internals.mojom.PageHandlerFactory"/>
   <int value="39256405" label="device.mojom.Geolocation"/>
   <int value="70273688" label="device.mojom.VRService"/>
@@ -64107,6 +66436,7 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="110" label="IDC_CONTENT_CONTEXT_GENERATE_QR_CODE"/>
   <int value="111" label="IDC_CONTENT_CLIPBOARD_HISTORY_MENU"/>
   <int value="112" label="IDC_CONTENT_CONTEXT_COPYLINKTOTEXT"/>
+  <int value="113" label="IDC_CONTENT_CONTEXT_SEARCHLENSFORIMAGE"/>
 </enum>
 
 <enum name="ReopenTabPromoStepAtDismissal">
@@ -64233,6 +66563,31 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="6" label="No request with timeout"/>
 </enum>
 
+<enum name="RequestDestination">
+  <int value="0" label="EMPTY"/>
+  <int value="1" label="AUDIO"/>
+  <int value="2" label="AUDIO_WORKLET"/>
+  <int value="3" label="DOCUMENT"/>
+  <int value="4" label="EMBED"/>
+  <int value="5" label="FONT"/>
+  <int value="6" label="FRAME"/>
+  <int value="7" label="IFRAME"/>
+  <int value="8" label="IMAGE"/>
+  <int value="9" label="MANIFEST"/>
+  <int value="10" label="OBJECT"/>
+  <int value="11" label="PAINT_WORKLET"/>
+  <int value="12" label="REPORT"/>
+  <int value="13" label="SCRIPT"/>
+  <int value="14" label="SERVICE_WORKER"/>
+  <int value="15" label="SHARED_WORKER"/>
+  <int value="16" label="STYLE"/>
+  <int value="17" label="TRACK"/>
+  <int value="18" label="VIDEO"/>
+  <int value="19" label="WEB_BUNDLE"/>
+  <int value="20" label="WORKER"/>
+  <int value="21" label="XSLT"/>
+</enum>
+
 <enum name="RequestedImageMimeType">
   <int value="0" label="Png"/>
   <int value="1" label="Jpeg"/>
@@ -64280,6 +66635,8 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="6" label="ExcludedCorbForPlugin">
     Requests from a renderer process that embeds a plugin (e.g. Flash) that
     needs to disable CORB and request_initiator_origin_lock enforcement.
+
+    Obsolete - this enum value was removed in Nov 2020 (M89).
   </int>
   <int value="7" label="AllowedRequestInitiatorForPlugin">
     Requests from a renderer process that embeds a plugin (e.g. PDF) that needs
@@ -64292,6 +66649,14 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="1" label="Supported"/>
 </enum>
 
+<enum name="RequestStopReason">
+  <int value="0" label="Fulfilled"/>
+  <int value="1" label="Timeout"/>
+  <int value="2" label="Empty Result"/>
+  <int value="3" label="Multiple Copy Completion"/>
+  <int value="4" label="Request Canceled"/>
+</enum>
+
 <enum name="RequestStorageResult">
   <int value="0" label="Approved due to existing storage access"/>
   <int value="1" label="Approved with new grant"/>
@@ -64312,6 +66677,20 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="5" label="RESOLVE_SPECULATIVE_ABORT"/>
 </enum>
 
+<enum name="ResolutionComparison">
+  <int value="0" label="Requested width larger than capture"/>
+  <int value="1" label="Requested width smaller than capture"/>
+  <int value="2" label="Requested height larger than capture"/>
+  <int value="3" label="Requested height smaller than capture"/>
+  <int value="4" label="Requested resolution equals capture"/>
+  <int value="5" label="Requested width and height larger than capture"/>
+  <int value="6"
+      label="Requested width smaller, and height larger than capture"/>
+  <int value="7"
+      label="Requested width larger and height smaller than capture"/>
+  <int value="8" label="Requested width and height smaller than capture"/>
+</enum>
+
 <enum name="ResolutionUnspecWasteCategory">
   <int value="0" label="AF_WASTE_IPV4_ONLY">
     Running in a IPv4-only configuration. No waste.
@@ -64886,6 +67265,8 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="5" label="SIGNED_OUT"/>
   <int value="6" label="QUOTA_LIMIT"/>
   <int value="7" label="FAILED"/>
+  <int value="8" label="FEATURE_UNAVAILABLE"/>
+  <int value="9" label="WEAK_PASSWORDS_EXIST"/>
 </enum>
 
 <enum name="SafetyCheckSafeBrowsingStatus">
@@ -65332,14 +67713,14 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="9" label="RESULT_FROM_CACHE"/>
   <int value="10" label="DEPRECATED: NOT_HTTP_URL"/>
   <int value="11" label="SCHEME_NOT_SUPPORTED"/>
-  <int value="12" label="WHITELISTED_BY_POLICY"/>
+  <int value="12" label="ALLOWLISTED_BY_POLICY"/>
 </enum>
 
 <enum name="SBClientDetectionPreClassificationCheckResult">
   <int value="0" label="PROXY_FETCH"/>
   <int value="1" label="PRIVATE_IP"/>
   <int value="2" label="OFF_THE_RECORD"/>
-  <int value="3" label="MATCH_CSD_WHITELIST"/>
+  <int value="3" label="MATCH_CSD_ALLOWLIST"/>
   <int value="4" label="TOO_MANY_REPORTS"/>
   <int value="5" label="UNSUPPORTED_MIME_TYPE"/>
   <int value="6" label="NO_DATABASE_MANAGER"/>
@@ -65348,7 +67729,7 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="9" label="RESULT_FROM_CACHE"/>
   <int value="10" label="DEPRECATED: NOT_HTTP_URL"/>
   <int value="11" label="SCHEME_NOT_SUPPORTED"/>
-  <int value="12" label="WHITELISTED_BY_POLICY"/>
+  <int value="12" label="ALLOWLISTED_BY_POLICY"/>
   <int value="13" label="CLASSIFY"/>
   <int value="14" label="NO_CLASSIFY_HAS_DELAYED_WARNING"/>
 </enum>
@@ -65399,7 +67780,7 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="3" label="UNCOMMON"/>
   <int value="4" label="DANGEROUS_HOST"/>
   <int value="5" label="POTENTIALLY_UNWANTED"/>
-  <int value="6" label="WHITELISTED_BY_POLICY"/>
+  <int value="6" label="ALLOWLISTED_BY_POLICY"/>
   <int value="7" label="ASYNC_SCANNING"/>
   <int value="8" label="BLOCKED_PASSWORD_PROTECTED"/>
   <int value="9" label="BLOCKED_TOO_LARGE"/>
@@ -65898,6 +68279,16 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="8" label="SKIPPED_VERSION_CHECK_EQUAL"/>
 </enum>
 
+<enum name="SBMetricsCollectorEventType">
+  <int value="0" label="USER_STATE_DISABLED"/>
+  <int value="1" label="USER_STATE_ENABLED"/>
+  <int value="2" label="DATABASE_INTERSTITIAL_BYPASS"/>
+  <int value="3" label="CSD_INTERSITITAL_BYPASS"/>
+  <int value="4" label="REAL_TIME_INTERSTITIAL_BYPASS"/>
+  <int value="5" label="DANGEROUS_DOWNLOAD_BYPASS"/>
+  <int value="6" label="PASSWORD_REUSE_MODAL_BYPASS"/>
+</enum>
+
 <enum name="SBPhishingClassifierEvent">
   <int value="0" label="Phishing detection was requested to start"/>
   <int value="1" label="Page text was captured"/>
@@ -65906,6 +68297,86 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="4" label="Phishing classifier was destructed"/>
 </enum>
 
+<enum name="SBThreatType">
+  <int value="0" label="Unused"/>
+  <int value="1" label="Safe"/>
+  <int value="2" label="URL phishing"/>
+  <int value="3" label="URL malware"/>
+  <int value="4" label="URL unwanted"/>
+  <int value="5" label="URL binary malware"/>
+  <int value="6" label="URL client side phishing"/>
+  <int value="7" label="Extension"/>
+  <int value="8" label="URL client side malware"/>
+  <int value="9" label="Blacklisted resource"/>
+  <int value="10" label="API abuse"/>
+  <int value="11" label="Subresource filter"/>
+  <int value="12" label="CSD whitelist"/>
+  <int value="13" label="URL password protection phishing"/>
+  <int value="14" label="Saved password reuse"/>
+  <int value="15" label="Signed in sync password reuse"/>
+  <int value="16" label="Signed in non sync password reuse"/>
+  <int value="17" label="Blocked ad redirect"/>
+  <int value="18" label="Ad sample"/>
+  <int value="19" label="Blocked ad popup"/>
+  <int value="20" label="Suspicious site"/>
+  <int value="21" label="Enterprise password reuse"/>
+  <int value="22" label="Billing"/>
+  <int value="23" label="Apk download"/>
+  <int value="24" label="High confidence allowlist"/>
+</enum>
+
+<enum name="ScanAppEntryPoint">
+<!-- This must be kept current with ScanAppEntryPoint in
+     chromeos/components/scanning/scanning_uma.h.
+-->
+
+  <int value="0" label="Settings"/>
+  <int value="1" label="Launcher"/>
+</enum>
+
+<enum name="ScanJobFailureReason">
+  <int value="0" label="Unknown scanner error"/>
+  <int value="1" label="Scanner not found"/>
+  <int value="2" label="Unsupported Scan To path"/>
+  <int value="3" label="Save to disk failed"/>
+</enum>
+
+<enum name="ScanJobSettingsColorMode">
+  <int value="0" label="Black and white"/>
+  <int value="1" label="Grayscale"/>
+  <int value="2" label="Color"/>
+</enum>
+
+<enum name="ScanJobSettingsFileType">
+  <int value="0" label="JPG"/>
+  <int value="1" label="PDF"/>
+  <int value="2" label="PNG"/>
+</enum>
+
+<enum name="ScanJobSettingsPageSize">
+  <int value="0" label="A4"/>
+  <int value="1" label="Letter"/>
+  <int value="2" label="Max"/>
+</enum>
+
+<enum name="ScanJobSettingsResolution">
+  <int value="0" label="Unexpected dpi"/>
+  <int value="1" label="75 dpi"/>
+  <int value="2" label="100 dpi"/>
+  <int value="3" label="150 dpi"/>
+  <int value="4" label="200 dpi"/>
+  <int value="5" label="300 dpi"/>
+  <int value="6" label="600 dpi"/>
+</enum>
+
+<enum name="ScanJobSettingsSource">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="Flatbed"/>
+  <int value="2" label="ADF Simplex"/>
+  <int value="3" label="ADF Duplex"/>
+  <int value="4" label="Default"/>
+</enum>
+
 <enum name="ScheduledNavigationType">
   <obsolete>
     Deprecated August 2018
@@ -66270,6 +68741,43 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="1" label="From omnibox"/>
 </enum>
 
+<enum name="SearchPrefetchEligibilityReason">
+  <int value="0" label="Prefetch started"/>
+  <int value="1" label="User disabled prefetch/preconnect"/>
+  <int value="2" label="User disabled Javascript"/>
+  <int value="3" label="Search engine not set"/>
+  <int value="4" label="Navigation URL was not a default search URL"/>
+  <int value="5" label="Recent network error"/>
+  <int value="6" label="Duplicate prefetch request"/>
+  <int value="7" label="Too many recent prefetches"/>
+  <int value="8" label="Throttle prevented the prefetch"/>
+</enum>
+
+<enum name="SearchPrefetchFinalStatus">
+  <int value="0" label="Not started"/>
+  <int value="1" label="In flight"/>
+  <int value="2" label="Headers received (for streaming responses)"/>
+  <int value="3"
+      label="Headers received and user navigated to search terms (for
+             streaming responses)"/>
+  <int value="4" label="Completed the prefetch"/>
+  <int value="5" label="Request failed"/>
+  <int value="6" label="Request cancelled"/>
+</enum>
+
+<enum name="SearchPrefetchServingReason">
+  <int value="0" label="Served a prefetch response"/>
+  <int value="1" label="Search engine not set"/>
+  <int value="2" label="User disabled Javascript"/>
+  <int value="3" label="Navigation URL was not a default search URL"/>
+  <int value="4" label="No prefetch issued for the search terms"/>
+  <int value="5" label="Prefetch was for a different origin"/>
+  <int value="6" label="Prefetch request was cancelled"/>
+  <int value="7" label="Prefetch request failed"/>
+  <int value="8" label="Another reason (unexpected)"/>
+  <int value="9" label="POST, reload, link, or other non-cache loads."/>
+</enum>
+
 <enum name="SearchTemplateURLEvent">
   <summary>
     Events within the TemplateURL system we log, i.e. edge cases.
@@ -66277,6 +68785,12 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="0" label="SYNC_DELETE_SUCCESS"/>
   <int value="1" label="SYNC_DELETE_FAIL_NONEXISTENT_ENGINE"/>
   <int value="2" label="SYNC_DELETE_FAIL_DEFAULT_SEARCH_PROVIDER"/>
+  <int value="3" label="SYNC_ADD_SUCCESS"/>
+  <int value="4" label="SYNC_ADD_CONVERTED_TO_UPDATE"/>
+  <int value="5" label="SYNC_ADD_FAIL_OTHER_ERROR"/>
+  <int value="6" label="SYNC_UPDATE_SUCCESS"/>
+  <int value="7" label="SYNC_UPDATE_CONVERTED_TO_ADD"/>
+  <int value="8" label="MIGRATE_SAFE_FOR_AUTOREPLACE_PLAY_API_ENGINE"/>
 </enum>
 
 <enum name="SearchWidgetUseInfo">
@@ -66309,6 +68823,9 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
 <enum name="SecureChannelNearbyConnectionMedium">
   <int value="0" label="Connected via Bluetooth"/>
   <int value="1" label="Upgraded bandwidth to WebRTC"/>
+  <int value="2"
+      label="Disconnected in under 30s without WebRTC upgrade; not provided
+             enough time to complete bandwidth upgrade process"/>
 </enum>
 
 <enum name="SecureCookieAction">
@@ -66343,6 +68860,17 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="7" label="Secure, by enterprise policy"/>
 </enum>
 
+<enum name="SecurePaymentConfirmationAuthenticationDialogResult">
+  <int value="0" label="Canceled"/>
+  <int value="1" label="Accepted"/>
+  <int value="2" label="Closed"/>
+</enum>
+
+<enum name="SecurePaymentConfirmationSystemPromptResult">
+  <int value="0" label="Canceled"/>
+  <int value="1" label="Accepted"/>
+</enum>
+
 <enum name="SecurityFilteredTouchResult">
   <int value="0" label="Touch event was handled by security sensitive dialog"/>
   <int value="1"
@@ -67129,6 +69657,17 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="19" label="Clear data on site details page"/>
 </enum>
 
+<enum name="SettingsPrivacySandboxEnabled">
+  <int value="0" label="PS enabled, allow all cookies"/>
+  <int value="1" label="PS enabled, block 3P cookies"/>
+  <int value="2" label="PS enabled, block all cookies"/>
+  <int value="3" label="PS disabled, allow all cookies"/>
+  <int value="4" label="PS disabled, block 3P cookies"/>
+  <int value="5" label="PS disabled, block all cookies"/>
+  <int value="6" label="PS disabled, policy block 3P cookies"/>
+  <int value="7" label="PS disabled, policy block all cookies"/>
+</enum>
+
 <enum name="SettingsResetPromptConfigError">
   <int value="1" label="Config Ok"/>
   <int value="2" label="Missing domain_hashes param"/>
@@ -67159,20 +69698,17 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
 
 <enum name="SettingsSafetyCheckInteractions">
   <int value="0" label="Safety check started"/>
-  <int value="1" label="Safety check, relaunch after updates"/>
-  <int value="2" label="Safety check, manage passwords"/>
-  <int value="3" label="Safety check, manage safe browsing"/>
-  <int value="4" label="Safety check, review extensions"/>
-  <int value="5" label="Safety check, reboot via Chrome cleaner"/>
-  <int value="6" label="Safety check, review Chrome cleaner infected state"/>
-  <int value="7"
-      label="Safety check, manage passwords through caret navigation"/>
-  <int value="8"
-      label="Safety check, manage safe browsing through caret navigation"/>
-  <int value="9"
-      label="Safety check, review extensions through caret navigation"/>
-  <int value="10"
-      label="Safety check, caret navigation to the Chrome cleaner UI"/>
+  <int value="1" label="Updates, relaunch after updates"/>
+  <int value="2" label="Passwords, manage compromised passwords"/>
+  <int value="3" label="Safe browsing, manage safe browsing"/>
+  <int value="4" label="Extensions, review extensions"/>
+  <int value="5" label="Chrome cleaner, reboot"/>
+  <int value="6" label="Chrome cleaner, review infected state"/>
+  <int value="7" label="Passwords, caret navigation"/>
+  <int value="8" label="Safe browsing, caret navigation"/>
+  <int value="9" label="Extensions, caret navigation"/>
+  <int value="10" label="Chrome cleaner, caret navigation"/>
+  <int value="11" label="Passwords, manage weak passwords"/>
 </enum>
 
 <enum name="SettingsSections">
@@ -67413,6 +69949,7 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   </int>
   <int value="6" label="TAB_GROUP"/>
   <int value="7" label="WEBAPP_NOTIFICATION"/>
+  <int value="8" label="FEED"/>
 </enum>
 
 <enum name="SharingActionSource">
@@ -67522,6 +70059,18 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="14" label="Draw tool: color changed"/>
 </enum>
 
+<enum name="SharingScreenshotFallbackAction">
+<!--
+  SharingScreenshotAction must be kept in sync with SharingScreenshotAction defined
+  in /chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/screenshot/ScreenshotShareSheetMetrics.java
+-->
+
+  <int value="0" label="Screenshot Edit"/>
+  <int value="1" label="Screenshot Shared"/>
+  <int value="2" label="Screenshot Saved"/>
+  <int value="3" label="Screenshot Deleted"/>
+</enum>
+
 <enum name="SharingSendMessageResult">
   <int value="0" label="Successful"/>
   <int value="1" label="Device is not found"/>
@@ -67612,6 +70161,9 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
 </enum>
 
 <enum name="ShortcutsMenuRegistrationWinResult">
+  <obsolete>
+    Removed January 2021.
+  </obsolete>
   <summary>
     Result of registering app icon shortcuts menu for PWA on Windows
   </summary>
@@ -67623,6 +70175,9 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
 </enum>
 
 <enum name="ShortcutsMenuUnregistrationWinResult">
+  <obsolete>
+    Removed January 2021.
+  </obsolete>
   <summary>
     Result of registering app icon shortcuts menu for PWA on Windows
   </summary>
@@ -67855,6 +70410,7 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="30" label="Re-signin after an account rename"/>
   <int value="31" label="Sign-in promo in the web sign-in flow"/>
   <int value="32" label="Safety check settings page"/>
+  <int value="33" label="Kaleidoscope"/>
 </enum>
 
 <enum name="SigninAccountEquality">
@@ -67966,6 +70522,13 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="10" label="Undo">The sync was aborted with an undo button.</int>
 </enum>
 
+<enum name="SigninInterceptGuestAvailability">
+  <int value="0" label="Guest option available"/>
+  <int value="1" label="Guest already open"/>
+  <int value="2" label="Guest mode blocked by policy"/>
+  <int value="3" label="Ephemeral Guest profile disabled"/>
+</enum>
+
 <enum name="SigninInterceptHeuristicOutcome">
   <int value="0" label="Intercept: profile switch"/>
   <int value="1" label="Intercept: multi-user"/>
@@ -67990,6 +70553,19 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="1" label="Declined"/>
   <int value="2" label="Ignored"/>
   <int value="3" label="Not displayed"/>
+  <int value="4" label="Accepted with Guest"/>
+</enum>
+
+<enum name="SigninInterceptSessionStartupResult">
+  <int value="0" label="Nothing to do (Reconcilor)"/>
+  <int value="1" label="Nothing to do (Multilogin)"/>
+  <int value="2" label="Success (reconcilor)"/>
+  <int value="3" label="Success (multilogin)"/>
+  <int value="4" label="Success (other)"/>
+  <int value="5" label="Timeout (multilogin)"/>
+  <int value="6" label="Timeout (reconcilor)"/>
+  <int value="7" label="Transient error (multilogin)"/>
+  <int value="8" label="Persistent error (multilogin)"/>
 </enum>
 
 <enum name="SigninInvalidGaiaCredentialsReason">
@@ -68116,6 +70692,10 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
     Signout was forced because MobileIdentityConsistency feature is disabled
     when there's a primary account without sync consent.
   </int>
+  <int value="14" label="Force Account ID migration">
+    Signout was forced because account ID migration from email to Gaia ID was
+    forced.
+  </int>
 </enum>
 
 <enum name="SigninSource">
@@ -68918,6 +71498,19 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="3" label="Large Downscale"/>
 </enum>
 
+<enum name="SlipstreamPort">
+  <int value="0" label="Other"/>
+  <int value="1" label="69"/>
+  <int value="2" label="137"/>
+  <int value="3" label="161"/>
+  <int value="4" label="554"/>
+  <int value="5" label="1719"/>
+  <int value="6" label="1720"/>
+  <int value="7" label="1723"/>
+  <int value="8" label="6566"/>
+  <int value="9" label="10080"/>
+</enum>
+
 <enum name="SmartChargingMessages">
   <int value="0" label="SerializeProtoError"/>
   <int value="1" label="WriteFileError"/>
@@ -69060,6 +71653,7 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="34" label="UMA_HOMEPAGE_PROMO_CHANGED_UNDO"/>
   <int value="35" label="UMA_CONDITIONAL_TAB_STRIP_DISMISS_UNDO"/>
   <int value="37" label="UMA_READING_LIST_BOOKMARK_ADDED"/>
+  <int value="38" label="UMA_PRIVACY_SANDBOX_PAGE_OPEN"/>
 </enum>
 
 <enum name="SnapshotItemId">
@@ -70663,8 +73257,17 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   </summary>
   <int value="2" label="Pageload count"/>
   <int value="3" label="Renderer crash count"/>
-  <int value="5" label="Extensions renderer count"/>
+  <int value="4" label="Renderer hang count"/>
+  <int value="5" label="Extension renderer crash count"/>
+  <int value="6" label="Child process crash count"/>
+  <int value="15" label="Browser launch count"/>
   <int value="16" label="Browser crash count"/>
+  <int value="17" label="Incomplete shutdown count"/>
+  <int value="24" label="Renderer failed launch count"/>
+  <int value="25" label="Extension renderer failed launch count"/>
+  <int value="26" label="Renderer launch count"/>
+  <int value="27" label="Extension renderer launch count"/>
+  <int value="31" label="GPU process crash count"/>
 </enum>
 
 <enum name="StabilityPageLoadType">
@@ -70720,6 +73323,13 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="20" label="OTHER"/>
 </enum>
 
+<enum name="StarEntryPointAction">
+  <int value="0" label="Add bookmark"/>
+  <int value="1" label="Edit bookmark"/>
+  <int value="2" label="Add to reading list"/>
+  <int value="3" label="Mark as read"/>
+</enum>
+
 <enum name="StarsLaunchLocation">
   <obsolete>
     Removed 01/2020 as we no longer record this metric.
@@ -70800,6 +73410,9 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
 </enum>
 
 <enum name="StayVsLeave">
+  <obsolete>
+    Removed 2020 November.
+  </obsolete>
   <int value="0" label="Stay on the current page"/>
   <int value="1" label="Leave the current page"/>
 </enum>
@@ -70857,11 +73470,19 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
 </enum>
 
 <enum name="StructuredMetricsInternalError">
-  <int value="0" label="Missing key"/>
+  <int value="0" label="Missing key (deprecated)"/>
   <int value="1" label="Wrong key length"/>
   <int value="2" label="Missing last rotation"/>
   <int value="3" label="Missing rotation period"/>
   <int value="4" label="Failed uint conversion"/>
+  <int value="5" label="Failed key read error"/>
+  <int value="6" label="Failed key parse error"/>
+  <int value="7" label="Failed key write error"/>
+  <int value="8" label="Failed key serialization"/>
+  <int value="9" label="Failed event read error"/>
+  <int value="10" label="Failed event parse error"/>
+  <int value="11" label="Failed event write error"/>
+  <int value="12" label="Failed event serialization"/>
 </enum>
 
 <enum name="StructuredMetricsKeyValidationState">
@@ -71026,12 +73647,38 @@ https://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.1.pdf
   <int value="11" label="AbortedBecauseSentinelFileWasPresent"/>
 </enum>
 
+<enum name="SubresourceRedirectRedirectResult">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="Redirectable"/>
+  <int value="2" label="Ineligible due to disallowed by Blink"/>
+  <int value="3" label="Ineligible subframe resource"/>
+  <int value="4" label="Ineligible subresource redirect failed"/>
+  <int value="5" label="Ineligible public image hints unavailable"/>
+  <int value="6"
+      label="Ineligible public image hints unavailable, but found to be
+             redirectable later"/>
+  <int value="7"
+      label="Ineligible public image hints unavailable, and found to be
+             missing in the hints later"/>
+  <int value="8" label="Ineligible missing in the public image hints"/>
+  <int value="9" label="Ineligible due to disallowed by robots rules"/>
+  <int value="10" label="Ineligible due to robots rules fetch timeout"/>
+  <int value="11" label="Ineligible due to logged-in page"/>
+</enum>
+
 <enum name="SubresourceRedirectRobotsRulesReceiveResult">
   <int value="0" label="Success"/>
   <int value="1" label="Timeout"/>
   <int value="2" label="Parse error"/>
 </enum>
 
+<enum name="SubresourceWebBundleLoadResult">
+  <int value="0" label="Success"/>
+  <int value="1" label="Metadata parse error"/>
+  <int value="2" label="Memory quota exceeded"/>
+  <int value="3" label="Serving constraints not met"/>
+</enum>
+
 <enum name="SuccessTimeoutStarted">
   <int value="0" label="Success"/>
   <int value="1" label="Timeout"/>
@@ -71616,6 +74263,9 @@ would be helpful to identify which type is being sent.
 </enum>
 
 <enum name="SyncBookmarkModelMetadataClientTagState">
+  <obsolete>
+    Deprecated 2021-02.
+  </obsolete>
   <int value="0" label="At least one mismatch found"/>
   <int value="1" label="All present do match but some are not present"/>
   <int value="2" label="All present and matching"/>
@@ -72223,6 +74873,14 @@ would be helpful to identify which type is being sent.
   <int value="2" label="Active"/>
 </enum>
 
+<enum name="SyncUserEventType">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="TestEvent"/>
+  <int value="2" label="GaiaPasswordReuseEvent"/>
+  <int value="3" label="GaiaPasswordCapturedEvent"/>
+  <int value="4" label="FlocIdComputedEvent"/>
+</enum>
+
 <enum name="SystemFeature">
   <summary>System Features to be disabled by a policy.</summary>
   <int value="0" label="Unknown"/>
@@ -72330,6 +74988,7 @@ would be helpful to identify which type is being sent.
   <int value="25" label="Chrome Reengagement 1"/>
   <int value="26" label="Chrome Reengagement 2"/>
   <int value="27" label="Chrome Reengagement 3"/>
+  <int value="28" label="Price Drop Alerts"/>
 </enum>
 
 <enum name="TabBackgroundLoadStatus">
@@ -72354,6 +75013,7 @@ would be helpful to identify which type is being sent.
   <int value="12" label="Timed Out"/>
   <int value="13" label="Stopped Due To Memory Pressure"/>
   <int value="14" label="Skipped Due To Memory Pressure"/>
+  <int value="15" label="Failure When Requesting Bitmap"/>
 </enum>
 
 <enum name="TabbedPaintPreviewExitCause">
@@ -72740,10 +75400,10 @@ would be helpful to identify which type is being sent.
 </enum>
 
 <enum name="ThermalState">
-  <int value="0" label="Nominal"/>
-  <int value="1" label="Fair"/>
-  <int value="2" label="Serious"/>
-  <int value="3" label="Critical"/>
+  <int value="0" label="0-Nominal"/>
+  <int value="1" label="1-Fair"/>
+  <int value="2" label="2-Serious"/>
+  <int value="3" label="3-Critical"/>
 </enum>
 
 <enum name="ThirdPartyStatus">
@@ -72808,6 +75468,15 @@ would be helpful to identify which type is being sent.
   <int value="1" label="Exceeded memory budget"/>
 </enum>
 
+<enum name="TimeLimitPolicyType">
+  <int value="0" label="No Time Limit"/>
+  <int value="1" label="Override Time Limit"/>
+  <int value="2" label="Bed Time Limit"/>
+  <int value="3" label="Screen Time Limit"/>
+  <int value="4" label="Web Time Limit"/>
+  <int value="5" label="App Time Limit"/>
+</enum>
+
 <enum name="TimeToInteractiveStatus">
   <int value="0" label="Recorded successfully"/>
   <int value="1" label="Not recorded because the page was backgrounded"/>
@@ -73141,6 +75810,118 @@ would be helpful to identify which type is being sent.
   <int value="2" label="Selected Manage Passwords"/>
 </enum>
 
+<enum name="TPMCommandCode">
+  <int value="287" label="TPM_CC_NV_UndefineSpaceSpecial"/>
+  <int value="288" label="TPM_CC_EvictControl"/>
+  <int value="289" label="TPM_CC_HierarchyControl"/>
+  <int value="290" label="TPM_CC_NV_UndefineSpace"/>
+  <int value="292" label="TPM_CC_ChangeEPS"/>
+  <int value="293" label="TPM_CC_ChangePPS"/>
+  <int value="294" label="TPM_CC_Clear"/>
+  <int value="295" label="TPM_CC_ClearControl"/>
+  <int value="296" label="TPM_CC_ClockSet"/>
+  <int value="297" label="TPM_CC_HierarchyChangeAuth"/>
+  <int value="298" label="TPM_CC_NV_DefineSpace"/>
+  <int value="299" label="TPM_CC_PCR_Allocate"/>
+  <int value="300" label="TPM_CC_PCR_SetAuthPolicy"/>
+  <int value="301" label="TPM_CC_PP_Commands"/>
+  <int value="302" label="TPM_CC_SetPrimaryPolicy"/>
+  <int value="303" label="TPM_CC_FieldUpgradeStart"/>
+  <int value="304" label="TPM_CC_ClockRateAdjust"/>
+  <int value="305" label="TPM_CC_CreatePrimary"/>
+  <int value="306" label="TPM_CC_NV_GlobalWriteLock"/>
+  <int value="307" label="TPM_CC_GetCommandAuditDigest"/>
+  <int value="308" label="TPM_CC_NV_Increment"/>
+  <int value="309" label="TPM_CC_NV_SetBits"/>
+  <int value="310" label="TPM_CC_NV_Extend"/>
+  <int value="311" label="TPM_CC_NV_Write"/>
+  <int value="312" label="TPM_CC_NV_WriteLock"/>
+  <int value="313" label="TPM_CC_DictionaryAttackLockReset"/>
+  <int value="314" label="TPM_CC_DictionaryAttackParameters"/>
+  <int value="315" label="TPM_CC_NV_ChangeAuth"/>
+  <int value="316" label="TPM_CC_PCR_Event"/>
+  <int value="317" label="TPM_CC_PCR_Reset"/>
+  <int value="318" label="TPM_CC_SequenceComplete"/>
+  <int value="319" label="TPM_CC_SetAlgorithmSet"/>
+  <int value="320" label="TPM_CC_SetCommandCodeAuditStatus"/>
+  <int value="321" label="TPM_CC_FieldUpgradeData"/>
+  <int value="322" label="TPM_CC_IncrementalSelfTest"/>
+  <int value="323" label="TPM_CC_SelfTest"/>
+  <int value="324" label="TPM_CC_Startup"/>
+  <int value="325" label="TPM_CC_Shutdown"/>
+  <int value="326" label="TPM_CC_StirRandom"/>
+  <int value="327" label="TPM_CC_ActivateCredential"/>
+  <int value="328" label="TPM_CC_Certify"/>
+  <int value="329" label="TPM_CC_PolicyNV"/>
+  <int value="330" label="TPM_CC_CertifyCreation"/>
+  <int value="331" label="TPM_CC_Duplicate"/>
+  <int value="332" label="TPM_CC_GetTime"/>
+  <int value="333" label="TPM_CC_GetSessionAuditDigest"/>
+  <int value="334" label="TPM_CC_NV_Read"/>
+  <int value="335" label="TPM_CC_NV_ReadLock"/>
+  <int value="336" label="TPM_CC_ObjectChangeAuth"/>
+  <int value="337" label="TPM_CC_PolicySecret"/>
+  <int value="338" label="TPM_CC_Rewrap"/>
+  <int value="339" label="TPM_CC_Create"/>
+  <int value="340" label="TPM_CC_ECDH_ZGen"/>
+  <int value="341" label="TPM_CC_HMAC"/>
+  <int value="342" label="TPM_CC_Import"/>
+  <int value="343" label="TPM_CC_Load"/>
+  <int value="344" label="TPM_CC_Quote"/>
+  <int value="345" label="TPM_CC_RSA_Decrypt"/>
+  <int value="347" label="TPM_CC_HMAC_Start"/>
+  <int value="348" label="TPM_CC_SequenceUpdate"/>
+  <int value="349" label="TPM_CC_Sign"/>
+  <int value="350" label="TPM_CC_Unseal"/>
+  <int value="352" label="TPM_CC_PolicySigned"/>
+  <int value="353" label="TPM_CC_ContextLoad"/>
+  <int value="354" label="TPM_CC_ContextSave"/>
+  <int value="355" label="TPM_CC_ECDH_KeyGen"/>
+  <int value="356" label="TPM_CC_EncryptDecrypt"/>
+  <int value="357" label="TPM_CC_FlushContext"/>
+  <int value="359" label="TPM_CC_LoadExternal"/>
+  <int value="360" label="TPM_CC_MakeCredential"/>
+  <int value="361" label="TPM_CC_NV_ReadPublic"/>
+  <int value="362" label="TPM_CC_PolicyAuthorize"/>
+  <int value="363" label="TPM_CC_PolicyAuthValue"/>
+  <int value="364" label="TPM_CC_PolicyCommandCode"/>
+  <int value="365" label="TPM_CC_PolicyCounterTimer"/>
+  <int value="366" label="TPM_CC_PolicyCpHash"/>
+  <int value="367" label="TPM_CC_PolicyLocality"/>
+  <int value="368" label="TPM_CC_PolicyNameHash"/>
+  <int value="369" label="TPM_CC_PolicyOR"/>
+  <int value="370" label="TPM_CC_PolicyTicket"/>
+  <int value="371" label="TPM_CC_ReadPublic"/>
+  <int value="372" label="TPM_CC_RSA_Encrypt"/>
+  <int value="374" label="TPM_CC_StartAuthSession"/>
+  <int value="375" label="TPM_CC_VerifySignature"/>
+  <int value="376" label="TPM_CC_ECC_Parameters"/>
+  <int value="377" label="TPM_CC_FirmwareRead"/>
+  <int value="378" label="TPM_CC_GetCapability"/>
+  <int value="379" label="TPM_CC_GetRandom"/>
+  <int value="380" label="TPM_CC_GetTestResult"/>
+  <int value="381" label="TPM_CC_Hash"/>
+  <int value="382" label="TPM_CC_PCR_Read"/>
+  <int value="383" label="TPM_CC_PolicyPCR"/>
+  <int value="384" label="TPM_CC_PolicyRestart"/>
+  <int value="385" label="TPM_CC_ReadClock"/>
+  <int value="386" label="TPM_CC_PCR_Extend"/>
+  <int value="387" label="TPM_CC_PCR_SetAuthValue"/>
+  <int value="388" label="TPM_CC_NV_Certify"/>
+  <int value="389" label="TPM_CC_EventSequenceComplete"/>
+  <int value="390" label="TPM_CC_HashSequenceStart"/>
+  <int value="391" label="TPM_CC_PolicyPhysicalPresence"/>
+  <int value="392" label="TPM_CC_PolicyDuplicationSelect"/>
+  <int value="393" label="TPM_CC_PolicyGetDigest"/>
+  <int value="394" label="TPM_CC_TestParms"/>
+  <int value="395" label="TPM_CC_Commit"/>
+  <int value="396" label="TPM_CC_PolicyPassword"/>
+  <int value="397" label="TPM_CC_ZGen_2Phase"/>
+  <int value="398" label="TPM_CC_EC_Ephemeral"/>
+  <int value="399" label="TPM_CC_PolicyNvWritten"/>
+  <int value="536903681" label="TPM_CCE_PolicyFidoSigned"/>
+</enum>
+
 <enum name="TPMFirmwareUpdateResult">
   <int value="0" label="Success"/>
   <int value="1" label="Success after retry"/>
@@ -73158,6 +75939,24 @@ would be helpful to identify which type is being sent.
   <int value="8" label="EXIT_CODE_SUCCESS_COLD_REBOOT"/>
 </enum>
 
+<enum name="TpmManagerSecretStatus">
+  <summary>
+    The status of the sercrets that tpm manager hold. Each bit field presents
+    the meanings listed below: 1. (0bX0000000): when the flag is set, the device
+    uses TPM2. 2. (0b0XX00000): reserved. 3. (0b000X0000): has owner password.
+    4. (0b0000X000): has endorsement password (TPM2.0 only). 5. (0b00000X00):
+    has lockout password (TPM2.0 only). 6. (0b000000X0): has owner delegate
+    (TPM1.2 only). 7. (0b0000000X): has reset DA premissions.
+  </summary>
+  <int value="0" label="(0b00000000) empty database (TPM1.2)"/>
+  <int value="2" label="(0b00000010) intact database (legacy TPM1.2)"/>
+  <int value="3" label="(0b00000011) intact database (TPM1.2)"/>
+  <int value="19" label="(0b00010011) stale owner auth (TPM1.2)"/>
+  <int value="128" label="(0b10000000) empty database (TPM2.0)"/>
+  <int value="141" label="(0b10001101) intact database (TPM2.0)"/>
+  <int value="157" label="(0b10011101) stale owner auth (TPM2.0)"/>
+</enum>
+
 <enum name="TPMResultCodeEnum">
   <int value="0" label="TPM_SUCCESS"/>
   <int value="1" label="TPM_E_AUTHFAIL"/>
@@ -73589,7 +76388,7 @@ Full version information for the fingerprint enum values:
   <int value="27" label="kSettingsResetPromptLastTriggeredForStartupUrls"/>
   <int value="28" label="kSettingsResetPromptLastTriggeredForHomepage"/>
   <int value="29" label="kMediaStorageIdSalt"/>
-  <int value="30" label="kModuleBlacklistCacheMD5Digest"/>
+  <int value="30" label="kModuleBlocklistCacheMD5Digest"/>
 </enum>
 
 <enum name="TranslateAssistContentResult">
@@ -73812,6 +76611,44 @@ Full version information for the fingerprint enum values:
   <int value="13" label="Show UI"/>
   <int value="14" label="Automatic translation, by link"/>
   <int value="15" label="Automatic translation, by user preference"/>
+  <int value="16" label="Show UI, from Href"/>
+  <int value="17" label="Automatic translation, by Href"/>
+</enum>
+
+<enum name="TranslateUIInteraction">
+  <int value="0" label="Uninitialized"/>
+  <int value="1" label="Translate page"/>
+  <int value="2" label="Revert translation"/>
+  <int value="3" label="Always translate language"/>
+  <int value="4" label="Change source language"/>
+  <int value="5" label="Change target language"/>
+  <int value="6" label="Never translate language"/>
+  <int value="7" label="Never translate site"/>
+  <int value="8" label="Close UI explicitly"/>
+  <int value="9" label="Close UI by lost focus"/>
+</enum>
+
+<enum name="TranslationStatus">
+  <int value="0" label="Uninitialized"/>
+  <int value="1" label="Succeeded, from manual translation"/>
+  <int value="2" label="Succeeded, automatic translation by user preference"/>
+  <int value="3" label="Succeeded, automatic translation by link"/>
+  <int value="4" label="Reverted by user, manual translation"/>
+  <int value="5" label="Reverted by user, automatic translation"/>
+  <int value="6" label="New translation requested by user"/>
+  <int value="7" label="Abandoned"/>
+  <int value="8" label="Failed with no error, manual translation"/>
+  <int value="9" label="Failed with no error, automatic translation"/>
+  <int value="10" label="Failed with an error, manual translation"/>
+  <int value="11" label="Failed with an error, automatic translation"/>
+</enum>
+
+<enum name="TranslationType">
+  <int value="0" label="Uninitialized"/>
+  <int value="1" label="Manual translation, first translation of page load"/>
+  <int value="2" label="Manual translation, after page was already translated"/>
+  <int value="3" label="Automatic translation by user preference"/>
+  <int value="4" label="Automatic translation by link"/>
 </enum>
 
 <enum name="TrendingTileEvent">
@@ -73924,6 +76761,20 @@ Full version information for the fingerprint enum values:
   <int value="3" label="Mainframe fetched using an auto-detected proxy"/>
 </enum>
 
+<enum name="TypedNavigationUpgradeThrottleEvent">
+  <int value="1" label="Started the load of an upgraded HTTPS URL."/>
+  <int value="2" label="Successfully finished loading the upgraded HTTPS URL."/>
+  <int value="3"
+      label="Failed to load the upgraded HTTPS URL because of a cert error,
+             fell back to the HTTP URL."/>
+  <int value="4"
+      label="Failed to load the upgraded HTTPS URL because of a net error,
+             fell back to the HTTP URL."/>
+  <int value="5"
+      label="Received a redirect. This doesn't necessarily imply that the
+             HTTPS load succeeded or failed."/>
+</enum>
+
 <enum name="TypeOfVideoInFrame">
   <int value="0" label="Frame do not have video"/>
   <int value="1" label="Frame has video (either inline or fullscreen)"/>
@@ -73989,6 +76840,7 @@ Full version information for the fingerprint enum values:
     This gets populated by the GetEnumsNodes function in merge_xml.py when
     producing the merged XML file.
   </summary>
+  <int value="0" label="Enum placerholder. See crbug/1179826"/>
 </enum>
 
 <enum name="UkmResetReason">
@@ -74150,6 +77002,18 @@ Full version information for the fingerprint enum values:
   <int value="3" label="Challenge-response security token"/>
 </enum>
 
+<enum name="UNNotificationPermissionStatus">
+  <int value="0" label="Permission not requested yet"/>
+  <int value="1" label="Permission denied"/>
+  <int value="2" label="Permission granted"/>
+</enum>
+
+<enum name="UNNotificationStyle">
+  <int value="0" label="None"/>
+  <int value="1" label="Banners"/>
+  <int value="2" label="Alerts"/>
+</enum>
+
 <enum name="UnPackStatus">
   <int value="0" label="No Error"/>
   <int value="1" label="Archive file not found"/>
@@ -74187,6 +77051,9 @@ Full version information for the fingerprint enum values:
 </enum>
 
 <enum name="UpdateAppBadgeMacResult">
+  <obsolete>
+    Removed in M88 as it's no longer needed.
+  </obsolete>
   <summary>The result from updating App Badge on macOS.</summary>
   <int value="0" label="success"/>
   <int value="1" label="No app shim manager"/>
@@ -74350,6 +77217,12 @@ Full version information for the fingerprint enum values:
 </enum>
 
 <enum name="UpdateEngineErrorCode">
+  <summary>
+    Tracks the Action exit codes of Update Engine.
+
+    Enum values need to ALWAYS be same as ErrorCode:
+    chromeos_public/src/aosp/system/update_engine/common/error_code.h
+  </summary>
   <int value="0" label="kErrorCodeSuccess"/>
   <int value="1" label="kErrorCodeError"/>
   <int value="2" label="kErrorCodeOmahaRequestError"/>
@@ -74410,10 +77283,11 @@ Full version information for the fingerprint enum values:
   <int value="57" label="kErrorCodeInternalLibCurlError"/>
   <int value="58" label="kErrorCodeUnresolvedHostError"/>
   <int value="59" label="kErrorCodeUnresolvedHostRecovered"/>
-  <int value="60" label="kErrorUnresolvedHostRecovered"/>
-  <int value="61" label="kErrorNotEnoughSpace"/>
-  <int value="62" label="kErrorDeviceCorrupted"/>
-  <int value="63" label="kErrorPackageExcludedFromUpdate"/>
+  <int value="60" label="kErrorCodeNotEnoughSpace"/>
+  <int value="61" label="kErrorCodeDeviceCorrupted"/>
+  <int value="62" label="kErrorCodePackageExcludedFromUpdate"/>
+  <int value="63" label="kErrorCodeDownloadCancelledPerPolicy"/>
+  <int value="64" label="kErrorCodeRepeatedFpFromOmahaError"/>
 </enum>
 
 <enum name="UpdateEngineInstallDateProvisioningSource">
@@ -74861,6 +77735,11 @@ Full version information for the fingerprint enum values:
   <int value="15" label="kExtensionMessagingNeitherPrivileged"/>
 </enum>
 
+<enum name="UserAgentRequestType">
+  <int value="0" label="RequestDesktop"/>
+  <int value="1" label="RequestMobile"/>
+</enum>
+
 <enum name="UserCertContentDisposition">
   <int value="0" label="No Content-Disposition"/>
   <int value="1" label="Content-Disposition"/>
@@ -74888,6 +77767,20 @@ Full version information for the fingerprint enum values:
   <int value="4" label="Minor Downgrade">Minor version downgrade</int>
 </enum>
 
+<enum name="UserDataMoveResult">
+  <int value="0" label="CreateTargetFailure">
+    Failed to create a temporary directory within User Data into which the
+    contents are to be moved for subsequent deletion.
+  </int>
+  <int value="1" label="Success">
+    The contents of User Data were moved as expected.
+  </int>
+  <int value="2" label="PartialSuccess">
+    Some items in User Data could not be moved; see
+    Downgrade.UserDataDirMove.FailureCount.
+  </int>
+</enum>
+
 <enum name="UserDemographicsStatus">
   <int value="0" label="Success - user demographics are available for report"/>
   <int value="1" label="Sync is not enabled"/>
@@ -74900,6 +77793,42 @@ Full version information for the fingerprint enum values:
   <int value="5" label="There is no sync service available"/>
 </enum>
 
+<enum name="UserDeviceMatrix">
+<!--
+    These are computed values. The lower 16-bits are from
+    UserTypeByDeviceTypeMetricsProvider::UserSegment (http://shortn/_uK3ZM4pC0a)
+    and the upper 16-bits are from policy::MarketSegment
+    (http://shortn/_3iFWcdjy0P). This list of possible user / device combos
+    should be updated if either of those enums changes.
+
+    Please note that the values listed below are the only values that should be
+    sent.
+  -->
+
+  <int value="0" label="Unmanaged user on unmanaged device"/>
+  <int value="1" label="K12 user on unmanaged device"/>
+  <int value="2" label="University user on unmanaged device"/>
+  <int value="3" label="Nonprofit user on unmanaged device"/>
+  <int value="4" label="Enterprise user on unmanaged device"/>
+<!--
+    There is no value for Managed Guest Session on Unmanaged device because that
+    combination cannot occur.
+  -->
+
+  <int value="65536" label="Unmanaged user on education device"/>
+  <int value="65537" label="K12 user on education device"/>
+  <int value="65538" label="University user on education device"/>
+  <int value="65539" label="Nonprofit user on education device"/>
+  <int value="65540" label="Enterprise user on education device"/>
+  <int value="131071" label="Managed guest session on an education device"/>
+  <int value="131072" label="Unmanaged user on enterprise device"/>
+  <int value="131073" label="K12 user on enterprise device"/>
+  <int value="131074" label="University user on enterprise device"/>
+  <int value="131075" label="Nonprofit user on enterprise device"/>
+  <int value="131076" label="Enterprise user on enterprise device"/>
+  <int value="196607" label="Managed guest session on an enterprise device"/>
+</enum>
+
 <enum name="UserGestureRequirement">
   <int value="0" label="Required and available"/>
   <int value="1" label="Required and not available"/>
@@ -75184,7 +78113,13 @@ Full version information for the fingerprint enum values:
   <int value="22" label="vaSyncSurface()"/>
   <int value="23" label="vaTerminate()"/>
   <int value="24" label="vaUnmapBuffer()"/>
-  <int value="25" label="Other VA functions"/>
+  <int value="25" label="vaCreateProtectedSession()"/>
+  <int value="26" label="vaDestroyProtectedSession()"/>
+  <int value="27" label="vaAttachProtectedSession()"/>
+  <int value="28" label="vaDetachProtectedSession()"/>
+  <int value="29" label="vaProtectedSessionHwUpdate() (deprecated)"/>
+  <int value="30" label="kVAProtectedSessionExecute()"/>
+  <int value="31" label="Other VA functions"/>
 </enum>
 
 <enum name="VAIPFailure">
@@ -75214,6 +78149,9 @@ Full version information for the fingerprint enum values:
 </enum>
 
 <enum name="ValidateMenuItemSelectorType">
+  <obsolete>
+    Deprecated as of 2021/01.
+  </obsolete>
   <int value="0"
       label="The menu items' associated action is an unknown selector."/>
   <int value="1" label="The menu item's associated action is -newProfile."/>
@@ -75458,6 +78396,21 @@ Full version information for the fingerprint enum values:
   <int value="0" label="VAAPI_ERROR"/>
 </enum>
 
+<enum name="VerifyDidCommitParamsDifference">
+  <summary>
+    The params that differ when comparing browser- and renderer-calculated
+    DidCommitProvisionalLoadParams.
+  </summary>
+  <int value="0" label="intended_as_new_entry"/>
+  <int value="1" label="method"/>
+  <int value="2" label="url_is_unreachable"/>
+  <int value="3" label="base_url"/>
+  <int value="4" label="post_id"/>
+  <int value="5" label="is_overriding_user_agent"/>
+  <int value="6" label="http_status_code"/>
+  <int value="7" label="should_update_history"/>
+</enum>
+
 <enum name="VerifyWakeOnWiFiSettingsResult">
   <summary>
     The result of NIC wake on WiFi settings verification. Corresponds to
@@ -75611,6 +78564,9 @@ Full version information for the fingerprint enum values:
 </enum>
 
 <enum name="VideoCaptureEvent">
+  <obsolete>
+    Expired in M82; removed in M90.
+  </obsolete>
   <int value="0" label="Starting video capture"/>
   <int value="1" label="Stopping video capture normally"/>
   <int value="2" label="Stopping video capture due to error"/>
@@ -75669,6 +78625,12 @@ Full version information for the fingerprint enum values:
   <int value="9" label="Video capture service timeout canceled"/>
 </enum>
 
+<enum name="VideoCaptureStartOutcome">
+  <int value="0" label="kStarted"/>
+  <int value="1" label="kTimedout"/>
+  <int value="2" label="kFailed"/>
+</enum>
+
 <enum name="VideoCaptureWinBackendUsed">
   <int value="0" label="Using DirectShow as default"/>
   <int value="1" label="Using MediaFoundation as default"/>
@@ -75882,6 +78844,8 @@ Full version information for the fingerprint enum values:
   <int value="29" label="P016LE"/>
   <int value="30" label="XR30"/>
   <int value="31" label="XB30"/>
+  <int value="32" label="BGRA"/>
+  <int value="33" label="RGBAF16"/>
 </enum>
 
 <enum name="VideoPlayerCastAPIExtensionStatus">
@@ -75897,6 +78861,52 @@ Full version information for the fingerprint enum values:
   <int value="1" label="Play on cast device"/>
 </enum>
 
+<enum name="VideoResolutionDesignation">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="QQVGA (160x120)"/>
+  <int value="2" label="HQVGA (240x160)"/>
+  <int value="3" label="QVGA (320x240)"/>
+  <int value="4" label="WQVGA (432x240)"/>
+  <int value="5" label="HVGA (480x320)"/>
+  <int value="6" label="VGA (640x480)"/>
+  <int value="7" label="WVGA (720x480)"/>
+  <int value="8" label="WSVGA (1024x576)"/>
+  <int value="9" label="SVGA (800x600)"/>
+  <int value="10" label="SXGA- (1280x960)"/>
+  <int value="11" label="UXGA (1600x1200)"/>
+  <int value="12" label="QXGA (2048x1536)"/>
+  <int value="13" label="QCIF (176x144)"/>
+  <int value="14" label="CIF (352x288)"/>
+  <int value="15" label="NHD (640x360)"/>
+  <int value="16" label="QHD (960x540)"/>
+  <int value="17" label="HD Fullscreen (960x720)"/>
+  <int value="18" label="HD (1280x720)"/>
+  <int value="19" label="HD_PLUS (1600x900)"/>
+  <int value="20" label="FHD (1920x1080)"/>
+  <int value="21" label="WQHD (2560x1440)"/>
+  <int value="22" label="QHD+ (3200x1800)"/>
+  <int value="23" label="4K UHD (3840x2160)"/>
+  <int value="24" label="DCI 4K (4096x2160)"/>
+  <int value="25" label="5K (5120x2880)"/>
+  <int value="26" label="8K UHD (7680x4320)"/>
+  <int value="27" label="160x90"/>
+  <int value="28" label="320x176"/>
+  <int value="29" label="320x180"/>
+  <int value="30" label="480x270"/>
+  <int value="31" label="544x288"/>
+  <int value="32" label="752x416"/>
+  <int value="33" label="864x480"/>
+  <int value="34" label="800x448"/>
+  <int value="35" label="960x544"/>
+  <int value="36" label="1184x656"/>
+  <int value="37" label="1392x768"/>
+  <int value="38" label="1504x832"/>
+  <int value="39" label="1600x896"/>
+  <int value="40" label="1712x960"/>
+  <int value="41" label="1792x1008"/>
+  <int value="42" label="2592x1944"/>
+</enum>
+
 <enum name="VideoRotation">
   <int value="0" label="VIDEO_ROTATION_0"/>
   <int value="1" label="VIDEO_ROTATION_90"/>
@@ -76171,6 +79181,8 @@ Full version information for the fingerprint enum values:
   <int value="1" label="Variant emoji from the emoji picker"/>
   <int value="2" label="Base emoji from the popup"/>
   <int value="3" label="Variant emoji from the popup"/>
+  <int value="4" label="Base emoji from the chromium emoji picker"/>
+  <int value="5" label="Variant emoji from the chromium emoji picker"/>
 </enum>
 
 <enum name="VirtualKeyboardErrorTypeHashes">
@@ -76195,6 +79207,22 @@ Full version information for the fingerprint enum values:
   <int value="3" label="HitTestData outdated"/>
 </enum>
 
+<enum name="VkPipelinePopulatedCacheEntryUsage">
+  <int value="0" label="Used"/>
+  <int value="1" label="Overwritten"/>
+  <int value="2" label="Discarded: too large"/>
+  <int value="3" label="Discarded: have newer data"/>
+  <int value="4" label="Evicted"/>
+</enum>
+
+<enum name="VoiceIntentTarget">
+<!-- This must be kept in sync with the VoiceIntentTarget variants in
+others/histograms.xml -->
+
+  <int value="0" label="System"/>
+  <int value="1" label="Assistant"/>
+</enum>
+
 <enum name="VoiceInteractionEventSource">
 <!-- This must be kept in sync with VoiceInteraction.AssistantActionPerformed in
 others/histograms.xml -->
@@ -76864,6 +79892,18 @@ others/histograms.xml -->
   <int value="9" label="App is system web app"/>
   <int value="10" label="Icon download failed"/>
   <int value="11" label="Icon read from disk failed"/>
+  <int value="12" label="App ID mismatch"/>
+</enum>
+
+<enum name="WebAppMoverResult">
+  <summary>Result of executing the WebAppMover on Chrome startup.</summary>
+  <int value="0" label="Invalid Finch Configuration"/>
+  <int value="1" label="App-to-install already installed"/>
+  <int value="2" label="Apps-to-uninstall not installed"/>
+  <int value="3" label="App-to-install is not installable"/>
+  <int value="4" label="Failure during uninstall"/>
+  <int value="5" label="Failure during install"/>
+  <int value="6" label="Success"/>
 </enum>
 
 <enum name="WebappUninstallDialogAction">
@@ -76895,6 +79935,30 @@ others/histograms.xml -->
   <int value="2" label="Source Node start()"/>
 </enum>
 
+<enum name="WebAuthenticationAOADiscoveryEvent">
+  <int value="0" label="Started"/>
+  <int value="1" label="An AOA USB device appeared during a WebAuthn request"/>
+  <int value="2"
+      label="A non-AOA USB device was plugged in during a WebAuthn request"/>
+  <int value="3"
+      label="A non-AOA device did not have an AOA configuration interface"/>
+  <int value="4" label="Failed to open an AOA device"/>
+  <int value="5"
+      label="Failed to set the active configuration of an AOA device"/>
+  <int value="6" label="Failed to claim the interface of an AOA device"/>
+  <int value="7" label="Failed to write a sync message to an AOA device"/>
+  <int value="8" label="Failed to read a sync reply from an AOA device"/>
+  <int value="9" label="AOA device successfully discovered"/>
+  <int value="10" label="Failed to open a non-AOA device"/>
+  <int value="11"
+      label="Failed to get version information from non-AOA device"/>
+  <int value="12" label="AOA version one not supported"/>
+  <int value="13" label="Failed to set AOA configuration strings"/>
+  <int value="14" label="Device requested to switch to AOA mode"/>
+  <int value="15"
+      label="One or more previously discovered devices are still connected"/>
+</enum>
+
 <enum name="WebAuthenticationAttestationPromptResult">
   <int value="0" label="Queried"/>
   <int value="1" label="Timeout"/>
@@ -76932,6 +79996,87 @@ others/histograms.xml -->
   <int value="7" label="Timeout"/>
 </enum>
 
+<enum name="WebAuthenticationCableV2DiscoveryEvent">
+  <int value="0" label="Discovery started"/>
+  <int value="1" label="Pairing information was provided to this discovery"/>
+  <int value="2" label="QR keys were provided to this discovery"/>
+  <int value="3"
+      label="Keys from an extension were provided to this discovery"/>
+  <int value="4" label="An EID matched a pending tunnel"/>
+  <int value="5" label="An EID matched a QR code"/>
+  <int value="6" label="An EID matched an extension"/>
+  <int value="7" label="An EID was ignored because it didn't match anything"/>
+</enum>
+
+<enum name="WebAuthenticationCableV2MobileEvent">
+  <int value="0" label="QR read"/>
+  <int value="1" label="Server-linked connection started"/>
+  <int value="2" label="Cloud message received"/>
+  <int value="3" label="USB connection"/>
+  <int value="4" label="Authenticator setup"/>
+  <int value="5" label="Connected to tunnel server"/>
+  <int value="6" label="Handshake completed"/>
+  <int value="7" label="Request received"/>
+  <int value="8" label="CTAP response with non-zero status"/>
+  <int value="9" label="Unlinked all devices"/>
+  <int value="10" label="Showed notification"/>
+  <int value="11" label="Notification pressed"/>
+  <int value="12" label="User unselected linking checkbox during QR scan"/>
+  <int value="13" label="USB transaction was successful"/>
+</enum>
+
+<enum name="WebAuthenticationCableV2MobileResult">
+  <int value="0" label="Success"/>
+  <int value="1" label="Unexpected EOF"/>
+  <int value="2" label="Failed to connect to tunnel server"/>
+  <int value="3" label="Handshake failure"/>
+  <int value="4" label="Decryption failure"/>
+  <int value="5" label="Invalid CBOR received"/>
+  <int value="6" label="Invalid CTAP received"/>
+  <int value="7" label="Unknown command"/>
+  <int value="8" label="Internal error"/>
+  <int value="9" label="Invalid QR"/>
+  <int value="10" label="Invalid server link data"/>
+</enum>
+
+<enum name="WebAuthenticationCableV2TunnelEvent">
+  <int value="0"
+      label="Tunnel attempt started for QR- or extension-based connection"/>
+  <int value="1" label="Tunnel attempt started for linked connected"/>
+  <int value="2" label="Tunnel connected"/>
+  <int value="3" label="Contact ID was invalid"/>
+  <int value="4" label="Tunnel failed with unexpected HTTP 410 status"/>
+  <int value="5" label="Tunnel failed"/>
+  <int value="6" label="Handshake failed"/>
+  <int value="7" label="Error processing post-handshake message"/>
+  <int value="8" label="Tunnel established"/>
+  <int value="9" label="Failed to decrypt main-flow message"/>
+</enum>
+
+<enum name="WebAuthenticationChromeOSGetAssertionResult">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="Success"/>
+  <int value="2" label="Verification failed"/>
+  <int value="3" label="Verification timeout"/>
+  <int value="4" label="Invalid request"/>
+  <int value="5" label="Internal error"/>
+  <int value="6" label="No credential id matched"/>
+  <int value="7" label="Another request pending"/>
+  <int value="8" label="Canceled"/>
+</enum>
+
+<enum name="WebAuthenticationChromeOSMakeCredentialResult">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="Success"/>
+  <int value="2" label="Verification failed"/>
+  <int value="3" label="Verification timeout"/>
+  <int value="4" label="Invalid request"/>
+  <int value="5" label="Internal error"/>
+  <int value="6" label="Excluded credential id matched"/>
+  <int value="7" label="Another request pending"/>
+  <int value="8" label="Canceled"/>
+</enum>
+
 <enum name="WebAuthenticationFidoTransport">
   <int value="0" label="USB HID"/>
   <int value="1" label="Near Field Communication"/>
@@ -77108,6 +80253,7 @@ others/histograms.xml -->
   <int value="4" label="Success CFF2 outline font"/>
   <int value="5" label="Success Sbix color font"/>
   <int value="6" label="Success COLR/CPAL color font"/>
+  <int value="7" label="Success COLRv1 color font"/>
 </enum>
 
 <enum name="WebFontInterventionResult">
@@ -77141,6 +80287,14 @@ others/histograms.xml -->
   <int value="2" label="Not styled, but used"/>
 </enum>
 
+<enum name="WebHidChooserClosed">
+  <int value="0" label="User cancelled"/>
+  <int value="1" label="User cancelled, no devices available"/>
+  <int value="2" label="Permission granted"/>
+  <int value="3" label="Ephemeral permission granted"/>
+  <int value="4" label="Dismissed due to loss of focus"/>
+</enum>
+
 <enum name="WebHistoryStatus">
   <int value="0" label="WEB_HISTORY_QUERY_FAILED">Failed</int>
   <int value="1" label="WEB_HISTORY_QUERY_SUCCEEDED">Succeeded</int>
@@ -77155,10 +80309,17 @@ others/histograms.xml -->
   <int value="4" label="FlingingRendererClientFactory"/>
 </enum>
 
+<enum name="WebOTPBackendAvailability">
+  <int value="0" label="Available"/>
+  <int value="1" label="API not connected"/>
+  <int value="2" label="Platform not supported"/>
+  <int value="3" label="API not available"/>
+</enum>
+
 <enum name="WebOTPServiceDestroyedReason">
   <int value="0" label="Navigated to new page"/>
   <int value="1" label="Navigated to existing page"/>
-  <int value="2" label="Nagivated to same page"/>
+  <int value="2" label="(Deprecated) Nagivated to same page"/>
 </enum>
 
 <enum name="WebOTPServiceInfobarAction">
@@ -77174,9 +80335,13 @@ others/histograms.xml -->
   <int value="4" label="Aborted"/>
   <int value="5" label="Timeout"/>
   <int value="6" label="UserCancelled"/>
+  <int value="7" label="BackendNotAvailable"/>
 </enum>
 
 <enum name="WebpDecodedFormat">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <int value="1" label="JPEG"/>
   <int value="2" label="PNG"/>
   <int value="3" label="TIFF"/>
@@ -77618,7 +80783,7 @@ Called by update_scheduler_enums.py.-->
   <int value="13" label="Cookies deleted for site"/>
   <int value="14" label="Permission dialog opened"/>
   <int value="15" label="Permission deleted for site"/>
-  <int value="16" label="Permission changed for site"/>
+  <int value="16" label="(Deprecated) Permission changed for site"/>
 </enum>
 
 <enum name="WebSiteSettingsAllSitesAction">
@@ -77638,6 +80803,14 @@ Called by update_scheduler_enums.py.-->
   <int value="6" label="Enter Site Details"/>
 </enum>
 
+<enum name="WebsiteSettingsDiscoverabilityAction">
+  <int value="0" label="Permission icon shown in omnibox"/>
+  <int value="1"
+      label="Page info opened while permission icon was shown in omnibox"/>
+  <int value="2" label="Permissions opened after click on permissions icon"/>
+  <int value="3" label="Permission changed after click on permissions icon"/>
+</enum>
+
 <enum name="WebSocketCloseCode">
   <int value="0" label="Normal Closure">1000</int>
   <int value="1" label="Going Away">1001</int>
@@ -77848,6 +81021,7 @@ Called by update_scheduler_enums.py.-->
   <int value="8030578" label="/crostini/sharedUsbDevices"/>
   <int value="8530592" label="/syncSetup/advanced"/>
   <int value="16287984" label="/languages/details"/>
+  <int value="53341592" label="/privacySandbox"/>
   <int value="60238454" label="/content/ads"/>
   <int value="104900992" label="/content/insecureContent"/>
   <int value="223791833" label="/help/about"/>
@@ -78662,6 +81836,10 @@ Called by update_scheduler_enums.py.-->
   <int value="5" label="WindowActivityBookmarksOrigin"/>
   <int value="6" label="WindowActivityHistoryOrigin"/>
   <int value="7" label="WindowActivityToolsOrigin"/>
+  <int value="8" label="WindowActivityRecentTabsOrigin"/>
+  <int value="9" label="WindowActivityLocationBarSteadyViewOrigin"/>
+  <int value="10" label="WindowActivityContentSuggestionsOrigin"/>
+  <int value="11" label="WindowActivityTabDragOrigin"/>
 </enum>
 
 <enum name="WindowDragEndEventType">
@@ -78909,6 +82087,7 @@ Called by update_scheduler_enums.py.-->
   <int value="2" label="DISABLED_FOR_USER"/>
   <int value="3" label="DISABLED_BY_GROUP_POLICY"/>
   <int value="4" label="DISABLED_BY_MANIFEST"/>
+  <int value="5" label="UNKNOWN"/>
 </enum>
 
 <enum name="WindowsNotificationGetSettingStatus">
@@ -79670,6 +82849,12 @@ Called by update_scheduler_enums.py.-->
   <int value="1247871240" label="Windows 10 2004 (Build 19041.264)"/>
 </enum>
 
+<enum name="WindowsServiceStatus">
+  <int value="0" label="Unknown"/>
+  <int value="1" label="Not Found"/>
+  <int value="2" label="Found"/>
+</enum>
+
 <enum name="WindowsToastActivatorCLSIDMismatchReason">
   <obsolete>
     Deprecated 12/2018 as this is no longer needed.
@@ -80441,6 +83626,8 @@ Called by update_scheduler_enums.py.-->
   <int value="49" label="Site Settings"/>
   <int value="50" label="App Info"/>
   <int value="51" label="Uninstall app"/>
+  <int value="52" label="Show Kaleidoscope"/>
+  <int value="53" label="Show tips for Chrome"/>
 </enum>
 
 <enum name="XFrameOptions">
diff --git a/chromium/tools/metrics/histograms/expand_owners.py b/chromium/tools/metrics/histograms/expand_owners.py
index 566f8d56f5a..f3de3e9d206 100644
--- a/chromium/tools/metrics/histograms/expand_owners.py
+++ b/chromium/tools/metrics/histograms/expand_owners.py
@@ -17,8 +17,8 @@ _OWNERS = 'OWNERS'
 # module's directory, histograms, and the directory above tools, which may or
 # may not be src depending on the machine running the code, is up three
 # directory levels from the histograms directory.
-_DIR_ABOVE_TOOLS = [os.path.dirname(__file__), '..', '..', '..']
-_SRC = 'src/'
+DIR_ABOVE_TOOLS = [os.path.dirname(__file__), '..', '..', '..']
+SRC = 'src/'
 
 
 class Error(Exception):
@@ -91,7 +91,7 @@ def _IsWellFormattedFilePath(path):
   Args:
     path: The path to an OWNERS file, e.g. 'src/gin/OWNERS'.
   """
-  return path.startswith(_SRC) and path.endswith(_OWNERS)
+  return path.startswith(SRC) and path.endswith(_OWNERS)
 
 
 def _GetHigherLevelOwnersFilePath(path):
@@ -111,7 +111,7 @@ def _GetHigherLevelOwnersFilePath(path):
   # The highest directory that is searched for component information is one
   # directory lower than the directory above tools. Depending on the machine
   # running this code, the directory above tools may or may not be src.
-  path_to_limiting_dir = os.path.abspath(os.path.join(*_DIR_ABOVE_TOOLS))
+  path_to_limiting_dir = os.path.abspath(os.path.join(*DIR_ABOVE_TOOLS))
   limiting_dir = path_to_limiting_dir.split(os.sep)[-1]
   owners_file_limit = (os.sep).join([limiting_dir, _OWNERS])
   if path.endswith(owners_file_limit):
@@ -138,10 +138,10 @@ def _GetOwnersFilePath(path):
   if _IsWellFormattedFilePath(path):
     # _SRC is removed because the file system on the machine running the code
     # may not have a(n) src directory.
-    path_without_src = path[len(_SRC):]
+    path_without_src = path[len(SRC):]
 
     return os.path.abspath(
-        os.path.join(*(_DIR_ABOVE_TOOLS + path_without_src.split(os.sep))))
+        os.path.join(*(DIR_ABOVE_TOOLS + path_without_src.split(os.sep))))
 
   raise Error(
       'The given path {} is not well-formatted. Well-formatted paths begin '
@@ -184,7 +184,7 @@ def _ExtractEmailAddressesFromOWNERS(path, depth=0):
 
       elif first_word.startswith(directive):
         next_path = _GetOwnersFilePath(
-          os.path.join(_SRC, first_word[len(directive):]))
+            os.path.join(SRC, first_word[len(directive):]))
 
         if os.path.exists(next_path) and os.path.isfile(next_path):
           extracted_emails.extend(
@@ -241,7 +241,7 @@ def _ExtractComponentViaDirmd(path):
   """
   # Verify that the paths are absolute and the root is a parent of the
   # passed in path.
-  root_path = os.path.abspath(os.path.join(*_DIR_ABOVE_TOOLS))
+  root_path = os.path.abspath(os.path.join(*DIR_ABOVE_TOOLS))
   path = os.path.abspath(path)
   if not path.startswith(root_path):
     raise Error('Path {} is not a subpath of the root path {}.'.format(
@@ -250,7 +250,7 @@ def _ExtractComponentViaDirmd(path):
   dirmd_exe = 'dirmd'
   if sys.platform == 'win32':
     dirmd_exe = 'dirmd.bat'
-  dirmd_path = os.path.join(*(_DIR_ABOVE_TOOLS +
+  dirmd_path = os.path.join(*(DIR_ABOVE_TOOLS +
                               ['third_party', 'depot_tools', dirmd_exe]))
   dirmd = subprocess.Popen([dirmd_path, 'compute', '--root', root_path, path],
                            stdout=subprocess.PIPE)
diff --git a/chromium/tools/metrics/histograms/expand_owners_unittest.py b/chromium/tools/metrics/histograms/expand_owners_unittest.py
index 5beb49e7170..76203b35b59 100644
--- a/chromium/tools/metrics/histograms/expand_owners_unittest.py
+++ b/chromium/tools/metrics/histograms/expand_owners_unittest.py
@@ -5,6 +5,7 @@
 import unittest
 
 import expand_owners
+import mock
 import os
 import shutil
 import tempfile
@@ -13,43 +14,38 @@ import xml.dom.minidom
 _DEFAULT_COMPONENT = '# COMPONENT: Default>Component'
 
 
-def _DirnameN(path, n):
-  """Calls os.path.dirname() on the argument n times."""
-  path = os.path.abspath(path)
-  for _ in range(n):
-    path = os.path.dirname(path)
-  return path
+def _GetToolsParentDir():
+  """Returns an absolute path to the the tools directory's parent directory.
 
-
-assert __file__.endswith('tools/metrics/histograms/expand_owners_unittest.py')
-
-_PATH_TO_CHROMIUM_DIR = _DirnameN(__file__, 5)
+  Example: 'C:\a\n\ff\' or '/opt/n/ff/'.
+  """
+  return os.path.abspath(os.path.join(*expand_owners.DIR_ABOVE_TOOLS))
 
 
 def _GetFileDirective(path):
   """Returns a file directive line.
 
   Args:
-    path: An absolute path, e.g. '/some/directory/chromium/src/tools/OWNERS'.
+    path: An absolute path, e.g. '/some/directory/subdirectory/tools/OWNERS'.
 
   Returns:
     A file directive that can be used in an OWNERS file, e.g.
     file://tools/OWNERS.
   """
-  return ''.join(['file://', path.split('src/')[1]])
+  return ''.join(['file://', path[len(_GetToolsParentDir()) + 1:]])
 
 
 def _GetSrcRelativePath(path):
   """Returns a(n) src-relative path for the given file path.
 
   Args:
-    path: An absolute path, e.g. '/some/directory/chromium/src/tools/OWNERS'.
+    path: An absolute path, e.g. '/some/directory/subdirectory/tools/OWNERS'.
 
   Returns:
     A src-relative path, e.g.'src/tools/OWNERS'.
   """
-  assert path.startswith(_PATH_TO_CHROMIUM_DIR)
-  return path[len(_PATH_TO_CHROMIUM_DIR) + 1:]
+  assert path.startswith(_GetToolsParentDir())
+  return expand_owners.SRC + path[len(_GetToolsParentDir()) + 1:]
 
 
 def _MakeOwnersFile(filename, directory):
@@ -75,10 +71,17 @@ class ExpandOwnersTest(unittest.TestCase):
     self.temp_dir = tempfile.mkdtemp(
         dir=os.path.abspath(os.path.join(os.path.dirname(__file__))))
 
+    # The below construction is used rather than __file__.endswith() because
+    # the file extension could be .py or .pyc.
+    assert os.sep.join(
+        ['tools', 'metrics', 'histograms',
+         'expand_owners_unittest.py']) in __file__
+
   def tearDown(self):
     super(ExpandOwnersTest, self).tearDown()
     shutil.rmtree(self.temp_dir)
 
+  @unittest.skip("http://crbug.com/1164985")
   def testExpandOwnersUsesMetadataOverOwners(self):
     """Checks that DIR_METADATA is used if available"""
     with open(os.path.join(self.temp_dir, 'DIR_METADATA'), "w+") as md:
@@ -134,8 +137,10 @@ class ExpandOwnersTest(unittest.TestCase):
     expand_owners.ExpandHistogramsOWNERS(histograms)
     self.assertMultiLineEqual(histograms.toxml(), expected_histograms.toxml())
 
-  def testExpandOwnersWithSimpleOWNERSFilePath(self):
+  @mock.patch('expand_owners._ExtractComponentViaDirmd')
+  def testExpandOwnersWithSimpleOWNERSFilePath(self, mock_dirmd_extract):
     """Checks that OWNERS files are expanded."""
+    mock_dirmd_extract.return_value = None
     absolute_path = _MakeOwnersFile('simple_OWNERS', self.temp_dir)
     src_relative_path = _GetSrcRelativePath(absolute_path)
 
@@ -188,11 +193,15 @@ class ExpandOwnersTest(unittest.TestCase):
     expand_owners.ExpandHistogramsOWNERS(histograms)
     self.assertMultiLineEqual(histograms.toxml(), expected_histograms.toxml())
 
-  def testExpandOwnersWithLongFilePath(self):
-    """
-    Check that long file path which forces <owner> tags to separate lines is
-    supported.
+  @mock.patch('expand_owners._ExtractComponentViaDirmd')
+  def testExpandOwnersWithLongFilePath(self, mock_dirmd_extract):
+    """Checks that long OWNERS file paths are supported.
+
+    Most OWNERS file paths appear between owners tags on the same line, e.g.
+    <owner>src/chrome/browser</owner>. However, especially long paths may appear
+    on their own line between the tags.
     """
+    mock_dirmd_extract.return_value = None
     absolute_path = _MakeOwnersFile('simple_OWNERS', self.temp_dir)
     src_relative_path = _GetSrcRelativePath(absolute_path)
 
@@ -229,8 +238,10 @@ class ExpandOwnersTest(unittest.TestCase):
     expand_owners.ExpandHistogramsOWNERS(histograms)
     self.assertMultiLineEqual(histograms.toxml(), expected_histograms.toxml())
 
-  def testExpandOwnersWithDuplicateOwners(self):
+  @mock.patch('expand_owners._ExtractComponentViaDirmd')
+  def testExpandOwnersWithDuplicateOwners(self, mock_dirmd_extract):
     """Checks that owners are unique."""
+    mock_dirmd_extract.return_value = None
     absolute_path = _MakeOwnersFile('simple_OWNERS', self.temp_dir)
     src_relative_path = _GetSrcRelativePath(absolute_path)
 
@@ -266,8 +277,10 @@ class ExpandOwnersTest(unittest.TestCase):
     expand_owners.ExpandHistogramsOWNERS(histograms)
     self.assertMultiLineEqual(histograms.toxml(), expected_histograms.toxml())
 
-  def testExpandOwnersWithFileDirectiveOWNERSFilePath(self):
+  @mock.patch('expand_owners._ExtractComponentViaDirmd')
+  def testExpandOwnersWithFileDirectiveOWNERSFilePath(self, mock_dirmd_extract):
     """Checks that OWNERS files with file directives are expanded."""
+    mock_dirmd_extract.return_value = None
     simple_absolute_path = _MakeOwnersFile('simple_OWNERS', self.temp_dir)
 
     with open(simple_absolute_path, 'w') as owners_file:
@@ -314,8 +327,11 @@ class ExpandOwnersTest(unittest.TestCase):
     expand_owners.ExpandHistogramsOWNERS(histograms)
     self.assertEqual(histograms.toxml(), expected_histograms.toxml())
 
-  def testExpandOwnersForOWNERSFileWithDuplicateComponents(self):
+  @mock.patch('expand_owners._ExtractComponentViaDirmd')
+  def testExpandOwnersForOWNERSFileWithDuplicateComponents(
+      self, mock_dirmd_extract):
     """Checks that only one component tag is added if there are duplicates."""
+    mock_dirmd_extract.return_value = None
     absolute_path = _MakeOwnersFile('OWNERS', self.temp_dir)
     src_relative_path = _GetSrcRelativePath(absolute_path)
 
@@ -463,8 +479,7 @@ class ExpandOwnersTest(unittest.TestCase):
 """)
 
     with self.assertRaisesRegexp(
-        expand_owners.Error,
-        r'The file at .*src/medium/medium/roast/OWNERS does not exist\.'):
+        expand_owners.Error, r'The file at .*medium.*OWNERS does not exist\.'):
       expand_owners.ExpandHistogramsOWNERS(histograms_with_fake_file_path)
 
   def testExpandOwnersWithoutOwnersFromFile(self):
@@ -595,28 +610,21 @@ class ExpandOwnersTest(unittest.TestCase):
       expand_owners._ExtractEmailAddressesFromOWNERS(
           file_directive_absolute_path)
 
+  def testGetHigherLevelPath(self):
+    """Checks that higher directories are recursively checked for OWNERS.
 
-class GetHigherLevelOwnersFilePathTest(unittest.TestCase):
-
-  def testGetHigherLevelPathDerivedPathInSrcDirectory(self):
-    """Checks that higher directories are recursively checked for OWNERS."""
-    path = expand_owners._GetOwnersFilePath('src/banana/chocolate/OWNERS')
-    self.assertRegexpMatches(
-        expand_owners._GetHigherLevelOwnersFilePath(path), r'.*src/OWNERS')
-
-  def testGetHigherLevelPathGivenPathInSrcDirectory(self):
-    """Checks that '' is returned when the last directory is reached.
-
-    If the directory above the tools directory is src, then receiving
-    'src/OWNERS' is the point at which recursion stops. However, this directory
-    may not always be src.
+    Also, checks that there isn't a recursive loop.
     """
-    path_to_chromium_directory = [
-        os.path.dirname(__file__), '..', '..', '..', '..'
-    ]
-    path = os.path.abspath(
-        os.path.join(*(path_to_chromium_directory + ['src/OWNERS'])))
-    self.assertEqual(expand_owners._GetHigherLevelOwnersFilePath(path), '')
+    path = expand_owners._GetOwnersFilePath('src/banana/chocolate/OWNERS')
+    result = expand_owners._GetHigherLevelOwnersFilePath(path)
+
+    # The condition is true when the tools directory's parent directory is src,
+    # which is generally the case locally. However, the parent directory is not
+    # always src, e.g. on various testing bots.
+    if os.path.basename(_GetToolsParentDir()) == 'src':
+      self.assertRegexpMatches(result, r'.*OWNERS')
+    else:
+      self.assertEqual(result, '')
 
 
 if __name__ == '__main__':
diff --git a/chromium/tools/metrics/histograms/extract_histograms.py b/chromium/tools/metrics/histograms/extract_histograms.py
index 6245b16e3d6..1dfc0a06ec3 100644
--- a/chromium/tools/metrics/histograms/extract_histograms.py
+++ b/chromium/tools/metrics/histograms/extract_histograms.py
@@ -299,6 +299,12 @@ def ExtractEnumsFromXmlTree(tree):
 
     nodes = list(IterElementsWithTag(enum, 'int'))
 
+    obsolete_nodes = list(IterElementsWithTag(enum, 'obsolete', 1))
+    if not nodes and not obsolete_nodes:
+      logging.error('Non-obsolete enum %s should have at least one <int>', name)
+      have_errors = True
+      continue
+
     for int_tag in nodes:
       value_dict = {}
       int_value = int(int_tag.getAttribute('value'))
diff --git a/chromium/tools/metrics/histograms/extract_histograms_test.py b/chromium/tools/metrics/histograms/extract_histograms_test.py
index cf98e9bb2a5..0008ebabdcc 100644
--- a/chromium/tools/metrics/histograms/extract_histograms_test.py
+++ b/chromium/tools/metrics/histograms/extract_histograms_test.py
@@ -569,6 +569,19 @@ class ExtractHistogramsTest(unittest.TestCase):
         histogram_with_enum_and_unit, {})
     self.assertTrue(have_errors)
 
+  def testEmptyEnum(self):
+    empty_enum = xml.dom.minidom.parseString("""
+<histogram-configuration>
+<enums>
+  <enum name="MyEnumType">
+    <summary>This is an empty enum</summary>
+  </enum>
+</enums>
+</histogram-configuration>
+""")
+    _, have_errors = extract_histograms.ExtractEnumsFromXmlTree(empty_enum)
+    self.assertTrue(have_errors)
+
   def testNewHistogramWithEnum(self):
     histogram_with_enum = xml.dom.minidom.parseString("""
 <histogram-configuration>
@@ -893,6 +906,37 @@ class ExtractHistogramsTest(unittest.TestCase):
         histogram_without_corresponding_variants, {})
     self.assertTrue(have_errors)
 
+  def testSuffixCanExtendPatternedHistograms(self):
+    patterned_suffix = ("""
+        <histogram-configuration>
+        <histograms>
+          <histogram name="Test{Version}" units="things"
+            expires_after="2017-10-16">
+            <owner>chrome-metrics-team@google.com</owner>
+            <summary>
+              Sample description.
+            </summary>
+            <token key="Version">
+              <variant name=".First"/>
+              <variant name=".Last"/>
+            </token>
+          </histogram>
+        </histograms>
+        <histogram_suffixes_list>
+          <histogram_suffixes name="ExtendPatternedHist" separator=".">
+            <suffix name="Found" label="Extending patterned histograms."/>
+            <affected-histogram name="Test.First"/>
+            <affected-histogram name="Test.Last"/>
+          </histogram_suffixes>
+        </histogram_suffixes_list>
+        </histogram-configuration>""")
+    # Only when the histogram is first extended by the token, can the
+    # histogram_suffixes find those affected histograms.
+    histograms_dict, had_errors = extract_histograms.ExtractHistogramsFromDom(
+        xml.dom.minidom.parseString(patterned_suffix))
+    self.assertFalse(had_errors)
+    self.assertIn('Test.First.Found', histograms_dict)
+    self.assertIn('Test.Last.Found', histograms_dict)
 
 if __name__ == "__main__":
   logging.basicConfig(level=logging.ERROR + 1)
diff --git a/chromium/tools/metrics/histograms/histograms_index.txt b/chromium/tools/metrics/histograms/histograms_index.txt
index d2974d7b1a0..c87d54c96cd 100644
--- a/chromium/tools/metrics/histograms/histograms_index.txt
+++ b/chromium/tools/metrics/histograms/histograms_index.txt
@@ -30,7 +30,6 @@ tools/metrics/histograms/histograms_xml/dev/histograms.xml
 tools/metrics/histograms/histograms_xml/diagnostics/histograms.xml
 tools/metrics/histograms/histograms_xml/direct/histograms.xml
 tools/metrics/histograms/histograms_xml/disk/histograms.xml
-tools/metrics/histograms/histograms_xml/dom/histograms.xml
 tools/metrics/histograms/histograms_xml/download/histograms.xml
 tools/metrics/histograms/histograms_xml/enterprise/histograms.xml
 tools/metrics/histograms/histograms_xml/event/histograms.xml
@@ -43,6 +42,7 @@ tools/metrics/histograms/histograms_xml/geolocation/histograms.xml
 tools/metrics/histograms/histograms_xml/google/histograms.xml
 tools/metrics/histograms/histograms_xml/gpu/histograms.xml
 tools/metrics/histograms/histograms_xml/hang_watcher/histograms.xml
+tools/metrics/histograms/histograms_xml/help_app/histograms.xml
 tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml
 tools/metrics/histograms/histograms_xml/history/histograms.xml
 tools/metrics/histograms/histograms_xml/holding_space/histograms.xml
@@ -51,6 +51,7 @@ tools/metrics/histograms/histograms_xml/input/histograms.xml
 tools/metrics/histograms/histograms_xml/installer/histograms.xml
 tools/metrics/histograms/histograms_xml/instant/histograms.xml
 tools/metrics/histograms/histograms_xml/interstitial/histograms.xml
+tools/metrics/histograms/histograms_xml/invalidation/histograms.xml
 tools/metrics/histograms/histograms_xml/ios/histograms.xml
 tools/metrics/histograms/histograms_xml/local/histograms.xml
 tools/metrics/histograms/histograms_xml/login/histograms.xml
@@ -60,6 +61,7 @@ tools/metrics/histograms/histograms_xml/mobile/histograms.xml
 tools/metrics/histograms/histograms_xml/multi_device/histograms.xml
 tools/metrics/histograms/histograms_xml/na_cl/histograms.xml
 tools/metrics/histograms/histograms_xml/navigation/histograms.xml
+tools/metrics/histograms/histograms_xml/nearby/histograms.xml
 tools/metrics/histograms/histograms_xml/net/histograms.xml
 tools/metrics/histograms/histograms_xml/network/histograms.xml
 tools/metrics/histograms/histograms_xml/new_tab_page/histograms.xml
@@ -77,6 +79,7 @@ tools/metrics/histograms/histograms_xml/phonehub/histograms.xml
 tools/metrics/histograms/histograms_xml/platform/histograms.xml
 tools/metrics/histograms/histograms_xml/plugin/histograms.xml
 tools/metrics/histograms/histograms_xml/power/histograms.xml
+tools/metrics/histograms/histograms_xml/prefetch/histograms.xml
 tools/metrics/histograms/histograms_xml/print/histograms.xml
 tools/metrics/histograms/histograms_xml/printing/histograms.xml
 tools/metrics/histograms/histograms_xml/profile/histograms.xml
@@ -86,6 +89,7 @@ tools/metrics/histograms/histograms_xml/renderer/histograms.xml
 tools/metrics/histograms/histograms_xml/renderer4/histograms.xml
 tools/metrics/histograms/histograms_xml/safe_browsing/histograms.xml
 tools/metrics/histograms/histograms_xml/sb_client/histograms.xml
+tools/metrics/histograms/histograms_xml/scanning/histograms.xml
 tools/metrics/histograms/histograms_xml/scheduler/histograms.xml
 tools/metrics/histograms/histograms_xml/search/histograms.xml
 tools/metrics/histograms/histograms_xml/security/histograms.xml
@@ -114,5 +118,6 @@ tools/metrics/histograms/histograms_xml/web_apk/histograms.xml
 tools/metrics/histograms/histograms_xml/web_audio/histograms.xml
 tools/metrics/histograms/histograms_xml/web_core/histograms.xml
 tools/metrics/histograms/histograms_xml/web_rtc/histograms.xml
+tools/metrics/histograms/histograms_xml/webauthn/histograms.xml
 tools/metrics/histograms/histograms_xml/weblayer/histograms.xml
 tools/metrics/histograms/histograms_xml/windows/histograms.xml
diff --git a/chromium/tools/metrics/histograms/histograms_xml/accessibility/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/accessibility/histograms.xml
index 9fbd0cbecdb..a741e4662db 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/accessibility/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/accessibility/histograms.xml
@@ -67,7 +67,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.Android.UserFontSizePref.Change" units="%"
-    expires_after="M90">
+    expires_after="2021-08-30">
   <owner>twellington@chromium.org</owner>
   <owner>skym@chromium.org</owner>
   <summary>
@@ -78,7 +78,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.Android.UserFontSizePref.OnStartup" units="%"
-    expires_after="M90">
+    expires_after="2021-08-30">
   <owner>twellington@chromium.org</owner>
   <owner>skym@chromium.org</owner>
   <summary>
@@ -89,7 +89,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.AndroidServiceInfo"
-    enum="AccessibilityAndroidServiceInfoEnum" expires_after="M89">
+    enum="AccessibilityAndroidServiceInfoEnum" expires_after="M93">
   <owner>dmazzoni@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
   <summary>
@@ -116,7 +116,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CaptionSettingsLoadedFromPrefs"
-    enum="BooleanEnabled" expires_after="2020-12-01">
+    enum="BooleanEnabled" expires_after="2021-12-01">
   <owner>evliu@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -126,7 +126,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CaptionSettingsLoadedFromSystemSettings"
-    enum="BooleanEnabled" expires_after="2020-12-01">
+    enum="BooleanEnabled" expires_after="2021-12-01">
   <owner>evliu@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -136,7 +136,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.ChromeVox.PerformGestureType"
-    enum="ChromeVoxGestureType" expires_after="M90">
+    enum="ChromeVoxGestureType" expires_after="M93">
   <owner>dtseng@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
   <summary>
@@ -147,7 +147,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosAlwaysShowA11yMenu" enum="BooleanEnabled"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>dmazzoni@chromium.org</owner>
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -170,7 +170,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosAutoclick.TrayMenu.ChangeAction"
-    enum="AutoclickActionType" expires_after="2020-10-04">
+    enum="AutoclickActionType" expires_after="2021-08-19">
   <owner>katie@chromium.org</owner>
   <owner>dtseng@chromium.org</owner>
   <owner>dmazzoni@chromium.org</owner>
@@ -182,7 +182,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosCaretHighlight" enum="BooleanEnabled"
-    expires_after="M90">
+    expires_after="M93">
   <owner>dmazzoni@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
   <summary>
@@ -192,7 +192,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosChromeVoxNext" enum="BooleanEnabled"
-    expires_after="M90">
+    expires_after="M93">
   <owner>dmazzoni@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
   <summary>
@@ -204,7 +204,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosCursorColor" enum="BooleanEnabled"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>dmazzoni@chromium.org</owner>
   <owner>katie@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -215,7 +215,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosCursorHighlight" enum="BooleanEnabled"
-    expires_after="2021-04-04">
+    expires_after="2021-07-11">
   <owner>dmazzoni@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
   <summary>
@@ -225,7 +225,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosDictation" enum="BooleanEnabled"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>anastasi@google.com</owner>
   <owner>dtseng@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -236,7 +236,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosDictation.ToggleDictationMethod"
-    enum="CrosDictationToggleDictationMethod" expires_after="M90">
+    enum="CrosDictationToggleDictationMethod" expires_after="M93">
   <owner>anastasi@google.com</owner>
   <owner>dtseng@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -244,7 +244,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosDockedMagnifier" enum="BooleanEnabled"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>dmazzoni@chromium.org</owner>
   <owner>katie@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -255,7 +255,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosFocusHighlight" enum="BooleanEnabled"
-    expires_after="M90">
+    expires_after="M93">
   <owner>dmazzoni@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
   <summary>
@@ -265,7 +265,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosHighContrast" enum="BooleanEnabled"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>dmazzoni@chromium.org</owner>
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -276,7 +276,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosLargeCursor" enum="BooleanEnabled"
-    expires_after="M90">
+    expires_after="M93">
   <owner>dmazzoni@chromium.org</owner>
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -287,7 +287,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosLargeCursorSize" units="dip"
-    expires_after="M90">
+    expires_after="M93">
   <owner>yawano@chromium.org</owner>
   <owner>lpalmaro@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -298,7 +298,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosScreenMagnifier" enum="BooleanEnabled"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>dmazzoni@chromium.org</owner>
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -309,7 +309,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosSelectToSpeak" enum="BooleanEnabled"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>dmazzoni@chromium.org</owner>
   <owner>katie@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -320,7 +320,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosSelectToSpeak.BackgroundShading"
-    enum="BooleanEnabled" expires_after="2021-05-28">
+    enum="BooleanEnabled" expires_after="2021-07-27">
   <owner>katie@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
   <summary>
@@ -328,8 +328,66 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Accessibility.CrosSelectToSpeak.BubbleDismissMethod"
+    enum="CrosSelectToSpeakActivationMethod" expires_after="2021-11-30">
+  <owner>ajitnarayanan@google.com</owner>
+  <owner>chrome-a11y-core@google.com</owner>
+  <summary>
+    When Select-to-speak is active, the user can dismiss the bubble menu in
+    multiple ways: by clicking the cancel button on the Select-to-speak menu or
+    using keyboard shortcuts. Track the methods here.
+  </summary>
+</histogram>
+
+<histogram name="Accessibility.CrosSelectToSpeak.NavigationControls"
+    enum="BooleanEnabled" expires_after="2021-11-30">
+  <owner>ajitnarayanan@google.com</owner>
+  <owner>chrome-a11y-core@google.com</owner>
+  <summary>
+    Whether Select-to-Speak's navigation controls were on when activated.
+  </summary>
+</histogram>
+
+<histogram name="Accessibility.CrosSelectToSpeak.OverrideSpeechRateMultiplier"
+    enum="CrosSelectToSpeakOverrideSpeechRateMultiplier"
+    expires_after="2021-11-30">
+  <owner>ajitnarayanan@google.com</owner>
+  <owner>chrome-a11y-core@google.com</owner>
+  <summary>
+    The multiplier with which the user overrode the speech rate setting in
+    Select-to-Speak. By default, the global Text-to-Speech setting is used,
+    which the user can temporarily override. The override multiplier is stored
+    as a sparse histogram with values (100 * multiple). For example, a speech
+    rate multiplier of 1.0 (default) will be seen as 100. Emitted once every
+    time playback starts, including on resume after pause or change of
+    selection.
+  </summary>
+</histogram>
+
+<histogram name="Accessibility.CrosSelectToSpeak.ParagraphNavigationMethod"
+    enum="CrosSelectToSpeakActivationMethod" expires_after="2021-11-30">
+  <owner>ajitnarayanan@google.com</owner>
+  <owner>chrome-a11y-core@google.com</owner>
+  <summary>
+    When Select-to-speak is active, the user can navigate between paragraphs in
+    multiple ways: by clicking the navigation buttons on the Select-to-speak
+    menu or using keyboard shortcuts. Track the methods here.
+  </summary>
+</histogram>
+
+<histogram name="Accessibility.CrosSelectToSpeak.SentenceNavigationMethod"
+    enum="CrosSelectToSpeakActivationMethod" expires_after="2021-11-30">
+  <owner>ajitnarayanan@google.com</owner>
+  <owner>chrome-a11y-core@google.com</owner>
+  <summary>
+    When Select-to-speak is active, the user can navigate between sentences in
+    multiple ways: by clicking the navigation buttons on the Select-to-speak
+    menu or using keyboard shortcuts. Track the methods here.
+  </summary>
+</histogram>
+
 <histogram name="Accessibility.CrosSelectToSpeak.StartSpeechMethod"
-    enum="CrosSelectToSpeakStartSpeechMethod" expires_after="M90">
+    enum="CrosSelectToSpeakStartSpeechMethod" expires_after="2021-08-22">
   <owner>katie@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
   <summary>
@@ -340,7 +398,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosSelectToSpeak.StateChangeEvent"
-    enum="CrosSelectToSpeakStateChangeEvent" expires_after="M90">
+    enum="CrosSelectToSpeakStateChangeEvent" expires_after="2021-08-22">
   <owner>katie@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
   <summary>
@@ -354,7 +412,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Accessibility.CrosShelfNavigationButtonsInTabletModeChanged.OOBE"
-    enum="BooleanEnabled" expires_after="M91">
+    enum="BooleanEnabled" expires_after="2021-07-27">
   <owner>gzadina@google.com</owner>
   <owner>tbarzic@chromium.org</owner>
   <summary>
@@ -368,7 +426,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Accessibility.CrosShelfNavigationButtonsInTabletModeChanged.OsSettings"
-    enum="BooleanEnabled" expires_after="M91">
+    enum="BooleanEnabled" expires_after="2021-08-22">
   <owner>gzadina@google.com</owner>
   <owner>tbarzic@chromium.org</owner>
   <summary>
@@ -381,7 +439,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosSpokenFeedback" enum="BooleanEnabled"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>dmazzoni@chromium.org</owner>
   <owner>kenjibaheux@google.com</owner>
   <owner>aleventhal@google.com</owner>
@@ -394,7 +452,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosStickyKeys" enum="BooleanEnabled"
-    expires_after="M90">
+    expires_after="M93">
   <owner>dmazzoni@chromium.org</owner>
   <owner>kenjibaheux@google.com</owner>
   <owner>tengs@chromium.org</owner>
@@ -406,7 +464,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosSwitchAccess" enum="BooleanEnabled"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>dmazzoni@chromium.org</owner>
   <owner>anastasi@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -417,7 +475,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.CrosVirtualKeyboard" enum="BooleanEnabled"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>dmazzoni@chromium.org</owner>
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -439,7 +497,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.ImageLabels" enum="BooleanEnabled"
-    expires_after="M89">
+    expires_after="M93">
   <owner>katie@chromium.org</owner>
   <owner>dmazzoni@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -449,8 +507,41 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Accessibility.ImageLabels.Android" enum="BooleanEnabled"
+    expires_after="M95">
+  <owner>dmazzoni@chromium.org</owner>
+  <owner>mschillaci@google.com</owner>
+  <owner>chrome-a11y-core@google.com</owner>
+  <summary>
+    Whether the Chrome accessibility image label setting is on for Android
+    (logged once 45 secs after startup).
+  </summary>
+</histogram>
+
+<histogram name="Accessibility.ImageLabels.Android.DialogOption"
+    enum="AccessibilityImageLabelModeAndroid" expires_after="M95">
+  <owner>dmazzoni@chromium.org</owner>
+  <owner>mschillaci@google.com</owner>
+  <owner>chrome-a11y-core@google.com</owner>
+  <summary>
+    When a user opens the accessibility image label dialog on Android, records
+    what option they select on user interaction.
+  </summary>
+</histogram>
+
+<histogram name="Accessibility.ImageLabels.Android.OnlyOnWifi"
+    enum="BooleanEnabled" expires_after="M95">
+  <owner>dmazzoni@chromium.org</owner>
+  <owner>mschillaci@google.com</owner>
+  <owner>chrome-a11y-core@google.com</owner>
+  <summary>
+    Whether the Chrome accessibility image label setting for Android is set to
+    only be enabled on a Wi-Fi connection (logged once 45 secs after startup).
+  </summary>
+</histogram>
+
 <histogram name="Accessibility.ImageLabels.ModalDialogAccepted"
-    enum="BooleanAccepted" expires_after="2021-03-28">
+    enum="BooleanAccepted" expires_after="2021-08-09">
   <owner>katie@chromium.org</owner>
   <owner>dmazzoni@chromium.org</owner>
   <summary>
@@ -462,7 +553,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.ImageLabels.PageLanguage" enum="LanguageCode"
-    expires_after="2021-01-24">
+    expires_after="2021-07-18">
   <owner>katie@chromium.org</owner>
   <owner>dmazzoni@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -473,7 +564,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.ImageLabels.RequestLanguage" enum="LanguageCode"
-    expires_after="2021-03-28">
+    expires_after="2021-08-09">
   <owner>katie@chromium.org</owner>
   <owner>dmazzoni@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -485,7 +576,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.iOS.NewLargerTextCategory" enum="BooleanHit"
-    expires_after="2021-05-02">
+    expires_after="2021-08-09">
   <owner>gambard@chromium.org</owner>
   <owner>rkgibson@google.com</owner>
   <summary>
@@ -500,7 +591,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.LanguageDetection.CountDetectionAttempted"
-    units="count" expires_after="2021-03-21">
+    units="count" expires_after="2021-08-09">
   <owner>chrishall@chromium.org</owner>
   <owner>aboxhall@chromium.org</owner>
   <owner>dmazzoni@chromium.org</owner>
@@ -510,7 +601,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.LanguageDetection.CountLabelled" units="count"
-    expires_after="2021-03-21">
+    expires_after="2021-08-09">
   <owner>chrishall@chromium.org</owner>
   <owner>aboxhall@chromium.org</owner>
   <owner>dmazzoni@chromium.org</owner>
@@ -521,7 +612,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.LanguageDetection.LangsPerPage" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>chrishall@chromium.org</owner>
   <owner>aboxhall@chromium.org</owner>
   <owner>dmazzoni@chromium.org</owner>
@@ -533,7 +624,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.LanguageDetection.PercentageLabelledWithTop"
-    units="%" expires_after="2021-03-21">
+    units="%" expires_after="2021-08-09">
   <owner>chrishall@chromium.org</owner>
   <owner>aboxhall@chromium.org</owner>
   <owner>dmazzoni@chromium.org</owner>
@@ -545,7 +636,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.LanguageDetection.PercentageLanguageDetected"
-    units="%" expires_after="2020-12-01">
+    units="%" expires_after="2021-05-23">
   <owner>chrishall@chromium.org</owner>
   <owner>aboxhall@chromium.org</owner>
   <owner>dmazzoni@chromium.org</owner>
@@ -556,7 +647,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.LanguageDetection.PercentageOverridden"
-    units="%" expires_after="2021-03-21">
+    units="%" expires_after="2021-08-09">
   <owner>chrishall@chromium.org</owner>
   <owner>aboxhall@chromium.org</owner>
   <owner>dmazzoni@chromium.org</owner>
@@ -568,7 +659,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.LiveCaption" enum="BooleanEnabled"
-    expires_after="2021-04-30">
+    expires_after="2021-07-04">
   <owner>katie@chromium.org</owner>
   <owner>abigailbklein@google.com</owner>
   <owner>evliu@google.com</owner>
@@ -580,7 +671,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.LiveCaption.AudioPropertyChanged"
-    enum="BooleanEnabled" expires_after="2021-04-30">
+    enum="BooleanEnabled" expires_after="2021-09-05">
   <owner>katie@chromium.org</owner>
   <owner>abigailbklein@google.com</owner>
   <owner>evliu@google.com</owner>
@@ -592,46 +683,82 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Accessibility.LiveCaption.FeatureEnabled"
-    enum="BooleanEnabled" expires_after="2021-04-30">
+<histogram name="Accessibility.LiveCaption.Duration.CaptionBubble{Visibility}"
+    units="ms" expires_after="2021-09-05">
+  <owner>abigailbklein@google.com</owner>
+  <owner>evliu@google.com</owner>
+  <owner>chrome-a11y-core@google.com</owner>
+  <summary>
+    Measures how long SODA was running while the Live Caption UI was
+    {Visibility}. Logged once on the destruction of the
+    SpeechRecognitionRecognizerImpl.
+  </summary>
+  <token key="Visibility">
+    <variant name="Hidden"
+        summary="hidden. This might be because it was closed by user or
+                 because there was an error passing transcriptions to the UI"/>
+    <variant name="Visible" summary="visible and showing transcriptions"/>
+  </token>
+</histogram>
+
+<histogram name="Accessibility.LiveCaption.EnableFrom{Entrypoint}"
+    enum="BooleanEnabled" expires_after="2021-09-05">
   <owner>katie@chromium.org</owner>
   <owner>abigailbklein@google.com</owner>
   <owner>evliu@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
   <summary>
-    Whether the Live Caption feature flag is enabled. This is logged once at the
-    time of component registration.
+    Records when a user enables or disables the Live Caption feature from
+    {Entrypoint}.
   </summary>
+  <token key="Entrypoint">
+    <variant name="GlobalMediaControls"
+        summary="global media controls (Zenith)"/>
+    <variant name="Settings" summary="chrome://settings"/>
+  </token>
 </histogram>
 
-<histogram name="Accessibility.LiveCaption.Session"
-    enum="LiveCaptionSessionEvent" expires_after="2021-04-30">
+<histogram name="Accessibility.LiveCaption.ExpandBubble"
+    enum="LiveCaptionExpandBubbleEvent" expires_after="2021-09-05">
   <owner>katie@chromium.org</owner>
   <owner>abigailbklein@google.com</owner>
   <owner>evliu@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
   <summary>
-    Logged when there's a change in the lifetime of a Live Caption audio stream:
-    When a session started and captions began arriving from the service, when a
-    session ended because the audio stream finished, or when the session ended
-    because a user clicked the close button on the caption bubble.
+    Records when a user expands or collapses the Live Caption bubble.
   </summary>
 </histogram>
 
-<histogram name="Accessibility.LiveCaption.ToggleEnabled" enum="BooleanEnabled"
-    expires_after="2021-04-30">
+<histogram name="Accessibility.LiveCaption.FeatureEnabled"
+    enum="BooleanEnabled" expires_after="2021-07-04">
   <owner>katie@chromium.org</owner>
   <owner>abigailbklein@google.com</owner>
   <owner>evliu@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
   <summary>
-    Records when a user enables or disables the Live Caption feature from
-    chrome://settings.
+    Whether the Live Caption feature flag is enabled. This is logged once at the
+    time of component registration.
+  </summary>
+</histogram>
+
+<histogram name="Accessibility.LiveCaption.Session"
+    enum="LiveCaptionSessionEvent" expires_after="2021-09-05">
+  <owner>katie@chromium.org</owner>
+  <owner>abigailbklein@google.com</owner>
+  <owner>evliu@google.com</owner>
+  <owner>chrome-a11y-core@google.com</owner>
+  <summary>
+    Logged when the Live Caption bubble appears and disappears. Stream start
+    indicates when the bubble appears due to an audio session starting. Stream
+    end indicates when the bubble disappears due to a tab change, a navigation,
+    or the audio session ending and the bubble fading out due to inactivity.
+    Close button clicked indicates when the bubble disappears due to a user
+    clicking the close button on the caption bubble.
   </summary>
 </histogram>
 
 <histogram name="Accessibility.LiveCaption.UseSodaForLiveCaption"
-    enum="BooleanEnabled" expires_after="2021-04-30">
+    enum="BooleanEnabled" expires_after="2021-09-05">
   <owner>abigailbklein@google.com</owner>
   <owner>evliu@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -643,7 +770,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.LiveCaption.WebsiteBlocked"
-    enum="BooleanEnabled" expires_after="2021-04-30">
+    enum="BooleanEnabled" expires_after="2021-07-04">
   <owner>katie@chromium.org</owner>
   <owner>abigailbklein@google.com</owner>
   <owner>evliu@google.com</owner>
@@ -669,7 +796,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.Mac.ReduceTransparency" enum="BooleanEnabled"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>ellyjones@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
   <summary>
@@ -693,7 +820,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.ManuallyEnabled" enum="BooleanEnabled"
-    expires_after="M89">
+    expires_after="M93">
   <owner>dmazzoni@chromium.org</owner>
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -705,7 +832,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.ModeFlag" enum="AccessibilityModeFlagEnum"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>dmazzoni@chromium.org</owner>
   <owner>aboxhall@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -734,7 +861,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.Performance.WinAPIs.{API}" units="microseconds"
-    expires_after="M89">
+    expires_after="M93">
   <owner>dmazzoni@chromium.org</owner>
   <owner>janewman@microsoft.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -785,8 +912,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </token>
 </histogram>
 
+<histogram name="Accessibility.Reliability.Tree.UnserializeError"
+    enum="AccessibilityTreeUnserializeError" expires_after="M93">
+  <owner>dmazzoni@chromium.org</owner>
+  <owner>janewman@microsoft.com</owner>
+  <owner>chrome-a11y-core@google.com</owner>
+  <summary>
+    Tracks the type of failure that occured when unserializing the accessibility
+    tree. When an error in unserialization occurs, this is emitted and
+    unserialization aborts. In the case of a tree with multiple issues, only the
+    first error is recorded. Refer to AXTree::Unserialize for details.
+  </summary>
+</histogram>
+
 <histogram name="Accessibility.Shortcuts.CrosDockedMagnifier"
-    enum="BooleanEnabled" expires_after="2021-03-18">
+    enum="BooleanEnabled" expires_after="2021-08-09">
   <owner>amraboelkher@chromium.org</owner>
   <owner>poromov@chromium.org</owner>
   <summary>
@@ -796,7 +936,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.Shortcuts.CrosHighContrast"
-    enum="BooleanEnabled" expires_after="2021-03-18">
+    enum="BooleanEnabled" expires_after="2021-08-09">
   <owner>amraboelkher@chromium.org</owner>
   <owner>poromov@chromium.org</owner>
   <summary>
@@ -806,7 +946,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.Shortcuts.CrosScreenMagnifier"
-    enum="BooleanEnabled" expires_after="2021-03-18">
+    enum="BooleanEnabled" expires_after="2021-08-09">
   <owner>amraboelkher@chromium.org</owner>
   <owner>poromov@chromium.org</owner>
   <summary>
@@ -816,7 +956,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.Shortcuts.CrosSpokenFeedback"
-    enum="BooleanEnabled" expires_after="2021-03-18">
+    enum="BooleanEnabled" expires_after="2021-08-09">
   <owner>amraboelkher@chromium.org</owner>
   <owner>poromov@chromium.org</owner>
   <summary>
@@ -826,7 +966,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.VTTContainsStyleBlock" enum="BooleanEnabled"
-    expires_after="2020-12-01">
+    expires_after="2021-12-01">
   <owner>evliu@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -849,7 +989,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.WinAPIs" enum="AccessibilityWinAPIEnum"
-    expires_after="M89">
+    expires_after="M93">
   <owner>dmazzoni@chromium.org</owner>
   <owner>nektar@chromium.org</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -857,7 +997,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.WinAPIs.GetPropertyValue"
-    enum="AccessibilityWinAPIGetPropertyValueEnum" expires_after="M89">
+    enum="AccessibilityWinAPIGetPropertyValueEnum" expires_after="M93">
   <owner>dmazzoni@chromium.org</owner>
   <owner>nektar@chromium.org</owner>
   <owner>kbabbitt@microsoft.com</owner>
@@ -868,7 +1008,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.WinAudioDescription" enum="BooleanEnabled"
-    expires_after="M89">
+    expires_after="M93">
   <owner>dmazzoni@chromium.org</owner>
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-a11y-core@google.com</owner>
@@ -879,7 +1019,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Accessibility.WinHighContrastTheme"
-    enum="AccessibilityHighContrastColorScheme" expires_after="M89">
+    enum="AccessibilityHighContrastColorScheme" expires_after="M93">
   <owner>dmazzoni@chromium.org</owner>
   <owner>almaher@microsoft.com</owner>
   <owner>weblayoutdev@microsoft.com</owner>
@@ -990,6 +1130,333 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="DomDistiller.DistillabilityRejection" enum="DistillRejection"
+    expires_after="M85">
+  <owner>wychen@chromium.org</owner>
+  <summary>
+    The reason to reject distillability at PageDistillableAfterParsing time.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.DistillabilityScoreNMF.Negative" units="score"
+    expires_after="M77">
+  <owner>wychen@chromium.org</owner>
+  <summary>
+    Score of distillability from AdaBoost model, non-mobile-friendly only. The
+    score shown here is multiplied by 100.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.DistillabilityScoreNMF.Positive" units="score"
+    expires_after="M77">
+  <owner>wychen@chromium.org</owner>
+  <summary>
+    Score of distillability from AdaBoost model, non-mobile-friendly only. The
+    score shown here is multiplied by 100.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.InfoBarUsage" enum="BooleanUsage"
+    expires_after="M77">
+  <owner>mdjones@chromium.org</owner>
+  <summary>
+    &quot;Used&quot; is recorded when the user clicks the infobar to enter
+    Reader Mode. &quot;Not Used&quot; is recorded when the user clicks the close
+    button. If there's no user action, nothing is recorded.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.LongArticleScoreNMF.Negative" units="score"
+    expires_after="M85">
+  <owner>wychen@chromium.org</owner>
+  <summary>
+    Score of long article from AdaBoost model, distillable and
+    non-mobile-friendly only. The score shown here is multiplied by 100.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.LongArticleScoreNMF.Positive" units="score"
+    expires_after="M85">
+  <owner>wychen@chromium.org</owner>
+  <summary>
+    Score of long article from AdaBoost model, distillable and
+    non-mobile-friendly only. The score shown here is multiplied by 100.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.PageDistillableAfterLoading"
+    enum="DistillableType2" expires_after="M85">
+  <owner>wychen@chromium.org</owner>
+  <summary>
+    Records the &quot;Distillable Type&quot; (mobile-friendly not distillable,
+    mobile-friendly distillable, non-mobile-friendly not distillable,
+    non-mobile-friendly distillable) for each analyzed page after loading.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.PageDistillableAfterParsing"
+    enum="DistillableType2" expires_after="M85">
+  <owner>wychen@chromium.org</owner>
+  <summary>
+    Records the &quot;Distillable Type&quot; (mobile-friendly not distillable,
+    mobile-friendly distillable, non-mobile-friendly not distillable,
+    non-mobile-friendly distillable) for each analyzed page after parsing.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.PageHasDistilledData"
+    enum="BooleanHasDistilledData" expires_after="M85">
+  <owner>kuan@chromium.org</owner>
+  <summary>Records whether a page has distilled data.</summary>
+</histogram>
+
+<histogram name="DomDistiller.ReaderMode.EntryPoint"
+    enum="ReaderModeEntryPoint" expires_after="2021-08-09">
+  <owner>katie@chromium.org</owner>
+  <owner>gilmanmh@google.com</owner>
+  <owner>chrome-a11y-core@google.com</owner>
+  <summary>The method a user used to enter reader mode on an article.</summary>
+</histogram>
+
+<histogram name="DomDistiller.ReaderMode.ExitPoint" enum="ReaderModeEntryPoint"
+    expires_after="2021-08-09">
+  <owner>katie@chromium.org</owner>
+  <owner>gilmanmh@google.com</owner>
+  <owner>chrome-a11y-core@google.com</owner>
+  <summary>
+    The method a user used to exit reader mode and return to the original
+    article.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.ReaderShownForPageLoad" enum="Boolean"
+    expires_after="M77">
+  <owner>mdjones@chromium.org</owner>
+  <summary>
+    Records if the panel became visible at any point after a page was navigated.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.Statistics.FirstPageWordCount" units="words"
+    expires_after="M85">
+  <owner>mdjones@chromium.org</owner>
+  <summary>
+    Records the number of words in a distilled page. This only records the first
+    page of a multi-page article.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.Statistics.WordCount" units="words"
+    expires_after="M85">
+  <owner>nyquist@chromium.org</owner>
+  <summary>
+    Records the number of words in a distilled page. For articles with multiple
+    pages, each page is counted separately.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.Time.ActivelyViewingArticleBeforeDistilling"
+    units="ms" expires_after="2021-08-19">
+  <owner>katie@chromium.org</owner>
+  <owner>chrome-a11y-core@chromium.org</owner>
+  <summary>
+    Records the amount of active time a user spent on a distillable page before
+    switching that page to Reader Mode. Active time is time that the article was
+    visible, not total time the page was open: the timer is paused when the page
+    is not visible. This is not recorded when the user opens a distillable page
+    but does not switch to Reader Mode from that page (via the omnibox icon or
+    menu option).
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.Time.ActivelyViewingReaderModePage" units="ms"
+    expires_after="2021-08-19">
+  <owner>katie@chromium.org</owner>
+  <owner>chrome-a11y-core@chromium.org</owner>
+  <summary>
+    Records the amount of active time a user spent on a Reader Mode page. Active
+    time is the time the Reader Mode page was visible, not the total time the
+    page was open: the timer is paused when the page is not visible. This is
+    recorded regardless of how a user enters the page: e.g. using the
+    forward/back buttons, entering the URL directly, or coming from a
+    distillable page all start the timer equally.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.Time.ArticleProcessing" units="ms"
+    expires_after="M77">
+  <owner>yfriedman@chromium.org</owner>
+  <summary>
+    Time spent in DomDistiller's identification of text content.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.Time.DistillationTotal" units="ms"
+    expires_after="M85">
+  <owner>yfriedman@chromium.org</owner>
+  <summary>Complete time spent in DomDistiller's processing of a page.</summary>
+</histogram>
+
+<histogram name="DomDistiller.Time.DistillPage" units="ms" expires_after="M77">
+  <owner>wychen@chromium.org</owner>
+  <summary>
+    Time spent in DistillPageImpl(), mostly ExecuteJavaScript(), including
+    compilation and execution.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.Time.DocumentConstruction" units="ms"
+    expires_after="M77">
+  <owner>yfriedman@chromium.org</owner>
+  <summary>
+    Time spent in creating DomDistiller's internal representation of the HTML
+    document.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.Time.Formatting" units="ms" expires_after="M77">
+  <owner>yfriedman@chromium.org</owner>
+  <summary>
+    Time spent in DomDistiller's final processing of article content/formatting.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.Time.MarkupParsing" units="ms"
+    expires_after="M77">
+  <owner>yfriedman@chromium.org</owner>
+  <summary>
+    Time spent in DomDistiller's processing of article metadata.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.Time.RunJavaScript" units="ms"
+    expires_after="M77">
+  <owner>wychen@chromium.org</owner>
+  <summary>
+    Time spent in ExecuteJavaScript() in DomDistiller. It includes JavaScript
+    code transmission through IPC, parsing, compilation, execution, and
+    returning the JSON back through IPC.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.Time.ViewerLoading" units="ms"
+    expires_after="M77">
+  <owner>wychen@chromium.org</owner>
+  <summary>
+    Records the time from the Reader Mode panel opening to the viewer loaded.
+  </summary>
+</histogram>
+
+<histogram name="DomDistiller.Time.ViewingReaderModePage" units="ms"
+    expires_after="M77">
+  <owner>mdjones@chromium.org</owner>
+  <summary>
+    Records the amount of time a user spent on a Reader Mode Page.
+  </summary>
+</histogram>
+
+<histogram name="TextToSpeech.Event" enum="TextToSpeechEvent"
+    expires_after="M93">
+  <owner>dmazzoni@chromium.org</owner>
+  <owner>dtseng@chromium.org</owner>
+  <owner>chrome-a11y-core@google.com</owner>
+  <summary>
+    Events fired by the text-to-speech engine when speaking an utterance.
+  </summary>
+</histogram>
+
+<histogram name="TextToSpeech.Utterance.FromExtensionAPI"
+    enum="TextToSpeechFromExtensionAPI" expires_after="M93">
+  <owner>dmazzoni@chromium.org</owner>
+  <owner>katie@chromium.org</owner>
+  <summary>
+    Indicates if an utterance spoken via synthesized text-to-speech was
+    triggered by the Chrome TTS extension API or the web speech API.
+  </summary>
+</histogram>
+
+<histogram name="TextToSpeech.Utterance.HasGender" enum="TextToSpeechHasGender"
+    expires_after="M73">
+  <obsolete>
+    Obsolete as of M73 because we decided to remove gender from the API.
+  </obsolete>
+  <owner>dmazzoni@chromium.org</owner>
+  <summary>
+    True if an utterance spoken via synthesized text-to-speech requested a
+    specific gender.
+  </summary>
+</histogram>
+
+<histogram name="TextToSpeech.Utterance.HasLang" enum="TextToSpeechHasLang"
+    expires_after="M93">
+  <owner>dmazzoni@chromium.org</owner>
+  <owner>katie@chromium.org</owner>
+  <summary>
+    True if an utterance spoken via synthesized text-to-speech specified a
+    language code.
+  </summary>
+</histogram>
+
+<histogram name="TextToSpeech.Utterance.HasPitch" enum="TextToSpeechHasPitch"
+    expires_after="M93">
+  <owner>dmazzoni@chromium.org</owner>
+  <owner>katie@chromium.org</owner>
+  <summary>
+    True if an utterance spoken via synthesized text-to-speech requested a
+    specific pitch other than the default.
+  </summary>
+</histogram>
+
+<histogram name="TextToSpeech.Utterance.HasRate" enum="TextToSpeechHasRate"
+    expires_after="M93">
+  <owner>dmazzoni@chromium.org</owner>
+  <owner>katie@chromium.org</owner>
+  <summary>
+    True if an utterance spoken via synthesized text-to-speech requested a
+    specific speech rate other than the default.
+  </summary>
+</histogram>
+
+<histogram name="TextToSpeech.Utterance.HasVoiceName"
+    enum="TextToSpeechHasVoiceName" expires_after="M93">
+  <owner>dmazzoni@chromium.org</owner>
+  <owner>katie@chromium.org</owner>
+  <summary>
+    True if an utterance spoken via synthesized text-to-speech requested a
+    specific voice by name.
+  </summary>
+</histogram>
+
+<histogram name="TextToSpeech.Utterance.HasVolume" enum="TextToSpeechHasVolume"
+    expires_after="M93">
+  <owner>dmazzoni@chromium.org</owner>
+  <owner>katie@chromium.org</owner>
+  <summary>
+    True if an utterance spoken via synthesized text-to-speech requested a
+    specific volume other than the default.
+  </summary>
+</histogram>
+
+<histogram name="TextToSpeech.Utterance.Native" enum="TextToSpeechNative"
+    expires_after="M93">
+  <owner>dmazzoni@chromium.org</owner>
+  <owner>katie@chromium.org</owner>
+  <summary>
+    True if an utterance is spoken with native speech provided by the operating
+    system, otherwise it's spoken via a Chrome extension that implements
+    text-to-speech support.
+  </summary>
+</histogram>
+
+<histogram name="TextToSpeech.Utterance.TextLength" units="bytes"
+    expires_after="M93">
+  <owner>dmazzoni@chromium.org</owner>
+  <owner>katie@chromium.org</owner>
+  <summary>
+    The length of an utterance to be spoken via synthesized text-to-speech.
+  </summary>
+</histogram>
+
 </histograms>
 
 </histogram-configuration>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/android/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/android/histograms.xml
index b518f1f8330..99a7470f2aa 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/android/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/android/histograms.xml
@@ -21,6 +21,43 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<variants name="AutofillAssistantIntents">
+  <variant name="" summary="aggregated across all intents"/>
+  <variant name=".BuyMovieTicket"/>
+  <variant name=".FlightsCheckin"/>
+  <variant name=".FoodOrdering"/>
+  <variant name=".FoodOrderingDelivery"/>
+  <variant name=".FoodOrderingPickup"/>
+  <variant name=".NotSet"/>
+  <variant name=".PasswordChange"/>
+  <variant name=".RentCar"/>
+  <variant name=".Shopping"/>
+  <variant name=".ShoppingAssistedCheckout"/>
+  <variant name=".Teleport"/>
+  <variant name=".UnknownIntent"/>
+</variants>
+
+<histogram name="Android.AdaptiveToolbarButton.Clicked"
+    enum="AdaptiveToolbarButtonVariant" expires_after="2022-02-15">
+  <owner>bttk@chromium.org</owner>
+  <owner>chrome-segmentation-platform@google.com</owner>
+  <summary>
+    Reports the variant of the optional toolbar button that was clicked. Reports
+    only when the feature AdaptiveButtonInTopToolbar is active.
+  </summary>
+</histogram>
+
+<histogram name="Android.AdaptiveToolbarButton.SessionVariant"
+    enum="AdaptiveToolbarButtonVariant" expires_after="2022-02-15">
+  <owner>bttk@chromium.org</owner>
+  <owner>chrome-segmentation-platform@google.com</owner>
+  <summary>
+    Reports the variant of the optional toolbar button used during the session.
+    Reports only when the feature AdaptiveButtonInTopToolbar is active, the
+    button is placed in the toolbar, and is clickable.
+  </summary>
+</histogram>
+
 <histogram name="Android.AppNotificationStatus" enum="NotificationAppStatus"
     expires_after="2020-11-15">
   <owner>peter@chromium.org</owner>
@@ -30,20 +67,39 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Android.AutofillAssistant.DropOutReason"
-    enum="AutofillAssistantDropOutReason" expires_after="M90">
+<histogram name="Android.ArmCpuPart" enum="ArmCpuPart"
+    expires_after="2022-01-01">
+  <owner>rsesek@chromium.org</owner>
+  <owner>clank-security@google.com</owner>
+  <summary>
+    Reports information about the ARM CPU of a device. This composes the 8-bit
+    ARM implementer identifier and the 12-bit part number into a single 20-bit
+    CPU identifier, ranging from [0x00000,0xFFFFF]. Depending on the CPU
+    package, processor configuration, and/or kernel version, this may only
+    report information about the processor on which the metric was collected.
+    This can happen on heterogeneous-processor SoCs. The metric is logged once
+    every startup.
+  </summary>
+</histogram>
+
+<histogram name="Android.AutofillAssistant.DropOutReason{Intent}"
+    enum="AutofillAssistantDropOutReason" expires_after="2021-08-22">
+  <owner>selakovic@google.com</owner>
   <owner>mcarlen@chromium.org</owner>
   <summary>
-    Reports the drop out reason of an Autofill Assistant script. It is recorded
-    when Autofill Assistant is shut down or terminated. The AA_START value is
-    used as a baseline and counts the number of attempted starts of Autofill
-    Assistant flows. The sum of all drop out reasons should be the same as the
-    number of attempted starts (i.e. AA_START).
+    Reports the drop out reason of an Autofill Assistant script during the
+    {Intent} flow. It is recorded when Autofill Assistant is shut down or
+    terminated. The AA_START value is used as a baseline and counts the number
+    of attempted starts of Autofill Assistant flows. The sum of all drop out
+    reasons should be the same as the number of attempted starts (i.e.
+    AA_START).
   </summary>
+  <token key="Intent" variants="AutofillAssistantIntents"/>
 </histogram>
 
 <histogram name="Android.AutofillAssistant.FeatureModuleInstallation"
-    enum="AutofillAssistantFeatureModuleInstallation" expires_after="M90">
+    enum="AutofillAssistantFeatureModuleInstallation"
+    expires_after="2021-08-22">
   <owner>mcarlen@chromium.org</owner>
   <owner>autofill_assistant+watch@google.com</owner>
   <summary>
@@ -53,18 +109,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Android.AutofillAssistant.OnBoarding"
-    enum="AutofillAssistantOnBoarding" expires_after="M90">
-  <owner>lsuder@chromium.org</owner>
-  <owner>mcarlen@chromium.org</owner>
-  <summary>
-    Reports the basic user interactions that can happen in regard on boarding.
-    It is recorded on Autofill Assistant startup and during the on boarding.
-  </summary>
-</histogram>
-
 <histogram name="Android.AutofillAssistant.OnboardingFetcher.ResultStatus"
-    enum="AutofillAssistantOnboardingFetcherResultStatus" expires_after="M90">
+    enum="AutofillAssistantOnboardingFetcherResultStatus" expires_after="M93">
   <owner>sandromaggi@google.com</owner>
   <owner>mcarlen@google.com</owner>
   <summary>
@@ -75,9 +121,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Android.AutofillAssistant.OnBoarding{Intent}"
+    enum="AutofillAssistantOnBoarding" expires_after="2021-09-04">
+  <owner>lsuder@chromium.org</owner>
+  <owner>mcarlen@chromium.org</owner>
+  <summary>
+    Reports the basic user interactions that can happen in regard to onboarding
+    during the {Intent} flow. It is recorded on Autofill Assistant startup and
+    during the on boarding.
+  </summary>
+  <token key="Intent" variants="AutofillAssistantIntents"/>
+</histogram>
+
 <histogram name="Android.AutofillAssistant.PaymentRequest.AutofillChanged"
     enum="AutofillAssistantPaymentRequestAutofillInfoChanged"
-    expires_after="M90">
+    expires_after="2021-07-18">
   <owner>arbesser@google.com</owner>
   <owner>mcarlen@chromium.org</owner>
   <summary>
@@ -88,7 +146,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.AutofillAssistant.PaymentRequest.FirstNameOnly"
-    enum="Boolean" expires_after="M90">
+    enum="Boolean" expires_after="M93">
   <owner>arbesser@google.com</owner>
   <owner>mcarlen@chromium.org</owner>
   <summary>
@@ -101,7 +159,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Android.AutofillAssistant.PaymentRequest.MandatoryPostalCode"
     enum="AutofillAssistantPaymentRequestMandatoryPostalCode"
-    expires_after="M90">
+    expires_after="M93">
   <owner>arbesser@google.com</owner>
   <owner>mcarlen@chromium.org</owner>
   <summary>
@@ -115,7 +173,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.AutofillAssistant.PaymentRequest.Prefilled"
-    enum="AutofillAssistantPaymentRequestPrefilled" expires_after="M90">
+    enum="AutofillAssistantPaymentRequestPrefilled" expires_after="2021-07-18">
   <owner>arbesser@google.com</owner>
   <owner>mcarlen@chromium.org</owner>
   <summary>
@@ -127,8 +185,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.ExactTaskCreated"
-    enum="BackgroundTaskId" expires_after="M91">
-  <owner>ioanastefan@chromium.org</owner>
+    enum="BackgroundTaskId" expires_after="2021-12-01">
+  <owner>fgorski@chromium.org</owner>
   <owner>nator@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
   <summary>
@@ -154,15 +212,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.TaskCanceled"
-    enum="BackgroundTaskId" expires_after="2021-01-31">
+    enum="BackgroundTaskId" expires_after="2021-12-01">
   <owner>fgorski@chromium.org</owner>
   <owner>nyquist@chromium.org</owner>
   <summary>Records that a specific background task has been canceled.</summary>
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.TaskCreated.WithExpiration"
-    enum="BackgroundTaskId" expires_after="2021-04-04">
-  <owner>ioanastefan@chromium.org</owner>
+    enum="BackgroundTaskId" expires_after="2021-12-01">
+  <owner>fgorski@chromium.org</owner>
   <owner>nator@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
   <summary>
@@ -172,8 +230,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.TaskCreated.WithoutExpiration"
-    enum="BackgroundTaskId" expires_after="2021-04-04">
-  <owner>ioanastefan@chromium.org</owner>
+    enum="BackgroundTaskId" expires_after="2021-12-01">
+  <owner>fgorski@chromium.org</owner>
   <owner>nator@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
   <summary>
@@ -183,8 +241,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.TaskExpired"
-    enum="BackgroundTaskId" expires_after="2021-01-31">
-  <owner>ioanastefan@chromium.org</owner>
+    enum="BackgroundTaskId" expires_after="2021-12-01">
+  <owner>fgorski@chromium.org</owner>
   <owner>nator@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
   <summary>
@@ -194,14 +252,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.TaskLoadedNative"
-    enum="BackgroundTaskId" expires_after="2021-04-18">
+    enum="BackgroundTaskId" expires_after="2021-12-01">
   <owner>fgorski@chromium.org</owner>
   <owner>nyquist@chromium.org</owner>
-  <summary>Records that a specific background task has loaded native.</summary>
+  <summary>
+    Records that a task extending a NativeBackgroundTask started loading the
+    native portion of Chrome (either in Reduced Mode or Full Browser Mode).
+  </summary>
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.TaskLoadedNative.FullBrowser"
-    enum="BackgroundTaskId" expires_after="2021-04-04">
+    enum="BackgroundTaskId" expires_after="2021-12-01">
   <owner>mheikal@chromium.org</owner>
   <owner>hanxi@chromium.org</owner>
   <owner>hnakashima@chromium.org</owner>
@@ -212,7 +273,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.TaskLoadedNative.ReducedMode"
-    enum="BackgroundTaskId" expires_after="2021-04-04">
+    enum="BackgroundTaskId" expires_after="2021-12-01">
   <owner>mheikal@chromium.org</owner>
   <owner>hanxi@chromium.org</owner>
   <owner>hnakashima@chromium.org</owner>
@@ -222,7 +283,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.TaskScheduled.Failure"
-    enum="BackgroundTaskId" expires_after="2021-04-04">
+    enum="BackgroundTaskId" expires_after="2021-12-01">
   <owner>fgorski@chromium.org</owner>
   <owner>nyquist@chromium.org</owner>
   <summary>
@@ -231,7 +292,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.TaskScheduled.Success"
-    enum="BackgroundTaskId" expires_after="2021-04-04">
+    enum="BackgroundTaskId" expires_after="2021-12-01">
   <owner>fgorski@chromium.org</owner>
   <owner>nyquist@chromium.org</owner>
   <summary>
@@ -240,14 +301,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.TaskStarted"
-    enum="BackgroundTaskId" expires_after="2021-04-04">
+    enum="BackgroundTaskId" expires_after="2021-12-01">
   <owner>fgorski@chromium.org</owner>
   <owner>nyquist@chromium.org</owner>
   <summary>Records that a specific background task has been started.</summary>
 </histogram>
 
 <histogram name="Android.BackgroundTaskScheduler.TaskStopped"
-    enum="BackgroundTaskId" expires_after="2021-01-31">
+    enum="BackgroundTaskId" expires_after="2021-12-01">
   <owner>fgorski@chromium.org</owner>
   <owner>nyquist@chromium.org</owner>
   <summary>
@@ -268,8 +329,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Android.ChildProcessStartTimeV2{type}" units="ms"
+    expires_after="2021-12-13">
+  <owner>cduvall@chromium.org</owner>
+  <owner>boliu@chromium.org</owner>
+  <summary>
+    Measures time from {type} child process starts to right before main. Only
+    recorded on Android N+. Zygote measurements are recorded on Q+.
+  </summary>
+  <token key="type">
+    <variant name=".All" summary="all (excluding zygote)"/>
+    <variant name=".Isolated" summary="isolated"/>
+    <variant name=".NotIsolated" summary="non-isolated"/>
+    <variant name=".Zygote" summary="app zygote"/>
+  </token>
+</histogram>
+
 <histogram name="Android.ChildProcessStartTime{type}" units="ms"
     expires_after="2021-09-18">
+  <obsolete>
+    Removed in December 2020, use Android.ChildProcessStartTimeV2.* instead
+    which allows timings up to 3 min.
+  </obsolete>
   <owner>cduvall@chromium.org</owner>
   <owner>boliu@chromium.org</owner>
   <summary>
@@ -319,19 +400,33 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Android.ChromeStartupDelegate.FailureReason"
+    enum="ChromeStartupDelegateFailureType" expires_after="2021-07-01">
+  <owner>gangwu@chromium.org</owner>
+  <owner>twellington@chromium.org</owner>
+  <summary>
+    Records the failure reason for ChromeStartupDelegate requests. Recorded at
+    most once on application startup.
+  </summary>
+</histogram>
+
 <histogram name="Android.ChromeStartupDelegate.Result"
     enum="ChromeStartupDelegateResult" expires_after="2021-07-01">
-  <owner>chouinard@chromium.org</owner>
+  <owner>gangwu@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
-  <summary>Records the result for ChromeStartupDelegate.</summary>
+  <summary>
+    Records the result for ChromeStartupDelegate. Recorded on application
+    startup.
+  </summary>
 </histogram>
 
 <histogram name="Android.ChromeStartupDelegate.{Result}.Time" units="ms"
     expires_after="2021-07-01">
-  <owner>chouinard@chromium.org</owner>
+  <owner>gangwu@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
-    Records the time taken to fetch a result for ChromeStartupDelegate.
+    Records the time taken to fetch a result for ChromeStartupDelegate. Recorded
+    on application startup.
   </summary>
   <token key="Result">
     <variant name="All"/>
@@ -343,6 +438,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Android.CompressedResources.ExtractionBlockingTime" units="ms"
     expires_after="M82">
+  <obsolete>
+    Removed in M82.
+  </obsolete>
   <owner>estevenson@chromium.org</owner>
   <owner>agrieve@chromium.org</owner>
   <summary>
@@ -354,6 +452,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Android.CompressedResources.ExtractionStatus"
     enum="AndroidResourceExtractionStatus" expires_after="2021-01-24">
+  <obsolete>
+    Removed in M82.
+  </obsolete>
   <owner>estevenson@chromium.org</owner>
   <owner>agrieve@chromium.org</owner>
   <summary>
@@ -364,6 +465,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Android.CompressedResources.ExtractionTime" units="ms"
     expires_after="2021-01-24">
+  <obsolete>
+    Removed in M82.
+  </obsolete>
   <owner>estevenson@chromium.org</owner>
   <owner>agrieve@chromium.org</owner>
   <summary>
@@ -434,7 +538,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.DarkTheme.DarkSearchRequested" enum="Boolean"
-    expires_after="2021-06-01">
+    expires_after="2021-08-22">
   <owner>wylieb@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <owner>clank-app-team@google.com</owner>
@@ -447,7 +551,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.DarkTheme.EnabledReason" enum="DarkThemeEnabledReason"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>twellington@chromium.org</owner>
   <owner>clank-app-team@google.com</owner>
   <summary>
@@ -457,7 +561,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.DarkTheme.EnabledState" enum="BooleanEnabled"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>twellington@chromium.org</owner>
   <owner>clank-app-team@google.com</owner>
   <summary>
@@ -467,7 +571,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.DarkTheme.Preference.State"
-    enum="DarkThemePreferences" expires_after="M90">
+    enum="DarkThemePreferences" expires_after="2021-08-22">
   <owner>twellington@chromium.org</owner>
   <owner>clank-app-team@google.com</owner>
   <summary>
@@ -477,7 +581,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.DefaultBrowserPromo.DialogShown"
-    enum="AndroidDefaultBrowserPromoType" expires_after="2021-03-26">
+    enum="AndroidDefaultBrowserPromoType" expires_after="2021-05-30">
+  <obsolete>
+    Removed Dec 2020; experiment is done and the data isn't useful.
+  </obsolete>
   <owner>lazzzis@google.com</owner>
   <owner>twellington@chromium.org</owner>
   <owner>pavely@chromium.org</owner>
@@ -490,6 +597,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="Android.DefaultBrowserPromo.IntentReceivedFromDisambiguationSheet"
     enum="AndroidDefaultBrowserPromoOutcomeType" expires_after="2021-03-26">
+  <obsolete>
+    Removed Dec 2020; experiment is done and the data isn't useful.
+  </obsolete>
   <owner>lazzzis@google.com</owner>
   <owner>twellington@chromium.org</owner>
   <owner>pavely@chromium.org</owner>
@@ -501,7 +611,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.DefaultBrowserPromo.Outcome.NoDefault"
-    enum="AndroidDefaultBrowserPromoOutcomeType" expires_after="2021-03-26">
+    enum="AndroidDefaultBrowserPromoOutcomeType" expires_after="2021-08-01">
   <owner>lazzzis@google.com</owner>
   <owner>twellington@chromium.org</owner>
   <owner>pavely@chromium.org</owner>
@@ -514,7 +624,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.DefaultBrowserPromo.Outcome.OtherDefault"
-    enum="AndroidDefaultBrowserPromoOutcomeType" expires_after="2021-03-26">
+    enum="AndroidDefaultBrowserPromoOutcomeType" expires_after="2021-08-01">
   <owner>lazzzis@google.com</owner>
   <owner>twellington@chromium.org</owner>
   <owner>pavely@chromium.org</owner>
@@ -527,7 +637,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.DefaultBrowserPromo.RoleManagerShown"
-    enum="AndroidDefaultBrowserPromoType" expires_after="2021-03-26">
+    enum="AndroidDefaultBrowserPromoType" expires_after="2021-08-01">
   <owner>lazzzis@google.com</owner>
   <owner>twellington@chromium.org</owner>
   <owner>pavely@chromium.org</owner>
@@ -538,7 +648,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.DefaultBrowserPromo.UIDismissalReason.NoDefault"
-    enum="AndroidDefaultBrowserPromoUserActionType" expires_after="2021-03-26">
+    enum="AndroidDefaultBrowserPromoUserActionType" expires_after="2021-06-06">
+  <obsolete>
+    Removed Dec 2020; experiment is done and the data isn't useful.
+  </obsolete>
   <owner>lazzzis@google.com</owner>
   <owner>twellington@chromium.org</owner>
   <owner>pavely@chromium.org</owner>
@@ -549,7 +662,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.DefaultBrowserPromo.UIDismissalReason.OtherDefault"
-    enum="AndroidDefaultBrowserPromoUserActionType" expires_after="2021-03-26">
+    enum="AndroidDefaultBrowserPromoUserActionType" expires_after="2021-05-30">
+  <obsolete>
+    Removed Dec 2020; experiment is done and the data isn't useful.
+  </obsolete>
   <owner>lazzzis@google.com</owner>
   <owner>twellington@chromium.org</owner>
   <owner>pavely@chromium.org</owner>
@@ -560,7 +676,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.DeviceSize.LargestDisplaySize" units="dp"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>twellington@chromium.org</owner>
   <owner>tedchoc@chromium.org</owner>
   <owner>clank-app-team@google.com</owner>
@@ -572,7 +688,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.DeviceSize.SmallestDisplaySize" units="dp"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>twellington@chromium.org</owner>
   <owner>tedchoc@chromium.org</owner>
   <owner>clank-app-team@google.com</owner>
@@ -583,8 +699,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Android.DexFixer" enum="DexFixerReason"
+    expires_after="2021-12-01">
+  <owner>agrieve@chromium.org</owner>
+  <owner>cduvall@chromium.org</owner>
+  <summary>
+    Records the number of times Chrome runs &quot;cmd package compile&quot; to
+    fix dexopt issues, and for what reason.
+  </summary>
+</histogram>
+
 <histogram name="Android.DirectAction.Perform" enum="DirectActionId"
-    expires_after="M90">
+    expires_after="M93">
   <owner>szermatt@chromium.org</owner>
   <owner>autofill_assistant@google.com</owner>
   <summary>
@@ -613,7 +739,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.Download.Rename.Dialog.Action"
-    enum="Android.Download.Rename.Dialog.Action" expires_after="2021-03-28">
+    enum="Android.Download.Rename.Dialog.Action" expires_after="2021-08-09">
   <owner>hesen@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>
@@ -623,7 +749,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.Download.Rename.Result"
-    enum="Android.Download.Rename.Result" expires_after="2021-03-28">
+    enum="Android.Download.Rename.Result" expires_after="2021-08-09">
   <owner>hesen@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>
@@ -703,7 +829,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.DownloadManager.Menu.Action"
-    enum="Android.DownloadManager.Menu.Actions" expires_after="2021-01-24">
+    enum="Android.DownloadManager.Menu.Actions" expires_after="2021-07-18">
   <owner>dtrainor@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>The count of Download Home top level menu actions taken.</summary>
@@ -738,14 +864,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.DownloadManager.OpenSource.Audio"
-    enum="AndroidDownloadOpenSource" expires_after="2021-04-04">
+    enum="AndroidDownloadOpenSource" expires_after="2021-08-09">
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>Records how users open audio download files on Android.</summary>
 </histogram>
 
 <histogram name="Android.DownloadManager.OpenSource.Other"
-    enum="AndroidDownloadOpenSource" expires_after="2021-03-28">
+    enum="AndroidDownloadOpenSource" expires_after="2021-08-01">
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>
@@ -755,7 +881,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.DownloadManager.OpenSource.Video"
-    enum="AndroidDownloadOpenSource" expires_after="2021-03-28">
+    enum="AndroidDownloadOpenSource" expires_after="2021-08-01">
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>Records how users open video download files on Android.</summary>
@@ -841,7 +967,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.DownloadPage.OpenSource"
-    enum="AndroidDownloadOpenSource" expires_after="2021-02-06">
+    enum="AndroidDownloadOpenSource" expires_after="2022-02-16">
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>
@@ -850,7 +976,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Android.FeatureModules.AvailabilityStatus"
-    enum="FeatureModuleAvailabilityStatus" expires_after="2021-01-31">
+    enum="FeatureModuleAvailabilityStatus" expires_after="2022-06-13">
 <!-- Name completed by histogram_suffixes
        name="AndroidFeatureModuleName" -->
 
@@ -866,7 +992,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Android.FeatureModules.CachedAwakeInstallDuration"
-    units="ms" expires_after="2021-01-31">
+    units="ms" expires_after="2022-06-13">
 <!-- Name completed by histogram_suffixes
        name="AndroidFeatureModuleName" -->
 
@@ -883,7 +1009,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Android.FeatureModules.InstallingStatus"
-    enum="FeatureModuleInstallingStatus" expires_after="2021-04-18">
+    enum="FeatureModuleInstallingStatus" expires_after="2022-06-13">
 <!-- Name completed by histogram_suffixes
        name="AndroidFeatureModuleName" -->
 
@@ -898,7 +1024,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Android.FeatureModules.InstallStatus"
-    enum="FeatureModuleInstallStatus" expires_after="2021-01-31">
+    enum="FeatureModuleInstallStatus" expires_after="2022-06-13">
 <!-- Name completed by histogram_suffixes
        name="AndroidFeatureModuleName" -->
 
@@ -913,7 +1039,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.FeatureModules.StartupTime" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2022-06-13">
   <owner>agrieve@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>tiborg@chromium.org</owner>
@@ -926,7 +1052,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Android.FeatureModules.UncachedAwakeInstallDuration" units="ms"
-    expires_after="2021-01-31">
+    expires_after="2022-06-13">
 <!-- Name completed by histogram_suffixes
        name="AndroidFeatureModuleName" -->
 
@@ -970,6 +1096,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Android.FontLookup.FetchFontName" enum="FetchFontName"
     expires_after="M89">
+  <obsolete>
+    Removed Jan 2021.
+  </obsolete>
   <owner>chouinard@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -981,6 +1110,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Android.FontLookup.FetchFontResult" enum="FetchFontResult"
     expires_after="M89">
+  <obsolete>
+    Removed Jan 2021.
+  </obsolete>
   <owner>chouinard@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -993,6 +1125,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Android.FontLookup.GmsFontRequest.Time" units="ms"
     expires_after="M89">
+  <obsolete>
+    Removed Jan 2021.
+  </obsolete>
   <owner>chouinard@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -1005,6 +1140,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Android.FontLookup.MatchLocalFontByUniqueName.Time" units="ms"
     expires_after="M89">
+  <obsolete>
+    Removed Jan 2021.
+  </obsolete>
   <owner>chouinard@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -1013,6 +1151,25 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Android.HistoryPage.ClearBrowsingData.PerProfileType"
+    enum="BrowserProfileType" expires_after="2021-12-31">
+  <owner>sideyilmaz@chromium.org</owner>
+  <owner>chrome-incognito@google.com</owner>
+  <summary>
+    Records the clicks on Clear Browsing Data button at history page for each
+    profile type in Android.
+  </summary>
+</histogram>
+
+<histogram name="Android.HomeButton.PerProfileType" enum="BrowserProfileType"
+    expires_after="2021-12-31">
+  <owner>sideyilmaz@chromium.org</owner>
+  <owner>chrome-incognito@google.com</owner>
+  <summary>
+    Records the clicks on Home button in Android toolbar for each profile type.
+  </summary>
+</histogram>
+
 <histogram name="Android.InstantApps.ApiCallDurationWithApp" units="ms"
     expires_after="M81">
   <owner>sbirch@google.com</owner>
@@ -1133,8 +1290,44 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram base="true" name="Android.IsolatedSplits.ClassLoaderReplaced"
+    enum="BooleanYesNo" expires_after="2022-01-10">
+<!-- Name completed by histogram_suffixes name="AndroidFeatureModuleName" -->
+
+  <owner>cduvall@chromium.org</owner>
+  <owner>agrieve@chromium.org</owner>
+  <summary>
+    Whether a split Context has had its ClassLoader replaced due to b/172602571.
+    This is recorded every time a split Context is created.
+  </summary>
+</histogram>
+
+<histogram base="true" name="Android.IsolatedSplits.ContextCreateTime"
+    units="ms" expires_after="2021-12-07">
+<!-- Name completed by histogram_suffixes name="AndroidFeatureModuleName" -->
+
+  <owner>cduvall@chromium.org</owner>
+  <owner>agrieve@chromium.org</owner>
+  <summary>
+    Amount of time it takes to create a new Context for a split. This will only
+    be recorded if isolated splits are enabled.
+  </summary>
+</histogram>
+
+<histogram base="true" name="Android.IsolatedSplits.PreloadWaitTime" units="ms"
+    expires_after="2021-12-07">
+<!-- Name completed by histogram_suffixes name="AndroidFeatureModuleName" -->
+
+  <owner>cduvall@chromium.org</owner>
+  <owner>agrieve@chromium.org</owner>
+  <summary>
+    Amount of time spent waiting for a split preload task to finish. This will
+    only be recorded if isolated splits are enabled.
+  </summary>
+</histogram>
+
 <histogram name="Android.KernelVersion" enum="AndroidKernelVersion"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>rsesek@chromium.org</owner>
   <summary>
     Reports the kernel major and minor version from the utsname.release field.
@@ -1145,9 +1338,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.Language.UiIsSystemLanguage" enum="BooleanMatched"
-    expires_after="2020-12-01">
+    expires_after="2021-12-01">
+  <obsolete>
+    Replaced by LanguageUsage.UI.Android.* Feb 2021.
+  </obsolete>
   <owner>perrier@chromium.org</owner>
-  <owner>megjablon@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
     Reports whether the Chrome UI language is the same as the Android system
@@ -1156,9 +1351,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.Language.WrongLanguageAfterResume" enum="Boolean"
-    expires_after="2020-12-01">
-  <owner>tiborg@chromium.org</owner>
-  <owner>heamy@chromium.org</owner>
+    expires_after="2021-12-01">
+  <obsolete>
+    Replaced by LanguageUsage.UI.Android.* Feb 2021.
+  </obsolete>
+  <owner>perrier@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
     Reports whether Chrome was started in a language other than the system
@@ -1268,7 +1465,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Android.MemoryPressureNotification"
-    enum="Android.MemoryPressureNotification" expires_after="2021-03-28">
+    enum="Android.MemoryPressureNotification" expires_after="2021-08-01">
   <owner>ssid@chromium.org</owner>
   <summary>
     Memory pressure notifications sent by Android through ComponentCallbacks2.
@@ -1326,7 +1523,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.NativeBackgroundTask.TaskFinished.FullBrowser"
-    enum="BackgroundTaskId" expires_after="2021-06-15">
+    enum="BackgroundTaskId" expires_after="2021-08-15">
   <owner>mheikal@chromium.org</owner>
   <owner>hanxi@chromium.org</owner>
   <owner>hnakashima@chromium.org</owner>
@@ -1338,7 +1535,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.NativeBackgroundTask.TaskFinished.ReducedMode"
-    enum="BackgroundTaskId" expires_after="2021-06-15">
+    enum="BackgroundTaskId" expires_after="2021-08-15">
   <owner>mheikal@chromium.org</owner>
   <owner>hanxi@chromium.org</owner>
   <owner>hnakashima@chromium.org</owner>
@@ -1364,7 +1561,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.NativeBackgroundTask.TaskStarted.FullBrowser"
-    enum="BackgroundTaskId" expires_after="2021-06-15">
+    enum="BackgroundTaskId" expires_after="2021-08-15">
   <owner>mheikal@chromium.org</owner>
   <owner>hanxi@chromium.org</owner>
   <owner>hnakashima@chromium.org</owner>
@@ -1375,7 +1572,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.NativeBackgroundTask.TaskStarted.ReducedMode"
-    enum="BackgroundTaskId" expires_after="2021-06-15">
+    enum="BackgroundTaskId" expires_after="2021-08-15">
   <owner>mheikal@chromium.org</owner>
   <owner>hanxi@chromium.org</owner>
   <owner>hnakashima@chromium.org</owner>
@@ -1397,7 +1594,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.NTP.Impression" enum="NTPImpressionType"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>finkm@chromium.org</owner>
   <summary>
     Counts impressions of the NTP on Android. It also counts potential
@@ -1420,7 +1617,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.Omnibox.InvalidMatch" enum="MatchResult"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>ender@chromium.org</owner>
   <owner>tedchoc@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
@@ -1434,7 +1631,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.Omnibox.SuggestionList.LayoutTime"
-    units="microseconds" expires_after="2021-03-15">
+    units="microseconds" expires_after="2021-07-18">
   <owner>ender@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
@@ -1461,7 +1658,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.Omnibox.SuggestionList.MeasureTime"
-    units="microseconds" expires_after="2021-03-15">
+    units="microseconds" expires_after="2021-07-18">
   <owner>ender@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
@@ -1489,7 +1686,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.Omnibox.SuggestionView.CreateTime"
-    units="microseconds" expires_after="2021-03-15">
+    units="microseconds" expires_after="2021-08-01">
   <owner>ender@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
@@ -1512,7 +1709,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.Omnibox.SuggestionView.Reused" enum="BooleanReused"
-    expires_after="2021-03-15">
+    expires_after="2021-07-27">
   <owner>ender@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
@@ -1543,7 +1740,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.OmniboxFocusReason" enum="OmniboxFocusReason"
-    expires_after="2021-01-24">
+    expires_after="2021-12-01">
   <owner>mdjones@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <owner>amaralp@chromium.org</owner>
@@ -1552,6 +1749,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>Records how the omnibox was focused.</summary>
 </histogram>
 
+<histogram name="Android.OpenHistoryFromMenu.PerProfileType"
+    enum="BrowserProfileType" expires_after="2022-02-02">
+  <owner>sideyilmaz@chromium.org</owner>
+  <owner>chrome-incognito@google.com</owner>
+  <summary>
+    Records the clicks on History menu item separately for each profile type in
+    Android.
+  </summary>
+</histogram>
+
 <histogram name="Android.PackageStats.CacheSize" units="MB" expires_after="M86">
   <owner>nyquist@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
@@ -1599,7 +1806,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.PhotoPicker.DecodeRequests" units="Hits"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>finnur@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -1708,7 +1915,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.PhotoPicker.EnumerationTime" units="ms"
-    expires_after="2021-06-01">
+    expires_after="2021-08-09">
   <owner>finnur@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -1824,7 +2031,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.PlayServices.Installed" enum="BooleanInstalled"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>twellington@chromium.org</owner>
   <owner>tedchoc@chromium.org</owner>
   <summary>
@@ -1834,7 +2041,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.PlayServices.Version" units="versioncode"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>twellington@chromium.org</owner>
   <owner>tedchoc@chromium.org</owner>
   <summary>
@@ -1844,7 +2051,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.PrepareMenu.OpenWebApkVisibilityCheck" units="ms"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
@@ -1855,6 +2062,37 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Android.RequestDesktopSite.TabletEligible" enum="Boolean"
+    expires_after="M96">
+  <owner>gangwu@chromium.org</owner>
+  <owner>fgorski@chromium.org</owner>
+  <summary>
+    Records if Chrome width is eligible for requesting desktop sites. Recorded
+    only when navigating to google or google search. This is recorded when
+    chrome adds X-Eligible-Tablet to the http header per request.
+  </summary>
+</histogram>
+
+<histogram name="Android.RequestDesktopSite.UseDesktopUserAgent" enum="Boolean"
+    expires_after="M96">
+  <owner>gangwu@chromium.org</owner>
+  <owner>fgorski@chromium.org</owner>
+  <summary>
+    Records if Chrome uses the desktop site user agent to request websites. This
+    is recorded when each tab loads a new url or reloads a url.
+  </summary>
+</histogram>
+
+<histogram name="Android.RequestDesktopSite.UserSwitchToDesktop" enum="Boolean"
+    expires_after="M96">
+  <owner>gangwu@chromium.org</owner>
+  <owner>fgorski@chromium.org</owner>
+  <summary>
+    Records if a user switched to request desktop site from the app menu. This
+    is recorded when a user manually switches sites between the desktop/mobile.
+  </summary>
+</histogram>
+
 <histogram name="Android.RestoreResult" enum="AndroidRestoreResult"
     expires_after="M81">
   <owner>aberent@chromium.org</owner>
@@ -1864,6 +2102,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Android.Rotation.BeginToRendererFrameActivation" units="ms"
+    expires_after="M95">
+  <owner>jonross@chromium.org</owner>
+  <owner>sadrul@chromium.org</owner>
+  <summary>
+    Measures the amount of time from when Android begins notifying the Browser
+    process of a rotation, to when the Renderer successfully submits and
+    activates a frame in the new orientation.
+  </summary>
+</histogram>
+
 <histogram name="Android.SearchEngineChoice.ChosenSearchEngine"
     enum="OmniboxSearchEngineType" expires_after="2021-09-01">
   <owner>fgorski@chromium.org</owner>
@@ -1916,7 +2165,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.SeccompStatus.RendererSandbox"
-    enum="AndroidSeccompSandboxStatus" expires_after="2021-06-01">
+    enum="AndroidSeccompSandboxStatus" expires_after="2021-08-01">
   <owner>rsesek@chromium.org</owner>
   <summary>
     Reports the status of the seccomp-bpf sandbox in renderer processes.
@@ -1935,7 +2184,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.SelectFileDialogImgCount" units="images"
-    expires_after="M90">
+    expires_after="M96">
   <owner>finnur@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -1947,7 +2196,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.SelectFileDialogScope" enum="SelectFileDialogScope"
-    expires_after="M90">
+    expires_after="M96">
   <owner>peter@chromium.org</owner>
   <owner>finnur@chromium.org</owner>
   <summary>
@@ -1957,7 +2206,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.ShouldDestroyIncognitoProfileOnStartup"
-    units="Boolean" expires_after="M92">
+    units="Boolean" expires_after="2021-08-09">
   <owner>rhalavati@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
   <summary>
@@ -1968,7 +2217,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.StrictMode.OverrideUrlLoadingTime" units="ms"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>yfriedman@chromium.org</owner>
   <owner>wnwen@chromium.org</owner>
   <summary>
@@ -1978,7 +2227,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.StrictMode.TabPersistentStore" units="ms"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>wnwen@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
   <summary>
@@ -2034,7 +2283,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.Survey.SurveyFilteringResults"
-    enum="SurveyFilteringResult" expires_after="2021-06-01">
+    enum="SurveyFilteringResult" expires_after="2021-08-01">
   <owner>twellington@chromium.org</owner>
   <owner>clank-app-team@google.com</owner>
   <summary>
@@ -2062,6 +2311,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>The number of bytes written for the tab metadata file.</summary>
 </histogram>
 
+<histogram name="Android.ThemeColor" enum="Android.ThemeColor"
+    expires_after="M95">
+  <owner>sinansahin@google.com</owner>
+  <owner>twellington@chromium.org</owner>
+  <summary>
+    Records whether a page defined theme color is available and applied to top
+    UI. Recorded in didFirstVisuallyNonEmptyPaint while a web page is being
+    loaded.
+  </summary>
+</histogram>
+
 <histogram name="Android.ThumbnailDiskStorage.CachedBitmap.Found"
     enum="BooleanFound" expires_after="2020-01-30">
   <owner>shaktisahu@chromium.org</owner>
@@ -2109,6 +2369,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Android.WebView.ActualUiThread"
     enum="AndroidWebViewActualUiThread" expires_after="2021-03-31">
+  <obsolete>
+    Removed Feb 2021; they virtually always use the main thread.
+  </obsolete>
   <owner>torne@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -2120,6 +2383,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Android.WebView.AndroidProtocolHandler.ResourceGetIdentifier"
     enum="BooleanSuccess" expires_after="2021-01-30">
+  <obsolete>
+    Removed Jan 2021 because it doesn't cover the cases, replaced with
+    ResourceGetIdentifier2.
+  </obsolete>
   <owner>hazems@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -2129,8 +2396,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Android.WebView.AndroidProtocolHandler.ResourceGetIdentifier2"
+    enum="AndroidWebViewAndroidProtocolHandlerResources"
+    expires_after="2021-05-30">
+  <owner>hazems@chromium.org</owner>
+  <owner>src/android_webview/OWNERS</owner>
+  <summary>
+    Track if looking up Android app resource id using
+    android.content.res.Resources#getIdentifier succeeds in
+    AndroidProtocolHandler in all cases or if should still fall back to
+    reflection look up.
+  </summary>
+</histogram>
+
 <histogram name="Android.WebView.AndroidX.ApiCall" enum="AndroidXWebkitApiCall"
-    expires_after="2021-01-29">
+    expires_after="2022-01-31">
   <owner>laisminchillo@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -2197,6 +2477,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Android.WebView.CookieManager.SameSiteAttributeValue"
     enum="CookieSameSiteString" expires_after="M90">
+  <obsolete>
+    Removed Jan 2021 for cleanup (no longer needed): https://crbug.com/1165012
+  </obsolete>
   <owner>chlily@chromium.org</owner>
   <owner>torne@chromium.org</owner>
   <summary>
@@ -2209,6 +2492,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Android.WebView.CookieManager.SameSiteNoneIsSecure"
     enum="Boolean" expires_after="M90">
+  <obsolete>
+    Removed Jan 2021 for cleanup (no longer needed): https://crbug.com/1165012
+  </obsolete>
   <owner>chlily@chromium.org</owner>
   <owner>torne@chromium.org</owner>
   <summary>
@@ -2221,7 +2507,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.DevUi.AppLaunch" enum="Boolean"
-    expires_after="2021-01-20">
+    expires_after="2021-12-14">
   <owner>ntfschr@chromium.org</owner>
   <owner>hazems@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -2233,7 +2519,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.DevUi.CrashList.CollectionState"
-    enum="AndroidWebViewCrashCollectionState" expires_after="2021-01-20">
+    enum="AndroidWebViewCrashCollectionState" expires_after="2021-12-14">
   <owner>ntfschr@chromium.org</owner>
   <owner>hazems@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -2248,7 +2534,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.DevUi.CrashList.CrashInteraction"
-    enum="AndroidWebViewCrashInteraction" expires_after="2021-01-20">
+    enum="AndroidWebViewCrashInteraction" expires_after="2021-12-14">
   <owner>ntfschr@chromium.org</owner>
   <owner>hazems@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -2265,7 +2551,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.DevUi.CrashList.NumberShown"
-    units="crash reports" expires_after="2021-01-20">
+    units="crash reports" expires_after="2021-12-14">
   <owner>ntfschr@chromium.org</owner>
   <owner>hazems@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -2278,7 +2564,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.DevUi.DeveloperModeBlockingTime" units="ms"
-    expires_after="2021-01-20">
+    expires_after="2021-12-14">
   <owner>ntfschr@chromium.org</owner>
   <owner>hazems@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -2291,7 +2577,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.DevUi.DeveloperModeEnabled"
-    enum="BooleanEnabled" expires_after="2021-01-20">
+    enum="BooleanEnabled" expires_after="2021-12-14">
   <owner>ntfschr@chromium.org</owner>
   <owner>hazems@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -2303,7 +2589,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.DevUi.FlagLoadingBlockingTime" units="ms"
-    expires_after="2021-01-20">
+    expires_after="2021-12-14">
   <owner>ntfschr@chromium.org</owner>
   <owner>hazems@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -2316,7 +2602,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.DevUi.FlagsUi.ToggledFromSearch"
-    enum="Boolean" expires_after="2021-01-20">
+    enum="Boolean" expires_after="2021-12-14">
   <owner>ntfschr@chromium.org</owner>
   <owner>hazems@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -2330,7 +2616,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Android.WebView.DevUi.FragmentNavigation"
-    enum="AndroidWebViewDevUiFragments" expires_after="2021-01-20">
+    enum="AndroidWebViewDevUiFragments" expires_after="2021-12-14">
 <!-- Name completed by histogram_suffixes
      name="Android.WebView.DevUi.NavType" -->
 
@@ -2346,7 +2632,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.DevUi.MenuSelection"
-    enum="AndroidWebViewDevUiMenu" expires_after="2021-01-20">
+    enum="AndroidWebViewDevUiMenu" expires_after="2021-12-14">
   <owner>ntfschr@chromium.org</owner>
   <owner>hazems@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -2357,7 +2643,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.DevUi.MonochromeIconStateToggled"
-    enum="BooleanEnabled" expires_after="2021-03-21">
+    enum="BooleanEnabled" expires_after="2021-12-14">
   <owner>ntfschr@chromium.org</owner>
   <owner>hazems@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -2372,7 +2658,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Android.WebView.DevUi.SessionDuration2" units="ms"
-    expires_after="2021-01-20">
+    expires_after="2021-12-14">
 <!-- Name completed by histogram_suffixes
      name="AndroidWebViewFragments" -->
 
@@ -2385,7 +2671,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.DevUi.ToggledFlagCount" units="flags"
-    expires_after="2021-01-20">
+    expires_after="2021-12-14">
   <owner>ntfschr@chromium.org</owner>
   <owner>hazems@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -2409,7 +2695,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.ExtraHeaders.Valid" enum="BooleanValid"
-    expires_after="2021-01-14">
+    expires_after="M88">
+  <obsolete>
+    Invalid headers instead just throw an exception in M89+.
+  </obsolete>
   <owner>torne@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -2421,6 +2710,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Android.WebView.ExtraHeadersRedirect"
     enum="WebViewExtraHeadersRedirect" expires_after="2021-02-14">
+  <obsolete>
+    Removed Nov 2020; experiment is done and the data isn't useful.
+  </obsolete>
   <owner>torne@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -2431,7 +2723,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.Gfx.HardwareDrawType"
-    enum="WebViewDrawAndSubmissionType" expires_after="2020-12-15">
+    enum="WebViewDrawAndSubmissionType" expires_after="2021-06-15">
   <owner>vasilyt@chromium.org</owner>
   <owner>boliu@chromium.org</owner>
   <summary>
@@ -2456,6 +2748,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Android.WebView.LoadDataWithBaseUrl.HistoryUrl"
     enum="HistoryUrlType" expires_after="M85">
+  <obsolete>
+    Removed Jan 2021 (had already expired)
+  </obsolete>
   <owner>jamwalla@chromium.org</owner>
   <summary>
     Records whether the historyUrl parameter to loadDataWithBaseUrl is empty/
@@ -2489,7 +2784,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.NonEmbeddedMetrics.HistogramRecordAge"
-    units="minutes" expires_after="2021-01-20">
+    units="minutes" expires_after="2021-07-20">
   <owner>hazems@chromium.org</owner>
   <owner>ntfschr@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -2503,7 +2798,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.NonEmbeddedMetrics.NumHistograms"
-    units="histograms" expires_after="2021-01-20">
+    units="histograms" expires_after="2021-07-20">
   <owner>ntfschr@chromium.org</owner>
   <owner>hazems@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -2516,7 +2811,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Android.WebView.NonEmbeddedMetrics.ParsingLogResult"
     enum="AndroidWebViewNonEmbeddedMetricsParsingLogResult"
-    expires_after="2021-01-20">
+    expires_after="2021-07-20">
   <owner>hazems@chromium.org</owner>
   <owner>ntfschr@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -2530,7 +2825,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Android.WebView.NonEmbeddedMetrics.RetrieveMetricsTaskStatus"
     enum="AndroidWebViewNonEmbeddedMetricsRetrieveMetricsTaskStatus"
-    expires_after="2021-01-20">
+    expires_after="2021-07-20">
   <owner>hazems@chromium.org</owner>
   <owner>ntfschr@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -2542,7 +2837,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.NonEmbeddedMetrics.TransmissionResult"
-    enum="AndroidWebViewDevUiMetricsTransmission" expires_after="2021-01-20">
+    enum="AndroidWebViewDevUiMetricsTransmission" expires_after="2021-07-20">
   <owner>ntfschr@chromium.org</owner>
   <owner>hazems@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -2653,6 +2948,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Android.WebView.SingleOrMultiProcess"
+    enum="AndroidWebViewSingleOrMultiProcess" expires_after="2022-01-22">
+  <owner>alexmitra@chromium.org</owner>
+  <owner>nator@chromium.org</owner>
+  <owner>src/android_webview/OWNERS</owner>
+  <summary>
+    Records whether WebView is being run in a single process or multi-process.
+    This is recorded when WebView starts.
+  </summary>
+</histogram>
+
 <histogram name="Android.WebView.Startup.CreationTime.Stage1.FactoryInit"
     units="ms" expires_after="2021-07-24">
   <owner>changwan@chromium.org</owner>
@@ -2740,7 +3046,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.UserAgent.Valid" enum="WebViewUserAgentType"
-    expires_after="2021-01-14">
+    expires_after="M88">
+  <obsolete>
+    Invalid UAs instead just throw an exception in M89+.
+  </obsolete>
   <owner>torne@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -2751,7 +3060,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.Visibility.Global" enum="WebViewVisibility"
-    expires_after="2021-01-01">
+    expires_after="2021-07-01">
   <owner>idries@google.com</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -2766,7 +3075,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.Visibility.PerWebView"
-    enum="WebViewVisibility" expires_after="2021-01-01">
+    enum="WebViewVisibility" expires_after="2021-07-01">
   <owner>idries@google.com</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -2783,7 +3092,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.WebViewOpenWebVisible.Global"
-    enum="WebViewOpenWebVisibility" expires_after="2021-01-01">
+    enum="WebViewOpenWebVisibility" expires_after="2021-07-01">
   <owner>idries@google.com</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -2798,7 +3107,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.WebViewOpenWebVisible.PerWebView"
-    enum="WebViewOpenWebVisibility" expires_after="2021-01-01">
+    enum="WebViewOpenWebVisibility" expires_after="2021-07-01">
   <owner>idries@google.com</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -2813,7 +3122,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Android.WebView.WebViewOpenWebVisible.ScreenPortion"
-    enum="WebViewOpenWebScreenPortion" expires_after="2021-01-01">
+    enum="WebViewOpenWebScreenPortion" expires_after="2021-07-01">
   <owner>idries@google.com</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -2836,7 +3145,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AndroidSms.EffectivePWAInstallationSuccess"
-    enum="BooleanSuccess" expires_after="2021-02-02">
+    enum="BooleanSuccess" expires_after="2022-02-02">
   <owner>azeemarshad@chromium.org</owner>
   <owner>jonmann@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
@@ -2849,7 +3158,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AndroidSms.FcmMessageDispatchFailure"
-    enum="AndroidSmsFcmMessageType" expires_after="2021-04-04">
+    enum="AndroidSmsFcmMessageType" expires_after="2022-02-02">
   <owner>azeemarshad@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -2860,7 +3169,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AndroidSms.FcmMessageDispatchRetry"
-    enum="AndroidSmsFcmMessageType" expires_after="2021-02-02">
+    enum="AndroidSmsFcmMessageType" expires_after="2022-02-02">
   <owner>azeemarshad@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -2871,7 +3180,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AndroidSms.FcmMessageDispatchSuccess"
-    enum="AndroidSmsFcmMessageType" expires_after="2021-04-04">
+    enum="AndroidSmsFcmMessageType" expires_after="2022-02-02">
   <owner>azeemarshad@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -2882,7 +3191,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AndroidSms.MultiDeviceFeatureState"
-    enum="MultiDevice_FeatureState" expires_after="2021-04-04">
+    enum="MultiDevice_FeatureState" expires_after="2022-02-02">
   <owner>azeemarshad@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -2893,7 +3202,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AndroidSms.NumAttemptsForSuccessfulInstallation"
-    units="attempts" expires_after="2021-05-02">
+    units="attempts" expires_after="2022-02-02">
   <owner>azeemarshad@chromium.org</owner>
   <owner>jonmann@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
@@ -2904,7 +3213,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AndroidSms.PWAInstallationResult"
-    enum="WebAppInstallResultCode" expires_after="2021-04-04">
+    enum="WebAppInstallResultCode" expires_after="2022-02-02">
   <owner>azeemarshad@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -2915,7 +3224,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AndroidSms.PWAUninstallationResult" enum="BooleanSuccess"
-    expires_after="2021-02-02">
+    expires_after="2022-02-02">
   <owner>azeemarshad@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -2926,7 +3235,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AndroidSms.ServiceWorkerLifetime" units="ms"
-    expires_after="2021-02-02">
+    expires_after="2022-02-02">
   <owner>azeemarshad@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -2936,7 +3245,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AndroidSms.ServiceWorkerMessageDispatchStatus"
-    enum="BooleanSuccess" expires_after="2021-02-02">
+    enum="BooleanSuccess" expires_after="2022-02-02">
   <owner>azeemarshad@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/apps/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/apps/histograms.xml
index c63d1605b91..b6f97cda7c0 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/apps/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/apps/histograms.xml
@@ -45,6 +45,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppInfoDialog.Launches" enum="AppInfoDialogLaunchOrigin"
     expires_after="M77">
+  <obsolete>
+    Removed February 2021.
+  </obsolete>
   <owner>sashab@chromium.org</owner>
   <summary>
     The number of times the app info dialog is launched. This is gathered each
@@ -55,6 +58,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppInfoDialog.OpenedForLocation" enum="AppLocation"
     expires_after="M85">
+  <obsolete>
+    Removed September 2016. Recorded as Apps.AppInfoDialogOpenedForLocation?
+  </obsolete>
   <owner>sashab@chromium.org</owner>
   <summary>
     The location of the app that the dialog was opened for. This is gathered
@@ -64,6 +70,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppInfoDialog.OpenedForType" enum="ExtensionType"
     expires_after="M85">
+  <obsolete>
+    Removed September 2016. Recorded as Apps.AppInfoDialogOpenedForType?
+  </obsolete>
   <owner>sashab@chromium.org</owner>
   <summary>
     The type of the app that the dialog was opened for. This is gathered each
@@ -101,7 +110,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Apps.AppList.AggregatedSearchRankerError"
     enum="AggregatedSearchRankerError" expires_after="2020-12-01">
   <owner>thanhdng@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     The type of errors that occur during the inference of Search Ranking
     aggregated model.
@@ -130,7 +138,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.AppSearchProvider.QueryTime" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-08-01">
   <owner>jennyz@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -140,7 +148,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.AppSearchProvider.ZeroStateLatency" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2021-12-31">
   <owner>jennyz@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -150,7 +158,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.AppsGridAddPage" enum="AppListAddPageType"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>anasalazar@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -177,9 +185,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppList.DriveQuickAccessProvider.ApiResults"
     units="count" expires_after="2021-03-15">
+  <obsolete>
+    Removed February 2021.
+  </obsolete>
   <owner>tby@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     The number of results returned from a call to the Drive QuickAccess API.
     Only reported if the API call did not error.
@@ -188,9 +198,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppList.DriveQuickAccessProvider.CacheEmpty"
     enum="BooleanEmpty" expires_after="2021-04-11">
+  <obsolete>
+    Removed February 2021.
+  </obsolete>
   <owner>tby@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     Whether or not the results cache is empty. An empty cache means either poor
     network conditions, the user opening zero-state very quickly, or an API
@@ -200,8 +212,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppList.DriveQuickAccessProvider.CacheWarmed"
     units="Boolean" expires_after="2021-03-28">
+  <obsolete>
+    Removed February 2021.
+  </obsolete>
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>wrong@chromium.org</owner>
   <summary>
     Whether or not the cache of Drive file results has already been warmed with
     a request to ItemSuggest. Emitted each time we decide whether to warm the
@@ -211,9 +226,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppList.DriveQuickAccessProvider.DriveFSMounted"
     enum="Boolean" expires_after="2021-04-11">
+  <obsolete>
+    Removed February 2021.
+  </obsolete>
   <owner>tby@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     Whether or not DriveFS is mounted on a call to
     DriveQuickAccessProvider::Start or ::GetQuickAccessItems.
@@ -222,9 +239,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppList.DriveQuickAccessProvider.FileError"
     enum="DriveFileError" expires_after="2021-04-11">
+  <obsolete>
+    Removed February 2021.
+  </obsolete>
   <owner>tby@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     The error code returned from a call to the Drive QuickAccess API.
   </summary>
@@ -233,9 +252,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="Apps.AppList.DriveQuickAccessProvider.GetQuickAccessItemsLatency"
     units="ms" expires_after="2021-03-15">
+  <obsolete>
+    Removed February 2021.
+  </obsolete>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     The time between when GetQuickAccessItems was last called, and receiving
     Drive QuickAccess results back. Only reported if the API call did not error.
@@ -244,9 +265,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppList.DriveQuickAccessProvider.Latency" units="ms"
     expires_after="2021-03-15">
+  <obsolete>
+    Removed February 2021.
+  </obsolete>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     The time between sending a zero state query and receiving file
     recommendations back from the DriveQuickAccessProvider.
@@ -256,9 +279,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="Apps.AppList.DriveQuickAccessProvider.TimeFromFetchToZeroStateStart"
     units="ms" expires_after="2021-03-15">
+  <obsolete>
+    Removed February 2021.
+  </obsolete>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     The time between when GetQuickAccessItems was last called, and the user
     entering zero state search.
@@ -267,9 +292,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppList.DriveQuickAccessProvider.ValidResults"
     units="count" expires_after="2021-04-04">
+  <obsolete>
+    Removed February 2021.
+  </obsolete>
   <owner>tby@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     Counts how many results from one call to the QuickAccess API exist in the
     DriveFS mount and are OK for display.
@@ -277,9 +304,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.DriveZeroStateProvider.Latency" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-27">
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <summary>
@@ -289,9 +315,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.DriveZeroStateProvider.Status"
-    enum="DriveZeroStateProviderStatus" expires_after="2021-03-15">
+    enum="DriveZeroStateProviderStatus" expires_after="2021-07-18">
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <summary>
@@ -301,9 +326,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.ItemSuggestCache.ResponseSize" units="bytes"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <summary>
@@ -314,9 +338,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.ItemSuggestCache.Status"
-    enum="ItemSuggestCacheStatus" expires_after="2021-03-15">
+    enum="ItemSuggestCacheStatus" expires_after="2021-07-18">
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <summary>
@@ -325,7 +348,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.LauncherSearchProvider.QueryTime" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2021-12-31">
   <owner>jennyz@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -335,7 +358,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.OmniboxProvider.QueryTime" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>jennyz@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -346,7 +369,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.OmniboxProvider.ZeroStateLatency" units="ms"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>jennyz@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -358,9 +381,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.OsSettingsProvider.Error"
-    enum="OsSettingsProviderError" expires_after="2021-04-18">
-  <owner>jiameng@chromium.org</owner>
+    enum="OsSettingsProviderError" expires_after="2021-07-18">
   <owner>tby@chromium.org</owner>
+  <owner>thanhdng@chromium.org</owner>
   <summary>
     Various error states of the provider for OS settings in the cros launcher.
     Emitted only in the case of an unexpected error, the bucket proportion is
@@ -369,8 +392,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.OsSettingsProvider.QueryTime" units="ms"
-    expires_after="2021-04-11">
-  <owner>jiameng@chromium.org</owner>
+    expires_after="2021-08-15">
+  <owner>thanhdng@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <summary>
     The latency of a search in the OsSettingsProvider. Recorded each time a
@@ -379,10 +402,45 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Apps.AppList.ScoreNormalizer.L2ErrorDecreased" enum="Boolean"
+    expires_after="2022-01-31">
+  <owner>adafang@google.com</owner>
+  <owner>wrong@chromium.com</owner>
+  <owner>tby@chromium.com</owner>
+  <summary>
+    Whether or not splitting and merging bins is less than or equal to the old
+    L2 error of bin counts. Logged after each search result is recorded.
+  </summary>
+</histogram>
+
+<histogram name="Apps.AppList.ScoreNormalizer.ReadPrefsError"
+    enum="BooleanError" expires_after="2022-01-31">
+  <owner>adafang@google.com</owner>
+  <owner>wrong@chromium.com</owner>
+  <owner>tby@chromium.com</owner>
+  <summary>
+    Whether or not dividers and/or counts from read prefs is empty. A empty
+    dividers or counts means one of the values in the vector was not saved
+    properly as a double. Logged when the ScoreNormalizer is initialized, which
+    is when ReadPrefs is called.
+  </summary>
+</histogram>
+
+<histogram name="Apps.AppList.ScoreNormalizer.SearchResultsCount" units="count"
+    expires_after="2022-01-31">
+  <owner>adafang@google.com</owner>
+  <owner>wrong@chromium.com</owner>
+  <owner>tby@chromium.com</owner>
+  <summary>
+    The number of search results which have been normalized. Logged when each
+    vector of search results is normalized.
+  </summary>
+</histogram>
+
 <histogram name="Apps.AppList.SearchQueryLength.Apps" units="characters"
-    expires_after="2021-03-15">
+    expires_after="2021-08-09">
   <owner>thanhdng@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>tby@chromium.org</owner>
   <summary>
     The length of the query that resulted in an app launch from search box. This
     metric only records non-empty queries.
@@ -392,16 +450,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Apps.AppList.SearchSuccess.Apps" enum="AppListLaunchedFrom"
     expires_after="2021-10-29">
   <owner>thanhdng@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>tby@chromium.org</owner>
   <summary>
     The number of app launches from the search box with non-empty queries.
   </summary>
 </histogram>
 
 <histogram name="Apps.AppList.SuggestedContent.Enabled" enum="BooleanEnabled"
-    expires_after="2021-03-28">
+    expires_after="2021-08-22">
   <owner>wrong@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>tby@chromium.org</owner>
+  <owner>thanhdng@chromium.org</owner>
   <summary>
     Whether or not the user has enabled Suggested Content in the launcher. This
     is logged once per UMA upload, and only for any user that has the Suggested
@@ -410,9 +469,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.SuggestedFiles.ChipLaunched" enum="Boolean"
-    expires_after="2021-03-12">
+    expires_after="2021-05-16">
+  <obsolete>
+    Removed December 2020.
+  </obsolete>
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     Emitted when a suggestion chip is launched. Currently only 'true' is used,
     but we may emit 'false' in future to track abandonment.
@@ -420,9 +481,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.SuggestedFiles.LaunchIndex" units="index"
-    expires_after="2021-03-12">
+    expires_after="2021-08-15">
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>wrong@chromium.org</owner>
   <summary>
     Emitted when a suggestion chip is launched, records the index (position in
     the bar) of that chip. The left-most chip is index 0 and the maximum index
@@ -431,9 +492,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.SuggestedFiles.LaunchType"
-    enum="LauncherRankingItemType" expires_after="2021-03-12">
+    enum="LauncherRankingItemType" expires_after="2021-05-30">
+  <obsolete>
+    Removed December 2020.
+  </obsolete>
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     Emitted when a suggestion chip is launched, records the type of that chip.
   </summary>
@@ -442,7 +505,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Apps.AppList.UserEvent.Error" enum="AppListSearchResult"
     expires_after="2021-04-04">
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>thanhdng@chromium.org</owner>
   <summary>
     Records error when processing user events into Apps.AppList.UserEvent.*
     metrics. These are expected to be rare and bucket proportion is not
@@ -451,11 +514,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.UserEvent.Overall" enum="AppListUserEvent"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="LauncherUISurface" -->
 
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>thanhdng@chromium.org</owner>
   <summary>
     Emitted on a usage of the launcher, and records overall impressions,
     launches, and abandons for a launcher UI view. The bucket proportion is not
@@ -466,11 +529,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.UserEvent.TypeAbandon" enum="AppListSearchResult"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="LauncherUISurface" -->
 
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>thanhdng@chromium.org</owner>
   <summary>
     Emitted after an impression, if the user then closes the launcher or moves
     to a different view without launching any search result. This is emitted
@@ -483,11 +546,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.UserEvent.TypeImpression"
-    enum="AppListSearchResult" expires_after="2021-06-01">
+    enum="AppListSearchResult" expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="LauncherUISurface" -->
 
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>thanhdng@chromium.org</owner>
   <summary>
     When a set of results is displayed for 2 seconds and the user has probably
     seen it, or the user interacted with the results and has definitely seen it,
@@ -506,11 +569,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.UserEvent.TypeLaunch" enum="AppListSearchResult"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="LauncherUISurface" -->
 
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>thanhdng@chromium.org</owner>
   <summary>
     Emitted after an impression, if the user launches a result. Records the type
     of the launched result. See Apps.AppList.UserEvent.TypeImpression for more
@@ -522,10 +585,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.ZeroStateFileProvider.Latency" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-07-18">
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     The time between sending a zero state query and receiving file
     recommendations back from the ZeroStateFileProvider.
@@ -534,6 +596,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppList.ZeroStateFileProvider.NotifierCreationSuccess"
     enum="BooleanSuccess" expires_after="2021-02-07">
+  <obsolete>
+    Removed January 2021.
+  </obsolete>
   <owner>tby@chromium.org</owner>
   <owner>edimitriadis@chromium.org</owner>
   <summary>
@@ -543,10 +608,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.ZeroStateResults.LaunchedItemType"
-    enum="ZeroStateResultType" expires_after="2021-04-11">
+    enum="ZeroStateResultType" expires_after="2021-08-15">
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     The type of item that was launched from a zero state launcher search result.
   </summary>
@@ -554,9 +618,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppList.ZeroStateResults.ReceivedScore.DriveQuickAccess"
     units="score" expires_after="2021-04-18">
+  <obsolete>
+    Removed December 2020.
+  </obsolete>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     Logs the result score received from the Drive Quick Access provider. The
     original float score is scaled to range from 0 to 100 and its floor is
@@ -566,9 +632,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppList.ZeroStateResults.ReceivedScore.OmniboxSearch"
     units="score" expires_after="2021-04-11">
+  <obsolete>
+    Removed December 2020.
+  </obsolete>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     Logs the result score received from the Omnibox search provider. The
     original float score is scaled to range from 0 to 100 and its floor is
@@ -578,9 +646,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppList.ZeroStateResults.ReceivedScore.ZeroStateFile"
     units="score" expires_after="2020-12-06">
+  <obsolete>
+    Removed December 2020.
+  </obsolete>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     Logs the result score received from the zero state file provider. The
     original float score is scaled to range from 0 to 100 and its floor is
@@ -590,9 +660,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppList.ZeroStateResultsList.Clicked"
     enum="BooleanClicked" expires_after="2021-04-11">
+  <obsolete>
+    Removed December 2020.
+  </obsolete>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     Whether an item was clicked from zero state search results, or if results
     were displayed for some amount time but not clicked. These clicks and
@@ -601,10 +673,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppList.ZeroStateResultsList.ContainsDriveFiles"
-    enum="Boolean" expires_after="2021-02-07">
+    enum="Boolean" expires_after="2021-05-30">
+  <obsolete>
+    Removed December 2020.
+  </obsolete>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     Whether a set of search result impressions contains any Drive QuickAccess
     file results.
@@ -613,9 +687,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppList.ZeroStateResultsList.FileImpressions"
     enum="AppListSearchResult" expires_after="2021-02-07">
+  <obsolete>
+    Removed January 2021.
+  </obsolete>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     The number of zero state impressions that contained at least one result of
     the specified file type.
@@ -624,9 +700,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppList.ZeroStateResultsList.LaunchedItemPositionV2"
     units="position" expires_after="2021-02-07">
+  <obsolete>
+    Removed December 2020.
+  </obsolete>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     The position index of an item launched from zero state search results.
   </summary>
@@ -634,16 +712,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppList.ZeroStateResultsList.NumImpressionTypesV2"
     units="count" expires_after="2021-01-03">
+  <obsolete>
+    Removed December 2020.
+  </obsolete>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     The number of item types included in each zero state impression set.
   </summary>
 </histogram>
 
 <histogram name="Apps.AppList.ZeroStateSearchResultRemovalDecision"
-    enum="AppListZeroStateResultRemovalConfirmation" expires_after="2020-12-31">
+    enum="AppListZeroStateResultRemovalConfirmation" expires_after="2021-12-31">
   <owner>jennyz@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -655,7 +735,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppList.ZeroStateSearchResultUserActionType"
     enum="AppListZeroStateSearchResultUserActionType"
-    expires_after="2020-12-31">
+    expires_after="2021-12-31">
   <owner>jennyz@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -674,7 +754,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListAppLaunchedV2" enum="AppListLaunchedFrom"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
 <!-- Name completed by histogram_suffixes name="AppListState" -->
 
   <owner>mmourgos@chromium.org</owner>
@@ -687,7 +767,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListAppMovingType" enum="AppListAppMovingType"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>mmourgos@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -697,7 +777,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListAppTypeClicked" enum="AppListAppType"
-    expires_after="2021-04-01">
+    expires_after="2021-07-04">
   <owner>charleszhao@chromium.org</owner>
   <owner>pdyson@chromium.org</owner>
   <summary>
@@ -725,7 +805,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListDefaultSearchResultOpenType"
-    enum="AppListSearchResult" expires_after="2020-12-31">
+    enum="AppListSearchResult" expires_after="2021-12-31">
   <owner>jennyz@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -741,7 +821,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListFolder.ShowHide.AnimationSmoothness" units="%"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>wutao@chromium.org</owner>
   <summary>
     Relative smoothness of animations of showing and hiding app list folder.
@@ -753,7 +833,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Apps.AppListFolderNameLength" units="characters"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
 <!-- Name completed by histogram_suffixes
      name="TabletOrClamshellMode" -->
 
@@ -767,7 +847,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListFolderOpened" enum="AppListFolderOpened"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>mmourgos@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -797,9 +877,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListLauncherClickedSearchQueryLength"
-    units="characters" expires_after="M90">
+    units="characters" expires_after="2021-08-22">
   <owner>wrong@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>tby@chromium.org</owner>
   <summary>
     Logs the length of user typed queries that result in launcher clicks.
     Emitted each time the user opens a launcher search result after typing a
@@ -808,7 +888,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListLauncherIssuedSearchQueryLength"
-    units="characters" expires_after="2021-03-15">
+    units="characters" expires_after="2021-07-18">
   <owner>jennyz@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -818,7 +898,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListPageOpened" enum="AppListPage"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>calamity@chromium.org</owner>
   <owner>src/ash/app_list/OWNERS</owner>
   <summary>
@@ -828,7 +908,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListPageSwitcherSource"
-    enum="AppListPageSwitcherSource" expires_after="2021-04-18">
+    enum="AppListPageSwitcherSource" expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="TabletOrClamshellMode" -->
 
   <owner>newcomer@chromium.org</owner>
@@ -848,7 +928,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListPeekingToFullscreenSource"
-    enum="AppListPeekingToFullscreenSource" expires_after="2021-03-14">
+    enum="AppListPeekingToFullscreenSource" expires_after="2021-07-18">
   <owner>newcomer@chromium.org</owner>
   <owner>mmourgos@chromium.org</owner>
   <summary>
@@ -858,7 +938,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListPlayStoreAppLaunchedIndex" units="indices"
-    expires_after="2020-12-31">
+    expires_after="2021-12-31">
   <owner>jennyz@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -868,13 +948,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListPlayStoreQueryState"
-    enum="AppListPlayStoreQueryState" expires_after="2021-04-25">
+    enum="AppListPlayStoreQueryState" expires_after="2021-06-27">
   <owner>hejq@chromium.org</owner>
   <summary>The state of a Play Store app search request.</summary>
 </histogram>
 
 <histogram name="Apps.AppListPlayStoreSearchAppsDisplayed" units="apss"
-    expires_after="2020-12-31">
+    expires_after="2021-12-31">
   <owner>jennyz@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -887,7 +967,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>napper@chromium.org</owner>
   <owner>robsc@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     When a user opens an app recommendation result, this is the number of times
     we showed the result before opening. Number of times shown is reset to 0
@@ -900,7 +979,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>napper@chromium.org</owner>
   <owner>robsc@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     Response when parsing the recommended app list from Play Store for candidate
     app list, recorded every time a response from the play store is parsed in
@@ -913,7 +991,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>napper@chromium.org</owner>
   <owner>robsc@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     Number of responses from server in Apps.AppListRecommendedResponse.count
     when fetching appListRecommendded GetAppReinstallCandidates.
@@ -925,7 +1002,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>napper@chromium.org</owner>
   <owner>robsc@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     Milliseconds elapsed to fetch appListRecommended GetAppReinstallCandidates.
   </summary>
@@ -933,8 +1009,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.AppListResultLaunchIndexAndQueryLength" units="units"
     expires_after="2021-01-31">
+  <obsolete>
+    Removed January 2021.
+  </obsolete>
   <owner>tby@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>thanhdng@chromium.org</owner>
   <summary>
     The index of a clicked result in the search result box and the length of the
     search query. The index is relative to the SearchResultListView, not the
@@ -943,9 +1022,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListResultLaunchIsEmptyQuery" enum="Boolean"
-    expires_after="2020-12-31">
+    expires_after="2021-11-15">
+  <obsolete>
+    Removed January 2021.
+  </obsolete>
   <owner>thanhdng@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>tby@chromium.org</owner>
   <summary>
     This boolean records if the query that introduces a launch in the results
     list is empty or not. This will be recorded every time the user clicks an
@@ -956,7 +1038,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Apps.AppListSearchAbandonQueryLength" units="characters"
     expires_after="2021-03-15">
   <owner>jennyz@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>tby@chromium.org</owner>
+  <owner>thanhdng@chromium.org</owner>
   <summary>
     The length of the query when the user abandons results of a queried search
     or recommendations of zero state (zero length query) in launcher UI.
@@ -964,7 +1047,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListSearchBoxActivated"
-    enum="SearchBoxActivationSource" expires_after="2021-03-15">
+    enum="SearchBoxActivationSource" expires_after="2021-07-27">
 <!-- Name completed by histogram_suffixes name="TabletOrClamshellMode" -->
 
   <owner>newcomer@chromium.org</owner>
@@ -978,7 +1061,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListSearchCommenced" units="searches"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>tapted@chromium.org</owner>
   <summary>
     The number of searches that are started in the app list. This is gathered
@@ -987,7 +1070,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListSearchOmniboxResultOpenType"
-    enum="AppListOmniboxResult" expires_after="2020-12-31">
+    enum="AppListOmniboxResult" expires_after="2021-12-31">
   <owner>jennyz@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
@@ -1000,7 +1083,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListSearchQueryLength" units="characters"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="TabletOrClamshellMode" -->
 
   <owner>calamity@chromium.org</owner>
@@ -1020,7 +1103,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListSearchResultInternalApp.Show"
-    enum="AppListInternalAppName" expires_after="2021-04-18">
+    enum="AppListInternalAppName" expires_after="2021-08-22">
   <owner>wutao@chromium.org</owner>
   <summary>
     The app list search result of an internal app that was shown to the user.
@@ -1030,7 +1113,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListSearchResultOpenDisplayType"
-    enum="AppListSearchResultDisplayType" expires_after="2021-02-16">
+    enum="AppListSearchResultDisplayType" expires_after="2021-08-15">
   <owner>calamity@chromium.org</owner>
   <owner>src/ash/app_list/OWNERS</owner>
   <summary>
@@ -1046,7 +1129,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListSearchResultOpenTypeV2" enum="AppListSearchResult"
-    expires_after="2021-03-15">
+    expires_after="2021-07-27">
 <!-- Name completed by histogram_suffixes name="TabletOrClamshellMode" -->
 
   <owner>newcomer@chromium.org</owner>
@@ -1070,7 +1153,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListShowSource" enum="AppListShowSource"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>newcomer@chromium.org</owner>
   <summary>
     The number of times the different sources for showing the app list are used.
@@ -1082,7 +1165,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListStateTransitionSource"
-    enum="AppListStateTransitionSource" expires_after="2021-05-02">
+    enum="AppListStateTransitionSource" expires_after="2021-08-09">
   <owner>newcomer@chromium.org</owner>
   <owner>mmourgos@chromium.org</owner>
   <summary>
@@ -1095,7 +1178,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.AppListSuggestedChipLaunched" units="indices"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>newcomer@chromium.org</owner>
   <owner>charleszhao@chromium.org</owner>
   <summary>
@@ -1129,7 +1212,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Apps.AppsInFolders" units="Apps" expires_after="2021-04-04">
+<histogram name="Apps.AppsInFolders" units="Apps" expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes
      name="AppListFolderExperiment" -->
 
@@ -1167,7 +1250,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Apps.ContextMenuShowSource" enum="MenuSourceType"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes
      name="AppUIComponent" -->
 
@@ -1195,7 +1278,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.CreateShortcutIcon.Linux.Result"
-    enum="WebAppCreateShortcutIconLinuxResult" expires_after="M90">
+    enum="WebAppCreateShortcutIconLinuxResult" expires_after="M95">
   <owner>phillis@chromium.org</owner>
   <owner>cmumford@chromium.org</owner>
   <summary>
@@ -1204,7 +1287,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.CreateShortcuts.Linux.Result"
-    enum="WebAppCreateShortcutLinuxResult" expires_after="M90">
+    enum="WebAppCreateShortcutLinuxResult" expires_after="M95">
   <owner>phillis@chromium.org</owner>
   <owner>cmumford@chromium.org</owner>
   <summary>
@@ -1213,7 +1296,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.CreateShortcuts.Mac.Result"
-    enum="WebAppCreateShortcutMacResult" expires_after="M90">
+    enum="WebAppCreateShortcutMacResult" expires_after="M95">
   <owner>phillis@chromium.org</owner>
   <owner>cmumford@chromium.org</owner>
   <summary>
@@ -1222,7 +1305,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Apps.DefaultAppLaunch" enum="DefaultAppName"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="DefaultAppLaunchSource" -->
 
   <owner>dominickn@chromium.org</owner>
@@ -1235,7 +1318,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.FileHandler.Registration.Linux.RecreateShortcut.Result"
     enum="FileHandlerRegistrationLinuxRecreateShortcutResult"
-    expires_after="M90">
+    expires_after="M95">
   <owner>phillis@chromium.org</owner>
   <owner>cmumford@chromium.org</owner>
   <summary>
@@ -1245,7 +1328,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.FileHandler.Registration.Linux.Result"
-    enum="FileHandlerRegistrationLinuxResult" expires_after="M90">
+    enum="FileHandlerRegistrationLinuxResult" expires_after="M95">
   <owner>phillis@chromium.org</owner>
   <owner>cmumford@chromium.org</owner>
   <summary>
@@ -1254,7 +1337,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.FileHandler.Registration.Win.Result"
-    enum="FileHandlerRegistrationWinResult" expires_after="M90">
+    enum="FileHandlerRegistrationWinResult" expires_after="M95">
   <owner>phillis@chromium.org</owner>
   <owner>cmumford@chromium.org</owner>
   <summary>
@@ -1302,9 +1385,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.LauncherSearchQueryLengthJumped" enum="Boolean"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>wrong@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>tby@chromium.org</owner>
   <summary>
     Whether or not the most recent Launcher search query differs from the
     previous query in length by more than one character. Search queries are
@@ -1470,7 +1553,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.LockScreen.NoteTakingApp.LaunchRequestReason"
-    enum="NewLockScreenNoteRequestType" expires_after="2021-06-01">
+    enum="NewLockScreenNoteRequestType" expires_after="2021-08-01">
   <owner>dstockwell@chromium.org</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -1503,7 +1586,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.LockScreen.NoteTakingApp.NoteTakingExitReason"
-    enum="LockScreenNoteTakingExitReason" expires_after="2021-06-01">
+    enum="LockScreenNoteTakingExitReason" expires_after="2021-08-01">
   <owner>dstockwell@chromium.org</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -1551,7 +1634,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <obsolete>
     Removed October 2020, replaced by Apps.AppList.UserEvent.Overall.*
   </obsolete>
-  <owner>jiameng@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <summary>
@@ -1581,7 +1663,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.NumberOfFolders" units="folder(s)"
-    expires_after="2021-01-31">
+    expires_after="2021-07-27">
   <owner>mmourgos@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -1590,7 +1672,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Apps.NumberOfPages" units="page(s)" expires_after="M92">
+<histogram name="Apps.NumberOfPages" units="page(s)" expires_after="2021-08-09">
   <owner>mmourgos@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -1599,7 +1681,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Apps.NumberOfPagesNotFull" units="page(s)" expires_after="M92">
+<histogram name="Apps.NumberOfPagesNotFull" units="page(s)"
+    expires_after="2021-08-09">
   <owner>mmourgos@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -1609,7 +1692,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.PaginationTransition.AnimationSmoothness" units="%"
-    expires_after="M92">
+    expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="TabletOrClamshellMode" -->
 
   <owner>newcomer@chromium.org</owner>
@@ -1629,7 +1712,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Apps.PaginationTransition.DragScroll.PresentationTime" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
 <!-- Name completed by histogram_suffixes
      name="TabletOrClamshellMode" -->
 
@@ -1645,7 +1728,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Apps.PaginationTransition.DragScroll.PresentationTime.MaxLatency"
-    units="ms" expires_after="2021-04-11">
+    units="ms" expires_after="2021-08-15">
 <!-- Name completed by histogram_suffixes
      name="TabletOrClamshellMode" -->
 
@@ -1657,7 +1740,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.PreferredApps.EntryCount" units="entries"
-    expires_after="M90">
+    expires_after="2021-07-18">
   <owner>dominickn@chromium.org</owner>
   <owner>mxcai@chromium.org</owner>
   <summary>
@@ -1691,7 +1774,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.ScrollableShelf.AnimationSmoothness" units="%"
-    expires_after="2021-03-15">
+    expires_after="2021-08-01">
 <!-- Name completed by histogram suffixes
      name="HomeLauncherVisibility" -->
 
@@ -1737,6 +1820,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.ShortcutsMenu.Registration.Win.Result"
     enum="ShortcutsMenuRegistrationWinResult" expires_after="M87">
+  <obsolete>
+    Removed January 2021.
+  </obsolete>
   <owner>cmumford@chromium.org</owner>
   <owner>rahsin@microsoft.com</owner>
   <summary>
@@ -1746,6 +1832,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Apps.ShortcutsMenu.Unregistration.Win.Result"
     enum="ShortcutsMenuUnregistrationWinResult" expires_after="M87">
+  <obsolete>
+    Removed January 2021.
+  </obsolete>
   <owner>cmumford@chromium.org</owner>
   <owner>rahsin@microsoft.com</owner>
   <summary>
@@ -1754,7 +1843,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Apps.StateTransition.AnimationSmoothness" units="%"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
 <!-- Name completed by histogram_suffixes
      name="TabletOrClamshellMode" and
      name="EnterOrExitOverview" and
diff --git a/chromium/tools/metrics/histograms/histograms_xml/arc/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/arc/histograms.xml
index a88a28463c3..f91fba938f0 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/arc/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/arc/histograms.xml
@@ -110,13 +110,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Arc.AndroidBootTime" units="ms" expires_after="2021-04-11">
+<histogram name="Arc.AndroidBootTime" units="ms" expires_after="2021-08-15">
   <owner>elijahtaylor@google.com</owner>
   <owner>shihuis@google.com</owner>
   <summary>The time elapsed for booting up the ARC instance.</summary>
 </histogram>
 
-<histogram name="Arc.AppCount" units="units" expires_after="2021-04-11">
+<histogram name="Arc.AppCount" units="units" expires_after="2021-08-15">
   <owner>elijahtaylor@google.com</owner>
   <owner>shihuis@google.com</owner>
   <summary>
@@ -127,7 +127,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.AppInstalledReason" enum="InstallationCounterReasonEnum"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>robsc@chromium.org</owner>
   <owner>napper@chromium.org</owner>
   <summary>
@@ -138,7 +138,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.AppListRecommendedImp.AllImpression" units="count"
-    expires_after="2021-03-28">
+    expires_after="2021-08-09">
   <owner>robsc@chromium.org</owner>
   <owner>napper@chromium.org</owner>
   <summary>
@@ -157,7 +157,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Arc.AppShortcuts.BuildMenuTime" units="ms" expires_after="M92">
+<histogram name="Arc.AppShortcuts.BuildMenuTime" units="ms"
+    expires_after="2021-08-09">
   <owner>mmourgos@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -179,7 +180,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.AppUninstallReason" enum="UninstallCounterReasonEnum"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>robsc@chromium.org</owner>
   <owner>napper@chromium.org</owner>
   <summary>
@@ -277,6 +278,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>Code installation result for ARC boot continue.</summary>
 </histogram>
 
+<histogram name="Arc.ClipboardDragDrop" enum="ArcClipboardDragDropEvent"
+    expires_after="M95">
+  <owner>tetsui@google.com</owner>
+  <owner>arc-framework@google.com</owner>
+  <summary>The number of clipboard and drag-and-drop events.</summary>
+</histogram>
+
 <histogram name="Arc.CodeIntegrityCheckingTotalTime" units="ms"
     expires_after="M81">
   <owner>elijahtaylor@google.com</owner>
@@ -323,7 +331,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.CompanionLibraryApisCounter"
-    enum="CompanionLibraryApisList" expires_after="M88">
+    enum="CompanionLibraryApisList" expires_after="M93">
   <owner>sstan@google.com</owner>
   <owner>bartfab@chromium.org</owner>
   <owner>giovax@google.com</owner>
@@ -344,7 +352,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.ContainerLifetimeEvent" enum="ArcContainerLifetimeEvent"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>elijahtaylor@google.com</owner>
   <owner>yusukes@google.com</owner>
   <summary>
@@ -355,7 +363,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.ContainerRestartAfterCrashCount" units="units"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>elijahtaylor@google.com</owner>
   <owner>yusukes@google.com</owner>
   <summary>
@@ -365,7 +373,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Arc.CpuRestrictionDisabled" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>wvk@google.com</owner>
   <owner>khmel@google.com</owner>
   <summary>
@@ -431,7 +439,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.EngagementTime.ArcTotal" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>maajid@google.com</owner>
   <owner>shaochuan@google.com</owner>
   <owner>shihuis@google.com</owner>
@@ -445,7 +453,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.EngagementTime.Background" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>maajid@google.com</owner>
   <owner>shaochuan@google.com</owner>
   <owner>shihuis@google.com</owner>
@@ -457,7 +465,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.EngagementTime.Foreground" units="ms"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>maajid@google.com</owner>
   <owner>shaochuan@google.com</owner>
   <owner>shihuis@google.com</owner>
@@ -468,7 +476,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.EngagementTime.Total" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>maajid@google.com</owner>
   <owner>shaochuan@google.com</owner>
   <owner>shihuis@google.com</owner>
@@ -504,7 +512,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.FirstAppLaunchDelay.TimeDelta" units="ms"
-    expires_after="2021-03-11">
+    expires_after="2021-07-18">
   <owner>yusukes@google.com</owner>
   <owner>khmel@google.com</owner>
   <summary>
@@ -650,9 +658,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.NativeBridge" enum="ArcNativeBridgeType"
-    expires_after="2021-09-06">
+    expires_after="never">
+<!-- expires-never: used internally for filtering -->
+
   <owner>elijahtaylor@google.com</owner>
   <owner>levarum@google.com</owner>
+  <owner>chrome-metrics-team@google.com</owner>
   <summary>
     Native bridge used for ARC. Can be unknown and none. This is collected along
     with Arc.State during every metrics recording interval, so it is in every
@@ -673,28 +684,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.OptInAction" enum="ArcOptInAction"
-    expires_after="2021-02-28">
+    expires_after="2021-08-15">
   <owner>elijahtaylor@google.com</owner>
   <owner>shihuis@google.com</owner>
   <summary>Arc OptIn action taken by user.</summary>
 </histogram>
 
 <histogram name="Arc.OptInCancel" enum="ArcOptInCancel"
-    expires_after="2021-03-21">
+    expires_after="2021-08-09">
   <owner>elijahtaylor@google.com</owner>
   <owner>shihuis@google.com</owner>
   <summary>Arc OptIn cancelation reason.</summary>
 </histogram>
 
 <histogram name="Arc.OptInResult" enum="ArcOptInResult"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>elijahtaylor@google.com</owner>
   <owner>khmel@google.com</owner>
   <summary>Arc OptIn flow result.</summary>
 </histogram>
 
 <histogram name="Arc.OptInSilentAuthCode" enum="ArcOptInSilentAuthCode"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>elijahtaylor@google.com</owner>
   <summary>
     Arc Silent Auth Code status. This status is set during the ARC OptIn flow.
@@ -711,7 +722,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.OptInSilentAuthCode.SecondaryAccount"
-    enum="ArcOptInSilentAuthCode" expires_after="2021-04-04">
+    enum="ArcOptInSilentAuthCode" expires_after="2021-08-09">
   <owner>khmel@google.com</owner>
   <summary>
     Arc Silent Auth Code status. This status is set during the minting of an
@@ -721,7 +732,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.PlayAutoInstallRequest.State"
-    enum="ArcPlayAutoInstallRequestState" expires_after="2021-03-11">
+    enum="ArcPlayAutoInstallRequestState" expires_after="2022-02-01">
 <!-- Name completed by histogram_suffixes name="ArcUserTypes" -->
 
   <owner>jhorwich@google.com</owner>
@@ -730,7 +741,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.PlayAutoInstallRequest.TimeDelta" units="ms"
-    expires_after="2021-03-11">
+    expires_after="2022-02-01">
 <!-- Name completed by histogram_suffixes name="ArcUserTypes" -->
 
   <owner>jhorwich@google.com</owner>
@@ -752,7 +763,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.PlayStoreSearch.DefaultResultClickLatency" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2021-12-31">
   <owner>jennyz@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -762,7 +773,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.PlayStoreSearch.QueryTime" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-27">
   <owner>hejq@chromium.org</owner>
   <summary>
     Time between sending an Play Store app discovery request and the storing
@@ -771,7 +782,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.PlayStoreSearch.ResultClickLatency" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2021-12-31">
   <owner>jennyz@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -780,7 +791,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.PlayStoreSearch.ReturnedAppsTotal" units="apps"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>hejq@chromium.org</owner>
   <summary>
     The total number of returned apps of a Play Store app discovery query.
@@ -816,7 +827,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.PrintPreview.PreviewEvent" enum="PrintPreviewHelperEvents"
-    expires_after="2021-01-01">
+    expires_after="2021-06-01">
   <owner>bmgordon@chromium.org</owner>
   <owner>jschettler@chromium.org</owner>
   <summary>
@@ -826,7 +837,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.PrintPreview.RenderAndGeneratePDFTime" units="ms"
-    expires_after="2021-01-01">
+    expires_after="2021-06-01">
   <owner>bmgordon@chromium.org</owner>
   <owner>jschettler@chromium.org</owner>
   <summary>
@@ -837,7 +848,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.PrintPreview.RenderAndGeneratePDFTimeAvgPerPage"
-    units="ms" expires_after="2021-01-01">
+    units="ms" expires_after="2021-06-01">
   <owner>bmgordon@chromium.org</owner>
   <owner>jschettler@chromium.org</owner>
   <summary>
@@ -848,7 +859,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.PrintPreview.RendererError" enum="PrintPreviewFailureType"
-    expires_after="2021-03-15">
+    expires_after="2021-08-01">
   <owner>bmgordon@chromium.org</owner>
   <owner>jschettler@chromium.org</owner>
   <summary>
@@ -858,14 +869,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.PrintPreview.RenderToPDFTime" units="ms"
-    expires_after="2021-01-01">
+    expires_after="2021-06-01">
   <owner>bmgordon@chromium.org</owner>
   <owner>jschettler@chromium.org</owner>
   <summary>Time taken for ARC to render a PDF for print preview.</summary>
 </histogram>
 
+<histogram base="true" name="Arc.Provisioning.CheckInError"
+    enum="ArcProvisioningCheckInError" expires_after="2021-12-01">
+<!-- Name completed by histogram_suffixes name="ArcUserTypes" -->
+
+  <owner>mhasank@google.com</owner>
+  <owner>arc-core@google.com</owner>
+  <summary>
+    The error that occurred during GMS check-in operation. Recorded when ARC++
+    provisioning flow fails.
+  </summary>
+</histogram>
+
 <histogram base="true" name="Arc.Provisioning.CloudFlowError"
-    enum="ArcProvisioningCloudFlowError" expires_after="2021-07-01">
+    enum="ArcProvisioningCloudFlowError" expires_after="2021-12-01">
 <!-- Name completed by histogram_suffixes name="ArcUserTypes" -->
 
   <owner>mhasank@google.com</owner>
@@ -878,6 +901,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true" name="Arc.Provisioning.Result"
     enum="ArcProvisioningResult" expires_after="2021-07-01">
+  <obsolete>
+    Removed in Dec 2020. Now reported as Arc.Provisioning.Status.
+  </obsolete>
 <!-- Name completed by histogram_suffixes name="ArcUserTypes" -->
 
   <owner>alexchau@google.com</owner>
@@ -888,8 +914,29 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram base="true" name="Arc.Provisioning.SignInError"
+    enum="ArcProvisioningSignInError" expires_after="2021-12-01">
+<!-- Name completed by histogram_suffixes name="ArcUserTypes" -->
+
+  <owner>mhasank@google.com</owner>
+  <owner>arc-core@google.com</owner>
+  <summary>
+    The error that occured during GMS sign-in operation. Recorded when ARC++
+    provisioning flow fails.
+  </summary>
+</histogram>
+
+<histogram base="true" name="Arc.Provisioning.Status"
+    enum="ArcProvisioningStatus" expires_after="2021-12-01">
+<!-- Name completed by histogram_suffixes name="ArcUserTypes" -->
+
+  <owner>mhasank@google.com</owner>
+  <owner>arc-core@google.com</owner>
+  <summary>The status (success or error) of ARC++ provisioning.</summary>
+</histogram>
+
 <histogram name="Arc.Provisioning.TimeDelta.Failure" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
 <!-- Name completed by histogram_suffixes name="ArcUserTypes" -->
 
   <owner>alexchau@google.com</owner>
@@ -900,7 +947,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.Provisioning.TimeDelta.Success" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
 <!-- Name completed by histogram_suffixes name="ArcUserTypes" -->
 
   <owner>alexchau@google.com</owner>
@@ -911,18 +958,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Arc.Reauthorization.Result" enum="ArcProvisioningResult"
-    expires_after="2021-02-07">
+<histogram name="Arc.Reauthorization.Result" enum="ArcProvisioningStatus"
+    expires_after="2022-01-12">
 <!-- Name completed by histogram_suffixes name="ArcUserTypes" -->
 
-  <owner>khmel@google.com</owner>
+  <owner>mhasank@google.com</owner>
+  <owner>arc-core@gmail.com</owner>
   <summary>
     The result (success or the type of failure) of ARC reauthorization.
   </summary>
 </histogram>
 
 <histogram name="Arc.Runtime.Performance.CommitDeviation" units="microseconds"
-    expires_after="2021-03-11">
+    expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="ArcPerformanceAppCategories" -->
 
   <owner>khmel@google.com</owner>
@@ -931,7 +979,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.Runtime.Performance.FPS" units="fps"
-    expires_after="2021-03-11">
+    expires_after="2021-07-18">
 <!-- Name completed by histogram_suffixes name="ArcPerformanceAppCategories" -->
 
   <owner>khmel@google.com</owner>
@@ -939,6 +987,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>Render frames per second.</summary>
 </histogram>
 
+<histogram name="Arc.Runtime.Performance.Generic.FirstFrameRendered" units="ms"
+    expires_after="2021-11-28">
+  <owner>camurcu@google.com</owner>
+  <owner>khmel@google.com</owner>
+  <summary>
+    Time (in ms) between an app launch request and the detection of the first
+    rendered frame. Recorded when the frame is detected by the first commit to
+    the Exo surface.
+  </summary>
+</histogram>
+
 <histogram name="Arc.Runtime.Performance.Generic.FrameTime" units="ms"
     expires_after="2021-09-28">
   <owner>camurcu@google.com</owner>
@@ -960,7 +1019,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.Runtime.Performance.RenderQuality" units="%"
-    expires_after="2021-03-11">
+    expires_after="2021-07-18">
 <!-- Name completed by histogram_suffixes name="ArcPerformanceAppCategories" -->
 
   <owner>khmel@google.com</owner>
@@ -969,7 +1028,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.SdkVersionUpgradeType" enum="ArcSdkVersionUpgradeType"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>niwa@google.com</owner>
   <owner>yusukes@google.com</owner>
   <summary>
@@ -978,8 +1037,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Arc.Secondary.Signin.Result" enum="ArcProvisioningResult"
-    expires_after="2021-03-15">
+<histogram name="Arc.Secondary.Signin.Result" enum="ArcProvisioningStatus"
+    expires_after="2021-07-18">
   <owner>sinhak@google.com</owner>
   <owner>jhorwich@google.com</owner>
   <owner>khmel@google.com</owner>
@@ -990,12 +1049,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.Session.MojoDisconnection" enum="ArcMojoConnectionType"
-    expires_after="2020-12-05">
+    expires_after="2021-11-11">
 <!-- Name completed by histogram_suffixes name="ArcUserTypes" -->
 
   <owner>shaochuan@google.com</owner>
   <owner>khmel@google.com</owner>
-  <owner>mmatena@google.com</owner>
+  <owner>ttylenda@google.com</owner>
   <summary>
     This is updated when the mojo connections to processes in detailing in
     ArcMojoConnectionType are closed for reasons other than the ARC container
@@ -1004,7 +1063,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.Session.StopReason" enum="ArcStopReason"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
 <!-- Name completed by histogram_suffixes name="ArcUserTypes" -->
 
   <owner>shaochuan@google.com</owner>
@@ -1037,9 +1096,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Arc.State" enum="BooleanEnabled" expires_after="2021-05-09">
+<histogram name="Arc.State" enum="BooleanEnabled" expires_after="never">
+<!-- expires-never: used internally for filtering -->
+
   <owner>elijahtaylor@google.com</owner>
   <owner>ttylenda@google.com</owner>
+  <owner>chrome-metrics-team@google.com</owner>
   <summary>
     Whether ARC is enabled or not. Before M56 this was collected only on login
     and when ARC was enabled or disabled. From M56 forward this is collected
@@ -1054,7 +1116,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.StateByUserType" enum="ArcEnableState"
-    expires_after="2021-03-15">
+    expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="ArcUserTypes" -->
 
   <owner>elijahtaylor@google.com</owner>
@@ -1138,7 +1200,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Arc.UserInteraction" enum="ArcUserInteraction"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>jhorwich@chromium.org</owner>
   <owner>elijahtaylor@chromium.org</owner>
   <owner>shihuis@google.com</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/ash/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/ash/histograms.xml
index 600a1e800dd..697915c3293 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/ash/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/ash/histograms.xml
@@ -69,7 +69,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Accelerators.WindowSnap"
-    enum="WindowSnapAcceleratorAction" expires_after="2020-12-12">
+    enum="WindowSnapAcceleratorAction" expires_after="2021-12-12">
   <owner>amusbach@chromium.org</owner>
   <owner>xdai@chromium.org</owner>
   <summary>Captures usage of Alt+[ and Alt+].</summary>
@@ -97,7 +97,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.AmbientMode.AnimationSmoothness.PhotoTransition" units="%"
-    expires_after="2021-05-01">
+    expires_after="2021-07-04">
   <owner>wutao@chromium.org</owner>
   <owner>xiaohuic@chromium.org</owner>
   <summary>
@@ -108,7 +108,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.AmbientMode.Enabled" enum="BooleanEnabled"
-    expires_after="2021-05-01">
+    expires_after="2021-07-04">
   <owner>cowmoo@google.com</owner>
   <owner>xiaohuic@chromium.org</owner>
   <summary>
@@ -132,7 +132,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.AmbientMode.PhotoSource" enum="AmbientModePhotoSource"
-    expires_after="2021-05-01">
+    expires_after="2021-07-04">
   <owner>cowmoo@google.com</owner>
   <owner>xiaohuic@chromium.org</owner>
   <summary>
@@ -142,7 +142,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.AmbientMode.SelectedNumberOfAlbums" units="int"
-    expires_after="2021-05-01">
+    expires_after="2021-07-04">
   <owner>cowmoo@google.com</owner>
   <owner>xiaohuic@chromium.org</owner>
   <summary>
@@ -153,7 +153,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.AmbientMode.TotalNumberOfAlbums" units="int"
-    expires_after="2021-05-01">
+    expires_after="2021-07-04">
   <owner>cowmoo@google.com</owner>
   <owner>xiaohuic@chromium.org</owner>
   <summary>
@@ -163,6 +163,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Ash.AppNotificationBadgingPref" enum="Boolean"
+    expires_after="2021-08-11">
+  <owner>mmourgos@chromium.org</owner>
+  <owner>gzadina@google.com</owner>
+  <summary>
+    For each user, records whether they have the app notification badging user
+    preference enabled or disabled. This metric is only logged when an active
+    user session has been started. This metric is logged periodically every 30
+    minutes.
+  </summary>
+</histogram>
+
 <histogram base="true" name="Ash.Assistant.AnimationSmoothness" units="%"
     expires_after="2021-07-20">
 <!-- Name completed by histogram_suffixes name="AshAssistantAnimationSmoothness" -->
@@ -186,7 +198,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.BackGesture.StartScenarioType"
-    enum="BackGestureStartScenarioType" expires_after="2021-06-01">
+    enum="BackGestureStartScenarioType" expires_after="2021-08-01">
   <owner>minch@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <summary>
@@ -279,6 +291,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <token key="TabletOrClamshell" variants="DisplayModes"/>
 </histogram>
 
+<histogram name="Ash.CaptureModeController.QuickAction"
+    enum="CaptureQuickAction" expires_after="2021-11-19">
+  <owner>shidi@chromium.org</owner>
+  <owner>chinsenj@chromium.org</owner>
+  <summary>
+    Track all quick actions on screenshot notification. Including: Edit in
+    backlight, Go to Files, Delete File.
+  </summary>
+</histogram>
+
 <histogram name="Ash.CaptureModeController.ScreenRecordingLength"
     units="seconds" expires_after="2021-11-04">
   <owner>afakhry@chromium.org</owner>
@@ -326,6 +348,38 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Ash.Clipboard.ConsecutiveCopies" units="times"
+    expires_after="2021-09-01">
+  <owner>newcomer@chromium.org</owner>
+  <owner>multipaste@google.com</owner>
+  <summary>
+    The number of consecutive copies in the user session, recorded when a paste
+    occurs.
+  </summary>
+</histogram>
+
+<histogram name="Ash.Clipboard.ConsecutivePastes" units="times"
+    expires_after="2021-09-01">
+  <owner>newcomer@chromium.org</owner>
+  <owner>multipaste@google.com</owner>
+  <summary>
+    The number of consecutive pastes in the user session, recorded when a copy
+    occurs. Includes pastes from Clipboard History.
+  </summary>
+</histogram>
+
+<histogram name="Ash.ClipboardHistory.ConsecutivePastes" units="times"
+    expires_after="2021-09-01">
+  <owner>andrewxu@chromium.org</owner>
+  <owner>multipaste@google.com</owner>
+  <summary>
+    The number of consecutive pastes from the clipboard history menu. The count
+    is reset after a copy or a paste that is not through the clipboard history
+    menu (such as pressing ctrl-v accelerator or clicking at a context menu
+    option).
+  </summary>
+</histogram>
+
 <histogram name="Ash.ClipboardHistory.ContextMenu.DisplayFormatDeleted"
     enum="ClipboardHistoryDisplayFormat" expires_after="2021-09-01">
   <owner>andrewxu@chromium.org</owner>
@@ -377,6 +431,27 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Ash.ClipboardHistory.ContextMenu.ShowMenu"
+    enum="ClipboardHistoryTriggerType" expires_after="2021-09-01">
+  <owner>andrewxu@chromium.org</owner>
+  <owner>multipaste@google.com</owner>
+  <summary>
+    It records how many times users trigger the clipboard history menu through
+    different ways respecitvely. Recorded when the clipboard history menu shows.
+  </summary>
+</histogram>
+
+<histogram name="Ash.ClipboardHistory.ContextMenu.ShowPlaceholderString"
+    enum="ClipboardHistoryPlaceholderStringType" expires_after="2021-09-01">
+  <owner>newcomer@chromium.org</owner>
+  <owner>multipaste@google.com</owner>
+  <summary>
+    The number of placeholder strings shown to users in lieu of actual data,
+    broken down by placeholder string type. Recorded when the label is requested
+    from ClipboardHistoryResourceManager.
+  </summary>
+</histogram>
+
 <histogram name="Ash.ClipboardHistory.ContextMenu.UserJourneyTime" units="ms"
     expires_after="2021-09-01">
   <owner>andrewxu@chromium.org</owner>
@@ -424,6 +499,74 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Ash.ClipboardHistory.ControlToVDelay" units="ms"
+    expires_after="2021-09-01">
+  <owner>gzadina@google.com</owner>
+  <owner>newcomer@chromium.org</owner>
+  <summary>
+    The time between a user pressing control and V when pasting via keyboard.
+    Recorded in AcceleratorHistory when a V is pressed. Only recorded for the
+    first pressed V in a sequence, for example: User holds control, waits 200ms,
+    presses V (histogram logged), presses V again without releasing control (no
+    histogram logged). This metric is used to set a baseline for an experimental
+    keyboard combination where a user holds control, then presses V after a
+    delay to show multipaste.
+  </summary>
+</histogram>
+
+<histogram name="Ash.ClipboardHistory.ImageModelRequest.Lifetime" units="ms"
+    expires_after="2021-12-11">
+  <owner>newcomer@chromium.org</owner>
+  <owner>multipaste@google.com</owner>
+  <summary>
+    The lifetime of the ClipboardImageModelRequest object. Logged in the dtor of
+    ClipboardImageModelRequest.
+  </summary>
+</histogram>
+
+<histogram name="Ash.ClipboardHistory.ImageModelRequest.Runtime" units="ms"
+    expires_after="2021-12-11">
+  <owner>newcomer@chromium.org</owner>
+  <owner>multipaste@google.com</owner>
+  <summary>
+    The runtime of a request in a ClipboardImageModelRequest. Logged from when
+    the ClipboardImageModelRequest is Start()-ed to when it is Stop()-ed.
+  </summary>
+</histogram>
+
+<histogram name="Ash.ClipboardHistory.ImageModelRequest.StopReason"
+    enum="RequestStopReason" expires_after="2021-12-11">
+  <owner>newcomer@chromium.org</owner>
+  <owner>multipaste@google.com</owner>
+  <summary>
+    The reason a ClipboardImageModelRequest is stopped. Logged when a request is
+    Stop()-ed.
+  </summary>
+</histogram>
+
+<histogram name="Ash.ClipboardHistory.Operation"
+    enum="ClipboardHistoryOperation" expires_after="2021-09-01">
+  <owner>newcomer@chromium.org</owner>
+  <owner>multipaste@google.com</owner>
+  <summary>
+    Different operations detected by ClipboardHistory. Debounced, so different
+    than Clipboard.Read, Clipboard.Write. Any clipboard copy detected here will
+    result in a new entry in ClipboardHistory. Recorded after a clipboard read
+    or write is debounced in ClipboardHistory.
+  </summary>
+</histogram>
+
+<histogram name="Ash.ClipboardHistory.ZeroStateContextualNudge.ShownCount"
+    enum="BooleanHit" expires_after="2021-09-01">
+  <owner>anasalazar@chromium.org</owner>
+  <owner>newcomer@chromium.org</owner>
+  <summary>
+    The number of times the clipboard history zero state contextual nudge has
+    been shown. This number will be used as the baseline against the sum of the
+    NudgeToFeatureUseTime and NudgeToFeatureOpenTime.
+  </summary>
+</histogram>
+
 <histogram base="true" name="Ash.ContextualNudgeDismissContext"
     enum="ContextualNudgeDismissContext" expires_after="2021-12-01">
 <!-- Name completed by histogram_suffixes name="ContextualNudgesNames" -->
@@ -454,7 +597,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Desks.AnimationSmoothness.DeskActivation" units="%"
-    expires_after="M89">
+    expires_after="2021-11-29">
   <owner>afakhry@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <owner>mukai@chromium.org</owner>
@@ -479,7 +622,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Desks.AnimationSmoothness.DeskRemoval" units="%"
-    expires_after="M89">
+    expires_after="2021-11-29">
   <owner>afakhry@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <owner>mukai@chromium.org</owner>
@@ -491,19 +634,68 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Ash.Desks.ConsecutiveDailyVisits" units="days"
+    expires_after="2022-02-19">
+  <owner>chinsenj@chromium.org</owner>
+  <owner>janetmac@chromium.org</owner>
+  <summary>
+    Emitted when a desk is destroyed or a user activates a desk they haven't
+    visited the prior day. In the former case, reports the number of consecutive
+    days a user visited the newly-closed desk. In the latter case, reports the
+    number of consecutive days a user visited the desk during the previous
+    visit. This metric is persisted across multiple sessions and restarts. I.e.
+    if a user logs out and logs back in their desk's consecutive daily visits
+    will be restored. This metric uses the user's local timezone so if they move
+    back in time via timezone change, this metric will be reset.
+  </summary>
+</histogram>
+
+<histogram name="Ash.Desks.DeskLifetime_{DeskIndex}" units="hr"
+    expires_after="2022-02-19">
+  <owner>chinsenj@chromium.org</owner>
+  <owner>janetmac@chromium.org</owner>
+  <summary>
+    The lifetime of the desk at index {DeskIndex} (1-indexed). Emitted when a
+    desk is removed. This metric is persisted across multiple sessions and
+    restarts. I.e. if a user logs out and logs back in their desk's lifetime
+    will be restored.
+  </summary>
+  <token key="DeskIndex">
+    <variant name="1" summary="1"/>
+    <variant name="2" summary="2"/>
+    <variant name="3" summary="3"/>
+    <variant name="4" summary="4"/>
+    <variant name="5" summary="5"/>
+    <variant name="6" summary="6"/>
+    <variant name="7" summary="7"/>
+    <variant name="8" summary="8"/>
+  </token>
+</histogram>
+
 <histogram name="Ash.Desks.DesksCount2" units="units"
-    expires_after="2020-12-06">
+    expires_after="2021-11-29">
   <owner>afakhry@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <summary>
     Emitted when there's a change in the virtual desks count whether due to desk
-    creation or removal. Specifies the number of available desks. It is not
-    emitted for the first-ever created default desk.
+    creation or removal in classic desks. Specifies the number of available
+    desks. It is not emitted for the first-ever created default desk.
+  </summary>
+</histogram>
+
+<histogram name="Ash.Desks.DesksCount3" units="units"
+    expires_after="2021-11-29">
+  <owner>afakhry@chromium.org</owner>
+  <owner>tclaiborne@chromium.org</owner>
+  <summary>
+    Emitted when there's a change in the virtual desks count whether due to desk
+    creation or removal in Bento. Specifies the number of available desks. It is
+    not emitted for the first-ever created default desk.
   </summary>
 </histogram>
 
 <histogram name="Ash.Desks.DesksSwitch" enum="DesksSwitchSource"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>afakhry@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <summary>
@@ -514,18 +706,22 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Desks.MoveWindowFromActiveDesk"
-    enum="DesksMoveWindowFromActiveDeskSource" expires_after="2021-04-25">
+    enum="DesksMoveWindowFromActiveDeskSource" expires_after="2021-08-09">
   <owner>afakhry@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <summary>
     Emitted when a window is moved from the current active desk to another desk.
     Specifies the source of this action, i.e. whether to window drag-and-drop,
-    or keyboard shortcut.
+    or keyboard shortcut. As of M90, the &quot;Assign to desk menu&quot; bucket
+    is emitted when a user assigns a window to all desks through its context
+    menu. Prior to this, the &quot;Assign to desk menu&quot; bucket was emitted
+    when a user switched desks and their All Desks windows were moved from the
+    old active desk to the new active desk.
   </summary>
 </histogram>
 
 <histogram name="Ash.Desks.NewDesk2" enum="DesksCreationRemovalSource"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>afakhry@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <summary>
@@ -550,7 +746,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Desks.NumberOfWindowsOnDesk_1" units="units"
-    expires_after="2021-04-11">
+    expires_after="2021-06-30">
   <owner>afakhry@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <summary>
@@ -560,7 +756,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Desks.NumberOfWindowsOnDesk_2" units="units"
-    expires_after="2021-04-11">
+    expires_after="2021-06-30">
   <owner>afakhry@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <summary>
@@ -570,7 +766,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Desks.NumberOfWindowsOnDesk_3" units="units"
-    expires_after="2021-04-11">
+    expires_after="2021-06-30">
   <owner>afakhry@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <summary>
@@ -580,7 +776,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Desks.NumberOfWindowsOnDesk_4" units="units"
-    expires_after="2021-04-11">
+    expires_after="2021-06-30">
   <owner>afakhry@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <summary>
@@ -589,6 +785,46 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Ash.Desks.NumberOfWindowsOnDesk_5" units="units"
+    expires_after="2021-06-30">
+  <owner>afakhry@chromium.org</owner>
+  <owner>tclaiborne@chromium.org</owner>
+  <summary>
+    The number of windows on the fifth desk. Emitted when a desk is removed, or
+    a window is moved to another desk.
+  </summary>
+</histogram>
+
+<histogram name="Ash.Desks.NumberOfWindowsOnDesk_6" units="units"
+    expires_after="2021-06-30">
+  <owner>afakhry@chromium.org</owner>
+  <owner>tclaiborne@chromium.org</owner>
+  <summary>
+    The number of windows on the sixth desk. Emitted when a desk is removed, or
+    a window is moved to another desk.
+  </summary>
+</histogram>
+
+<histogram name="Ash.Desks.NumberOfWindowsOnDesk_7" units="units"
+    expires_after="2021-06-30">
+  <owner>afakhry@chromium.org</owner>
+  <owner>tclaiborne@chromium.org</owner>
+  <summary>
+    The number of windows on the seventh desk. Emitted when a desk is removed,
+    or a window is moved to another desk.
+  </summary>
+</histogram>
+
+<histogram name="Ash.Desks.NumberOfWindowsOnDesk_8" units="units"
+    expires_after="2021-06-30">
+  <owner>afakhry@chromium.org</owner>
+  <owner>tclaiborne@chromium.org</owner>
+  <summary>
+    The number of windows on the eighth desk. Emitted when a desk is removed, or
+    a window is moved to another desk.
+  </summary>
+</histogram>
+
 <histogram name="Ash.Desks.PresentationTime.UpdateGesture" units="ms"
     expires_after="2021-09-16">
   <owner>afakhry@chromium.org</owner>
@@ -619,7 +855,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Desks.RemoveDesk" enum="DesksCreationRemovalSource"
-    expires_after="2021-01-03">
+    expires_after="2021-11-29">
   <owner>afakhry@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <summary>
@@ -790,7 +1026,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.DragWindowFromShelf.PresentationTime" units="ms"
-    expires_after="2021-02-03">
+    expires_after="2021-12-31">
   <owner>tbarzic@chromium.org</owner>
   <owner>xdai@chromium.org</owner>
   <summary>
@@ -800,7 +1036,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.DragWindowFromShelf.PresentationTime.MaxLatency"
-    units="ms" expires_after="2021-04-18">
+    units="ms" expires_after="2021-12-31">
   <owner>tbarzic@chromium.org</owner>
   <owner>xdai@chromium.org</owner>
   <summary>
@@ -821,7 +1057,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.HotseatGesture" enum="HotseatInAppGesture"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>andrewxu@chromium.org</owner>
   <owner>tbarzic@chromium.org</owner>
   <summary>Gestures supported by the in-app hotseat.</summary>
@@ -843,7 +1079,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.HotseatTransition.Drag.PresentationTime" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>anasalazar@chromium.org</owner>
   <owner>newcomer@chromium.org</owner>
   <summary>
@@ -897,7 +1133,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.InteractiveWindowResize.TimeToPresent" units="ms"
-    expires_after="2021-02-14">
+    expires_after="2021-12-10">
   <owner>oshima@chromium.org</owner>
   <owner>mukai@chromium.org</owner>
   <summary>
@@ -908,7 +1144,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.InteractiveWindowResize.TimeToPresent.MaxLatency"
-    units="ms" expires_after="2020-12-10">
+    units="ms" expires_after="2021-12-10">
   <owner>oshima@chromium.org</owner>
   <owner>mukai@chromium.org</owner>
   <summary>
@@ -919,36 +1155,40 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Login.Lock.AuthMethod.Switched"
-    enum="AuthMethodSwitchType" expires_after="2021-03-15">
+    enum="AuthMethodSwitchType" expires_after="2021-07-18">
   <owner>rsorokin@chromium.org</owner>
+  <owner>tellier@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
-    The count of auth method switching actions in ChromeOS lock screen.
+    The count of auth method switching actions on ChromeOS lock screen.
   </summary>
 </histogram>
 
 <histogram name="Ash.Login.Lock.AuthMethod.Used.ClamShellMode"
-    enum="AuthMethod" expires_after="2021-03-15">
+    enum="AuthMethod" expires_after="2021-07-18">
   <owner>rsorokin@chromium.org</owner>
+  <owner>tellier@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
     The usage of different auth methods (PIN / Password / Smartlock /
-    Fingerprint) in ChromeOS lock screen clamshell mode.
+    Fingerprint / Challenge response) on Chromebooks in clamshell mode and on
+    other form-factors.
   </summary>
 </histogram>
 
 <histogram name="Ash.Login.Lock.AuthMethod.Used.TabletMode" enum="AuthMethod"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>rsorokin@chromium.org</owner>
+  <owner>tellier@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
     The usage of different auth methods (PIN / Password / Smartlock /
-    Fingerprint) in ChromeOS lock screen tablet mode.
+    Fingerprint / Challenge response) on Chromebooks in tablet mode.
   </summary>
 </histogram>
 
 <histogram name="Ash.Login.Lock.NbPasswordAttempts.UntilFailure"
-    units="attempts" expires_after="2021-05-27">
+    units="attempts" expires_after="2021-08-09">
   <owner>tellier@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -959,7 +1199,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Login.Lock.NbPasswordAttempts.UntilSuccess"
-    units="attempts" expires_after="2021-05-27">
+    units="attempts" expires_after="2021-07-27">
   <owner>tellier@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -978,8 +1218,41 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Ash.Login.Login.AuthMethod.Switched"
+    enum="AuthMethodSwitchType" expires_after="2021-05-16">
+  <owner>rsorokin@chromium.org</owner>
+  <owner>tellier@google.com</owner>
+  <owner>cros-oac@google.com</owner>
+  <summary>
+    The count of auth method switching actions on ChromeOS login screen.
+  </summary>
+</histogram>
+
+<histogram name="Ash.Login.Login.AuthMethod.Used.ClamShellMode"
+    enum="AuthMethod" expires_after="2021-05-16">
+  <owner>rsorokin@chromium.org</owner>
+  <owner>tellier@google.com</owner>
+  <owner>cros-oac@google.com</owner>
+  <summary>
+    The usage of different auth methods (PIN / Password / Smartlock /
+    Fingerprint / Challenge response) on Chromebooks in clamshell mode and on
+    other form-factors.
+  </summary>
+</histogram>
+
+<histogram name="Ash.Login.Login.AuthMethod.Used.TabletMode" enum="AuthMethod"
+    expires_after="2021-05-16">
+  <owner>rsorokin@chromium.org</owner>
+  <owner>tellier@google.com</owner>
+  <owner>cros-oac@google.com</owner>
+  <summary>
+    The usage of different auth methods (PIN / Password / Smartlock /
+    Fingerprint / Challenge response) on Chromebooks in tablet mode.
+  </summary>
+</histogram>
+
 <histogram name="Ash.Login.Login.MigrationBanner" enum="BooleanShown"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>rsorokin@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -999,14 +1272,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Login.OOBE.UserClicks" enum="OobeUserClickTarget"
-    expires_after="2021-04-18">
+    expires_after="2021-08-09">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>What shelf buttons or trays are clicked in the OOBE.</summary>
 </histogram>
 
 <histogram name="Ash.Login.PinAutosubmit.Backfill"
-    enum="PinAutosubmitBackfillEvent" expires_after="2021-03-30">
+    enum="PinAutosubmitBackfillEvent" expires_after="2021-08-01">
   <owner>rrsilva@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -1016,6 +1289,83 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram base="true" name="Ash.LoginAnimation.Duration" units="ms"
+    expires_after="2021-12-10">
+  <owner>oshima@chromium.org</owner>
+  <owner>chromeos-wmp@google.com</owner>
+<!-- Name completed by histogram_suffixes
+     name="TabletOrClamshellMode" -->
+
+  <summary>
+    The duration of how long it took to finish all animations applied during the
+    login process, from the time the first animation is added, to the time the
+    last animation is finished.
+  </summary>
+</histogram>
+
+<histogram base="true" name="Ash.LoginAnimation.Jank" units="%"
+    expires_after="2021-12-10">
+  <owner>oshima@chromium.org</owner>
+  <owner>chromeos-wmp@google.com</owner>
+<!-- Name completed by histogram_suffixes
+     name="TabletOrClamshellMode" -->
+
+  <summary>
+    Jank metrics of all animations applied during the login process. This
+    represents how often the frame update rate changed during animation.
+  </summary>
+</histogram>
+
+<histogram base="true" name="Ash.LoginAnimation.Smoothness" units="%"
+    expires_after="2021-12-10">
+  <owner>oshima@chromium.org</owner>
+  <owner>chromeos-wmp@google.com</owner>
+<!-- Name completed by histogram_suffixes
+     name="TabletOrClamshellMode" -->
+
+  <summary>
+    Relative smoothness of all animations applied during the login process. 100%
+    represents the ideal smoothness for 60 frames per second.
+  </summary>
+</histogram>
+
+<histogram name="Ash.Media.CameraPrivacySwitch.Event"
+    enum="CameraPrivacySwitchEvent" expires_after="2021-12-31">
+  <owner>tbarzic@chromium.org</owner>
+  <owner>gzadina@google.com</owner>
+  <summary>
+    Reports events related to camera privacy switch state. The camera privacy
+    switch is a hardware toggle supported by some Chrome OS devices that
+    disables the built in camera video feed. The histogram is reported (1) when
+    a camera privacy switch state change is detected (which generally causes a
+    system toast to get shown), and (2) when a notification informing the user
+    that the camera privacy switch is on (the notification is shown if the user
+    tries to use their camera with the privacy switch tuned on). The camera
+    privacy switch state is only recorded if the state change is a result of a
+    user action - it will not be recorded for state changes that are a result of
+    camera privacy switch state initialization.
+  </summary>
+</histogram>
+
+<histogram name="Ash.Media.CameraPrivacySwitch.TimeFromNotificationToOff"
+    units="5 seconds" expires_after="2021-12-31">
+  <owner>tbarzic@chromium.org</owner>
+  <owner>gzadina@google.com</owner>
+  <summary>
+    Time from showing a notification informing the user about the camera privacy
+    switch to the user turning the privacy switch off. The camera privacy switch
+    is a hardware switch supported by some Chrome OS devices that cuts the video
+    camera feed off. The Chrome OS UI shows a notification if the user tries to
+    use the camera with the privacy switch on. The intention is to track the
+    time it takes for the user to flip the privacy switch after they're notified
+    the camera is disabled. The histogram is recorded if the user toggles the
+    camera privacy switch after seeing the notification about the privacy switch
+    being on (if the switch is toggled more than once after the notification
+    gets shown, only the first toggle action will be reported). The time is
+    reported in seconds with 5 second granularity.
+  </summary>
+</histogram>
+
 <histogram base="true" name="Ash.NavigationWidget.AnimationSmoothness"
     units="%" expires_after="2021-05-31">
 <!-- Name completed by histogram suffixes
@@ -1036,14 +1386,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.NightLight.AutoNightLightNotificationShown"
-    enum="BooleanShown" expires_after="2020-12-02">
+    enum="BooleanShown" expires_after="2021-11-29">
   <owner>afakhry@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <summary>Emitted when the Auto Night Light notification is shown.</summary>
 </histogram>
 
 <histogram name="Ash.NightLight.AutoNightLightNotificationState"
-    enum="AshAutoNightLightNotificationState" expires_after="2020-12-02">
+    enum="AshAutoNightLightNotificationState" expires_after="2021-11-29">
   <owner>afakhry@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <summary>
@@ -1053,7 +1403,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.NightLight.DisplayCrtcCtmSupport"
-    enum="AshNightLightDisplayCrtcCtmSupportType" expires_after="2021-02-10">
+    enum="AshNightLightDisplayCrtcCtmSupportType" expires_after="2022-02-01">
   <owner>afakhry@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <summary>
@@ -1065,7 +1415,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.NightLight.ScheduleType" enum="AshNightLightScheduleType"
-    expires_after="2021-04-11">
+    expires_after="2021-07-11">
   <owner>afakhry@chromium.org</owner>
   <summary>
     The selected Night Light schedule type. Emitted when the user changes the
@@ -1074,8 +1424,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.NightLight.Temperature"
-    enum="AshNightLightTemperatureRanges" expires_after="2021-02-07">
+    enum="AshNightLightTemperatureRanges" expires_after="2022-02-01">
   <owner>afakhry@chromium.org</owner>
+  <owner>tclaiborne@chromium.org</owner>
   <summary>
     The ranges in which the selected values of the Night Light color temperature
     reside. Emitted when the user drags the Night Light color temperature slider
@@ -1084,7 +1435,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.NumberOfVisibleWindowsInPrimaryDisplay" units="Windows"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>jamescook@chromium.org</owner>
   <summary>
     An upper bound on the number of windows visible to the user on the primary
@@ -1181,7 +1532,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Overview.WindowDrag.Workflow" enum="OverviewDragAction"
-    expires_after="2020-12-12">
+    expires_after="2021-12-12">
   <owner>amusbach@chromium.org</owner>
   <owner>xdai@chromium.org</owner>
   <summary>
@@ -1191,6 +1542,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Ash.PciePeripheral.ConnectivityResults"
+    enum="PciePeripheralConnectivityResult" expires_after="M94">
+  <owner>jimmyxgong@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>
+    The connectivity results of when the user plugs in a Thunderbolt/USB4
+    peripheral to their Chrome OS device. This is recorded for only devices that
+    support Thunderbolt/USB4 connectivity. Gets recorded every time a
+    Thunderbolt/USB4 peripheral is plugged in.
+  </summary>
+</histogram>
+
 <histogram name="Ash.PersistentWindow.NumOfWindowsRestored" units="units"
     expires_after="M82">
   <owner>zentaro@chromium.org</owner>
@@ -1204,24 +1567,48 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Ash.PhoneHub.InterstitialScreenEvent.{Screen}"
     enum="PhoneHubInterstitialScreenEvent" expires_after="2021-10-31">
+  <obsolete>
+    Moved to tools/metrics/histograms/histograms_xml/phonehub/histograms.xml.
+    Removed 11/2020 in M89.
+  </obsolete>
   <owner>tengs@chromium.org</owner>
   <owner>khorimoto@chromium.org</owner>
-  <summary>Events for the given PhoneHub interstitial screen.</summary>
+  <summary>
+    Events logged when the given PhoneHub interstitial screen is shown.
+  </summary>
 <!-- The entries below should be a subset of the PhoneHubScreen enum -->
 
   <token key="Screen">
     <variant name="BluetoothOrWifiDisabled"/>
-    <variant name="ConnectionError"/>
-    <variant name="InitialConnecting"/>
+    <variant name="ConnectionError">
+      <obsolete>
+        Renamed to PhoneDisconnected on Nov 2020.
+      </obsolete>
+    </variant>
+    <variant name="InitialConnecting">
+      <obsolete>
+        Combined into PhoneConnecting on Nov 2020.
+      </obsolete>
+    </variant>
     <variant name="Onboarding.ExistingMultideviceUser"/>
     <variant name="Onboarding.NewMultideviceUser"/>
     <variant name="OnboardingDismissPrompt"/>
-    <variant name="Reconnecting"/>
+    <variant name="PhoneConnecting"/>
+    <variant name="PhoneDisconnected"/>
+    <variant name="Reconnecting">
+      <obsolete>
+        Combined into PhoneConnecting on Nov 2020.
+      </obsolete>
+    </variant>
   </token>
 </histogram>
 
 <histogram name="Ash.PhoneHub.NotificationCount" units="notifications"
     expires_after="2021-10-31">
+  <obsolete>
+    Moved to tools/metrics/histograms/histograms_xml/phonehub/histograms.xml.
+    Removed 11/2020 in M89.
+  </obsolete>
   <owner>tengs@chromium.org</owner>
   <owner>khorimoto@chromium.org</owner>
   <summary>
@@ -1232,6 +1619,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Ash.PhoneHub.NotificationOptInEvents"
     enum="PhoneHubInterstitialScreenEvent" expires_after="2021-10-31">
+  <obsolete>
+    Moved to tools/metrics/histograms/histograms_xml/phonehub/histograms.xml.
+    Removed 11/2020 in M89.
+  </obsolete>
   <owner>tengs@chromium.org</owner>
   <owner>khorimoto@chromium.org</owner>
   <summary>Events for the given notification opt-in prompt.</summary>
@@ -1239,6 +1630,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Ash.PhoneHub.QuickActionClicked" enum="PhoneHubQuickAction"
     expires_after="2021-10-31">
+  <obsolete>
+    Moved to tools/metrics/histograms/histograms_xml/phonehub/histograms.xml.
+    Removed 11/2020 in M89.
+  </obsolete>
   <owner>tengs@chromium.org</owner>
   <owner>khorimoto@chromium.org</owner>
   <summary>Event logged after the user clicks on a quick action.</summary>
@@ -1246,6 +1641,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Ash.PhoneHub.ScreenOnSettingsButtonClicked"
     enum="PhoneHubScreen" expires_after="2021-10-31">
+  <obsolete>
+    Moved to tools/metrics/histograms/histograms_xml/phonehub/histograms.xml.
+    Removed 11/2020 in M89.
+  </obsolete>
   <owner>tengs@chromium.org</owner>
   <owner>khorimoto@chromium.org</owner>
   <summary>
@@ -1256,6 +1655,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Ash.PhoneHub.ScreenOn{BubbleEvent}" enum="PhoneHubScreen"
     expires_after="2021-10-31">
+  <obsolete>
+    Moved to tools/metrics/histograms/histograms_xml/phonehub/histograms.xml.
+    Removed 11/2020 in M89.
+  </obsolete>
   <owner>tengs@chromium.org</owner>
   <owner>khorimoto@chromium.org</owner>
   <summary>
@@ -1270,6 +1673,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Ash.PhoneHub.TabContinuationChipClicked" units="tab index"
     expires_after="2021-10-31">
+  <obsolete>
+    Moved to tools/metrics/histograms/histograms_xml/phonehub/histograms.xml.
+    Removed 11/2020 in M89.
+  </obsolete>
   <owner>tengs@chromium.org</owner>
   <owner>khorimoto@chromium.org</owner>
   <summary>
@@ -1280,13 +1687,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Pip.AndroidPipUseTime" units="ms"
-    expires_after="2021-06-16">
+    expires_after="2021-08-15">
   <owner>takise@chromium.org</owner>
   <owner>linben@chromium.org</owner>
   <summary>How long Android PIP was used for, upon ending the session.</summary>
 </histogram>
 
-<histogram name="Ash.Pip.Events" enum="AshPipEvents" expires_after="2021-06-16">
+<histogram name="Ash.Pip.Events" enum="AshPipEvents" expires_after="2021-08-15">
   <owner>takise@chromium.org</owner>
   <owner>linben@chromium.org</owner>
   <summary>
@@ -1392,7 +1799,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Shelf.NavigationButtonsInTabletMode.ReasonShown"
-    enum="ReasonToShowShelfNavigationButtons" expires_after="2021-05-01">
+    enum="ReasonToShowShelfNavigationButtons" expires_after="2021-07-04">
   <owner>tbarzic@chromium.org</owner>
   <owner>gzadina@google.com</owner>
   <summary>
@@ -1406,7 +1813,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Shelf.NumberOfItems" units="Icons"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>anasalazar@google.com</owner>
   <owner>mmourgos@google.com</owner>
   <summary>
@@ -1416,7 +1823,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Shelf.NumberOfPinnedItems" units="Icons"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>anasalazar@google.com</owner>
   <owner>mmourgos@google.com</owner>
   <summary>
@@ -1426,7 +1833,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Shelf.NumberOfUnpinnedItems" units="Icons"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>anasalazar@google.com</owner>
   <owner>mmourgos@google.com</owner>
   <summary>
@@ -1606,7 +2013,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Ash.Shelf.UkmLogger.HasNightLightSchedule" enum="Boolean"
     expires_after="2020-09-27">
   <owner>wrong@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     Whether or not the user had set up a night light schedule at the time of
     night light event logging.
@@ -1616,7 +2022,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Ash.Shelf.UkmLogger.NumAvailableBluetoothDevices"
     units="count" expires_after="2020-09-27">
   <owner>wrong@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
   <summary>
     The number of Bluetooth devices available at the time of Bluetooth event
     logging.
@@ -1660,7 +2065,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.SplitView.TimeInMultiDisplaySplitView" units="ms"
-    expires_after="2020-12-12">
+    expires_after="2021-12-12">
   <owner>amusbach@chromium.org</owner>
   <owner>xdai@chromium.org</owner>
   <summary>
@@ -1671,7 +2076,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Ash.SplitView.TimeInSplitView" units="ms" expires_after="M92">
+<histogram name="Ash.SplitView.TimeInSplitView" units="ms"
+    expires_after="2021-08-09">
   <owner>xdai@chromium.org</owner>
   <summary>
     The amount of time that the user spent in split view mode. The time is
@@ -1681,7 +2087,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.SplitViewResize.AnimationSmoothness.DividerAnimation"
-    units="%" expires_after="2021-06-15">
+    units="%" expires_after="2021-08-15">
   <owner>sammiequon@chromium.org</owner>
   <owner>xdai@chromium.org</owner>
   <summary>
@@ -1692,7 +2098,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Ash.SplitViewResize.PresentationTime" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="SplitViewResizeModes" -->
 
   <owner>amusbach@chromium.org</owner>
@@ -1705,7 +2111,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Ash.SplitViewResize.PresentationTime.MaxLatency"
-    units="ms" expires_after="2020-12-12">
+    units="ms" expires_after="2021-12-12">
 <!-- Name completed by histogram_suffixes name="SplitViewResizeModes" -->
 
   <owner>amusbach@chromium.org</owner>
@@ -1756,7 +2162,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.SwipeHomeToOverviewGesture"
-    enum="SwipeHomeToOverviewResult" expires_after="2021-04-04">
+    enum="SwipeHomeToOverviewResult" expires_after="2021-08-09">
   <owner>andrewxu@chromium.org</owner>
   <owner>tbarzic@chromium.org</owner>
   <summary>
@@ -1796,7 +2202,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.TabletMode.AnimationSmoothness.Enter" units="%"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>oshima@chromium.org</owner>
   <owner>sammiequon@chromium.org</owner>
   <summary>
@@ -1807,7 +2213,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.TabletMode.AnimationSmoothness.Exit" units="%"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>oshima@chromium.org</owner>
   <owner>sammiequon@chromium.org</owner>
   <summary>
@@ -1849,7 +2255,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.TouchView.LidAngle" units="degrees"
-    expires_after="2021-03-15">
+    expires_after="2021-07-27">
   <owner>oshima@chromium.org</owner>
   <summary>
     Chrome OS only. The computed angle between the lid and the keyboard panel.
@@ -1860,7 +2266,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.TouchView.TouchViewActive" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>girard@chromium.org</owner>
   <summary>
     The length of time that TouchView is active, for each activation.
@@ -1868,31 +2274,57 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.TouchView.TouchViewActivePercentage" units="%"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>girard@chromium.org</owner>
   <summary>The proportion of time spent in TouchView during a session.</summary>
 </histogram>
 
 <histogram name="Ash.TouchView.TouchViewActiveTotal" units="minutes"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>girard@chromium.org</owner>
   <summary>The total time that TouchView is active during a session.</summary>
 </histogram>
 
 <histogram name="Ash.TouchView.TouchViewInactive" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>girard@chromium.org</owner>
   <summary>The length of time between TouchView activations.</summary>
 </histogram>
 
 <histogram name="Ash.TouchView.TouchViewInactiveTotal" units="minutes"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>girard@chromium.org</owner>
   <summary>
     The total time that TouchView is not active during a session.
   </summary>
 </histogram>
 
+<histogram base="true" name="Ash.UnlockAnimation.Jank" units="%"
+    expires_after="2021-12-10">
+  <owner>oshima@chromium.org</owner>
+  <owner>chromeos-wmp@google.com</owner>
+<!-- Name completed by histogram_suffixes
+     name="TabletOrClamshellMode" -->
+
+  <summary>
+    Jank metrics of all animations applied during the unlock process. This
+    represents how often the frame update rate changed during animation.
+  </summary>
+</histogram>
+
+<histogram base="true" name="Ash.UnlockAnimation.Smoothness" units="%"
+    expires_after="2021-12-10">
+  <owner>oshima@chromium.org</owner>
+  <owner>chromeos-wmp@google.com</owner>
+<!-- Name completed by histogram_suffixes
+     name="TabletOrClamshellMode" -->
+
+  <summary>
+    Relative smoothness of all animations applied during the unlock process.
+    100% represents the ideal smoothness for 60 frames per second.
+  </summary>
+</histogram>
+
 <histogram name="Ash.Wallpaper.ColorExtractionResult2"
     enum="WallpaperColorExtractionResult" expires_after="M92">
   <owner>newcomer@chromium.org</owner>
@@ -1904,7 +2336,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.Wallpaper.CustomLayout" enum="WallpaperLayout"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>xdai@chromium.org</owner>
   <summary>
     The custom wallpaper layout type. Recorded when the user sets a new custom
@@ -1912,7 +2344,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Ash.Wallpaper.Source" enum="WallpaperType" expires_after="M92">
+<histogram name="Ash.Wallpaper.Source" enum="WallpaperType"
+    expires_after="2021-08-09">
   <owner>xdai@chromium.org</owner>
   <summary>
     Recorded when a new wallpaper is set, either by the built-in Wallpaper
@@ -1921,13 +2354,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Ash.Wallpaper.Type" enum="WallpaperType" expires_after="M92">
+<histogram name="Ash.Wallpaper.Type" enum="WallpaperType"
+    expires_after="2021-08-09">
   <owner>kuscher@google.com</owner>
   <summary>The wallpaper type. Recorded at user login.</summary>
 </histogram>
 
 <histogram name="Ash.Window.AnimationSmoothness.CrossFade" units="%"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>wutao@chromium.org</owner>
   <summary>
     Relative smoothness of cross fade animation when setting window bounds. 100%
@@ -1993,7 +2427,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.WindowCycleController.DesksSwitchDistance" units="units"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>afakhry@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <summary>
@@ -2004,8 +2438,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Ash.WindowCycleController.InitialMode" enum="AltTabMode"
+    expires_after="2022-03-09">
+  <owner>afakhry@chromium.org</owner>
+  <owner>cattalyya@chromium.org</owner>
+  <owner>tclaiborne@chromium.org</owner>
+  <summary>
+    Emitted when the user starts Alt-Tab, if and only if user had 2 or more
+    desks and Bento is not disabled, to report the initial alt-tab mode, which
+    signals user's saved and preferred mode.
+  </summary>
+</histogram>
+
 <histogram name="Ash.WindowCycleController.Items" units="items"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>sammiequon@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <owner>xdai@chromium.org</owner>
@@ -2015,8 +2461,32 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Ash.WindowCycleController.ModeSwitchSource"
+    enum="AltTabModeSwitchSource" expires_after="2022-03-09">
+  <owner>afakhry@chromium.org</owner>
+  <owner>cattalyya@chromium.org</owner>
+  <owner>tclaiborne@chromium.org</owner>
+  <summary>
+    Emitted when the user switches the Alt-Tab mode, if and only if user had 2
+    or more desks and Bento is not disabled, to report whether the user switches
+    the mode via a click or keyboard.
+  </summary>
+</histogram>
+
+<histogram name="Ash.WindowCycleController.SwitchMode" enum="AltTabMode"
+    expires_after="2022-03-09">
+  <owner>afakhry@chromium.org</owner>
+  <owner>cattalyya@chromium.org</owner>
+  <owner>tclaiborne@chromium.org</owner>
+  <summary>
+    Emitted when the user switches the Alt-Tab mode from a click or keyboard, if
+    and only if user had 2 or more desks and Bento is not disabled, to report
+    the alt-tab mode the user switches to.
+  </summary>
+</histogram>
+
 <histogram name="Ash.WindowCycleController.TimeBetweenTaskSwitches"
-    units="seconds" expires_after="2021-03-15">
+    units="seconds" expires_after="2021-08-09">
   <owner>sammiequon@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <owner>xdai@chromium.org</owner>
@@ -2027,7 +2497,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.WindowCycleView.AnimationSmoothness.Container" units="%"
-    expires_after="2021-05-31">
+    expires_after="2021-08-22">
   <owner>yjliu@chromium.org</owner>
   <owner>chromeos-wmp@google.com</owner>
   <summary>
@@ -2039,7 +2509,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.WindowCycleView.AnimationSmoothness.Show" units="%"
-    expires_after="2021-05-31">
+    expires_after="2021-08-09">
   <owner>yjliu@chromium.org</owner>
   <owner>chromeos-wmp@google.com</owner>
   <summary>
@@ -2051,7 +2521,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ash.WindowDragFromShelfResult" enum="ShelfWindowDragResult"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>andrewxu@chromium.org</owner>
   <owner>tbarzic@chromium.org</owner>
   <summary>
@@ -2200,7 +2670,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Ash.WorkspaceWindowResizer.TabDragging.PresentationTime.ClamshellMode"
-    units="ms" expires_after="2021-02-03">
+    units="ms" expires_after="2021-08-01">
   <owner>yichenz@chromium.org</owner>
   <owner>chromeos-wmp@google.com</owner>
   <summary>
@@ -2212,7 +2682,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Ash.WorkspaceWindowResizer.TabDragging.PresentationTime.MaxLatency.ClamshellMode"
-    units="ms" expires_after="2021-02-03">
+    units="ms" expires_after="2021-08-09">
   <owner>yichenz@chromium.org</owner>
   <owner>chromeos-wmp@google.com</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/assistant/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/assistant/histograms.xml
index 6bbf8b4f2c8..3f8391d51b0 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/assistant/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/assistant/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="Assistant.BetterOnboarding.Click"
-    enum="AssistantBetterOnboardingType" expires_after="2021-02-07">
+    enum="AssistantBetterOnboardingType" expires_after="2021-07-18">
   <owner>xiaohuic@chromium.org</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -31,7 +31,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Assistant.BetterOnboarding.Shown"
-    enum="AssistantBetterOnboardingMode" expires_after="2021-04-11">
+    enum="AssistantBetterOnboardingMode" expires_after="2021-08-15">
   <owner>xiaohuic@chromium.org</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -50,7 +50,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Assistant.ContextEnabledUserCount" enum="BooleanEnabled"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>updowndota@chromium.org</owner>
   <owner>xiaohuic@chromium.org</owner>
   <summary>
@@ -62,7 +62,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Assistant.DspHotwordDetection"
-    enum="DspHotwordDetectionStatus" expires_after="2020-05-23">
+    enum="DspHotwordDetectionStatus" expires_after="2021-08-01">
   <owner>meilinw@chromium.org</owner>
   <owner>xiaohuic@chromium.org</owner>
   <summary>
@@ -72,7 +72,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Assistant.EntryPoint" enum="AssistantEntryPoint"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>xiaohuic@chromium.org</owner>
   <owner>meilinw@chromium.org</owner>
   <summary>
@@ -81,7 +81,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Assistant.ExitPoint" enum="AssistantExitPoint"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>xiaohuic@chromium.org</owner>
   <owner>meilinw@chromium.org</owner>
   <summary>
@@ -90,7 +90,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Assistant.HotwordEnableNotification" enum="BooleanHit"
-    expires_after="2020-12-31">
+    expires_after="2021-05-31">
   <owner>updowndota@chromium.org</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -111,7 +111,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Assistant.OptInFlow.GetSettingsRequestTime" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>updowndota@chromium.org</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -121,8 +121,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Assistant.OptInFlow.LoadingTimeoutCount" units="units"
-    expires_after="2020-12-31">
+<histogram name="Assistant.OptInFlow.LoadingTimeoutCount" units="timeouts"
+    expires_after="2021-08-01">
   <owner>updowndota@chromium.org</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -133,28 +133,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Assistant.OptInFlowStatus" enum="AssistantOptInFlowStatus"
-    expires_after="2021-03-15">
+    expires_after="2021-08-01">
   <owner>updowndota@chromium.org</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>Record the status of the Assistant opt-in flow.</summary>
 </histogram>
 
 <histogram name="Assistant.QueryCountPerEntryPoint" enum="AssistantEntryPoint"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>xiaohuic@chromium.org</owner>
   <owner>meilinw@chromium.org</owner>
   <summary>Number of queries fired for each entry point.</summary>
 </histogram>
 
 <histogram name="Assistant.QueryResponseType" enum="AssistantQueryResponseType"
-    expires_after="2021-04-11">
+    expires_after="2021-08-09">
   <owner>xiaohuic@chromium.org</owner>
   <owner>meilinw@chromium.org</owner>
   <summary>The Assistant query response type.</summary>
 </histogram>
 
 <histogram name="Assistant.QuerySource" enum="AssistantQuerySource"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>xiaohuic@chromium.org</owner>
   <owner>meilinw@chromium.org</owner>
   <summary>
@@ -164,7 +164,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Assistant.ServiceEnabledUserCount" enum="BooleanEnabled"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>xiaohuic@chromium.org</owner>
   <owner>meilinw@chromium.org</owner>
   <summary>
@@ -176,7 +176,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Assistant.ServiceReadyTime" units="ms"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>xiaohuic@chromium.org</owner>
   <owner>jeroendh@google.com</owner>
   <summary>
@@ -186,13 +186,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Assistant.ServiceStartTime" units="ms"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>updowndota@chromium.org</owner>
   <summary>Amount of time spent in starting Assistant service.</summary>
 </histogram>
 
 <histogram name="Assistant.SetDspHotwordLocale" enum="BooleanSuccess"
-    expires_after="2021-05-14">
+    expires_after="2021-08-09">
   <owner>meilinw@chromium.org</owner>
   <owner>xiaohuic@chromium.org</owner>
   <summary>
@@ -201,29 +201,50 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Assistant.VoiceSearch.ConsentOutcome"
+    enum="AssistantConsentOutcome" expires_after="2021-06-20">
+  <owner>wylieb@chromium.org</owner>
+  <owner>fgorski@chromium.org</owner>
+  <summary>
+    (Android only) Reports the outcome of the consent dialog shown for the
+    assistant.
+  </summary>
+</histogram>
+
 <histogram name="Assistant.VoiceSearch.UserEligibility" enum="BooleanEligible"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>wylieb@chromium.org</owner>
   <owner>fgorski@chromium.org</owner>
   <summary>
-    (Android only) Reports user eligibility for the feature, but ignores if the
-    feature is enabled. The criteria includes: locale, agsa version and
-    available memory.
+    (Android only) Reports user eligibility for the feature when the mic is
+    clicked. This is reported even when the feature is disabled.
+
+    Before M90, this histogram was reported to multiple times per-search and at
+    other random points in time.
+
+    From M90 onwards, this histogram is reported to exactly once per mic click.
   </summary>
 </histogram>
 
 <histogram name="Assistant.VoiceSearch.UserEligibility.FailureReason"
-    enum="EligibilityFailureReason" expires_after="2021-04-18">
+    enum="EligibilityFailureReason" expires_after="2021-08-22">
   <owner>wylieb@chromium.org</owner>
   <owner>fgorski@chromium.org</owner>
   <summary>
     (Android only) Reports why users failed the eligibility check for the
-    feature.
+    feature. This metric is reported every time the mic button is clicked.
+
+    Before M90, this histogram only reported the FailureReason which failed the
+    eligibility check. If a client failed for multiple reasons, some would be
+    ignored.
+
+    From M90 onwards, this will report all FailureReasons that effect
+    eligibility.
   </summary>
 </histogram>
 
 <histogram name="QuickAnswers.ActiveImpression" enum="QuickAnswersResultType"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>llin@google.com</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -233,7 +254,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="QuickAnswers.ActiveImpression.Duration" units="ms"
-    expires_after="2021-04-25">
+    expires_after="2021-07-11">
   <owner>llin@google.com</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -243,7 +264,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="QuickAnswers.Click" enum="QuickAnswersResultType"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>llin@google.com</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -252,7 +273,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="QuickAnswers.Click.Duration" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>llin@google.com</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -262,7 +283,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="QuickAnswers.Consent" units="impressions"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>llin@google.com</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -272,7 +293,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="QuickAnswers.Consent.Duration" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-08-09">
   <owner>llin@google.com</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -282,7 +303,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="QuickAnswers.Consent.Impression"
-    units="impressions" expires_after="2021-04-25">
+    units="impressions" expires_after="2021-06-27">
   <owner>llin@google.com</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -292,7 +313,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="QuickAnswers.ContextMenu.Close" enum="BooleanClicked"
-    expires_after="2021-02-14">
+    expires_after="2021-06-27">
   <owner>updowndota@google.com</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -304,8 +325,23 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="QuickAnswers.ContextMenu.Close.Duration{InteractionType}"
+    units="ms" expires_after="2021-06-27">
+  <owner>updowndota@chromium.org</owner>
+  <owner>croissant-eng@chromium.org</owner>
+  <summary>
+    Records the amount of time the context menu was shown before close if the
+    user {InteractionType} (via clicking) with the context menu. Recorded on
+    ChromeOS only.
+  </summary>
+  <token key="InteractionType">
+    <variant name="WithClick" summary="has interacted"/>
+    <variant name="WithoutClick" summary="has not interacted"/>
+  </token>
+</histogram>
+
 <histogram name="QuickAnswers.Intent" enum="QuickAnswersIntentType"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>llin@google.com</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -315,7 +351,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="QuickAnswers.Loading.Duration" units="ms"
-    expires_after="2021-02-14">
+    expires_after="2021-07-18">
   <owner>llin@google.com</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -325,7 +361,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="QuickAnswers.Loading.Status" enum="QuickAnswersLoadStatus"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>llin@google.com</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -333,8 +369,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="QuickAnswers.NetworkError.IntentType"
+    enum="QuickAnswersIntentType" expires_after="2021-06-27">
+  <owner>updowndota@google.com</owner>
+  <owner>croissant-eng@chromium.org</owner>
+  <summary>
+    Records the intent type when network error occurs during the quick answers
+    fetch. ChromeOS only.
+  </summary>
+</histogram>
+
 <histogram name="QuickAnswers.Result" enum="QuickAnswersResultType"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>llin@google.com</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -344,7 +390,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="QuickAnswers.Result.Duration" units="ms"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>llin@google.com</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
@@ -354,7 +400,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="QuickAnswers.SelectedContent.Length" units="characters"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>llin@google.com</owner>
   <owner>croissant-eng@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/auth/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/auth/histograms.xml
index aeaf24e22ba..896b702d127 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/auth/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/auth/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="AuthPolicy.ErrorTypeOfAuthenticateUser"
-    enum="AuthPolicyErrorType" expires_after="M90">
+    enum="AuthPolicyErrorType" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -31,14 +31,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AuthPolicy.ErrorTypeOfAutoMachinePasswordChange"
-    enum="AuthPolicyErrorType" expires_after="M90">
+    enum="AuthPolicyErrorType" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>Result from automatic background machine password renewal.</summary>
 </histogram>
 
 <histogram name="AuthPolicy.ErrorTypeOfAutoTgtRenewal"
-    enum="AuthPolicyErrorType" expires_after="M90">
+    enum="AuthPolicyErrorType" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -47,7 +47,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AuthPolicy.ErrorTypeOfGetUserKerberosFiles"
-    enum="AuthPolicyErrorType" expires_after="M90">
+    enum="AuthPolicyErrorType" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -57,7 +57,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AuthPolicy.ErrorTypeOfGetUserStatus"
-    enum="AuthPolicyErrorType" expires_after="M90">
+    enum="AuthPolicyErrorType" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -67,7 +67,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AuthPolicy.ErrorTypeOfJoinADDomain" enum="AuthPolicyErrorType"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -76,7 +76,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AuthPolicy.ErrorTypeOfRefreshDevicePolicy"
-    enum="AuthPolicyErrorType" expires_after="M90">
+    enum="AuthPolicyErrorType" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -86,7 +86,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AuthPolicy.ErrorTypeOfRefreshUserPolicy"
-    enum="AuthPolicyErrorType" expires_after="M90">
+    enum="AuthPolicyErrorType" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -96,7 +96,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AuthPolicy.FailedTriesOfKinit" units="units"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -108,7 +108,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AuthPolicy.FailedTriesOfSmbClient" units="units"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -119,7 +119,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AuthPolicy.KerberosEncryptionTypes.AuthenticateUser"
-    enum="KerberosEncryptionTypes" expires_after="M90">
+    enum="KerberosEncryptionTypes" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -129,7 +129,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AuthPolicy.KerberosEncryptionTypes.JoinADDomain"
-    enum="KerberosEncryptionTypes" expires_after="M90">
+    enum="KerberosEncryptionTypes" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -140,7 +140,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AuthPolicy.NumGposToDownload" units="units"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -151,7 +151,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AuthPolicy.TimeToAuthenticateUser" units="ms"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -161,7 +161,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AuthPolicy.TimeToGetUserKerberosFiles" units="ms"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -171,7 +171,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="AuthPolicy.TimeToGetUserStatus" units="ms" expires_after="M90">
+<histogram name="AuthPolicy.TimeToGetUserStatus" units="ms" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -180,7 +180,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="AuthPolicy.TimeToJoinADDomain" units="ms" expires_after="M90">
+<histogram name="AuthPolicy.TimeToJoinADDomain" units="ms" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -191,7 +191,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AuthPolicy.TimeToRefreshDevicePolicy" units="ms"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -202,7 +202,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AuthPolicy.TimeToRefreshUserPolicy" units="ms"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -212,7 +212,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="AuthPolicy.TimeToRunKinit" units="ms" expires_after="M90">
+<histogram name="AuthPolicy.TimeToRunKinit" units="ms" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -223,7 +223,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="AuthPolicy.TimeToRunKlist" units="ms" expires_after="M90">
+<histogram name="AuthPolicy.TimeToRunKlist" units="ms" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -234,7 +234,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="AuthPolicy.TimeToRunKpasswd" units="ms" expires_after="M90">
+<histogram name="AuthPolicy.TimeToRunKpasswd" units="ms" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -245,7 +245,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="AuthPolicy.TimeToRunNetAdsGpo" units="ms" expires_after="M90">
+<histogram name="AuthPolicy.TimeToRunNetAdsGpo" units="ms" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -255,7 +255,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="AuthPolicy.TimeToRunNetAdsInfo" units="ms" expires_after="M90">
+<histogram name="AuthPolicy.TimeToRunNetAdsInfo" units="ms" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -265,7 +265,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="AuthPolicy.TimeToRunNetAdsJoin" units="ms" expires_after="M90">
+<histogram name="AuthPolicy.TimeToRunNetAdsJoin" units="ms" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -276,7 +276,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AuthPolicy.TimeToRunNetAdsSearch" units="ms"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -287,7 +287,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AuthPolicy.TimeToRunNetAdsWorkgroup" units="ms"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -297,7 +297,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="AuthPolicy.TimeToRunSmbclient" units="ms" expires_after="M90">
+<histogram name="AuthPolicy.TimeToRunSmbclient" units="ms" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/auto/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/auto/histograms.xml
index 711457f2a13..a9f0fc1ecc7 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/auto/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/auto/histograms.xml
@@ -25,7 +25,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     units="count" expires_after="2021-06-30">
 <!-- Name completed by histogram_suffixes name="AlsBrightnessDirection" and name="AdapterDecision" -->
 
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -42,7 +41,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     units="count" expires_after="2021-06-30">
 <!-- Name completed by histogram_suffixes name="AlsBrightnessDirection" and name="AdapterDecision" -->
 
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -57,7 +55,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="AutoScreenBrightness.AdapterDecisionAtUserChange.BrightnessChange.Cause"
     enum="AutoScreenBrightnessBrightnessChangeCause" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -73,7 +70,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     units="count" expires_after="2021-06-30">
 <!-- Name completed by histogram_suffixes name="AdapterDecision" -->
 
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -88,7 +84,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     name="AutoScreenBrightness.AdapterDecisionAtUserChange.NoBrightnessChange.Cause"
     enum="AutoScreenBrightnessNoBrightnessChangeCause"
     expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -104,7 +99,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     units="count" expires_after="2021-06-30">
 <!-- Name completed by histogram_suffixes name="AdapterDecision" -->
 
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -118,7 +112,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.AlsReaderStatus"
     enum="AutoScreenBrightnessAlsReaderStatus" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -129,7 +122,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.BrightnessChange.Cause"
     enum="AutoScreenBrightnessBrightnessChangeCause" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -138,7 +130,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.BrightnessChange.ElapsedTime" units="ms"
     expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -149,7 +140,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.BrightnessChange.ModelIteration"
     units="count" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -162,7 +152,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="AutoScreenBrightness.BrightnessMonitorStatus"
     enum="AutoScreenBrightnessBrightnessMonitorStatus"
     expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -174,7 +163,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.DailyUserAdjustment.Atlas" units="count"
     expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -192,7 +180,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.DailyUserAdjustment.Eve" units="count"
     expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -209,7 +196,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.DailyUserAdjustment.Kohaku" units="count"
     expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -227,7 +213,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.DailyUserAdjustment.NoAls" units="count"
     expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -244,7 +229,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.DailyUserAdjustment.Nocturne"
     units="count" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -262,7 +246,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.DailyUserAdjustment.SupportedAls"
     units="count" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -279,7 +262,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.DailyUserAdjustment.UnsupportedAls"
     units="count" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -296,7 +278,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.DataError"
     enum="AutoScreenBrightnessDataError" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -309,7 +290,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="AutoScreenBrightness.ElapsedTimeBetweenModelAndUserAdjustments"
     units="ms" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -321,7 +301,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.GlobalCurveResetOnInitialization"
     enum="Boolean" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -330,7 +309,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.InvalidCurveReason"
     enum="AutoScreenBrightnessInvalidCurveReason" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -342,7 +320,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.MissingAlsWhenBrightnessChanged"
     enum="BooleanError" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -353,7 +330,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.MissingPriorUserBrightnessRequest"
     enum="BooleanError" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -368,7 +344,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.ModelIterationCountAtInitialization"
     units="count" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>napper@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
@@ -380,7 +355,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.ModelLoadingStatus"
     enum="AutoScreenBrightnessModelLoadingStatus" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>napper@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
@@ -391,7 +365,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="AutoScreenBrightness.ModelTraining.BrightnessChange"
     enum="AutoScreenBrightnessBoundedBrightnessChange"
     expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -403,7 +376,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.ModelTraining.BrightnessOutlier"
     enum="Boolean" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -415,7 +387,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.ModelTraining.Inaccuracy.NoUpdate"
     units="%" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>napper@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
@@ -429,7 +400,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.ModelTraining.Inaccuracy.Update"
     units="%" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>napper@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
@@ -443,7 +413,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.ModelTraining.ModelUserConsistent"
     enum="Boolean" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -455,7 +424,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.NewCurveSaved.Duration" units="ms"
     expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -468,7 +436,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.NewCurveSaved.Success"
     enum="BooleanSuccess" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -480,7 +447,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.Opposite.UserModelBrightnessAdjustments"
     units="count" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -494,7 +460,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.ParameterError"
     enum="AutoScreenBrightnessParameterError" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -506,7 +471,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.PersonalCurveValid" enum="BooleanValid"
     expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -517,7 +481,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.Same.UserModelBrightnessAdjustments"
     units="count" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -531,7 +494,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.TrainingCompleteDuration.NewCurve"
     units="ms" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -543,7 +505,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.TrainingCompleteDuration.NoNewCurve"
     units="ms" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
@@ -555,7 +516,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AutoScreenBrightness.UserAdjustmentEffect"
     enum="AutoScreenBrightnessUserAdjustmentEffect" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/autofill/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/autofill/histograms.xml
index f56f7cb8536..cdbcf82284c 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/autofill/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/autofill/histograms.xml
@@ -21,8 +21,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<variants name="Autofill.OfferNotification.Type">
+  <variant name="CardLinkedOffer"
+      summary="The bubble/infobar for an offer that is linked to a credit
+               card."/>
+</variants>
+
+<variants name="Autofill.PaymentBubble.Show">
+  <variant name="FirstShow" summary="The bubble is shown for the first time."/>
+  <variant name="Reshows" summary="The bubble is re-shown."/>
+</variants>
+
 <histogram name="Autofill.Address.IsEnabled.PageLoad" enum="BooleanEnabled"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>jsaul@google.com</owner>
   <owner>chrome-autofill@google.com</owner>
   <summary>
@@ -32,7 +43,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.Address.IsEnabled.Startup" enum="BooleanEnabled"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>jsaul@google.com</owner>
   <owner>chrome-autofill@google.com</owner>
   <summary>
@@ -66,7 +77,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Autofill.AddressProfileImportCountrySpecificFieldRequirements"
     enum="AutofillAddressProfileImportCountrySpecificFieldRequirement"
-    expires_after="2021-05-01">
+    expires_after="2021-07-04">
   <owner>koerber@google.com</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -77,7 +88,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.AddressProfileImportRequirements"
-    enum="AutofillAddressProfileImportRequirement" expires_after="2021-05-01">
+    enum="AutofillAddressProfileImportRequirement" expires_after="2021-07-04">
   <owner>koerber@google.com</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -87,7 +98,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.AddressProfileImportStatus"
-    enum="AutofillAddressProfileImportStatus" expires_after="2021-05-01">
+    enum="AutofillAddressProfileImportStatus" expires_after="2021-07-04">
   <owner>koerber@google.com</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -170,7 +181,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.BetterAuth.CardUnmaskDuration.Fido" units="ms"
-    expires_after="2021-05-31">
+    expires_after="2021-08-01">
   <owner>jsaul@google.com</owner>
   <owner>manasverma@google.com</owner>
   <owner>autofill-auth-team@google.com</owner>
@@ -181,7 +192,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.BetterAuth.CardUnmaskPreflightCalled"
-    enum="BooleanHit" expires_after="2021-05-31">
+    enum="BooleanHit" expires_after="2021-08-01">
   <owner>jsaul@google.com</owner>
   <owner>manasverma@google.com</owner>
   <owner>autofill-auth-team@google.com</owner>
@@ -198,7 +209,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.BetterAuth.CardUnmaskPreflightDuration" units="ms"
-    expires_after="2021-05-31">
+    expires_after="2021-08-01">
   <owner>jsaul@google.com</owner>
   <owner>manasverma@google.com</owner>
   <owner>autofill-auth-team@google.com</owner>
@@ -211,7 +222,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.BetterAuth.CardUnmaskTypeDecision"
-    enum="AutofillCreditCardUnmaskDecisionMetric" expires_after="2021-05-31">
+    enum="AutofillCreditCardUnmaskDecisionMetric" expires_after="2021-08-01">
   <owner>jsaul@google.com</owner>
   <owner>manasverma@google.com</owner>
   <owner>autofill-auth-team@google.com</owner>
@@ -224,7 +235,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.BetterAuth.FlowEvents"
-    enum="AutofillCreditCardAuthenticationEvents" expires_after="2021-05-31">
+    enum="AutofillCreditCardAuthenticationEvents" expires_after="2021-08-01">
   <owner>jsaul@google.com</owner>
   <owner>manasverma@google.com</owner>
   <owner>autofill-auth-team@google.com</owner>
@@ -238,7 +249,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Autofill.BetterAuth.OptInCalled"
-    enum="AutofillCreditCardWebauthnOptInParameters" expires_after="2021-05-31">
+    enum="AutofillCreditCardWebauthnOptInParameters" expires_after="2021-08-01">
   <owner>jsaul@google.com</owner>
   <owner>manasverma@google.com</owner>
   <owner>autofill-auth-team@google.com</owner>
@@ -253,7 +264,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Autofill.BetterAuth.OptInPromoShown"
-    enum="BooleanHit" expires_after="2021-05-31">
+    enum="BooleanHit" expires_after="2021-08-01">
   <owner>jsaul@google.com</owner>
   <owner>manasverma@google.com</owner>
   <owner>autofill-auth-team@google.com</owner>
@@ -274,7 +285,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Autofill.BetterAuth.OptInPromoUserDecision"
-    enum="AutofillWebauthnOptInPromoUserDecision" expires_after="2021-05-31">
+    enum="AutofillWebauthnOptInPromoUserDecision" expires_after="2021-08-01">
   <owner>jsaul@google.com</owner>
   <owner>manasverma@google.com</owner>
   <owner>autofill-auth-team@google.com</owner>
@@ -290,7 +301,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.BetterAuth.OptOutCalled.FromSettingsPage"
-    enum="BooleanHit" expires_after="2021-05-31">
+    enum="BooleanHit" expires_after="2021-08-01">
   <owner>jsaul@google.com</owner>
   <owner>manasverma@google.com</owner>
   <owner>autofill-auth-team@google.com</owner>
@@ -307,7 +318,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Autofill.BetterAuth.UserPerceivedLatencyOnCardSelection"
-    enum="AutofillCreditCardPreflightCallEvent" expires_after="2021-05-31">
+    enum="AutofillCreditCardPreflightCallEvent" expires_after="2021-08-01">
   <owner>jsaul@google.com</owner>
   <owner>manasverma@google.com</owner>
   <owner>autofill-auth-team@google.com</owner>
@@ -324,7 +335,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Autofill.BetterAuth.UserPerceivedLatencyOnCardSelection.OptedIn.Duration"
-    units="ms" expires_after="2021-05-31">
+    units="ms" expires_after="2021-08-09">
   <owner>jsaul@google.com</owner>
   <owner>manasverma@google.com</owner>
   <owner>autofill-auth-team@google.com</owner>
@@ -366,7 +377,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Autofill.BetterAuth.WebauthnResult"
-    enum="AutofillCreditCardWebauthnResultMetric" expires_after="2021-05-31">
+    enum="AutofillCreditCardWebauthnResultMetric" expires_after="2021-08-01">
   <owner>jsaul@google.com</owner>
   <owner>manasverma@google.com</owner>
   <owner>autofill-auth-team@google.com</owner>
@@ -380,7 +391,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.CardholderNameFixFlowPrompt.Events"
-    enum="AutofillCardholderNameFixFlowPromptEvent" expires_after="2021-01-31">
+    enum="AutofillCardholderNameFixFlowPromptEvent" expires_after="2021-11-30">
   <owner>jsaul@google.com</owner>
   <owner>siyua@chromium.org</owner>
   <owner>payments-autofill-team@google.com</owner>
@@ -392,7 +403,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.CardUnmask.CvcLength" units="digits"
-    expires_after="2021-03-31">
+    expires_after="2021-08-09">
   <owner>jsaul@google.com</owner>
   <owner>siyua@chromium.org</owner>
   <owner>payments-autofill-team@google.com</owner>
@@ -405,7 +416,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.CardUploadDecisionMetric"
-    enum="AutofillCardUploadDecisionMetric" expires_after="2021-05-31">
+    enum="AutofillCardUploadDecisionMetric" expires_after="2021-08-01">
   <owner>jsaul@google.com</owner>
   <owner>siyua@chromium.org</owner>
   <owner>payments-autofill-team@google.com</owner>
@@ -417,7 +428,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.CardUploadEnabled" enum="AutofillCardUploadEnabled"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>aneeshali@google.com</owner>
   <owner>jsaul@google.com</owner>
   <summary>
@@ -428,7 +439,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.CreditCard.IsEnabled.PageLoad" enum="BooleanEnabled"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>jsaul@google.com</owner>
   <owner>chrome-autofill@google.com</owner>
   <summary>
@@ -438,7 +449,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.CreditCard.IsEnabled.Startup" enum="BooleanEnabled"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>jsaul@google.com</owner>
   <owner>chrome-autofill@google.com</owner>
   <summary>
@@ -559,7 +570,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.EditedAutofilledFieldAtSubmission.Aggregate"
-    enum="AutofilledFieldUserEditingStatus" expires_after="2021-05-01">
+    enum="AutofilledFieldUserEditingStatus" expires_after="2021-07-04">
   <owner>koerber@google.com</owner>
   <owner>battre@google.com</owner>
   <summary>
@@ -570,7 +581,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Autofill.EditedAutofilledFieldAtSubmission.ByFieldType"
     enum="AutofilledFieldUserEditingStatusByFieldType"
-    expires_after="2021-05-01">
+    expires_after="2021-07-04">
   <owner>koerber@google.com</owner>
   <owner>battre@google.com</owner>
   <summary>
@@ -580,7 +591,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.ExpirationDateFixFlowPrompt.Events"
-    enum="AutofillExpirationDateFixFlowPromptEvent" expires_after="2021-02-01">
+    enum="AutofillExpirationDateFixFlowPromptEvent" expires_after="2021-07-27">
   <owner>siashah@google.com</owner>
   <owner>jsaul@google.com</owner>
   <owner>payments-autofill-team@google.com</owner>
@@ -592,7 +603,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.ExpirationDateFixFlowPromptShown" enum="Boolean"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>siashah@google.com</owner>
   <owner>jsaul@google.com</owner>
   <owner>payments-autofill-team@google.com</owner>
@@ -811,6 +822,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Autofill.FormSubmission.PerProfileType"
+    enum="BrowserProfileType" expires_after="2022-02-02">
+  <owner>rhalavati@chromium.org</owner>
+  <owner>chrome-privacy-core@google.com</owner>
+  <summary>
+    This histogram records the browser profile type when an autofill form is
+    submitted.
+  </summary>
+</histogram>
+
 <histogram name="Autofill.FormSubmittedState" enum="AutofillFormSubmittedState"
     expires_after="M95">
   <owner>battre@chromium.org</owner>
@@ -902,7 +923,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.HadUserOptedIn_To_WalletSyncTransportServerCards"
-    enum="BooleanOptedIn" expires_after="2021-01-31">
+    enum="BooleanOptedIn" expires_after="2021-11-30">
   <owner>jsaul@google.com</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -948,7 +969,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.IsEnabled.PageLoad" enum="BooleanEnabled"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>jsaul@google.com</owner>
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill@google.com</owner>
@@ -962,7 +983,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.IsEnabled.Startup" enum="BooleanEnabled"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>jsaul@google.com</owner>
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill@google.com</owner>
@@ -1064,7 +1085,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.LocalCardMigrationBubbleOffer"
-    enum="AutofillLocalCardMigrationBubbleOffer" expires_after="2021-05-01">
+    enum="AutofillLocalCardMigrationBubbleOffer" expires_after="2021-07-04">
   <owner>siyua@chromium.org</owner>
   <owner>jsaul@google.com</owner>
   <summary>
@@ -1074,7 +1095,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.LocalCardMigrationBubbleResult"
-    enum="AutofillLocalCardMigrationBubbleResult" expires_after="2021-05-01">
+    enum="AutofillLocalCardMigrationBubbleResult" expires_after="2021-07-04">
   <owner>siyua@chromium.org</owner>
   <owner>jsaul@google.com</owner>
   <summary>
@@ -1085,7 +1106,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Autofill.LocalCardMigrationBubbleUserInteraction"
     enum="AutofillLocalCardMigrationBubbleUserInteraction"
-    expires_after="2021-05-01">
+    expires_after="2021-07-04">
   <owner>siyua@chromium.org</owner>
   <owner>jsaul@google.com</owner>
   <summary>Record how bubble is closed by different user interactions.</summary>
@@ -1149,7 +1170,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.ManageCardsPrompt" enum="AutofillManageCardsPrompt"
-    expires_after="2021-06-01">
+    expires_after="2021-08-09">
   <owner>manasverma@google.com</owner>
   <owner>jsaul@google.com</owner>
   <summary>
@@ -1168,6 +1189,22 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram
+    name="Autofill.NumberOfAutofilledFieldsAtSubmission.{AcceptanceStatus}"
+    units="fields" expires_after="M92">
+  <owner>koerber@google.com</owner>
+  <owner>chrome-autofill@google.com</owner>
+  <summary>
+    The {AcceptanceStatus} autofilled fields in a form after receiving a form
+    submission event.
+  </summary>
+  <token key="AcceptanceStatus">
+    <variant name="Accepted" summary="number of accepted"/>
+    <variant name="Corrected" summary="number of corrected"/>
+    <variant name="Total" summary="total number of"/>
+  </token>
+</histogram>
+
 <histogram name="Autofill.NumberOfEditedAutofilledFieldsAtSubmission"
     units="fields" expires_after="M95">
   <owner>battre@chromium.org</owner>
@@ -1283,6 +1320,55 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Autofill.OfferNotificationBubbleOffer.{BubbleType}"
+    enum="BooleanPreviouslyShown" expires_after="2021-09-01">
+  <owner>siyua@chromium.org</owner>
+  <owner>payments-autofill-team@google.com</owner>
+  <summary>
+    Records whether the offer notification bubble is the first such offer that
+    the user has been shown or is reshown due to user actions. The metric is
+    recorded when the bubble is shown.
+  </summary>
+  <token key="BubbleType" variants="Autofill.OfferNotification.Type"/>
+</histogram>
+
+<histogram
+    name="Autofill.OfferNotificationBubbleResult.{BubbleType}.{ShowType}"
+    enum="AutofillOfferNotificationBubbleResult" expires_after="2021-09-01">
+  <owner>siyua@chromium.org</owner>
+  <owner>payments-autofill-team@google.com</owner>
+  <summary>
+    Records the reason for closing the offer notification bubble. Recorded when
+    the bubble is closed.
+  </summary>
+  <token key="BubbleType" variants="Autofill.OfferNotification.Type"/>
+  <token key="ShowType" variants="Autofill.PaymentBubble.Show"/>
+</histogram>
+
+<histogram name="Autofill.OfferNotificationInfoBarOffer.{OfferType}"
+    enum="BooleanShown" expires_after="2021-09-01">
+  <owner>siashah@chromium.org</owner>
+  <owner>siyua@chromium.org</owner>
+  <owner>payments-autofill-team@google.com</owner>
+  <summary>
+    Emits true when the offer notification infobar is displayed and does not
+    emit any value otherwise.
+  </summary>
+  <token key="OfferType" variants="Autofill.OfferNotification.Type"/>
+</histogram>
+
+<histogram name="Autofill.OfferNotificationInfoBarResult.{OfferType}"
+    enum="AutofillOfferNotificationInfoBarResult" expires_after="2021-09-01">
+  <owner>siashah@chromium.org</owner>
+  <owner>siyua@chromium.org</owner>
+  <owner>payments-autofill-team@google.com</owner>
+  <summary>
+    Records the reason for closing the offer notification infobar for
+    {OfferType}. Recorded when the infobar is closed.
+  </summary>
+  <token key="OfferType" variants="Autofill.OfferNotification.Type"/>
+</histogram>
+
 <histogram name="Autofill.PageTranslationStatus" enum="Boolean"
     expires_after="2021-10-25">
   <owner>marsin@google.com</owner>
@@ -1418,7 +1504,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.SaveCreditCardPrompt"
-    enum="AutofillSaveCreditCardPrompt" expires_after="2021-05-01">
+    enum="AutofillSaveCreditCardPrompt" expires_after="2021-07-04">
+  <obsolete>
+    Removed 02/2021 as it is replaced by Autofill.SaveCreditCardPromptOffer and
+    Autofill.SaveCreditCardPromptResult.
+  </obsolete>
   <owner>jsaul@google.com</owner>
   <owner>siyua@chromium.org</owner>
   <summary>
@@ -1428,7 +1518,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.SaveCreditCardPromptOffer"
-    enum="AutofillSaveCreditCardPromptOfferEnum" expires_after="2021-05-01">
+    enum="AutofillSaveCreditCardPromptOfferEnum" expires_after="2021-07-04">
   <owner>jsaul@google.com</owner>
   <owner>siyua@chromium.org</owner>
   <summary>
@@ -1439,7 +1529,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.SaveCreditCardPromptResult"
-    enum="AutofillSaveCreditCardPromptResultEnum" expires_after="2021-05-01">
+    enum="AutofillSaveCreditCardPromptResultEnum" expires_after="2021-07-04">
   <owner>jsaul@google.com</owner>
   <owner>siyua@chromium.org</owner>
   <summary>
@@ -1471,7 +1561,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.ServerCardLinkClicked" enum="AutofillSyncState"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>jsaul@google.com</owner>
   <owner>battre@chromium.org</owner>
   <owner>chrome-autofill@google.com</owner>
@@ -1554,7 +1644,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Autofill.StrikeDatabase.CreditCardSaveNotOfferedDueToMaxStrikes"
-    enum="AutofillSaveType" expires_after="2021-01-31">
+    enum="AutofillSaveType" expires_after="2021-12-20">
   <owner>jsaul@google.com</owner>
   <owner>annelim@google.com</owner>
   <summary>
@@ -1566,7 +1656,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Autofill.StrikeDatabase.LocalCardMigrationNotOfferedDueToMaxStrikes"
-    enum="AutofillSaveType" expires_after="2021-01-31">
+    enum="AutofillSaveType" expires_after="2021-12-20">
   <owner>jsaul@google.com</owner>
   <owner>annelim@google.com</owner>
   <summary>
@@ -1576,7 +1666,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.StrikeDatabase.NthStrikeAdded" units="strikes"
-    expires_after="2021-04-04">
+    expires_after="2021-12-20">
 <!-- Name completed by histogram_suffixes name="AutofillStrikeDatabaseProjectType" -->
 
   <owner>jsaul@google.com</owner>
@@ -1588,7 +1678,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.StrikeDatabase.StrikeDatabaseInitFailed"
-    units="attempts" expires_after="2021-04-04">
+    units="attempts" expires_after="2021-12-20">
   <owner>jsaul@google.com</owner>
   <owner>annelim@google.com</owner>
   <summary>
@@ -1599,7 +1689,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Autofill.StrikeDatabase.StrikesPresentWhenLocalCardMigrationAccepted"
-    units="strikes" expires_after="2021-01-31">
+    units="strikes" expires_after="2021-12-20">
   <owner>jsaul@google.com</owner>
   <owner>annelim@google.com</owner>
   <summary>
@@ -1609,7 +1699,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.StrikeDatabase.StrikesPresentWhenLocalCardSaved"
-    units="strikes" expires_after="2021-01-31">
+    units="strikes" expires_after="2021-12-20">
   <owner>jsaul@google.com</owner>
   <owner>annelim@google.com</owner>
   <summary>
@@ -1619,7 +1709,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.StrikeDatabase.StrikesPresentWhenServerCardSaved"
-    units="strikes" expires_after="2021-01-31">
+    units="strikes" expires_after="2021-12-20">
   <owner>jsaul@google.com</owner>
   <owner>annelim@google.com</owner>
   <summary>
@@ -1629,7 +1719,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.StrikeDatabase.StrikesPresentWhenStrikeExpired"
-    units="strikes" expires_after="2021-01-31">
+    units="strikes" expires_after="2021-12-20">
 <!-- Name completed by histogram_suffixes name="AutofillStrikeDatabaseProjectType" -->
 
   <owner>jsaul@google.com</owner>
@@ -1664,9 +1754,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.SubmittedValuePatterns" enum="AutofillValuePatterns"
-    expires_after="M88">
-  <owner>kolos@chromium.org</owner>
+    expires_after="M93">
+  <owner>battre@chromium.org</owner>
   <owner>jsaul@google.com</owner>
+  <owner>koerber@google.com</owner>
   <summary>
     Metric to measure if a submitted form contains any recognizable value
     patterns (e.g., Unified Payment Interface Virtual Payment address (UPI
@@ -1676,7 +1767,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.SuggestionAccepted.OffTheRecord" units="units"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>rhalavati@chromium.org</owner>
   <owner>chrome-privacy-core@google.com</owner>
   <summary>
@@ -1706,7 +1797,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.SuggestionShown.OffTheRecord" units="units"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>rhalavati@chromium.org</owner>
   <owner>chrome-privacy-core@google.com</owner>
   <summary>
@@ -1748,7 +1839,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.UnmaskPrompt.Duration" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>jsaul@google.com</owner>
   <owner>siyua@chromium.org</owner>
   <summary>
@@ -1759,7 +1850,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.UnmaskPrompt.Events" enum="AutofillUnmaskPromptEvent"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>jsaul@google.com</owner>
   <owner>siyua@chromium.org</owner>
   <summary>
@@ -1769,7 +1860,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.UnmaskPrompt.GetRealPanDuration" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>jsaul@google.com</owner>
   <owner>siyua@chromium.org</owner>
   <summary>
@@ -1780,7 +1871,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.UnmaskPrompt.GetRealPanResult"
-    enum="AutofillGetRealPanResult" expires_after="2021-04-01">
+    enum="AutofillGetRealPanResult" expires_after="2021-08-09">
   <owner>jsaul@google.com</owner>
   <owner>siyua@chromium.org</owner>
   <summary>
@@ -1791,7 +1882,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.UnmaskPrompt.TimeBeforeAbandonUnmasking" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>jsaul@google.com</owner>
   <owner>siyua@chromium.org</owner>
   <summary>
@@ -1804,7 +1895,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autofill.UnmaskPrompt.UnmaskingDuration" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>jsaul@google.com</owner>
   <owner>siyua@chromium.org</owner>
   <summary>
@@ -2003,6 +2094,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>Records the state of an autofill session.</summary>
 </histogram>
 
+<histogram name="Autofill.WebView.AwGIsCurrentService" enum="BooleanYesNo"
+    expires_after="2021-06-08">
+  <owner>michaelbai@chromium.org</owner>
+  <owner>src/android_webview/OWNERS</owner>
+  <summary>
+    Records whether Autofill with Google is the current Android autofill
+    service. It is recorded on AutofillProvider initialization. Only recorded in
+    Android P and beyond.
+  </summary>
+</histogram>
+
 <histogram name="Autofill.WebView.CreatedByActivityContext"
     enum="BooleanEnabled" expires_after="2021-06-08">
   <owner>michaelbai@chromium.org</owner>
@@ -2019,6 +2121,42 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Autofill.WebView.ServerPrediction.AwGSuggestionAvailability"
+    enum="AutofillAwGSuggestionAvailability" expires_after="2021-06-08">
+  <owner>michaelbai@chromium.org</owner>
+  <owner>src/android_webview/OWNERS</owner>
+  <summary>
+    Records whether Autofill with Google has suggestions and if the user selects
+    any suggestion. It is recorded when the form is submitted. Only recorded in
+    Android P and beyond.
+  </summary>
+</histogram>
+
+<histogram name="Autofill.WebView.ServerPredicton.HasValidServerPrediction"
+    enum="BooleanYesNo" expires_after="2021-06-08">
+  <owner>michaelbai@chromium.org</owner>
+  <owner>src/android_webview/OWNERS</owner>
+  <summary>
+    Records whether the server prediction of any field isn't NO_SERVER_DATA.
+    This histogram is recorded when the server prediction is available for the
+    current form, and only if AndroidAutofillQueryServerFieldTypes feature is
+    enabled.
+  </summary>
+</histogram>
+
+<histogram name="Autofill.WebView.ServerPredicton.PredictionAvailability"
+    enum="AutofillServerPredictionAvailability" expires_after="2021-06-08">
+  <owner>michaelbai@chromium.org</owner>
+  <owner>src/android_webview/OWNERS</owner>
+  <summary>
+    Records whether and when the server prediction response of current autofill
+    session is available even if query failed or there is no server data. This
+    histogram is recorded when the prediction becomes available or the new
+    session starts, and only if AndroidAutofillQueryServerFieldTypes feature is
+    enabled.
+  </summary>
+</histogram>
+
 <histogram name="Autofill.WebView.SubmissionSource"
     enum="AutofillSubmissionSource" expires_after="2021-06-08">
   <owner>michaelbai@chromium.org</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/background/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/background/histograms.xml
index 91c9827f768..64e4ed2030a 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/background/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/background/histograms.xml
@@ -160,7 +160,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BackgroundMode.BackgroundApplicationsCount" units="units"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>atwilson@chromium.org</owner>
   <owner>mvanouwerkerk@chromium.org</owner>
   <summary>
@@ -189,7 +189,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BackgroundMode.OnStartup.AutoLaunchState"
-    enum="AutoLaunchState" expires_after="2021-03-30">
+    enum="AutoLaunchState" expires_after="2021-08-01">
   <owner>mvanouwerkerk@chromium.org</owner>
   <owner>rdevlin.cronin@chromium.org</owner>
   <summary>
@@ -199,7 +199,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BackgroundMode.OnStartup.IsBackgroundModePrefEnabled"
-    enum="BooleanEnabled" expires_after="2021-03-30">
+    enum="BooleanEnabled" expires_after="2021-08-01">
   <owner>mvanouwerkerk@chromium.org</owner>
   <owner>rdevlin.cronin@chromium.org</owner>
   <summary>
@@ -340,7 +340,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BackgroundSync.Registration.OneShot"
-    enum="BackgroundSyncStatus" expires_after="2021-04-04">
+    enum="BackgroundSyncStatus" expires_after="2021-08-09">
   <owner>nator@chromium.org</owner>
   <owner>rayankans@chromium.org</owner>
   <summary>
@@ -349,7 +349,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BackgroundSync.Registration.OneShot.CouldFire"
-    enum="BooleanCouldFireImmediately" expires_after="2021-04-25">
+    enum="BooleanCouldFireImmediately" expires_after="2021-08-09">
   <owner>nator@chromium.org</owner>
   <owner>rayankans@chromium.org</owner>
   <summary>
@@ -360,7 +360,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="BackgroundSync.Registration.OneShot.EventSucceededAtCompletion"
-    enum="BooleanSuccess" expires_after="2021-05-09">
+    enum="BooleanSuccess" expires_after="2021-07-11">
   <owner>nator@chromium.org</owner>
   <owner>rayankans@chromium.org</owner>
   <owner>peter@chromium.org</owner>
@@ -382,7 +382,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="BackgroundSync.Registration.OneShot.NumAttemptsForSuccessfulEvent"
-    units="attempts" expires_after="2021-05-09">
+    units="attempts" expires_after="2021-07-11">
   <owner>nator@chromium.org</owner>
   <owner>rayankans@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/blink/OWNERS b/chromium/tools/metrics/histograms/histograms_xml/blink/OWNERS
index fcb25654bc6..4e971ef7ab1 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/blink/OWNERS
+++ b/chromium/tools/metrics/histograms/histograms_xml/blink/OWNERS
@@ -1 +1,3 @@
 schenney@chromium.org
+# For BlinkGC.* and related changes.
+mlippautz@chromium.org
\ No newline at end of file
diff --git a/chromium/tools/metrics/histograms/histograms_xml/blink/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/blink/histograms.xml
index b0f9c229eef..c2c6836b7ab 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/blink/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/blink/histograms.xml
@@ -33,8 +33,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Blink.Animate.UpdateTime" units="microseconds"
-    expires_after="2021-03-21">
+<histogram base="true" name="Blink.Animate.UpdateTime" units="microseconds"
+    expires_after="2021-07-27">
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
 
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
@@ -52,7 +52,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Animation.CompositedAnimationFailureReason"
-    enum="CompositorAnimationsFailureReason" expires_after="2021-04-18">
+    enum="CompositorAnimationsFailureReason" expires_after="2021-08-22">
   <owner>smcgruer@chromium.org</owner>
   <owner>animations-dev@chromium.org</owner>
   <summary>
@@ -65,7 +65,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Canvas.2DPrintingAsVector" enum="BooleanSuccess"
-    expires_after="2021-01-31">
+    expires_after="2022-01-31">
   <owner>fserb@chromium.org</owner>
   <owner>juanmihd@chromium.org</owner>
   <summary>
@@ -74,7 +74,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Canvas.ContentChangeMode"
-    enum="BooleanContentChangeMode" expires_after="2021-05-09">
+    enum="BooleanContentChangeMode" expires_after="2021-08-09">
   <owner>yiyix@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>
@@ -86,7 +86,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Canvas.ContextType" enum="CanvasContextType"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>fserb@chromium.org</owner>
   <owner>aaronhk@chromium.org</owner>
   <summary>
@@ -95,7 +95,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Canvas.CreateImageBitmapSource"
-    enum="CanvasCreateImageBitmapSource" expires_after="2021-01-31">
+    enum="CanvasCreateImageBitmapSource" expires_after="2022-04-04">
   <owner>fserb@chromium.org</owner>
   <owner>aaronhk@chromium.org</owner>
   <summary>
@@ -104,7 +104,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Blink.Canvas.DrawImage.Duration"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-08-09">
   <owner>fserb@chromium.org</owner>
   <owner>aaronhk@chromium.org</owner>
   <summary>
@@ -117,7 +117,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Blink.Canvas.DrawImage.SqrtNumberOfPixels"
-    units="sqrt(pixels)" expires_after="2021-04-04">
+    units="sqrt(pixels)" expires_after="2021-08-09">
   <owner>fserb@chromium.org</owner>
   <owner>aaronhk@chromium.org</owner>
   <summary>
@@ -154,7 +154,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Canvas.HasRendered" enum="Boolean"
-    expires_after="2021-01-31">
+    expires_after="2022-01-31">
   <owner>juanmihd@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>
@@ -171,18 +171,32 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Blink.Canvas.IsComposited" enum="BooleanSuccess"
+<histogram name="Blink.Canvas.ImageSmoothingQuality"
+    enum="ImageSmoothingQuality" expires_after="2021-05-31">
+  <owner>fserb@chromium.org</owner>
+  <owner>yiyix@chromium.org</owner>
+  <summary>
+    Records the image smoothing quality used by draw image. Users can choose
+    between none, low, medium or high image quality.
+  </summary>
+</histogram>
+
+<histogram name="Blink.Canvas.IsComposited" enum="Boolean"
     expires_after="2021-01-31">
   <owner>aaronhk@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>
     Records if the canvas context is composited or not. Recorded in
     HTMLCanvasElement::GetCanvasRenderingContext.
+
+    Note: This has been recording bad data since at least 2020-01-01. It was
+    emitted in the wrong place and always recording false. Since it records the
+    same information as IsAccelerated, I am just going to let it expire.
   </summary>
 </histogram>
 
 <histogram name="Blink.Canvas.MaximumInflightResources"
-    units="canvas resources" expires_after="2021-04-04">
+    units="canvas resources" expires_after="2021-08-09">
   <owner>aaronhk@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>
@@ -193,7 +207,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Canvas.NumCanvasesPerPage" units="canvases"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>aaronhk@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>
@@ -223,7 +237,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Canvas.RasterDuration" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>aaronhk@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>
@@ -240,7 +254,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Blink.Canvas.RequestedImageMimeTypes"
-    enum="RequestedImageMimeType" expires_after="2021-01-31">
+    enum="RequestedImageMimeType" expires_after="2022-04-04">
   <owner>fserb@chromium.org</owner>
   <owner>aaronhk@chromium.org</owner>
   <summary>
@@ -250,21 +264,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Canvas.ResourceProviderIsAccelerated"
-    enum="BooleanHardwareAccelerated" expires_after="2021-04-04">
+    enum="BooleanHardwareAccelerated" expires_after="2022-04-04">
   <owner>aaronhk@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>Logs if the canvas resource provider is accelerated or not.</summary>
 </histogram>
 
 <histogram name="Blink.Canvas.ResourceProviderType"
-    enum="CanvasResourceProviderType" expires_after="2021-04-04">
+    enum="CanvasResourceProviderType" expires_after="2022-04-04">
   <owner>aaronhk@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>Records the type of resource provider used for a canvas.</summary>
 </histogram>
 
 <histogram name="Blink.Canvas.ResourceProviderUsage"
-    enum="CanvasResourceProviderUsage" expires_after="2021-01-31">
+    enum="CanvasResourceProviderUsage" expires_after="2022-04-04">
   <owner>aaronhk@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>
@@ -273,7 +287,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Canvas.SqrtNumberOfPixels" units="sqrt(pixels)"
-    expires_after="2021-01-31">
+    expires_after="2022-04-04">
   <owner>aaronhk@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>
@@ -284,6 +298,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true" name="Blink.Canvas.ToBlob.CompleteEncodingDelay"
     units="microseconds" expires_after="2021-01-31">
+  <obsolete>
+    Removed in M89. Obsolete and unused. This has been replaced with
+    Blink.Canvas.ToBlob.TotalEncodingDelay
+  </obsolete>
   <owner>fserb@chromium.org</owner>
   <owner>aaronhk@chromium.org</owner>
   <summary>
@@ -324,8 +342,44 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Blink.Canvas.ToBlob.InitialEncodingDelay.{Type}"
+    units="microseconds" expires_after="2022-04-04">
+  <owner>aaronhk@chromium.org</owner>
+  <owner>fserb@chromium.org</owner>
+  <summary>
+    A new version of &quot;Blink.Canvas.ToBlob.InitiateEncodingDelay&quot;
+    (which will be allowed to expire) which allows for times &gt;10ms.
+
+    This metric measures the time spent from initiating image encoding (jpeg or
+    png) on idle task to the actual execution time of initiation, as part of a
+    canvas.toBlob API call.
+
+    This metric is useful in helping us adjust the IdleTaskStartTimeoutDelay in
+    canvas.toBlob. When the initialization idle task is delayed for longer than
+    IdleTaskStartTimeoutDelay, the browser will switch to a non-idle task to
+    force initialization and encoding to occur on the main thread.
+
+    In addition, metric values from OffscreenCanvas.convertToBlob API call are
+    also gathered into this histogram, because the logic flow is exactly the
+    same as canvas.toBlob. It's worth to note that the values can come from idle
+    tasks on either main or worker thread.
+
+    Note: This metric drops reports on clients with low-resolution clocks, which
+    means these reports will be biased against a portion of the population on
+    Windows. See Windows.HasHighResolutionTimeTicks for the affected sample.
+  </summary>
+  <token key="Type">
+    <variant name="JPEG"/>
+    <variant name="PNG"/>
+  </token>
+</histogram>
+
 <histogram base="true" name="Blink.Canvas.ToBlob.InitiateEncodingDelay"
     units="microseconds" expires_after="2021-01-31">
+  <obsolete>
+    Removed in M89. Obsolete and unused. This has been replaced with
+    Blink.Canvas.ToBlob.InitialEncodingDelay
+  </obsolete>
   <owner>fserb@chromium.org</owner>
   <owner>aaronhk@chromium.org</owner>
   <summary>
@@ -350,7 +404,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Blink.Canvas.ToBlob.ScaledDuration"
-    units="microseconds/sqrt(pixels)" expires_after="2021-01-31">
+    units="microseconds/sqrt(pixels)" expires_after="2022-04-04">
   <owner>fserb@chromium.org</owner>
   <owner>aaronhk@chromium.org</owner>
   <summary>
@@ -368,8 +422,43 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Blink.Canvas.ToBlob.TotalEncodingDelay.{Type}"
+    units="microseconds" expires_after="2022-04-04">
+  <owner>aaronhk@chromium.org</owner>
+  <owner>fserb@chromium.org</owner>
+  <summary>
+    A new version of &quot;Blink.Canvas.ToBlob.InitiateEncodingDelay&quot;
+    (which will be allowed to expire) which allows for times &gt;10ms.
+
+    This metric measures the total time spent on completing encoding all the
+    rows of an image (jpeg or png), as part of a canvas.toBlob API call.
+    Encoding occurs during one or more idle periods on the main thread and the
+    waiting time of the next idle period is included in the measurement. If the
+    code has swtiched to force encoding path, we will not measure the delay in
+    this metric.
+
+    This metric is useful in helping us adjust the IdleTaskCompleteTimeoutDelay
+    in canvas.toBlob. When the encoding idle task is delayed for longer than
+    IdleTaskCompleteTimeoutDelay, the browser will switch to a non-idle task to
+    force encoding to happen on the main thread.
+
+    In addition, metric values from OffscreenCanvas.convertToBlob API call are
+    also gathered into this histogram, because the logic flow is exactly the
+    same as canvas.toBlob. It's worth to note that the values can come from idle
+    tasks on either main or worker thread.
+
+    Note: This metric drops reports on clients with low-resolution clocks, which
+    means these reports will be biased against a portion of the population on
+    Windows. See Windows.HasHighResolutionTimeTicks for the affected sample.
+  </summary>
+  <token key="Type">
+    <variant name="JPEG"/>
+    <variant name="PNG"/>
+  </token>
+</histogram>
+
 <histogram base="true" name="Blink.Canvas.ToDataURLScaledDuration"
-    units="microseconds/sqrt(pixels)" expires_after="2021-01-31">
+    units="microseconds/sqrt(pixels)" expires_after="2022-04-04">
   <owner>fserb@chromium.org</owner>
   <owner>aaronhk@chromium.org</owner>
   <summary>
@@ -423,7 +512,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Blink.Compositing.LayerPromotionCount"
-    units="units" expires_after="2021-03-28">
+    units="units" expires_after="2021-08-01">
   <owner>pdr@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -432,8 +521,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Blink.CompositingAssignments.UpdateTime" units="microseconds"
-    expires_after="2021-05-02">
+<histogram base="true" name="Blink.CompositingAssignments.UpdateTime"
+    units="microseconds" expires_after="2021-07-04">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
 
   <owner>schenney@chromium.org</owner>
@@ -447,8 +540,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Blink.CompositingCommit.UpdateTime" units="microseconds"
-    expires_after="2021-05-02">
+<histogram base="true" name="Blink.CompositingCommit.UpdateTime"
+    units="microseconds" expires_after="2021-07-04">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
 
   <owner>schenney@chromium.org</owner>
@@ -466,8 +563,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Blink.CompositingInputs.UpdateTime" units="microseconds"
-    expires_after="2021-05-02">
+<histogram base="true" name="Blink.CompositingInputs.UpdateTime"
+    units="microseconds" expires_after="2021-07-04">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
 
   <owner>schenney@chromium.org</owner>
@@ -482,7 +583,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Compression.CompressionStream.Format"
-    enum="CompressionStreamsFormat" expires_after="2021-01-24">
+    enum="CompressionStreamsFormat" expires_after="2022-01-12">
   <owner>ricea@chromium.org</owner>
   <owner>yhirano@chromium.org</owner>
   <summary>
@@ -494,7 +595,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Compression.DecompressionStream.Format"
-    enum="CompressionStreamsFormat" expires_after="2021-01-24">
+    enum="CompressionStreamsFormat" expires_after="2022-01-12">
   <owner>ricea@chromium.org</owner>
   <owner>yhirano@chromium.org</owner>
   <summary>
@@ -505,8 +606,74 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram base="true" name="Blink.ContentDocumentUpdate.UpdateTime"
+    units="microseconds" expires_after="2021-07-04">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
+
+  <owner>schenney@chromium.org</owner>
+  <owner>paint-dev@chromium.org</owner>
+  <summary>
+    Time spent preparing the document for a canvas draw, SVG image draw or
+    plugin during a main frame update. Includes time spent in style update and
+    layout.
+
+    This histogram does not record metrics on machines with low-resolution
+    clocks.
+  </summary>
+</histogram>
+
+<histogram name="Blink.ContextMenu.ImageSelection.Depth" units="count"
+    expires_after="2021-09-05">
+  <owner>benwgold@google.com</owner>
+  <owner>flackr@chromium.org</owner>
+  <summary>
+    The depth of the discovered image node in the hit test list when performing
+    a penetrating image selection search.
+
+    Only recorded when the `EnablePenetratingImageSelection` feature is enabled
+    and a user long presses or right clicks a document (and an image is found).
+  </summary>
+</histogram>
+
+<histogram name="Blink.ContextMenu.ImageSelection.ElapsedTime"
+    units="microseconds" expires_after="2021-09-05">
+  <owner>benwgold@google.com</owner>
+  <owner>flackr@chromium.org</owner>
+  <summary>
+    The amount of time it took to iterate through the dom looking for an image
+    node.
+
+    Only recorded when the `EnablePenetratingImageSelection` feature is enabled
+    and a user long presses or right clicks a document.
+
+    Note: This metric drops reports on clients with low-resolution clocks, which
+    means these reports will be biased against a portion of the population on
+    Windows. See Windows.HasHighResolutionTimeTicks for the affected sample.
+  </summary>
+</histogram>
+
+<histogram name="Blink.ContextMenu.ImageSelection.Outcome"
+    enum="ImageSelectionOutcome" expires_after="2021-09-05">
+  <owner>benwgold@google.com</owner>
+  <owner>flackr@chromium.org</owner>
+  <summary>
+    The outcome of an image selection search that may or may not trigger the
+    context menu.
+
+    Only recorded when the `EnablePenetratingImageSelection` feature is enabled
+    and a user long presses or right clicks a document (and an image is found).
+  </summary>
+</histogram>
+
 <histogram name="Blink.CookieStore.MatchType" enum="CookieStoreMatchType"
     expires_after="M87">
+  <obsolete>
+    Removed in M87.
+  </obsolete>
   <owner>ayui@chromium.org</owner>
   <owner>pwnall@chromium.org</owner>
   <summary>
@@ -528,6 +695,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Blink.DecodedImage.DensitySizeCorrectionDetected"
     enum="BooleanPresent" expires_after="2021-01-03">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>schenney@chromium.org</owner>
   <owner>noam.j.rosenthal@gmail.com</owner>
   <owner>paint-dev@chromium.org</owner>
@@ -538,7 +708,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.DecodedImage.JpegDensity.KiBWeighted"
-    units="0.01 bits per pixel" expires_after="2021-04-18">
+    units="0.01 bits per pixel" expires_after="2021-08-22">
   <owner>deymo@google.com</owner>
   <owner>compression-dev@google.com</owner>
   <summary>
@@ -561,7 +731,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.DecodedImage.WebPFileFormat" enum="WebPFileFormat"
-    expires_after="2021-04-18">
+    expires_after="2021-07-04">
   <owner>mcasas@chromium.org</owner>
   <owner>andrescj@chromium.org</owner>
   <summary>
@@ -571,12 +741,31 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.DecodedImageType" enum="DecodedImageType"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>urvang@chromium.org</owner>
   <summary>Image codec inferred during decode.</summary>
 </histogram>
 
-<histogram name="Blink.EffectiveZoom" units="%" expires_after="2021-05-02">
+<histogram base="true" name="Blink.DisplayLockIntersectionObserver.UpdateTime"
+    units="microseconds" expires_after="2021-08-09">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
+
+  <owner>schenney@chromium.org</owner>
+  <owner>paint-dev@chromium.org</owner>
+  <summary>
+    Time spent computing IntersectionObserver observations in the Blink document
+    lifecycle where the observation is for Display Locking. Recorded when an
+    intersection observation is made for the Display Locking reason.
+
+    This histogram only records metrics on machines with high-resolution clocks.
+  </summary>
+</histogram>
+
+<histogram name="Blink.EffectiveZoom" units="%" expires_after="2021-07-04">
   <owner>schenney@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -695,6 +884,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Blink.Fonts.Enumeration.Duration" units="ms"
     expires_after="2021-10-15">
+  <obsolete>
+    Removed in M89. Obsolete and unused. This has been replaced with
+    Fonts.AccessAPI.EnumerationCache.*
+  </obsolete>
   <owner>oyiptong@chromium.org</owner>
   <owner>layout-dev@chromium.org</owner>
   <owner>storage-dev@chromium.org</owner>
@@ -705,6 +898,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Blink.Fonts.FontFamilyMatchAttempts.System" units="attempts"
+    expires_after="2021-12-20">
+  <owner>caraitto@chromium.org</owner>
+  <owner>privacy-sandbox-dev@chromium.org</owner>
+  <summary>
+    Number of system font family match attempts made, from page load to page
+    unload. Recorded on page unload.
+  </summary>
+</histogram>
+
+<histogram name="Blink.Fonts.FontMatchAttempts.System" units="attempts"
+    expires_after="2021-12-20">
+  <owner>caraitto@chromium.org</owner>
+  <owner>privacy-sandbox-dev@chromium.org</owner>
+  <summary>
+    Number of system font match attempts (success + failure) made via @font-face
+    src:local(), from page load to page unload. Recorded on page unload.
+  </summary>
+</histogram>
+
 <histogram name="Blink.Fonts.ShapeCache" units="units"
     expires_after="2021-10-15">
   <owner>drott@chromium.org</owner>
@@ -795,22 +1008,30 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Blink.ForcedStyleAndLayout.UpdateTime" units="microseconds"
-    expires_after="2021-03-21">
+<histogram base="true" name="Blink.ForcedStyleAndLayout.UpdateTime"
+    units="microseconds" expires_after="2021-07-27">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
 
   <owner>schenney@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
     Time spent computing layouts due to Javascript value requests. Specifically,
-    time spent in Blink Document::UpdateStyleAndLayoutIgnorePendingStylesheets.
+    time spent in Blink Document::UpdateStyleAndLayout.
 
     This histogram only records metrics on machines with high-resolution clocks.
   </summary>
 </histogram>
 
-<histogram name="Blink.HandleInputEvents.UpdateTime" units="microseconds"
-    expires_after="2021-05-02">
+<histogram base="true" name="Blink.HandleInputEvents.UpdateTime"
+    units="microseconds" expires_after="2021-07-04">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
 
   <owner>schenney@chromium.org</owner>
@@ -823,8 +1044,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Blink.HitTestDocumentUpdate.UpdateTime" units="microseconds"
-    expires_after="2021-05-02">
+<histogram base="true" name="Blink.HitTestDocumentUpdate.UpdateTime"
+    units="microseconds" expires_after="2021-07-04">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
 
   <owner>schenney@chromium.org</owner>
@@ -840,7 +1065,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.HTMLParsing.ChunkCount" units="chunks"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>schenney@chromium.org</owner>
   <owner>dom-dev@chromium.org</owner>
   <summary>
@@ -853,7 +1078,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.HTMLParsing.ParsingTimeMax" units="microseconds"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>schenney@chromium.org</owner>
   <owner>dom-dev@chromium.org</owner>
   <summary>
@@ -866,7 +1091,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.HTMLParsing.ParsingTimeMin" units="microseconds"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>schenney@chromium.org</owner>
   <owner>dom-dev@chromium.org</owner>
   <summary>
@@ -879,7 +1104,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.HTMLParsing.ParsingTimeTotal" units="microseconds"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>schenney@chromium.org</owner>
   <owner>dom-dev@chromium.org</owner>
   <summary>
@@ -892,7 +1117,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.HTMLParsing.TokensParsedAverage" units="tokens"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>schenney@chromium.org</owner>
   <owner>dom-dev@chromium.org</owner>
   <summary>
@@ -901,7 +1126,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.HTMLParsing.TokensParsedMax" units="tokens"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>schenney@chromium.org</owner>
   <owner>dom-dev@chromium.org</owner>
   <summary>
@@ -910,7 +1135,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.HTMLParsing.TokensParsedMin" units="tokens"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>schenney@chromium.org</owner>
   <owner>dom-dev@chromium.org</owner>
   <summary>
@@ -919,7 +1144,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.HTMLParsing.YieldedTimeAverage" units="microseconds"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>schenney@chromium.org</owner>
   <owner>dom-dev@chromium.org</owner>
   <summary>
@@ -932,7 +1157,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.HTMLParsing.YieldedTimeMax" units="microseconds"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>schenney@chromium.org</owner>
   <owner>dom-dev@chromium.org</owner>
   <summary>
@@ -945,7 +1170,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.HTMLParsing.YieldedTimeMin" units="microseconds"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>schenney@chromium.org</owner>
   <owner>dom-dev@chromium.org</owner>
   <summary>
@@ -958,7 +1183,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.ImageDecoders.IncrementalDecodeNeeded"
-    enum="IncrementalDecodeNeeded" expires_after="2021-05-02">
+    enum="IncrementalDecodeNeeded" expires_after="2021-07-04">
   <owner>mbarowsky@chromium.org</owner>
   <owner>andrescj@chromium.org</owner>
   <summary>
@@ -972,7 +1197,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Blink.ImageDecoders.IncrementallyDecodedByteSize"
-    units="bytes" expires_after="2021-05-09">
+    units="bytes" expires_after="2021-07-11">
   <owner>mbarowsky@chromium.org</owner>
   <owner>andrescj@chromium.org</owner>
   <summary>
@@ -987,7 +1212,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Blink.ImageDecoders.InitiallyFullyDecodedByteSize"
-    units="bytes" expires_after="2021-04-11">
+    units="bytes" expires_after="2021-08-15">
   <owner>mbarowsky@chromium.org</owner>
   <owner>andrescj@chromium.org</owner>
   <summary>
@@ -1004,8 +1229,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.ImageDecoders.Jpeg.Area" units="pixels"
-    expires_after="2021-02-28">
+    expires_after="2022-02-28">
   <owner>andrescj@chromium.org</owner>
+  <owner>src/third_party/blink/renderer/platform/image-decoders/OWNERS</owner>
   <summary>
     Number of pixels in a decoded JPEG image. Recorded after decoding is done by
     Blink's JPEG decoder (as opposed to, possibly, a hardware decode
@@ -1018,7 +1244,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.ImageDecoders.Jpeg.ColorSpace" enum="JpegColorSpace"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>andrescj@chromium.org</owner>
   <owner>mcasas@chromium.org</owner>
   <summary>
@@ -1029,8 +1255,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Blink.ImplCompositorCommit.UpdateTime" units="microseconds"
-    expires_after="2021-05-02">
+<histogram base="true" name="Blink.ImplCompositorCommit.UpdateTime"
+    units="microseconds" expires_after="2021-07-04">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
 
   <owner>schenney@chromium.org</owner>
@@ -1046,15 +1276,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Input.GestureScrollBeginAsCursorControl"
-    enum="BooleanSuccess" expires_after="M89">
+    enum="BooleanSuccess" expires_after="M91">
   <owner>ctzsm@chromium.org</owner>
   <owner>changwan@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>Records if a GestureScrollBegin is for cursor control.</summary>
 </histogram>
 
-<histogram name="Blink.IntersectionObservation.UpdateTime" units="microseconds"
-    expires_after="2021-03-21">
+<histogram base="true" name="Blink.IntersectionObservation.UpdateTime"
+    units="microseconds" expires_after="2021-08-09">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
 
   <owner>schenney@chromium.org</owner>
@@ -1068,8 +1302,50 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram base="true" name="Blink.JavascriptDocumentUpdate.UpdateTime"
+    units="microseconds" expires_after="2021-07-04">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
+
+  <owner>schenney@chromium.org</owner>
+  <owner>paint-dev@chromium.org</owner>
+  <summary>
+    Time spent preparing the document to answer a Javascript API query or
+    request. Examples include scrool offset requests, queries of layout
+    dimensions, SVG path queries, etc. Includes time spent in style update and
+    layout, or via EnsurePaintLocationDataValidForNode. Some of these calls may
+    be servicing internal needs, but we have no way to disambiguate those from
+    JS driven activity.
+
+    This histogram does not record metrics on machines with low-resolution
+    clocks.
+  </summary>
+</histogram>
+
+<histogram base="true" name="Blink.JavascriptIntersectionObserver.UpdateTime"
+    units="microseconds" expires_after="2021-08-09">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
+
+  <owner>schenney@chromium.org</owner>
+  <owner>paint-dev@chromium.org</owner>
+  <summary>
+    Time spent computing IntersectionObserver observations in the Blink document
+    lifecycle where the observation is due to a Javascript request. Recorded
+    when an intersection observation is made for the Javascript reason.
+
+    This histogram only records metrics on machines with high-resolution clocks.
+  </summary>
+</histogram>
+
 <histogram name="Blink.KeyboardLock.MethodCalled" enum="KeyboardLockMethods"
-    expires_after="2020-12-31">
+    expires_after="2021-09-30">
   <owner>joedow@chromium.org</owner>
   <owner>garykac@chromium.org</owner>
   <summary>
@@ -1078,7 +1354,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Layout.NGRatio.Blocks" units="%"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>tkent@chromium.org</owner>
   <owner>layout-dev@chromium.org</owner>
   <summary>
@@ -1093,7 +1369,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Layout.NGRatio.Calls" units="%"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>tkent@chromium.org</owner>
   <owner>layout-dev@chromium.org</owner>
   <summary>
@@ -1108,8 +1384,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Blink.Layout.UpdateTime" units="microseconds"
-    expires_after="2021-05-02">
+<histogram base="true" name="Blink.Layout.UpdateTime" units="microseconds"
+    expires_after="2021-07-04">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
 
   <owner>schenney@chromium.org</owner>
@@ -1158,6 +1438,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram base="true" name="Blink.LazyLoadIntersectionObserver.UpdateTime"
+    units="microseconds" expires_after="2021-08-09">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
+
+  <owner>schenney@chromium.org</owner>
+  <owner>paint-dev@chromium.org</owner>
+  <summary>
+    Time spent computing IntersectionObserver observations in the Blink document
+    lifecycle where the observation is due to a Lazy Image Loading request.
+    Recorded when an intersection observation is made to determine when a lazy
+    loaded image should be loaded.
+
+    This histogram only records metrics on machines with high-resolution clocks.
+  </summary>
+</histogram>
+
 <histogram base="true" name="Blink.MainFrame.AnimateRatio" units="%"
     expires_after="2020-11-08">
   <obsolete>
@@ -1296,7 +1596,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Blink.MainFrame.IntersectionObservationRatio"
-    units="%" expires_after="2020-11-08">
+    units="%" expires_after="2021-08-09">
   <obsolete>
     Removed M88 due to lack of use.
   </obsolete>
@@ -1402,8 +1702,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Blink.MainFrame.UpdateTime" units="microseconds"
-    expires_after="2021-04-18">
+<histogram base="true" name="Blink.MainFrame.UpdateTime" units="microseconds"
+    expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
 
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
@@ -1435,6 +1735,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram base="true" name="Blink.MediaIntersectionObserver.UpdateTime"
+    units="microseconds" expires_after="2021-08-09">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
+
+  <owner>schenney@chromium.org</owner>
+  <owner>paint-dev@chromium.org</owner>
+  <summary>
+    Time spent computing IntersectionObserver observations in the Blink document
+    lifecycle where the observation is for a media element. Recorded when an
+    intersection observation is made attributed to a media element (such as
+    video auto-play).
+
+    This histogram only records metrics on machines with high-resolution clocks.
+  </summary>
+</histogram>
+
 <histogram name="Blink.MemoryCache.RevalidationPolicy"
     enum="RevalidationPolicy" expires_after="2021-04-21">
   <owner>hiroshige@chromium.org</owner>
@@ -1446,7 +1766,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.MemoryCache.RevalidationPolicy.AsyncScript"
-    enum="RevalidationPolicy" expires_after="2021-04-21">
+    enum="RevalidationPolicy" expires_after="2021-08-22">
   <owner>hiroshige@chromium.org</owner>
   <owner>lizeb@chromium.org</owner>
   <owner>loading-dev@chromium.org</owner>
@@ -1468,6 +1788,33 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Blink.MemoryCache.RevalidationPolicy.PerDocument"
+    enum="RevalidationPolicy" expires_after="2021-06-20">
+  <obsolete>
+    Removed in M89. Obsolete and unused. This has been replaced with
+    Blink.MemoryCache.RevalidationPolicy with feature
+    ScopeMemoryCachePerContext.
+  </obsolete>
+  <owner>shivanisha@chromium.org</owner>
+  <owner>privacy-sandbox-dev@chromium.org</owner>
+  <summary>
+    RevalidationPolicy used for requests for each resource type. Logged only if
+    the resource is found in the memory cache and if the same document had
+    loaded this resource earlier.
+  </summary>
+</histogram>
+
+<histogram name="Blink.MemoryCache.RevalidationPolicy.PerTopFrameSite"
+    enum="RevalidationPolicy" expires_after="2021-08-22">
+  <owner>shivanisha@chromium.org</owner>
+  <owner>privacy-sandbox-dev@chromium.org</owner>
+  <summary>
+    RevalidationPolicy used for requests for each resource type. Logged only if
+    the resource is found in the memory cache and if the same top-frame site had
+    loaded this resource earlier.
+  </summary>
+</histogram>
+
 <histogram name="Blink.MemoryCache.RevalidationPolicy.Preload"
     enum="RevalidationPolicy" expires_after="2021-04-21">
   <owner>hiroshige@chromium.org</owner>
@@ -1479,7 +1826,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.OffscreenCanvas.ContextType" enum="CanvasContextType"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>aaronhk@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>
@@ -1489,7 +1836,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.OffscreenCanvas.NewOffscreenCanvas" enum="Boolean"
-    expires_after="2021-01-31">
+    expires_after="2022-04-04">
   <owner>aaronhk@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>
@@ -1498,7 +1845,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.OffscreenCanvas.SqrtNumberOfPixels" units="sqrt(pixels)"
-    expires_after="2021-01-31">
+    expires_after="2022-04-04">
   <owner>aaronhk@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>
@@ -1508,17 +1855,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.OffscreenCanvas.TransferControlToOffscreen"
-    enum="Boolean" expires_after="2021-01-31">
+    enum="BooleanSuccess" expires_after="2022-04-04">
   <owner>aaronhk@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
-  <summary>
-    Records a call to transfer a canvas offscreen. True indicates a successful
-    transfer, false for a failure.
-  </summary>
+  <summary>Records a call to transfer a canvas offscreen.</summary>
 </histogram>
 
 <histogram name="Blink.OffscreenCanvas.Transferred" enum="Boolean"
-    expires_after="2021-01-31">
+    expires_after="2022-04-04">
   <owner>aaronhk@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>
@@ -1528,7 +1872,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Paint.CachedItemPercentage" units="%"
-    expires_after="2021-03-01">
+    expires_after="2021-07-01">
   <owner>wangxianzhu@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -1539,7 +1883,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Paint.CachedSubsequencePercentage" units="%"
-    expires_after="2021-03-01">
+    expires_after="2021-07-01">
   <owner>wangxianzhu@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -1550,8 +1894,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Blink.Paint.UpdateTime" units="microseconds"
-    expires_after="2021-04-18">
+<histogram base="true" name="Blink.Paint.UpdateTime" units="microseconds"
+    expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
 
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
@@ -1568,8 +1912,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Blink.PrePaint.UpdateTime" units="microseconds"
-    expires_after="2021-04-25">
+<histogram base="true" name="Blink.PrePaint.UpdateTime" units="microseconds"
+    expires_after="2021-06-27">
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
 
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
@@ -1589,7 +1933,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Render.DisplayLockActivationReason"
-    enum="DisplayLockActivationReason" expires_after="2021-03-21">
+    enum="DisplayLockActivationReason" expires_after="2021-08-09">
   <owner>vmpstr@chromium.org</owner>
   <owner>chrishtr@chromium.org</owner>
   <summary>This indicates the reason for display-locking activation</summary>
@@ -1597,6 +1941,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Blink.ResourceFetcher.StaleWhileRevalidateDuration" units="ms"
     expires_after="2020-04-05">
+  <obsolete>
+    Removed 12/2020.
+  </obsolete>
   <owner>dtapuska@chromium.org</owner>
   <owner>kenjibaheux@google.com</owner>
   <summary>Duration of completed stale revalidation attempts.</summary>
@@ -1625,7 +1972,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Script.AsyncScriptCount" units="count"
-    expires_after="2021-05-25">
+    expires_after="2021-07-27">
   <owner>dom@chromium.org</owner>
   <owner>chrome-loading@google.com</owner>
   <summary>
@@ -1681,7 +2028,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Script.SchedulingType" enum="ScriptSchedulingType"
-    expires_after="2021-05-02">
+    expires_after="2021-07-11">
+  <obsolete>
+    Removed in M90 because we collected enough insights.
+  </obsolete>
   <owner>kouhei@chromium.org</owner>
   <owner>hiroshige@chromium.org</owner>
   <summary>
@@ -1690,8 +2040,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Blink.ScrollingCoordinator.UpdateTime" units="microseconds"
-    expires_after="M88">
+<histogram base="true" name="Blink.ScrollDocumentUpdate.UpdateTime"
+    units="microseconds" expires_after="2021-07-04">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
+
+  <owner>schenney@chromium.org</owner>
+  <owner>paint-dev@chromium.org</owner>
+  <summary>
+    Time spent preparing the document to ensure correct scroll behavior, such as
+    scroll chaining or other programatic scrolling. Includes time spent in style
+    update and layout.
+
+    This histogram does not record metrics on machines with low-resolution
+    clocks.
+  </summary>
+</histogram>
+
+<histogram base="true" name="Blink.ScrollingCoordinator.UpdateTime"
+    units="microseconds" expires_after="M88">
   <obsolete>
     Merged into Blink.CompositingCommit.UpdateTime in http://crrev.com/815947 in
     M88.
@@ -1717,8 +2087,38 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram base="true" name="Blink.ServiceDocumentUpdate.UpdateTime"
+    units="microseconds" expires_after="2021-07-04">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
+
+  <owner>schenney@chromium.org</owner>
+  <owner>paint-dev@chromium.org</owner>
+  <summary>
+    Time spent preparing the document to service browser driven behaviors.
+    Examples include accessibility, intersection observer, display locking and
+    spell checking. Includes time spent in style update and layout.
+
+    This histogram does not record metrics on machines with low-resolution
+    clocks.
+  </summary>
+</histogram>
+
+<histogram name="Blink.Sms.BackendAvailability"
+    enum="WebOTPBackendAvailability" expires_after="2021-08-09">
+  <owner>yigu@chromium.org</owner>
+  <owner>web-identity@google.com</owner>
+  <summary>
+    Records how often the verification backend is unavailable for the WebOTP API
+    and the corresponding reason. This is recorded once per OTP request.
+  </summary>
+</histogram>
+
 <histogram name="Blink.Sms.PendingOriginCount" units="origins"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>yigu@chromium.org</owner>
   <owner>web-identity@google.com</owner>
   <summary>
@@ -1729,7 +2129,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Sms.Receive.DestroyedReason"
-    enum="WebOTPServiceDestroyedReason" expires_after="M92">
+    enum="WebOTPServiceDestroyedReason" expires_after="2021-08-09">
   <owner>goto@chromium.org</owner>
   <owner>reillyg@chromium.org</owner>
   <owner>yigu@chromium.org</owner>
@@ -1740,7 +2140,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Sms.Receive.Infobar" enum="WebOTPServiceInfobarAction"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>goto@chromium.org</owner>
   <owner>reillyg@chromium.org</owner>
   <owner>yigu@chromium.org</owner>
@@ -1752,7 +2152,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Sms.Receive.Outcome" enum="WebOTPServiceOutcome"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>goto@chromium.org</owner>
   <owner>reillyg@chromium.org</owner>
   <owner>yigu@chromium.org</owner>
@@ -1761,7 +2161,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Sms.Receive.SmsParsingStatus" enum="SmsParsingStatus"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>yigu@chromium.org</owner>
   <owner>web-identity@google.com</owner>
   <summary>
@@ -1796,7 +2196,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Sms.Receive.TimeCancelOnSuccess" units="ms"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>goto@chromium.org</owner>
   <owner>reillyg@chromium.org</owner>
   <owner>yigu@chromium.org</owner>
@@ -1808,7 +2208,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Sms.Receive.TimeContinueOnSuccess" units="ms"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>goto@chromium.org</owner>
   <owner>reillyg@chromium.org</owner>
   <owner>yigu@chromium.org</owner>
@@ -1820,7 +2220,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Sms.Receive.TimeSmsReceive" units="ms"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>goto@chromium.org</owner>
   <owner>reillyg@chromium.org</owner>
   <owner>yigu@chromium.org</owner>
@@ -1831,7 +2231,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Blink.Sms.Receive.TimeSuccess" units="ms" expires_after="M92">
+<histogram name="Blink.Sms.Receive.TimeSuccess" units="ms"
+    expires_after="2021-08-09">
   <owner>goto@chromium.org</owner>
   <owner>reillyg@chromium.org</owner>
   <owner>yigu@chromium.org</owner>
@@ -1844,7 +2245,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.Sms.Receive.TimeUserCancel" units="ms"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>goto@chromium.org</owner>
   <owner>yigu@chromium.org</owner>
   <owner>web-identity@google.com</owner>
@@ -1867,8 +2268,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Blink.Style.UpdateTime" units="microseconds"
-    expires_after="2021-03-21">
+<histogram base="true" name="Blink.Style.UpdateTime" units="microseconds"
+    expires_after="2021-07-27">
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
 
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
@@ -1896,6 +2297,25 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Blink.UpdateViewportIntersection.UpdateTime"
+    units="microseconds" expires_after="2021-08-09">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
+
+  <owner>schenney@chromium.org</owner>
+  <owner>paint-dev@chromium.org</owner>
+  <summary>
+    Time spent computing geometry information about iframes from the perspective
+    of their embedding document. This time is also included in the
+    Blink.IntersectionObservation.UpdateTime metric.
+
+    This histogram only records metrics on machines with high-resolution clocks.
+  </summary>
+</histogram>
+
 <histogram name="Blink.UseCounter.AnimatedCSSProperties"
     enum="MappedCSSProperties" expires_after="never">
 <!-- expires-never: used by Chrome Platform Status dashboard -->
@@ -1968,7 +2388,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.UseCounter.DocumentPolicy.Header"
-    enum="DocumentPolicyFeature" expires_after="2021-03-31">
+    enum="DocumentPolicyFeature" expires_after="2021-08-09">
   <owner>iclelland@chromium.org</owner>
   <owner>feature-control@chromium.org</owner>
   <summary>
@@ -1997,7 +2417,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.UseCounter.Extensions.Features" enum="FeatureObserver"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>chasej@chromium.org</owner>
   <owner>feature-control@chromium.org</owner>
   <summary>
@@ -2137,6 +2557,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </details>
 </histogram>
 
+<histogram base="true" name="Blink.UserDrivenDocumentUpdate.UpdateTime"
+    units="microseconds" expires_after="2021-07-04">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
+
+  <owner>schenney@chromium.org</owner>
+  <owner>paint-dev@chromium.org</owner>
+  <summary>
+    Time spent preparing the document to service user driven behaviors. Examples
+    include inspector, selection, editing, find-in-page and focus. Includes time
+    spent in style update and layout.
+
+    This histogram does not record metrics on machines with low-resolution
+    clocks.
+  </summary>
+</histogram>
+
 <histogram name="Blink.VisibleBeforeLoaded.LazyLoadEligibleFrames.BelowTheFold"
     enum="NQEEffectiveConnectionType" expires_after="2021-02-21">
   <owner>sclittle@chromium.org</owner>
@@ -2148,7 +2588,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.VisibleBeforeLoaded.LazyLoadImages.AboveTheFold"
-    enum="NQEEffectiveConnectionType" expires_after="2021-03-21">
+    enum="NQEEffectiveConnectionType" expires_after="2021-07-27">
   <owner>sclittle@chromium.org</owner>
   <owner>rajendrant@chromium.org</owner>
   <summary>
@@ -2158,7 +2598,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.VisibleBeforeLoaded.LazyLoadImages.BelowTheFold"
-    enum="NQEEffectiveConnectionType" expires_after="2021-05-02">
+    enum="NQEEffectiveConnectionType" expires_after="2021-07-04">
   <owner>sclittle@chromium.org</owner>
   <owner>rajendrant@chromium.org</owner>
   <summary>
@@ -2168,7 +2608,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Blink.VisibleLoadTime.LazyLoadEligibleFrames.AboveTheFold"
-    units="ms" expires_after="2021-04-25">
+    units="ms" expires_after="2021-06-27">
   <owner>sclittle@chromium.org</owner>
   <summary>
     Milliseconds spent waiting for an above the fold iframe to load. Only fires
@@ -2188,7 +2628,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Blink.VisibleLoadTime.LazyLoadImages.AboveTheFold"
-    units="ms" expires_after="2021-04-25">
+    units="ms" expires_after="2021-06-27">
   <owner>rajendrant@chromium.org</owner>
   <owner>bengr@chromium.org</owner>
   <summary>
@@ -2200,7 +2640,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Blink.VisibleLoadTime.LazyLoadImages.BelowTheFold"
-    units="ms" expires_after="2021-04-25">
+    units="ms" expires_after="2021-06-27">
   <owner>rajendrant@chromium.org</owner>
   <owner>bengr@chromium.org</owner>
   <summary>
@@ -2211,8 +2651,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Blink.WaitForCommit.UpdateTime" units="microseconds"
-    expires_after="2021-05-02">
+<histogram base="true" name="Blink.WaitForCommit.UpdateTime"
+    units="microseconds" expires_after="2021-07-04">
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePreFCPSuffixes" -->
+
+<!-- Name completed by histogram_suffixes name="BlinkUpdateTimePostFCPSuffixes" -->
+
 <!-- Name completed by histogram_suffixes name="BlinkUpdateTimeAggregatedSuffixes" -->
 
   <owner>schenney@chromium.org</owner>
@@ -2263,7 +2707,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BlinkGC.MainThreadMarkingThroughput" units="MB/s"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>mlippautz@chromium.org</owner>
   <owner>oilpan-reviews@chromium.org</owner>
   <summary>
@@ -2302,7 +2746,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="BlinkGC.TimeForAtomicPhase" units="ms" expires_after="M92">
+<histogram name="BlinkGC.TimeForAtomicPhase" units="ms"
+    expires_after="2021-08-09">
   <owner>mlippautz@chromium.org</owner>
   <owner>oilpan-reviews@chromium.org</owner>
   <summary>
@@ -2314,7 +2759,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BlinkGC.TimeForAtomicPhaseMarking" units="ms"
-    expires_after="M92">
+    expires_after="2021-08-15">
   <owner>mlippautz@chromium.org</owner>
   <owner>oilpan-reviews@chromium.org</owner>
   <summary>
@@ -2324,7 +2769,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="BlinkGC.TimeForCompleteSweep" units="ms" expires_after="M92">
+<histogram name="BlinkGC.TimeForCompleteSweep" units="ms"
+    expires_after="2021-08-09">
   <owner>bikineev@chromium.org</owner>
   <owner>oilpan-reviews@chromium.org</owner>
   <summary>
@@ -2362,7 +2808,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BlinkGC.TimeForIncrementalMarking" units="ms"
-    expires_after="M92">
+    expires_after="2021-08-08">
   <owner>mlippautz@chromium.org</owner>
   <owner>oilpan-reviews@chromium.org</owner>
   <summary>
@@ -2381,7 +2827,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="BlinkGC.TimeForMarking" units="ms" expires_after="M92">
+<histogram name="BlinkGC.TimeForMarking" units="ms" expires_after="2021-08-09">
   <owner>omerkatz@chromium.org</owner>
   <owner>oilpan-reviews@chromium.org</owner>
   <summary>
@@ -2391,7 +2837,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="BlinkGC.TimeForMarkingRoots" units="ms" expires_after="M92">
+<histogram name="BlinkGC.TimeForMarkingRoots" units="ms"
+    expires_after="2021-08-09">
   <owner>omerkatz@chromium.org</owner>
   <owner>oilpan-reviews@chromium.org</owner>
   <summary>
@@ -2421,7 +2868,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BlinkGC.TimeForSweepingForeground" units="ms"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>bikineev@chromium.org</owner>
   <owner>oilpan-reviews@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/bluetooth/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/bluetooth/histograms.xml
index f5006c9093b..bf044c2048b 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/bluetooth/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/bluetooth/histograms.xml
@@ -52,7 +52,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Bluetooth.Availability.v2" enum="BluetoothAvailability"
-    expires_after="2020-12-31">
+    expires_after="2021-12-31">
   <owner>kenrb@chromium.org</owner>
   <owner>kpaulhamus@chromium.org</owner>
   <summary>
@@ -104,7 +104,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Bluetooth.ChromeOS.Pairing.Result" enum="BooleanSuccess"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
 <!-- Name completed by histogram_suffixes name="BluetoothTransportTypes" -->
 
   <owner>hansberry@chromium.org</owner>
@@ -121,7 +121,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Bluetooth.ChromeOS.Pairing.Result.FailureReason"
-    enum="BluetoothConnectionFailureReason" expires_after="2021-03-05">
+    enum="BluetoothConnectionFailureReason" expires_after="2021-07-11">
 <!-- Name completed by histogram_suffixes name="BluetoothTransportTypes" -->
 
   <owner>hansberry@chromium.org</owner>
@@ -148,7 +148,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Bluetooth.ChromeOS.UserInitiatedReconnectionAttempt.Result"
-    enum="BooleanSuccess" expires_after="2021-05-09">
+    enum="BooleanSuccess" expires_after="2021-07-11">
 <!-- Name completed by histogram_suffixes name="BluetoothUISurfaces" -->
 
   <owner>hansberry@chromium.org</owner>
@@ -183,7 +183,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Bluetooth.ConnectedDeviceCount" units="devices"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>adlr@chromium.org</owner>
   <summary>
     Counts the number of simulataneously connected Bluetooth devices. Used to
@@ -215,6 +215,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Bluetooth.Linux.ConnectToServiceInsecurelyResult"
+    enum="BluetoothAdapterConnectToServiceInsecurelyResult"
+    expires_after="2022-01-01">
+  <owner>alainm@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Result of attempting a call to mojom::Adapter::ConnectToServiceInsecurely().
+    Emitted when function completes.
+  </summary>
+</histogram>
+
 <histogram base="true" name="Bluetooth.MacOS.Errors"
     enum="MacOSBluetoothOperationsResult" expires_after="2021-01-31">
 <!-- Name completed by histogram_suffixes name="WebBluetoothMacOSAPIs" -->
@@ -312,7 +323,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Bluetooth.Web.ChooserInteraction" enum="BooleanInvalid"
-    expires_after="2021-01-31">
+    expires_after="2021-07-18">
   <owner>ortuno@chromium.org</owner>
   <owner>reillyg@chromium.org</owner>
   <summary>
@@ -322,7 +333,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Bluetooth.Web.ConnectGATT.Outcome"
-    enum="WebBluetoothConnectGATTOutcome" expires_after="2021-03-15">
+    enum="WebBluetoothConnectGATTOutcome" expires_after="2021-07-18">
   <owner>ortuno@chromium.org</owner>
   <owner>reillyg@chromium.org</owner>
   <summary>
@@ -610,7 +621,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Bluetooth.Web.RequestDevice.Outcome"
-    enum="WebBluetoothRequestDeviceOutcome" expires_after="2021-01-31">
+    enum="WebBluetoothRequestDeviceOutcome" expires_after="2021-07-18">
   <owner>ortuno@chromium.org</owner>
   <owner>reillyg@chromium.org</owner>
   <summary>
@@ -663,7 +674,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Bluetooth.Web.RequestDevice.UnionOfServices.Services"
-    enum="GATTServiceHash" expires_after="2021-04-04">
+    enum="GATTServiceHash" expires_after="2021-08-15">
   <owner>ortuno@chromium.org</owner>
   <owner>reillyg@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/borealis/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/borealis/histograms.xml
index cbe119cd89d..713f40da243 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/borealis/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/borealis/histograms.xml
@@ -58,6 +58,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Borealis.Shutdown.Attempt" enum="BooleanAttempted"
+    expires_after="2022-02-02">
+  <owner>lqu@google.com</owner>
+  <owner>src/chrome/browser/chromeos/borealis/OWNERS</owner>
+  <summary>
+    Recording every attempt to exit Borealis given the that VM was launched.
+    Recorded regardless of if the shutdown is successful.
+  </summary>
+</histogram>
+
 <histogram name="Borealis.Stability" enum="GuestOsFailureClasses"
     expires_after="2021-10-09">
   <owner>cpelling@google.com</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/browser/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/browser/histograms.xml
index 2143764c4d3..4ca713cd55d 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/browser/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/browser/histograms.xml
@@ -21,8 +21,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<histogram name="Browser.AnyWindowHasName" enum="Boolean"
+    expires_after="2021-06-30">
+  <owner>ellyjones@chromium.org</owner>
+  <summary>
+    Whether any browser window in the current session has a user-set name.
+    Logged once every histogram recording.
+  </summary>
+</histogram>
+
 <histogram name="Browser.BitmapFetcher.Decode" units="ms"
-    expires_after="2021-04-23">
+    expires_after="2021-06-27">
   <owner>manukh@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
@@ -30,7 +39,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.BitmapFetcher.Fetch" units="ms"
-    expires_after="2021-04-23">
+    expires_after="2021-06-27">
   <owner>manukh@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
@@ -52,8 +61,33 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram
+    name="Browser.ContinuousSearch.BackNavigationToSrp{ExperimentCategory}"
+    units="count" expires_after="2021-06-20">
+  <owner>ckitagawa@chromium.org</owner>
+  <owner>fredmello@chromium.org</owner>
+  <owner>mahmoudi@chromium.org</owner>
+  <owner>yashard@chromium.org</owner>
+  <summary>
+    Records the number of back navigations to the Google search result page
+    while in a search session. It is emitted when the session is considered
+    ended. Different actions that cause the search session to end include
+    navigating away from SRP (or one of the pages linked in SRP), closing the
+    SRP tab and closing the browser.
+  </summary>
+  <token key="ExperimentCategory">
+    <variant name="">
+      <obsolete>
+        Deprecated 2021-02. Replaced by experiment arm suffixes.
+      </obsolete>
+    </variant>
+    <variant name=".News"/>
+    <variant name=".Organic"/>
+  </token>
+</histogram>
+
 <histogram name="Browser.DarkModeStatus" enum="DarkModeStatus"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>lgrey@chromium.org</owner>
   <owner>robliao@chromium.org</owner>
   <summary>
@@ -63,7 +97,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.PaintPreview.Capture.CompressedOnDiskSize" units="KB"
-    expires_after="2021-04-18">
+    expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -74,7 +108,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.PaintPreview.Capture.NumberOfFramesCaptured"
-    units="units" expires_after="2021-04-25">
+    units="units" expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -84,7 +118,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.PaintPreview.Capture.Success" enum="BooleanSuccess"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -94,7 +128,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.PaintPreview.Capture.TotalCaptureDuration" units="ms"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -105,7 +139,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.PaintPreview.Capture.UncompressedOnDiskSize"
-    units="KB" expires_after="2021-03-08">
+    units="KB" expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -117,6 +151,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Browser.PaintPreview.CaptureExperiment.CompressedOnDiskSize"
     units="KB" expires_after="2020-12-20">
+  <obsolete>
+    Obsoleted on 2020-11-17 as corresponding experiment code was removed and the
+    experiment wrapped up.
+  </obsolete>
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -128,6 +166,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Browser.PaintPreview.CaptureExperiment.Success"
     enum="BooleanSuccess" expires_after="2020-12-20">
+  <obsolete>
+    Obsoleted on 2020-11-17 as corresponding experiment code was removed and the
+    experiment wrapped up.
+  </obsolete>
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -138,7 +180,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.PaintPreview.Player.CompositorProcessStartedCorrectly"
-    units="BooleanSuccess" expires_after="2021-03-08">
+    units="BooleanSuccess" expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -148,7 +190,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.PaintPreview.Player.CompositorProcessStartupTime"
-    units="ms" expires_after="2021-05-02">
+    units="ms" expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -158,7 +200,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.PaintPreview.Player.LinkClicked"
-    units="BooleanSuccess" expires_after="2021-04-18">
+    units="BooleanSuccess" expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -166,7 +208,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.PaintPreview.Player.TimeToFirstBitmap" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -177,7 +219,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.PaintPreview.TabbedPlayer.CompositorFailureReason"
-    enum="TabbedPaintPreviewCompositorFailureReason" expires_after="2021-04-25">
+    enum="TabbedPaintPreviewCompositorFailureReason" expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -189,7 +231,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.PaintPreview.TabbedPlayer.ExitCause"
-    enum="TabbedPaintPreviewExitCause" expires_after="2021-04-18">
+    enum="TabbedPaintPreviewExitCause" expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -211,7 +253,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.PaintPreview.TabbedPlayer.HadCapture" units="Boolean"
-    expires_after="2021-07-01">
+    expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -223,7 +265,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.PaintPreview.TabbedPlayer.SnackbarCount" units="units"
-    expires_after="2021-05-02">
+    expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -234,7 +276,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.PaintPreview.TabbedPlayer.TimeToFirstBitmap"
-    units="ms" expires_after="2021-04-25">
+    units="ms" expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -245,7 +287,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Browser.PaintPreview.TabbedPlayer.UpTime"
-    units="ms" expires_after="2021-04-18">
+    units="ms" expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -256,7 +298,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.PaintPreview.TabService.DiskUsageAtStartup" units="KB"
-    expires_after="2021-05-02">
+    expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -267,7 +309,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.Responsiveness.IOJanksTotalPerMinute" units="janks"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>gab@chromium.org</owner>
   <owner>olivierli@chromium.org</owner>
   <summary>
@@ -281,7 +323,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.Responsiveness.IOJankyIntervalsPerMinute"
-    units="janks" expires_after="2021-04-04">
+    units="janks" expires_after="2021-08-09">
   <owner>gab@chromium.org</owner>
   <owner>olivierli@chromium.org</owner>
   <summary>
@@ -304,7 +346,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <!-- expires-never: guiding metric (internal: go/chrome-browser-guiding-metrics) -->
 
   <owner>erikchen@chromium.org</owner>
-  <owner>tdresser@chromium.org</owner>
   <owner>chrome-analysis-team@google.com</owner>
   <summary>
     This metric is emitted every 30 seconds [when there is user activity]. Each
@@ -344,7 +385,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <!-- expires-never: guiding metric (internal: go/chrome-browser-guiding-metrics) -->
 
   <owner>erikchen@chromium.org</owner>
-  <owner>tdresser@chromium.org</owner>
   <owner>fdoray@chromium.org</owner>
   <owner>chrome-analysis-team@google.com</owner>
   <summary>
@@ -378,7 +418,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.Tabs.SelectionToVisibilityRequestTime"
-    units="microseconds" expires_after="2021-04-11">
+    units="microseconds" expires_after="2021-08-15">
   <owner>sadrul@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
@@ -392,7 +432,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Browser.Tabs.TabSwitchResult"
-    enum="TabSwitchResult" expires_after="2021-05-09">
+    enum="TabSwitchResult" expires_after="2021-07-11">
 <!-- Name completed by histogram_suffixes name="TabSwitchingType" -->
 
   <owner>fdoray@chromium.org</owner>
@@ -400,7 +440,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Browser.Tabs.TotalIncompleteSwitchDuration"
-    units="ms" expires_after="2021-04-25">
+    units="ms" expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="TabSwitchingType" -->
 
   <owner>fdoray@chromium.org</owner>
@@ -412,7 +452,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Browser.Tabs.TotalSwitchDuration" units="ms"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
 <!-- Name completed by histogram_suffixes name="TabSwitchingType" -->
 
   <owner>ejoe@google.com</owner>
@@ -424,7 +464,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.WindowCount.Guest" units="units"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>rhalavati@chromium.org</owner>
   <owner>chrome-privacy-core@google.com</owner>
   <summary>
@@ -436,7 +476,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Browser.WindowCount.Incognito" units="units"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>rhalavati@chromium.org</owner>
   <owner>chrome-privacy-core@google.com</owner>
   <summary>
@@ -448,7 +488,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BrowserDialogs.ExternalProtocol.HandleState"
-    enum="HandleStateType" expires_after="2021-03-28">
+    enum="HandleStateType" expires_after="2021-08-09">
   <owner>dominickn@chromium.org</owner>
   <owner>meacer@chromium.org</owner>
   <summary>
@@ -461,8 +501,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="BrowserRenderProcessHost.BackgroundTime" units="ms"
     expires_after="2021-04-04">
-  <owner>ericrobinson@chromium.org</owner>
+  <obsolete>
+    Obsoleted on 2021-01-22 as corresponding experiment code was removed and the
+    experiment wrapped up.
+  </obsolete>
   <owner>johnidel@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     Record the time spent in the background after RenderProcessHost
     initialization of the process. Recorded when the RenderProcessHost for the
@@ -482,7 +526,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BrowserRenderProcessHost.ChildCrashes" enum="RendererType"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>wfh@chromium.org</owner>
   <summary>Count of renderer process crashes grouped by type.</summary>
 </histogram>
@@ -494,7 +538,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BrowserRenderProcessHost.ChildKills.OOM" enum="RendererType"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>oshima@chromium.org</owner>
   <summary>
     Out of BrowserRenderProcessHost.ChildKills, numer of kills due to SIGKILL,
@@ -533,9 +577,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BrowserRenderProcessHost.FramePrioritiesSeen"
-    enum="FramePrioritiesSeen" expires_after="2021-04-11">
-  <owner>ericrobinson@chromium.org</owner>
+    enum="FramePrioritiesSeen" expires_after="2021-06-13">
+  <obsolete>
+    Obsoleted on 2021-01-22 as corresponding experiment code was removed and the
+    experiment wrapped up.
+  </obsolete>
   <owner>csharrison@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     Determines what combination of low and normal priority frames were attached
     to a render process during its lifetime. Recorded when the host for the
@@ -556,7 +604,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BrowserRenderProcessHost.SpareProcessMaybeTakeAction"
-    enum="SpareProcessMaybeTakeAction" expires_after="2021-04-25">
+    enum="SpareProcessMaybeTakeAction" expires_after="2021-06-27">
   <owner>alexmos@chromium.org</owner>
   <owner>lukasza@chromium.org</owner>
   <summary>
@@ -566,9 +614,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BrowserRenderProcessHost.TotalTime" units="ms"
-    expires_after="2021-02-21">
-  <owner>ericrobinson@chromium.org</owner>
+    expires_after="2021-06-06">
+  <obsolete>
+    Obsoleted on 2021-01-22 as corresponding experiment code was removed and the
+    experiment wrapped up.
+  </obsolete>
   <owner>johnidel@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     Record the lifetime of the RenderProcessHost after initialization of the
     process. Recorded when the RenderProcessHost for the process is destroyed.
@@ -617,7 +669,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BrowserServices.VerificationResult"
-    enum="BrowserServicesVerificationResult" expires_after="M92">
+    enum="BrowserServicesVerificationResult" expires_after="2021-08-09">
   <owner>peconn@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -648,7 +700,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BrowserSwitcher.AlternativeBrowser" enum="BrowserType"
-    expires_after="2021-04-04">
+    expires_after="2021-08-15">
   <owner>nicolaso@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -693,7 +745,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BrowserSwitcher.Decision" enum="BooleanBrowserSwitch"
-    expires_after="2021-04-04">
+    expires_after="2021-08-15">
   <owner>nicolaso@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -705,7 +757,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BrowserSwitcher.DecisionTime" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-15">
   <owner>nicolaso@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -726,7 +778,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BrowserSwitcher.ExternalSitelistSize" units="rules"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>nicolaso@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -757,7 +809,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BrowserSwitcher.IeemSitelistSize" units="rules"
-    expires_after="2021-04-04">
+    expires_after="2021-08-15">
   <owner>nicolaso@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -767,7 +819,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BrowserSwitcher.LaunchSuccess" enum="BooleanSuccess"
-    expires_after="2021-04-04">
+    expires_after="2021-07-27">
   <owner>nicolaso@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -777,7 +829,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BrowserSwitcher.LaunchTime" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>nicolaso@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -797,7 +849,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BrowserSwitcher.UrlListWildcard" enum="BooleanPresent"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>nicolaso@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/chrome/OWNERS b/chromium/tools/metrics/histograms/histograms_xml/chrome/OWNERS
new file mode 100644
index 00000000000..dd116272f3f
--- /dev/null
+++ b/chromium/tools/metrics/histograms/histograms_xml/chrome/OWNERS
@@ -0,0 +1,7 @@
+# Prefer chromium-metrics-reviews@google.com instead.
+# Use the following owners only if:
+#  - The reviewer is available for review.
+#  - You work in the same area as them.
+#  - They are already a good reviewer for the non-metrics part of the CL.
+# See tools/metrics/histograms/OWNERS for details.
+tbansal@chromium.org
\ No newline at end of file
diff --git a/chromium/tools/metrics/histograms/histograms_xml/chrome/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/chrome/histograms.xml
index 5abd9bc6363..d0b2fdda352 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/chrome/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/chrome/histograms.xml
@@ -145,7 +145,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Chrome.Tabs.AnimationSmoothness.TabLoading" units="%"
-    expires_after="2021-06-04">
+    expires_after="2021-08-09">
   <owner>yichenz@chromium.org</owner>
   <owner>chromeos-wmp@google.com</owner>
   <summary>
@@ -155,8 +155,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ChromeColors.ColorApplied" enum="ChromeColorsInfo"
+    expires_after="M90">
+  <owner>alexilin@chromium.org</owner>
+  <owner>jkrcal@chromium.org</owner>
+  <summary>
+    Records the theme color every time the user clicks on a color icon in the
+    color picker.
+  </summary>
+</histogram>
+
 <histogram name="ChromeColors.ColorOnLoad" enum="ChromeColorsInfo"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>gayane@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <summary>
@@ -234,7 +244,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="ChromeMLService.EvaluationLatency" units="ms"
-    expires_after="2021-02-27">
+    expires_after="M92">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -245,7 +255,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="ChromeMLService.LoadModelResult"
-    enum="ChromeMLServiceLoadModelResult" expires_after="2021-02-27">
+    enum="ChromeMLServiceLoadModelResult" expires_after="M92">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -254,8 +264,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeMLService.PredictionResult.DecisionTreeModel"
-    enum="ChromeMLServiceDecisionTreePredictionResult"
-    expires_after="2021-02-27">
+    enum="ChromeMLServiceDecisionTreePredictionResult" expires_after="M92">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -264,7 +273,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeMLService.ServiceAliveDuration" units="ms"
-    expires_after="2021-02-27">
+    expires_after="M92">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -275,28 +284,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeMLService.ServiceCrash" enum="Boolean"
-    expires_after="2021-02-27">
+    expires_after="M92">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>Records if the Chrome ML Service crashed.</summary>
 </histogram>
 
 <histogram name="ChromeMLService.ServiceLaunch" enum="Boolean"
-    expires_after="2021-02-27">
+    expires_after="M92">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>Records if the Chrome ML Service launched successfully.</summary>
 </histogram>
 
 <histogram name="ChromeMLService.ServiceNormalTermination" enum="Boolean"
-    expires_after="2021-02-27">
+    expires_after="M92">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>Records if the Chrome ML Service terminated normally.</summary>
 </histogram>
 
 <histogram name="ChromeMLService.ServiceStatusWhenRequested"
-    enum="ChromeMLServiceRequestStatus" expires_after="2021-02-27">
+    enum="ChromeMLServiceRequestStatus" expires_after="M92">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -305,7 +314,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="ChromeMLService.ValidationLatency" units="ms"
-    expires_after="2021-02-27">
+    expires_after="M92">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/chromeos/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/chromeos/histograms.xml
index 939366bdff6..c3e9ed5741c 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/chromeos/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/chromeos/histograms.xml
@@ -23,7 +23,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="ChromeOS.Apps.ExternalProtocolDialog"
-    enum="ArcIntentHandlerAction" expires_after="M90">
+    enum="ArcIntentHandlerAction" expires_after="2021-08-22">
   <owner>dominickn@chromium.org</owner>
   <owner>melzhang@chromium.org</owner>
   <owner>mxcai@chromium.org</owner>
@@ -34,7 +34,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.Apps.ExternalProtocolDialog.Accepted"
-    enum="ArcExternalProtocolAction" expires_after="M90">
+    enum="ArcExternalProtocolAction" expires_after="2021-08-22">
   <owner>dominickn@chromium.org</owner>
   <owner>melzhang@chromium.org</owner>
   <owner>mxcai@chromium.org</owner>
@@ -57,7 +57,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.Apps.IntentPickerAction"
-    enum="ArcIntentHandlerAction" expires_after="2021-04-11">
+    enum="ArcIntentHandlerAction" expires_after="2021-08-15">
   <owner>elijahtaylor@google.com</owner>
   <owner>dominickn@chromium.org</owner>
   <owner>shihuis@google.com</owner>
@@ -68,7 +68,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.Apps.IntentPickerDestinationPlatform"
-    enum="ArcIntentHandlerDestinationPlatform" expires_after="2021-03-21">
+    enum="ArcIntentHandlerDestinationPlatform" expires_after="2021-07-27">
   <owner>elijahtaylor@google.com</owner>
   <owner>dominickn@chromium.org</owner>
   <owner>shihuis@google.com</owner>
@@ -81,7 +81,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.Apps.NumberOfAppsForNotification"
-    enum="BooleanMultipleApps" expires_after="2021-01-31">
+    enum="BooleanMultipleApps" expires_after="2021-08-09">
   <owner>dominickn@chromium.org</owner>
   <owner>nancylingwang@chromium.org</owner>
   <summary>
@@ -100,9 +100,31 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ChromeOS.Attestation.AttestationFlowStatus"
+    enum="AttestationFlowStatus" expires_after="2021-07-31">
+  <owner>cylai@chromium.org</owner>
+  <owner>cros-hwsec+umas@chromium.org</owner>
+  <summary>
+    Records the status of attestation flow. The value represents 6 flags in 6
+    rightmost bits; starting from more significant bits they mean: 1. Has proxy.
+    2. Is System proxy active. 3. Run the default flow. 4. The default flow
+    succeeds. 5. Run the fallback flow. 6. The fallback flow succeeds.
+  </summary>
+</histogram>
+
+<histogram name="ChromeOS.Attestation.GetCertificateStatus"
+    enum="AttestationStatus" expires_after="2021-07-31">
+  <owner>cylai@chromium.org</owner>
+  <owner>cros-hwsec+umas@chromium.org</owner>
+  <summary>
+    Records the status of `AttesttionClient::GetCertificate()` called by
+    `AttestationFlowIntegrated`.
+  </summary>
+</histogram>
+
 <histogram base="true"
     name="ChromeOS.Camera.ConfigureStreams.Output.Resolution" units="pixels"
-    expires_after="2021-03-15">
+    expires_after="2021-10-01">
 <!-- Name completed by histogram_suffixes
      name="ChromeOS.Camera.StreamFormat" -->
 
@@ -115,7 +137,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.Camera.ConfigureStreamsLatency" units="microseconds"
-    expires_after="2021-03-15">
+    expires_after="2021-10-01">
   <owner>wtlee@chromium.org</owner>
   <owner>chromeos-camera-eng@google.com</owner>
   <summary>
@@ -128,7 +150,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.Camera.ErrorType" enum="ChromeOSCameraErrorType"
-    expires_after="2021-03-15">
+    expires_after="2021-10-01">
   <owner>wtlee@chromium.org</owner>
   <owner>chromeos-camera-eng@google.com</owner>
   <summary>
@@ -138,7 +160,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.Camera.Facing" enum="ChromeOSCameraFacing"
-    expires_after="2021-03-15">
+    expires_after="2021-10-01">
   <owner>wtlee@chromium.org</owner>
   <owner>chromeos-camera-eng@google.com</owner>
   <summary>
@@ -147,7 +169,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="ChromeOS.Camera.Jpeg.Latency" units="microseconds"
-    expires_after="2021-03-15">
+    expires_after="2021-10-01">
 <!-- Name completed by histogram_suffixes
      name="ChromeOS.Camera.JpegProcessMethod" and
      name="ChromeOS.Camera.JpegProcessType" -->
@@ -166,7 +188,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="ChromeOS.Camera.Jpeg.Resolution" units="pixels"
-    expires_after="2021-03-15">
+    expires_after="2021-10-01">
 <!-- Name completed by histogram_suffixes
      name="ChromeOS.Camera.JpegProcessMethod" and
      name="ChromeOS.Camera.JpegProcessType" -->
@@ -181,8 +203,18 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ChromeOS.Camera.OpenDeviceClientType"
+    enum="ChromeOSCameraClientType" expires_after="2021-10-01">
+  <owner>lnishan@chromium.org</owner>
+  <owner>chromeos-camera-eng@google.com</owner>
+  <summary>
+    Records which client type (e.g., Chrome, Android) is opening a camera
+    device.
+  </summary>
+</histogram>
+
 <histogram name="ChromeOS.Camera.OpenDeviceLatency" units="microseconds"
-    expires_after="2021-03-15">
+    expires_after="2021-10-01">
   <owner>wtlee@chromium.org</owner>
   <owner>chromeos-camera-eng@google.com</owner>
   <summary>
@@ -194,14 +226,14 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.Camera.SessionDuration" units="seconds"
-    expires_after="2021-03-15">
+    expires_after="2021-10-01">
   <owner>wtlee@chromium.org</owner>
   <owner>chromeos-camera-eng@google.com</owner>
   <summary>Records the session duration in Chrome OS camera service.</summary>
 </histogram>
 
 <histogram name="ChromeOS.CertProvisioning.CsrSignTime" units="ms"
-    expires_after="2021-06-01">
+    expires_after="2021-08-15">
   <owner>miersh@google.com</owner>
   <owner>pmarko@chromium.org</owner>
   <summary>
@@ -251,7 +283,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.CWP.CollectPerf"
-    enum="ChromeOSProfileCollectionStatus" expires_after="2021-04-18">
+    enum="ChromeOSProfileCollectionStatus" expires_after="2021-08-22">
   <owner>aalexand@google.com</owner>
   <owner>gmx@chromium.org</owner>
   <summary>
@@ -261,7 +293,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.CWP.CollectProcessTypes"
-    enum="ChromeOSProcessTypeCollectionStatus" expires_after="2021-03-01">
+    enum="ChromeOSProcessTypeCollectionStatus" expires_after="2022-01-19">
   <owner>aalexand@google.com</owner>
   <owner>cwp-team@google.com</owner>
   <summary>
@@ -282,7 +314,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.CWP.ParseCPUFrequencies"
-    enum="ChromeOSParseCPUFrequencyStatus" expires_after="2021-04-18">
+    enum="ChromeOSParseCPUFrequencyStatus" expires_after="2021-08-09">
   <owner>gmx@chromium.org</owner>
   <owner>cwp-team@google.com</owner>
   <summary>
@@ -292,8 +324,20 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ChromeOS.CWP.RecordPerf" enum="ChromeOSProfileRecordStatus"
+    expires_after="2021-11-30">
+  <owner>dubin@google.com</owner>
+  <owner>cwp-team@google.com</owner>
+  <summary>
+    A count of the various outcomes related to recording the profile data
+    collected via &quot;perf events&quot; on Chrome OS. The histogram is
+    recorded when system-wide CPU profiling finishes and the collected data is
+    being saved to memory for later upload.
+  </summary>
+</histogram>
+
 <histogram name="ChromeOS.CWP.UploadPerf" units="reports"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>aalexand@google.com</owner>
   <owner>gmx@chromium.org</owner>
   <summary>
@@ -302,10 +346,72 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ChromeOS.DeviceSettings.FeatureFlagsMigration"
+    enum="DeviceSettingsFeatureFlagsMigrationStatus" expires_after="2021-11-30">
+  <owner>mnissler@chromium.org</owner>
+  <owner>src/chrome/browser/ash/settings/OWNERS</owner>
+  <summary>
+    Migration status for Chrome OS feature flags configuration in device
+    settings. This is intended to track migration progress in the field, so the
+    migration code can be removed when the old approach of storing bare flags is
+    no longer relevant in the field.
+  </summary>
+</histogram>
+
+<histogram name="ChromeOS.DiagnosticsUi.MemoryRoutineDuration" units="s"
+    expires_after="2021-07-15">
+  <owner>baileyberro@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>
+    Records the duration that the Memory Routine took to complete. Emitted when
+    the routine completes successfully.
+  </summary>
+</histogram>
+
+<histogram name="ChromeOS.DiagnosticsUi.OpenDuration" units="ms"
+    expires_after="2021-07-15">
+  <owner>baileyberro@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>
+    Records the duration that the Diagnostics App is open. emitted when the app
+    is closed.
+  </summary>
+</histogram>
+
+<histogram name="ChromeOS.DiagnosticsUi.RoutineCount" units="routines"
+    expires_after="2021-07-15">
+  <owner>baileyberro@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>
+    Records the number of routines run while the Chrome OS Diagnostics App was
+    open. Begins at zero each time the app is open and recorded each time the
+    app is closed.
+  </summary>
+</histogram>
+
+<histogram name="ChromeOS.DiagnosticsUi.{RoutineType}Result"
+    enum="CrosDiagnosticsRoutineResult" expires_after="2021-07-15">
+  <owner>baileyberro@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>Records the result of the {RoutineType} Routine.</summary>
+  <token key="RoutineType">
+    <variant name="BatteryCharge"/>
+    <variant name="BatteryDischarge"/>
+    <variant name="CpuCache"/>
+    <variant name="CpuFloatingPoint"/>
+    <variant name="CpuPrime"/>
+    <variant name="CpuStress"/>
+    <variant name="Memory"/>
+  </token>
+</histogram>
+
 <histogram name="ChromeOS.FamilyLinkUser.LogSegment"
-    enum="FamilyLinkUserLogSegment" expires_after="2021-10-12">
+    enum="FamilyLinkUserLogSegment" expires_after="never">
+<!-- expires-never: used internally for filtering -->
+
   <owner>tobyhuang@chromium.org</owner>
   <owner>cros-families-eng@google.com</owner>
+  <owner>chrome-metrics-team@google.com</owner>
   <summary>
     Categorizes the current user for the Family Experiences team's metrics.
     Other is for all other users that do not fall into any of the below
@@ -317,8 +423,12 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="ChromeOS.FamilyUser.LogSegment" enum="FamilyUserLogSegment"
     expires_after="2021-07-23">
+  <obsolete>
+    Replaced with ChromeOS.FamilyUser.LogSegment2 in M90
+  </obsolete>
   <owner>tobyhuang@chromium.org</owner>
   <owner>cros-families-eng@google.com</owner>
+  <owner>chrome-metrics-team@google.com</owner>
   <summary>
     Categorizes the current user for the Family Experiences team's metrics.
     Other is for all other users that do not fall into any of the below
@@ -331,6 +441,25 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ChromeOS.FamilyUser.LogSegment2" enum="FamilyUserLogSegment"
+    expires_after="never">
+<!-- expires-never: used internally for filtering -->
+
+  <owner>tobyhuang@chromium.org</owner>
+  <owner>cros-families-eng@google.com</owner>
+  <owner>chrome-metrics-team@google.com</owner>
+  <summary>
+    Categorizes the current user for the Family Experiences team's metrics.
+    Other is for all other users that do not fall into any of the below
+    categories. A Supervised User has a supervised primary account and no
+    secondary accounts. A Supervised Student has a supervised primary account
+    and one or more EDU secondary accounts, which is the only available option
+    for a secondary account in that scenario. A Student at Home has a K-12 EDU
+    primary account on an unmanaged ChromeOS device, regardless of the secondary
+    account. A Regular User is an unmanaged consumer user on any device.
+  </summary>
+</histogram>
+
 <histogram name="ChromeOS.GAIA.AuthenticatorContentWindowNull" enum="Boolean"
     expires_after="M85">
   <obsolete>
@@ -348,7 +477,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="ChromeOS.HardwareVerifier.Report"
-    enum="HardwareVerifierQualificationStatus" expires_after="2021-04-20">
+    enum="HardwareVerifierQualificationStatus" expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="HardwareVerifierSupportCategory" -->
 
   <owner>itspeter@chromium.org</owner>
@@ -361,7 +490,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.HardwareVerifier.Report.IsCompliant" enum="Boolean"
-    expires_after="2021-04-20">
+    expires_after="2021-08-22">
   <owner>itspeter@chromium.org</owner>
   <owner>stimim@chromium.org</owner>
   <owner>chromeos-hw-checker@google.com</owner>
@@ -369,7 +498,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.HardwareVerifier.TimeToFinish" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>itspeter@chromium.org</owner>
   <owner>stimim@chromium.org</owner>
   <owner>chromeos-hw-checker@google.com</owner>
@@ -379,7 +508,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.HardwareVerifier.TimeToProbe" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>itspeter@chromium.org</owner>
   <owner>stimim@chromium.org</owner>
   <owner>chromeos-hw-checker@google.com</owner>
@@ -397,8 +526,28 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ChromeOS.KeyPermissionsManager.ArcUsageUpdate"
+    enum="KeyPermissionsManagerArcUsageUpdateStatus" expires_after="2021-08-01">
+  <owner>omorsi@google.com</owner>
+  <owner>pmarko@google.com</owner>
+  <summary>
+    Counts the number of times the arc usage flags update started as well as the
+    number of times it succeeded and failed.
+  </summary>
+</histogram>
+
+<histogram name="ChromeOS.KeyPermissionsManager.ArcUsageUpdateTime" units="ms"
+    expires_after="2021-08-01">
+  <owner>omorsi@google.com</owner>
+  <owner>pmarko@chromium.org</owner>
+  <summary>
+    Records the time taken to successfully update chaps with the new ARC usage
+    flags.
+  </summary>
+</histogram>
+
 <histogram name="ChromeOS.KeyPermissionsManager.Migration"
-    enum="KeyPermissionsManagerMigrationStatus" expires_after="2021-04-01">
+    enum="KeyPermissionsManagerMigrationStatus" expires_after="2021-08-09">
   <owner>omorsi@google.com</owner>
   <owner>pmarko@google.com</owner>
   <summary>
@@ -407,6 +556,15 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ChromeOS.KeyPermissionsManager.MigrationTime" units="ms"
+    expires_after="2021-08-01">
+  <owner>omorsi@google.com</owner>
+  <owner>pmarko@chromium.org</owner>
+  <summary>
+    Records the time taken to successfully migrate key permissions to chaps.
+  </summary>
+</histogram>
+
 <histogram name="ChromeOS.Lacros.OSChannel" enum="ChromeOSChannel"
     expires_after="2021-10-01">
   <owner>jamescook@chromium.org</owner>
@@ -431,27 +589,105 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ChromeOS.LegacySupervisedUsers.HiddenFromLoginScreen"
+    enum="BooleanLegacySupervisedUserHidden" expires_after="M93">
+  <owner>tobyhuang@chromium.org</owner>
+  <owner>cros-families-eng@google.com</owner>
+  <summary>
+    Reports true when the login screen hides a legacy supervised user. Reports
+    false when the login screen displays a Gaia user. Recorded whenever the user
+    sees the login screen.
+  </summary>
+</histogram>
+
+<histogram name="ChromeOS.Logging.{LogType}EntryCountPerDay"
+    units="log entries per day" expires_after="2021-07-31">
+  <owner>yoshiki@chromium.org</owner>
+  <owner>chromeos-velocity@chromium.org</owner>
+  <summary>
+    Metrics of the numbers of log entries recorded in {LogType}s. Recorded when
+    the daily job &quot;chromeos-cleanup-logs&quot; is executed.
+  </summary>
+  <token key="LogType">
+    <variant name="SystemLog"/>
+    <variant name="UserLog"/>
+  </token>
+</histogram>
+
+<histogram name="ChromeOS.Logging.{LogType}LogFileSizePerDay" units="MB"
+    expires_after="2021-07-31">
+  <owner>yoshiki@chromium.org</owner>
+  <owner>chromeos-velocity@chromium.org</owner>
+  <summary>
+    File sizes of {LogType} files in megabytes. Recorded when the daily job
+    &quot;chromeos-cleanup-logs&quot; is executed.
+  </summary>
+  <token key="LogType">
+    <variant name="SystemArc"/>
+    <variant name="SystemAudit"/>
+    <variant name="SystemChrome"/>
+    <variant name="SystemMessage"/>
+    <variant name="SystemNet"/>
+    <variant name="UserChrome"/>
+  </token>
+</histogram>
+
+<histogram name="ChromeOS.Logging.{LogType}MaxThroughputPerMin"
+    units="log entries per min" expires_after="2021-07-31">
+  <owner>yoshiki@chromium.org</owner>
+  <owner>chromeos-velocity@chromium.org</owner>
+  <summary>
+    Metrics of the number of maximum throughput (entries per minute) recorded in
+    {LogType}s within a day. Recorded when the daily job
+    &quot;chromeos-cleanup-logs&quot; is executed.
+  </summary>
+  <token key="LogType">
+    <variant name="SystemLog"/>
+    <variant name="UserLog"/>
+  </token>
+</histogram>
+
+<histogram name="ChromeOS.Logging.{LogType}TotalFileSize" units="MB"
+    expires_after="2021-07-31">
+  <owner>yoshiki@chromium.org</owner>
+  <owner>chromeos-velocity@chromium.org</owner>
+  <summary>
+    Total file sizes of {LogType} files in megabytes. Recorded when the daily
+    job &quot;chromeos-cleanup-logs&quot; is executed.
+  </summary>
+  <token key="LogType">
+    <variant name="SystemLog"/>
+    <variant name="UserLog"/>
+  </token>
+</histogram>
+
 <histogram name="ChromeOS.MachineIdRegen.AgeSeconds" units="seconds"
-    expires_after="M77">
-  <owner>zeuthen@chromium.org</owner>
+    expires_after="2022-02-02">
+  <owner>ahassani@chromium.org</owner>
+  <owner>chromeos-core-services@google.com</owner>
   <summary>
     The number of seconds of uptime since the last time the Chrome OS machine-id
     was regenerated. This is reported every time the machine-id is regenerated
     except for the first time since reboot.
+
+    NB: Data before M90 is incomplete.
   </summary>
 </histogram>
 
 <histogram name="ChromeOS.MachineIdRegen.Reason" enum="ChromeOSMachineIdReason"
-    expires_after="M77">
-  <owner>zeuthen@chromium.org</owner>
+    expires_after="2022-02-02">
+  <owner>ahassani@chromium.org</owner>
+  <owner>chromeos-core-services@google.com</owner>
   <summary>
     The reason why the Chrome OS machine-id was regenerated. This is reported
     when the machine-id is re-generated.
+
+    NB: Data before M90 is incomplete.
   </summary>
 </histogram>
 
 <histogram name="ChromeOS.MemoryPressureLevel" enum="MemoryPressureLevel"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>xdai@chromium.org</owner>
   <summary>
     The memory pressure level in Chrome OS, which is recorded periodically (once
@@ -492,7 +728,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.PlatformVerification.Available"
-    enum="BooleanAvailable" expires_after="2020-10-04">
+    enum="BooleanAvailable" expires_after="2021-12-21">
   <owner>apronin@chromium.org</owner>
   <owner>cros-hwsec+uma@chromium.org</owner>
   <summary>
@@ -502,7 +738,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.PlatformVerification.Result"
-    enum="ChromeOSPlatformVerificationResult" expires_after="2020-08-31">
+    enum="ChromeOSPlatformVerificationResult" expires_after="2021-12-21">
   <owner>apronin@chromium.org</owner>
   <owner>cros-hwsec+uma@chromium.org</owner>
   <summary>
@@ -512,7 +748,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.PrivacyScreen.Toggled"
-    enum="PrivacyScreenToggleUISurface" expires_after="2021-04-14">
+    enum="PrivacyScreenToggleUISurface" expires_after="2021-08-09">
   <owner>tengs@chromium.org</owner>
   <owner>gzadina@google.com</owner>
   <summary>
@@ -532,7 +768,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.SAML.InSessionPasswordChangeEvent"
-    enum="SamlInSessionPasswordChangeEvent" expires_after="2021-04-30">
+    enum="SamlInSessionPasswordChangeEvent" expires_after="2021-07-11">
   <owner>mslus@chromium.org</owner>
   <owner>rsorokin@chromium.org</owner>
   <summary>
@@ -552,7 +788,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.SAML.Provider" enum="ChromeOSSamlProvider"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>mslus@chromium.org</owner>
   <owner>mohammedabdon@chromium.org</owner>
   <summary>Records SAML provider when SAML login flow is used.</summary>
@@ -599,6 +835,18 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram
+    name="ChromeOS.Settings.Accessibility.FullscreenMagnifierMouseFollowingMode"
+    enum="MagnifierMouseFollowingMode" expires_after="2022-01-26">
+  <owner>josiahk@chromium.org</owner>
+  <owner>chromium-accessibility@chromium.org</owner>
+  <summary>
+    Recorded when a user changes the value of the
+    kFullscreenMagnifierMouseFollowingMode setting on the Accessibility page.
+    Records the value of the setting.
+  </summary>
+</histogram>
+
 <histogram name="ChromeOS.Settings.Bluetooth.BluetoothOnOff"
     enum="BooleanToggled" expires_after="2021-09-30">
   <owner>khorimoto@chromium.org</owner>
@@ -643,7 +891,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.Settings.Languages.Browser.Interaction"
-    enum="SettingsLanguagesPageBrowserInteraction" expires_after="2021-03-31">
+    enum="SettingsLanguagesPageBrowserInteraction" expires_after="2021-08-01">
   <owner>myy@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -653,7 +901,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.Settings.Languages.Browser.OfferToTranslateCheckbox"
-    enum="BooleanChecked" expires_after="2021-03-31">
+    enum="BooleanChecked" expires_after="2021-05-30">
   <owner>myy@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -663,7 +911,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="ChromeOS.Settings.Languages.Browser.Toggle"
-    enum="BooleanToggled" expires_after="2021-03-31">
+    enum="BooleanToggled" expires_after="2021-05-30">
 <!-- Name completed by histogram_suffixes name="SettingsLanguagesPageToggle" -->
 
   <owner>myy@chromium.org</owner>
@@ -675,7 +923,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.Settings.Languages.Interaction"
-    enum="SettingsLanguagesPageInteraction" expires_after="2021-03-31">
+    enum="SettingsLanguagesPageInteraction" expires_after="2021-08-01">
   <owner>myy@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -685,7 +933,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.Settings.Languages.OfferToTranslateCheckbox"
-    enum="BooleanChecked" expires_after="2021-03-31">
+    enum="BooleanChecked" expires_after="2021-08-01">
   <owner>myy@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -695,7 +943,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.Settings.Languages.SupportPageVisits"
-    enum="SettingsLanguagesSupportPage" expires_after="2021-03-31">
+    enum="SettingsLanguagesSupportPage" expires_after="2021-08-01">
   <owner>myy@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -704,7 +952,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="ChromeOS.Settings.Languages.Toggle"
-    enum="BooleanToggled" expires_after="2021-03-31">
+    enum="BooleanToggled" expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="SettingsLanguagesPageToggle" -->
 
   <owner>myy@chromium.org</owner>
@@ -797,7 +1045,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.Settings.PathVisited" enum="WebUISettingsPathHashes"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>khorimoto@chromium.org</owner>
   <owner>cros-customization@google.com</owner>
   <summary>
@@ -818,6 +1066,17 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ChromeOS.Settings.Privacy.PeripheralDataAccessProtection"
+    enum="BooleanEnabled" expires_after="2021-11-30">
+  <owner>jimmyxgong@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>
+    Records when the users clicks on the Peripheral Data Access toggle. A true
+    value refers to the user enables peripheral data access protection (toggle
+    is turned on).
+  </summary>
+</histogram>
+
 <histogram name="ChromeOS.Settings.SearchLatency" units="ms"
     expires_after="2021-10-01">
   <owner>khorimoto@chromium.org</owner>
@@ -938,7 +1197,11 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="ChromeOS.Sharesheet.AppCount" units="apps" expires_after="M90">
+<histogram name="ChromeOS.Sharesheet.AppCount" units="apps" expires_after="M95">
+  <obsolete>
+    Replaced with pattern histogram ChromeOS.Sharesheet.AppCount.{AppType}.
+    (2021-03)
+  </obsolete>
   <owner>dominickn@chromium.org</owner>
   <owner>melzhang@chromium.org</owner>
   <summary>
@@ -946,15 +1209,53 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ChromeOS.Sharesheet.AppCount.{AppType}" units="apps"
+    expires_after="M95">
+  <owner>dominickn@chromium.org</owner>
+  <owner>melzhang@chromium.org</owner>
+  <summary>
+    Records number of {AppType} apps found for a given intent in the Sharesheet
+    when the sharesheet is invoked.
+  </summary>
+  <token key="AppType">
+    <variant name="All" summary="all apps"/>
+    <variant name="Arc" summary="arc app"/>
+    <variant name="Web" summary="web app"/>
+  </token>
+</histogram>
+
+<histogram name="ChromeOS.Sharesheet.FormFactor"
+    enum="ChromeOSSharesheetFormFactor" expires_after="M95">
+  <owner>dominickn@chromium.org</owner>
+  <owner>melzhang@chromium.org</owner>
+  <summary>Records the form factor when the Sharesheet is invoked.</summary>
+</histogram>
+
+<histogram name="ChromeOS.Sharesheet.LaunchSource"
+    enum="ChromeOSSharesheetLaunchSource" expires_after="M95">
+  <owner>dominickn@chromium.org</owner>
+  <owner>melzhang@chromium.org</owner>
+  <summary>Records the source from which the Sharesheet is invoked.</summary>
+</histogram>
+
+<histogram name="ChromeOS.Sharesheet.ShareActionCount"
+    enum="ChromeOSSharesheetAction" expires_after="M95">
+  <owner>dominickn@chromium.org</owner>
+  <owner>melzhang@chromium.org</owner>
+  <summary>
+    Records each action found for a given intent when the Sharesheet is invoked.
+  </summary>
+</histogram>
+
 <histogram name="ChromeOS.Sharesheet.UserAction"
-    enum="ChromeOSSharesheetAction" expires_after="M90">
+    enum="ChromeOSSharesheetAction" expires_after="M95">
   <owner>dominickn@chromium.org</owner>
   <owner>melzhang@chromium.org</owner>
   <summary>Records user action on sharesheet invocations.</summary>
 </histogram>
 
 <histogram name="ChromeOS.Sync.PreferencesMigrated" enum="BooleanMigrated"
-    expires_after="2021-03-28">
+    expires_after="2021-08-09">
   <owner>jamescook@chromium.org</owner>
   <owner>cros-customization@google.com</owner>
   <summary>
@@ -997,7 +1298,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.SystemTray.FeaturePodCountOnOpen" units="count"
-    expires_after="2021-04-11">
+    expires_after="2021-07-11">
   <owner>tengs@chromium.org</owner>
   <owner>amehfooz@chromium.org</owner>
   <summary>
@@ -1022,7 +1323,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.SystemTray.Interaction"
-    enum="CrosSystemTrayInteraction" expires_after="2021-05-10">
+    enum="CrosSystemTrayInteraction" expires_after="2021-08-15">
   <owner>tengs@chromium.org</owner>
   <owner>gzadina@google.com</owner>
   <summary>
@@ -1043,7 +1344,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.SystemTray.NotificationsRemovedByClearAll"
-    units="notifications" expires_after="2021-05-10">
+    units="notifications" expires_after="2021-07-11">
   <owner>tengs@chromium.org</owner>
   <owner>gzadina@google.com</owner>
   <summary>
@@ -1098,7 +1399,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.SystemTray.TimeToClick" units="ms"
-    expires_after="2021-05-10">
+    expires_after="2021-08-22">
   <owner>tengs@chromium.org</owner>
   <owner>gzadina@google.com</owner>
   <summary>
@@ -1117,7 +1418,8 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="ChromeOS.UrlXattrsCount" units="units" expires_after="M89">
+<histogram name="ChromeOS.UrlXattrsCount" units="units"
+    expires_after="2021-12-01">
   <owner>jorgelo@chromium.org</owner>
   <owner>tnagel@chromium.org</owner>
   <summary>
@@ -1128,7 +1430,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="ChromeOS.USB.DeviceAttached"
-    enum="ChromeOSUsbEventTiming" expires_after="2021-04-11">
+    enum="ChromeOSUsbEventTiming" expires_after="2021-08-15">
   <owner>allenwebb@chromium.org</owner>
   <owner>jorgelo@chromium.org</owner>
   <owner>mnissler@chromium.org</owner>
@@ -1136,7 +1438,10 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.UserAddingScreen.LoadTime" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-05-16">
+  <obsolete>
+    Removed in M90, superseded by ChromeOS.UserAddingScreen.LoadTimeViewsBased.
+  </obsolete>
   <owner>rsorokin@chromium.org</owner>
   <owner>tellier@google.com</owner>
   <owner>cros-oac@google.com</owner>
@@ -1147,7 +1452,7 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChromeOS.UserAddingScreen.LoadTimeViewsBased" units="ms"
-    expires_after="2021-01-07">
+    expires_after="2021-07-18">
   <owner>tellier@google.com</owner>
   <owner>rsorokin@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
@@ -1157,6 +1462,21 @@ incoming reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ChromeOS.UserTypeByDeviceType.LogSegment"
+    enum="UserDeviceMatrix" expires_after="M95">
+  <owner>bmalcolm@chromium.org</owner>
+  <owner>cros-client-wa@google.com</owner>
+  <summary>
+    This value is reported at the start of a user session, and is a 32-bit value
+    that reports the primary user account type and the device type (umanaged
+    user on managed device, K12 user on an education device, etc.). The upper
+    16-bits represent the device type (found at http://shortn/_3iFWcdjy0P), and
+    the lower 16-bits represent the user type (found at
+    http://shortn/_uK3ZM4pC0a). So a nonprofit user (0x03) on an enterprise
+    device (0x02) would be 0x00020003 or 131075.
+  </summary>
+</histogram>
+
 </histograms>
 
 </histogram-configuration>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/cloud/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/cloud/histograms.xml
index ac6b2c2547d..a57789bd96a 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/cloud/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/cloud/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="CloudPrint.AuthEvent" enum="CloudPrintAuthEventType"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>thestig@chromium.org</owner>
   <summary>Event counts in CloudPrintAuth.</summary>
 </histogram>
@@ -42,7 +42,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CloudPrint.JobHandlerEvent"
-    enum="CloudPrintJobHandlerEventType" expires_after="M90">
+    enum="CloudPrintJobHandlerEventType" expires_after="2021-07-18">
   <owner>thestig@chromium.org</owner>
   <summary>Event counts in PrinterJobHandler.</summary>
 </histogram>
@@ -60,18 +60,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CloudPrint.JobStatus" enum="CloudPrintJobStatusType"
-    expires_after="M90">
+    expires_after="2021-07-18">
   <owner>thestig@chromium.org</owner>
   <summary>Then number of job completion statuses.</summary>
 </histogram>
 
 <histogram name="CloudPrint.NativeJobStatus"
-    enum="CloudPrintNativeJobStatusType" expires_after="M90">
+    enum="CloudPrintNativeJobStatusType" expires_after="2021-07-18">
   <owner>thestig@chromium.org</owner>
   <summary>Event counts in PrintSystem.</summary>
 </histogram>
 
-<histogram name="CloudPrint.PrepareTime" units="ms" expires_after="M90">
+<histogram name="CloudPrint.PrepareTime" units="ms" expires_after="2021-07-18">
   <owner>thestig@chromium.org</owner>
   <summary>The amount of time needed to prepare job for spooling.</summary>
 </histogram>
@@ -94,7 +94,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CloudPrint.ServiceEvents" enum="ServiceProcessEventType"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>thestig@chromium.org</owner>
   <summary>Event counts in ServiceProcessControl.</summary>
 </histogram>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/compositing/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/compositing/histograms.xml
index f8c818b4545..1f005b3bb36 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/compositing/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/compositing/histograms.xml
@@ -23,8 +23,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Compositing.Browser.HitTestTimeToFindClosestLayer"
     units="microseconds" expires_after="2020-12-01">
+  <obsolete>
+    Expired Dec 2020.
+  </obsolete>
   <owner>flackr@chromium.org</owner>
-  <owner>animations-dev@chromium.org</owner>
+  <owner>input-dev@chromium.org</owner>
   <summary>
     Time spent finding the closest matching layer to a given point whenever we
     do hit testing on LayerTreeImpl (in a browser process).
@@ -38,7 +41,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Browser.LayersUpdateTime" units="microseconds"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>schenney@chromium.org</owner>
   <owner>animations-dev@chromium.org</owner>
   <summary>
@@ -54,7 +57,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Browser.LayerTreeImpl.CalculateDrawPropertiesUs"
-    units="microseconds" expires_after="2021-04-25">
+    units="microseconds" expires_after="2021-06-27">
   <owner>schenney@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -70,7 +73,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Browser.NumActiveLayers" units="layers"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>schenney@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -80,7 +83,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Browser.NumActivePictureLayers" units="layers"
-    expires_after="2021-06-01">
+    expires_after="2021-08-09">
   <owner>schenney@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -91,7 +94,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Browser.NumRenderSurfaces" units="surfaces"
-    expires_after="2021-06-01">
+    expires_after="2021-08-15">
   <owner>schenney@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -102,7 +105,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.ColorGamut" enum="ColorGamut"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>cblume@chromium.org</owner>
   <owner>khushalsagar@chromium.org</owner>
   <summary>
@@ -136,7 +139,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.DirectRenderer.GL.DrawFrameUs"
-    units="microseconds" expires_after="2021-04-11">
+    units="microseconds" expires_after="2021-08-15">
   <owner>weiliangc@chromium.org</owner>
   <summary>
     Time spent drawing of composited layers by GLRenderer, in microseconds. This
@@ -151,7 +154,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.DirectRenderer.PartialSwap.ExtraDamage" units="%"
-    expires_after="2021-04-11">
+    expires_after="2021-08-09">
   <owner>vasilyt@chromium.org</owner>
   <owner>backer@chromium.org</owner>
   <summary>
@@ -166,7 +169,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.DirectRenderer.PartialSwap.FrameBufferDamage"
-    units="%" expires_after="2021-04-11">
+    units="%" expires_after="2021-08-15">
   <owner>vasilyt@chromium.org</owner>
   <owner>backer@chromium.org</owner>
   <summary>
@@ -180,7 +183,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.DirectRenderer.PartialSwap.RootDamage" units="%"
-    expires_after="2021-04-25">
+    expires_after="2021-08-09">
   <owner>vasilyt@chromium.org</owner>
   <owner>backer@chromium.org</owner>
   <summary>
@@ -192,7 +195,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.DirectRenderer.PartialSwap.TotalDamage" units="%"
-    expires_after="2021-04-18">
+    expires_after="2021-08-09">
   <owner>vasilyt@chromium.org</owner>
   <owner>backer@chromium.org</owner>
   <summary>
@@ -204,7 +207,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.DirectRenderer.Software.DrawFrameUs"
-    units="microseconds" expires_after="2021-03-15">
+    units="microseconds" expires_after="2021-08-09">
   <owner>weiliangc@chromium.org</owner>
   <summary>
     Time spent drawing of composited layers by SoftwareRenderer, in
@@ -236,7 +239,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Display.Draw.Occlusion.Calculation.Time"
-    units="microseconds" expires_after="2021-03-28">
+    units="microseconds" expires_after="2021-08-01">
   <owner>yiyix@chromium.org</owner>
   <owner>chromeos-gfx@chromium.org</owner>
   <summary>
@@ -271,7 +274,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Display.DrawToSwapUs" units="microseconds"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>backer@chromium.org</owner>
   <owner>rjkroege@chromium.org</owner>
   <summary>
@@ -307,7 +310,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Display.FlattenedRenderPassCount" units="units"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>backer@chromium.org</owner>
   <owner>rjkroege@chromium.org</owner>
   <summary>
@@ -320,7 +323,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Compositing.Display.OverlayProcessorOzone.IsCandidateSharedImage"
-    enum="Boolean" expires_after="2021-03-15">
+    enum="Boolean" expires_after="2021-07-18">
   <owner>samans@chromium.org</owner>
   <owner>rjkroege@chromium.org</owner>
   <summary>
@@ -332,7 +335,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Display.OverlayProcessorOzone.SharedImageExists"
-    enum="Boolean" expires_after="2021-03-15">
+    enum="Boolean" expires_after="2021-07-18">
   <owner>samans@chromium.org</owner>
   <owner>rjkroege@chromium.org</owner>
   <summary>
@@ -342,7 +345,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Display.VizScheduledDrawToGpuStartedDrawUs"
-    units="microseconds" expires_after="2021-04-18">
+    units="microseconds" expires_after="2021-08-22">
   <owner>vasilyt@chromium.org</owner>
   <owner>backer@chromium.org</owner>
   <summary>
@@ -365,7 +368,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Renderer.GPUMemoryForTilingsInKb" units="Kb"
-    expires_after="M90">
+    expires_after="M99">
   <owner>pdr@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -380,8 +383,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Compositing.Renderer.HitTestTimeToFindClosestLayer"
     units="microseconds" expires_after="2020-12-01">
+  <obsolete>
+    Expired Dec 2020.
+  </obsolete>
   <owner>flackr@chromium.org</owner>
-  <owner>animations-dev@chromium.org</owner>
+  <owner>input-dev@chromium.org</owner>
   <summary>
     Time spent finding the closest matching layer to a given point whenever we
     do hit testing on LayerTreeImpl (in a renderer process).
@@ -396,7 +402,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Compositing.Renderer.LayerSkippedForDrawPropertiesDueToBackface"
-    units="boolean" expires_after="M90">
+    units="boolean" expires_after="M94">
   <owner>chrishtr@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -407,7 +413,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Renderer.LayersUpdateTime" units="microseconds"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>schenney@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -439,7 +445,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Renderer.LayerUpdateSkippedDueToBackface"
-    units="boolean" expires_after="M90">
+    units="boolean" expires_after="2021-08-22">
   <owner>chrishtr@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -450,7 +456,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Renderer.LCDTextDisallowedReasonKPixels"
-    enum="LCDTextDisallowedReason" expires_after="2021-04-01">
+    enum="LCDTextDisallowedReason" expires_after="2021-08-09">
   <owner>wangxianzhu@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -463,7 +469,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Renderer.LCDTextDisallowedReasonLayers"
-    enum="LCDTextDisallowedReason" expires_after="2021-04-01">
+    enum="LCDTextDisallowedReason" expires_after="2021-08-09">
   <owner>wangxianzhu@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -473,7 +479,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Renderer.NumActiveLayers" units="layers"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>schenney@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -483,7 +489,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Renderer.NumActivePictureLayers" units="layers"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>schenney@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -494,7 +500,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.Renderer.NumRenderSurfaces" units="surfaces"
-    expires_after="2021-06-01">
+    expires_after="2021-08-09">
   <owner>schenney@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -560,7 +566,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.SurfaceAggregator.AggregateUs"
-    units="microseconds" expires_after="2021-05-02">
+    units="microseconds" expires_after="2021-07-04">
   <owner>weiliangc@chromium.org</owner>
   <summary>
     Time spent aggregating compositor frames from different surfaces in
@@ -575,7 +581,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Compositing.SurfaceAggregator.FrameContainsVideo"
-    enum="TypeOfVideoInFrame" expires_after="2021-03-28">
+    enum="TypeOfVideoInFrame" expires_after="2021-08-01">
   <owner>vikassoni@chromium.org</owner>
   <owner>khushalsagar@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/content/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/content/histograms.xml
index a283d304f2b..d7d09efc830 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/content/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/content/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="ContentCapture.CaptureContentDelayTime" units="ms"
-    expires_after="2021-02-01">
+    expires_after="2022-01-12">
   <owner>michaelbai@chromium.org</owner>
   <owner>src/third_party/blink/renderer/core/content_capture/OWNERS</owner>
   <summary>
@@ -53,7 +53,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentCapture.CaptureContentTime2" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2022-01-12">
   <owner>michaelbai@chromium.org</owner>
   <owner>src/third_party/blink/renderer/core/content_capture/OWNERS</owner>
   <summary>
@@ -65,7 +65,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentCapture.GetBoundingBox" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2022-01-12">
   <owner>michaelbai@chromium.org</owner>
   <owner>src/third_party/blink/renderer/core/content_capture/OWNERS</owner>
   <summary>
@@ -77,7 +77,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentCapture.SendContentTime" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2022-01-12">
   <owner>michaelbai@chromium.org</owner>
   <owner>src/third_party/blink/renderer/core/content_capture/OWNERS</owner>
   <summary>
@@ -90,13 +90,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="ContentCapture.SentContentCount" units="count"
     expires_after="2021-04-04">
+  <obsolete>
+    Replaced by ContentCapture.SentContentCount2 in M89, which uses standard
+    buckets for 10k counts rather than exact linear buckets.
+  </obsolete>
+  <owner>michaelbai@chromium.org</owner>
+  <owner>src/third_party/blink/renderer/core/content_capture/OWNERS</owner>
+  <summary>The total number of content captures sent for a document.</summary>
+</histogram>
+
+<histogram name="ContentCapture.SentContentCount2" units="count"
+    expires_after="2022-01-12">
   <owner>michaelbai@chromium.org</owner>
   <owner>src/third_party/blink/renderer/core/content_capture/OWNERS</owner>
   <summary>The total number of content captures sent for a document.</summary>
 </histogram>
 
 <histogram name="ContentCapture.TaskDelayTimeInMs" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2022-01-12">
   <owner>michaelbai@chromium.org</owner>
   <owner>src/third_party/blink/renderer/core/content_capture/OWNERS</owner>
   <summary>
@@ -108,7 +119,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentCapture.TaskRunsPerCapture" units="runs"
-    expires_after="2021-04-04">
+    expires_after="2022-01-12">
   <owner>michaelbai@chromium.org</owner>
   <owner>src/third_party/blink/renderer/core/content_capture/OWNERS</owner>
   <summary>
@@ -173,14 +184,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSettings.DefaultAutoplaySetting" enum="ContentSetting"
-    expires_after="2021-06-19">
+    expires_after="2021-08-22">
   <owner>engedy@chromium.org</owner>
   <owner>src/components/permissions/PERMISSIONS_OWNERS</owner>
   <summary>The default autoplay setting at profile open.</summary>
 </histogram>
 
 <histogram name="ContentSettings.DefaultCookiesSetting" enum="ContentSetting"
-    expires_after="2021-06-19">
+    expires_after="2021-08-22">
   <owner>engedy@chromium.org</owner>
   <owner>src/components/permissions/PERMISSIONS_OWNERS</owner>
   <summary>The default cookies setting at profile open.</summary>
@@ -203,14 +214,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSettings.DefaultJavaScriptSetting"
-    enum="ContentSetting" expires_after="2021-06-19">
+    enum="ContentSetting" expires_after="2021-08-22">
   <owner>engedy@chromium.org</owner>
   <owner>src/components/permissions/PERMISSIONS_OWNERS</owner>
   <summary>The default JavaScript setting at profile open.</summary>
 </histogram>
 
 <histogram name="ContentSettings.DefaultLocationSetting" enum="ContentSetting"
-    expires_after="2021-06-19">
+    expires_after="2021-08-22">
   <owner>engedy@chromium.org</owner>
   <owner>src/components/permissions/PERMISSIONS_OWNERS</owner>
   <summary>The default location setting at profile open.</summary>
@@ -272,7 +283,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSettings.DefaultSubresourceFilterSetting"
-    enum="ContentSetting" expires_after="2021-06-19">
+    enum="ContentSetting" expires_after="2021-08-22">
   <owner>engedy@chromium.org</owner>
   <owner>src/components/permissions/PERMISSIONS_OWNERS</owner>
   <summary>The default subresource filter setting at profile open</summary>
@@ -296,6 +307,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="ContentSettings.EphemeralFlashPermission"
     enum="ContentSettings.EphemeralFlashPermission" expires_after="M89">
+  <obsolete>
+    Flash / Plugins is deprecated since M87 and removed in M89.
+  </obsolete>
   <owner>engedy@chromium.org</owner>
   <owner>src/components/permissions/PERMISSIONS_OWNERS</owner>
   <summary>
@@ -397,7 +411,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSettings.NumberOfExceptions" units="units"
-    expires_after="M90">
+    expires_after="2021-07-18">
   <owner>battre@chromium.org</owner>
   <summary>
     The number of user defined hostname patterns for content settings at browser
@@ -557,7 +571,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSettings.Popups.StrongBlockerActions"
-    enum="StrongPopupBlockerAction" expires_after="2021-04-11">
+    enum="StrongPopupBlockerAction" expires_after="2021-08-15">
   <owner>csharrison@chromium.org</owner>
   <summary>
     Counts of various events related to the strong popup blocker (aka abusive
@@ -566,7 +580,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.ActivityLoggingEnabled" enum="Boolean"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>rogerm@chromium.org</owner>
   <owner>feed@chromium.org</owner>
   <summary>
@@ -576,7 +590,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.AppLifecycle.Events"
-    enum="AppLifecycleEvent" expires_after="M90">
+    enum="AppLifecycleEvent" expires_after="2021-06-20">
   <owner>carlosk@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -601,7 +615,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.AvailableOffline.Opened"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-06-06">
   <owner>carlosk@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -642,6 +656,34 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ContentSuggestions.Feed.ContentAgeOnLoad.BlockingRefresh"
+    units="ms" expires_after="2022-01-20">
+  <owner>carlosk@chromium.org</owner>
+  <owner>harringtond@chromium.org</owner>
+  <owner>feed@chromium.org</owner>
+  <summary>
+    Android: The time since locally stored content was fetched from the server.
+    Reported when the feed surface is shown, and content is refreshed from the
+    network. This typically only happens when content is stale, so this is a
+    measurement of how stale content is before it's replaced by a blocking
+    refresh. Feed v2 only.
+  </summary>
+</histogram>
+
+<histogram name="ContentSuggestions.Feed.ContentAgeOnLoad.NotRefreshed"
+    units="ms" expires_after="2022-01-20">
+  <owner>carlosk@chromium.org</owner>
+  <owner>harringtond@chromium.org</owner>
+  <owner>feed@chromium.org</owner>
+  <summary>
+    Android: The time since locally stored content was fetched from the server.
+    Reported when the feed surface is shown, and the local persisted feed
+    content is loaded instead of a direct network refresh. This provides a
+    measure of how stale feed content is when the feed loads without a blocking
+    network request. Feed v2 only.
+  </summary>
+</histogram>
+
 <histogram name="ContentSuggestions.Feed.Controls.Actions"
     enum="FeedControlsActions" expires_after="never">
 <!-- expires-never: tracked as an important feed metric. -->
@@ -664,7 +706,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.DisplayStatusOnOpen"
-    enum="ContentSuggestionsDisplayStatus" expires_after="2021-04-18">
+    enum="ContentSuggestionsDisplayStatus" expires_after="2021-08-22">
   <owner>carlosk@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -677,7 +719,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.EngagementType"
-    enum="FeedEngagementType" expires_after="2021-03-01">
+    enum="FeedEngagementType" expires_after="never">
+<!-- expires-never: key feature metric.  We will need the Engagement
+       type as long as we have a feed, and it will be removed with the
+       feed code if the feed is ever removed. -->
+
   <owner>petewil@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -698,7 +744,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.FetchPendingSpinner.Shown"
-    enum="FeedSpinnerType" expires_after="M90">
+    enum="FeedSpinnerType" expires_after="2021-07-04">
   <owner>carlosk@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -710,7 +756,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.FetchPendingSpinner.VisibleDuration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2021-06-20">
   <owner>carlosk@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -735,7 +781,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.ImageFetchStatus"
-    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-06-01">
+    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-08-09">
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
   <summary>
@@ -786,7 +832,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="ContentSuggestions.Feed.LoadStepLatency"
-    units="ms" expires_after="2021-06-01">
+    units="ms" expires_after="2021-08-01">
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
   <summary>
@@ -800,7 +846,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.LoadStreamStatus.BackgroundRefresh"
-    enum="FeedLoadStreamStatus" expires_after="2021-05-01">
+    enum="FeedLoadStreamStatus" expires_after="2021-07-04">
   <owner>harringtond@chromium.org</owner>
   <owner>carlosk@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -821,7 +867,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.LoadStreamStatus.InitialFromStore"
-    enum="FeedLoadStreamStatus" expires_after="2021-05-01">
+    enum="FeedLoadStreamStatus" expires_after="2021-07-11">
   <owner>harringtond@chromium.org</owner>
   <owner>carlosk@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -834,7 +880,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.LoadStreamStatus.LoadMore"
-    enum="FeedLoadStreamStatus" expires_after="2021-05-01">
+    enum="FeedLoadStreamStatus" expires_after="2021-07-04">
   <owner>harringtond@chromium.org</owner>
   <owner>carlosk@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -855,7 +901,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.Network.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2021-07-04">
   <owner>carlosk@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -866,7 +912,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.Network.Duration.{NetworkEvent}"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-01-13">
   <owner>sczs@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -893,7 +939,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.Network.RequestStatusCode"
-    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-04-18">
+    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-06-20">
   <owner>carlosk@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -905,7 +951,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.Network.ResponseSizeKB" units="KB"
-    expires_after="2021-04-04">
+    expires_after="2021-07-04">
   <owner>carlosk@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -916,7 +962,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.Network.ResponseStatus"
-    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-05-01">
+    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-07-04">
   <owner>carlosk@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -936,7 +982,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.Network.TokenFetchStatus"
-    enum="GoogleServiceAuthError" expires_after="2021-05-02">
+    enum="GoogleServiceAuthError" expires_after="2021-07-04">
   <owner>carlosk@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -947,7 +993,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.NoticeCardFulfilled" enum="Boolean"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>vincb@google.com</owner>
   <owner>feed@chromium.org</owner>
   <summary>
@@ -958,7 +1004,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.NoticeCardFulfilled2" enum="Boolean"
-    expires_after="2021-06-16">
+    expires_after="2021-08-15">
   <owner>vincb@google.com</owner>
   <owner>feed@chromium.org</owner>
   <summary>
@@ -1063,7 +1109,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.Scheduler.RefreshTrigger"
-    enum="RefreshTrigger" expires_after="2021-03-21">
+    enum="RefreshTrigger" expires_after="2021-05-23">
   <owner>carlosk@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -1112,7 +1158,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.SendFeedback"
-    enum="FeedSendFeedbackType" expires_after="2021-02-01">
+    enum="FeedSendFeedbackType" expires_after="2022-02-01">
   <owner>carlosk@chromium.org</owner>
   <owner>petewil@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -1151,7 +1197,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.TimeSpentInFeed" units="ms"
-    expires_after="2021-05-01">
+    expires_after="2021-07-04">
   <owner>carlosk@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -1199,7 +1245,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.UploadActionsBatchStatus"
-    enum="FeedUploadActionsBatchStatus" expires_after="2021-04-18">
+    enum="FeedUploadActionsBatchStatus" expires_after="2021-12-01">
   <owner>iwells@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -1209,7 +1255,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.UploadActionsStatus"
-    enum="FeedUploadActionsStatus" expires_after="2020-12-01">
+    enum="FeedUploadActionsStatus" expires_after="2021-12-01">
   <owner>iwells@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -1221,7 +1267,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.UserActions" enum="FeedUserActionType"
-    expires_after="2021-05-01">
+    expires_after="2021-07-04">
   <owner>harringtond@chromium.org</owner>
   <owner>carlosk@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -1245,7 +1291,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.UserJourney.GetMore.FailureDuration"
-    units="ms" expires_after="2021-05-01">
+    units="ms" expires_after="2021-07-11">
   <owner>harringtond@chromium.org</owner>
   <owner>carlosk@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -1256,7 +1302,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.UserJourney.GetMore.SuccessDuration"
-    units="ms" expires_after="2021-05-01">
+    units="ms" expires_after="2021-07-11">
   <owner>harringtond@chromium.org</owner>
   <owner>carlosk@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -1267,7 +1313,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.UserJourney.OpenCard.Failure"
-    enum="Boolean" expires_after="2021-05-01">
+    enum="Boolean" expires_after="2021-07-04">
   <owner>harringtond@chromium.org</owner>
   <owner>carlosk@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -1278,7 +1324,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.UserJourney.OpenCard.SuccessDuration"
-    units="ms" expires_after="2021-05-01">
+    units="ms" expires_after="2021-07-04">
   <owner>harringtond@chromium.org</owner>
   <owner>carlosk@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -1289,7 +1335,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.UserJourney.OpenFeed.FailureDuration"
-    units="ms" expires_after="2021-05-01">
+    units="ms" expires_after="2021-07-11">
   <owner>harringtond@chromium.org</owner>
   <owner>carlosk@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -1301,7 +1347,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.UserJourney.OpenFeed.SuccessDuration"
-    units="ms" expires_after="2021-05-01">
+    units="ms" expires_after="2021-07-11">
   <owner>harringtond@chromium.org</owner>
   <owner>carlosk@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -1359,7 +1405,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.VisualElement.Viewed" units="index"
-    expires_after="M90">
+    expires_after="2021-07-04">
   <owner>carlosk@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -1413,7 +1459,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContentSuggestions.Feed.ZeroStateShown.Reason"
-    enum="FeedZeroStateShowReason" expires_after="M90">
+    enum="FeedZeroStateShowReason" expires_after="2021-06-20">
   <owner>carlosk@chromium.org</owner>
   <owner>harringtond@chromium.org</owner>
   <owner>feed@chromium.org</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/cookie/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/cookie/histograms.xml
index 2b9f670ffeb..5b5eddf8f8b 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/cookie/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/cookie/histograms.xml
@@ -21,6 +21,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<histogram name="Cookie.AbbreviatedExpirationYear" units="year"
+    expires_after="2021-06-30">
+  <obsolete>
+    Removed Jan 2021: no longer needed since crbug.com/907610 is now fixed.
+  </obsolete>
+  <owner>chlily@chromium.org</owner>
+  <owner>morlovich@chromium.org</owner>
+  <summary>
+    Records the abbreviated 2-digit year number used in a cookie's expiration
+    date. Emitted when parsing a cookie with an Expires attribute that specifies
+    an expiration year as a number between 0 and 99 inclusive.
+  </summary>
+</histogram>
+
 <histogram name="Cookie.BackingStoreUpdateResults" enum="BackingStoreResults"
     expires_after="M82">
   <owner>morlovich@chromium.org</owner>
@@ -31,7 +45,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cookie.CommitProblem" enum="CookieCommitProblem"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>morlovich@chromium.org</owner>
   <summary>
     Recorded when a problem occurs trying to commit changes to the cookie store
@@ -40,7 +54,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cookie.CookiePrefix" enum="CookiePrefix"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>estark@chromium.org</owner>
   <summary>
     Number of times a cookie was set with a name prefixed by
@@ -64,7 +78,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cookie.CookieSchemeRequestScheme" enum="CookieRequestScheme"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>bingler@chromium.org</owner>
   <owner>chlily@chromium.org</owner>
   <summary>
@@ -75,7 +89,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cookie.CookieSourceScheme" enum="CookieSourceScheme"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>estark@chromium.org</owner>
   <summary>
     For each cookie added to the store, record whether its source URL has a
@@ -103,14 +117,27 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Cookie.Count" units="units" expires_after="2021-03-21">
-  <owner>battre@chromium.org</owner>
+<histogram name="Cookie.Count" units="units" expires_after="2021-07-27">
+  <obsolete>
+    Removed Feb 2021 in favor of Cookie.Count2, which has a wider range.
+  </obsolete>
+  <owner>chlily@chromium.org</owner>
+  <owner>morlovich@chromium.org</owner>
   <summary>
     Number of cookies in the store (recorded every 10 minutes of active browsing
     time)
   </summary>
 </histogram>
 
+<histogram name="Cookie.Count2" units="units" expires_after="2021-07-27">
+  <owner>chlily@chromium.org</owner>
+  <owner>morlovich@chromium.org</owner>
+  <summary>
+    Number of cookies in the store (recorded every 10 minutes of active browsing
+    time), with a wider range than Cookie.Count.
+  </summary>
+</histogram>
+
 <histogram name="Cookie.DomainSet" enum="Boolean" expires_after="2021-11-18">
   <owner>bingler@chromium.org</owner>
   <owner>chlily@chromium.org</owner>
@@ -153,7 +180,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cookie.IncludedRequestEffectiveSameSite"
-    enum="CookieEffectiveSameSite" expires_after="M90">
+    enum="CookieEffectiveSameSite" expires_after="2021-08-22">
   <owner>bingler@chromium.org</owner>
   <owner>chlily@chromium.org</owner>
   <summary>
@@ -163,7 +190,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cookie.IncludedResponseEffectiveSameSite"
-    enum="CookieEffectiveSameSite" expires_after="M90">
+    enum="CookieEffectiveSameSite" expires_after="2021-08-22">
   <owner>bingler@chromium.org</owner>
   <owner>chlily@chromium.org</owner>
   <summary>
@@ -195,7 +222,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cookie.LoadProblem" enum="CookieLoadProblem"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>morlovich@chromium.org</owner>
   <summary>
     Recorded when a problem is recorded when loading the persistent cookie
@@ -203,8 +230,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Cookie.MigratedEncryptionKeySuccess" enum="BooleanSuccess"
+    expires_after="M92">
+  <owner>wfh@chromium.org</owner>
+  <owner>pwnall@chromium.org</owner>
+  <summary>
+    Whether the migration of encryption key for the sqlite persistent cookie
+    store on Windows was successful or not. This happened when moving from
+    cookie database v13 to cookie database v14. This is recorded once during
+    migration, in first startup of a browser version with v14 database code. See
+    also Cookie.TimeDatabaseMigrationToV14.
+  </summary>
+</histogram>
+
 <histogram name="Cookie.NumDomainPurgedKeys" units="keys"
-    expires_after="2021-05-29">
+    expires_after="2021-08-01">
   <owner>chlily@chromium.org</owner>
   <owner>kaustubhag@chromium.org</owner>
   <summary>
@@ -217,7 +257,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Cookie.NumKeys" units="keys" expires_after="2021-05-29">
+<histogram name="Cookie.NumKeys" units="keys" expires_after="2021-08-01">
   <owner>chlily@chromium.org</owner>
   <owner>kaustubhag@chromium.org</owner>
   <summary>
@@ -227,6 +267,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Cookie.PerFirstPartySetCount" units="cookies"
+    expires_after="2022-01-05">
+  <owner>cfredric@chromium.org</owner>
+  <owner>chlily@chromium.org</owner>
+  <summary>
+    This histogram records, for each (nontrivial) First-Party Set, the number of
+    cookies in the cookie store that belong to a member or owner of that set.
+    Recorded every 10 minutes of active browsing time.
+  </summary>
+</histogram>
+
 <histogram name="Cookie.Port.OmniboxURLNavigation.Localhost"
     enum="InterestingCookiePorts" expires_after="2021-11-04">
   <owner>bingler@chromium.org</owner>
@@ -366,7 +417,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cookie.RequestSameSiteContext" enum="SameSiteCookieContext"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>chlily@chromium.org</owner>
   <owner>morlovich@chromium.org</owner>
   <summary>
@@ -376,6 +427,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Cookie.SameParty.ReadExclusionDecidedBySameParty"
+    enum="Boolean" expires_after="2022-01-06">
+  <owner>cfredric@chromium.org</owner>
+  <owner>chlily@chromium.org</owner>
+  <summary>
+    This histogram records whether enforcement of the SameParty attribute was
+    the only reason for a cookie's exclusion (from a read).
+  </summary>
+</histogram>
+
+<histogram name="Cookie.SameParty.SetExclusionDecidedBySameParty"
+    enum="Boolean" expires_after="2022-01-06">
+  <owner>cfredric@chromium.org</owner>
+  <owner>chlily@chromium.org</owner>
+  <summary>
+    This histogram records whether enforcement of the SameParty attribute was
+    the only reason for a cookie's exclusion (from a write).
+  </summary>
+</histogram>
+
 <histogram name="Cookie.SamePartyCookieSameSiteAttributeValue"
     enum="CookieSameSiteString" expires_after="2021-11-01">
   <owner>chlily@chromium.org</owner>
@@ -387,6 +458,72 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Cookie.SamePartyReadIncluded.InclusionUnderSameSite"
+    enum="BooleanIncluded" expires_after="2022-01-05">
+  <owner>cfredric@chromium.org</owner>
+  <owner>chlily@chromium.org</owner>
+  <summary>
+    This histogram records, for each cookie with the SameParty attribute that is
+    read, whether the access would have been allowed by the cookie's SameSite
+    attribute (if SameParty had not been specified).
+  </summary>
+</histogram>
+
+<histogram name="Cookie.SamePartyReadIncluded.IsHTTP" enum="BooleanHTTPVsJS"
+    expires_after="2022-01-05">
+  <owner>cfredric@chromium.org</owner>
+  <owner>chlily@chromium.org</owner>
+  <summary>
+    This histogram records, for each cookie with the SameParty attribute that is
+    read, whether the access was over HTTP/HTTPS (as opposed to JS).
+  </summary>
+</histogram>
+
+<histogram name="Cookie.SamePartyReadIncluded.PartyContextSize"
+    units="registrable domains" expires_after="2022-01-05">
+  <owner>cfredric@chromium.org</owner>
+  <owner>chlily@chromium.org</owner>
+  <summary>
+    This histogram records, for each cookie with the SameParty attribute that is
+    read, how large the party-context was. I.e., how many distinct registrable
+    domains needed to be treated as a single party in order for the cookie to
+    &quot;work&quot;.
+  </summary>
+</histogram>
+
+<histogram name="Cookie.SamePartySetIncluded.InclusionUnderSameSite"
+    enum="BooleanIncluded" expires_after="2022-01-05">
+  <owner>cfredric@chromium.org</owner>
+  <owner>chlily@chromium.org</owner>
+  <summary>
+    This histogram records, for each cookie with the SameParty attribute that is
+    set, whether the access would have been allowed by the cookie's SameSite
+    attribute (if SameParty had not been specified).
+  </summary>
+</histogram>
+
+<histogram name="Cookie.SamePartySetIncluded.IsHTTP" enum="BooleanHTTPVsJS"
+    expires_after="2022-01-05">
+  <owner>cfredric@chromium.org</owner>
+  <owner>chlily@chromium.org</owner>
+  <summary>
+    This histogram records, for each cookie that is set with the SameParty
+    attribute, whether the access was over HTTP/HTTPS (as opposed to JS).
+  </summary>
+</histogram>
+
+<histogram name="Cookie.SamePartySetIncluded.PartyContextSize"
+    units="registrable domains" expires_after="2022-01-05">
+  <owner>cfredric@chromium.org</owner>
+  <owner>chlily@chromium.org</owner>
+  <summary>
+    This histogram records, for each cookie that is set with the SameParty
+    attribute, how large the party-context was. I.e., how many distinct
+    registrable domains needed to be treated as a single party in order for the
+    cookie to &quot;work&quot;.
+  </summary>
+</histogram>
+
 <histogram name="Cookie.SameSiteAttributeValue" enum="CookieSameSiteString"
     expires_after="2021-11-01">
   <owner>chlily@chromium.org</owner>
@@ -397,9 +534,25 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Cookie.SameSiteContextAffectedByBugfix1166211"
+    enum="BooleanAffected" expires_after="2021-08-18">
+  <owner>chlily@chromium.org</owner>
+  <owner>miketaylr@chromium.org</owner>
+  <summary>
+    Whether the SameSite context was affected by the fix for crbug.com/1166211,
+    i.e. whether it would have been laxly same-site before the fix but is
+    considered cross-site after the fix. Logged for each HTTP(S)
+    request/response that potentially accesses cookies, whose site-for-cookies
+    is same-site with the request URL, but whose initiator is cross-site to the
+    request URL. This is logged regardless of whether the change in SameSite
+    context actually changed the outcome of any cookie inclusion calculation.
+    Logged regardless of whether the bugfix's base::Feature is enabled.
+  </summary>
+</histogram>
+
 <histogram name="Cookie.SameSiteContextDowngradeRequest"
     enum="SameSiteCookieContextBreakingDowngradeWithSecureness"
-    expires_after="2021-05-04">
+    expires_after="2021-07-04">
   <owner>bingler@chromium.org</owner>
   <owner>kaustubhag@chromium.org</owner>
   <summary>
@@ -416,7 +569,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Cookie.SameSiteContextDowngradeResponse"
     enum="SameSiteCookieContextBreakingDowngradeWithSecureness"
-    expires_after="2021-05-04">
+    expires_after="2021-07-04">
   <owner>bingler@chromium.org</owner>
   <owner>kaustubhag@chromium.org</owner>
   <summary>
@@ -431,8 +584,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Cookie.SameSiteCookieInclusionChangedByBugfix1166211"
+    enum="BooleanChanged" expires_after="2021-08-18">
+  <owner>chlily@chromium.org</owner>
+  <owner>miketaylr@chromium.org</owner>
+  <summary>
+    Whether a cookie was excluded solely due to the fix for crbug.com/1166211,
+    i.e. whether it would have been included before the fix but is excluded
+    after the fix. Logged for each cookie accessed by an HTTP(S)
+    request/response whose SameSite context was affected by the bugfix, i.e.
+    requests that are not main frame navigations, whose site-for-cookies is
+    same-site with the request URL, but whose initiator is cross-site to the
+    request URL. This is logged regardless of whether the bugfix's base::Feature
+    is enabled.
+  </summary>
+</histogram>
+
 <histogram name="Cookie.SameSiteNoneIsSecure" enum="Boolean"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>chlily@chromium.org</owner>
   <owner>morlovich@chromium.org</owner>
   <summary>
@@ -443,6 +612,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Cookie.SameSiteUnspecifiedEffective"
     enum="CookieEffectiveSameSite" expires_after="M90">
+  <obsolete>
+    Removed Jan 2021 for cleanup: crbug.com/1165039
+  </obsolete>
   <owner>chlily@chromium.org</owner>
   <owner>morlovich@chromium.org</owner>
   <summary>
@@ -474,7 +646,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cookie.TimeBlockedOnLoad" units="ms"
-    expires_after="2021-04-25">
+    expires_after="2021-08-09">
   <owner>nharper@chromium.org</owner>
   <summary>
     The amount of time (ms) between the cookie store load starting and
@@ -532,14 +704,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Cookie.TimeDatabaseMigrationToV14" units="ms"
+    expires_after="M92">
+  <owner>wfh@chromium.org</owner>
+  <owner>chlily@chromium.org</owner>
+  <owner>morlovich@chromium.org</owner>
+  <summary>
+    The amount of time (ms) to migrate a v13 cookie database to v14. Migration
+    occurs upon first startup of a browser version with v14 database code.
+  </summary>
+</histogram>
+
 <histogram name="Cookie.TimeDatabaseMigrationToV9" units="ms"
     expires_after="2018-08-30">
   <owner>erikchen@chromium.org</owner>
   <summary>The amount of time (ms) to migrate a v8 database to v9.</summary>
 </histogram>
 
-<histogram name="Cookie.TimeInitializeDB" units="ms" expires_after="2021-01-03">
-  <owner>nyquist@chromium.org</owner>
+<histogram name="Cookie.TimeInitializeDB" units="ms" expires_after="2021-08-22">
+  <owner>chlily@chromium.org</owner>
+  <owner>src/net/cookies/OWNERS</owner>
   <summary>The amount of time (ms) to initialize the cookies database.</summary>
 </histogram>
 
@@ -578,7 +762,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Cookie.Type" enum="CookieType" expires_after="2021-04-11">
+<histogram name="Cookie.Type" enum="CookieType" expires_after="2021-08-15">
   <owner>mkwst@chromium.org</owner>
   <summary>For each cookie added to the store, record it's type(s).</summary>
 </histogram>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/cras/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/cras/histograms.xml
index 90d23885373..d5196acea2b 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/cras/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/cras/histograms.xml
@@ -79,6 +79,22 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Cras.FetchDelayMilliSeconds" units="ms"
+    expires_after="2021-12-01">
+<!-- Name completed by histogram_suffixes
+     name="Cras.ClientType" and
+     name="Cras.StreamType" -->
+
+  <owner>yuhsuan@chromium.org</owner>
+  <owner>chromeos-audio@google.com</owner>
+  <summary>
+    The longest additional time CRAS(Chrome OS audio server) ever waits for a
+    stream exceeding the timeout threshold. This value is recorded per stream
+    when it gets removed and used to investigate the audio glitch/skip problem
+    on Chrome OS.
+  </summary>
+</histogram>
+
 <histogram name="Cras.HfpBatteryIndicatorSupported"
     enum="CrasHfpBatteryIndicator" expires_after="2021-12-01">
   <owner>enshuo@chromium.org</owner>
@@ -392,7 +408,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Cras.InputStreamRuntime" units="seconds"
     expires_after="2021-12-01">
 <!-- Name completed by histogram_suffixes
-     name="Cras.ClientType" -->
+     name="Cras.ClientType" and
+     name="Cras.StreamType" -->
 
   <owner>yuhsuan@chromium.org</owner>
   <owner>chromeos-audio@google.com</owner>
@@ -655,7 +672,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Cras.OutputStreamRuntime" units="seconds"
     expires_after="2021-12-01">
 <!-- Name completed by histogram_suffixes
-     name="Cras.ClientType" -->
+     name="Cras.ClientType" and
+     name="Cras.StreamType" -->
 
   <owner>yuhsuan@chromium.org</owner>
   <owner>chromeos-audio@google.com</owner>
@@ -727,6 +745,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Cras.StreamRuntime" units="seconds" expires_after="2021-12-01">
+<!-- Name completed by histogram_suffixes
+     name="Cras.Direction" and
+     name="Cras.ClientType" and
+     name="Cras.StreamType" -->
+
+  <owner>yuhsuan@chromium.org</owner>
+  <owner>chromeos-audio@google.com</owner>
+  <summary>
+    The runtime of stream in CRAS(ChromeOS audio server). The runtime is the
+    duration between creating and destroying a stream. The value is recorded
+    when the stream is destroyed.
+  </summary>
+</histogram>
+
 <histogram name="Cras.StreamSamplingFormat" enum="AlsaSampleFormatType"
     expires_after="2021-12-01">
 <!-- Name completed by histogram_suffixes
@@ -757,6 +790,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Cras.StreamTimeoutMilliSeconds" units="ms"
     expires_after="2021-12-01">
+<!-- Name completed by histogram_suffixes
+     name="Cras.ClientType" and
+     name="Cras.StreamType" -->
+
   <owner>hychao@chromium.org</owner>
   <owner>chromeos-audio@google.com</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/cros/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/cros/histograms.xml
index 3c0a2596ce1..94a459b319a 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/cros/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/cros/histograms.xml
@@ -34,7 +34,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CrosDisks.ArchiveType" enum="CrosDisksArchiveType"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>fdegros@chromium.org</owner>
   <owner>chromeos-files-app@google.com</owner>
   <summary>
@@ -44,7 +44,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CrosDisks.DeviceMediaType" enum="CrosDisksDeviceMediaType"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>fdegros@chromium.org</owner>
   <owner>chromeos-files-app@google.com</owner>
   <summary>
@@ -54,7 +54,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CrosDisks.FilesystemType" enum="CrosDisksFilesystemType"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>fdegros@chromium.org</owner>
   <owner>chromeos-files-app@google.com</owner>
   <summary>
@@ -74,7 +74,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CrosDisks.Fuse.Rar2fs" enum="Rar2fsError"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>fdegros@chromium.org</owner>
   <owner>chromeos-files-app@google.com</owner>
   <summary>
@@ -84,7 +84,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CrosDisksClient.FormatCompletedError"
-    enum="CrosDisksClientFormatError" expires_after="2021-05-09">
+    enum="CrosDisksClientFormatError" expires_after="2021-07-11">
   <owner>austinct@chromium.org</owner>
   <summary>
     The error code of disk format signals received from the Chrome OS cros-disks
@@ -93,7 +93,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CrosDisksClient.FormatTime" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>austinct@chromium.org</owner>
   <summary>
     Time taken for the Chrome OS cros-disks daemon to perform a format
@@ -152,6 +152,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="CrosFirstRun.DialogShown" units="units"
     expires_after="2020-12-01">
+  <obsolete>
+    Deprecated 01/2020 in Issue 1001460 when Welcome Tour was deleted.
+  </obsolete>
   <owner>alemate@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -161,6 +164,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="CrosFirstRun.FurthestStep" units="units"
     expires_after="2020-12-01">
+  <obsolete>
+    Deprecated 01/2020 in Issue 1001460 when Welcome Tour was deleted.
+  </obsolete>
   <owner>alemate@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -171,6 +177,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CrosFirstRun.TimeSpent" units="ms" expires_after="2020-12-01">
+  <obsolete>
+    Deprecated 01/2020 in Issue 1001460 when Welcome Tour was deleted.
+  </obsolete>
   <owner>alemate@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>The total time that user spent on first-run tutorial.</summary>
@@ -178,6 +187,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="CrosFirstRun.TimeSpentOnStep" units="ms"
     expires_after="2020-12-01">
+  <obsolete>
+    Deprecated 01/2020 in Issue 1001460 when Welcome Tour was deleted.
+  </obsolete>
   <owner>alemate@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>The time that user spent on some step of tutorial.</summary>
@@ -185,6 +197,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="CrosFirstRun.TutorialCompletion"
     enum="CrosFirstRunTutorialCompletionType" expires_after="2020-12-01">
+  <obsolete>
+    Deprecated 01/2020 in Issue 1001460 when Welcome Tour was deleted.
+  </obsolete>
   <owner>alemate@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>Tracks the way how user left tutorial.</summary>
@@ -192,6 +207,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="CrosFirstRun.TutorialLaunched" units="units"
     expires_after="2020-12-01">
+  <obsolete>
+    Deprecated 01/2020 in Issue 1001460 when Welcome Tour was deleted.
+  </obsolete>
   <owner>alemate@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -201,6 +219,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="CrosUsb.NotificationClosed" enum="CrosUsbNotificationClosed"
     expires_after="2021-01-31">
+  <obsolete>
+    Removed 01/2021. We haven't been making use of this.
+  </obsolete>
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/crostini/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/crostini/histograms.xml
index f9d9ffbdc53..552c75df4a5 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/crostini/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/crostini/histograms.xml
@@ -21,8 +21,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<variants name="CrostiniState">
+  <variant name="CreateContainer" summary="creating container"/>
+  <variant name="CreateDiskImage" summary="creating disk image"/>
+  <variant name="FetchSshKeys" summary="fetching SSH keys"/>
+  <variant name="InstallImageLoader" summary="installing component or DLC"/>
+  <variant name="MountContainer" summary="creating SSHFS mounts"/>
+  <variant name="SetupContainer" summary="setting up container for use"/>
+  <variant name="Start" summary="initial"/>
+  <variant name="StartContainer" summary="starting container"/>
+  <variant name="StartLxd" summary="starting LXD"/>
+  <variant name="StartTerminaVm" summary="starting VM"/>
+</variants>
+
 <histogram name="Crostini.AppLaunch" enum="CrostiniAppLaunchAppType"
-    expires_after="2021-01-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -32,7 +45,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.AppLaunchResult" enum="CrostiniResult"
-    expires_after="2021-01-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -41,7 +54,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.AppsInstalledAtLogin" units="apps"
-    expires_after="2021-04-04">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -52,7 +65,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.AvailableDiskCancel" units="MiB"
-    expires_after="2021-01-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -64,7 +77,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.AvailableDiskError" units="MiB"
-    expires_after="2021-01-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -76,7 +89,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.AvailableDiskSuccess" units="MiB"
-    expires_after="2021-01-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -88,14 +101,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.Backup" enum="CrostiniExportContainerResult"
-    expires_after="2021-04-04">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>Result of crostini backup.</summary>
 </histogram>
 
 <histogram name="Crostini.BackupCompressedSizeLog2" units="units"
-    expires_after="2021-01-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -106,7 +119,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.BackupContainerSizeLog2" units="units"
-    expires_after="2021-01-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -117,7 +130,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.BackupSizeRatio" units="units"
-    expires_after="2021-01-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -127,21 +140,32 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.BackupTimeFailed" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>Time taken for failed backup.</summary>
 </histogram>
 
 <histogram name="Crostini.BackupTimeSuccess" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>Time taken for successful backup.</summary>
 </histogram>
 
+<histogram name="Crostini.CleanSession.RestarterResult" enum="CrostiniResult"
+    expires_after="2022-01-06">
+  <owner>clumptini@google.com</owner>
+  <owner>tbuckley@chromium.org</owner>
+  <summary>
+    The result of a single run of CrostiniRestarter. This is the same as
+    Crostini.RestarterResult except only emitted in sessions that happen after a
+    clean start (e.g. after fresh login).
+  </summary>
+</histogram>
+
 <histogram name="Crostini.ContainerOsVersion" enum="CrostiniContainerOsVersion"
-    expires_after="2021-04-04">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -151,7 +175,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.Crosvm.CpuPercentage" units="%"
-    expires_after="2021-04-18">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -162,7 +186,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.Crosvm.Processes.Count" units="processes"
-    expires_after="2021-04-04">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -172,7 +196,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.Crosvm.RssPercentage" units="%"
-    expires_after="2021-04-11">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -183,7 +207,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.DiskResize.Result" enum="CrostiniDiskImageStatus"
-    expires_after="2021-03-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>davidmunro@google.com</owner>
   <summary>
@@ -193,7 +217,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.DiskResize.Started" enum="BooleanAttempted"
-    expires_after="2021-03-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>davidmunro@google.com</owner>
   <summary>
@@ -205,7 +229,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.DiskType" enum="CrostiniDiskImageType"
-    expires_after="2021-03-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>davidmunro@google.com</owner>
   <summary>
@@ -217,8 +241,40 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Crostini.EngagementTime.{Variant}" units="ms"
+    expires_after="2022-01-06">
+  <owner>davidmunro@google.com</owner>
+  <owner>clumptini@google.com</owner>
+  <summary>
+    {Variant} Engagement time metrics, along with foreground and background
+    time, are only collected on users with Crostini enabled. All four metrics
+    are accumulated and recorded to UMA once a day.
+  </summary>
+  <token key="Variant">
+    <variant name="Background"
+        summary="Times when a user is engaged and Crostini apps are running
+                 in the background, but the user isn't focusing on an
+                 Crostini app window."/>
+    <variant name="CrostiniTotal"
+        summary="Total of Crostini.EngagementTime.Background and .Foreground,
+                 which is the time the user is engaged and Crostini is
+                 running either in the foreground or background."/>
+    <variant name="Foreground"
+        summary="Times when a user is engaged and focuses on a Crostini GUI
+                 window. As of 2020-12-15 this may count some
+                 similar-but-not-quite-Crostini windows e.g. Bruschetta, see
+                 crbug/1158644 for more details."/>
+    <variant name="Total"
+        summary="Total CrOS user session time (from login to logout)
+                 excluding times when a user &quot;disengages&quot;. A user
+                 is disengaged when the screen is locked or dimmed due to
+                 user inactivity. For Total Crostini engagement time, see
+                 Crostini.EngagementTime.CrostiniTotal."/>
+  </token>
+</histogram>
+
 <histogram name="Crostini.FilesystemCorruption" enum="CorruptionStates"
-    expires_after="2021-04-11">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -227,8 +283,32 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Crostini.InstallSource" enum="CrostiniInstallSource"
+    expires_after="2022-01-06">
+  <owner>clumptini@google.com</owner>
+  <owner>sidereal@google.com</owner>
+  <summary>
+    The source (component vs DLC) that was used to install termina. This is
+    recorded every time a CrostiniRestart succeeds at the termina install step
+    to measure the progress of the component-&gt;DLC migration.
+  </summary>
+</histogram>
+
+<histogram name="Crostini.InvalidStateTransition" enum="CrostiniInstallerState"
+    expires_after="2022-01-06">
+  <owner>clumptini@google.com</owner>
+  <owner>tbuckley@chromium.org</owner>
+  <summary>
+    Emitted when an invalid request to transition states during the Crostini
+    restarter flow is received. For example, when a container start signal is
+    received when the restarter is still waiting for the vm to finish launching.
+    The value is the state the restarter should have been in for the transition
+    to be legal (in this example StartContainer).
+  </summary>
+</histogram>
+
 <histogram name="Crostini.RecoverySource" enum="CrostiniUISurface"
-    expires_after="2021-01-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -238,7 +318,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.Restarter.Started" enum="BooleanAttempted"
-    expires_after="2021-04-04">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -248,38 +328,51 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.RestarterResult" enum="CrostiniResult"
-    expires_after="2021-04-04">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
     The result of a single run of CrostiniRestarter. This is recorded any time
-    the crostini restart flow is triggered, except during the initial install.
+    the crostini restart flow is triggered except during the initial install.
   </summary>
 </histogram>
 
+<histogram name="Crostini.RestarterTimeInState.{state}" units="ms"
+    expires_after="2022-01-06">
+  <owner>clumptini@google.com</owner>
+  <owner>tbuckley@chromium.org</owner>
+  <summary>
+    Base histogram for measuring how much time the restarter flow spends in the
+    {state} state. Used to set timeouts. Note that this since this is for any
+    restarter run (no-op relaunch, installation, etc) the results are expected
+    to be multi-modal.
+  </summary>
+  <token key="state" variants="CrostiniState"/>
+</histogram>
+
 <histogram name="Crostini.Restore" enum="CrostiniImportContainerResult"
-    expires_after="2021-04-04">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>Result of crostini restore.</summary>
 </histogram>
 
 <histogram name="Crostini.RestoreTimeFailed" units="ms"
-    expires_after="2021-01-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>Time taken for failed restore.</summary>
 </histogram>
 
 <histogram name="Crostini.RestoreTimeSuccess" units="ms"
-    expires_after="2021-01-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>Time taken for successful restore.</summary>
 </histogram>
 
 <histogram name="Crostini.SettingsEvent" enum="CrostiniSettingsEvent"
-    expires_after="2021-04-18">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <owner>victorhsieh@chromium.org</owner>
@@ -287,7 +380,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.Setup.Started" enum="BooleanAttempted"
-    expires_after="2021-01-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -297,7 +390,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.SetupResult" enum="CrostiniSetupResult"
-    expires_after="2021-04-04">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -307,7 +400,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.SetupSource" enum="CrostiniUISurface"
-    expires_after="2021-01-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -317,7 +410,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.Stability" enum="GuestOsFailureClasses"
-    expires_after="2021-06-09">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -328,7 +421,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.TerminalSettingsChanged"
-    enum="CrostiniTerminalSetting" expires_after="2021-03-31">
+    enum="CrostiniTerminalSetting" expires_after="2022-01-06">
   <owner>joelhockey@chromium.org</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -340,7 +433,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.TimeFromDeviceSetupToInstall" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -349,7 +442,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.TimeToInstallCancel" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -360,7 +453,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.TimeToInstallError" units="ms"
-    expires_after="2021-01-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -372,7 +465,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.TimeToInstallSuccess" units="ms"
-    expires_after="2021-01-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -382,8 +475,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Crostini.UncleanSession.RestarterResult" enum="CrostiniResult"
+    expires_after="2022-01-06">
+  <owner>clumptini@google.com</owner>
+  <owner>tbuckley@chromium.org</owner>
+  <summary>
+    The result of a single run of CrostiniRestarter. This is the same as
+    Crostini.RestarterResult except only emitted in sessions that happen after
+    an unclean restart (e.g. after a Chrome crash).
+  </summary>
+</histogram>
+
 <histogram name="Crostini.UninstallResult" enum="CrostiniUninstallResult"
-    expires_after="2021-04-04">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -393,7 +497,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.UninstallSource" enum="CrostiniUISurface"
-    expires_after="2021-01-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -403,7 +507,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Crostini.UnsupportedNotification.Reason"
-    enum="CrostiniUnsupportedNotificationReason" expires_after="2021-01-31">
+    enum="CrostiniUnsupportedNotificationReason" expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -415,7 +519,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Crostini.UpgradeAvailable"
     enum="CrostiniUpgradeAvailableNotificationClosed"
-    expires_after="2021-07-15">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -425,7 +529,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.UpgradeDialogEvent" enum="CrostiniUpgradeDialogEvent"
-    expires_after="2021-05-09">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
@@ -435,7 +539,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crostini.UpgradeSource" enum="CrostiniUISurface"
-    expires_after="2021-01-31">
+    expires_after="2022-01-06">
   <owner>clumptini@google.com</owner>
   <owner>tbuckley@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/crypt/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/crypt/histograms.xml
index adf3ae3f5d9..44415f30a3a 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/crypt/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/crypt/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="CryptAuth.ClientAppMetadata.IsManufacturerEmpty"
-    enum="BooleanEmpty" expires_after="2021-04-04">
+    enum="BooleanEmpty" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -33,7 +33,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.ClientAppMetadata.IsModelEmpty" enum="BooleanEmpty"
-    expires_after="2021-04-04">
+    expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -43,7 +43,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.ClientAppMetadataInstanceIdTokenFetch.Result"
-    enum="InstanceIDResult" expires_after="2021-04-04">
+    enum="InstanceIDResult" expires_after="2021-10-06">
   <owner>khorimoto@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -53,7 +53,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.ClientAppMetadataInstanceIdTokenFetch.Retries"
-    units="retries" expires_after="2021-04-04">
+    units="retries" expires_after="2021-10-06">
   <owner>khorimoto@chromium.org</owner>
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
@@ -65,7 +65,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.DeviceSync.Result" enum="BooleanSuccess"
-    expires_after="2021-04-04">
+    expires_after="2021-10-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>Indicates success of performing a DeviceSync.</summary>
@@ -73,7 +73,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncService.ClientAppMetadataFetch.AsyncTaskResult"
-    enum="CryptAuthAsyncTaskResult" expires_after="2021-04-04">
+    enum="CryptAuthAsyncTaskResult" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -85,7 +85,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncService.ClientAppMetadataFetch.ExecutionTime"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -96,7 +96,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncService.GcmRegistration.ExecutionTime"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -107,7 +107,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncService.GcmRegistration.Success"
-    enum="BooleanSuccess" expires_after="2021-04-04">
+    enum="BooleanSuccess" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -117,7 +117,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncService.Initialization.ExecutionTime"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -128,7 +128,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncSoftwareFeaturesResult"
-    enum="BooleanSuccess" expires_after="2021-04-04">
+    enum="BooleanSuccess" expires_after="2021-10-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -141,7 +141,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncSoftwareFeaturesResult.Failures"
-    enum="CryptAuthSoftwareFeature" expires_after="2021-04-04">
+    enum="CryptAuthSoftwareFeature" expires_after="2021-10-06">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -153,7 +153,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.DeviceActivityGetter.ApiCallResult.GetDevicesActivityStatus"
-    enum="CryptAuthApiCallResult" expires_after="2021-04-04">
+    enum="CryptAuthApiCallResult" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -165,7 +165,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.DeviceActivityGetter.ExecutionTime.GetDevicesActivityStatus"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -177,7 +177,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.DeviceNotifier.ApiCallResult.NotifyGroupDevices"
-    enum="CryptAuthApiCallResult" expires_after="2021-04-04">
+    enum="CryptAuthApiCallResult" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -189,7 +189,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.DeviceNotifier.ExecutionTime.NotifyGroupDevices"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -201,7 +201,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.DeviceSyncer.AsyncTaskResult.DeviceMetadataDecryption"
-    enum="CryptAuthAsyncTaskResult" expires_after="2021-04-04">
+    enum="CryptAuthAsyncTaskResult" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -216,7 +216,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.DeviceSyncer.AsyncTaskResult.GroupPrivateKeyDecryption"
-    enum="CryptAuthAsyncTaskResult" expires_after="2021-04-04">
+    enum="CryptAuthAsyncTaskResult" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -228,7 +228,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.DeviceSyncer.ExecutionTime.DeviceMetadataDecryption"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -240,7 +240,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.DeviceSyncer.ExecutionTime.GroupPrivateKeyDecryption"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -252,7 +252,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.DeviceSyncer.IsGroupPrivateKeyConsistent"
-    enum="BooleanConsistent" expires_after="2021-04-04">
+    enum="BooleanConsistent" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -264,7 +264,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.DeviceSyncer.IsLocalDeviceMetadataConsistent"
-    enum="BooleanConsistent" expires_after="2021-04-04">
+    enum="BooleanConsistent" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -275,7 +275,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.DeviceSyncer.MetadataDecryptionSuccess"
-    enum="BooleanSuccess" expires_after="2021-04-04">
+    enum="BooleanSuccess" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -286,7 +286,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.DeviceSyncer.MetadataParsingSuccess"
-    enum="BooleanSuccess" expires_after="2021-04-04">
+    enum="BooleanSuccess" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -299,7 +299,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.FeatureStatusGetter.ApiCallResult.GetFeatureStatuses"
-    enum="CryptAuthApiCallResult" expires_after="2021-04-04">
+    enum="CryptAuthApiCallResult" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -311,7 +311,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.FeatureStatusGetter.CorrectNumberOfDevicesInResponse"
-    enum="BooleanExpected" expires_after="2021-04-04">
+    enum="BooleanExpected" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -323,7 +323,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.FeatureStatusGetter.ExecutionTime.GetFeatureStatuses"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -335,7 +335,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.FeatureStatusGetter.IsDuplicateDeviceId"
-    enum="BooleanDuplicate" expires_after="2021-04-04">
+    enum="BooleanDuplicate" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -347,7 +347,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.FeatureStatusGetter.IsKnownFeatureType"
-    enum="BooleanKnown" expires_after="2021-04-04">
+    enum="BooleanKnown" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -361,7 +361,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.FeatureStatusGetter.IsUnsupportedFeatureMarkedEnabled"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -374,7 +374,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.FeatureStatusGetter.WasDeviceInResponseRequested"
-    enum="BooleanRequested" expires_after="2021-04-04">
+    enum="BooleanRequested" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -386,7 +386,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.FeatureStatusSetter.ApiCallResult.SetFeatureStatuses"
-    enum="CryptAuthApiCallResult" expires_after="2021-04-04">
+    enum="CryptAuthApiCallResult" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -398,7 +398,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.FeatureStatusSetter.ExecutionTime.SetFeatureStatuses"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -410,7 +410,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.GroupPrivateKeySharer.ApiCallResult.ShareGroupPrivateKey"
-    enum="CryptAuthApiCallResult" expires_after="2021-04-04">
+    enum="CryptAuthApiCallResult" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -422,7 +422,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.GroupPrivateKeySharer.AsyncTaskResult.GroupPrivateKeyEncryption"
-    enum="CryptAuthAsyncTaskResult" expires_after="2021-04-04">
+    enum="CryptAuthAsyncTaskResult" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -437,7 +437,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.GroupPrivateKeySharer.EncryptionSuccess"
-    enum="BooleanSuccess" expires_after="2021-04-04">
+    enum="BooleanSuccess" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -450,7 +450,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.GroupPrivateKeySharer.ExecutionTime.GroupPrivateKeyEncryption"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -462,7 +462,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.GroupPrivateKeySharer.ExecutionTime.ShareGroupPrivateKey"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -474,7 +474,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.GroupPrivateKeySharer.IsEncryptingKeyEmpty"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -487,7 +487,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.InvocationReason"
-    enum="CryptAuthV2InvocationReason" expires_after="2021-04-04">
+    enum="CryptAuthV2InvocationReason" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -498,7 +498,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.MetadataSyncer.ApiCallResult.FirstSyncMetadata"
-    enum="CryptAuthApiCallResult" expires_after="2021-04-04">
+    enum="CryptAuthApiCallResult" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -510,7 +510,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.MetadataSyncer.ApiCallResult.SecondSyncMetadata"
-    enum="CryptAuthApiCallResult" expires_after="2021-04-04">
+    enum="CryptAuthApiCallResult" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -522,7 +522,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.MetadataSyncer.AsyncTaskResult.GroupKeyCreation"
-    enum="CryptAuthAsyncTaskResult" expires_after="2021-04-04">
+    enum="CryptAuthAsyncTaskResult" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -534,7 +534,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.MetadataSyncer.AsyncTaskResult.LocalDeviceMetadataEncryption"
-    enum="CryptAuthAsyncTaskResult" expires_after="2021-04-04">
+    enum="CryptAuthAsyncTaskResult" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -546,7 +546,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.MetadataSyncer.ExecutionTime.FirstSyncMetadata"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -558,7 +558,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.MetadataSyncer.ExecutionTime.GroupKeyCreation"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -570,7 +570,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.MetadataSyncer.ExecutionTime.LocalDeviceMetadataEncryption"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -582,7 +582,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.MetadataSyncer.ExecutionTime.SecondSyncMetadata"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -594,7 +594,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.MetadataSyncer.IsDeviceMetadataPacketValid"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -605,7 +605,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.MetadataSyncer.IsDuplicateDeviceId"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -617,7 +617,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.RemoteDeviceProvider.NumV1Devices"
-    units="count" expires_after="2021-04-04">
+    units="count" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -629,7 +629,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.RemoteDeviceProvider.NumV2Devices"
-    units="count" expires_after="2021-04-04">
+    units="count" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -642,7 +642,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.RemoteDeviceProvider.PercentageOfV1DevicesReplacedByV2Devices"
-    units="%" expires_after="2021-04-04">
+    units="%" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -657,7 +657,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.RemoteDeviceProvider.PercentageOfV2DevicesWithDecryptedPublicKey"
-    units="%" expires_after="2021-04-04">
+    units="%" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -671,7 +671,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.DeviceSyncV2.RemoteDeviceProvider.RatioOfV2ToV1Devices"
-    units="%" expires_after="2021-04-04">
+    units="%" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -688,7 +688,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.Result.DidDeviceRegistryChange"
-    enum="BooleanChanged" expires_after="2021-04-04">
+    enum="BooleanChanged" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -699,7 +699,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.Result.ResultCode"
-    enum="CryptAuthV2DeviceSyncResultCode" expires_after="2021-04-04">
+    enum="CryptAuthV2DeviceSyncResultCode" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -709,7 +709,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.DeviceSyncV2.Result.ResultType"
-    enum="CryptAuthV2DeviceSyncResultType" expires_after="2021-04-04">
+    enum="CryptAuthV2DeviceSyncResultType" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -719,7 +719,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.Enrollment.Result" enum="BooleanSuccess"
-    expires_after="2021-04-04">
+    expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -728,7 +728,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.EnrollmentV2.ApiCallResult.EnrollKeys"
-    enum="CryptAuthApiCallResult" expires_after="2021-04-04">
+    enum="CryptAuthApiCallResult" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -739,7 +739,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.EnrollmentV2.ApiCallResult.SyncKeys"
-    enum="CryptAuthApiCallResult" expires_after="2021-04-04">
+    enum="CryptAuthApiCallResult" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -750,7 +750,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.EnrollmentV2.AsyncTaskResult.KeyCreation"
-    enum="CryptAuthAsyncTaskResult" expires_after="2021-04-04">
+    enum="CryptAuthAsyncTaskResult" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -761,7 +761,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.EnrollmentV2.ExecutionTime.EnrollKeys" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -772,7 +772,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.EnrollmentV2.ExecutionTime.KeyCreation" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -783,7 +783,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.EnrollmentV2.ExecutionTime.SyncKeys" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -794,7 +794,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.EnrollmentV2.InvocationReason"
-    enum="CryptAuthV2InvocationReason" expires_after="2021-04-04">
+    enum="CryptAuthV2InvocationReason" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -804,7 +804,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.EnrollmentV2.Result.ResultCode"
-    enum="CryptAuthV2EnrollmentResult" expires_after="2021-04-04">
+    enum="CryptAuthV2EnrollmentResult" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -814,7 +814,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.EnrollmentV2.Result.Success" enum="BooleanSuccess"
-    expires_after="2021-04-04">
+    expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -824,7 +824,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.EnrollmentV2.UserKeyPairState"
-    enum="CryptAuthV2EnrollmentUserKeyPairState" expires_after="2021-04-04">
+    enum="CryptAuthV2EnrollmentUserKeyPairState" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -835,7 +835,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.Gcm.Message.FeatureType" enum="CryptAuthFeatureType"
-    expires_after="2021-04-04">
+    expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -846,7 +846,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.Gcm.Message.IsDeviceSyncGroupNameValid"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -858,7 +858,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.Gcm.Message.IsKnownFeatureType" enum="Boolean"
-    expires_after="2021-04-04">
+    expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -870,7 +870,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.Gcm.Message.TargetService.AreTickleTypeAndTargetServiceBothSpecified"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -884,7 +884,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="CryptAuth.Gcm.Message.TargetService.FromRegistrationTickleType"
-    enum="CryptAuthTargetService" expires_after="2021-04-04">
+    enum="CryptAuthTargetService" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -896,7 +896,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.Gcm.Message.TargetService.FromTargetServiceValue"
-    enum="CryptAuthTargetService" expires_after="2021-04-04">
+    enum="CryptAuthTargetService" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -908,7 +908,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.Gcm.Registration.AttemptTimeWithRetries" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -924,7 +924,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.Gcm.Registration.Result" enum="GCMClientResult"
-    expires_after="2021-04-04">
+    expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -940,7 +940,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.InstanceId.DidInstanceIdChange"
-    enum="BooleanChanged" expires_after="2021-04-04">
+    enum="BooleanChanged" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -951,7 +951,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CryptAuth.InstanceId.DidInstanceIdTokenChange"
-    enum="BooleanChanged" expires_after="2021-04-04">
+    enum="BooleanChanged" expires_after="2021-10-06">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/cryptohome/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/cryptohome/histograms.xml
index 517d2e32a1e..4054c1b9d72 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/cryptohome/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/cryptohome/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="Cryptohome.AsyncDBusRequest" units="ms"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>zuan@chromium.org</owner>
   <owner>cros-hwsec+uma@chromium.org</owner>
   <summary>
@@ -42,7 +42,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.ChecksumStatus" enum="CryptohomeChecksumStatus"
-    expires_after="2021-03-15">
+    expires_after="2021-08-09">
   <owner>apronin@chromium.org</owner>
   <owner>cros-hwsec+uma@chromium.org</owner>
   <summary>
@@ -52,9 +52,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.DeletedUserProfiles" units="profiles"
-    expires_after="M90">
-  <owner>slangley@chromium.org</owner>
-  <owner>wiefangsun@chromium.org</owner>
+    expires_after="2022-02-05">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     In low disk space scenarios, Cryptohome erases whole user profiles. This is
     a number of user profiles deleted during cleanup. Only reported when
@@ -63,7 +63,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.DeprecatedApiCalled"
-    enum="CryptohomeDeprecatedApiCalled" expires_after="2021-04-04">
+    enum="CryptohomeDeprecatedApiCalled" expires_after="2021-08-09">
   <owner>apronin@chromium.org</owner>
   <owner>louiscollard@chromium.org</owner>
   <owner>zuan@chromium.org</owner>
@@ -194,7 +194,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.DiskCleanupProgress"
-    enum="CryptohomeDiskCleanupProgress" expires_after="M90">
+    enum="CryptohomeDiskCleanupProgress" expires_after="2021-08-22">
   <owner>slangley@chromium.org</owner>
   <owner>weifangsun@chromium.org</owner>
   <summary>
@@ -205,15 +205,22 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Cryptohome.DiskCleanupResult"
+    enum="CryptohomeDiskCleanupResult" expires_after="M93">
+  <owner>vsavu@google.com</owner>
+  <owner>weifangsun@chromium.org</owner>
+  <summary>Records the result of triggering disk cleanup.</summary>
+</histogram>
+
 <histogram name="Cryptohome.Errors" enum="CryptohomeError"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>apronin@chromium.org</owner>
   <owner>cros-hwsec+uma@chromium.org</owner>
   <summary>Cryptohome errors.</summary>
 </histogram>
 
 <histogram name="Cryptohome.EvkkEncryptionType" enum="EvkkEncryptionType"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>enlightened@chromium.org</owner>
   <owner>tnagel@chromium.org</owner>
   <summary>
@@ -224,7 +231,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.FreeDiskSpaceTotalFreedInMb" units="MiB"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>vsavu@chromium.org</owner>
   <owner>weifangsun@chromium.org</owner>
   <summary>
@@ -235,7 +242,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.FreeDiskSpaceTotalTime2" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>slangley@chromium.org</owner>
   <owner>weifangsun@chromium.org</owner>
   <summary>
@@ -247,7 +254,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.GCache.FreedDiskSpaceInMb" units="MB"
-    expires_after="M90">
+    expires_after="2021-07-04">
   <owner>slangley@chromium.org</owner>
   <owner>weifangsun@chromium.org</owner>
   <summary>
@@ -258,7 +265,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.HomedirEncryptionType" enum="HomedirEncryptionType"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>dspaid@chromium.org</owner>
   <summary>
     The encryption type used for a user's cryptohome directory. This is logged
@@ -277,7 +284,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Cryptohome.LECredential"
-    enum="CryptohomeLECredError" expires_after="2021-05-02">
+    enum="CryptohomeLECredError" expires_after="2021-07-04">
 <!-- Name completed by histogram_suffixes name="LECredentialOps" -->
 
   <owner>pmalani@chromium.org</owner>
@@ -364,7 +371,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.OOPMountCleanupResult"
-    enum="CryptohomeOOPMountCleanupResult" expires_after="2021-04-04">
+    enum="CryptohomeOOPMountCleanupResult" expires_after="2021-08-09">
   <owner>betuls@chromium.org</owner>
   <owner>jorgelo@chromium.org</owner>
   <summary>
@@ -374,7 +381,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.OOPMountOperationResult"
-    enum="CryptohomeOOPMountOperationResult" expires_after="2021-04-04">
+    enum="CryptohomeOOPMountOperationResult" expires_after="2021-08-09">
   <owner>betuls@chromium.org</owner>
   <owner>jorgelo@chromium.org</owner>
   <summary>
@@ -384,7 +391,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.ParallelTasks" units="count"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>zuan@chromium.org</owner>
   <owner>cros-hwsec+uma@chromium.org</owner>
   <summary>
@@ -394,8 +401,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.TimeBetweenFreeDiskSpace" units="s"
-    expires_after="M90">
-  <owner>vsavu@chromium.org</owner>
+    expires_after="M93">
+  <owner>vsavu@google.com</owner>
   <owner>slangley@chromium.org</owner>
   <owner>weifangsun@chromium.org</owner>
   <summary>
@@ -406,7 +413,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.TimeSessionUnlock" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-09">
   <owner>kerrnel@chromium.org</owner>
   <owner>mnissler@chromium.org</owner>
   <summary>
@@ -438,7 +445,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.TimeToInitPkcs11" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>apronin@chromium.org</owner>
   <owner>cros-hwsec+uma@chromium.org</owner>
   <summary>
@@ -449,7 +456,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.TimeToMountEx" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>jorgelo@chromium.org</owner>
   <owner>cros-hwsec+uma@chromium.org</owner>
   <summary>
@@ -469,7 +476,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.TimeToMountGuestEx" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>jorgelo@chromium.org</owner>
   <owner>cros-hwsec+uma@chromium.org</owner>
   <summary>
@@ -479,7 +486,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.TimeToPerformEphemeralMount" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>jorgelo@chromium.org</owner>
   <owner>cros-hwsec+uma@chromium.org</owner>
   <summary>
@@ -502,7 +509,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.TimeToPerformOOPMountCleanup" units="ms"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>jorgelo@chromium.org</owner>
   <owner>betuls@chromium.org</owner>
   <summary>
@@ -513,7 +520,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.TimeToPerformOOPMountOperation" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>jorgelo@chromium.org</owner>
   <owner>betuls@chromium.org</owner>
   <summary>
@@ -523,7 +530,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.TimeToTakeTpmOwnership" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>apronin@chromium.org</owner>
   <owner>cros-hwsec+uma@chromium.org</owner>
   <summary>
@@ -533,7 +540,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cryptohome.TpmResults" enum="CryptohomeTpmResults"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>afakhry@chromium.org</owner>
   <summary>
     The errors resulting from interacting with the Trusted Platform Module (TPM)
@@ -541,7 +548,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="CryptohomeClient" units="ms" expires_after="2021-05-09">
+<histogram name="CryptohomeClient" units="ms" expires_after="2021-07-11">
   <owner>zuan@chromium.org</owner>
   <owner>cros-hwsec+uma@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/custom_tabs/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/custom_tabs/histograms.xml
index 1c42417efd3..07a877af9de 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/custom_tabs/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/custom_tabs/histograms.xml
@@ -35,7 +35,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CustomTabs.ClientAppId" enum="ClientAppId"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>yusufo@chromium.org</owner>
   <summary>
     Android: AppId declared by the launching application in EXTRA_APPLICATION_ID
@@ -47,7 +47,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CustomTabs.CloseButton.ChildTab.ScopeAlgorithm.ClosesOneTab"
-    enum="BooleanCloseJustCurrentTab" expires_after="2021-02-01">
+    enum="BooleanCloseJustCurrentTab" expires_after="M92">
   <owner>peconn@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/browserservices/OWNERS
@@ -64,7 +64,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CustomTabs.ConnectionStatusOnReturn.GSA"
-    enum="CustomTabsConnection" expires_after="M92">
+    enum="CustomTabsConnection" expires_after="2021-08-09">
   <owner>peconn@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -77,7 +77,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CustomTabs.ConnectionStatusOnReturn.NonGSA"
-    enum="CustomTabsConnection" expires_after="M92">
+    enum="CustomTabsConnection" expires_after="2021-08-09">
   <owner>peconn@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -90,7 +90,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="CustomTabs.DetachedResourceRequest.Duration"
-    units="ms" expires_after="M92">
+    units="ms" expires_after="2021-08-15">
   <owner>lizeb@chromium.org</owner>
   <owner>cct-team@google.com</owner>
   <summary>
@@ -101,7 +101,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CustomTabs.DetachedResourceRequest.FinalStatus"
-    enum="NetErrorCodes" expires_after="M92">
+    enum="NetErrorCodes" expires_after="2021-08-08">
   <owner>lizeb@chromium.org</owner>
   <owner>cct-team@google.com</owner>
   <summary>
@@ -123,6 +123,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="CustomTabs.IncognitoCCTCallerId" enum="IncognitoCCTCallerId"
+    expires_after="2021-07-11">
+  <owner>roagarwal@chromium.org</owner>
+  <owner>chrome-incognito@google.com</owner>
+  <owner>cct-team@google.com</owner>
+  <summary>
+    This metrics records the caller of Incognito CCTs. For Chrome features, the
+    feature name is recorded, for external calls, either Google App or
+    Non-Google App categories are recorded. The metric is recorded when an
+    Incognito CCT opening intent is received.
+  </summary>
+</histogram>
+
 <histogram name="CustomTabs.IntentToFirstCommitNavigationTime3" units="ms"
     expires_after="M81">
   <owner>lizeb@chromium.org</owner>
@@ -165,7 +178,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CustomTabs.ParallelRequestStatusOnStart"
-    enum="CustomTabsParallelRequestStatusOnStart" expires_after="M92">
+    enum="CustomTabsParallelRequestStatusOnStart" expires_after="2021-08-09">
   <owner>lizeb@chromium.org</owner>
   <owner>cct-team@google.com</owner>
   <summary>
@@ -290,7 +303,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CustomTabs.WarmupStateOnLaunch" enum="WarmupStateOnLaunch"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>lizeb@chromium.org</owner>
   <summary>
     Recorded only on Android. Reports whether warmup() has been called when a
diff --git a/chromium/tools/metrics/histograms/histograms_xml/data_reduction_proxy/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/data_reduction_proxy/histograms.xml
index cfe29b84fea..b2baecd0078 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/data_reduction_proxy/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/data_reduction_proxy/histograms.xml
@@ -21,6 +21,68 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<histogram name="ConnectivityDetector.ConnectionState.{Client}"
+    enum="ConnectivityDetectorConnectionState" expires_after="2021-11-15">
+  <owner>curranmax@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <owner>jianli@chromium.org</owner>
+  <summary>
+    Result of the connection state after the HTTP Probe made by connectivity
+    detector finishes and the connection state is updated.
+  </summary>
+  <token key="Client">
+    <variant name="OfflineDetector"/>
+    <variant name="OfflineIndicatorController"/>
+  </token>
+</histogram>
+
+<histogram name="ConnectivityDetector.DefaultHttpProbeResult.{Client}"
+    enum="ProbeResult" expires_after="2021-11-15">
+  <owner>curranmax@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <owner>jianli@chromium.org</owner>
+  <summary>
+    Result of the HTTP Probe made by connectivity detector. Recorded everytime
+    the probe to the default URL completes (in either success or failure) or
+    timeouts.
+  </summary>
+  <token key="Client">
+    <variant name="OfflineDetector"/>
+    <variant name="OfflineIndicatorController"/>
+  </token>
+</histogram>
+
+<histogram name="ConnectivityDetector.FallbackHttpProbeResult.{Client}"
+    enum="ProbeResult" expires_after="2021-11-15">
+  <owner>curranmax@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <owner>jianli@chromium.org</owner>
+  <summary>
+    Result of the HTTP Probe made by connectivity detector. Recorded everytime
+    the probe to the fallback URL completes (in either success or failure) or
+    timeouts.
+  </summary>
+  <token key="Client">
+    <variant name="OfflineDetector"/>
+    <variant name="OfflineIndicatorController"/>
+  </token>
+</histogram>
+
+<histogram name="ConnectivityDetector.SentHttpProbe.{Client}" units="count"
+    expires_after="2021-11-15">
+  <owner>curranmax@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <owner>jianli@chromium.org</owner>
+  <owner>src/components/data_reduction_proxy/OWNERS</owner>
+  <summary>
+    Count of times when a HTTP Probe was made by connectivity detector.
+  </summary>
+  <token key="Client">
+    <variant name="OfflineDetector"/>
+    <variant name="OfflineIndicatorController"/>
+  </token>
+</histogram>
+
 <histogram name="DataReductionProxy.BypassedBytes" units="bytes"
     expires_after="M85">
   <owner>bengr@chromium.org</owner>
@@ -43,6 +105,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="DataReductionProxy.ConfigService.AuthExpired"
     enum="BooleanExpired" expires_after="M90">
+  <obsolete>
+    Obsoleted Jan 2021.
+  </obsolete>
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -58,6 +123,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="DataReductionProxy.ConfigService.ConnectionSetupTime"
     units="ms" expires_after="M90">
+  <obsolete>
+    Obsoleted Jan 2021.
+  </obsolete>
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -70,6 +138,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="DataReductionProxy.ConfigService.FetchFailedAttemptsBeforeSuccess"
     units="units" expires_after="M90">
+  <obsolete>
+    Obsoleted Jan 2021.
+  </obsolete>
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -84,6 +155,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="DataReductionProxy.ConfigService.FetchLatency" units="ms"
     expires_after="M90">
+  <obsolete>
+    Obsoleted Jan 2021.
+  </obsolete>
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -96,6 +170,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="DataReductionProxy.ConfigService.FetchResponseCode"
     enum="HttpResponseCode" expires_after="M90">
+  <obsolete>
+    Obsoleted Jan 2021.
+  </obsolete>
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -105,7 +182,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataReductionProxy.ConfigService.HttpRequestRTT" units="ms"
-    expires_after="M90">
+    expires_after="2021-06-20">
+  <obsolete>
+    Obsoleted Jan 2021.
+  </obsolete>
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -116,6 +196,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="DataReductionProxy.ConfigService.HTTPRequests"
     enum="DataReductionProxyConfigServiceHTTPRequests" expires_after="M90">
+  <obsolete>
+    Obsoleted Jan 2021.
+  </obsolete>
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -131,6 +214,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="DataReductionProxy.ConfigService.MainFrames"
     enum="DataReductionProxyConfigServiceMainFrames" expires_after="M90">
+  <obsolete>
+    Obsoleted Jan 2021.
+  </obsolete>
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -170,7 +256,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataReductionProxy.EnabledState"
-    enum="DataReductionProxyEnabledState" expires_after="2021-03-10">
+    enum="DataReductionProxyEnabledState" expires_after="2021-08-09">
   <owner>rajendrant@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -194,7 +280,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataReductionProxy.LastWeekAggregateKB.Services"
-    enum="DataUseServicesHash" expires_after="M90">
+    enum="DataUseServicesHash" expires_after="2021-08-22">
   <owner>rajendrant@chromium.org</owner>
   <owner>bengr@chromium.org</owner>
   <summary>
@@ -209,7 +295,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="DataReductionProxy.LastWeekAggregateKB.UserTraffic.Downstream.ContentType"
-    enum="DataUseContentType" expires_after="M90">
+    enum="DataUseContentType" expires_after="2021-08-22">
   <owner>rajendrant@chromium.org</owner>
   <owner>bengr@chromium.org</owner>
   <summary>
@@ -277,7 +363,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataReductionProxy.StartupNegativeSavingsPercent" units="%"
-    expires_after="2021-04-27">
+    expires_after="2021-08-01">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -288,7 +374,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataReductionProxy.StartupSavingsPercent" units="%"
-    expires_after="2021-04-27">
+    expires_after="2021-08-01">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -299,7 +385,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataReductionProxy.StartupState"
-    enum="DataReductionProxyStartupState" expires_after="2021-05-09">
+    enum="DataReductionProxyStartupState" expires_after="2021-07-11">
   <owner>rajendrant@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -311,7 +397,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataReductionProxy.ThisWeekAggregateKB.Services"
-    enum="DataUseServicesHash" expires_after="M90">
+    enum="DataUseServicesHash" expires_after="2021-08-22">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -326,7 +412,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="DataReductionProxy.ThisWeekAggregateKB.UserTraffic.Downstream.ContentType"
-    enum="DataUseContentType" expires_after="M90">
+    enum="DataUseContentType" expires_after="2021-08-22">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -340,7 +426,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataReductionProxy.UIAction" enum="DataReductionProxyUIAction"
-    expires_after="2021-04-27">
+    expires_after="2021-06-27">
   <owner>bengr@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -384,7 +470,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataReductionProxy.UserViewedOriginalSize" units="KB"
-    expires_after="2021-05-02">
+    expires_after="2021-08-09">
   <owner>rajendrant@chromium.org</owner>
   <owner>robertogden@chromium.org</owner>
   <owner>src/components/data_reduction_proxy/OWNERS</owner>
@@ -395,7 +481,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataReductionProxy.UserViewedSavingsDifferenceWithBreakdown"
-    units="%" expires_after="2021-03-15">
+    units="%" expires_after="2021-08-15">
   <owner>rajendrant@chromium.org</owner>
   <owner>robertogden@chromium.org</owner>
   <owner>src/components/data_reduction_proxy/OWNERS</owner>
@@ -409,7 +495,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataReductionProxy.UserViewedSavingsSize" units="KB"
-    expires_after="2021-05-02">
+    expires_after="2021-08-09">
   <owner>rajendrant@chromium.org</owner>
   <owner>robertogden@chromium.org</owner>
   <owner>src/components/data_reduction_proxy/OWNERS</owner>
@@ -420,7 +506,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataReductionProxy.UserViewedUsageDifferenceWithBreakdown"
-    units="%" expires_after="2021-03-15">
+    units="%" expires_after="2021-08-15">
   <owner>rajendrant@chromium.org</owner>
   <owner>robertogden@chromium.org</owner>
   <owner>src/components/data_reduction_proxy/OWNERS</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/dev/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/dev/histograms.xml
index cabf03c4776..9b5683752b9 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/dev/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/dev/histograms.xml
@@ -30,7 +30,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DevTools.BackgroundService.ClearEvents"
-    enum="ServiceWorkerStatusCode" expires_after="M87">
+    enum="ServiceWorkerStatusCode" expires_after="M92">
   <owner>yangguo@chromium.org</owner>
   <owner>rayankans@chromium.org</owner>
   <owner>bmeurer@chromium.org</owner>
@@ -42,7 +42,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DevTools.BackgroundService.GetEvents"
-    enum="ServiceWorkerStatusCode" expires_after="M87">
+    enum="ServiceWorkerStatusCode" expires_after="M92">
   <owner>rayankans@chromium.org</owner>
   <owner>yangguo@chromium.org</owner>
   <owner>bmeurer@chromium.org</owner>
@@ -53,7 +53,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DevTools.BackgroundService.LogEvent"
-    enum="ServiceWorkerStatusCode" expires_after="M87">
+    enum="ServiceWorkerStatusCode" expires_after="M92">
   <owner>rayankans@chromium.org</owner>
   <owner>yangguo@chromium.org</owner>
   <owner>bmeurer@chromium.org</owner>
@@ -65,7 +65,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DevTools.BackgroundService.StartRecording"
-    enum="DevToolsBackgroundService" expires_after="M87">
+    enum="DevToolsBackgroundService" expires_after="2021-08-09">
   <owner>yangguo@chromium.org</owner>
   <owner>bmeurer@chromium.org</owner>
   <owner>rayankans@chromium.org</owner>
@@ -77,7 +77,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DevTools.ColorPicker.FixedColor"
-    enum="DevToolsColorPickerFixedColor" expires_after="2021-03-17">
+    enum="DevToolsColorPickerFixedColor" expires_after="2021-07-27">
   <owner>yangguo@chromium.org</owner>
   <owner>mathias@chromium.org</owner>
   <owner>alexrudenko@chromium.org</owner>
@@ -101,8 +101,23 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="DevTools.CssEditorOpened" enum="DevToolsCssEditorOpened"
+    expires_after="2021-09-14">
+  <owner>yangguo@chromium.org</owner>
+  <owner>michael.liao@microsoft.com</owner>
+  <owner>shanejc@microsoft.com</owner>
+  <summary>
+    Records the usage of each of the Styles Pane property editors while the font
+    editor experiment is enabled. The four editors are the color picker, the CSS
+    shadow editor, the bezier editor and the font editor.
+  </summary>
+</histogram>
+
 <histogram name="DevTools.CSSGridSettings2" enum="DevtoolsGridSettingChanged2"
     expires_after="M88">
+  <obsolete>
+    Removed in M89 because it is no longer needed for analysis.
+  </obsolete>
   <owner>yangguo@chromium.org</owner>
   <owner>brgoddar@microsoft.com</owner>
   <owner>leo.lee@microsoft.com</owner>
@@ -111,6 +126,59 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="DevTools.DeveloperResourceLoaded"
+    enum="DevToolsDeveloperResourceLoaded" expires_after="2021-12-31">
+  <owner>yangguo@chromium.org</owner>
+  <owner>sigurds@chromium.org</owner>
+  <summary>
+    Records for each developer resource load that the DevTools front-end issues
+    (e.g. to load a source map) several enum values encoding which load method
+    was used, whether a fallback was used (and why), and whether the method
+    succeeded or not.
+
+    Some explanations to make sense of the enum values:
+
+    LoadsThroughPage = LoadThroughPageViaTarget + LoadThroughPageViaFrame
+
+    SuccessfulLoadsThroughPage = LoadsThroughPage - LoadThroughPageFailure
+
+    LoadThroughPageFallback is the number of loads that can in principle be
+    loaded through the page, but had to use the fallback because either loading
+    through the page failed (LoadThroughPageFailure), or there was insufficient
+    information to dispatch the load through the page; the number of such loads
+    can be computed as LoadThroughPageFallback - LoadThroughPageFailure.
+
+    The number of loads not eligible for loading through the page can be
+    computed as FallbackPerOverride + FallbackPerProtocol, where
+    FallbackPerOverride indicates loads where the DevTools user disabled loading
+    through the page via an override, and FallbackPerProtocol indicates loads
+    where DevTools could not load the resource via the page due to the
+    resource's protocol scheme.
+
+    The total number of loads that used the fallback can be computed as
+    LoadThroughPageFallback + FallbackPerOverride + FallbackPerProtocol. Adding
+    SuccessfulLoadsThroughPage to that number gives the total number of loads.
+  </summary>
+</histogram>
+
+<histogram name="DevTools.DeveloperResourceScheme"
+    enum="DevToolsDeveloperResourceScheme" expires_after="2021-12-31">
+  <owner>yangguo@chromium.org</owner>
+  <owner>sigurds@chromium.org</owner>
+  <summary>
+    Records for each developer resource load that the DevTools front-end issues
+    (e.g. to load a source map) one enum value that records the scheme of the
+    resource's URL. For HTTP and HTTPS schemes, there are two enums each: One
+    that signifies that the host was localhost, and one that signifies that it
+    wasn't, i.e. to get the total number of resource loads using a HTTP scheme
+    one must add the numbers of SchemeHttp and SchemeHttpLocalhost.
+
+    The value SchemeUnknown signifies that parsing the scheme from the URL
+    failed (note that at the point the enum is recorded, only absolute URLs
+    arrive).
+  </summary>
+</histogram>
+
 <histogram name="DevTools.DualScreenDeviceEmulated"
     enum="DevToolsDualScreenDeviceEmulated" expires_after="M87">
   <owner>yangguo@chromium.org</owner>
@@ -155,6 +223,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="DevTools.GridOverlayOpenedFrom"
     enum="DevToolsGridOverlayOpenedFrom" expires_after="M88">
+  <obsolete>
+    Removed in M89 because it is no longer needed for analysis.
+  </obsolete>
   <owner>changhaohan@chromium.org</owner>
   <owner>yangguo@chromium.org</owner>
   <owner>mathias@chromium.org</owner>
@@ -165,6 +236,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="DevTools.HighlightedPersistentCSSGridCount"
     enum="DevToolsHighlightedPersistentCSSGridCount" expires_after="M88">
+  <obsolete>
+    Removed in M89 because it is no longer needed for analysis.
+  </obsolete>
   <owner>yangguo@chromium.org</owner>
   <owner>patrick.brosset@microsoft.com</owner>
   <owner>leo.lee@microsoft.com</owner>
@@ -184,6 +258,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="DevTools.IssueCreated" enum="DevToolsIssueCreated"
+    expires_after="2021-10-31">
+  <owner>yangguo@chromium.org</owner>
+  <owner>bmeurer@chromium.org</owner>
+  <summary>
+    Records the issue type when an issue is created for the Issues Panel.
+  </summary>
+</histogram>
+
 <histogram name="DevTools.IssuesPanelIssueExpanded"
     enum="DevToolsIssuesPanelIssueExpanded" expires_after="2021-08-27">
   <owner>yangguo@chromium.org</owner>
@@ -194,7 +277,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DevTools.IssuesPanelOpenedFrom"
-    enum="DevToolsIssuesPanelOpenedFrom" expires_after="2021-03-28">
+    enum="DevToolsIssuesPanelOpenedFrom" expires_after="2021-08-01">
   <owner>yangguo@chromium.org</owner>
   <owner>bmeurer@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/dom/OWNERS b/chromium/tools/metrics/histograms/histograms_xml/dom/OWNERS
deleted file mode 100644
index fcb25654bc6..00000000000
--- a/chromium/tools/metrics/histograms/histograms_xml/dom/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-schenney@chromium.org
diff --git a/chromium/tools/metrics/histograms/histograms_xml/dom/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/dom/histograms.xml
deleted file mode 100644
index e3f359050d0..00000000000
--- a/chromium/tools/metrics/histograms/histograms_xml/dom/histograms.xml
+++ /dev/null
@@ -1,251 +0,0 @@
-<!--
-Copyright 2020 The Chromium Authors. All rights reserved.
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file.
--->
-
-<!--
-This file is used to generate a comprehensive list of Dom histograms
-along with a detailed description for each histogram.
-
-For best practices on writing histogram descriptions, see
-https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/metrics/histograms/README.md
-
-Please send CLs to chromium-metrics-reviews@google.com rather than to specific
-individuals. These CLs will be automatically reassigned to a reviewer within
-about 5 minutes. This approach helps the metrics team to load-balance incoming
-reviews. Googlers can read more about this at go/gwsq-gerrit.
--->
-
-<histogram-configuration>
-
-<histograms>
-
-<histogram name="DomDistiller.DistillabilityRejection" enum="DistillRejection"
-    expires_after="M85">
-  <owner>wychen@chromium.org</owner>
-  <summary>
-    The reason to reject distillability at PageDistillableAfterParsing time.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.DistillabilityScoreNMF.Negative" units="score"
-    expires_after="M77">
-  <owner>wychen@chromium.org</owner>
-  <summary>
-    Score of distillability from AdaBoost model, non-mobile-friendly only. The
-    score shown here is multiplied by 100.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.DistillabilityScoreNMF.Positive" units="score"
-    expires_after="M77">
-  <owner>wychen@chromium.org</owner>
-  <summary>
-    Score of distillability from AdaBoost model, non-mobile-friendly only. The
-    score shown here is multiplied by 100.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.InfoBarUsage" enum="BooleanUsage"
-    expires_after="M77">
-  <owner>mdjones@chromium.org</owner>
-  <summary>
-    &quot;Used&quot; is recorded when the user clicks the infobar to enter
-    Reader Mode. &quot;Not Used&quot; is recorded when the user clicks the close
-    button. If there's no user action, nothing is recorded.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.LongArticleScoreNMF.Negative" units="score"
-    expires_after="M85">
-  <owner>wychen@chromium.org</owner>
-  <summary>
-    Score of long article from AdaBoost model, distillable and
-    non-mobile-friendly only. The score shown here is multiplied by 100.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.LongArticleScoreNMF.Positive" units="score"
-    expires_after="M85">
-  <owner>wychen@chromium.org</owner>
-  <summary>
-    Score of long article from AdaBoost model, distillable and
-    non-mobile-friendly only. The score shown here is multiplied by 100.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.PageDistillableAfterLoading"
-    enum="DistillableType2" expires_after="M85">
-  <owner>wychen@chromium.org</owner>
-  <summary>
-    Records the &quot;Distillable Type&quot; (mobile-friendly not distillable,
-    mobile-friendly distillable, non-mobile-friendly not distillable,
-    non-mobile-friendly distillable) for each analyzed page after loading.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.PageDistillableAfterParsing"
-    enum="DistillableType2" expires_after="M85">
-  <owner>wychen@chromium.org</owner>
-  <summary>
-    Records the &quot;Distillable Type&quot; (mobile-friendly not distillable,
-    mobile-friendly distillable, non-mobile-friendly not distillable,
-    non-mobile-friendly distillable) for each analyzed page after parsing.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.PageHasDistilledData"
-    enum="BooleanHasDistilledData" expires_after="M85">
-  <owner>kuan@chromium.org</owner>
-  <summary>Records whether a page has distilled data.</summary>
-</histogram>
-
-<histogram name="DomDistiller.ReaderMode.EntryPoint"
-    enum="ReaderModeEntryPoint" expires_after="2021-04-04">
-  <owner>katie@chromium.org</owner>
-  <owner>gilmanmh@google.com</owner>
-  <owner>chrome-a11y-core@google.com</owner>
-  <summary>The method a user used to enter reader mode on an article.</summary>
-</histogram>
-
-<histogram name="DomDistiller.ReaderMode.ExitPoint" enum="ReaderModeEntryPoint"
-    expires_after="2021-04-04">
-  <owner>katie@chromium.org</owner>
-  <owner>gilmanmh@google.com</owner>
-  <owner>chrome-a11y-core@google.com</owner>
-  <summary>
-    The method a user used to exit reader mode and return to the original
-    article.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.ReaderShownForPageLoad" enum="Boolean"
-    expires_after="M77">
-  <owner>mdjones@chromium.org</owner>
-  <summary>
-    Records if the panel became visible at any point after a page was navigated.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.Statistics.FirstPageWordCount" units="words"
-    expires_after="M85">
-  <owner>mdjones@chromium.org</owner>
-  <summary>
-    Records the number of words in a distilled page. This only records the first
-    page of a multi-page article.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.Statistics.WordCount" units="words"
-    expires_after="M85">
-  <owner>nyquist@chromium.org</owner>
-  <summary>
-    Records the number of words in a distilled page. For articles with multiple
-    pages, each page is counted separately.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.Time.ActivelyViewingArticleBeforeDistilling"
-    units="ms" expires_after="2021-02-01">
-  <owner>katie@chromium.org</owner>
-  <owner>chrome-a11y-core@chromium.org</owner>
-  <summary>
-    Records the amount of active time a user spent on a distillable page before
-    switching that page to Reader Mode. Active time is time that the article was
-    visible, not total time the page was open: the timer is paused when the page
-    is not visible. This is not recorded when the user opens a distillable page
-    but does not switch to Reader Mode from that page (via the omnibox icon or
-    menu option).
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.Time.ActivelyViewingReaderModePage" units="ms"
-    expires_after="2021-04-04">
-  <owner>katie@chromium.org</owner>
-  <owner>chrome-a11y-core@chromium.org</owner>
-  <summary>
-    Records the amount of active time a user spent on a Reader Mode page. Active
-    time is the time the Reader Mode page was visible, not the total time the
-    page was open: the timer is paused when the page is not visible. This is
-    recorded regardless of how a user enters the page: e.g. using the
-    forward/back buttons, entering the URL directly, or coming from a
-    distillable page all start the timer equally.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.Time.ArticleProcessing" units="ms"
-    expires_after="M77">
-  <owner>yfriedman@chromium.org</owner>
-  <summary>
-    Time spent in DomDistiller's identification of text content.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.Time.DistillationTotal" units="ms"
-    expires_after="M85">
-  <owner>yfriedman@chromium.org</owner>
-  <summary>Complete time spent in DomDistiller's processing of a page.</summary>
-</histogram>
-
-<histogram name="DomDistiller.Time.DistillPage" units="ms" expires_after="M77">
-  <owner>wychen@chromium.org</owner>
-  <summary>
-    Time spent in DistillPageImpl(), mostly ExecuteJavaScript(), including
-    compilation and execution.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.Time.DocumentConstruction" units="ms"
-    expires_after="M77">
-  <owner>yfriedman@chromium.org</owner>
-  <summary>
-    Time spent in creating DomDistiller's internal representation of the HTML
-    document.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.Time.Formatting" units="ms" expires_after="M77">
-  <owner>yfriedman@chromium.org</owner>
-  <summary>
-    Time spent in DomDistiller's final processing of article content/formatting.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.Time.MarkupParsing" units="ms"
-    expires_after="M77">
-  <owner>yfriedman@chromium.org</owner>
-  <summary>
-    Time spent in DomDistiller's processing of article metadata.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.Time.RunJavaScript" units="ms"
-    expires_after="M77">
-  <owner>wychen@chromium.org</owner>
-  <summary>
-    Time spent in ExecuteJavaScript() in DomDistiller. It includes JavaScript
-    code transmission through IPC, parsing, compilation, execution, and
-    returning the JSON back through IPC.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.Time.ViewerLoading" units="ms"
-    expires_after="M77">
-  <owner>wychen@chromium.org</owner>
-  <summary>
-    Records the time from the Reader Mode panel opening to the viewer loaded.
-  </summary>
-</histogram>
-
-<histogram name="DomDistiller.Time.ViewingReaderModePage" units="ms"
-    expires_after="M77">
-  <owner>mdjones@chromium.org</owner>
-  <summary>
-    Records the amount of time a user spent on a Reader Mode Page.
-  </summary>
-</histogram>
-
-</histograms>
-
-</histogram-configuration>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/download/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/download/histograms.xml
index e75cc13d0f6..9daaab5424e 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/download/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/download/histograms.xml
@@ -37,7 +37,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Download.BandwidthOverallBytesPerSecond" units="units"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>dtrainor@chromium.org</owner>
   <summary>
     Overall bandwidth seen for the download. Note that this is measured at the
@@ -48,14 +48,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Download.CancelReason" enum="DownloadCancelReason"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>Records why the download is canceled.</summary>
 </histogram>
 
 <histogram name="Download.ContentType.Audio" enum="DownloadAudioType"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>xingliu@chromium.org</owner>
   <summary>Types of audio files that are downloaded.</summary>
 </histogram>
@@ -69,7 +69,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Download.ContentType.Text" enum="DownloadTextType"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>xingliu@chromium.org</owner>
   <summary>Types of text files that are downloaded.</summary>
 </histogram>
@@ -83,7 +83,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Download.Counts" enum="DownloadCountType"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
 <!-- Name completed by histogram_suffixes name="DownloadSource" -->
 
   <owner>xingliu@chromium.org</owner>
@@ -103,7 +103,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Download.DangerousFile.DownloadValidatedByType"
-    enum="SBClientDownloadExtensions" expires_after="M90">
+    enum="SBClientDownloadExtensions" expires_after="2021-08-22">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@chromium.org</owner>
   <summary>
@@ -150,7 +150,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Download.DownloadDangerPrompt"
-    enum="SBClientDownloadExtensions" expires_after="2021-05-05">
+    enum="SBClientDownloadExtensions" expires_after="2021-07-04">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -270,16 +270,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Download.IOSDownloadARModelState.USDZ"
-    enum="DownloadARModelState" expires_after="2020-11-29">
+    enum="DownloadARModelState" expires_after="2021-05-08">
   <owner>mahmadi@chromium.org</owner>
+  <owner>ewannpv@chromium.com</owner>
   <summary>
     Logged at different stages of downloading a USDZ MIME type AR model on iOS.
   </summary>
 </histogram>
 
 <histogram name="Download.IOSDownloadedFileAction" enum="DownloadedFileAction"
-    expires_after="2021-03-21">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-07-11">
+  <owner>sdefresne@chromium.org</owner>
+  <owner>ewannpv@chromium.com</owner>
   <summary>
     The action that a user takes on a file after it has been successfully
     downloaded on iOS.
@@ -287,18 +289,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Download.IOSDownloadedFileNetError" enum="NetErrorCodes"
-    expires_after="2021-01-15">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-05-08">
+  <owner>ewannpv@chromium.org</owner>
   <owner>mrefaat@chromium.org</owner>
   <summary>
-    Positive net error codes that happens in the case of download content fetch
+    Positive net error codes that happen in the case of download content fetch
     failure.
   </summary>
 </histogram>
 
 <histogram name="Download.IOSDownloadedFileStatusCode" units="units"
-    expires_after="2021-01-15">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2020-12-08">
+  <obsolete>
+    Deprecated as of 08-2018. Recording code was removed in crrev.com/c/1170128.
+  </obsolete>
   <owner>stkhapugin@chromium.org</owner>
   <summary>
     HTTP status code returned when file download completes on iOS.
@@ -306,8 +310,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Download.IOSDownloadFileInBackground"
-    enum="DownloadFileInBackground" expires_after="2021-01-15">
-  <owner>eugenebut@chromium.org</owner>
+    enum="DownloadFileInBackground" expires_after="2021-05-08">
+  <owner>sdefresne@chromium.org</owner>
+  <owner>ewannpv@chromium.com</owner>
   <summary>
     Logged when the download is completed (successfully or not) or in-progress
     download was cancelled because of the app termination. This histogram
@@ -318,14 +323,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Download.IOSDownloadFileResult" enum="DownloadFileResult"
     expires_after="2021-07-26">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>ewannpv@chromium.org</owner>
+  <owner>sdefresne@chromium.org</owner>
   <summary>Result when a user attempts to download a file on iOS.</summary>
 </histogram>
 
 <histogram name="Download.IOSDownloadFileUI" enum="DownloadFileUI"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>ewannpv@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
+  <owner>sdefresne@chromium.org</owner>
   <summary>
     Result when a user attempts to present the download UI on iOS. Looged when
     download is created.
@@ -335,7 +341,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Download.IOSDownloadFileUIGoogleDrive"
     enum="DownloadFileUIGoogleDrive" expires_after="2021-11-29">
   <owner>ewannpv@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
+  <owner>sdefresne@chromium.org</owner>
   <summary>
     Result when the download UI is prexsented on iOS. Values indicate if Google
     Drive is installed and whether or not Install Google Drive promo was shown.
@@ -344,8 +350,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Download.IOSDownloadMimeType" enum="DownloadMimeTypeResult"
-    expires_after="2021-04-11">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-08-15">
+  <owner>ewannpv@chromium.org</owner>
+  <owner>sdefresne@chromium.org</owner>
   <summary>
     MIME type of a download response. Logged when the download UI was offered by
     the browser to the user.
@@ -353,16 +360,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Download.IOSDownloadPassKitResult"
-    enum="DownloadPassKitResult" expires_after="2021-01-15">
-  <owner>eugenebut@chromium.org</owner>
+    enum="DownloadPassKitResult" expires_after="2021-05-08">
+  <owner>ewannpv@chromium.org</owner>
+  <owner>sdefresne@chromium.org</owner>
   <summary>
-    Result when a user attempts to download a PassKit file on iOS.
+    Recorded when a user attempts to download a PassKit file on iOS.
   </summary>
 </histogram>
 
 <histogram name="Download.IOSDownloadReplaced" enum="BooleanReplaced"
-    expires_after="2021-01-15">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-07-15">
+  <owner>ewannpv@chromium.org</owner>
   <owner>sdefresne@chromium.org</owner>
   <summary>
     The user discarded in-progress download and replaced with the new one. Only
@@ -374,7 +382,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Download.IOSPresentAddPassesDialogResult"
     enum="PresentAddPassesDialogResult" expires_after="2021-05-01">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>ewannpv@chromium.org</owner>
   <owner>sdefresne@chromium.org</owner>
   <summary>Result of an attempt to present Add Passes dialog on iOS.</summary>
 </histogram>
@@ -468,6 +476,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>Network connection type when starting a new download.</summary>
 </histogram>
 
+<histogram name="Download.OpenDownloads.PerProfileType"
+    enum="BrowserProfileType" expires_after="2021-12-31">
+  <owner>sideyilmaz@chromium.org</owner>
+  <owner>chrome-incognito@google.com</owner>
+  <summary>
+    Records the profile type for opening the Downloads page. This may be
+    triggered by different entry points like mobile menu, notification or info
+    bar.
+  </summary>
+</histogram>
+
+<histogram name="Download.OpenDownloadsFromMenu.PerProfileType"
+    enum="BrowserProfileType" expires_after="2021-12-31">
+  <owner>sideyilmaz@chromium.org</owner>
+  <owner>chrome-incognito@google.com</owner>
+  <summary>
+    Records the profile type for opening the Downloads page from menu.
+  </summary>
+</histogram>
+
 <histogram name="Download.OpenMethod" enum="DownloadOpenMethod"
     expires_after="never">
 <!-- expires-never: part of top-line metric (internal: go/chrome-browser-nsm) -->
@@ -489,6 +517,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>The number of unopened downloads, when one is opened.</summary>
 </histogram>
 
+<histogram name="Download.OverwrittenDownloadRemovedFromHistory"
+    units="downloads" expires_after="2021-08-01">
+  <owner>qinmin@chromium.org</owner>
+  <owner>chrome-downloads@google.com</owner>
+  <summary>
+    Records the number of overwritten downloads that are cleaned up from
+    Chrome://downloads history. Recorded after loading all the downloads from
+    history DB.
+  </summary>
+</histogram>
+
 <histogram name="Download.ParallelDownload.CreationEvent"
     enum="ParallelDownloadCreationEvent" expires_after="2020-12-06">
   <obsolete>
@@ -538,13 +577,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Download.Parallelizable.DownloadTime" units="ms"
     expires_after="2020-12-28">
+  <obsolete>
+    Removed 2021/02
+  </obsolete>
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>The download time for a parallelizable download.</summary>
 </histogram>
 
 <histogram name="Download.Parallelizable.FileSize" units="KB"
-    expires_after="2021-05-02">
+    expires_after="2021-08-09">
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>The download size of a parallelizable download.</summary>
@@ -777,7 +819,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Download.Service.Files.FreeDiskSpace" units="%"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>xingliu@chromium.org</owner>
   <summary>
     The percentage of free disk space to total disk space. Recorded during
@@ -806,7 +848,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Download.Service.Finish.Type"
-    enum="Download.Service.CompletionType" expires_after="2021-03-21">
+    enum="Download.Service.CompletionType" expires_after="2021-07-27">
   <owner>xingliu@chromium.org</owner>
   <summary>The completion type for downloads in download service.</summary>
 </histogram>
@@ -918,7 +960,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Download.ShowedDownloadWarning" enum="DownloadItem.DangerType"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@chromium.org</owner>
   <summary>
@@ -948,7 +990,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Download.Start.ContentType.NormalProfile"
-    enum="DownloadContentType" expires_after="2021-04-25">
+    enum="DownloadContentType" expires_after="2021-06-27">
   <owner>shaktisahu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>
@@ -956,8 +998,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Download.Start.PerProfileType" enum="BrowserProfileType"
+    expires_after="2021-12-31">
+  <owner>sideyilmaz@chromium.org</owner>
+  <owner>chrome-incognito@google.com</owner>
+  <summary>
+    The browser profile type for each download started, recorded just after
+    download successfully started.
+  </summary>
+</histogram>
+
 <histogram name="Download.UserValidatedDangerousDownload"
-    enum="DownloadItem.DangerType" expires_after="M90">
+    enum="DownloadItem.DangerType" expires_after="2021-08-22">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-team@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/enterprise/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/enterprise/histograms.xml
index 2cf7081a3be..9d7582f4cf6 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/enterprise/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/enterprise/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="Enterprise.ActiveDirectoryJoin"
-    enum="ActiveDirectoryDomainJoinType" expires_after="M90">
+    enum="ActiveDirectoryDomainJoinType" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -42,7 +42,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.AppRestrictionLoadTime2.EmptyBundle" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>twellington@google.com</owner>
   <owner>tedchcoc@chromium.org</owner>
   <summary>
@@ -52,7 +52,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.AppRestrictionLoadTime2.NonEmptyBundle" units="ms"
-    expires_after="2021-02-28">
+    expires_after="2021-08-09">
   <owner>twellington@google.com</owner>
   <owner>tedchcoc@chromium.org</owner>
   <summary>
@@ -74,7 +74,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Enterprise.AutoEnrollmentBucketDownloadTime"
-    units="ms" expires_after="2021-05-02">
+    units="ms" expires_after="2021-08-15">
 <!-- Name completed by histogram_suffixes name="EnterpriseAutoEnrollmentType". -->
 
   <owner>pmarko@chromium.org</owner>
@@ -97,7 +97,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Enterprise.AutoEnrollmentHashDanceSuccessTime"
-    units="ms" expires_after="2021-05-02">
+    units="ms" expires_after="2021-07-04">
 <!-- Name completed by histogram_suffixes name="EnterpriseAutoEnrollmentType". -->
 
   <owner>amraboelkher@google.com</owner>
@@ -108,9 +108,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram base="true"
+<histogram
     name="Enterprise.AutoEnrollmentPrivateSetMembershipHashDanceComparison"
-    enum="PrivateSetMembershipHashDanceComparison" expires_after="2021-03-01">
+    enum="PrivateSetMembershipHashDanceComparison" expires_after="2021-09-01">
   <owner>amraboelkher@google.com</owner>
   <owner>mpolzer@google.com</owner>
   <summary>
@@ -119,9 +119,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram base="true"
-    name="Enterprise.AutoEnrollmentPrivateSetMembershipRequestStatus"
-    enum="PrivateSetMembershipStatus" expires_after="2021-03-01">
+<histogram name="Enterprise.AutoEnrollmentPrivateSetMembershipRequestStatus"
+    enum="PrivateSetMembershipStatus" expires_after="2021-09-01">
   <owner>amraboelkher@google.com</owner>
   <owner>mpolzer@google.com</owner>
   <summary>
@@ -130,9 +129,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram base="true"
-    name="Enterprise.AutoEnrollmentPrivateSetMembershipSuccessTime" units="ms"
-    expires_after="2021-03-01">
+<histogram name="Enterprise.AutoEnrollmentPrivateSetMembershipSuccessTime"
+    units="ms" expires_after="2021-09-01">
   <owner>amraboelkher@google.com</owner>
   <owner>mpolzer@google.com</owner>
   <summary>
@@ -142,7 +140,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Enterprise.AutoEnrollmentProtocolTime" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
 <!-- Name completed by histogram_suffixes name="EnterpriseAutoEnrollmentType". -->
 
   <owner>pmarko@chromium.org</owner>
@@ -150,8 +148,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>Total duration time of the auto-enrollment protocol.</summary>
 </histogram>
 
+<histogram
+    name="Enterprise.AutoEnrollmentPsmHashDanceDifferentResultsComparison"
+    enum="PsmHashDanceDifferentResultsComparison" expires_after="2021-09-01">
+  <owner>amraboelkher@google.com</owner>
+  <owner>mpolzer@google.com</owner>
+  <summary>
+    Comparison of hash dance and private set membership results used to
+    determine the initial enrollment state of the device. Only recorded after
+    both protocols have been executed successfully with different results.
+  </summary>
+</histogram>
+
 <histogram base="true" name="Enterprise.AutoEnrollmentRequestNetworkErrorCode"
-    enum="NetErrorCodes" expires_after="2021-05-02">
+    enum="NetErrorCodes" expires_after="2021-08-15">
 <!-- Name completed by histogram_suffixes name="EnterpriseAutoEnrollmentType". -->
 
   <owner>pmarko@chromium.org</owner>
@@ -162,7 +172,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Enterprise.AutoEnrollmentRequestStatus"
-    enum="EnterpriseDeviceManagementStatus" expires_after="2021-05-02">
+    enum="EnterpriseDeviceManagementStatus" expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="EnterpriseAutoEnrollmentType". -->
 
   <owner>pmarko@chromium.org</owner>
@@ -170,6 +180,29 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>URL fetcher status for auto-enrollment requests.</summary>
 </histogram>
 
+<histogram base="true" name="Enterprise.BrowserSigninIOS.SignedOutByPolicy"
+    enum="BooleanHit" expires_after="2021-06-30">
+  <owner>gujen@google.com</owner>
+  <owner>goanuj@google.com</owner>
+  <summary>
+    Recorded when a signed-in user is automatically signed out of the browser
+    due to the BrowserSignin policy being set to 0 (sign-in disabled) by their
+    organization. The sample is always recorded as true.
+  </summary>
+</histogram>
+
+<histogram base="true"
+    name="Enterprise.BrowserSigninIOS.SignInInterruptedByPolicy"
+    enum="BooleanHit" expires_after="2021-06-30">
+  <owner>gujen@google.com</owner>
+  <owner>goanuj@google.com</owner>
+  <summary>
+    Recorded when a user is in the process of signing in to the browser, but is
+    interrupted due to the BrowserSignin policy being set to 0 (sign-in
+    disabled) by their organization. The sample is always recorded as true.
+  </summary>
+</histogram>
+
 <histogram base="true" name="Enterprise.CachedDevicePolicyDeviceIdValidity"
     enum="EnterprisePolicyDeviceIdValidity" expires_after="M95">
   <owner>emaxx@chromium.org</owner>
@@ -268,7 +301,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.CloudExtensionRequestUpdated"
-    enum="EnterpriseCloudExtensionRequestListUpdate" expires_after="2021-02-01">
+    enum="EnterpriseCloudExtensionRequestListUpdate" expires_after="2021-10-01">
   <owner>zmin@chromium.org</owner>
   <owner>src/chrome/browser/enterprise/reporting/OWNERS</owner>
   <summary>
@@ -279,7 +312,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.CloudReportingBasicRequestSize" units="KB"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>zmin@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -290,7 +323,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.CloudReportingRequestCount" units="requests"
-    expires_after="2021-04-04">
+    expires_after="2022-02-01">
   <owner>zmin@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -300,7 +333,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.CloudReportingRequestSize" units="KB"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>zmin@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -310,7 +343,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.CloudReportingResponse"
-    enum="EnterpriseCloudReportingResponse" expires_after="2021-04-04">
+    enum="EnterpriseCloudReportingResponse" expires_after="2022-02-01">
   <owner>zmin@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -333,7 +366,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.DeviceLocalAccountPolicyInvalidations2"
-    enum="EnterprisePolicyInvalidations" expires_after="2021-03-01">
+    enum="EnterprisePolicyInvalidations" expires_after="2021-08-15">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -348,7 +381,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.DeviceLocalAccountPolicyRefresh3"
-    enum="EnterprisePolicyRefresh" expires_after="2021-03-01">
+    enum="EnterprisePolicyRefresh" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -374,7 +407,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.DevicePolicyInvalidations2"
-    enum="EnterprisePolicyInvalidations" expires_after="2021-05-02">
+    enum="EnterprisePolicyInvalidations" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -390,7 +423,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.DevicePolicyRefresh3"
-    enum="EnterprisePolicyRefresh" expires_after="2021-03-01">
+    enum="EnterprisePolicyRefresh" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -405,7 +438,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.DeviceRemoteCommand.Executed"
-    enum="RemoteCommandExecutionStatus" expires_after="2021-03-01">
+    enum="RemoteCommandExecutionStatus" expires_after="2022-03-01">
 <!-- Name completed by histogram_suffixes name="Enterprise.RemoteCommandType". -->
 
   <owner>asumaneev@google.com</owner>
@@ -418,7 +451,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.DeviceRemoteCommand.Executed.Unsigned"
-    enum="RemoteCommandExecutionStatus" expires_after="2021-03-01">
+    enum="RemoteCommandExecutionStatus" expires_after="2022-03-01">
 <!-- Name completed by histogram_suffixes name="Enterprise.RemoteCommandType". -->
 
   <owner>asumaneev@google.com</owner>
@@ -431,7 +464,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.DeviceRemoteCommand.Received"
-    enum="RemoteCommandReceivedStatus" expires_after="2021-03-01">
+    enum="RemoteCommandReceivedStatus" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -443,7 +476,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.DeviceRemoteCommand.Received.Unsigned"
-    enum="RemoteCommandReceivedStatus" expires_after="2021-03-01">
+    enum="RemoteCommandReceivedStatus" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -455,7 +488,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.DeviceRemoteCommandInvalidations"
-    enum="EnterprisePolicyInvalidations" expires_after="2021-03-01">
+    enum="EnterprisePolicyInvalidations" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -472,7 +505,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.DeviceSettings.MissingPolicyMitigated"
-    units="BooleanSuccess" expires_after="2021-01-31">
+    units="BooleanSuccess" expires_after="2021-07-27">
   <owner>poromov@chromium.org</owner>
   <owner>managed-devices@google.com</owner>
   <summary>
@@ -483,7 +516,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.DeviceSettings.UpdatedStatus"
-    enum="DeviceSettingsStatus" expires_after="2021-01-31">
+    enum="DeviceSettingsStatus" expires_after="2021-07-27">
   <owner>poromov@chromium.org</owner>
   <owner>managed-devices@google.com</owner>
   <summary>
@@ -493,8 +526,140 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Enterprise.Dlp.CaptureModeInitBlocked" enum="BooleanBlocked"
+    expires_after="2022-03-01">
+  <owner>poromov@chromium.org</owner>
+  <owner>chromeos-dlp@google.com</owner>
+  <summary>
+    Recorded when capture mode initialization was blocked by Data Leak
+    Prevention.
+  </summary>
+</histogram>
+
+<histogram name="Enterprise.Dlp.ClipboardReadBlocked" enum="BooleanBlocked"
+    expires_after="2022-03-01">
+  <owner>poromov@chromium.org</owner>
+  <owner>chromeos-dlp@google.com</owner>
+  <summary>
+    Result of Data Leak Prevention evaluation for a data read from the
+    clipboard.
+  </summary>
+</histogram>
+
+<histogram name="Enterprise.Dlp.DataTransferControllerStarted" enum="Boolean"
+    expires_after="2022-03-01">
+  <owner>poromov@chromium.org</owner>
+  <owner>chromeos-dlp@google.com</owner>
+  <summary>
+    Recorded when DataTransferController is initialized, meaning that all
+    clipboard and drag-n-drop operations will be affected by Data Leak
+    Prevention checks.
+  </summary>
+</histogram>
+
+<histogram name="Enterprise.Dlp.DlpPolicyPresent" enum="Boolean"
+    expires_after="2022-03-01">
+  <owner>poromov@chromium.org</owner>
+  <owner>chromeos-dlp@google.com</owner>
+  <summary>
+    Recorded when non-empty Data Leak Prevention policy is present and due to
+    that Data Leak Prevention infrastructure is initialized on the client.
+  </summary>
+</histogram>
+
+<histogram name="Enterprise.Dlp.DragDropBlocked" enum="BooleanBlocked"
+    expires_after="2022-03-01">
+  <owner>poromov@chromium.org</owner>
+  <owner>chromeos-dlp@google.com</owner>
+  <summary>
+    Result of Data Leak Prevention evaluation for a drag-n-drop operation.
+  </summary>
+</histogram>
+
+<histogram name="Enterprise.Dlp.FilesDaemonStarted" enum="Boolean"
+    expires_after="2022-03-01">
+  <owner>poromov@chromium.org</owner>
+  <owner>chromeos-dlp@google.com</owner>
+  <summary>
+    Recorded when Data Leak Prevention policy contains Files restrictions and
+    DLP Files daemon is started because of that.
+  </summary>
+</histogram>
+
+<histogram name="Enterprise.Dlp.PrintingBlocked" enum="BooleanBlocked"
+    expires_after="2022-03-01">
+  <owner>poromov@chromium.org</owner>
+  <owner>chromeos-dlp@google.com</owner>
+  <summary>Result of Data Leak Prevention evaluation for printing.</summary>
+</histogram>
+
+<histogram name="Enterprise.Dlp.PrivacyScreenEnforced" enum="BooleanForced"
+    expires_after="2022-03-01">
+  <owner>poromov@chromium.org</owner>
+  <owner>chromeos-dlp@google.com</owner>
+  <summary>
+    Recorded when privacy screen was enforced by Data Leak Prevention.
+  </summary>
+</histogram>
+
+<histogram name="Enterprise.Dlp.RestrictionConfigured"
+    enum="EnterpriseDlpPolicyRestriction" expires_after="2022-03-01">
+  <owner>poromov@chromium.org</owner>
+  <owner>chromeos-dlp@google.com</owner>
+  <summary>
+    Records which types of restrictions are present in Data Leak Prevention
+    policy.
+  </summary>
+</histogram>
+
+<histogram name="Enterprise.Dlp.ScreenShareBlocked" enum="BooleanBlocked"
+    expires_after="2022-03-01">
+  <owner>poromov@chromium.org</owner>
+  <owner>chromeos-dlp@google.com</owner>
+  <summary>
+    Result of Data Leak Prevention evaluation for a screen share.
+  </summary>
+</histogram>
+
+<histogram name="Enterprise.Dlp.ScreenSharePausedOrResumed" enum="Boolean"
+    expires_after="2022-03-01">
+  <owner>poromov@chromium.org</owner>
+  <owner>chromeos-dlp@google.com</owner>
+  <summary>
+    Recorded when screen share was paused (True) or resumed (False) by Data Leak
+    Prevention.
+  </summary>
+</histogram>
+
+<histogram name="Enterprise.Dlp.ScreenshotBlocked" enum="BooleanBlocked"
+    expires_after="2022-03-01">
+  <owner>poromov@chromium.org</owner>
+  <owner>chromeos-dlp@google.com</owner>
+  <summary>
+    Result of Data Leak Prevention evaluation for taking a screenshot.
+  </summary>
+</histogram>
+
+<histogram name="Enterprise.Dlp.VideoCaptureBlocked" enum="BooleanBlocked"
+    expires_after="2022-03-01">
+  <owner>poromov@chromium.org</owner>
+  <owner>chromeos-dlp@google.com</owner>
+  <summary>
+    Result of Data Leak Prevention evaluation for a taking a video capture.
+  </summary>
+</histogram>
+
+<histogram name="Enterprise.Dlp.VideoCaptureInterrupted" enum="Boolean"
+    expires_after="2022-03-01">
+  <owner>poromov@chromium.org</owner>
+  <owner>chromeos-dlp@google.com</owner>
+  <summary>
+    Recorded when video capture was interrupted by Data Leak Prevention.
+  </summary>
+</histogram>
+
 <histogram name="Enterprise.DMServerRequestSuccess"
-    enum="EnterpriseDMServerRequestSuccess" expires_after="2021-04-04">
+    enum="EnterpriseDMServerRequestSuccess" expires_after="2021-08-09">
   <owner>poromov@chromium.org</owner>
   <owner>managed-devices@google.com</owner>
   <summary>
@@ -520,7 +685,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.Enrollment" enum="EnterpriseEnrollmentType"
-    expires_after="2021-03-15">
+    expires_after="2021-08-15">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -529,7 +694,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.EnrollmentAttestationBased"
-    enum="EnterpriseEnrollmentType" expires_after="2021-01-01">
+    enum="EnterpriseEnrollmentType" expires_after="2021-10-01">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -539,7 +704,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.EnrollmentConfiguration"
-    enum="EnterpriseEnrollmentType" expires_after="2021-01-01">
+    enum="EnterpriseEnrollmentType" expires_after="2021-10-01">
   <owner>antrim@chromium.org</owner>
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
@@ -550,7 +715,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.EnrollmentForced" enum="EnterpriseEnrollmentType"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -559,7 +724,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.EnrollmentForcedAttestationBased"
-    enum="EnterpriseEnrollmentType" expires_after="2021-03-15">
+    enum="EnterpriseEnrollmentType" expires_after="2021-07-18">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -569,7 +734,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.EnrollmentForcedInitial"
-    enum="EnterpriseEnrollmentType" expires_after="2021-01-01">
+    enum="EnterpriseEnrollmentType" expires_after="2021-10-01">
   <owner>raleksandrov@google.com</owner>
   <owner>pmarko@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
@@ -580,7 +745,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.EnrollmentForcedInitialAttestationBased"
-    enum="EnterpriseEnrollmentType" expires_after="2021-01-01">
+    enum="EnterpriseEnrollmentType" expires_after="2021-10-01">
   <owner>raleksandrov@google.com</owner>
   <owner>pmarko@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
@@ -591,7 +756,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.EnrollmentForcedInitialManualFallback"
-    enum="EnterpriseEnrollmentType" expires_after="2021-01-01">
+    enum="EnterpriseEnrollmentType" expires_after="2021-10-01">
   <owner>raleksandrov@google.com</owner>
   <owner>pmarko@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
@@ -602,7 +767,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.EnrollmentForcedManualFallback"
-    enum="EnterpriseEnrollmentType" expires_after="2021-01-01">
+    enum="EnterpriseEnrollmentType" expires_after="2021-10-01">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -612,7 +777,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.EnrollmentRecovery" enum="EnterpriseEnrollmentType"
-    expires_after="2021-01-01">
+    expires_after="2021-10-01">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -623,7 +788,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.EnrollmentTime.Cancel" units="ms"
-    expires_after="2021-01-01">
+    expires_after="2021-10-01">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -632,7 +797,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.EnrollmentTime.Failure" units="ms"
-    expires_after="2021-01-01">
+    expires_after="2021-10-01">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -641,7 +806,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.EnrollmentTime.Success" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-08-09">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -652,6 +817,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Enterprise.ExistingInstallAttributesLock"
     enum="EnterpriseExistingInstallAttributesLockType"
     expires_after="2020-07-01">
+  <obsolete>
+    Removed 2020/11.
+  </obsolete>
   <owner>emaxx@chromium.org</owner>
   <owner>poromov@chromium.org</owner>
   <owner>rsorokin@chromium.org</owner>
@@ -690,7 +858,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Enterprise.FCMInvalidationService.DeviceLocalAccountPolicyInvalidations2"
-    enum="EnterprisePolicyInvalidations" expires_after="2021-03-01">
+    enum="EnterprisePolicyInvalidations" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -709,7 +877,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Enterprise.FCMInvalidationService.DeviceLocalAccountPolicyRefresh3"
-    enum="EnterprisePolicyRefresh" expires_after="2021-03-01">
+    enum="EnterprisePolicyRefresh" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -727,7 +895,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.FCMInvalidationService.DevicePolicyInvalidations2"
-    enum="EnterprisePolicyInvalidations" expires_after="2021-03-01">
+    enum="EnterprisePolicyInvalidations" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -745,7 +913,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.FCMInvalidationService.DevicePolicyRefresh3"
-    enum="EnterprisePolicyRefresh" expires_after="2021-03-01">
+    enum="EnterprisePolicyRefresh" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -763,7 +931,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.FCMInvalidationService.PolicyInvalidations"
-    enum="EnterprisePolicyInvalidations" expires_after="2021-03-01">
+    enum="EnterprisePolicyInvalidations" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -778,7 +946,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Enterprise.FCMInvalidationService.PolicyInvalidationsRegistrationResult"
-    enum="BooleanSuccess" expires_after="2021-05-02">
+    enum="BooleanSuccess" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -791,7 +959,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.FCMInvalidationService.PolicyRefresh2"
-    enum="EnterprisePolicyRefresh" expires_after="2021-03-01">
+    enum="EnterprisePolicyRefresh" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -804,7 +972,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.FirstRun.AppRestrictionLoadTime" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>wenyufu@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -815,7 +983,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.FirstRun.AppRestrictionLoadTime.Medium" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>skym@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <owner>wenyufu@chromium.org</owner>
@@ -882,7 +1050,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Enterprise.MachineLevelUserCloudPolicyEnrollment.RequestFailureTime"
-    units="ms" expires_after="2021-05-02">
+    units="ms" expires_after="2021-08-09">
   <owner>rogerta@chromium.org</owner>
   <owner>zmin@chromium.org</owner>
   <summary>
@@ -893,7 +1061,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Enterprise.MachineLevelUserCloudPolicyEnrollment.RequestSuccessTime"
-    units="ms" expires_after="2021-02-01">
+    units="ms" expires_after="2021-06-01">
   <owner>rogerta@chromium.org</owner>
   <owner>zmin@chromium.org</owner>
   <summary>
@@ -904,7 +1072,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Enterprise.MachineLevelUserCloudPolicyEnrollment.Result"
     enum="MachineLevelUserCloudPolicyEnrollmentResult"
-    expires_after="2021-04-04">
+    expires_after="2021-08-01">
   <owner>rogerta@chromium.org</owner>
   <owner>zmin@chromium.org</owner>
   <summary>The result of machine level user cloud policy enrollment.</summary>
@@ -913,7 +1081,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="Enterprise.MachineLevelUserCloudPolicyEnrollment.StartupDialog"
     enum="MachineLevelUserCloudPolicyEnrollmentStartupDialog"
-    expires_after="2021-02-01">
+    expires_after="2021-06-01">
   <owner>rogerta@chromium.org</owner>
   <owner>zmin@chromium.org</owner>
   <summary>
@@ -924,7 +1092,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Enterprise.MachineLevelUserCloudPolicyEnrollment.StartupDialogTime"
-    units="ms" expires_after="2021-02-01">
+    units="ms" expires_after="2021-06-01">
   <owner>rogerta@chromium.org</owner>
   <owner>zmin@chromium.org</owner>
   <summary>
@@ -935,7 +1103,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Enterprise.MachineLevelUserCloudPolicyEnrollment.UnenrollSuccess"
-    enum="BooleanSuccess" expires_after="2021-02-07">
+    enum="BooleanSuccess" expires_after="2021-08-01">
   <owner>domfc@chromium.org</owner>
   <owner>zmin@chromium.org</owner>
   <summary>
@@ -945,7 +1113,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.OnBulkDataEntry.DataSize" units="bytes"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -962,7 +1130,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.Policies" enum="EnterprisePolicies"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>mnissler@chromium.org</owner>
   <summary>
     A set of enterprise policy rules that are in use. This is recorded every 24
@@ -1003,7 +1171,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.PolicyInvalidations"
-    enum="EnterprisePolicyInvalidations" expires_after="2021-05-02">
+    enum="EnterprisePolicyInvalidations" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -1015,7 +1183,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.PolicyInvalidationsRegistrationResult"
-    enum="BooleanSuccess" expires_after="2021-05-02">
+    enum="BooleanSuccess" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -1050,7 +1218,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.PolicyRefresh2" enum="EnterprisePolicyRefresh"
-    expires_after="2021-03-01">
+    expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -1061,24 +1229,31 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.PolicyUpdatePeriod.Device" units="days"
-    expires_after="M90">
+    expires_after="M95">
   <owner>rbock@google.com</owner>
   <owner>igorcov@chromium.org</owner>
-  <summary>Time since last device policy fetch.</summary>
+  <summary>
+    Time since last device policy fetch. Emitted when policies are loaded.
+  </summary>
 </histogram>
 
 <histogram name="Enterprise.PolicyUpdatePeriod.MachineLevelUser" units="days"
     expires_after="M95">
   <owner>zmin@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
-  <summary>Time since last machine level user policy fetch.</summary>
+  <summary>
+    Time since last machine level user policy fetch.. Emitted when policies are
+    loaded.
+  </summary>
 </histogram>
 
 <histogram name="Enterprise.PolicyUpdatePeriod.User" units="days"
-    expires_after="M90">
+    expires_after="M95">
   <owner>rbock@google.com</owner>
   <owner>igorcov@chromium.org</owner>
-  <summary>Time since last user policy fetch.</summary>
+  <summary>
+    Time since last user policy fetch. Emitted when policies are loaded.
+  </summary>
 </histogram>
 
 <histogram name="Enterprise.PolicyUserVerification"
@@ -1101,7 +1276,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.PublicSession.SessionLength" units="minutes"
-    expires_after="2021-03-15">
+    expires_after="2021-07-27">
   <owner>marcgrimme@chromium.org</owner>
   <owner>managed-devices@google.com</owner>
   <summary>
@@ -1126,7 +1301,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.RegularUserSession.SessionLength" units="minutes"
-    expires_after="2021-03-15">
+    expires_after="2021-08-09">
   <owner>marcgrimme@chromium.org</owner>
   <owner>managed-devices@google.com</owner>
   <summary>
@@ -1160,7 +1335,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.RemoteCommandInvalidationsRegistrationResult"
-    enum="BooleanSuccess" expires_after="2021-03-01">
+    enum="BooleanSuccess" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -1183,6 +1358,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Enterprise.StorePolicy.Duration" units="ms"
+    expires_after="2021-08-09">
+  <owner>mpolzer@google.com</owner>
+  <owner>managed-platforms@google.com</owner>
+  <summary>
+    Duration of a call to StorePolicyEx. This histogram is used to find a
+    reasonable timeout for StorePolicyEx calls. (See crbug/1155533.)
+  </summary>
+</histogram>
+
 <histogram name="Enterprise.SystemFeaturesDisableList" enum="SystemFeature"
     expires_after="2021-06-01">
   <owner>ayaelattar@chromium.org</owner>
@@ -1195,13 +1380,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.SystemLogUploadResult"
-    enum="EnterpriseSystemLogUploadResult" expires_after="2021-02-14">
-  <owner>poromov@chromium.org</owner>
+    enum="EnterpriseSystemLogUploadResult" expires_after="2021-08-14">
+  <owner>bmalcolm@chromium.org</owner>
+  <owner>cros-client-wa@google.com</owner>
   <summary>Result of a single attempt to upload system logs.</summary>
 </histogram>
 
 <histogram name="Enterprise.TiclInvalidationService.DevicePolicyInvalidations"
     enum="EnterprisePolicyInvalidations" expires_after="2021-03-01">
+  <obsolete>
+    Removed 2021/01.
+  </obsolete>
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -1216,6 +1405,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Enterprise.TiclInvalidationService.DevicePolicyRefresh2"
     enum="EnterprisePolicyRefresh" expires_after="2021-03-01">
+  <obsolete>
+    Removed 2021/01.
+  </obsolete>
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -1230,6 +1422,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Enterprise.TiclInvalidationService.PolicyInvalidations"
     enum="EnterprisePolicyInvalidations" expires_after="2021-03-01">
+  <obsolete>
+    Removed 2021/01.
+  </obsolete>
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -1245,6 +1440,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="Enterprise.TiclInvalidationService.PolicyInvalidationsRegistrationResult"
     enum="BooleanSuccess" expires_after="2021-03-01">
+  <obsolete>
+    Removed 2021/01.
+  </obsolete>
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -1258,6 +1456,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Enterprise.TiclInvalidationService.PolicyRefresh2"
     enum="EnterprisePolicyRefresh" expires_after="2021-03-01">
+  <obsolete>
+    Removed 2021/01.
+  </obsolete>
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -1307,7 +1508,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.UserPolicyChromeOS.ChildUser.OAuthTokenError"
-    enum="GoogleServiceAuthError" expires_after="2021-03-15">
+    enum="GoogleServiceAuthError" expires_after="2021-08-15">
   <owner>agawronska@chromium.org</owner>
   <owner>michaelpg@chromium.org</owner>
   <summary>Failure reason for OAuth token fetch for child user.</summary>
@@ -1351,7 +1552,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.UserPolicyChromeOS.InitialFetch.OAuth2Error"
-    enum="GoogleServiceAuthError" expires_after="2021-02-16">
+    enum="GoogleServiceAuthError" expires_after="M95">
   <owner>igorcov@chromium.org</owner>
   <owner>asumaneev@google.com</owner>
   <summary>Service error during OAuth2 access token fetch.</summary>
@@ -1374,6 +1575,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Enterprise.UserPolicyChromeOS.SessionAbort"
     enum="EnterpriseUserPolicyChromeOSSessionAbortType"
     expires_after="2020-02-23">
+  <obsolete>
+    Removed 2020/11.
+  </obsolete>
   <owner>emaxx@chromium.org</owner>
   <summary>
     Session abort due to a fatal error of Chrome OS user policy initialization.
@@ -1403,7 +1607,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.UserRemoteCommand.Executed"
-    enum="RemoteCommandExecutionStatus" expires_after="2021-03-01">
+    enum="RemoteCommandExecutionStatus" expires_after="2022-03-01">
 <!-- Name completed by histogram_suffixes name="Enterprise.RemoteCommandType". -->
 
   <owner>asumaneev@google.com</owner>
@@ -1416,7 +1620,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.UserRemoteCommand.Executed.Unsigned"
-    enum="RemoteCommandExecutionStatus" expires_after="2021-03-01">
+    enum="RemoteCommandExecutionStatus" expires_after="2022-03-01">
 <!-- Name completed by histogram_suffixes name="Enterprise.RemoteCommandType". -->
 
   <owner>asumaneev@google.com</owner>
@@ -1429,7 +1633,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.UserRemoteCommand.Received"
-    enum="RemoteCommandReceivedStatus" expires_after="2021-03-01">
+    enum="RemoteCommandReceivedStatus" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -1441,7 +1645,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.UserRemoteCommand.Received.Unsigned"
-    enum="RemoteCommandReceivedStatus" expires_after="2021-05-09">
+    enum="RemoteCommandReceivedStatus" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -1453,7 +1657,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.UserRemoteCommandInvalidations"
-    enum="EnterprisePolicyInvalidations" expires_after="2021-03-01">
+    enum="EnterprisePolicyInvalidations" expires_after="2022-03-01">
   <owner>asumaneev@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -1467,7 +1671,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.UserSession.Logins"
-    enum="EnterpriseUserSessionLogins" expires_after="2021-03-15">
+    enum="EnterpriseUserSessionLogins" expires_after="2021-07-18">
   <owner>xiyuan@chromium.org</owner>
   <owner>sduraisamy@chromium.org</owner>
   <summary>Tracks the sign-in events on an enrolled device.</summary>
@@ -1491,7 +1695,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Enterprise.VpdUpdateStatus" units="units"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>igorcov@chromium.org</owner>
   <owner>tnagel@chromium.org</owner>
   <summary>
@@ -1542,7 +1746,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="EnterpriseCheck.InvalidPolicies" enum="EnterprisePolicies"
-    expires_after="2021-05-09">
+    expires_after="2021-08-09">
   <owner>pastarmovj@chromium.org</owner>
   <summary>
     A set of policy rules that were ignored due to integrity violations while
@@ -1552,7 +1756,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="EnterpriseCheck.InvalidPoliciesDetected"
-    units="disabled policies" expires_after="2021-05-05">
+    units="disabled policies" expires_after="2021-08-09">
   <owner>pastarmovj@chromium.org</owner>
   <owner>zmin@chomium.org</owner>
   <summary>
@@ -1586,7 +1790,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="EnterpriseCheck.IsFullyManaged2" enum="IsFullyManagedBoolean"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>twellington@google.com</owner>
   <owner>tedchcoc@chromium.org</owner>
   <summary>
@@ -1643,7 +1847,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="EnterpriseCheck.Mac.IsCurrentUserDomainUser" enum="Boolean"
-    expires_after="2021-03-21">
+    expires_after="2021-08-09">
   <owner>avi@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -1653,7 +1857,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="EnterpriseCheck.Mac.IsDeviceDomainJoined" enum="Boolean"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>avi@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -1663,7 +1867,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="EnterpriseCheck.Mac.IsDeviceMDMEnrolledNew"
-    enum="EnterpriseMacMDMStatusNew" expires_after="2021-03-21">
+    enum="EnterpriseMacMDMStatusNew" expires_after="2021-08-09">
   <owner>avi@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -1674,7 +1878,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="EnterpriseCheck.Mac.IsDeviceMDMEnrolledOld"
-    enum="EnterpriseMacMDMStatusOld" expires_after="2021-03-21">
+    enum="EnterpriseMacMDMStatusOld" expires_after="2021-08-09">
   <owner>avi@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -1693,7 +1897,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="EnterpriseCheck.OSType" enum="OsSuite"
-    expires_after="2021-05-05">
+    expires_after="2021-07-27">
   <owner>pastarmovj@chromium.org</owner>
   <owner>rogerta@chomium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/event/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/event/histograms.xml
index 3e1e8c50112..9b3b9c79396 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/event/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/event/histograms.xml
@@ -22,8 +22,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="Event.AggregatedLatency.Renderer2" units="microseconds"
-    expires_after="2021-04-04">
-  <owner>tdresser@chromium.org</owner>
+    expires_after="2021-08-09">
+  <owner>flackr@chromium.org</owner>
   <summary>
     Time between initiation of any input event and the renderer receiving and
     starting to process it.
@@ -55,8 +55,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.AsyncTargeting.AsyncClientDepth" units="clients"
-    expires_after="2021-01-31">
-  <owner>yigu@chromium.org</owner>
+    expires_after="2021-08-09">
+  <owner>sadrul@chromium.org</owner>
   <owner>event-targeting@chromium.org</owner>
   <summary>
     Tracks how many clients were queried (asynchronously) to determine the
@@ -65,18 +65,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.AsyncTargeting.ResponseTime" units="ms"
-    expires_after="2021-04-04">
-  <owner>yigu@chromium.org</owner>
+    expires_after="2021-08-09">
+  <owner>sadrul@chromium.org</owner>
+  <owner>event-targeting@chromium.org</owner>
   <summary>
     Tracks how long it takes for a client to respond to an asynchronous request
     to find a target for an input event.
-
-    Team: event-targeting@chromium.org.
   </summary>
 </histogram>
 
 <histogram name="Event.BrowserVerifiedUserActivation" enum="BooleanSuccess"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>liviutinta@chromium.org</owner>
   <owner>mustaq@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
@@ -127,7 +126,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Event.FractionOfTimeWithoutUserInput" units="%"
     expires_after="2021-06-16">
-  <owner>tdresser@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
     For each 10 second window, reports the fraction of the time there was no
@@ -216,7 +215,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.InputEventPrediction.Scroll.OverPrediction"
-    units="pixels" expires_after="M85">
+    units="pixels" expires_after="M97">
   <owner>eirage@chromium.org</owner>
   <owner>axantoine@google.com</owner>
   <summary>
@@ -229,7 +228,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.InputEventPrediction.Scroll.PredictionJitter"
-    units="pixels" expires_after="M85">
+    units="pixels" expires_after="M97">
   <owner>eirage@chromium.org</owner>
   <owner>axantoine@google.com</owner>
   <summary>
@@ -243,7 +242,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.InputEventPrediction.Scroll.UnderPrediction"
-    units="pixels" expires_after="M85">
+    units="pixels" expires_after="M97">
   <owner>eirage@chromium.org</owner>
   <owner>axantoine@google.com</owner>
   <summary>
@@ -256,7 +255,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.InputEventPrediction.Scroll.VisualJitter" units="pixels"
-    expires_after="M85">
+    expires_after="M97">
   <owner>eirage@chromium.org</owner>
   <owner>axantoine@google.com</owner>
   <summary>
@@ -269,7 +268,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.InputEventPrediction.Scroll.WrongDirection"
-    enum="Boolean" expires_after="M85">
+    enum="Boolean" expires_after="M97">
   <owner>eirage@chromium.org</owner>
   <owner>axantoine@google.com</owner>
   <summary>
@@ -282,8 +281,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.EndToEnd.KeyPress" units="microseconds"
-    expires_after="2021-05-09">
-  <owner>tdresser@chromium.org</owner>
+    expires_after="2021-07-11">
+  <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Time between the OS receiving a keyboard event and the resulting GPU frame
@@ -325,7 +324,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.EndToEnd.TouchpadPinch2" units="microseconds"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>nzolghadr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
@@ -345,7 +344,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.HitTest" units="microseconds"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>schenney@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -364,7 +363,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.HitTestRecursive" units="microseconds"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>schenney@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -382,11 +381,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.OS" units="microseconds"
-    expires_after="2020-11-01">
-  <owner>tdresser@chromium.org</owner>
+    expires_after="2021-12-01">
+  <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
-    Time between input event received by OS and sent to Chrome.
+    Time between input event received by OS and sent to Chrome, recorded for
+    each event when it is received by Chrome.
 
     Warning: This metric may include reports from clients with low-resolution
     clocks (i.e. on Windows, ref. |TimeTicks::IsHighResolution()|). Such reports
@@ -397,7 +397,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.OS_NO_VALIDATION.POSITIVE" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-08-09">
   <owner>sullivan@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
@@ -411,8 +411,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.Scroll.Wheel.TimeToHandled2"
-    units="microseconds" expires_after="2021-06-16">
-  <owner>tdresser@chromium.org</owner>
+    units="microseconds" expires_after="2021-08-15">
+  <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Time between initial creation of a wheel event and the generated
@@ -433,7 +433,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Event.Latency.Scroll.Wheel.TimeToScrollUpdateSwapBegin2"
     units="microseconds" expires_after="2020-06-21">
-  <owner>tdresser@chromium.org</owner>
+  <obsolete>
+    Removed 2021-01-14 - replaced by Event.Latency.Scroll(Begin|Update).Wheel.*.
+  </obsolete>
+  <owner>flackr@chromium.org</owner>
   <summary>
     Time between initial creation of a wheel event and start of the frame swap
     on the GPU service caused by the generated ScrollUpdate gesture event. If no
@@ -453,8 +456,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Event.Latency.ScrollBegin.Scrollbar.BrowserNotifiedToBeforeGpuSwap2"
-    units="microseconds" expires_after="2021-04-11">
-  <owner>nzolghadr@chromium.org</owner>
+    units="microseconds" expires_after="2021-12-01">
+  <owner>flackr@chromium.org</owner>
   <owner>dlibby@microsoft.com</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
@@ -470,7 +473,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollBegin.Scrollbar.GpuSwap2"
-    units="microseconds" expires_after="2021-04-25">
+    units="microseconds" expires_after="2021-06-27">
   <owner>nzolghadr@chromium.org</owner>
   <owner>dlibby@microsoft.com</owner>
   <owner>input-dev@chromium.org</owner>
@@ -550,7 +553,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Event.Latency.ScrollBegin.Scrollbar.TimeToScrollUpdateSwapBegin4"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-08-09">
   <owner>nzolghadr@chromium.org</owner>
   <owner>dlibby@microsoft.com</owner>
   <owner>input-dev@chromium.org</owner>
@@ -574,7 +577,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollBegin.TimeToScrollUpdateSwapBegin2"
-    units="microseconds" expires_after="2021-05-09">
+    units="microseconds" expires_after="2021-07-11">
   <owner>nzolghadr@chromium.org</owner>
   <summary>
     Time between initial creation of a wheel/touch event and start of the frame
@@ -599,7 +602,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollBegin.Touch.AverageLag" units="pixels"
-    expires_after="M86">
+    expires_after="M97">
   <owner>flackr@chromium.org</owner>
   <owner>joalmei@microsoft.com</owner>
   <owner>input-dev@chromium.org</owner>
@@ -617,7 +620,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollBegin.Touch.AverageLagPresentation"
-    units="pixels" expires_after="M86">
+    units="pixels" expires_after="M97">
   <owner>flackr@chromium.org</owner>
   <owner>joalmei@microsoft.org</owner>
   <owner>input-dev@chromium.org</owner>
@@ -641,8 +644,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Event.Latency.ScrollBegin.Touch.BrowserNotifiedToBeforeGpuSwap2"
-    units="microseconds" expires_after="2020-12-06">
-  <owner>tdresser@chromium.org</owner>
+    units="microseconds" expires_after="2021-12-01">
+  <owner>flackr@chromium.org</owner>
+  <owner>input-dev@chromium.org</owner>
   <summary>
     Time between the browser receives the notification of the first ScrollUpdate
     gesture event in a given scroll gesture event sequence with touch source
@@ -653,8 +657,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollBegin.Touch.GpuSwap2" units="microseconds"
-    expires_after="2021-04-04">
-  <owner>tdresser@chromium.org</owner>
+    expires_after="2021-08-09">
+  <owner>flackr@chromium.org</owner>
   <summary>
     Time between gpu starts to swap the first ScrollUpdate gesture event in a
     given scroll gesture event sequence with touch source induced frame and the
@@ -672,7 +676,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Event.Latency.ScrollBegin.Touch.HandledToRendererSwap2"
     units="microseconds" expires_after="2021-06-16">
-  <owner>tdresser@chromium.org</owner>
+  <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Time between the first ScrollBegin gesture event in a given scroll gesture
@@ -692,7 +696,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="Event.Latency.ScrollBegin.Touch.RendererSwapToBrowserNotified2"
     units="microseconds" expires_after="2021-06-16">
-  <owner>tdresser@chromium.org</owner>
+  <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Time between the renderer starts to swap a frame induced by the first
@@ -704,8 +708,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollBegin.Touch.TimeToHandled2"
-    units="microseconds" expires_after="2021-04-19">
-  <owner>tdresser@chromium.org</owner>
+    units="microseconds" expires_after="2021-08-22">
+  <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Time between initial creation of a touch event and the first generated
@@ -724,8 +728,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollBegin.Touch.TimeToScrollUpdateSwapBegin4"
-    units="microseconds" expires_after="2021-06-16">
-  <owner>tdresser@chromium.org</owner>
+    units="microseconds" expires_after="2021-08-15">
+  <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
@@ -747,8 +751,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Event.Latency.ScrollBegin.Wheel.BrowserNotifiedToBeforeGpuSwap2"
-    units="microseconds" expires_after="2020-11-29">
-  <owner>tdresser@chromium.org</owner>
+    units="microseconds" expires_after="2021-12-01">
+  <owner>flackr@chromium.org</owner>
+  <owner>input-dev@chromium.org</owner>
   <summary>
     Time between the browser receives the notification of the first ScrollUpdate
     gesture event in a given scroll gesture event sequence with wheel source
@@ -760,7 +765,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Event.Latency.ScrollBegin.Wheel.GpuSwap2" units="microseconds"
     expires_after="2021-06-16">
-  <owner>tdresser@chromium.org</owner>
+  <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Time between gpu starts to swap the first ScrollUpdate gesture event in a
@@ -779,7 +784,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Event.Latency.ScrollBegin.Wheel.HandledToRendererSwap2"
     units="microseconds" expires_after="2021-07-16">
-  <owner>tdresser@chromium.org</owner>
+  <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Time between the first ScrollUpdate gesture event in a given scroll gesture
@@ -799,7 +804,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="Event.Latency.ScrollBegin.Wheel.RendererSwapToBrowserNotified2"
     units="microseconds" expires_after="2021-07-13">
-  <owner>tdresser@chromium.org</owner>
+  <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Time between the renderer starts to swap a frame induced by the first
@@ -812,7 +817,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Event.Latency.ScrollBegin.Wheel.TimeToHandled2"
     units="microseconds" expires_after="2021-06-26">
-  <owner>tdresser@chromium.org</owner>
+  <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Time between initial creation of a wheel event and the first generated
@@ -831,8 +836,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollBegin.Wheel.TimeToScrollUpdateSwapBegin4"
-    units="microseconds" expires_after="2021-04-25">
-  <owner>tdresser@chromium.org</owner>
+    units="microseconds" expires_after="2021-06-27">
+  <owner>flackr@chromium.org</owner>
   <summary>
     Time between initial creation of a wheel event and the start of the frame
     swap on the GPU service caused by the generated ScrollUpdate gesture event
@@ -851,8 +856,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Event.Latency.ScrollInertial.Touch.BrowserNotifiedToBeforeGpuSwap2"
-    units="microseconds" expires_after="M80">
-  <owner>nzolghad@chromium.org</owner>
+    units="microseconds" expires_after="2021-12-01">
+  <owner>flackr@chromium.org</owner>
+  <owner>input-dev@chromium.org</owner>
   <summary>
     Time between the browser receives the notification of a ScrollUpdate gesture
     generated from a touchscreen fling induced renderer swap and GPU starts to
@@ -928,9 +934,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Event.Latency.ScrollUpdate.Scrollbar.BrowserNotifiedToBeforeGpuSwap2"
-    units="microseconds" expires_after="2020-12-01">
-  <owner>nzolghadr@chromium.org</owner>
-  <owner>dlibby@microsoft.com</owner>
+    units="microseconds" expires_after="2021-12-01">
+  <owner>flackr@chromium.org</owner>
+  <owner>arakeri@microsoft.com</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Time between the display compositor receives the notification of the first
@@ -945,9 +951,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollUpdate.Scrollbar.GpuSwap2"
-    units="microseconds" expires_after="2020-12-01">
-  <owner>nzolghadr@chromium.org</owner>
-  <owner>dlibby@microsoft.com</owner>
+    units="microseconds" expires_after="2021-12-01">
+  <owner>flackr@chromium.org</owner>
+  <owner>arakeri@microsoft.com</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Time between gpu starts to swap a ScrollUpdate gesture event with scrollbar
@@ -964,9 +970,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollUpdate.Scrollbar.HandledToRendererSwap2"
-    units="microseconds" expires_after="2020-12-01">
-  <owner>nzolghadr@chromium.org</owner>
-  <owner>dlibby@microsoft.com</owner>
+    units="microseconds" expires_after="2021-12-01">
+  <owner>flackr@chromium.org</owner>
+  <owner>arakeri@microsoft.com</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Time between the ScrollUpdate gesture event with scrollbar source, is
@@ -985,9 +991,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Event.Latency.ScrollUpdate.Scrollbar.RendererSwapToBrowserNotified2"
-    units="microseconds" expires_after="2020-12-01">
-  <owner>nzolghadr@chromium.org</owner>
-  <owner>dlibby@microsoft.com</owner>
+    units="microseconds" expires_after="2021-12-01">
+  <owner>flackr@chromium.org</owner>
+  <owner>arakeri@microsoft.com</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Time between the renderer starts to swap a frame (generates compositor
@@ -1002,9 +1008,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollUpdate.Scrollbar.TimeToHandled2"
-    units="microseconds" expires_after="2020-12-01">
-  <owner>nzolghadr@chromium.org</owner>
-  <owner>dlibby@microsoft.com</owner>
+    units="microseconds" expires_after="2021-12-01">
+  <owner>flackr@chromium.org</owner>
+  <owner>arakeri@microsoft.com</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Time between initial creation of an input event that results in a scrollbar
@@ -1024,9 +1030,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Event.Latency.ScrollUpdate.Scrollbar.TimeToScrollUpdateSwapBegin4"
-    units="microseconds" expires_after="2021-04-04">
-  <owner>nzolghadr@chromium.org</owner>
-  <owner>dlibby@microsoft.com</owner>
+    units="microseconds" expires_after="2021-12-01">
+  <owner>flackr@chromium.org</owner>
+  <owner>arakeri@microsoft.com</owner>
   <owner>input-dev@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
@@ -1047,7 +1053,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollUpdate.TimeToScrollUpdateSwapBegin2"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-08-09">
   <owner>nzolghadr@chromium.org</owner>
   <summary>
     Time between initial creation of a wheel/touch event and start of the frame
@@ -1071,7 +1077,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollUpdate.Touch.AverageLag" units="pixels"
-    expires_after="M86">
+    expires_after="M97">
   <owner>flackr@chromium.org</owner>
   <owner>joalmei@microsoft.com</owner>
   <owner>input-dev@chromium.org</owner>
@@ -1089,7 +1095,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Event.Latency.ScrollUpdate.Touch.AverageLag.PredictionNegative"
-    units="pixels" expires_after="M86">
+    units="pixels" expires_after="M97">
   <owner>flackr@chromium.org</owner>
   <owner>joalmei@microsoft.com</owner>
   <owner>input-dev@chromium.org</owner>
@@ -1111,7 +1117,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Event.Latency.ScrollUpdate.Touch.AverageLag.PredictionPositive"
-    units="pixels" expires_after="M86">
+    units="pixels" expires_after="M97">
   <owner>flackr@chromium.org</owner>
   <owner>joalmei@microsoft.com</owner>
   <owner>input-dev@chromium.org</owner>
@@ -1132,7 +1138,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollUpdate.Touch.AverageLagPresentation"
-    units="pixels" expires_after="M86">
+    units="pixels" expires_after="M97">
   <owner>flackr@chromium.org</owner>
   <owner>joalmei@microsoft.com</owner>
   <owner>input-dev@chromium.org</owner>
@@ -1154,7 +1160,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Event.Latency.ScrollUpdate.Touch.AverageLagPresentation.PredictionNegative"
-    units="pixels" expires_after="M86">
+    units="pixels" expires_after="M97">
   <owner>flackr@chromium.org</owner>
   <owner>joalmei@microsoft.com</owner>
   <owner>input-dev@chromium.org</owner>
@@ -1180,7 +1186,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Event.Latency.ScrollUpdate.Touch.AverageLagPresentation.PredictionPositive"
-    units="pixels" expires_after="M86">
+    units="pixels" expires_after="M97">
   <owner>flackr@chromium.org</owner>
   <owner>joalmei@microsoft.com</owner>
   <owner>input-dev@chromium.org</owner>
@@ -1206,8 +1212,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Event.Latency.ScrollUpdate.Touch.BrowserNotifiedToBeforeGpuSwap2"
-    units="microseconds" expires_after="M85">
-  <owner>tdresser@chromium.org</owner>
+    units="microseconds" expires_after="2021-12-01">
+  <owner>flackr@chromium.org</owner>
+  <owner>input-dev@chromium.org</owner>
   <summary>
     Time between the browser receives the notification of a ScrollUpdate gesture
     event with touch source induced renderer swap and GPU starts to swap.
@@ -1217,8 +1224,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollUpdate.Touch.GpuSwap2"
-    units="microseconds" expires_after="2021-04-05">
-  <owner>tdresser@chromium.org</owner>
+    units="microseconds" expires_after="2021-08-09">
+  <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Time between gpu starts to swap a ScrollUpdate gesture event with touch
@@ -1235,11 +1242,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollUpdate.Touch.HandledToRendererSwap2"
-    units="microseconds" expires_after="2020-12-06">
-  <owner>tdresser@chromium.org</owner>
+    units="microseconds" expires_after="2021-12-01">
+  <owner>flackr@chromium.org</owner>
+  <owner>input-dev@chromium.org</owner>
   <summary>
     Time between the ScrollUpdate gesture event with touch source, is handled on
     main/impl thread (specified by suffix) and before renderer starts to swap.
+    This is recorded each time a user touch scroll is swapped to the display.
 
     Team: input-dev@chromium.org.
 
@@ -1253,8 +1262,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Event.Latency.ScrollUpdate.Touch.RendererSwapToBrowserNotified2"
-    units="microseconds" expires_after="2021-04-19">
-  <owner>tdresser@chromium.org</owner>
+    units="microseconds" expires_after="2021-08-22">
+  <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Time between the renderer starts to swap a frame induced by ScrollUpdate
@@ -1265,8 +1274,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollUpdate.Touch.TimeToHandled2"
-    units="microseconds" expires_after="2021-04-11">
-  <owner>tdresser@chromium.org</owner>
+    units="microseconds" expires_after="2021-08-15">
+  <owner>flackr@chromium.org</owner>
   <summary>
     Time between initial creation of a touch event and the generated
     ScrollUpdate gesture event is handled on main/impl thread (specified by
@@ -1287,7 +1296,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     units="microseconds" expires_after="never">
 <!-- expires-never: guiding metric (internal: go/chrome-browser-guiding-metrics) -->
 
-  <owner>tdresser@chromium.org</owner>
+  <owner>flackr@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <owner>chrome-analysis-team@google.com</owner>
@@ -1310,8 +1320,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Event.Latency.ScrollUpdate.Wheel.BrowserNotifiedToBeforeGpuSwap2"
-    units="microseconds" expires_after="2020-12-06">
-  <owner>tdresser@chromium.org</owner>
+    units="microseconds" expires_after="2021-12-01">
+  <owner>flackr@chromium.org</owner>
+  <owner>input-dev@chromium.org</owner>
   <summary>
     Time between the browser receives the notification of a ScrollUpdate gesture
     event with wheel source induced renderer swap and GPU starts to swap.
@@ -1322,7 +1333,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Event.Latency.ScrollUpdate.Wheel.GpuSwap2"
     units="microseconds" expires_after="2021-06-16">
-  <owner>tdresser@chromium.org</owner>
+  <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Time between gpu starts to swap a ScrollUpdate gesture event with wheel
@@ -1339,11 +1350,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollUpdate.Wheel.HandledToRendererSwap2"
-    units="microseconds" expires_after="2020-12-27">
-  <owner>tdresser@chromium.org</owner>
+    units="microseconds" expires_after="2021-06-16">
+  <owner>flackr@chromium.org</owner>
+  <owner>input-dev@chromium.org</owner>
   <summary>
     Time between the ScrollUpdate gesture event with wheel source, is handled on
     main/impl thread (specified by suffix) and before renderer starts to swap.
+    This is recorded each time the user scrolls the mouse wheel when that frame
+    is swapped to the display.
 
     Team: input-dev@chromium.org.
 
@@ -1358,8 +1372,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="Event.Latency.ScrollUpdate.Wheel.RendererSwapToBrowserNotified2"
     units="microseconds" expires_after="2021-07-13">
-  <owner>tdresser@chromium.org</owner>
-  <owner>input@chromium.org</owner>
+  <owner>flackr@chromium.org</owner>
+  <owner>input-dev@chromium.org</owner>
   <summary>
     Time between the renderer starts to swap a frame induced by ScrollUpdate
     gesture event with wheel source, and browser receives the swap notification.
@@ -1369,14 +1383,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollUpdate.Wheel.TimeToHandled2"
-    units="microseconds" expires_after="2021-01-17">
-  <owner>tdresser@chromium.org</owner>
+    units="microseconds" expires_after="2021-12-01">
+  <owner>flackr@chromium.org</owner>
+  <owner>input-dev@chromium.org</owner>
   <summary>
     Time between initial creation of a wheel event and the generated
     ScrollUpdate gesture event is handled on main/impl thread (specified by
     suffix). If no swap was induced by the ScrollUpdate gesture event, no
     recording is made. The first GSU of every scrolling sequence is excluded
-    from this metric.
+    from this metric. This is recorded at the point when the frame has been
+    swapped to the screen for every wheel scroll except the first one.
 
     Team: input-dev@chromium.org.
 
@@ -1389,8 +1405,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Latency.ScrollUpdate.Wheel.TimeToScrollUpdateSwapBegin4"
-    units="microseconds" expires_after="2021-04-25">
-  <owner>tdresser@chromium.org</owner>
+    units="microseconds" expires_after="2021-06-27">
+  <owner>flackr@chromium.org</owner>
   <summary>
     Time between initial creation of a wheel event and start of the frame swap
     on the GPU service caused by the generated ScrollUpdate gesture event. If no
@@ -1421,7 +1437,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.PassiveListeners" enum="EventResultType"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>dtapuska@chromium.org</owner>
   <summary>
     The result of handling of MouseWheel, TouchStart, TouchMove, TouchEnd events
@@ -1431,8 +1447,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Event.SingleTapType" enum="TapDelayType" expires_after="M85">
-  <owner>tdresser@chromium.org</owner>
+<histogram name="Event.SingleTapType" enum="TapDelayType" expires_after="M97">
+  <owner>flackr@chromium.org</owner>
+  <owner>input-dev@chromium.org</owner>
   <summary>
     On non-mobile sites, gesture taps are delayed to prevent double taps from
     sending a click event. This stat counts the number of taps that are delayed
@@ -1470,8 +1487,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Touch.TimedOutOnDesktopSite" enum="BooleanTimedOut"
-    expires_after="2021-06-15">
-  <owner>tdresser@chromium.org</owner>
+    expires_after="2021-08-15">
+  <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     On non-mobile-optimized (desktop) sites, whether the ack response from the
@@ -1483,8 +1500,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.Touch.TimedOutOnMobileSite" enum="BooleanTimedOut"
-    expires_after="2021-06-15">
-  <owner>tdresser@chromium.org</owner>
+    expires_after="2021-08-15">
+  <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     On mobile-optimized sites, whether the ack response from the renderer for
@@ -1497,7 +1514,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Event.TouchDuration" units="ms" expires_after="M77">
   <owner>kuscher@google.com</owner>
-  <owner>tdresser@chromium.org</owner>
+  <owner>flackr@chromium.org</owner>
   <summary>
     The duration of a touch-sequence. Only measured for single finger gestures.
     This replaces Ash.TouchDuration2, which did not record events on Android and
@@ -1509,7 +1526,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Event.TouchMaxDistance" units="pixels" expires_after="M77">
   <owner>kuscher@google.com</owner>
-  <owner>tdresser@chromium.org</owner>
+  <owner>flackr@chromium.org</owner>
   <summary>
     The maximum euclidean distance in dips (device independent pixel) which a
     touch point has travelled away from its starting point. Only measured for
@@ -1604,7 +1621,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.UserActivation.TriggerFor{ActivationGatedApiType}"
-    enum="UserActivationTriggerEnum" expires_after="2021-03-31">
+    enum="UserActivationTriggerEnum" expires_after="2021-09-30">
   <owner>mustaq@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
@@ -1620,13 +1637,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Event.VizHitTest.AsyncHitTestReasons"
-    enum="AsyncHitTestReasons" expires_after="2021-04-25">
-  <owner>yigu@chromium.org</owner>
+    enum="AsyncHitTestReasons" expires_after="2021-08-09">
+  <owner>sadrul@chromium.org</owner>
+  <owner>event-targeting@chromium.org</owner>
   <summary>
     Tracks the reasons why sychronous hit testing could not be done for each hit
     test requests processd by HitTestQuery.
-
-    Team: event-targeting@chromium.org.
   </summary>
 </histogram>
 
@@ -1640,8 +1656,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Event.WaylandDragDrop.IncomingDataTransferTime" units="ms"
+    expires_after="M90">
+  <owner>rjkroege@chromium.org</owner>
+  <owner>adunaev@igalia.com</owner>
+  <summary>
+    Delay between the drag coming into the window and the window is actually
+    notified.
+  </summary>
+</histogram>
+
 <histogram base="true" name="EventLatency" units="microseconds"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>mohsen@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/extension/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/extension/histograms.xml
index 36f82932374..e31cda206cf 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/extension/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/extension/histograms.xml
@@ -177,7 +177,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ExtensionOverrideBubble.SettingsApiUserSelectionHomePage"
-    enum="ExtensionBubbleAction" expires_after="2021-04-01">
+    enum="ExtensionBubbleAction" expires_after="2021-08-09">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/extensions/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/extensions/histograms.xml
index 62100658875..caf4c4d52b7 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/extensions/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/extensions/histograms.xml
@@ -32,7 +32,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ActiveScriptController.DeniedExtensions"
-    units="Extension Count" expires_after="2021-06-01">
+    units="Extension Count" expires_after="2021-08-01">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -42,7 +42,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ActiveScriptController.PermittedExtensions"
-    units="Extension Count" expires_after="2021-06-01">
+    units="Extension Count" expires_after="2021-08-01">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -252,14 +252,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.BookmarkAppLaunchContainer"
-    enum="AppLaunchContainer" expires_after="2021-01-31">
+    enum="AppLaunchContainer" expires_after="2021-07-31">
   <owner>benwells@chromium.org</owner>
   <owner>dominickn@chromium.org</owner>
-  <summary>Records the container used for a bookmark app launch.</summary>
+  <owner>phillis@chromium.org</owner>
+  <summary>
+    Records the container used for a bookmark app launch, when the app is
+    launched (eg. via UI surfaces or intents). Not recorded when the web app is
+    navigated to via URL.
+  </summary>
 </histogram>
 
 <histogram name="Extensions.BookmarkAppLaunchSource" enum="AppLaunchSource"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>benwells@chromium.org</owner>
   <owner>dominickn@chromium.org</owner>
   <owner>mgiuca@chromium.org</owner>
@@ -354,7 +359,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ContentVerification.ComputeHashesOnInstallResult"
-    enum="BooleanSuccess" expires_after="2021-05-02">
+    enum="BooleanSuccess" expires_after="2021-08-09">
   <owner>burunduk@chromium.org</owner>
   <owner>lazyboy@chromium.org</owner>
   <owner>rdevlin.cronin@chromium.org</owner>
@@ -370,7 +375,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ContentVerification.ComputeHashesOnInstallTime"
-    units="ms" expires_after="2021-05-02">
+    units="ms" expires_after="2021-08-09">
   <owner>burunduk@chromium.org</owner>
   <owner>lazyboy@chromium.org</owner>
   <owner>rdevlin.cronin@chromium.org</owner>
@@ -384,7 +389,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ContentVerification.FetchFailureError"
-    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-03-30">
+    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-08-01">
   <owner>burunduk@chromium.org</owner>
   <owner>lazyboy@chromium.org</owner>
   <owner>rdevlin.cronin@chromium.org</owner>
@@ -398,7 +403,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ContentVerification.FetchResult"
-    enum="BooleanSuccess" expires_after="2021-03-28">
+    enum="BooleanSuccess" expires_after="2021-08-09">
   <owner>lazyboy@chromium.org</owner>
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
@@ -499,7 +504,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.CorruptPolicyExtensionDetected3"
-    enum="ExtensionPolicyReinstallReason" expires_after="2021-03-28">
+    enum="ExtensionPolicyReinstallReason" expires_after="2021-08-01">
   <owner>burunduk@chromium.org</owner>
   <owner>lazyboy@chromium.org</owner>
   <owner>poromov@chromium.org</owner>
@@ -516,7 +521,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.CorruptPolicyExtensionResolved" units="ms"
-    expires_after="2021-03-28">
+    expires_after="2021-08-09">
   <owner>burunduk@chromium.org</owner>
   <owner>lazyboy@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
@@ -577,19 +582,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.DeclarativeNetRequest.CreateVerifiedMatcherTime"
-    units="ms" expires_after="2021-05-02">
+    units="ms" expires_after="2021-07-11">
   <owner>karandeepb@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
     Measures the time taken to load a single indexed ruleset in the browser
     process for an extension. This includes reading the indexed ruleset file and
-    verifying it. Emitted whenever a single extension ruleset is loaded.
+    verifying it. Emitted whenever a single file-backed extension ruleset is
+    loaded.
   </summary>
 </histogram>
 
 <histogram
     name="Extensions.DeclarativeNetRequest.EvaluateBeforeRequestTime.SingleExtension2"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-08-09">
   <owner>karandeepb@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -602,7 +608,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Extensions.DeclarativeNetRequest.EvaluateRequestTime.AllExtensions3"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-08-09">
   <owner>karandeepb@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -615,7 +621,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.DeclarativeNetRequest.IndexAndPersistRulesTime"
-    units="ms" expires_after="2021-05-02">
+    units="ms" expires_after="2021-08-22">
   <owner>karandeepb@chromium.org</owner>
   <owner>lazyboy@chromium.org</owner>
   <summary>
@@ -627,7 +633,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.DeclarativeNetRequest.IsLargeRegexRule"
-    enum="RegexRuleStatus" expires_after="2021-03-31">
+    enum="RegexRuleStatus" expires_after="2021-05-30">
   <owner>karandeepb@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -637,7 +643,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.DeclarativeNetRequest.LoadRulesetResult"
-    enum="LoadRulesetResult" expires_after="2021-05-02">
+    enum="LoadRulesetResult" expires_after="2021-07-11">
   <owner>karandeepb@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -647,7 +653,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.DeclarativeNetRequest.ManifestEnabledRulesCount2"
-    units="rules" expires_after="2021-03-31">
+    units="rules" expires_after="2021-08-22">
   <owner>karandeepb@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -670,7 +676,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.DeclarativeNetRequest.ReadDynamicRulesJSONStatus"
-    enum="ReadDynamicRulesJSONStatus" expires_after="2020-12-30">
+    enum="ReadDynamicRulesJSONStatus" expires_after="2021-06-01">
   <owner>karandeepb@chromium.org</owner>
   <owner>rdevlin.cronin@chromium.org</owner>
   <summary>
@@ -754,7 +760,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.DeclarativeNetRequest.RulesetReindexSuccessful"
-    enum="BooleanSuccess" expires_after="2020-12-30">
+    enum="BooleanSuccess" expires_after="2021-06-01">
   <owner>karandeepb@chromium.org</owner>
   <owner>lazyboy@chromium.org</owner>
   <summary>
@@ -766,7 +772,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.DeclarativeNetRequest.UpdateDynamicRulesStatus"
-    enum="UpdateDynamicRulesStatus" expires_after="2020-12-30">
+    enum="UpdateDynamicRulesStatus" expires_after="2021-06-01">
   <owner>karandeepb@chromium.org</owner>
   <owner>rdevlin.cronin@chromium.org</owner>
   <summary>
@@ -955,7 +961,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.DisableReason" enum="ExtensionDisableReason"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -1121,18 +1127,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ExtensionAddDisabledRemotelyReason"
-    enum="ExtensionUpdateCheckDataKey" expires_after="2021-04-04">
+    enum="ExtensionUpdateCheckDataKey" expires_after="2021-08-09">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
-    Recorded when an extension is already disabled and a new disable reason is
-    added to the extension. The new disable reason is retrieved from the update
-    service data key reasons during an update check for extensions.
+    Recorded when a new violation is retrieved from Omaha for an extension. The
+    new violation reason is retrieved from the update service data key reasons
+    during an update check for extensions.
   </summary>
 </histogram>
 
 <histogram name="Extensions.ExtensionCacheCount" units="units"
-    expires_after="2021-01-31">
+    expires_after="2021-05-30">
   <owner>burunduk@chromium.org</owner>
   <owner>snijhara@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1143,7 +1149,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ExtensionCacheSize" units="MB"
-    expires_after="2021-01-31">
+    expires_after="2021-05-30">
   <owner>burunduk@chromium.org</owner>
   <owner>snijhara@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1154,13 +1160,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ExtensionDisabledRemotely"
-    enum="ExtensionUpdateCheckDataKey" expires_after="2021-04-04">
+    enum="ExtensionUpdateCheckDataKey" expires_after="2021-08-09">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
-    The update service data key reasons that the update service encounters
-    during an update check session using update client when disabling an
-    extension.
+    Recorded when an extension that was previously enabled is disabled due to a
+    new violation retrieved from Omaha. This is recorded when the violation is
+    detected when Chrome checks for an update for the extension.
   </summary>
 </histogram>
 
@@ -1187,7 +1193,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ExtensionReenabledRemotely" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-08-15">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1229,7 +1235,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ExtensionUninstalled" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-07-11">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>An extension has been uninstalled.</summary>
@@ -1309,7 +1315,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledAndBlackListed" units="count"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>swapnilgupta@google.com</owner>
   <owner>burunduk@chromium.org</owner>
   <owner>managed-devices@google.com</owner>
@@ -1322,7 +1328,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Extensions.ForceInstalledCacheStatus"
     enum="ExtensionInstallationDownloadingCacheStatus"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>swapnilgupta@google.com</owner>
   <owner>burunduk@chromium.org</owner>
   <owner>poromov@chromium.org</owner>
@@ -1333,7 +1339,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledCreationStage"
-    enum="ExtensionInstallCreationStage" expires_after="2021-04-18">
+    enum="ExtensionInstallCreationStage" expires_after="2021-08-22">
   <owner>swapnilgupta@google.com</owner>
   <owner>burunduk@chromium.org</owner>
   <owner>managed-devices@google.com</owner>
@@ -1348,7 +1354,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledDownloadingStage"
-    enum="ExtensionInstallationDownloadingStage" expires_after="2021-03-28">
+    enum="ExtensionInstallationDownloadingStage" expires_after="2021-08-01">
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1364,7 +1370,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Extensions.ForceInstalledFailureCacheStatus"
     enum="ExtensionInstallationDownloadingCacheStatus"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1378,7 +1384,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledFailureCrxInstallError"
-    enum="ExtensionInstallationCrxInstallError" expires_after="2021-03-28">
+    enum="ExtensionInstallationCrxInstallError" expires_after="2021-08-01">
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1391,7 +1397,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledFailureManifestInvalidAppStatusError"
-    enum="ManifestInvalidAppStatusError" expires_after="2021-03-15">
+    enum="ManifestInvalidAppStatusError" expires_after="2021-07-18">
   <owner>swapnilgupta@google.com</owner>
   <owner>burunduk@chromium.org</owner>
   <owner>managed-devices@google.com</owner>
@@ -1406,7 +1412,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledFailureManifestInvalidErrorDetail2"
-    enum="ManifestInvalidError" expires_after="2021-03-15">
+    enum="ManifestInvalidError" expires_after="2021-07-18">
   <owner>swapnilgupta@google.com</owner>
   <owner>burunduk@chromium.org</owner>
   <owner>managed-devices@google.com</owner>
@@ -1423,7 +1429,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledFailureNoUpdatesInfo"
-    enum="ExtensionNoUpdatesInfo" expires_after="2021-04-04">
+    enum="ExtensionNoUpdatesInfo" expires_after="2021-08-09">
   <owner>snijhara@google.com</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>burunduk@chromium.org</owner>
@@ -1439,7 +1445,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledFailureReason3"
-    enum="ExtensionInstallationFailureReason" expires_after="2021-03-28">
+    enum="ExtensionInstallationFailureReason" expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="ExtensionSource" -->
 
   <owner>burunduk@chromium.org</owner>
@@ -1458,7 +1464,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledFailureSandboxUnpackFailureReason"
-    enum="ExtensionUnpackFailureReason" expires_after="2021-03-28">
+    enum="ExtensionUnpackFailureReason" expires_after="2021-08-01">
+  <obsolete>
+    Deprecated as of 02/2021 in favour of
+    `Extensions.ForceInstalledFailureSandboxUnpackFailureReason2`.
+  </obsolete>
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1470,8 +1480,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Extensions.ForceInstalledFailureSessionType"
-    enum="SessionType" expires_after="2021-03-28">
+<histogram name="Extensions.ForceInstalledFailureSandboxUnpackFailureReason2"
+    enum="ExtensionUnpackFailureReason" expires_after="2021-08-01">
+  <owner>burunduk@chromium.org</owner>
+  <owner>swapnilgupta@google.com</owner>
+  <owner>managed-devices@google.com</owner>
+  <summary>
+    The reason why enterprise policy forced extensions had failed to unpack.
+    Recorded for each forced extension that failed to install after 5 minutes
+    with Extensions.ForceInstalledFailureReason3 equal to
+    CRX_INSTALL_ERROR_SANDBOXED_UNPACKER_FAILURE.
+
+    Replaced Extensions.ForceInstalledFailureSandboxUnpackFailureReason because
+    the enum values were not in sync with the C++ enums.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.ForceInstalledFailureSessionType{FailureReason}"
+    enum="SessionType" expires_after="2021-08-01">
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1479,13 +1505,32 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     The type of session in case enterprise policy forced extensions were not
     installed. Recorded for each force installed extension which failed to
     install after 5 minutes. Supported only on ChromeOS and recorded only if
-    there is an active user.
+    there is an active user. {FailureReason}
+  </summary>
+  <token key="FailureReason">
+    <variant name="" summary="Any type of failure"/>
+    <variant name=".ExtensionStuckInCreatedStage"
+        summary="Extensions stuck in CREATED stage"/>
+  </token>
+</histogram>
+
+<histogram
+    name="Extensions.ForceInstalledFailureStuckInCreatedStageAreExtensionsEnabled"
+    enum="BooleanEnabled" expires_after="2021-08-01">
+  <owner>swapnilgupta@google.com</owner>
+  <owner>burunduk@chromium.org</owner>
+  <owner>managed-devices@google.com</owner>
+  <summary>
+    Records whether the extensions are enabled or not. Recorded for each forced
+    extension that failed to install after 5 minutes with
+    Extensions.ForceInstalledCreationStage equal to
+    NOTIFIED_FROM_MANAGEMENT_INITIAL_CREATION_FORCED.
   </summary>
 </histogram>
 
 <histogram name="Extensions.ForceInstalledFailureWithCrxHeaderInvalidIsCWS"
     enum="IsForceInstalledExtensionFailedWithCrxHeaderInvalidFromCWSBoolean"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>swapnilgupta@google.com</owner>
   <owner>burunduk@chromium.org</owner>
   <owner>managed-devices@google.com</owner>
@@ -1499,7 +1544,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Extensions.ForceInstalledFailureWithCrxHeaderInvalidIsFromCache"
-    enum="BooleanCacheHit" expires_after="2021-05-02">
+    enum="BooleanCacheHit" expires_after="2021-07-04">
   <owner>swapnilgupta@google.com</owner>
   <owner>burunduk@chromium.org</owner>
   <owner>snijhara@google.com</owner>
@@ -1513,7 +1558,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledFetchTries" units="retries"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1527,7 +1572,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledHttpErrorCode2"
-    enum="HttpResponseCode" expires_after="2021-04-18">
+    enum="HttpResponseCode" expires_after="2021-08-22">
+<!-- Name completed by histogram_suffixes name="ExtensionSource" -->
+
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1544,7 +1591,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledLoadTime" units="ms"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1555,7 +1602,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledManifestFetchFailedFetchTries"
-    units="retries" expires_after="2021-03-28">
+    units="retries" expires_after="2021-08-01">
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1569,7 +1616,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledManifestFetchFailedHttpErrorCode2"
-    enum="HttpResponseCode" expires_after="2021-01-24">
+    enum="HttpResponseCode" expires_after="2021-05-30">
+<!-- Name completed by histogram_suffixes name="ExtensionSource" -->
+
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1587,7 +1636,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledManifestFetchFailedNetworkErrorCode"
-    enum="NetErrorCodes" expires_after="2021-03-28">
+    enum="NetErrorCodes" expires_after="2021-08-01">
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1601,7 +1650,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledNetworkErrorCode"
-    enum="NetErrorCodes" expires_after="2021-03-28">
+    enum="NetErrorCodes" expires_after="2021-08-01">
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1615,7 +1664,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledNotLoadedDisableReason"
-    enum="ExtensionDisableReason" expires_after="2021-03-28">
+    enum="ExtensionDisableReason" expires_after="2021-08-01">
   <owner>swapnilgupta@google.com</owner>
   <owner>burunduk@chromium.org</owner>
   <owner>managed-devices@google.com</owner>
@@ -1628,7 +1677,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledReadyTime" units="ms"
-    expires_after="2021-01-24">
+    expires_after="2021-05-30">
   <owner>snijhara@google.com</owner>
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
@@ -1641,7 +1690,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Extensions.ForceInstalledSessionsWithNonMisconfigurationFailureOccured"
-    enum="Boolean" expires_after="2021-03-28">
+    enum="Boolean" expires_after="2021-08-01">
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1657,7 +1706,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledStage2"
-    enum="ExtensionInstallationStage" expires_after="2021-01-24">
+    enum="ExtensionInstallationStage" expires_after="2021-05-30">
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1675,7 +1724,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Extensions.ForceInstalledTime" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>swapnilgupta@google.com</owner>
   <owner>burunduk@chromium.org</owner>
   <owner>managed-devices@google.com</owner>
@@ -1686,7 +1735,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledTimedOutAndNotInstalledCount"
-    units="units" expires_after="2021-03-28">
+    units="units" expires_after="2021-08-01">
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1697,7 +1746,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledTimedOutCount" units="units"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1708,7 +1757,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceInstalledTotalCandidateCount" units="units"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>burunduk@chromium.org</owner>
   <owner>swapnilgupta@google.com</owner>
   <owner>managed-devices@google.com</owner>
@@ -1722,7 +1771,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.ForceToolbarPinnedCount" units="extensions"
-    expires_after="2021-03-01">
+    expires_after="2021-08-01">
   <owner>nicolaso@chromium.org</owner>
   <owner>chrome-enterprise-team-core@google.com</owner>
   <summary>
@@ -1750,7 +1799,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>extensions-core@chromium.org</owner>
   <summary>
     Recorded when a component extension calls an extension API. Recorded once
-    per function call. See also Extensions.Functions.WebUICalls and
+    per function call. See also Extensions.Functions.WebUICalls,
+    Extensions.Functions.WebUIUntrustedCalls, and
     Extensions.Functions.ExtensionCalls.
   </summary>
 </histogram>
@@ -1763,13 +1813,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>extensions-core@chromium.org</owner>
   <summary>
     Recorded when a non-component extension calls an extension API. Recorded
-    once per function call. See also Extensions.Functions.WebUICalls and
+    once per function call. See also Extensions.Functions.WebUICalls,
+    Extensions.Functions.WebUIUntrustedCalls, and
     Extensions.Functions.ComponentExtensionCalls.
   </summary>
 </histogram>
 
 <histogram name="Extensions.Functions.ExtensionServiceWorkerCalls"
-    enum="ExtensionFunctions" expires_after="2021-04-11">
+    enum="ExtensionFunctions" expires_after="2021-08-09">
   <owner>lazyboy@chromium.org</owner>
   <owner>dbertoni@chromium.org</owner>
   <owner>rdevlin.cronin@chromium.org</owner>
@@ -1783,7 +1834,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.Functions.FailedTime" enum="ExtensionFunctions"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -1794,7 +1845,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.Functions.FailedTotalExecutionTime" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -1835,7 +1886,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.Functions.SucceededTime" enum="ExtensionFunctions"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -1846,7 +1897,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.Functions.SucceededTotalExecutionTime" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -1859,7 +1910,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.Functions.SynchronousExecutionTime" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -1877,13 +1928,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>extensions-core@chromium.org</owner>
   <summary>
     Recorded when a WebUI context calls an extension API. Recorded once per
-    function call. See also Extensions.Functions.ComponentExtensionCalls and
+    function call. See also Extensions.Functions.WebUIUntrustedCalls,
+    Extensions.Functions.ComponentExtensionCalls and
+    Extensions.Functions.ExtensionCalls.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.Functions.WebUIUntrustedCalls"
+    enum="ExtensionFunctions" expires_after="never">
+<!-- expires-never: Used for monitoring extension API usage. -->
+
+  <owner>rdevlin.cronin@chromium.org</owner>
+  <owner>extensions-core@chromium.org</owner>
+  <summary>
+    Recorded when a WebUI context calls an extension API. Recorded once per
+    function call. See also Extensions.Functions.WebUICalls,
+    Extensions.Functions.ComponentExtensionCalls and
     Extensions.Functions.ExtensionCalls.
   </summary>
 </histogram>
 
 <histogram name="Extensions.GoogleDocOffline.AvailabilityOnResourceRequest"
-    enum="GoogleDocsExtensionAvailablity" expires_after="M90">
+    enum="GoogleDocsExtensionAvailablity" expires_after="2021-07-18">
   <owner>rhalavati@chromium.org</owner>
   <owner>chrome-privacy-core@google.com</owner>
   <summary>
@@ -2043,7 +2109,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.HomepageOverrides" units="units"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>kelvinjiang@chromium.org</owner>
   <summary>
@@ -2053,17 +2119,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.HostedAppLaunchContainer" enum="AppLaunchContainer"
-    expires_after="2021-04-04">
+    expires_after="2021-07-31">
   <owner>benwells@chromium.org</owner>
   <owner>dominickn@chromium.org</owner>
   <summary>
-    Records the container used for a hosted app launch. The definition of
-    'launch' for the purposes of this histogram is different to that used for
-    the launch type histograms. This definition is less inclusive, for example
-    it does not include navigations to the hosted app due to normal browsing,
-    which the other definition does include. This definition could be thought of
-    more as explicit launches via a launch surface such as the app launcher,
-    chrome://apps, or a shortcut.
+    Records the container used for a hosted app launch, when the app is
+    launched. The definition of 'launch' for the purposes of this histogram is
+    different to that used for the launch type histograms. This definition is
+    less inclusive, for example it does not include navigations to the hosted
+    app due to normal browsing, which the other definition does include. This
+    definition could be thought of more as explicit launches via a launch
+    surface such as the app launcher, chrome://apps, or a shortcut.
   </summary>
 </histogram>
 
@@ -2248,7 +2314,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.InstallPrompt.Type2"
-    enum="ExtensionInstallPromptType" expires_after="2021-06-01">
+    enum="ExtensionInstallPromptType" expires_after="2021-08-09">
   <owner>meacer@chromium.org</owner>
   <owner>rdevlin.cronin@chromium.org</owner>
   <summary>
@@ -2293,7 +2359,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.InstanceID.GetToken.OptionsCount" units="options"
-    expires_after="M91">
+    expires_after="M89">
+  <obsolete>
+    Deprecated as of 11/2020
+  </obsolete>
   <owner>peter@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
   <summary>
@@ -2473,14 +2542,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>The number of platform apps loaded at profile open.</summary>
 </histogram>
 
-<histogram name="Extensions.LoadTheme" units="units" expires_after="2021-04-04">
+<histogram name="Extensions.LoadTheme" units="units" expires_after="2021-08-15">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>The number of themes loaded at profile open.</summary>
 </histogram>
 
 <histogram name="Extensions.LoadType" enum="ExtensionType"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -2703,7 +2772,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Extensions.NetworkDelay" units="ms" expires_after="2020-12-31">
+<histogram name="Extensions.NetworkDelay" units="ms" expires_after="2021-11-20">
   <owner>battre@chromium.org</owner>
   <owner>karandeepb@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
@@ -2711,7 +2780,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.NetworkDelayPercentage" units="%"
-    expires_after="2021-03-15">
+    expires_after="2021-11-20">
   <owner>battre@chromium.org</owner>
   <owner>karandeepb@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
@@ -2722,7 +2791,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.NewTabPageOverrides" units="units"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>kelvinjiang@chromium.org</owner>
   <summary>
@@ -2750,6 +2819,50 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Extensions.NotAllowlistedDisabled" units="extensions"
+    expires_after="2021-06-01">
+  <owner>jeffcyr@google.com</owner>
+  <owner>lucferron@chromium.org</owner>
+  <summary>
+    The total number of disabled extensions that are not present in the Enhanced
+    Safe Browsing CRX allowlist. Recorded for all users on profile
+    initialization.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.NotAllowlistedDisabledAndEsbUser"
+    units="extensions" expires_after="2021-06-01">
+  <owner>jeffcyr@google.com</owner>
+  <owner>lucferron@chromium.org</owner>
+  <summary>
+    The total number of disabled extensions that are not present in the Enhanced
+    Safe Browsing CRX allowlist. Recorded for only for Enhanced Safe Browsing
+    users on profile initialization.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.NotAllowlistedEnabled" units="extensions"
+    expires_after="2021-08-09">
+  <owner>jeffcyr@google.com</owner>
+  <owner>lucferron@chromium.org</owner>
+  <summary>
+    The total number of enabled extensions that are not present in the Enhanced
+    Safe Browsing CRX allowlist. Recorded for all users on profile
+    initialization.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.NotAllowlistedEnabledAndEsbUser" units="extensions"
+    expires_after="2021-06-01">
+  <owner>jeffcyr@google.com</owner>
+  <owner>lucferron@chromium.org</owner>
+  <summary>
+    The total number of enabled extensions that are not present in the Enhanced
+    Safe Browsing CRX allowlist. Recorded for only for Enhanced Safe Browsing
+    users on profile initialization.
+  </summary>
+</histogram>
+
 <histogram name="Extensions.Permissions_AutoDisable3"
     enum="ExtensionPermission3" expires_after="2020-12-01">
   <owner>rdevlin.cronin@chromium.org</owner>
@@ -2765,7 +2878,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.Permissions_Install3" enum="ExtensionPermission3"
-    expires_after="2021-05-09">
+    expires_after="2021-08-09">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -3024,12 +3137,30 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Extensions.SandboxUnpackFailureReason"
     enum="ExtensionUnpackFailureReason" expires_after="never">
+  <obsolete>
+    Deprecated as of 02/2021 in favour of
+    `Extensions.SandboxUnpackFailureReason2`.
+  </obsolete>
+<!-- expires-never: Monitors core extension installation flows. -->
+
+  <owner>rdevlin.cronin@chromium.org</owner>
+  <owner>extensions-core@chromium.org</owner>
+  <summary>
+    The reason an extension failed to unpack, recorded when a failure occurs.
+  </summary>
+</histogram>
+
+<histogram name="Extensions.SandboxUnpackFailureReason2"
+    enum="ExtensionUnpackFailureReason" expires_after="never">
 <!-- expires-never: Monitors core extension installation flows. -->
 
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
     The reason an extension failed to unpack, recorded when a failure occurs.
+
+    Replaced Extensions.SandboxUnpackFailureReason because the enum values were
+    not in sync with the C++ enums.
   </summary>
 </histogram>
 
@@ -3051,7 +3182,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.SearchEngineOverrides" units="units"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>kelvinjiang@chromium.org</owner>
   <summary>
@@ -3099,7 +3230,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Extensions.SettingsOverridden.BackToGoogleNtpOverriddenDialogResult"
-    enum="SettingsOverriddenDialogResult" expires_after="2021-05-01">
+    enum="SettingsOverriddenDialogResult" expires_after="2021-08-01">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -3113,7 +3244,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Extensions.SettingsOverridden.BackToGoogleSearchOverriddenDialogResult"
-    enum="SettingsOverriddenDialogResult" expires_after="2021-05-01">
+    enum="SettingsOverriddenDialogResult" expires_after="2021-08-01">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -3127,7 +3258,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Extensions.SettingsOverridden.BackToOtherSearchOverriddenDialogResult"
-    enum="SettingsOverriddenDialogResult" expires_after="2021-05-01">
+    enum="SettingsOverriddenDialogResult" expires_after="2021-08-01">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -3141,7 +3272,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Extensions.SettingsOverridden.GenericNtpOverriddenDialogResult"
-    enum="SettingsOverriddenDialogResult" expires_after="2021-05-01">
+    enum="SettingsOverriddenDialogResult" expires_after="2021-08-01">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -3154,7 +3285,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Extensions.SettingsOverridden.GenericSearchOverriddenDialogResult"
-    enum="SettingsOverriddenDialogResult" expires_after="2021-05-01">
+    enum="SettingsOverriddenDialogResult" expires_after="2021-08-01">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -3166,7 +3297,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.StartupPagesOverrides" units="units"
-    expires_after="2021-06-01">
+    expires_after="2021-08-09">
   <owner>rdevlin.cronin@chromium.org</owner>
   <owner>kelvinjiang@chromium.org</owner>
   <summary>
@@ -3339,7 +3470,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.UsedMimeTypeHandler" enum="UsedMimeTypeHandler"
-    expires_after="2021-03-01">
+    expires_after="2021-07-11">
   <owner>apotapchuk@chromium.org</owner>
   <owner>anqing@chromium.org</owner>
   <summary>
@@ -3363,7 +3494,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.WebRequest.KeepaliveRequestState"
-    enum="ExtensionInProgressRequestState" expires_after="2021-04-25">
+    enum="ExtensionInProgressRequestState" expires_after="2021-06-27">
   <owner>yhirano@chromium.org</owner>
   <owner>kinuko@chromium.org</owner>
   <summary>
@@ -3535,7 +3666,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.WebRequestBlockingCount" units="extensions"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>karandeepb@chromium.org</owner>
   <owner>extensions-core@chromium.org</owner>
   <summary>
@@ -3547,7 +3678,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Extensions.WebRequestCount" units="extensions"
-    expires_after="2021-05-09">
+    expires_after="2021-08-09">
   <owner>karandeepb@chromium.org</owner>
   <owner>rdevlin.cronin@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/file/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/file/histograms.xml
index a8bd89512ad..6ea1115900e 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/file/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/file/histograms.xml
@@ -22,9 +22,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="FileBrowser.ChangeDirectory.RootType"
-    enum="FileManagerRootType" expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    enum="FileManagerRootType" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: Counts the number of directory-changed events,
     bucketed by the RootType of the directory newly displayed.
@@ -32,9 +32,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.ComputersCount" units="Computers"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: number of Computers a user has available in the
     Files app. Computed every time the File Browser is opened (including file
@@ -43,15 +43,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="FileBrowser.Create" enum="FileDialogType" expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
-  <summary>Chrome OS File Browser opening mode.</summary>
+<histogram name="FileBrowser.Create" enum="FileDialogType" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
+  <summary>
+    Chrome OS File Browser: The mode in which the File Browser was opened.
+  </summary>
 </histogram>
 
-<histogram name="FileBrowser.DirectoryScan" units="ms" expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+<histogram name="FileBrowser.DirectoryScan" units="ms" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: time to scan a directory. Measured on every File
     Browser directory change.
@@ -59,9 +61,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.DownloadDestination.IsGoogleDrive.Changed"
-    enum="BooleanEnabled" expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    enum="BooleanEnabled" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Tracks whether download destination is set to a Google Drive folder when the
     download destination is changed by the user in the settings page.
@@ -69,9 +71,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.DownloadDestination.IsGoogleDrive.Started"
-    enum="BooleanEnabled" expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    enum="BooleanEnabled" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Tracks whether download destination is set to a Google Drive folder on
     startup.
@@ -79,29 +81,30 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.Downloads.DirectoryPercentageOfDiskUsage"
-    units="%" expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    units="%" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     The size of the space consumed by a users files in &quot;My Files&quot;
     folder and it's children, calculated as a percentage of the total disk
-    space. Caluclated on user login.
+    space. Caluclated on user login and recorded by VolumeManager.
   </summary>
 </histogram>
 
 <histogram name="FileBrowser.Downloads.DirectorySizeMiB" units="MiB"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     The total size of all of the users files stored in the &quot;My Files&quot;
-    folder and it's children. Caluclated on user login.
+    folder and it's children. Caluclated on user login and recorded by
+    VolumeManager.
   </summary>
 </histogram>
 
-<histogram name="FileBrowser.DownloadsCount" units="units" expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+<histogram name="FileBrowser.DownloadsCount" units="units" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: number of files and directories in the Downloads
     directory (not including the contents of nested directories). Computed every
@@ -110,9 +113,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.DriveDuplicateFinder.LongComputeHash" units="ms"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     The time taken to calculate the hash of a file, only recorded if the time
     exceeds a local threshold that is currenty 5 seconds.
@@ -120,9 +123,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.DriveDuplicateFinder.LongSearchByHash" units="ms"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     The time taken to search for a file using it's hash value, only recorded if
     the time exceeds a local threshold that is currently 1 second.
@@ -130,23 +133,23 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.DriveHostedFilePinSuccess" enum="BooleanSuccess"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>austinct@chromium.org</owner>
   <owner>dats@chromium.org</owner>
   <summary>Tracks success rate of pinning hosted files in Drive.</summary>
 </histogram>
 
 <histogram name="FileBrowser.DrivePinSuccess" enum="BooleanSuccess"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>austinct@chromium.org</owner>
   <owner>dats@chromium.org</owner>
   <summary>Tracks success rate of pinning files in Drive.</summary>
 </histogram>
 
 <histogram name="FileBrowser.FileSystemProviderMounted"
-    enum="FileSystemProviderMountType" expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    enum="FileSystemProviderMountType" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     The type of file system provider that has been mounted. This metric is
     emmitted on mounting of the filesystem.
@@ -154,9 +157,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.FolderShortcut.Add" units="units"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: this is recorded when the user adds a folder
     shortcut.
@@ -164,9 +167,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.FolderShortcut.Count" units="units"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: number of saved folder shorcuts. This is recorded
     when the Files app is launched.
@@ -174,9 +177,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.FolderShortcut.Navigate" units="units"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: this is recorded when the user clicks or selects a
     folder shortcut and is navigated to the target folder.
@@ -184,9 +187,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.FolderShortcut.Remove" units="units"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: this is recorded when the user removes a folder
     shortcut.
@@ -194,7 +197,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.FormatFileSystemType"
-    enum="FileManagerFormatFileSystemType" expires_after="2021-05-02">
+    enum="FileManagerFormatFileSystemType" expires_after="2021-08-09">
   <owner>austinct@chromium.org</owner>
   <summary>
     Chrome OS File Browser: this records the filesystem selected when formatting
@@ -202,10 +205,23 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram
+    name="FileBrowser.HoldingSpace.TimeFromFirstWelcomeBannerShowToFirstPin"
+    units="ms" expires_after="2022-01-05">
+  <owner>dmblack@google.com</owner>
+  <owner>tbarzic@chromium.org</owner>
+  <summary>
+    Chrome OS Files App: Records the time from when the holding space welcome
+    banner was first shown to when the user first pinned an item to holding
+    space from the Files app. If the holding space welcome banner was not shown
+    prior to the first pin, zero is recorded.
+  </summary>
+</histogram>
+
 <histogram name="FileBrowser.ImportController.DeviceYanked" enum="Boolean"
     expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Files App: Whether an external media device was removed during the
     upload process.
@@ -214,17 +230,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="FileBrowser.ImportController.ImportCancelled"
     enum="BooleanCanceled" expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Files App: Whether the media import process was cancelled.
   </summary>
 </histogram>
 
 <histogram name="FileBrowser.LauncherSearch.Drive" units="ms"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     The time taken to execute launcher search for drive files. Recorded when the
     complete result set is returned from drive.
@@ -232,9 +248,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.LauncherSearch.Local" units="ms"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     The time taken to execute launcher search for local files. Recorded when the
     complete result set has been calculated for files on the local disk.
@@ -242,9 +258,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.Load{FileBrowserLoad}" units="ms"
-    expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser is an built-in extension without a background page.
     Its main.html file is loaded every time the user opens a File Browser tab or
@@ -309,9 +325,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.Location.OnEntryExpandedOrCollapsed.NonTopLevel"
-    enum="FileManagerRootType" expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    enum="FileManagerRootType" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Files App: The locations (root types) of non-top-level entries
     when they are expanded or collapsed (expand icon clicked) in the directory
@@ -320,9 +336,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.Location.OnEntryExpandedOrCollapsed.TopLevel"
-    enum="FileManagerRootType" expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    enum="FileManagerRootType" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Files App: The locations (root types) of top-level entries (root
     entries) when they are expanded or collapsed (expand icon clicked) in the
@@ -331,28 +347,31 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.Location.OnEntrySelected.NonTopLevel"
-    enum="FileManagerRootType" expires_after="M79">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    enum="FileManagerRootType" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Files App: The locations (root types) of non-top-level entries
-    when they are clicked in the directory tree.
+    when they are clicked in the directory tree. Contains incomplete data from
+    M80 to M87 inclusively.
   </summary>
 </histogram>
 
 <histogram name="FileBrowser.Location.OnEntrySelected.TopLevel"
-    enum="FileManagerRootType" expires_after="M79">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    enum="FileManagerRootType" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Files App: The locations (root types) of top-level entries (root
-    entries) when they are clicked in the directory tree.
+    entries) when they are clicked in the directory tree. Contains incomplete
+    data from M80 to M87 inclusively.
   </summary>
 </histogram>
 
 <histogram name="FileBrowser.MediaImport.Cancelled" enum="BooleanCanceled"
-    expires_after="M88">
-  <owner>slangley@chromium.org</owner>
+    expires_after="M93">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Files App: Whether the media import (Photos/Video) from external
     media was cancelled.
@@ -360,8 +379,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.MediaImport.Duplicates" units="count"
-    expires_after="M88">
-  <owner>slangley@chromium.org</owner>
+    expires_after="M93">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Files App: Count of duplicate media (Photos/Videos) files that
     were skipped during a single upload session.
@@ -369,16 +389,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.MediaImport.ErrorCount" units="count"
-    expires_after="M88">
-  <owner>slangley@chromium.org</owner>
+    expires_after="M93">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Files App: Number of errors that occured during an upload session.
   </summary>
 </histogram>
 
 <histogram name="FileBrowser.MediaImport.ImportCount" units="count"
-    expires_after="M88">
-  <owner>slangley@chromium.org</owner>
+    expires_after="M93">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Files App: Count of individual media (Photos/Videos) uploaded from
     a single upload session.
@@ -386,8 +408,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.MediaImport.ImportMB" units="MBytes"
-    expires_after="M88">
-  <owner>slangley@chromium.org</owner>
+    expires_after="M93">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Files App: Size of the media (Photos/Videos) uploaded from a
     single upload session.
@@ -395,8 +418,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.MediaImport.Started" enum="BooleanAttempted"
-    expires_after="M88">
-  <owner>slangley@chromium.org</owner>
+    expires_after="M93">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Files App: Whether the media import (Photos/Video) from external
     media was started.
@@ -404,36 +428,36 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.MenuItemSelected" enum="FileManagerMenuCommands"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Files App: The commands selected in the menu by the files app.
   </summary>
 </histogram>
 
 <histogram name="FileBrowser.Notification.Show"
-    enum="FileManagerNotificationType" expires_after="M92">
-  <owner>fukino@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    enum="FileManagerNotificationType" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: Notification types what were shown to the user.
   </summary>
 </histogram>
 
 <histogram name="FileBrowser.Notification.UserAction"
-    enum="FileManagerNotificationUserAction" expires_after="M92">
-  <owner>fukino@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    enum="FileManagerNotificationUserAction" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: User actions responding to a notification.
   </summary>
 </histogram>
 
 <histogram name="FileBrowser.OpenFiles.RootType" enum="FileManagerRootType"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: The locations (root types) of files which are opened
     by the file picker.
@@ -441,9 +465,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.PhotoEditor.DisplayTime" units="ms"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M92">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Photo Editor: time to display an image. Measured from the moment
     the user selected the image till the moment it is displayed (not counting
@@ -452,46 +476,46 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.PhotoEditor.FileType" enum="PhotoEditorFileType"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M92">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>Chrome OS Photo Editor: the type of the file opened.</summary>
 </histogram>
 
 <histogram name="FileBrowser.PhotoEditor.LoadMode" enum="PhotoEditorLoadMode"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M92">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>Chrome OS Photo Editor: the way the image has been loaded.</summary>
 </histogram>
 
 <histogram name="FileBrowser.PhotoEditor.LoadTime" units="ms"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="2021-08-09">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>Chrome OS Photo Editor: time to load an image from a file.</summary>
 </histogram>
 
 <histogram name="FileBrowser.PhotoEditor.SaveResult"
-    enum="PhotoEditorSaveResult" expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    enum="PhotoEditorSaveResult" expires_after="M92">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Photo Editor: the result of a file save operation.
   </summary>
 </histogram>
 
 <histogram name="FileBrowser.PhotoEditor.SaveTime" units="ms"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M92">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>Chrome OS Photo Editor: time to save an image to a file.</summary>
 </histogram>
 
 <histogram name="FileBrowser.PhotoEditor.Size.MB" units="MBytes"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M92">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Photo Editor: size of an image file in megabytes. Measured on
     every image load.
@@ -499,9 +523,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.PhotoEditor.Size.MPix" units="MPixels"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M92">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Photo Editor: size of an image in megapixels. Measured on every
     image load.
@@ -509,53 +533,53 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.PhotoEditor.Tool" enum="PhotoEditorToolType"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M92">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>Chrome OS Photo Editor: the button which the user clicked.</summary>
 </histogram>
 
 <histogram name="FileBrowser.QuickView.DialogType" enum="FileDialogType"
-    expires_after="M90">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     File dialog type (e.g. Full page, Save as file) when quick view is launched.
   </summary>
 </histogram>
 
 <histogram name="FileBrowser.QuickView.FileType" enum="ViewFileType"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>File types that were tried to be opened with quick view.</summary>
 </histogram>
 
 <histogram name="FileBrowser.QuickView.FileTypeOnLaunch" enum="ViewFileType"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>File types that were selected when quick view is launched.</summary>
 </histogram>
 
 <histogram name="FileBrowser.QuickView.VolumeType" enum="FileManagerVolumeType"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>The volume type where quick view is opened.</summary>
 </histogram>
 
 <histogram name="FileBrowser.QuickView.WayToOpen"
-    enum="FileManagerQuickViewWayToOpen" expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    enum="FileManagerQuickViewWayToOpen" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>How quick view was opened.</summary>
 </histogram>
 
 <histogram name="FileBrowser.Recent.LoadArcMedia" units="ms"
-    expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Time to load a recently modified file list from Media Views. It is triggered
     when the user opens or reloads Recent view in the Files app.
@@ -563,9 +587,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.Recent.LoadCrostini" units="ms"
-    expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Time to load a recently modified file list from Crostini. It is triggered
     when the user opens or reloads Recent view in the Files app.
@@ -573,27 +597,27 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.Recent.LoadDownloads" units="ms"
-    expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Time to load a recently modified file list from Downloads. It is triggered
     when the user opens or reloads Recent view in the Files app.
   </summary>
 </histogram>
 
-<histogram name="FileBrowser.Recent.LoadDrive" units="ms" expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+<histogram name="FileBrowser.Recent.LoadDrive" units="ms" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Time to load a recently modified file list from Drive. It is triggered when
     the user opens or reloads Recent view in the Files app.
   </summary>
 </histogram>
 
-<histogram name="FileBrowser.Recent.LoadTotal" units="ms" expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+<histogram name="FileBrowser.Recent.LoadTotal" units="ms" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Time to load a recently modified file list from all sources. It is triggered
     when the user opens or reloads Recent view in the Files app.
@@ -601,7 +625,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.Share.ActionSource" enum="SharingActionSource"
-    expires_after="2021-05-05">
+    expires_after="2021-07-04">
   <owner>lucmult@chromium.org</owner>
   <owner>majewski@chromium.org</owner>
   <summary>Chrome OS File Browser: the source of file sharing action.</summary>
@@ -628,18 +652,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.SuggestApps.CloseDialog"
-    enum="SuggestAppsDialogCloseReason" expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    enum="SuggestAppsDialogCloseReason" expires_after="M92">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: the reason why the suggest apps dialog was closed.
   </summary>
 </histogram>
 
 <histogram name="FileBrowser.SuggestApps.Install"
-    enum="SuggestAppsDialogInstall" expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    enum="SuggestAppsDialogInstall" expires_after="2021-08-09">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: whether the Webstore item user selected was
     successfully installed or not.
@@ -647,9 +671,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.SuggestApps.Load" enum="SuggestAppsDialogLoad"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="2021-08-09">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: whether the initialization of the dialog succeeded
     or not.
@@ -657,9 +681,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.SuggestApps.LoadTime" units="ms"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M92">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: time to load the suggest apps dialog. Measured
     between the moment window appears and the moment all the contents in the
@@ -668,9 +692,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.TeamDrivesCount" units="Team Drives"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: number of Team Drives a user has available in the
     Files app. Computed every time the File Browser is opened (including file
@@ -680,9 +704,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.ToggleFileListType" enum="FileManagerListType"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS Files App: Recorded when the Grid View/List View toggle menu icon
     is selected.
@@ -690,9 +714,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.ViewingFileType" enum="ViewFileType"
-    expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     File types that were tried to be viewed through browser. This is recorded
     when the user tries to view a file from the Files app.
@@ -700,9 +724,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.ViewingFileType.Offline" enum="ViewFileType"
-    expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     File types that were tried to be viewed through browser while the user is
     offline. This is recorded when the user tries to view a file from the Files
@@ -711,9 +735,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.ViewingFileType.Online" enum="ViewFileType"
-    expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     File types that were tried to be viewed through browser while the user is
     online. This is recorded when the user tries to view a file from the Files
@@ -722,9 +746,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.ViewingRootType" enum="FileManagerRootType"
-    expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: The locations (root types) of files which are opened
     in stand-alone mode. This does not include files opened in file picker mode.
@@ -732,9 +756,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.ViewingRootType.Offline"
-    enum="FileManagerRootType" expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    enum="FileManagerRootType" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: The locations (root types) of files which are opened
     in stand-alone mode while the user is offline. This does not include files
@@ -743,9 +767,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.ViewingRootType.Online" enum="FileManagerRootType"
-    expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: The locations (root types) of files which are opened
     in stand-alone mode while the user is online. This does not include files
@@ -754,9 +778,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.ViewingTaskType" enum="FileManagerTaskType"
-    expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: The type of the handler to be used to open files.
     This is recorded when the user tries to view a file from the Files app.
@@ -764,9 +788,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.ViewingTaskType.Offline"
-    enum="FileManagerTaskType" expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    enum="FileManagerTaskType" expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: The type of the handler to be used to open files
     when the user is offline. This is recorded when the user tries to view a
@@ -775,9 +799,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.ViewingTaskType.Online" enum="FileManagerTaskType"
-    expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: The type of the handler to be used to open files
     when the user is online. This is recorded when the user tries to view a file
@@ -786,9 +810,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.VolumeType" enum="FileManagerVolumeType"
-    expires_after="M92">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: counts the number of times volumes are mounted for
     each volume type.
@@ -796,9 +820,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FileBrowser.ZipFileTask" enum="FileManagerZipHandlerType"
-    expires_after="M89">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    expires_after="M98">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Chrome OS File Browser: counts the number of times ZIP file was opened or
     created, categorized by component extensions and its operation types.
diff --git a/chromium/tools/metrics/histograms/histograms_xml/fingerprint/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/fingerprint/histograms.xml
index 1c66adffca6..b875bfa345a 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/fingerprint/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/fingerprint/histograms.xml
@@ -21,29 +21,55 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<histogram name="Fingerprint.Auth.ScanResult" enum="FingerprintScanResult"
+    expires_after="2021-09-01">
+  <owner>rsorokin@chromium.org</owner>
+  <owner>tomhughes@chromium.org</owner>
+  <owner>cros-oac@google.com</owner>
+  <owner>chromeos-fingerprint@google.com</owner>
+  <summary>
+    Tracks the scan result during fingerprint authentication session. It is
+    recorded every time user touches the fingerprint sensor while authenticating
+    (unlock screen, web auth, etc.).
+  </summary>
+</histogram>
+
+<histogram name="Fingerprint.Enroll.ScanResult" enum="FingerprintScanResult"
+    expires_after="2021-09-01">
+  <owner>rsorokin@chromium.org</owner>
+  <owner>tomhughes@chromium.org</owner>
+  <owner>cros-oac@google.com</owner>
+  <owner>chromeos-fingerprint@google.com</owner>
+  <summary>
+    Tracks the scan result during fingerprint enrollment session. It is recorded
+    every time user touches the fingerprint sensor while enrolling fingerprints
+    (during onboarding or in Chrome OS settings).
+  </summary>
+</histogram>
+
 <histogram name="Fingerprint.Reset.ResetContextMode"
-    enum="FingerprintSensorMode" expires_after="2021-03-15">
+    enum="FingerprintSensorMode" expires_after="2021-08-09">
   <owner>tomhughes@chromium.org</owner>
   <owner>chromeos-fingerprint@google.com</owner>
   <summary>The mode FPMCU was in when we reset context.</summary>
 </histogram>
 
 <histogram name="Fingerprint.SetContext.SetContextMode"
-    enum="FingerprintSensorMode" expires_after="2021-03-21">
+    enum="FingerprintSensorMode" expires_after="2021-07-27">
   <owner>yichengli@chromium.org</owner>
   <owner>chromeos-fingerprint@google.com</owner>
   <summary>The mode FPMCU was in when we set its context.</summary>
 </histogram>
 
 <histogram name="Fingerprint.SetContext.Success" enum="BooleanSuccess"
-    expires_after="2021-01-03">
+    expires_after="2021-09-01">
   <owner>yichengli@chromium.org</owner>
   <owner>chromeos-fingerprint@google.com</owner>
   <summary>Whether setting FPMCU mode succeeded.</summary>
 </histogram>
 
 <histogram name="Fingerprint.Unlock.AttemptsCountBeforeSuccess" units="count"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>rsorokin@chromium.org</owner>
   <owner>jessejames@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
@@ -53,7 +79,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Fingerprint.Unlock.AuthSuccessful" enum="BooleanSuccess"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>rsorokin@chromium.org</owner>
   <owner>jessejames@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
@@ -64,7 +90,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Fingerprint.Unlock.EnrolledFingerCount" units="count"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>rsorokin@chromium.org</owner>
   <owner>jessejames@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
@@ -72,7 +98,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Fingerprint.Unlock.Match.Duration.Capture" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>rsorokin@chromium.org</owner>
   <owner>jessejames@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
@@ -83,7 +109,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Fingerprint.Unlock.Match.Duration.Matcher" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>rsorokin@chromium.org</owner>
   <owner>jessejames@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
@@ -93,7 +119,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Fingerprint.Unlock.Match.Duration.Overall" units="ms"
-    expires_after="2021-01-03">
+    expires_after="2021-07-18">
   <owner>rsorokin@chromium.org</owner>
   <owner>jessejames@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
@@ -104,7 +130,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Fingerprint.Unlock.Match.PositiveMatchSecretCorrect"
-    enum="BooleanCorrect" expires_after="2021-01-03">
+    enum="BooleanCorrect" expires_after="2021-09-01">
   <owner>yichengli@chromium.org</owner>
   <owner>chromeos-fingerprint@google.com</owner>
   <summary>
@@ -114,7 +140,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Fingerprint.Unlock.MatchIgnoredDueToPowerButtonPress"
-    enum="BooleanIgnored" expires_after="2021-02-02">
+    enum="BooleanIgnored" expires_after="2021-09-01">
   <owner>ravisadineni@chromium.org</owner>
   <owner>chromeos-fingerprint@google.com</owner>
   <summary>
@@ -135,7 +161,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Fingerprint.Unlock.NoMatch.Duration.Capture" units="ms"
-    expires_after="2021-01-03">
+    expires_after="2021-09-01">
   <owner>rsorokin@chromium.org</owner>
   <owner>jessejames@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
@@ -146,7 +172,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Fingerprint.Unlock.NoMatch.Duration.Matcher" units="ms"
-    expires_after="2021-01-03">
+    expires_after="2021-09-01">
   <owner>rsorokin@chromium.org</owner>
   <owner>jessejames@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
@@ -156,7 +182,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Fingerprint.Unlock.NoMatch.Duration.Overall" units="ms"
-    expires_after="2021-01-03">
+    expires_after="2021-09-01">
   <owner>rsorokin@chromium.org</owner>
   <owner>jessejames@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
@@ -167,7 +193,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Fingerprint.Unlock.ReadPositiveMatchSecret.Success"
-    enum="BooleanSuccess" expires_after="2021-01-03">
+    enum="BooleanSuccess" expires_after="2021-09-01">
   <owner>yichengli@chromium.org</owner>
   <owner>chromeos-fingerprint@google.com</owner>
   <summary>
@@ -176,7 +202,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Fingerprint.Unlock.RecordFormatVersion"
-    enum="FingerprintRecordFormatVersion" expires_after="2021-01-03">
+    enum="FingerprintRecordFormatVersion" expires_after="2021-09-01">
   <owner>yichengli@chromium.org</owner>
   <owner>chromeos-fingerprint@google.com</owner>
   <summary>
@@ -184,8 +210,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Fingerprint.Unlock.Result" enum="FingerprintUnlockResult"
+    expires_after="2021-07-01">
+  <owner>rsorokin@chromium.org</owner>
+  <owner>tomhughes@chromium.org</owner>
+  <owner>cros-oac@google.com</owner>
+  <owner>chromeos-fingerprint@google.com</owner>
+  <summary>
+    Tracks the result of the fingerprint authentication attempt on the lock
+    screen.
+  </summary>
+</histogram>
+
 <histogram name="Fingerprint.UnlockEnabled" enum="BooleanEnabled"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>rsorokin@chromium.org</owner>
   <owner>jessejames@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
@@ -196,7 +234,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Fingerprint.Updater.NoUpdate.Duration.Overall" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>tomhughes@chromium.org</owner>
   <owner>hesling@chromium.org</owner>
   <owner>chromeos-fingerprint@google.com</owner>
@@ -207,7 +245,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Fingerprint.Updater.Reason" enum="FingerprintUpdaterReason"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>tomhughes@chromium.org</owner>
   <owner>hesling@chromium.org</owner>
   <owner>chromeos-fingerprint@google.com</owner>
@@ -217,7 +255,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Fingerprint.Updater.Status" enum="FingerprintUpdaterStatus"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>tomhughes@chromium.org</owner>
   <owner>hesling@chromium.org</owner>
   <owner>chromeos-fingerprint@google.com</owner>
@@ -225,7 +263,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Fingerprint.Updater.Update.Duration.Overall" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>tomhughes@chromium.org</owner>
   <owner>hesling@chromium.org</owner>
   <owner>chromeos-fingerprint@google.com</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/gcm/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/gcm/histograms.xml
index c7d4258853c..e633ea50696 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/gcm/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/gcm/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="GCM.AccountMappingMessageReceived" enum="BooleanReceived"
-    expires_after="M88">
+    expires_after="M94">
   <owner>peter@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
   <summary>
@@ -32,14 +32,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GCM.CheckinRequestStatus" enum="GCMCheckinRequestStatus"
-    expires_after="M88">
+    expires_after="M92">
   <owner>peter@chromium.org</owner>
-  <owner>zea@chromium.org</owner>
+  <owner>knollr@chromium.org</owner>
   <summary>Status code of the outcome of a GCM checkin request.</summary>
 </histogram>
 
 <histogram name="GCM.CheckinRequestStatusNetError" enum="NetErrorCodes"
-    expires_after="M90">
+    expires_after="M92">
   <owner>peter@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
   <summary>
@@ -120,7 +120,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GCM.Crypto.EncryptMessageResult" enum="GCMEncryptionResult"
-    expires_after="M87">
+    expires_after="M92">
   <owner>peter@chromium.org</owner>
   <owner>alexchau@chromium.org</owner>
   <summary>
@@ -152,7 +152,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GCM.Crypto.InitKeyStoreSuccessRate" enum="BooleanSuccess"
-    expires_after="M90">
+    expires_after="M94">
   <owner>peter@chromium.org</owner>
   <owner>zea@chromium.org</owner>
   <summary>
@@ -161,7 +161,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GCM.Crypto.LoadKeyStoreSuccessRate" enum="BooleanSuccess"
-    expires_after="M88">
+    expires_after="M94">
   <owner>peter@chromium.org</owner>
   <owner>zea@chromium.org</owner>
   <summary>
@@ -170,7 +170,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GCM.Crypto.RemoveKeySuccessRate" enum="BooleanSuccess"
-    expires_after="M88">
+    expires_after="M94">
   <owner>peter@chromium.org</owner>
   <owner>zea@chromium.org</owner>
   <summary>
@@ -221,7 +221,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GCM.DeliveredToAppHandler" enum="BooleanDelivered"
-    expires_after="M87">
+    expires_after="M92">
   <owner>peter@chromium.org</owner>
   <owner>mamir@chromium.org</owner>
   <summary>
@@ -239,8 +239,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="GCM.IncomingSendErrors" units="messages" expires_after="M90">
+<histogram name="GCM.IncomingSendErrors" units="messages" expires_after="M94">
   <owner>peter@chromium.org</owner>
+  <owner>knollr@chromium.org</owner>
   <summary>
     Number of SEND_ERROR messages received from Google Cloud Messaging. Recorded
     when processing the received message.
@@ -248,7 +249,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GCM.LoadStatus" enum="GCMLoadStatus"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>peter@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
   <summary>Status code of loading from the persistent GCM store.</summary>
@@ -263,8 +264,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GCM.PendingConnectionEventsAtShutdown" units="events"
-    expires_after="M90">
+    expires_after="M92">
   <owner>peter@chromium.org</owner>
+  <owner>knollr@chromium.org</owner>
   <summary>
     Number of connection events which have not been sent to GCM. This is
     recorded only at the time of shutdown to capture the events which are being
@@ -304,7 +306,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GCM.RegistrationRequestStatus"
-    enum="GCMRegistrationRequestStatus" expires_after="2021-05-09">
+    enum="GCMRegistrationRequestStatus" expires_after="2021-07-11">
   <owner>peter@chromium.org</owner>
   <summary>
     Status code of the outcome of a GCM registration request. The Unknown error
@@ -379,8 +381,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GCM.SendWebPushMessagePayloadSize" units="units"
-    expires_after="2021-02-14">
-  <owner>alexchau@chromium.org</owner>
+    expires_after="M92">
+  <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
     Size of web push messages payload. Recorded right before the message is
@@ -389,8 +391,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GCM.SendWebPushMessageResult" enum="SendWebPushMessageResult"
-    expires_after="2021-04-18">
-  <owner>alexchau@chromium.org</owner>
+    expires_after="2021-08-09">
+  <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
     Result of sending web push messages. Recorded when the message has either
@@ -399,8 +401,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GCM.SendWebPushMessageStatusCode"
-    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2020-12-13">
-  <owner>alexchau@chromium.org</owner>
+    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-08-09">
+  <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
     Result code from sending web push messages. Logs net::Error if it's not
@@ -454,7 +456,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GCM.WebPushReceived.DeviceState" enum="WebPushDeviceState"
-    expires_after="M88">
+    expires_after="M94">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/geolocation/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/geolocation/histograms.xml
index 5123c672377..09346b2df0a 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/geolocation/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/geolocation/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="Geolocation.AuthorizationActionExistingUser"
-    enum="GeolocationAuthorizationAction" expires_after="2021-04-04">
+    enum="GeolocationAuthorizationAction" expires_after="2021-08-09">
   <owner>mattreynolds@chromium.org</owner>
   <owner>device-dev@chromium.org</owner>
   <summary>
@@ -32,7 +32,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Geolocation.AuthorizationActionNewUser"
-    enum="GeolocationAuthorizationAction" expires_after="2021-04-04">
+    enum="GeolocationAuthorizationAction" expires_after="2021-08-09">
   <owner>mattreynolds@chromium.org</owner>
   <owner>device-dev@chromium.org</owner>
   <summary>
@@ -86,7 +86,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Geolocation.LocationUpdate.ErrorCode"
-    enum="GeopositionErrorCode" expires_after="2021-02-01">
+    enum="GeopositionErrorCode" expires_after="2021-07-18">
   <owner>mattreynolds@chromium.org</owner>
   <owner>device-dev@chromium.org</owner>
   <summary>Error code for the geoposition sent to the renderers.</summary>
@@ -116,7 +116,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Geolocation.PositionCache.CacheHit" units="BooleanCacheHit"
-    expires_after="2021-03-10">
+    expires_after="2021-08-22">
   <owner>mattreynolds@chromium.org</owner>
   <owner>deviceapi-team@google.com</owner>
   <summary>
@@ -198,7 +198,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GeolocationDisclosure.DisclosureResult"
-    enum="GeolocationDisclosureResult" expires_after="M90">
+    enum="GeolocationDisclosureResult" expires_after="2021-06-27">
   <owner>benwells@chromium.org</owner>
   <summary>
     Records the action the user took after the geolocation disclosure has been
diff --git a/chromium/tools/metrics/histograms/histograms_xml/gpu/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/gpu/histograms.xml
index 49f98716d73..fab1104e6ce 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/gpu/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/gpu/histograms.xml
@@ -22,8 +22,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="GPU.AcceleratedSurfaceRefreshRate" units="hz"
-    expires_after="M85">
+    expires_after="M97">
   <owner>vmiura@chromium.org</owner>
+  <owner>graphics-dev@chromium.org</owner>
   <summary>
     Refresh rate of the display in Hz. This is recorded every time we present a
     frame.
@@ -41,56 +42,65 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.ANGLE.D3D11CreateDeviceError" enum="Hresult"
-    expires_after="M90">
-  <owner>jmadill@chromium.org</owner>
+    expires_after="2021-06-30">
+  <owner>jonahr@google.com</owner>
+  <owner>angle-team@google.com</owner>
   <summary>
-    An extended Windows error code returned from D3D11CreateDevice on error. Can
-    be almost any valid HRESULT or DXGI error code, which are listed at
+    An extended Windows error code returned from D3D11CreateDevice on error when
+    ANGLE's D3D backend is in use. Can be almost any valid HRESULT or DXGI error
+    code, which are listed at
     https://msdn.microsoft.com/en-us/library/windows/desktop/bb509553.aspx.
   </summary>
 </histogram>
 
 <histogram name="GPU.ANGLE.D3D11FeatureLevel" enum="D3DFeatureLevel"
-    expires_after="M90">
-  <owner>jmadill@chromium.org</owner>
+    expires_after="2021-06-30">
+  <owner>jonahr@google.com</owner>
+  <owner>angle-team@google.com</owner>
   <summary>
     The maxmium supported (or currently requested) Direct3D feature level in
     D3D11 ANGLE. We support as low as 9.3, and as high as 11.1, though Chrome
     should only use 10.0+ for D3D11. Gives an indication of how new a user's
     video card is, what features it supports, and it's general speed tier.
+    Recorded on D3D device initialization, loss, or reset when ANGLE's D3D
+    backend is in use.
   </summary>
 </histogram>
 
 <histogram name="GPU.ANGLE.D3D11InitializeResult" enum="D3D11InitializeResult"
-    expires_after="2020-11-30">
+    expires_after="2021-06-30">
   <owner>jonahr@google.com</owner>
   <owner>angle-team@google.com</owner>
   <summary>
     The result from initializing a D3D11 device in ANGLE. Can be success, or one
     of several error codes which indicate different reasons for failing.
+    Recorded on D3D11 device initialization when ANGLE's D3D backend is in use.
   </summary>
 </histogram>
 
 <histogram name="GPU.ANGLE.D3D9InitializeResult" enum="D3D9InitializeResult"
-    expires_after="M90">
-  <owner>jmadill@chromium.org</owner>
+    expires_after="2021-06-30">
+  <owner>jonahr@google.com</owner>
+  <owner>angle-team@google.com</owner>
   <summary>
     The result from initializing a D3D9 device in ANGLE. Can be success, or one
     of several error codes which indicate different reasons for failing.
+    Recorded on D3D9 device initialization when ANGLE's D3D backend is in use.
   </summary>
 </histogram>
 
-<histogram name="GPU.ANGLE.D3DCompileMS" units="ms" expires_after="2021-02-28">
+<histogram name="GPU.ANGLE.D3DCompileMS" units="ms" expires_after="2021-06-30">
   <owner>jonahr@google.com</owner>
   <owner>angle-team@google.com</owner>
   <summary>
     The time ANGLE spends calling the D3D shader compiler. Tracks total time we
-    spend compiling shaders on startup and during Chrome's lifetime.
+    spend compiling shaders on startup and during Chrome's lifetime. Recorded on
+    D3D shader compilation when ANGLE's D3D backend is in use.
   </summary>
 </histogram>
 
 <histogram name="GPU.ANGLE.DisplayInitializeMS" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-06-30">
   <owner>jonahr@google.com</owner>
   <owner>angle-team@google.com</owner>
   <summary>
@@ -137,31 +147,35 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.ANGLE.ProgramCache.LoadBinarySuccess"
-    enum="BooleanSuccess" expires_after="2021-04-04">
+    enum="BooleanSuccess" expires_after="2021-06-30">
   <owner>jonahr@google.com</owner>
   <owner>angle-team@google.com</owner>
   <summary>
-    Records if the call to load a cached binary was successful. This can
-    legitimately fail if the driver wants chrome to re-link and re-cache the gpu
-    program.
+    Records if the call to load a cached binary was successful. Calls are made
+    on shader creation and linking. This can legitimately fail if the driver
+    wants chrome to re-link and re-cache the gpu program.
   </summary>
 </histogram>
 
 <histogram name="GPU.ANGLE.ProgramCache.ProgramBinarySizeBytes" units="bytes"
-    expires_after="M90">
-  <owner>jmadill@chromium.org</owner>
+    expires_after="2021-06-30">
+  <owner>jonahr@google.com</owner>
+  <owner>angle-team@google.com</owner>
   <summary>
-    The size of program binaries loaded into the gpu program cache.
+    Records the size of program binaries loaded into the gpu program cache.
+    Programs are loaded into the cache upon use in draw and dispatch calls.
   </summary>
 </histogram>
 
 <histogram name="GPU.ANGLE.SupportsDXGI1_2" enum="BooleanSupported"
-    expires_after="M90">
-  <owner>jmadill@chromium.org</owner>
+    expires_after="2021-06-30">
+  <owner>jonahr@google.com</owner>
+  <owner>angle-team@google.com</owner>
   <summary>
     Windows computers running Windows 8+, or running Windows 7 with a platform
     update, support the newer version of DXGI. This update also indicates the
     computer is capable of running Direct3D 11.1 if the hardware supports it.
+    Recorded on D3D11 device initialization when ANGLE's D3D backend is in use.
   </summary>
 </histogram>
 
@@ -200,7 +214,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.BlacklistFeatureTestResults"
-    enum="GPUBlacklistFeatureTestResults" expires_after="2021-03-21">
+    enum="GPUBlocklistFeatureTestResults" expires_after="M89">
+  <obsolete>
+    Replaced by GPU.BlocklistFeatureTestResults in M89.
+  </obsolete>
   <owner>vmiura@chromium.org</owner>
   <summary>
     Counts number of browser invocations for which a GPU feature is
@@ -209,7 +226,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.BlacklistFeatureTestResultsWindows2"
-    enum="GPUBlacklistFeatureTestResultsWindows2" expires_after="2020-05-10">
+    enum="GPUBlocklistFeatureTestResultsWindows2" expires_after="M89">
   <obsolete>
     Removed in Oct 2020.
   </obsolete>
@@ -221,7 +238,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.BlacklistTestResultsPerDisabledEntry"
-    enum="GPUBlacklistTestResultPerEntry" expires_after="M85">
+    enum="GPUBlocklistTestResultPerEntry" expires_after="M85">
+  <obsolete>
+    Removed before M86.
+  </obsolete>
   <owner>vmiura@chromium.org</owner>
   <summary>
     Counts number of browser invocations for which a disabled blacklist entry is
@@ -230,11 +250,34 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.BlacklistTestResultsPerEntry"
-    enum="GPUBlacklistTestResultPerEntry" expires_after="2020-04-26">
+    enum="GPUBlocklistTestResultPerEntry" expires_after="M89">
+  <obsolete>
+    Replaced by GPU.BlocklistTestResultsPerEntry in M89.
+  </obsolete>
   <owner>vmiura@chromium.org</owner>
   <summary>
     Counts number of browser invocations for which the GPU process is blocked
-    due to a blacklist entry match.
+    due to a blocklist entry match.
+  </summary>
+</histogram>
+
+<histogram name="GPU.BlocklistFeatureTestResults"
+    enum="GPUBlocklistFeatureTestResults" expires_after="2021-12-01">
+  <owner>vmiura@chromium.org</owner>
+  <owner>graphics-dev@chromium.org</owner>
+  <summary>
+    Counts number of browser invocations for which a GPU feature is
+    allowed/blocklisted/disabled.
+  </summary>
+</histogram>
+
+<histogram name="GPU.BlocklistTestResultsPerEntry"
+    enum="GPUBlocklistTestResultPerEntry" expires_after="2021-12-01">
+  <owner>vmiura@chromium.org</owner>
+  <owner>graphics-dev@chromium.org</owner>
+  <summary>
+    Counts number of browser invocations for which the GPU process is blocked
+    due to a blocklist entry match.
   </summary>
 </histogram>
 
@@ -265,7 +308,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.ContextLost" enum="ContextLostReason"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>sievers@chromium.org</owner>
   <summary>
     The reason a GPU command buffer context of a given type was lost.
@@ -295,7 +338,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.D3D11FeatureLevel" enum="D3D11FeatureLevel"
-    expires_after="2021-05-02">
+    expires_after="2021-12-01">
   <owner>sadrul@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -305,18 +348,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.D3D12FeatureLevel" enum="D3D12FeatureLevel"
-    expires_after="2020-12-01">
-  <owner>vmiura@chromium.org</owner>
+    expires_after="2021-12-01">
   <owner>magchen@chromium.org</owner>
+  <owner>zmo@chromium.org</owner>
   <summary>
     The maximum D3D12 feature level supported in the gpu drivers. It is recorded
-    15 seconds after the browser launch.
+    in the browser process 120 seconds after the browser launch.
   </summary>
 </histogram>
 
 <histogram name="GPU.D3DShaderModel" enum="ShaderModel"
-    expires_after="2021-09-01">
-  <owner>jmadill@chromium.org</owner>
+    expires_after="2021-06-30">
+  <owner>jonahr@google.com</owner>
+  <owner>angle-team@google.com</owner>
   <summary>
     ANGLE's currently active D3D shader model version. Logged once every startup
     of the GPU process, on Windows only. Note that Shader Models 2 and 3 map to
@@ -325,7 +369,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.DirectComposition.ApprovedPresentDuration" units="ms"
-    expires_after="2021-01-03">
+    expires_after="2022-01-03">
   <owner>sunnyps@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -336,7 +380,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.DirectComposition.CompositionMode"
-    enum="DxgiFramePresentationMode" expires_after="2021-05-02">
+    enum="DxgiFramePresentationMode" expires_after="2021-07-27">
   <owner>sunnyps@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -356,7 +400,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.DirectComposition.CreateSwapChainForComposition"
-    enum="Hresult" expires_after="2021-05-02">
+    enum="Hresult" expires_after="2021-07-27">
   <owner>magchen@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -365,7 +409,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.DirectComposition.CreateVideoProcessorEnumerator"
-    enum="Hresult" expires_after="2021-05-02">
+    enum="Hresult" expires_after="2021-08-01">
   <owner>magchen@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -375,7 +419,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.DirectComposition.DCLayer.YUVOverlayCount"
-    units="overlays" expires_after="2021-03-15">
+    units="overlays" expires_after="2021-07-27">
   <owner>magchen@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -386,7 +430,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.DirectComposition.DCLayerResult.Texture"
-    enum="DCLayerResult" expires_after="2021-05-02">
+    enum="DCLayerResult" expires_after="2021-08-01">
   <owner>sunnyps@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -396,7 +440,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="GPU.DirectComposition.DCLayerResult.Video"
-    enum="DCLayerResult" expires_after="2021-05-02">
+    enum="DCLayerResult" expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="GPU.ProtectedVideoType" -->
 
   <owner>magchen@chromium.org</owner>
@@ -408,7 +452,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.DirectComposition.DcompDeviceCreateSurface" enum="Hresult"
-    expires_after="2021-05-02">
+    expires_after="2021-07-27">
   <owner>magchen@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -456,7 +500,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.DirectComposition.IsUnderlay" enum="BooleanUnderlay"
-    expires_after="2021-05-02">
+    expires_after="2021-07-27">
   <owner>magchen@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -476,7 +520,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.DirectComposition.OverlayFormatUsed3" enum="DXGI_FORMAT"
-    expires_after="2021-05-02">
+    expires_after="2021-08-01">
   <owner>sunnyps@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -486,7 +530,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.DirectComposition.OverlaysSupported"
-    enum="BooleanOverlaySupported" expires_after="2021-05-31">
+    enum="BooleanOverlaySupported" expires_after="2021-08-01">
   <owner>sunnyps@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>True if Chrome will try to use DirectComposition overlays.</summary>
@@ -512,7 +556,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="GPU.DirectComposition.SwapChainCreationResult3"
-    enum="Hresult" expires_after="2021-05-02">
+    enum="Hresult" expires_after="2021-07-27">
 <!-- Name completed by histogram_suffixes name="GPU.ProtectedVideoType" -->
 
   <owner>magchen@chromium.org</owner>
@@ -533,7 +577,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.DirectComposition.UploadVideoImages.CreateCopyTexture"
-    enum="Hresult" expires_after="2021-05-02">
+    enum="Hresult" expires_after="2021-08-01">
   <owner>magchen@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -543,7 +587,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.DirectComposition.UploadVideoImages.CreateStagingTexture"
-    enum="Hresult" expires_after="2021-05-02">
+    enum="Hresult" expires_after="2021-08-01">
   <owner>magchen@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -553,7 +597,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.DirectComposition.VideoDeviceCreateVideoProcessor"
-    enum="Hresult" expires_after="2021-05-02">
+    enum="Hresult" expires_after="2021-08-01">
   <owner>magchen@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -563,7 +607,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.DirectComposition.VideoPresentationMode"
-    enum="DirectCompositionVideoPresentationMode" expires_after="2021-04-25">
+    enum="DirectCompositionVideoPresentationMode" expires_after="2021-06-27">
   <owner>sunnyps@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -571,7 +615,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="GPU.DoLinkProgramTime" units="ms" expires_after="2020-11-30">
+<histogram name="GPU.DoLinkProgramTime" units="ms" expires_after="2021-06-30">
   <owner>jonahr@google.com</owner>
   <owner>angle-team@google.com</owner>
   <summary>
@@ -596,8 +640,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.EGLDisplayType" enum="EGLDisplayType"
-    expires_after="2021-05-09">
-  <owner>jbauman@chromium.org</owner>
+    expires_after="2021-12-01">
+  <owner>zmo@chromium.org</owner>
+  <owner>graphics-dev@chromium.org</owner>
   <summary>The display type used to ask for an EGLDisplay.</summary>
 </histogram>
 
@@ -616,7 +661,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.GLImplementation" enum="GLImplementation"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>magchen@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -627,6 +672,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="GPU.GpuBlockedBetweenSwapsUs2" units="microseconds"
     expires_after="2020-12-01">
+  <obsolete>
+    Removed in Nov 2020 (available as local histogram for telemetry runs).
+  </obsolete>
   <owner>vasilyt@chromium.org</owner>
   <owner>backer@chromium.org</owner>
   <summary>
@@ -640,7 +688,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.GPUChannelHostWaitTime2" units="ms"
-    expires_after="2020-11-29">
+    expires_after="2020-11-18">
+  <obsolete>
+    Used by GPU watchdog V2 finch. Obsolete since 11/18/2020.
+  </obsolete>
   <owner>magchen@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -650,8 +701,31 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="GPU.GPUChannelHostWaitTime3" units="microseconds"
+    expires_after="2021-12-01">
+  <owner>magchen@chromium.org</owner>
+  <owner>zmo@chromium.org</owner>
+  <summary>
+    The wait time between the IPC message sent from the GPU channel host and the
+    event sync from the GPU process. This is the time the browser UI thread
+    spends blocked. Recorded only for users with high-resolution clocks.
+  </summary>
+</histogram>
+
+<histogram name="GPU.GpuCount" units="gpus" expires_after="2021-12-01">
+  <owner>zmo@chromium.org</owner>
+  <owner>graphics-dev@chromium.org</owner>
+  <summary>
+    The number of GPUs a device has, excluding software renderers. Recorded when
+    GPU process launches and sends GPUInfo to browser process.
+  </summary>
+</histogram>
+
 <histogram name="GPU.GPUInitializationTime.V2" units="ms"
-    expires_after="2021-01-08">
+    expires_after="2020-12-15">
+  <obsolete>
+    Removed 12/2020. Moved to GPU.GPUInitializationTime.V3.
+  </obsolete>
   <owner>magchen@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -661,6 +735,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="GPU.GPUInitializationTime.V3" units="ms"
+    expires_after="2021-12-15">
+  <owner>magchen@chromium.org</owner>
+  <owner>zmo@chromium.org</owner>
+  <summary>
+    The time between the GPU process starts and the GPU Info is collected at GPU
+    process startup and recorded in browser process when this piece info is sent
+    back to browser process. The range is between 5ms and 5s.
+  </summary>
+</histogram>
+
 <histogram name="GPU.GPUProcessDetailedExitStatus"
     enum="ProcessDetailedExitStatus" expires_after="2020-05-03">
   <owner>wnwen@chromium.org</owner>
@@ -670,8 +755,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.GPUProcessExitCode" enum="GPUProcessExitCode"
-    expires_after="2021-03-15">
-  <owner>jbauman@chromium.org</owner>
+    expires_after="2021-12-01">
+  <owner>zmo@chromium.org</owner>
+  <owner>graphics-dev@chromium.org</owner>
   <summary>
     Counts for the exit codes returned by the GPU process when it terminated.
   </summary>
@@ -687,7 +773,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.GPUProcessLaunchTime" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>vmiura@chromium.org</owner>
   <summary>
     Startup time of the GPU process as measured by the GPU process host.
@@ -708,15 +794,25 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.GPUProcessTerminationStatus2" enum="GpuTerminationStatus"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>vmiura@chromium.org</owner>
   <summary>
     Counts for each time the GPU Process Host detects the process dies.
   </summary>
 </histogram>
 
+<histogram name="GPU.HardwareAccelerationModeEnabled" enum="BooleanEnabled"
+    expires_after="2021-12-01">
+  <owner>zmo@chromium.org</owner>
+  <owner>graphics-dev@chromium.org</owner>
+  <summary>
+    Records if GPU hardware acceleration is explicitly disabled by the user.
+    Recorded when the browser process launches.
+  </summary>
+</histogram>
+
 <histogram name="GPU.HasDiscreteGpu" enum="HasDiscreteGpu"
-    expires_after="2021-02-21">
+    expires_after="2021-12-01">
   <owner>sadrul@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -726,7 +822,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.InitializeOneOffMediumTime" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-06-30">
   <owner>jonahr@google.com</owner>
   <owner>angle-team@google.com</owner>
   <summary>
@@ -736,7 +832,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.IntelGpuGeneration" enum="IntelGpuGeneration"
-    expires_after="2021-05-02">
+    expires_after="2021-08-09">
   <owner>sadrul@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -746,7 +842,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.IntelGpuSeriesType" enum="IntelGpuSeriesType"
-    expires_after="2021-05-02">
+    expires_after="2021-08-01">
   <owner>sunnyps@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -765,7 +861,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.IOSurface.CreateTime" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>ccameron@chromium.org</owner>
   <summary>
     The time that it took for a call to IOSurfaceCreate to complete.
@@ -781,7 +877,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.IOSurface.TexImageTime" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-08-01">
   <owner>ccameron@chromium.org</owner>
   <summary>
     The time that it took for a call to CGLTexImageIOSurface2D to complete.
@@ -797,8 +893,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="GPU.MultiGpu.AMD" enum="AMDDeviceId"
+    expires_after="2021-12-01">
+  <owner>zmo@chromium.org</owner>
+  <owner>graphics-dev@chromium.org</owner>
+  <summary>
+    AMD device IDs from multi-gpu devices. Recorded when GPU process launches
+    and sends GPUInfo to browser process.
+  </summary>
+</histogram>
+
+<histogram name="GPU.MultiGpu.Nvidia" enum="NvidiaDeviceId"
+    expires_after="2021-12-01">
+  <owner>zmo@chromium.org</owner>
+  <owner>graphics-dev@chromium.org</owner>
+  <summary>
+    Nvidia device IDs from multi-gpu devices. Recorded when GPU process launches
+    and sends GPUInfo to browser process.
+  </summary>
+</histogram>
+
 <histogram name="GPU.OopRaster.GlyphCacheMiss"
-    enum="OopRasterGlyphCacheMissType" expires_after="2021-04-11">
+    enum="OopRasterGlyphCacheMissType" expires_after="2021-08-15">
   <owner>khushalsagar@chromium.org</owner>
   <summary>
     During OutOfProcess(Oop) raster, the renderer generates and sends the
@@ -823,7 +939,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="GPU.Output.HDR" enum="Boolean" expires_after="2021-05-02">
+<histogram name="GPU.Output.HDR" enum="Boolean" expires_after="2021-07-27">
   <owner>hubbe@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -834,7 +950,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.PassthroughDoLinkProgramTime" units="ms"
-    expires_after="2020-11-30">
+    expires_after="2021-06-30">
   <owner>jonahr@google.com</owner>
   <owner>angle-team@google.com</owner>
   <summary>
@@ -855,7 +971,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.ProcessLifetimeEvents.HardwareAccelerated"
-    enum="GPUProcessLifetimeEvent" expires_after="2021-03-15">
+    enum="GPUProcessLifetimeEvent" expires_after="2021-07-18">
   <owner>vmiura@chromium.org</owner>
   <summary>
     Recorded once for every GPU process launch and crash when GPU process is
@@ -866,7 +982,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.ProcessLifetimeEvents.SwiftShader"
-    enum="GPUProcessLifetimeEvent" expires_after="2021-05-02">
+    enum="GPUProcessLifetimeEvent" expires_after="2021-07-04">
   <owner>vmiura@chromium.org</owner>
   <summary>
     Recorded once for every GPU process launch and crash when GPU process is
@@ -905,7 +1021,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.ProgramCache.CacheHit" enum="BooleanSuccess"
-    expires_after="2020-11-30">
+    expires_after="2021-06-30">
   <owner>jonahr@google.com</owner>
   <owner>angle-team@google.com</owner>
   <summary>
@@ -973,7 +1089,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.Scheduler.RunTaskTime" units="microseconds"
-    expires_after="2021-03-15">
+    expires_after="2021-08-09">
   <owner>kylechar@chromium.org</owner>
   <owner>chrome-gpu-metrics@google.com</owner>
   <summary>
@@ -1003,7 +1119,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.SharedImage.ContentConsumed" enum="BooleanMatched"
-    expires_after="2021-03-21">
+    expires_after="2021-08-09">
   <owner>penghuang@chromium.org</owner>
   <owner>backer@chromium.org</owner>
   <summary>
@@ -1024,7 +1140,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.SoftwareRendering" enum="BooleanSoftwareRendering"
-    expires_after="2021-05-02">
+    expires_after="2021-07-27">
   <owner>sadrul@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -1046,12 +1162,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.SupportsDX12" enum="BooleanSupported"
-    expires_after="2020-12-01">
-  <owner>vmiura@chromium.org</owner>
+    expires_after="2021-12-01">
   <owner>magchen@chromium.org</owner>
+  <owner>zmo@chromium.org</owner>
   <summary>
-    This metric shows whether the GPU supports D3D12. It is recorded 120 seconds
-    after the browser launch.
+    This metric shows whether the GPU supports D3D12. It is recorded in the
+    browser process 120 seconds after the browser launch.
   </summary>
 </histogram>
 
@@ -1065,7 +1181,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.SwapTimeUs" units="microseconds"
-    expires_after="2021-03-21">
+    expires_after="2021-08-09">
   <owner>vasilyt@chromium.org</owner>
   <owner>backer@chromium.org</owner>
   <summary>
@@ -1085,7 +1201,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.Vulkan.CreateExternalVkSemaphore" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>backer@chromium.org</owner>
   <owner>penghuang@chromium.org</owner>
   <owner>vasilyt@chromium.org</owner>
@@ -1107,7 +1223,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.Vulkan.ImportSemaphoreGLPerSwapBuffers" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>backer@chromium.org</owner>
   <owner>penghuang@chromium.org</owner>
   <owner>vasilyt@chromium.org</owner>
@@ -1115,7 +1231,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.Vulkan.ImportVkSemaphoreHandle" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>backer@chromium.org</owner>
   <owner>penghuang@chromium.org</owner>
   <owner>vasilyt@chromium.org</owner>
@@ -1126,7 +1242,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.Vulkan.ImportVkSemaphoreIntoGL" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>backer@chromium.org</owner>
   <owner>penghuang@chromium.org</owner>
   <owner>vasilyt@chromium.org</owner>
@@ -1136,8 +1252,67 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="GPU.Vulkan.PipelineCache.LoadCacheHit" enum="BooleanCacheHit"
+    expires_after="2021-06-25">
+  <owner>backer@chromium.org</owner>
+  <owner>penghuang@chromium.org</owner>
+  <owner>vasilyt@chromium.org</owner>
+  <summary>
+    Shows if we had a vkPipelineCache entry in cache when skia requested it.
+    Recorded each time skia loads vkPipelineCache entry from the GrShaderCache.
+  </summary>
+</histogram>
+
+<histogram name="GPU.Vulkan.PipelineCache.PopulatedCacheUsage"
+    enum="VkPipelinePopulatedCacheEntryUsage" expires_after="2021-06-25">
+  <owner>backer@chromium.org</owner>
+  <owner>penghuang@chromium.org</owner>
+  <owner>vasilyt@chromium.org</owner>
+  <summary>
+    Shows if the populated from disk cache entry was used by skia or discarded
+    and why. Recorded when cache entry that was read from disk is either loaded
+    by skia, overwriten by skia or discarded by GrShaderCache.
+  </summary>
+</histogram>
+
+<histogram name="GPU.Vulkan.PipelineCache.Size" units="KB"
+    expires_after="2021-06-25">
+  <owner>backer@chromium.org</owner>
+  <owner>penghuang@chromium.org</owner>
+  <owner>vasilyt@chromium.org</owner>
+  <summary>
+    Size of stored VkPipelineCache in kb. Recorded every time we store a
+    pipeline cache item. Currently happens when gpu goes idle after we stored or
+    loaded new shader.
+  </summary>
+</histogram>
+
+<histogram name="GPU.Vulkan.PipelineCache.StoreDuration" units="microseconds"
+    expires_after="2021-06-25">
+  <owner>backer@chromium.org</owner>
+  <owner>penghuang@chromium.org</owner>
+  <owner>vasilyt@chromium.org</owner>
+  <summary>
+    Duration of storeVkPipelineCacheData in Skia, this includes chromium side
+    GrShaderCache::store. Recorded even if data didn't fit into the cache. Only
+    reported for platforms supporting high resolution clocks.
+  </summary>
+</histogram>
+
+<histogram name="GPU.Vulkan.PipelineCache.vkCreateGraphicsPipelines"
+    units="microseconds" expires_after="2021-06-25">
+  <owner>backer@chromium.org</owner>
+  <owner>penghuang@chromium.org</owner>
+  <owner>vasilyt@chromium.org</owner>
+  <summary>
+    Duration of vkCreateGraphicsPipelines call. Recorded every time Skia creates
+    graphics pipeline. Only reported for platforms supporting high resolution
+    clocks.
+  </summary>
+</histogram>
+
 <histogram name="GPU.Vulkan.QueueSubmitPerSwapBuffers" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>backer@chromium.org</owner>
   <owner>penghuang@chromium.org</owner>
   <owner>vasilyt@chromium.org</owner>
@@ -1168,7 +1343,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.WatchdogThread.ExtraThreadTime" units="# timeouts"
-    expires_after="2021-03-15">
+    expires_after="2021-07-27">
 <!-- Name completed by histogram_suffixes name="GPU.WatchdogStage" -->
 
   <owner>magchen@chromium.org</owner>
@@ -1180,7 +1355,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.WatchdogThread.ExtraThreadTime.NumOfUsers"
-    units="# timeouts" expires_after="2021-03-15">
+    units="# timeouts" expires_after="2021-07-27">
   <owner>magchen@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -1192,7 +1367,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.WatchdogThread.Timeout" enum="GpuWatchdogTimeoutEvent"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
 <!-- Name completed by histogram_suffixes name="GPU.WatchdogStage" -->
 
   <owner>magchen@chromium.org</owner>
@@ -1203,7 +1378,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.WatchdogThread.WaitTime" units="ms"
-    expires_after="2020-12-15">
+    expires_after="2020-11-18">
+  <obsolete>
+    Used for an experiment only. Removed 11/2020.
+  </obsolete>
 <!-- Name completed by histogram_suffixes name="GPU.WatchdogStage" -->
 
   <owner>magchen@chromium.org</owner>
@@ -1215,7 +1393,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.WatchdogThread.WaitTime.NumOfUsers" units="seconds"
-    expires_after="2020-12-15">
+    expires_after="2020-11-18">
+  <obsolete>
+    Used for an experiment only. Removed 11/2020.
+  </obsolete>
   <owner>magchen@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -1227,7 +1408,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.WatchdogThread.WaitTime.ProgressAfterWait" units="seconds"
-    expires_after="2020-12-15">
+    expires_after="2020-11-18">
+  <obsolete>
+    Used for an experiment only. Removed 11/2020.
+  </obsolete>
   <owner>magchen@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/hang_watcher/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/hang_watcher/histograms.xml
index c13fd879646..27440583997 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/hang_watcher/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/hang_watcher/histograms.xml
@@ -32,9 +32,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <variant name="UIThread"/>
 </variants>
 
+<histogram name="HangWatcher.IsThreadHung.{ProcessType}.{ThreadType}"
+    enum="BooleanHung" expires_after="2021-10-23">
+  <owner>olivierli@chromium.org</owner>
+  <owner>chrome-catan@google.com</owner>
+  <summary>
+    Every 10 seconds, a boolean is recorded to this histogram to indicate
+    whether the {ProcessType} {ThreadType} was hung. The thread is hung if the
+    current work unit started running more than 10 seconds ago and this was not
+    labeled as &quot;working as intended&quot; by HangWatchScopeDisabled.
+    Recording is skipped if the hang watcher detects an irregular heartbeat
+    (e.g. when the machine sleeps).
+  </summary>
+  <token key="ProcessType" variants="ProcessType"/>
+  <token key="ThreadType" variants="ThreadType"/>
+</histogram>
+
 <histogram
     name="HangWatcher.NumberOfHungThreadsDuringWatchWindow.{ProcessType}.{ThreadType}"
     units="threads" expires_after="2021-10-23">
+  <obsolete>
+    Replaced by HangWatcher.IsThreadHung on 11-2020.
+  </obsolete>
   <owner>olivierli@chromium.org</owner>
   <owner>chrome-catan@google.com</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/help_app/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/help_app/histograms.xml
new file mode 100644
index 00000000000..32f692731ed
--- /dev/null
+++ b/chromium/tools/metrics/histograms/histograms_xml/help_app/histograms.xml
@@ -0,0 +1,38 @@
+<!--
+Copyright 2021 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<!--
+This file is used to generate a comprehensive list of History histograms
+along with a detailed description for each histogram.
+
+For best practices on writing histogram descriptions, see
+https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/metrics/histograms/README.md
+
+Please send CLs to chromium-metrics-reviews@google.com rather than to specific
+individuals. These CLs will be automatically reassigned to a reviewer within
+about 5 minutes. This approach helps the metrics team to load-balance incoming
+reviews. Googlers can read more about this at go/gwsq-gerrit.
+-->
+
+<histogram-configuration>
+
+<histograms>
+
+<histogram name="Discover.Search.SearchStatus"
+    enum="LocalSearchServiceResponseStatus" expires_after="2022-01-08">
+  <owner>callistus@google.com</owner>
+  <owner>showoff-eng@google.com</owner>
+  <summary>
+    Records the search status when searching with the Local Search Service in
+    the Discover (internally &quot;Showoff&quot;) app. This is logged once per
+    user search and will count the number of searches while the index is still
+    empty, successful searches, etc.
+  </summary>
+</histogram>
+
+</histograms>
+
+</histogram-configuration>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml b/chromium/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml
index 9836a6c6ad6..212c4b819d5 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml
@@ -599,6 +599,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
       name="PageLoad.AdPaintTiming.NavigationToFirstContentfulPaint"/>
   <affected-histogram
       name="PageLoad.AdPaintTiming.NavigationToFirstContentfulPaint2"/>
+  <affected-histogram
+      name="PageLoad.AdPaintTiming.NavigationToFirstContentfulPaint3"/>
   <affected-histogram name="PageLoad.Bytes"/>
   <affected-histogram name="PageLoad.Cpu"/>
   <affected-histogram
@@ -772,8 +774,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="autofill_assistant" label="Assistant-in-Chrome Module"/>
   <suffix name="cablev2_authenticator" label="caBLEv2 Authenticator Module"/>
   <suffix name="chime" label="Chime Notification Module"/>
+  <suffix name="chrome" label="Chrome Module"/>
   <suffix name="dev_ui" label="Developer UI Module"/>
   <suffix name="extra_icu" label="Extra ICU Module"/>
+  <suffix name="feedv2" label="Feed V2 Module"/>
   <suffix name="image_editor" label="Image Editor Module"/>
   <suffix name="stack_unwinder" label="Stack Unwinder Module"/>
   <suffix name="tab_ui" label="Tab Management Module"/>
@@ -827,6 +831,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
       name="Android.FeatureModules.UncachedInstallDuration.PendingDownload"/>
   <affected-histogram
       name="Android.FeatureModules.UncachedInstallDuration.PendingInstall"/>
+  <affected-histogram name="Android.IsolatedSplits.ClassLoaderReplaced"/>
+  <affected-histogram name="Android.IsolatedSplits.ContextCreateTime"/>
+  <affected-histogram name="Android.IsolatedSplits.PreloadWaitTime"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="AndroidGATTEvents" separator=".">
@@ -1023,8 +1030,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="Arc.PlayAutoInstallRequest.State"/>
   <affected-histogram name="Arc.PlayAutoInstallRequest.TimeDelta"/>
   <affected-histogram name="Arc.PlayStoreShown.TimeDelta"/>
+  <affected-histogram name="Arc.Provisioning.CheckInError"/>
   <affected-histogram name="Arc.Provisioning.CloudFlowError"/>
   <affected-histogram name="Arc.Provisioning.Result"/>
+  <affected-histogram name="Arc.Provisioning.SignInError"/>
+  <affected-histogram name="Arc.Provisioning.Status"/>
   <affected-histogram name="Arc.Provisioning.TimeDelta.Failure"/>
   <affected-histogram name="Arc.Provisioning.TimeDelta.Success"/>
   <affected-histogram name="Arc.Reauthorization.Result"/>
@@ -1081,6 +1091,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram_suffixes>
 
 <histogram_suffixes name="AsyncDNSPref" separator="_">
+  <obsolete>
+    All histograms removed unknown date before 2021-01.
+  </obsolete>
   <suffix name="Disabled" label=""/>
   <suffix name="Enabled" label=""/>
   <affected-histogram name="AsyncDNS.PrefDefaultSource"/>
@@ -1283,7 +1296,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="Reshows" label="Bubble was reopened after being closed"/>
   <affected-histogram name="Autofill.LocalCardMigrationBubbleOffer"/>
   <affected-histogram name="Autofill.LocalCardMigrationBubbleResult"/>
-  <affected-histogram name="Autofill.LocalCardMigrationBubbleUserInteraction"/>
 </histogram_suffixes>
 
 <histogram_suffixes
@@ -1333,7 +1345,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     separator=".">
   <suffix name="Local" label="to local storage"/>
   <suffix name="Upload" label="to upload"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt"/>
   <affected-histogram name="Autofill.SaveCreditCardPromptOffer"/>
   <affected-histogram name="Autofill.SaveCreditCardPromptResult"/>
 </histogram_suffixes>
@@ -1344,10 +1355,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
       label="Prompt shown from dynamic change forms"/>
   <affected-histogram name="Autofill.CreditCardInfoBar.Local"/>
   <affected-histogram name="Autofill.CreditCardInfoBar.Server"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Local.FirstShow"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Local.Reshows"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Upload.FirstShow"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Upload.Reshows"/>
   <affected-histogram
       name="Autofill.SaveCreditCardPromptOffer.Local.FirstShow"/>
   <affected-histogram name="Autofill.SaveCreditCardPromptOffer.Local.Reshows"/>
@@ -1369,10 +1376,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
       label="Prompt shown from non-focusable forms"/>
   <affected-histogram name="Autofill.CreditCardInfoBar.Local"/>
   <affected-histogram name="Autofill.CreditCardInfoBar.Server"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Local.FirstShow"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Local.Reshows"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Upload.FirstShow"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Upload.Reshows"/>
   <affected-histogram
       name="Autofill.SaveCreditCardPromptOffer.Local.FirstShow"/>
   <affected-histogram name="Autofill.SaveCreditCardPromptOffer.Local.Reshows"/>
@@ -1398,10 +1401,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
       label="User had previously denied save credit card prompt"/>
   <affected-histogram name="Autofill.CreditCardInfoBar.Local"/>
   <affected-histogram name="Autofill.CreditCardInfoBar.Server"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Local.FirstShow"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Local.Reshows"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Upload.FirstShow"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Upload.Reshows"/>
   <affected-histogram
       name="Autofill.SaveCreditCardPromptOffer.Local.FirstShow"/>
   <affected-histogram name="Autofill.SaveCreditCardPromptOffer.Local.Reshows"/>
@@ -1423,8 +1422,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
       label="Cardholder name was explicitly requested in prompt or infobar"/>
   <affected-histogram name="Autofill.CreditCardInfoBar.Local"/>
   <affected-histogram name="Autofill.CreditCardInfoBar.Server"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Upload.FirstShow"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Upload.Reshows"/>
   <affected-histogram
       name="Autofill.SaveCreditCardPromptOffer.Upload.FirstShow"/>
   <affected-histogram name="Autofill.SaveCreditCardPromptOffer.Upload.Reshows"/>
@@ -1440,8 +1437,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
       label="Expiration date was explicitly requested in prompt or infobar"/>
   <affected-histogram name="Autofill.CreditCardInfoBar.Local"/>
   <affected-histogram name="Autofill.CreditCardInfoBar.Server"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Upload.FirstShow"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Upload.Reshows"/>
   <affected-histogram
       name="Autofill.SaveCreditCardPromptOffer.Upload.FirstShow"/>
   <affected-histogram name="Autofill.SaveCreditCardPromptOffer.Upload.Reshows"/>
@@ -1455,8 +1450,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="FirstShow"
       label="first time prompt is shown for a single credit card submit"/>
   <suffix name="Reshows" label="all shows after the first one, combined"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Local"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Upload"/>
   <affected-histogram name="Autofill.SaveCreditCardPromptOffer.Local"/>
   <affected-histogram name="Autofill.SaveCreditCardPromptOffer.Upload"/>
   <affected-histogram name="Autofill.SaveCreditCardPromptResult.Local"/>
@@ -1571,10 +1564,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="Autofill.FormEvents.CreditCard.WithOnlyLocalData"/>
   <affected-histogram name="Autofill.FormEvents.CreditCard.WithOnlyServerData"/>
   <affected-histogram name="Autofill.IsEnabled.PageLoad"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Local.FirstShow"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Local.Reshows"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Upload.FirstShow"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Upload.Reshows"/>
   <affected-histogram
       name="Autofill.SaveCreditCardPromptOffer.Local.FirstShow"/>
   <affected-histogram name="Autofill.SaveCreditCardPromptOffer.Local.Reshows"/>
@@ -1984,19 +1973,29 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="Blink.CompositingAssignments.UpdateTime"/>
   <affected-histogram name="Blink.CompositingCommit.UpdateTime"/>
   <affected-histogram name="Blink.CompositingInputs.UpdateTime"/>
+  <affected-histogram name="Blink.ContentDocumentUpdate.UpdateTime"/>
+  <affected-histogram name="Blink.DisplayLockIntersectionObserver.UpdateTime"/>
   <affected-histogram name="Blink.ForcedStyleAndLayout.UpdateTime"/>
   <affected-histogram name="Blink.HandleInputEvents.UpdateTime"/>
   <affected-histogram name="Blink.HitTestDocumentUpdate.UpdateTime"/>
   <affected-histogram name="Blink.ImplCompositorCommit.UpdateTime"/>
   <affected-histogram name="Blink.IntersectionObservation.UpdateTime"/>
+  <affected-histogram name="Blink.JavascriptDocumentUpdate.UpdateTime"/>
+  <affected-histogram name="Blink.JavascriptIntersectionObserver.UpdateTime"/>
   <affected-histogram name="Blink.Layout.UpdateTime"/>
+  <affected-histogram name="Blink.LazyLoadIntersectionObserver.UpdateTime"/>
   <affected-histogram name="Blink.MainFrame.UpdateTime"/>
+  <affected-histogram name="Blink.MediaIntersectionObserver.UpdateTime"/>
   <affected-histogram name="Blink.Paint.UpdateTime"/>
   <affected-histogram name="Blink.PrePaint.UpdateTime"/>
   <affected-histogram name="Blink.ProxyCommit.UpdateTime"/>
+  <affected-histogram name="Blink.ScrollDocumentUpdate.UpdateTime"/>
   <affected-histogram name="Blink.ScrollingCoordinator.UpdateTime"/>
+  <affected-histogram name="Blink.ServiceDocumentUpdate.UpdateTime"/>
   <affected-histogram name="Blink.Style.UpdateTime"/>
   <affected-histogram name="Blink.StyleAndLayout.UpdateTime"/>
+  <affected-histogram name="Blink.UpdateViewportIntersection.UpdateTime"/>
+  <affected-histogram name="Blink.UserDrivenDocumentUpdate.UpdateTime"/>
   <affected-histogram name="Blink.WaitForCommit.UpdateTime"/>
 </histogram_suffixes>
 
@@ -2007,19 +2006,29 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="Blink.CompositingAssignments.UpdateTime"/>
   <affected-histogram name="Blink.CompositingCommit.UpdateTime"/>
   <affected-histogram name="Blink.CompositingInputs.UpdateTime"/>
+  <affected-histogram name="Blink.ContentDocumentUpdate.UpdateTime"/>
+  <affected-histogram name="Blink.DisplayLockIntersectionObserver.UpdateTime"/>
   <affected-histogram name="Blink.ForcedStyleAndLayout.UpdateTime"/>
   <affected-histogram name="Blink.HandleInputEvents.UpdateTime"/>
   <affected-histogram name="Blink.HitTestDocumentUpdate.UpdateTime"/>
   <affected-histogram name="Blink.ImplCompositorCommit.UpdateTime"/>
   <affected-histogram name="Blink.IntersectionObservation.UpdateTime"/>
+  <affected-histogram name="Blink.JavascriptDocumentUpdate.UpdateTime"/>
+  <affected-histogram name="Blink.JavascriptIntersectionObserver.UpdateTime"/>
   <affected-histogram name="Blink.Layout.UpdateTime"/>
+  <affected-histogram name="Blink.LazyLoadIntersectionObserver.UpdateTime"/>
   <affected-histogram name="Blink.MainFrame.UpdateTime"/>
+  <affected-histogram name="Blink.MediaIntersectionObserver.UpdateTime"/>
   <affected-histogram name="Blink.Paint.UpdateTime"/>
   <affected-histogram name="Blink.PrePaint.UpdateTime"/>
   <affected-histogram name="Blink.ProxyCommit.UpdateTime"/>
+  <affected-histogram name="Blink.ScrollDocumentUpdate.UpdateTime"/>
   <affected-histogram name="Blink.ScrollingCoordinator.UpdateTime"/>
+  <affected-histogram name="Blink.ServiceDocumentUpdate.UpdateTime"/>
   <affected-histogram name="Blink.Style.UpdateTime"/>
   <affected-histogram name="Blink.StyleAndLayout.UpdateTime"/>
+  <affected-histogram name="Blink.UpdateViewportIntersection.UpdateTime"/>
+  <affected-histogram name="Blink.UserDrivenDocumentUpdate.UpdateTime"/>
   <affected-histogram name="Blink.WaitForCommit.UpdateTime"/>
 </histogram_suffixes>
 
@@ -2030,19 +2039,29 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="Blink.CompositingAssignments.UpdateTime"/>
   <affected-histogram name="Blink.CompositingCommit.UpdateTime"/>
   <affected-histogram name="Blink.CompositingInputs.UpdateTime"/>
+  <affected-histogram name="Blink.ContentDocumentUpdate.UpdateTime"/>
+  <affected-histogram name="Blink.DisplayLockIntersectionObserver.UpdateTime"/>
   <affected-histogram name="Blink.ForcedStyleAndLayout.UpdateTime"/>
   <affected-histogram name="Blink.HandleInputEvents.UpdateTime"/>
   <affected-histogram name="Blink.HitTestDocumentUpdate.UpdateTime"/>
   <affected-histogram name="Blink.ImplCompositorCommit.UpdateTime"/>
   <affected-histogram name="Blink.IntersectionObservation.UpdateTime"/>
+  <affected-histogram name="Blink.JavascriptDocumentUpdate.UpdateTime"/>
+  <affected-histogram name="Blink.JavascriptIntersectionObserver.UpdateTime"/>
   <affected-histogram name="Blink.Layout.UpdateTime"/>
+  <affected-histogram name="Blink.LazyLoadIntersectionObserver.UpdateTime"/>
   <affected-histogram name="Blink.MainFrame.UpdateTime"/>
+  <affected-histogram name="Blink.MediaIntersectionObserver.UpdateTime"/>
   <affected-histogram name="Blink.Paint.UpdateTime"/>
   <affected-histogram name="Blink.PrePaint.UpdateTime"/>
   <affected-histogram name="Blink.ProxyCommit.UpdateTime"/>
+  <affected-histogram name="Blink.ScrollDocumentUpdate.UpdateTime"/>
   <affected-histogram name="Blink.ScrollingCoordinator.UpdateTime"/>
+  <affected-histogram name="Blink.ServiceDocumentUpdate.UpdateTime"/>
   <affected-histogram name="Blink.Style.UpdateTime"/>
   <affected-histogram name="Blink.StyleAndLayout.UpdateTime"/>
+  <affected-histogram name="Blink.UpdateViewportIntersection.UpdateTime"/>
+  <affected-histogram name="Blink.UserDrivenDocumentUpdate.UpdateTime"/>
   <affected-histogram name="Blink.WaitForCommit.UpdateTime"/>
 </histogram_suffixes>
 
@@ -2791,10 +2810,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
              starting main thread work."/>
   <suffix name="SendBeginMainFrameToCommit.Composite"
       label="The time portion of SendBeginMainFrameToCommit spent on
-             compositing."/>
+             compositing.">
+    <obsolete>
+      Obsolete as of https://crrev.com/794384 and M86.
+    </obsolete>
+  </suffix>
   <suffix name="SendBeginMainFrameToCommit.CompositeCommit"
       label="The time portion of SendBeginMainFrameToCommit spent on
              composite commit."/>
+  <suffix name="SendBeginMainFrameToCommit.CompositingAssignments"
+      label="The time portion of SendBeginMainFrameToCommit spent on updating
+             compositing assignments."/>
+  <suffix name="SendBeginMainFrameToCommit.CompositingInputs"
+      label="The time portion of SendBeginMainFrameToCommit spent on updating
+             compositing inputs."/>
   <suffix name="SendBeginMainFrameToCommit.HandleInputEvents"
       label="The time portion of SendBeginMainFrameToCommit spent on handling
              imput events."/>
@@ -2807,8 +2836,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
       label="The time portion of SendBeginMainFrameToCommit spent on
              prepaint."/>
   <suffix name="SendBeginMainFrameToCommit.ScrollingCoordinator"
-      label="The time portion of SendBeginMainFrameToCommit spent on
-             scrolling coordinator."/>
+      label="The time portion of SendBeginMainFrameToCommit spent on scrolling
+             coordinator.">
+    <obsolete>
+      Merged into SendBeginMainFrameToCommit.CompositeCommit in
+      https://crrev.com/815947 in M88.
+    </obsolete>
+  </suffix>
   <suffix name="SendBeginMainFrameToCommit.StyleUpdate"
       label="The time portion of SendBeginMainFrameToCommit spent on style
              update."/>
@@ -3293,8 +3327,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram_suffixes>
 
 <histogram_suffixes name="CompromisedCredentialsAction" separator=".">
-  <suffix name="Remove" label="Saved password is removed from the database"/>
-  <suffix name="Update" label="Saved password is updated in the database"/>
+  <suffix name="Add" label="Insecure password is added to the database"/>
+  <suffix name="Remove" label="Insecure password is removed from the database"/>
+  <suffix name="Update" label="Insecure password is updated in the database">
+    <obsolete>
+      Deprecated December 2020 because it isn't recorded.
+    </obsolete>
+  </suffix>
   <affected-histogram name="PasswordManager.CompromisedCredentials"/>
 </histogram_suffixes>
 
@@ -3331,6 +3370,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="Net.QuicSession.ConnectionMigrationProbeSuccess"/>
   <affected-histogram
       name="Net.QuicSession.HandshakeStatusOnConnectionMigration"/>
+  <affected-histogram name="Net.QuicSession.PathValidationSuccess"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="ConnectivityDetectorProbe" separator=".">
@@ -3415,6 +3455,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="bluetooth-guard" label="Bluetooth guard exceptions"/>
   <suffix name="client-hints" label="Client hints"/>
   <suffix name="cookies" label="Cookies exceptions"/>
+  <suffix name="display-capture" label="Display Capture Exceptions"/>
   <suffix name="durable-storage" label="Durable Storage Exceptions"/>
   <suffix name="fullscreen" label="Fullscreen exceptions"/>
   <suffix name="geolocation" label="Geolocation exceptions"/>
@@ -3708,11 +3749,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="Chrome" label="A client created by Chrome."/>
   <suffix name="CrOSVM" label="A client created by ChromeOS VM."/>
   <suffix name="InvalidType" label="Invalid client."/>
+  <suffix name="LaCrOS" label="A client created by LaCrOS."/>
   <suffix name="Legacy" label="A client using an old CRAS lib."/>
   <suffix name="PCM" label="A client created by PCM."/>
   <suffix name="ServerStream" label="A client created by CRAS server."/>
   <suffix name="Test" label="A client created by cras_test_client."/>
   <suffix name="Unknown" label="Unknown client."/>
+  <affected-histogram name="Cras.FetchDelayMilliSeconds"/>
   <affected-histogram name="Cras.InputStreamRuntime"/>
   <affected-histogram name="Cras.OutputStreamRuntime"/>
   <affected-histogram name="Cras.StreamCallbackThreshold.Input"/>
@@ -3721,10 +3764,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="Cras.StreamEffects.Output"/>
   <affected-histogram name="Cras.StreamFlags.Input"/>
   <affected-histogram name="Cras.StreamFlags.Output"/>
+  <affected-histogram name="Cras.StreamRuntime.Input"/>
+  <affected-histogram name="Cras.StreamRuntime.Output"/>
   <affected-histogram name="Cras.StreamSamplingFormat.Input"/>
   <affected-histogram name="Cras.StreamSamplingFormat.Output"/>
   <affected-histogram name="Cras.StreamSamplingRate.Input"/>
   <affected-histogram name="Cras.StreamSamplingRate.Output"/>
+  <affected-histogram name="Cras.StreamTimeoutMilliSeconds"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="Cras_DeviceType" separator=".">
@@ -3765,10 +3811,40 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="Cras.StreamCallbackThreshold"/>
   <affected-histogram name="Cras.StreamEffects"/>
   <affected-histogram name="Cras.StreamFlags"/>
+  <affected-histogram name="Cras.StreamRuntime"/>
   <affected-histogram name="Cras.StreamSamplingFormat"/>
   <affected-histogram name="Cras.StreamSamplingRate"/>
 </histogram_suffixes>
 
+<histogram_suffixes name="Cras_StreamType" separator=".">
+  <suffix name="Default" label="Default"/>
+  <suffix name="VoiceCommunication" label="WebRTC"/>
+  <affected-histogram name="Cras.FetchDelayMilliSeconds.ARC"/>
+  <affected-histogram name="Cras.FetchDelayMilliSeconds.Chrome"/>
+  <affected-histogram name="Cras.FetchDelayMilliSeconds.CrOSVM"/>
+  <affected-histogram name="Cras.FetchDelayMilliSeconds.LaCrOS"/>
+  <affected-histogram name="Cras.InputStreamRuntime.ARC"/>
+  <affected-histogram name="Cras.InputStreamRuntime.Chrome"/>
+  <affected-histogram name="Cras.InputStreamRuntime.CrOSVM"/>
+  <affected-histogram name="Cras.InputStreamRuntime.LaCrOS"/>
+  <affected-histogram name="Cras.OutputStreamRuntime.ARC"/>
+  <affected-histogram name="Cras.OutputStreamRuntime.Chrome"/>
+  <affected-histogram name="Cras.OutputStreamRuntime.CrOSVM"/>
+  <affected-histogram name="Cras.OutputStreamRuntime.LaCrOS"/>
+  <affected-histogram name="Cras.StreamRuntime.Input.ARC"/>
+  <affected-histogram name="Cras.StreamRuntime.Input.Chrome"/>
+  <affected-histogram name="Cras.StreamRuntime.Input.CrOSVM"/>
+  <affected-histogram name="Cras.StreamRuntime.Input.LaCrOS"/>
+  <affected-histogram name="Cras.StreamRuntime.Output.ARC"/>
+  <affected-histogram name="Cras.StreamRuntime.Output.Chrome"/>
+  <affected-histogram name="Cras.StreamRuntime.Output.CrOSVM"/>
+  <affected-histogram name="Cras.StreamRuntime.Output.LaCrOS"/>
+  <affected-histogram name="Cras.StreamTimeoutMilliSeconds.ARC"/>
+  <affected-histogram name="Cras.StreamTimeoutMilliSeconds.Chrome"/>
+  <affected-histogram name="Cras.StreamTimeoutMilliSeconds.CrOSVM"/>
+  <affected-histogram name="Cras.StreamTimeoutMilliSeconds.LaCrOS"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="Cras_TimePeriod" separator=".">
   <suffix name="LongPeriod" label="Runtime is longer than 60 minutes"/>
   <suffix name="MediumPeriod" label="Runtime is between 10 and 60 minutes"/>
@@ -3947,7 +4023,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="TpmIsOwned" label=""/>
   <suffix name="TpmIsReady" label=""/>
   <suffix name="Unmount" label=""/>
-  <suffix name="UpdateKeyEx" label=""/>
+  <suffix name="UpdateKeyEx" label="">
+    <obsolete>
+      Unused as of 2020-12
+    </obsolete>
+  </suffix>
   <suffix name="VerifyBootLockbox" label=""/>
   <affected-histogram name="CryptohomeClient"/>
 </histogram_suffixes>
@@ -4719,6 +4799,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="FromArc" label="From ARC."/>
   <suffix name="FromChromeInternal" label="From Chrome Internal."/>
   <suffix name="FromFileManager" label="From FileManager."/>
+  <suffix name="FromFullRestore" label="From full restore."/>
   <suffix name="FromInstalledNotification"
       label="From installed notification."/>
   <suffix name="FromKeyboard" label="From keyboard shortcut."/>
@@ -5920,78 +6001,188 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram_suffixes>
 
 <histogram_suffixes name="EventLatencyBreakdowns" separator=".">
-  <suffix name="Activation" label="The duration of the activation stage."/>
+  <suffix name="Activation" label="The duration of the activation stage.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix name="BeginImplFrameToSendBeginMainFrame"
       label="The time from when the compositor impl frame is started to when
-             BeginMainFrame is sent."/>
+             BeginMainFrame is sent.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix name="BrowserToRendererCompositor"
       label="The time from when the event is generated until the first
-             compositor stage after the event arrives in the renderer."/>
-  <suffix name="Commit" label="The duration of the commit stage."/>
+             compositor stage after the event arrives in the renderer.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
+  <suffix name="Commit" label="The duration of the commit stage.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix name="EndActivateToSubmitCompositorFrame"
       label="The time from when an activation is complete to the next
-             SubmitCompositorFrame."/>
+             SubmitCompositorFrame.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix name="EndCommitToActivation"
       label="The time from when a commit is complete to the beginning of the
-             next activation."/>
+             next activation.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix name="SendBeginMainFrameToCommit"
-      label="The time from when the BeginMainFrame is sent to the beginning
-             of the commit."/>
+      label="The time from when the BeginMainFrame is sent to the beginning of
+             the commit.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix name="SendBeginMainFrameToCommit.Animate"
       label="The time portion of SendBeginMainFrameToCommit spent on
-             animations."/>
+             animations.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix name="SendBeginMainFrameToCommit.BeginMainSentToStarted"
       label="The time portion of SendBeginMainFrameToCommit spent before
-             starting main thread work."/>
+             starting main thread work.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix name="SendBeginMainFrameToCommit.Composite"
       label="The time portion of SendBeginMainFrameToCommit spent on
-             compositing."/>
+             compositing.">
+    <obsolete>
+      Obsolete as of https://crrev.com/794384 and M86.
+    </obsolete>
+  </suffix>
   <suffix name="SendBeginMainFrameToCommit.CompositeCommit"
-      label="The time portion of SendBeginMainFrameToCommit spent on
-             composite commit."/>
+      label="The time portion of SendBeginMainFrameToCommit spent on composite
+             commit.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
+  <suffix name="SendBeginMainFrameToCommit.CompositingAssignments"
+      label="The time portion of SendBeginMainFrameToCommit spent on updating
+             compositing assignments.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
+  <suffix name="SendBeginMainFrameToCommit.CompositingInputs"
+      label="The time portion of SendBeginMainFrameToCommit spent on updating
+             compositing inputs.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix name="SendBeginMainFrameToCommit.HandleInputEvents"
       label="The time portion of SendBeginMainFrameToCommit spent on handling
-             imput events."/>
+             imput events.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix name="SendBeginMainFrameToCommit.LayoutUpdate"
       label="The time portion of SendBeginMainFrameToCommit spent on layout
-             update."/>
+             update.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix name="SendBeginMainFrameToCommit.Paint"
-      label="The time portion of SendBeginMainFrameToCommit spent on paint."/>
+      label="The time portion of SendBeginMainFrameToCommit spent on paint.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix name="SendBeginMainFrameToCommit.Prepaint"
-      label="The time portion of SendBeginMainFrameToCommit spent on
-             prepaint."/>
+      label="The time portion of SendBeginMainFrameToCommit spent on prepaint.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix name="SendBeginMainFrameToCommit.ScrollingCoordinator"
-      label="The time portion of SendBeginMainFrameToCommit spent on
-             scrolling coordinator."/>
+      label="The time portion of SendBeginMainFrameToCommit spent on scrolling
+             coordinator.">
+    <obsolete>
+      Merged into SendBeginMainFrameToCommit.CompositeCommit in
+      https://crrev.com/815947 in M88.
+    </obsolete>
+  </suffix>
   <suffix name="SendBeginMainFrameToCommit.StyleUpdate"
       label="The time portion of SendBeginMainFrameToCommit spent on style
-             update."/>
+             update.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix name="SendBeginMainFrameToCommit.UpdateLayers"
       label="The time portion of SendBeginMainFrameToCommit spent on updating
-             layers."/>
+             layers.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix name="SubmitCompositorFrameToPresentationCompositorFrame"
       label="The time from when the compositor frame is submitted to the
-             display compositor to when it is presented."/>
+             display compositor to when it is presented.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix
       name="SubmitCompositorFrameToPresentationCompositorFrame.ReceivedCompositorFrameToStartDraw"
       label="The time from when the compositor frame is received to when it
-             starts to draw."/>
+             starts to draw.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix
       name="SubmitCompositorFrameToPresentationCompositorFrame.StartDrawToSwapStart"
       label="The time from when the compositor frame is started to draw to
-             when it starts swap."/>
+             when it starts swap.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix
       name="SubmitCompositorFrameToPresentationCompositorFrame.SubmitToReceiveCompositorFrame"
       label="The time from when the compositor frame is submitted to when it
-             is received."/>
+             is received.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix
       name="SubmitCompositorFrameToPresentationCompositorFrame.SwapEndToPresentationCompositorFrame"
       label="The time from when the compositor frame ends swap to when it is
-             presented."/>
+             presented.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix
       name="SubmitCompositorFrameToPresentationCompositorFrame.SwapStartToSwapEnd"
-      label="The time from when the compositor frame starts to swap to when
-             it ends swap."/>
+      label="The time from when the compositor frame starts to swap to when it
+             ends swap.">
+    <obsolete>
+      Obsolete as of M90. Breakdowns are being tracked in UKM.
+    </obsolete>
+  </suffix>
   <suffix name="TotalLatency"
       label="Total latency from when the event is generated until the frame
              is presented on screen."/>
@@ -6002,6 +6193,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="EventLatency.GestureDoubleTap"/>
   <affected-histogram name="EventLatency.GestureLongPress"/>
   <affected-histogram name="EventLatency.GestureLongTap"/>
+  <affected-histogram name="EventLatency.GesturePinchBegin.Touchscreen"/>
+  <affected-histogram name="EventLatency.GesturePinchBegin.Wheel"/>
+  <affected-histogram name="EventLatency.GesturePinchEnd.Touchscreen"/>
+  <affected-histogram name="EventLatency.GesturePinchEnd.Wheel"/>
+  <affected-histogram name="EventLatency.GesturePinchUpdate.Touchscreen"/>
+  <affected-histogram name="EventLatency.GesturePinchUpdate.Wheel"/>
   <affected-histogram name="EventLatency.GestureScrollBegin.Autoscroll"/>
   <affected-histogram name="EventLatency.GestureScrollBegin.Scrollbar"/>
   <affected-histogram name="EventLatency.GestureScrollBegin.Touchscreen"/>
@@ -6022,6 +6219,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="EventLatency.GestureTwoFingerTap"/>
   <affected-histogram name="EventLatency.KeyPressed"/>
   <affected-histogram name="EventLatency.KeyReleased"/>
+  <affected-histogram name="EventLatency.MouseDragged"/>
   <affected-histogram name="EventLatency.MousePressed"/>
   <affected-histogram name="EventLatency.MouseReleased"/>
   <affected-histogram name="EventLatency.MouseWheel"/>
@@ -6042,6 +6240,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="Event.Latency.OS_NO_VALIDATION.POSITIVE"/>
 </histogram_suffixes>
 
+<histogram_suffixes name="EventLatencyPinchTypes" separator=".">
+  <suffix base="true" name="Touchscreen"
+      label="Event latency for touchscreen pinch events."/>
+  <suffix base="true" name="Wheel"
+      label="Event latency for touchpad pinch events."/>
+  <affected-histogram name="EventLatency.GesturePinchBegin"/>
+  <affected-histogram name="EventLatency.GesturePinchEnd"/>
+  <affected-histogram name="EventLatency.GesturePinchUpdate"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="EventLatencyScrollBreakdowns" separator=".">
   <suffix name="TotalLatencyToSwapBegin"
       label="Total latency from when the event is generated until the
@@ -6104,6 +6312,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
       label="Event latency for gesture-long-press event."/>
   <suffix base="true" name="GestureLongTap"
       label="Event latency for gesture-long-tap event."/>
+  <suffix base="true" name="GesturePinchBegin"
+      label="Event latency for gesture-ping-begin event."/>
+  <suffix base="true" name="GesturePinchEnd"
+      label="Event latency for gesture-ping-end event."/>
+  <suffix base="true" name="GesturePinchUpdate"
+      label="Event latency for gesture-ping-update event."/>
   <suffix base="true" name="GestureScrollBegin"
       label="Event latency for gesture-scroll-begin event."/>
   <suffix base="true" name="GestureScrollEnd"
@@ -6127,6 +6341,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
       label="Event latency for key-pressed event."/>
   <suffix base="true" name="KeyReleased"
       label="Event latency for key-released event."/>
+  <suffix base="true" name="MouseDragged"
+      label="Event latency for mouse-dragged event."/>
   <suffix base="true" name="MousePressed"
       label="Event latency for mouse-pressed event."/>
   <suffix base="true" name="MouseReleased"
@@ -6309,6 +6525,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="WebStore" label="Extension from the Chrome Web Store"/>
   <affected-histogram name="Extensions.ForceInstalledFailureReason2"/>
   <affected-histogram name="Extensions.ForceInstalledFailureReason3"/>
+  <affected-histogram name="Extensions.ForceInstalledHttpErrorCode2"/>
+  <affected-histogram
+      name="Extensions.ForceInstalledManifestFetchFailedHttpErrorCode2"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="ExtensionWebUiPageType" separator=".">
@@ -6403,6 +6622,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram_suffixes name="FeedNetworkRequestType" separator=".">
   <suffix name="FeedQuery" label="Requests to fetch new feed content"/>
+  <suffix name="ListFollowedWebFeeds"
+      label="Requests to list followed web feeds"/>
+  <suffix name="NextPage" label="Requests to fetch the next page of the feed"/>
+  <suffix name="UnfollowWebFeed" label="Requests to unfollow a web feed"/>
   <suffix name="UploadActions" label="Requests to upload user action data"/>
   <affected-histogram name="ContentSuggestions.Feed.Network.ResponseStatus"/>
 </histogram_suffixes>
@@ -6556,24 +6779,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="FileBrowser.CrostiniSharedPaths.Depth"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="FileOperations" separator=".">
-  <suffix name="DeleteFile.NonRecursive" label=""/>
-  <suffix name="DeleteFile.Recursive" label=""/>
-  <affected-histogram name="Windows.FilesystemError"/>
-  <affected-histogram name="Windows.PostOperationState"/>
-</histogram_suffixes>
-
-<histogram_suffixes name="FindInPageRequestEndState" separator=".">
-  <suffix name="Aborted"
-      label="The request got aborted before it went through every text in the
-             document."/>
-  <suffix name="Finished"
-      label="The request finished going through every text in the document."/>
-  <affected-histogram name="WebCore.FindInPage.NumberOfTasksPerRequest"/>
-  <affected-histogram name="WebCore.FindInPage.RequestDuration"/>
-  <affected-histogram name="WebCore.FindInPage.TotalTaskDuration"/>
-</histogram_suffixes>
-
 <histogram_suffixes name="FirstDownload" separator=".">
   <obsolete>
     Removed 2020-10.
@@ -6908,11 +7113,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="PowerResume" label="PowerResume"/>
   <affected-histogram name="GPU.WatchdogThread.ExtraThreadTime"/>
   <affected-histogram name="GPU.WatchdogThread.Timeout"/>
-  <affected-histogram name="GPU.WatchdogThread.WaitTime"/>
+  <affected-histogram name="GPU.WatchdogThread.WaitTime">
+    <obsolete>
+      Used for an experiment only. Removed 11/2020.
+    </obsolete>
+  </affected-histogram>
 </histogram_suffixes>
 
-<histogram_suffixes name="GPUBlacklistPerFeature" separator=".">
-  <owner>vmiura@chromium.org</owner>
+<histogram_suffixes name="GPUBlocklistPerFeature" separator=".">
   <suffix name="Accelerated2dCanvas" label="Accelerated2dCanvas"/>
   <suffix name="GpuCompositing" label="GpuCompositing"/>
   <suffix name="GpuRasterization" label="GpuRasterization"/>
@@ -6921,6 +7129,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="GPU.BlacklistFeatureTestResults"/>
   <affected-histogram name="GPU.BlacklistFeatureTestResultsWindows"/>
   <affected-histogram name="GPU.BlacklistFeatureTestResultsWindows2"/>
+  <affected-histogram name="GPU.BlocklistFeatureTestResults"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="GpuChannelManagerPressureHandlerDurationDetails"
@@ -7247,7 +7456,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram_suffixes name="HighDownloadBandwidth" separator=".">
   <suffix name="HighDownloadBandwidth" label="download with high bandwidth."/>
-  <affected-histogram name="Download.Parallelizable.DownloadTime"/>
   <affected-histogram name="Download.Parallelizable.FileSize"/>
 </histogram_suffixes>
 
@@ -7515,6 +7723,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram_suffixes name="ImportantFileWriterSuffix" separator=".">
   <suffix name="BookmarkStorage" label=""/>
   <suffix name="FeedbackReport" label=""/>
+  <suffix name="Local_State" label="Local State file"/>
+  <suffix name="Preferences" label="Preferences file"/>
+  <suffix name="Secure_Preferences" label="Secure Preferences file"/>
+  <suffix name="StructuredMetricsPersistentProto"
+      label="Structured metrics persistent proto"/>
   <affected-histogram name="ImportantFile.DeleteOnCloseError"/>
   <affected-histogram name="ImportantFile.FileCreateError"/>
   <affected-histogram name="ImportantFile.FileDeleteError"/>
@@ -7524,6 +7737,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="ImportantFile.FileOpenError"/>
   <affected-histogram name="ImportantFile.FileRenameError"/>
   <affected-histogram name="ImportantFile.FileWriteError"/>
+  <affected-histogram name="ImportantFile.SerializationDuration"/>
   <affected-histogram name="ImportantFile.TempFileFailures"/>
   <affected-histogram name="ImportantFile.TimeToWrite"/>
 </histogram_suffixes>
@@ -7833,7 +8047,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     </obsolete>
   </suffix>
   <suffix name="IPH_HomepagePromoCard"
-      label="In product help homepage promo card displayed on new tab page."/>
+      label="In product help homepage promo card displayed on new tab page.">
+    <obsolete>
+      Feature was deprecated in January 2021.
+    </obsolete>
+  </suffix>
   <suffix name="IPH_HomepageTile" label="In product help homepage tile.">
     <obsolete>
       This feature was deprecated in M79
@@ -7847,24 +8065,29 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
       label="In-product help for password autofill suggestions."/>
   <suffix name="IPH_KeyboardAccessoryPaymentFilling"
       label="In-product help for payments autofill suggestions."/>
+  <suffix name="IPH_LiveCaption" label="In product help for Live Caption."/>
   <suffix name="IPH_LongPressToolbarTip"
       label="In product help LongPress toolbar."/>
   <suffix name="IPH_NewIncognitoTabTip"
       label="In product help new incognito tab tip."/>
   <suffix name="IPH_NewTab" label="In product help new tab."/>
-  <suffix name="IPH_NewTabPageButton"
-      label="In product help new tab page button.">
+  <suffix name="IPH_NewTabPageButton" label="For NewTabPageButton feature.">
     <obsolete>
       This feature was deprecated in M79
     </obsolete>
   </suffix>
+  <suffix name="IPH_NewTabPageHomeButton"
+      label="In product help for new tab page button."/>
   <suffix name="IPH_NewTabTip" label="In product help new tab tip."/>
+  <suffix name="IPH_PageInfo" label="In product help for opening PageInfo."/>
   <suffix name="IPH_PasswordsAccountStorage"
       label="In product help for passwords account storage."/>
   <suffix name="IPH_PreviewsOmniboxUI"
       label="In product help for the Previews UI in the Android Omnibox."/>
   <suffix name="IPH_QuietNotificationPrompts"
       label="For the quiet notification prompts feature."/>
+  <suffix name="IPH_ReadingListDiscovery"
+      label="In product help for first time a tab is added to reading list."/>
   <suffix name="IPH_ReopenTab"
       label="In product help for reopening closed tabs."/>
   <suffix name="IPH_TabGroupsDragAndDrop"
@@ -7877,6 +8100,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="IPH_TabGroupsYourTabsTogether"
       label="In product help for tab switcher cards with multiple tab
              thumbnails."/>
+  <suffix name="IPH_TabSwitcherButton"
+      label="In product help for tab swticher button."/>
   <suffix name="IPH_TranslateMenuButton"
       label="In product help translate menu button."/>
   <suffix name="IPH_VideoTutorial_NTP_ChromeIntro"
@@ -7899,15 +8124,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="InProductHelp.ShouldTriggerHelpUI"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="IPProtocolType" separator="_">
-  <suffix name="TCP" label=""/>
-  <suffix name="UDP" label=""/>
-  <affected-histogram name="WebRTC.PeerConnection.CandidatePairType"/>
-  <affected-histogram name="WebRTC.SystemMaxConsecutiveBytesDelayed"/>
-  <affected-histogram name="WebRTC.SystemPercentPacketsDelayed"/>
-  <affected-histogram name="WebRTC.SystemSendPacketDuration"/>
-</histogram_suffixes>
-
 <histogram_suffixes name="IPv6_Probe" separator="_">
   <suffix name="IPv6_probe_done"
       label="with IPv6 probed for and possibly disabled"/>
@@ -8011,6 +8227,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="Media.EME.cancelKeyRequest"/>
   <affected-histogram name="Media.EME.CreateCdm"/>
   <affected-histogram name="Media.EME.CreateCdmTime"/>
+  <affected-histogram name="Media.EME.CreateSession.SessionType"/>
   <affected-histogram name="Media.EME.generateKeyRequest"/>
   <affected-histogram name="Media.EME.KeyAdded"/>
   <affected-histogram name="Media.EME.KeyError"/>
@@ -8177,6 +8394,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
       label="Database for storing budget information for origins."/>
   <suffix name="CachedImageFetcherDatabase"
       label="Database for CachedImageFetcher metadata."/>
+  <suffix name="CartDatabase" label="Database for chrome cart."/>
+  <suffix name="CommerceSubscriptionDatabase"
+      label="Database for Chrome commerce subscriptions."/>
   <suffix name="DomDistillerStore" label="Databases for DomDistillerStore">
     <obsolete>
       Deprecated since 2019-10.
@@ -8197,6 +8417,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </suffix>
   <suffix name="FeedJournalDatabase"
       label="Database for Feed journal storage."/>
+  <suffix name="FeedKeyValueDatabase"
+      label="Database for key value cache used in feed rendering."/>
   <suffix name="FeedStorageDatabase" label="Databases for Feed Storage.">
     <obsolete>
       Deprecated since 08/18.
@@ -8587,8 +8809,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram_suffixes name="MachineLearningServiceModels" separator="."
     ordering="prefix">
   <suffix name="smart_dim_model_20190521_v3"
-      label="Predict whether to cancel screen dims, temporarily added for
-             downloadable smart dim models, will remove after M84."/>
+      label="Obsolete smart dim model identifier.">
+    <obsolete>
+      This model identifier deprecated after M84, use SmartDimModel instead.
+    </obsolete>
+  </suffix>
   <suffix name="SmartDimModel" label="Predict whether to cancel screen dims."/>
   <suffix name="TestModel" label="A simple model for testing purpose."/>
   <suffix name="TopCatModel" label="Predict the next app to be launched.">
@@ -8907,6 +9132,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram_suffixes>
 
 <histogram_suffixes name="MediaRouteProvider" separator=".">
+  <suffix name="AndroidCaf"
+      label="Cast Application Framework (CAF) base MRPs on Clank"/>
   <suffix name="Cast" label="Native Cast MRP"/>
   <suffix name="DIAL" label="Native DIAL MRP"/>
   <suffix name="WiredDisplay" label="Wired Display MRP"/>
@@ -9403,16 +9630,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="NativeFileSystemAPI.WritePermissionRequestOutcome"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="NatType" separator=".">
-  <suffix name="NoNAT" label=""/>
-  <suffix name="NonSymNAT" label=""/>
-  <suffix name="SymNAT" label=""/>
-  <suffix name="UnknownNAT" label=""/>
-  <affected-histogram name="WebRTC.Stun.BatchSuccessPercent"/>
-  <affected-histogram name="WebRTC.Stun.ResponseLatency"/>
-  <affected-histogram name="WebRTC.Stun.SuccessPercent"/>
-</histogram_suffixes>
-
 <histogram_suffixes name="NavigationCharacteristic" separator="_">
   <suffix name="ExistingRenderer_BeforeUnloadDiscounted"
       label="Navigation reused an existing renderer process. Time spent in
@@ -9425,8 +9642,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
              (whether from a crash or a continued session) either spawning or
              reusing a renderer. Time spent in beforeunload subtracted.">
     <obsolete>
-      Replaced by the likely named entry. It had a misleading name as it also
-      has the before-unload time discounted.
+      Replaced by SessionRestored_BeforeUnloadDiscounte. It had a misleading
+      name as it also has the before-unload time discounted.
     </obsolete>
   </suffix>
   <suffix name="SessionRestored_BeforeUnloadDiscounted"
@@ -9566,7 +9783,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="NewPagePendingEntryMatches"
       label="new page navigation which found a pending entry"/>
   <suffix name="NewSubFrame" label="new subframe navigation"/>
-  <suffix name="SamePage" label="same page navigation"/>
+  <suffix name="SamePage" label="same page navigation">
+    <obsolete>
+      Deprecated 01/2021 in favor of ExistingPageSameDocumentIntendedAsNew and
+      ExistingPageDifferentDocumentIntendedAsNew.
+    </obsolete>
+  </suffix>
   <affected-histogram name="Navigation.SecureSchemeHasSSLStatus"/>
 </histogram_suffixes>
 
@@ -11090,7 +11312,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram
       name="NewTabPage.BackgroundService.Images.RequestLatency"/>
   <affected-histogram
-      name="NewTabPage.BackgroundService.NextImage.RequestLatency"/>
+      name="NewTabPage.BackgroundService.NextImage.RequestLatency">
+    <obsolete>
+      Never recorded. Marked obsolete 01/2021.
+    </obsolete>
+  </affected-histogram>
 </histogram_suffixes>
 
 <histogram_suffixes name="NewTabPage_OneGoogleBar_RequestLatency" separator=".">
@@ -11157,19 +11383,30 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram_suffixes>
 
 <histogram_suffixes name="NewTabPageModules" separator=".">
+  <suffix name="chrome_cart" label="Module ID for Chrome Cart"/>
+  <suffix name="drive" label="Module ID for Google Drive module"/>
   <suffix name="dummy" label="Module ID for a dummy module"/>
   <suffix name="dummy2" label="Module ID for another dummy module"/>
-  <suffix name="kaleidoscope" label="Module ID for Kaleidoscope"/>
+  <suffix name="kaleidoscope" label="Module ID for Kaleidoscope">
+    <obsolete>
+      Kaleidoscope has been turned down.
+    </obsolete>
+  </suffix>
   <suffix name="recipe_tasks" label="Module ID for Recipe Tasks"/>
   <suffix name="shopping_tasks" label="Module ID for Shopping Tasks"/>
   <affected-histogram name="NewTabPage.Modules.Dismissed"/>
+  <affected-histogram name="NewTabPage.Modules.EnabledOnNTPLoad"/>
   <affected-histogram name="NewTabPage.Modules.Impression"/>
+  <affected-histogram name="NewTabPage.Modules.ImpressionRatio"/>
+  <affected-histogram name="NewTabPage.Modules.LoadDuration"/>
   <affected-histogram name="NewTabPage.Modules.Loaded"/>
   <affected-histogram name="NewTabPage.Modules.Restored"/>
   <affected-histogram name="NewTabPage.Modules.Usage"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="NewTabPageProviders" separator=".">
+  <suffix name="allowlist"
+      label="Installed allowlist entry point suggestions."/>
   <suffix name="client" label="Suggestions coming from the client."/>
   <suffix name="client0" label="">
     <obsolete>
@@ -11218,8 +11455,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
       Has never been used.
     </obsolete>
   </suffix>
-  <suffix name="whitelist"
-      label="Installed whitelist entry point suggestions."/>
+  <suffix name="whitelist" label="Installed whitelist entry point suggestions.">
+    <obsolete>
+      Replaced with allowlist (M89).
+    </obsolete>
+  </suffix>
   <affected-histogram name="NewTabPage.MostVisited"/>
   <affected-histogram name="NewTabPage.MostVisitedAge"/>
   <affected-histogram name="NewTabPage.SuggestionsImpression"/>
@@ -11925,7 +12165,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="Demo-preferences" label=""/>
   <suffix name="Demo-setup" label=""/>
   <suffix name="Device-disabled" label=""/>
-  <suffix name="Discover" label=""/>
+  <suffix name="Discover" label="">
+    <obsolete>
+      Replaced by Pin-setup in M90.
+    </obsolete>
+  </suffix>
   <suffix name="Edu-coexistence-login" label=""/>
   <suffix name="Encryption-migration" label=""/>
   <suffix name="Enroll" label=""/>
@@ -11938,12 +12182,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="Hid-detection" label=""/>
   <suffix name="Image" label=""/>
   <suffix name="Kiosk-enable" label=""/>
+  <suffix name="Locale-switch" label=""/>
   <suffix name="Marketing-opt-in" label=""/>
-  <suffix name="Multidevice-setup" label=""/>
+  <suffix name="Multidevice-setup" label="">
+    <obsolete>
+      Renamed to Multidevice-setup-screen in M89.
+    </obsolete>
+  </suffix>
+  <suffix name="Multidevice-setup-screen" label=""/>
   <suffix name="Network" label=""/>
   <suffix name="Network-selection" label=""/>
+  <suffix name="Offline-login" label=""/>
   <suffix name="Packaged-license" label=""/>
   <suffix name="Parental-handoff" label=""/>
+  <suffix name="Pin-setup" label=""/>
   <suffix name="Recommend-apps" label=""/>
   <suffix name="Reset" label=""/>
   <suffix name="Supervision-transition" label=""/>
@@ -11976,29 +12228,61 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="Demo-preferences.Completed" label=""/>
   <suffix name="Demo-setup.Completed" label=""/>
   <suffix name="Device-disabled.Canceled" label=""/>
-  <suffix name="Discover.Next" label=""/>
+  <suffix name="Discover.Next" label="">
+    <obsolete>
+      Replaced by Pin-setup.Done in M90.
+    </obsolete>
+  </suffix>
   <suffix name="Edu-coexistence-login.Done" label=""/>
   <suffix name="Eula.AcceptedWithoutStats" label=""/>
   <suffix name="Eula.AcceptedWithStats" label=""/>
   <suffix name="Eula.Back" label=""/>
   <suffix name="Family-link-notice.Done" label=""/>
-  <suffix name="Fingerprint-setup.Next" label=""/>
+  <suffix name="Fingerprint-setup.Done" label=""/>
+  <suffix name="Fingerprint-setup.Next" label="">
+    <obsolete>
+      Split into Fingerprint-setup.Done and Fingerprint-setup.Skipped in M90.
+    </obsolete>
+  </suffix>
+  <suffix name="Fingerprint-setup.Skipped" label=""/>
   <suffix name="Gaia-signin.Back" label=""/>
-  <suffix name="Gaia-signin.CloseDialog" label=""/>
+  <suffix name="Gaia-signin.Cancel" label=""/>
+  <suffix name="Gaia-signin.CloseDialog" label="">
+    <obsolete>
+      Removed in M89.
+    </obsolete>
+  </suffix>
+  <suffix name="Gaia-signin.EnterpriseEnroll" label=""/>
+  <suffix name="Gaia-signin.StartConsumerKiosk" label=""/>
   <suffix name="Gesture-navigation.Next" label=""/>
   <suffix name="Hid-detection.Next" label=""/>
   <suffix name="Hid-detection.StartDemo" label=""/>
   <suffix name="Kiosk-enable.Next" label=""/>
+  <suffix name="Locale-switch.LocaleFetchFailed" label=""/>
+  <suffix name="Locale-switch.LocaleFetchTimeout" label=""/>
+  <suffix name="Locale-switch.NoSwitchNeeded" label=""/>
+  <suffix name="Locale-switch.SwitchFailed" label=""/>
+  <suffix name="Locale-switch.SwitchSucceded" label=""/>
   <suffix name="Marketing-opt-in.Next" label=""/>
-  <suffix name="Multidevice-setup.Next" label=""/>
+  <suffix name="Multidevice-setup-screen.Next" label=""/>
+  <suffix name="Multidevice-setup.Next" label="">
+    <obsolete>
+      Renamed to Multidevice-setup-screen.Next in M89.
+    </obsolete>
+  </suffix>
   <suffix name="Network-selection.Back" label=""/>
   <suffix name="Network-selection.Connected" label=""/>
   <suffix name="Network-selection.OfflineDemoSetup" label=""/>
   <suffix name="Oauth-enrollment.Back" label=""/>
   <suffix name="Oauth-enrollment.Completed" label=""/>
+  <suffix name="Offline-login.Back" label=""/>
+  <suffix name="Offline-login.ReloadOnlineLogin" label=""/>
   <suffix name="Packaged-license.DontEnroll" label=""/>
   <suffix name="Packaged-license.Enroll" label=""/>
   <suffix name="Parental-Handoff.Done" label=""/>
+  <suffix name="Pin-setup.Done" label=""/>
+  <suffix name="Pin-setup.Skipped" label=""/>
+  <suffix name="Pin-setup.TimedOut" label=""/>
   <suffix name="Recommend-apps.Selected" label=""/>
   <suffix name="Recommend-apps.Skipped" label=""/>
   <suffix name="Reset.Cancel" label=""/>
@@ -12018,9 +12302,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram_suffixes>
 
 <histogram_suffixes name="OptimizationGuide_OptimizationTargets" separator=".">
+  <suffix name="LanguageDetection" label="Language detection"/>
+  <suffix name="PageTopics" label="Page topics"/>
   <suffix name="PainfulPageLoad" label="Painful page load"/>
   <affected-histogram name="OptimizationGuide.IsPredictionModelValid"/>
   <affected-histogram
+      name="OptimizationGuide.PredictionManager.ModelTypeChanged"/>
+  <affected-histogram
       name="OptimizationGuide.PredictionModelEvaluationLatency"/>
   <affected-histogram name="OptimizationGuide.PredictionModelLoadedVersion"/>
   <affected-histogram name="OptimizationGuide.PredictionModelUpdateVersion"/>
@@ -12065,13 +12353,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="LoadingPredictor"
       label="Provides information about subresources predicted to be on the
              page"/>
+  <suffix name="LoginDetection"
+      label="Provides information about hosts that are identified as commonly
+             logged-in"/>
   <suffix name="None" label="No optimization type"/>
   <suffix name="NoScript"
-      label="Disables the fetching and execution of JavaScript"/>
+      label="Disables the fetching and execution of JavaScript">
+    <obsolete>
+      Removed in M89.
+    </obsolete>
+  </suffix>
   <suffix name="PerformanceHints"
       label="Provides aggregated performance information about the page"/>
   <suffix name="ResourceLoading"
-      label="Applies a set of resource loading hints to load the page"/>
+      label="Applies a set of resource loading hints to load the page">
+    <obsolete>
+      Removed in M89.
+    </obsolete>
+  </suffix>
+  <suffix name="ShoppingPagePredictor"
+      label="Determines if a page is shopping related or not"/>
   <affected-histogram name="OptimizationGuide.ApplyDecision"/>
   <affected-histogram name="OptimizationGuide.ApplyDecisionAsync"/>
   <affected-histogram name="OptimizationGuide.OptimizationFilterStatus"/>
@@ -12719,9 +13020,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram
       name="PageLoad.Clients.NoServiceWorker.DocumentTiming.NavigationToLoadEventFired"/>
   <affected-histogram
-      name="PageLoad.Clients.NoServiceWorker.Experimental.PaintTiming.NavigationToFirstMeaningfulPaint"/>
+      name="PageLoad.Clients.NoServiceWorker.Experimental.PaintTiming.NavigationToFirstMeaningfulPaint">
+    <obsolete>
+      Removed in December 2020.
+    </obsolete>
+  </affected-histogram>
   <affected-histogram
-      name="PageLoad.Clients.NoServiceWorker.Experimental.PaintTiming.ParseStartToFirstMeaningfulPaint"/>
+      name="PageLoad.Clients.NoServiceWorker.Experimental.PaintTiming.ParseStartToFirstMeaningfulPaint">
+    <obsolete>
+      Removed in December 2020.
+    </obsolete>
+  </affected-histogram>
   <affected-histogram
       name="PageLoad.Clients.NoServiceWorker.PaintTiming.NavigationToFirstContentfulPaint"/>
   <affected-histogram
@@ -12895,9 +13204,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram
       name="PageLoad.DocumentTiming.NavigationToLoadEventFired"/>
   <affected-histogram
-      name="PageLoad.Experimental.PaintTiming.NavigationToFirstMeaningfulPaint"/>
+      name="PageLoad.Experimental.PaintTiming.NavigationToFirstMeaningfulPaint">
+    <obsolete>
+      Removed Dec 2020.
+    </obsolete>
+  </affected-histogram>
   <affected-histogram
-      name="PageLoad.Experimental.PaintTiming.ParseStartToFirstMeaningfulPaint"/>
+      name="PageLoad.Experimental.PaintTiming.ParseStartToFirstMeaningfulPaint">
+    <obsolete>
+      Removed Dec 2020.
+    </obsolete>
+  </affected-histogram>
   <affected-histogram name="PageLoad.InteractiveTiming.FirstInputDelay"/>
   <affected-histogram name="PageLoad.InteractiveTiming.FirstInputDelay2"/>
   <affected-histogram name="PageLoad.InteractiveTiming.FirstInputDelay3"/>
@@ -12905,6 +13222,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
       name="PageLoad.PaintTiming.NavigationToFirstContentfulPaint"/>
   <affected-histogram name="PageLoad.PaintTiming.NavigationToFirstPaint"/>
   <affected-histogram
+      name="PageLoad.PaintTiming.NavigationToLargestContentfulPaint2"/>
+  <affected-histogram
       name="PageLoad.PaintTiming.ParseStartToFirstContentfulPaint"/>
   <affected-histogram name="PageLoad.ParseTiming.NavigationToParseStart"/>
   <affected-histogram name="PageLoad.Timing2.NavigationToFirstContentfulPaint">
@@ -12917,7 +13236,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram_suffixes name="PageLoadMetricsClientsServiceWorkerSpecialApps"
     separator=".">
   <suffix name="docs" label="Custom histogram for the Google Docs page"/>
-  <suffix name="inbox" label="Custom histogram for Inbox"/>
+  <suffix name="inbox" label="Custom histogram for Inbox">
+    <obsolete>
+      Removed December 2020.
+    </obsolete>
+  </suffix>
   <suffix name="search"
       label="Custom histogram for the Google Search results page"/>
   <affected-histogram
@@ -12925,9 +13248,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram
       name="PageLoad.Clients.ServiceWorker.DocumentTiming.NavigationToLoadEventFired"/>
   <affected-histogram
-      name="PageLoad.Clients.ServiceWorker.Experimental.PaintTiming.NavigationToFirstMeaningfulPaint"/>
+      name="PageLoad.Clients.ServiceWorker.Experimental.PaintTiming.NavigationToFirstMeaningfulPaint">
+    <obsolete>
+      Removed in December 2020.
+    </obsolete>
+  </affected-histogram>
   <affected-histogram
-      name="PageLoad.Clients.ServiceWorker.Experimental.PaintTiming.ParseStartToFirstMeaningfulPaint"/>
+      name="PageLoad.Clients.ServiceWorker.Experimental.PaintTiming.ParseStartToFirstMeaningfulPaint">
+    <obsolete>
+      Removed in December 2020.
+    </obsolete>
+  </affected-histogram>
   <affected-histogram
       name="PageLoad.Clients.ServiceWorker.PaintTiming.NavigationToFirstContentfulPaint"/>
   <affected-histogram
@@ -12939,9 +13270,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram
       name="PageLoad.Clients.ServiceWorker2.DocumentTiming.NavigationToLoadEventFired"/>
   <affected-histogram
-      name="PageLoad.Clients.ServiceWorker2.Experimental.PaintTiming.NavigationToFirstMeaningfulPaint"/>
+      name="PageLoad.Clients.ServiceWorker2.Experimental.PaintTiming.NavigationToFirstMeaningfulPaint">
+    <obsolete>
+      Removed in December 2020.
+    </obsolete>
+  </affected-histogram>
   <affected-histogram
-      name="PageLoad.Clients.ServiceWorker2.Experimental.PaintTiming.ParseStartToFirstMeaningfulPaint"/>
+      name="PageLoad.Clients.ServiceWorker2.Experimental.PaintTiming.ParseStartToFirstMeaningfulPaint">
+    <obsolete>
+      Removed in December 2020.
+    </obsolete>
+  </affected-histogram>
   <affected-histogram
       name="PageLoad.Clients.ServiceWorker2.PaintTiming.NavigationToFirstContentfulPaint"/>
   <affected-histogram
@@ -13394,12 +13733,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="PasswordManager.TotalAccountsHiRes.ByType"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="PasswordGenerationType" separator=".">
-  <suffix name="Automatic" label=""/>
-  <suffix name="Manual" label=""/>
-  <affected-histogram name="KeyboardAccessory.GenerationDialogChoice"/>
-</histogram_suffixes>
-
 <histogram_suffixes name="PasswordManagerMonitor" separator="_">
   <obsolete>
     Removed as of 03/2016.
@@ -13749,7 +14082,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="AR" label="AR permission"/>
   <suffix name="AudioAndVideoCapture" label="Mic+Camera permission"/>
   <suffix name="AudioCapture" label="Microphone permission"/>
-  <suffix name="Flash" label="Flash permission"/>
+  <suffix name="Flash" label="Flash permission">
+    <obsolete>
+      Removed in M88, as the feature will not be included in the M89 launch.
+    </obsolete>
+  </suffix>
   <suffix name="Geolocation" label="Geolocation permission"/>
   <suffix name="MidiSysEx" label="Midi SysEx permission"/>
   <suffix name="MultipleDownload" label="Multiple downloads permission"/>
@@ -13775,7 +14112,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="AR" label="AR permission actions"/>
   <suffix name="AudioCapture" label="Microphone permission actions"/>
   <suffix name="ClipboardReadWrite" label="Clipboard permission actions"/>
-  <suffix name="Flash" label="Flash permission actions"/>
+  <suffix name="DisplayCapture" label="Display capture permission actions"/>
+  <suffix name="Flash" label="Flash permission actions">
+    <obsolete>
+      Removed in M88, as the feature will not be included in the M89 launch.
+    </obsolete>
+  </suffix>
   <suffix name="Geolocation" label="Geolocation permission actions"/>
   <suffix name="MidiSysEx" label="Midi SysEx permsision actions"/>
   <suffix name="Nfc" label="Nfc permsision actions"/>
@@ -14169,6 +14511,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="Started" label="Preference value upon startup."/>
   <affected-histogram name="Mouse.ScrollAcceleration"/>
   <affected-histogram name="Mouse.ScrollSensitivity"/>
+  <affected-histogram name="PointingStick.Acceleration"/>
+  <affected-histogram name="PointingStick.PointerSensitivity"/>
+  <affected-histogram name="PointingStick.PrimaryButtonRight"/>
   <affected-histogram name="Touchpad.ScrollAcceleration"/>
   <affected-histogram name="Touchpad.ScrollSensitivity"/>
 </histogram_suffixes>
@@ -14443,14 +14788,22 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     </obsolete>
   </suffix>
   <suffix name="None" label="No preview was served"/>
-  <suffix name="NoScript" label="NoScript previews"/>
+  <suffix name="NoScript" label="NoScript previews">
+    <obsolete>
+      Removed in M89.
+    </obsolete>
+  </suffix>
   <suffix name="Offline" label="Offline previews">
     <obsolete>
       Functionality removed in M86.
     </obsolete>
   </suffix>
   <suffix name="ResourceLoadingHints"
-      label="Resource loading hints based previews"/>
+      label="Resource loading hints based previews">
+    <obsolete>
+      Removed in M89.
+    </obsolete>
+  </suffix>
   <affected-histogram name="Previews.EligibilityReason"/>
   <affected-histogram name="Previews.InfoBarAction"/>
   <affected-histogram name="Previews.OmniboxAction"/>
@@ -14490,6 +14843,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="Malloc.AllocatedObjects"
       label="Only counting objects allocated using the malloc allocator. The
              measurement is only accurate on Linux and MacOS."/>
+  <suffix name="ManualFillingCache"
+      label="Only counting memory used by the password manager fallbacks."/>
   <suffix name="PartitionAlloc"
       label="Only counting memory used by Partition allocator."/>
   <suffix name="PartitionAlloc.AllocatedObjects"
@@ -14532,7 +14887,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="V8.AllocatedObjects"
       label="Only counting objects allocated by V8 javascript engine."/>
   <suffix name="V8.Main.GlobalHandles"
-      label="Memory used by V8 global handles in the main isolate."/>
+      label="Total memory used by V8 global handles in the main isolate."/>
+  <suffix name="V8.Main.GlobalHandles.AllocatedObjects"
+      label="Allocated memory used by V8 global handles in the main isolate."/>
   <suffix name="V8.Main.Heap" label="Only counting memory used by V8 heap"/>
   <suffix name="V8.Main.Heap.AllocatedObjects"
       label="Only counting objects allocated in V8 heap"/>
@@ -14598,6 +14955,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram_suffixes name="ProcessMemoryAllocatorSmall2" separator=".">
   <suffix name="Discardable.FreelistSize"
       label="Freelist size used by ClientDiscardableMemoryManager."/>
+  <suffix name="Discardable.ResidentSize"
+      label="Amount of resident memory held by
+             ClientDiscardableSharedMemoryManager."/>
   <suffix name="Discardable.VirtualSize"
       label="Virtual memory used by ClientDiscardableMemoryManager."/>
   <suffix name="DownloadService"
@@ -14608,6 +14968,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="History" label="Only counting memory used by History service."/>
   <suffix name="LevelDatabase"
       label="Only counting memory used by Level databases."/>
+  <suffix name="Malloc.ThreadCache"
+      label="Memory used by all thread caches, recorded when PartitionAlloc
+             is used as malloc()."/>
   <suffix name="Net"
       label="Only counting memory used by Networking sockets and caches."/>
   <suffix name="Net.UrlRequestContext"
@@ -14616,6 +14979,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="NumberOfNodes" label=""/>
   <suffix name="OmniboxSuggestions"
       label="Only counting memory used by Omnibox suggestions provider."/>
+  <suffix name="PartitionAlloc.Partitions.FastMalloc.ThreadCache"
+      label="Memory used by all thread caches for the FastMalloc partition.
+             Recorded in blink processes, unless PartitionAlloc is used as
+             malloc()."/>
   <suffix name="SiteStorage.IndexDB"
       label="Only counting memory used by IndexedDB API."/>
   <suffix name="SiteStorage.LocalStorage"
@@ -15093,6 +15460,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram_suffixes>
 
 <histogram_suffixes name="RecurrenceRankerModel" separator=".">
+  <obsolete>
+    Removed January 2021, all affected histograms have been deprecated.
+  </obsolete>
   <suffix name="QueryBasedMixedTypes" label=""/>
   <suffix name="QueryBasedMixedTypesGroup" label=""/>
   <suffix name="ZeroStateMixedTypes" label=""/>
@@ -15131,6 +15501,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram_suffixes>
 
 <histogram_suffixes name="RelaunchNotificationStyle" separator=".">
+  <obsolete>
+    Removed in M90.
+  </obsolete>
   <suffix name="Recommended" label="The relaunch recommended bubble."/>
   <suffix name="Required" label="The relaunch required dialog."/>
   <affected-histogram name="RelaunchNotification.ShowResult"/>
@@ -15860,6 +16233,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="XSLStyleSheet" label=""/>
   <affected-histogram name="Blink.MemoryCache.RevalidationPolicy"/>
   <affected-histogram name="Blink.MemoryCache.RevalidationPolicy.Dead"/>
+  <affected-histogram name="Blink.MemoryCache.RevalidationPolicy.PerDocument"/>
+  <affected-histogram
+      name="Blink.MemoryCache.RevalidationPolicy.PerTopFrameSite"/>
   <affected-histogram name="Blink.MemoryCache.RevalidationPolicy.Preload"/>
   <affected-histogram name="PreloadScanner.Counts"/>
   <affected-histogram name="PreloadScanner.Counts.Miss"/>
@@ -15898,6 +16274,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="SafeBrowsing.RT.IsLookupSuccessful"/>
   <affected-histogram name="SafeBrowsing.RT.Network.Result"/>
   <affected-histogram name="SafeBrowsing.RT.Network.Time"/>
+  <affected-histogram name="SafeBrowsing.RT.Request.Size"/>
   <affected-histogram name="SafeBrowsing.RT.Request.UserPopulation"/>
   <affected-histogram name="SafeBrowsing.RT.ThreatInfoSize"/>
 </histogram_suffixes>
@@ -16174,6 +16551,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="Startup.TimeSinceLastStartup"/>
 </histogram_suffixes>
 
+<histogram_suffixes name="SB2RequestDestinations" separator=".">
+  <suffix name="Checked"
+      label="Resources that were checked. Logged before the resource starts
+             loading and again for each redirect."/>
+  <suffix name="Skipped"
+      label="Resources that were not checked because they are not active-ish
+             content types. Only used on mobile. Logged before the resource
+             request starts."/>
+  <suffix name="Unsafe"
+      label="Resources that were checked and classified as unsafe. Logged
+             when the URL check is completed."/>
+  <affected-histogram name="SB2.RequestDestination"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="SB2ResourceTypes" separator=".">
   <suffix name="Checked"
       label="Resources that were checked. Logged before the resource starts
@@ -16247,24 +16638,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
       name="Scheduler.Experimental.Renderer.TotalTime.Wall.MainThread"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="ScreenshareLayerStats" separator=".">
-  <suffix name="FrameRate"
-      label="Frames per second sent, in fps. The value is reported when a
-             stream is removed and is calculated as the total number of
-             frames in this layer, divided by the duration of the call."/>
-  <suffix name="Qp"
-      label="Average quantizer (qp) of frames sent. The value is reported
-             when a stream is removed and is calculated, for this layer, as
-             the sum of all qp values divided the number of frames."/>
-  <suffix name="TargetBitrate"
-      label="Average target bitrate in kbps. The value is reported when a
-             stream is removed and is calculated as the sum of all target
-             bitrates for this layer (sampled after frame has been encoded)
-             divided by the total number of frames for this layer."/>
-  <affected-histogram name="WebRTC.Video.Screenshare.Layer0"/>
-  <affected-histogram name="WebRTC.Video.Screenshare.Layer1"/>
-</histogram_suffixes>
-
 <histogram_suffixes name="ScrollSourceDevice" separator=".">
   <suffix name="Touch" label="Touch"/>
   <suffix name="Wheel" label="Wheel"/>
@@ -16338,10 +16711,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="origin_policy" label=""/>
   <suffix name="phishing" label=""/>
   <suffix name="phishing_subresource" label=""/>
-  <suffix name="social_engineering_ads" label=""/>
-  <suffix name="social_engineering_ads_subresource" label=""/>
-  <suffix name="social_engineering_landing" label=""/>
-  <suffix name="social_engineering_landing_subresource" label=""/>
+  <suffix name="social_engineering_ads" label="">
+    <obsolete>
+      Removed as of 2021-1. Doesn't trigger interstitials.
+    </obsolete>
+  </suffix>
+  <suffix name="social_engineering_ads_subresource" label="">
+    <obsolete>
+      Removed as of 2021-1. Doesn't trigger interstitials.
+    </obsolete>
+  </suffix>
+  <suffix name="social_engineering_landing" label="">
+    <obsolete>
+      Removed as of 2021-1. Doesn't trigger interstitials.
+    </obsolete>
+  </suffix>
+  <suffix name="social_engineering_landing_subresource" label="">
+    <obsolete>
+      Removed as of 2021-1. Doesn't trigger interstitials.
+    </obsolete>
+  </suffix>
   <affected-histogram name="interstitial.decision"/>
   <affected-histogram name="interstitial.decision.repeat_visit"/>
   <affected-histogram name="interstitial.interaction"/>
@@ -16353,7 +16742,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
              side detection."/>
   <suffix name="from_data_saver"
       label="Interstitial for a resource classified as unsafe by the Data
-             Saver service."/>
+             Saver service.">
+    <obsolete>
+      Deprecated as of 2021-1. Data saver has been completely turned down.
+    </obsolete>
+  </suffix>
   <suffix name="from_device"
       label="Interstitial for a resource classified as unsafe by the Safe
              Browsing database via either
@@ -16389,27 +16782,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram
       name="interstitial.phishing_subresource.decision.repeat_visit"/>
   <affected-histogram name="interstitial.phishing_subresource.interaction"/>
-  <affected-histogram name="interstitial.social_engineering_ads.decision"/>
-  <affected-histogram
-      name="interstitial.social_engineering_ads.decision.repeat_visit"/>
-  <affected-histogram name="interstitial.social_engineering_ads.interaction"/>
-  <affected-histogram
-      name="interstitial.social_engineering_ads_subresource.decision"/>
-  <affected-histogram
-      name="interstitial.social_engineering_ads_subresource.decision.repeat_visit"/>
-  <affected-histogram
-      name="interstitial.social_engineering_ads_subresource.interaction"/>
-  <affected-histogram name="interstitial.social_engineering_landing.decision"/>
-  <affected-histogram
-      name="interstitial.social_engineering_landing.decision.repeat_visit"/>
-  <affected-histogram
-      name="interstitial.social_engineering_landing.interaction"/>
-  <affected-histogram
-      name="interstitial.social_engineering_landing_subresource.decision"/>
-  <affected-histogram
-      name="interstitial.social_engineering_landing_subresource.decision.repeat_visit"/>
-  <affected-histogram
-      name="interstitial.social_engineering_landing_subresource.interaction"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="SecurityInterstitialSSLType" separator="."
@@ -16444,8 +16816,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="SECURE_WITH_POLICY_INSTALLED_CERT"
       label="SecurityLevel is SECURE_WITH_POLICY_INSTALLED_CERT."/>
   <suffix name="WARNING" label="SecurityLevel is WARNING."/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Local"/>
-  <affected-histogram name="Autofill.SaveCreditCardPrompt.Upload"/>
   <affected-histogram name="Autofill.SaveCreditCardPromptOffer.Local"/>
   <affected-histogram name="Autofill.SaveCreditCardPromptOffer.Upload"/>
   <affected-histogram name="Autofill.SaveCreditCardPromptResult.Local"/>
@@ -16467,8 +16837,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram_suffixes name="SendTabToSelfEntryPoint" separator="."
     ordering="prefix">
   <owner>jeffreycohen@chromium.org</owner>
-  <owner>sebsg@chromium.org</owner>
   <owner>tgupta@chromium.org</owner>
+  <owner>chrome-sharing-core@google.com</owner>
   <suffix name="ContentMenu" label="Option shown in the content context menu"/>
   <suffix name="LinkMenu" label="Option shown in the link context menu"/>
   <suffix name="OmniboxIcon" label="Icon shown in the omnibox"/>
@@ -16483,9 +16853,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <obsolete>
     The affected histogram is obsolete (5/20).
   </obsolete>
-  <owner>jeffreycohen@chromium.org</owner>
-  <owner>sebsg@chromium.org</owner>
-  <owner>tgupta@chromium.org</owner>
   <suffix name="ContentMenu"
       label="The count of devices shown in the content submenu"/>
   <suffix name="LinkMenu"
@@ -17250,8 +17617,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="SIGNALLING_MESSAGE" label="Signalling Message"/>
   <suffix name="SMS_FETCH_REQUEST" label="SMS Fetch Request"/>
   <suffix name="UNKNOWN_MESSAGE" label="Unknown Message"/>
-  <affected-histogram name="Sharing.DeviceLastUpdatedAge"/>
-  <affected-histogram name="Sharing.MajorVersionComparison"/>
+  <affected-histogram name="Sharing.DeviceLastUpdatedAge">
+    <obsolete>
+      Removed in M89.
+    </obsolete>
+  </affected-histogram>
+  <affected-histogram name="Sharing.MajorVersionComparison">
+    <obsolete>
+      Removed in M89.
+    </obsolete>
+  </affected-histogram>
   <affected-histogram name="Sharing.MessageAckTime"/>
   <affected-histogram name="Sharing.MessageAckTime.Android"/>
   <affected-histogram name="Sharing.MessageAckTime.ChromeOS"/>
@@ -17310,8 +17685,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="NetworkError" label="Network error"/>
   <suffix name="PayloadTooLarge" label="Payload is too large"/>
   <suffix name="Successful" label="Successful"/>
-  <affected-histogram name="Sharing.DeviceLastUpdatedAgeWithResult"/>
-  <affected-histogram name="Sharing.SharedClipboardRetries"/>
+  <affected-histogram name="Sharing.DeviceLastUpdatedAgeWithResult">
+    <obsolete>
+      Removed in M89.
+    </obsolete>
+  </affected-histogram>
+  <affected-histogram name="Sharing.SharedClipboardRetries">
+    <obsolete>
+      Removed in M89.
+    </obsolete>
+  </affected-histogram>
 </histogram_suffixes>
 
 <histogram_suffixes name="SharingWebRtcTimingEvent" separator=".">
@@ -17964,6 +18347,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="WarmStartup" label="Startup was warm (almost no hard faults)."/>
   <affected-histogram
       name="LibraryLoader.PercentageOfResidentCodeBeforePrefetch"/>
+  <affected-histogram
+      name="ProfilePicker.StartupTime.FirstPaint.FromApplicationStart"/>
   <affected-histogram name="Startup.BrowserMainToRendererMain"/>
   <affected-histogram
       name="Startup.BrowserMessageLoopStart.To.MainNavigationStart"/>
@@ -17978,7 +18363,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="Startup.BrowserMessageLoopStartTimeFromMainEntry3"/>
   <affected-histogram name="Startup.BrowserOpenTabs"/>
   <affected-histogram name="Startup.BrowserWindow.FirstPaint"/>
-  <affected-histogram name="Startup.BrowserWindow.FirstPaint.CompositingEnded"/>
+  <affected-histogram name="Startup.BrowserWindow.FirstPaint.CompositingEnded">
+    <obsolete>
+      Obsolete as of Feb 2021.
+    </obsolete>
+  </affected-histogram>
   <affected-histogram name="Startup.BrowserWindowDisplay"/>
   <affected-histogram name="Startup.FirstWebContents.MainFrameLoad"/>
   <affected-histogram name="Startup.FirstWebContents.MainFrameLoad2"/>
@@ -18359,6 +18748,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="Sync.ModelTypeMemoryKB"/>
   <affected-histogram name="Sync.ModelTypeStoreCommitWriteBatchOutcome"/>
   <affected-histogram name="Sync.ModelTypeTimeUntilEncryptionKeyFound"/>
+  <affected-histogram name="Sync.ModelTypeUndecryptablePendingUpdatesDropped"/>
   <affected-histogram name="Sync.NonReflectionUpdateFreshnessPossiblySkewed">
     <obsolete>
       Deprecated 06/2019. Replaced by
@@ -18464,6 +18854,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="DecryptionPending"
       label="Decryption keys are missing at the moment (it is queued for
              later decryption which may or may not happen)."/>
+  <suffix name="DecryptionPendingForTooLong"
+      label="Decryption keys were missing for so long that the update was
+             ignored."/>
   <suffix name="FailedToDecrypt"
       label="Decryption is not successful (maybe the data is corrupt)."/>
   <suffix name="InconsistentClientTag"
@@ -18614,8 +19007,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="Apps.StateTransition.Drag.PresentationTime"/>
   <affected-histogram
       name="Apps.StateTransition.Drag.PresentationTime.MaxLatency"/>
+  <affected-histogram name="Ash.LoginAnimation.Duration"/>
+  <affected-histogram name="Ash.LoginAnimation.Jank"/>
+  <affected-histogram name="Ash.LoginAnimation.Smoothness"/>
   <affected-histogram name="Ash.Overview.AnimationSmoothness.Close"/>
   <affected-histogram name="Ash.Overview.WindowDrag.PresentationTime"/>
+  <affected-histogram name="Ash.UnlockAnimation.Jank"/>
+  <affected-histogram name="Ash.UnlockAnimation.Smoothness"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="TabSwitchingType" separator=".">
@@ -19154,10 +19552,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="Success" label="The operation or partial operation succeeded."/>
   <affected-histogram name="Net.TrustTokens.NetErrorForTrustTokenOperation"/>
   <affected-histogram name="Net.TrustTokens.NetErrorForTrustTokenOperation"/>
-  <affected-histogram name="Net.TrustTokens.OperationBeginTime"/>
-  <affected-histogram name="Net.TrustTokens.OperationFinalizeTime"/>
-  <affected-histogram name="Net.TrustTokens.OperationServerTime"/>
-  <affected-histogram name="Net.TrustTokens.OperationTotalTime"/>
 </histogram_suffixes>
 
 <histogram_suffixes name="TrustTokenOperationType" separator=".">
@@ -19170,14 +19564,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
       name="Net.TrustTokens.NetErrorForTrustTokenOperation.Failure"/>
   <affected-histogram
       name="Net.TrustTokens.NetErrorForTrustTokenOperation.Success"/>
-  <affected-histogram name="Net.TrustTokens.OperationBeginTime.Failure"/>
-  <affected-histogram name="Net.TrustTokens.OperationBeginTime.Success"/>
-  <affected-histogram name="Net.TrustTokens.OperationFinalizeTime.Failure"/>
-  <affected-histogram name="Net.TrustTokens.OperationFinalizeTime.Success"/>
-  <affected-histogram name="Net.TrustTokens.OperationServerTime.Failure"/>
-  <affected-histogram name="Net.TrustTokens.OperationServerTime.Success"/>
-  <affected-histogram name="Net.TrustTokens.OperationTotalTime.Failure"/>
-  <affected-histogram name="Net.TrustTokens.OperationTotalTime.Success"/>
   <affected-histogram name="Net.TrustTokens.RequestHelperFactoryOutcome"/>
 </histogram_suffixes>
 
@@ -19374,15 +19760,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="VRSessionVideoTime"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="WebApkDistributorType" separator=".">
-  <suffix name="Browser" label="Installed by Chrome"/>
-  <suffix name="DevicePolicy" label="Installed by device policy"/>
-  <suffix name="Other" label="Installed by other sources"/>
-  <affected-histogram name="WebApk.Session.TotalDuration2"/>
-  <affected-histogram name="WebApk.ShellApkVersion2"/>
-  <affected-histogram name="WebApk.Uninstall"/>
-</histogram_suffixes>
-
 <histogram_suffixes name="WebApkType" separator=".">
   <suffix name="BrowserApk" label="Installed by Chrome"/>
   <suffix name="UnboundApk" label="Not installed by Chrome"/>
@@ -19435,12 +19812,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </suffix>
   <suffix name="Camera" label="Camera"/>
   <suffix name="ConnectivityDiagnostics" label="Connectivity Diagnostics"/>
+  <suffix name="Crosh" label="Crosh"/>
   <suffix name="Diagnostics" label="Diagnostics"/>
   <suffix name="Discover" label="Discovery">
     <obsolete>
       Deprecated as of 2020-10-21.
     </obsolete>
   </suffix>
+  <suffix name="Eche" label="Eche"/>
   <suffix name="Help" label="Help"/>
   <suffix name="Media" label="Media"/>
   <suffix name="OSSettings" label="OS Settings"/>
@@ -19466,9 +19845,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="SigninOrLockScreen" label="Sign in or lockscreen"/>
   <affected-histogram name="Webapp.InstallResult.System.Profiles"/>
   <affected-histogram
-      name="Webapp.InstallResultExtensionDisabledReason.System.Profiles"/>
-  <affected-histogram
-      name="Webapp.InstallResultExtensionError.System.Profiles"/>
+      name="Webapp.InstallResultExtensionDisabledReason.System.Profiles">
+    <obsolete>
+      Deprecated 11/2020. The affected histogram is deprecated.
+    </obsolete>
+  </affected-histogram>
+  <affected-histogram name="Webapp.InstallResultExtensionError.System.Profiles">
+    <obsolete>
+      Deprecated 11/2020. The affected histogram is deprecated.
+    </obsolete>
+  </affected-histogram>
 </histogram_suffixes>
 
 <histogram_suffixes name="WebappType" separator=".">
@@ -19520,7 +19906,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram_suffixes name="WebFontMissedCache" separator="." ordering="prefix">
   <owner>toyoshim@chromium.org</owner>
-  <suffix name="MissedCache" label="On missed cache"/>
+  <suffix name="MissedCache" label="On missed cache">
+    <obsolete>
+      Removed Dec 2020.
+    </obsolete>
+  </suffix>
   <affected-histogram name="WebFont.DownloadTime.0.Under10KB"/>
   <affected-histogram name="WebFont.DownloadTime.1.10KBTo50KB"/>
   <affected-histogram name="WebFont.DownloadTime.2.50KBTo100KB"/>
@@ -19565,14 +19955,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="Media.UnderflowDuration2"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="WebRTCEchoCancellerEstimate" separator=".">
-  <suffix name="Max" label="The maximum over the time interval"/>
-  <suffix name="Min" label="The minimum over the time interval"/>
-  <suffix name="Value" label="The last estimated value of the time interval"/>
-  <affected-histogram name="WebRTC.Audio.EchoCanceller.Erl"/>
-  <affected-histogram name="WebRTC.Audio.EchoCanceller.Erle"/>
-</histogram_suffixes>
-
 <histogram_suffixes name="WebRTCEchoCancellerStatisticType" separator=".">
   <suffix name="Average" label="The average over the time interval"/>
   <suffix name="Max" label="The maximum over the time interval"/>
@@ -19587,50 +19969,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <affected-histogram name="WebRTC.Audio.EchoCanceller.SuppressorGainBand1"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="WebRTCMediaType" separator=".">
-  <suffix name="Audio" label="Audio"/>
-  <suffix name="Data" label="Data"/>
-  <suffix name="Video" label="Video"/>
-  <affected-histogram name="WebRTC.PeerConnection.SrtpCryptoSuite"/>
-  <affected-histogram name="WebRTC.PeerConnection.SslCipherSuite"/>
-</histogram_suffixes>
-
-<histogram_suffixes name="WebRTCVideoExperimentGroupId" separator=".">
-  <owner>ilnik@chromium.org</owner>
-  <owner>webrtc-video@google.com</owner>
-  <suffix name="ExperimentGroup0" label=""/>
-  <suffix name="ExperimentGroup1" label=""/>
-  <suffix name="ExperimentGroup2" label=""/>
-  <suffix name="ExperimentGroup3" label=""/>
-  <suffix name="ExperimentGroup4" label=""/>
-  <suffix name="S0" label=""/>
-  <suffix name="S1" label=""/>
-  <suffix name="S2" label=""/>
-  <affected-histogram name="WebRTC.Video.Decoded.Vp8.Qp"/>
-  <affected-histogram name="WebRTC.Video.EndToEndDelayInMs"/>
-  <affected-histogram name="WebRTC.Video.EndToEndDelayMaxInMs"/>
-  <affected-histogram name="WebRTC.Video.InterframeDelay95PercentileInMs"/>
-  <affected-histogram name="WebRTC.Video.InterframeDelayInMs"/>
-  <affected-histogram name="WebRTC.Video.InterframeDelayMaxInMs"/>
-  <affected-histogram name="WebRTC.Video.KeyFramesReceivedInPermille"/>
-  <affected-histogram name="WebRTC.Video.MediaBitrateReceivedInKbps"/>
-  <affected-histogram name="WebRTC.Video.ReceivedHeightInPixels"/>
-  <affected-histogram name="WebRTC.Video.ReceivedWidthInPixels"/>
-  <affected-histogram name="WebRTC.Video.Screenshare.Decoded.Vp8.Qp"/>
-  <affected-histogram name="WebRTC.Video.Screenshare.EndToEndDelayInMs"/>
-  <affected-histogram name="WebRTC.Video.Screenshare.EndToEndDelayMaxInMs"/>
-  <affected-histogram
-      name="WebRTC.Video.Screenshare.InterframeDelay95PercentileInMs"/>
-  <affected-histogram name="WebRTC.Video.Screenshare.InterframeDelayInMs"/>
-  <affected-histogram name="WebRTC.Video.Screenshare.InterframeDelayMaxInMs"/>
-  <affected-histogram
-      name="WebRTC.Video.Screenshare.KeyFramesReceivedInPermille"/>
-  <affected-histogram
-      name="WebRTC.Video.Screenshare.MediaBitrateReceivedInKbps"/>
-  <affected-histogram name="WebRTC.Video.Screenshare.ReceivedHeightInPixels"/>
-  <affected-histogram name="WebRTC.Video.Screenshare.ReceivedWidthInPixels"/>
-</histogram_suffixes>
-
 <histogram_suffixes name="WebSocketErrorCodesVariants" separator="_">
   <suffix name="Localhost" label=""/>
   <suffix name="NotLocalhost" label=""/>
@@ -19721,6 +20059,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="BookmarkPage" label=""/>
   <suffix name="Cast" label=""/>
   <suffix name="ChromeOSRestart" label=""/>
+  <suffix name="ChromeTips" label=""/>
   <suffix name="ClearBrowsingData" label=""/>
   <suffix name="Copy" label=""/>
   <suffix name="CopyUrl" label=""/>
@@ -19766,6 +20105,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="ShowBookmarkMgr" label=""/>
   <suffix name="ShowDownloads" label=""/>
   <suffix name="ShowHistory" label=""/>
+  <suffix name="ShowKaleidoscope" label=""/>
   <suffix name="ShowSyncSetup" label=""/>
   <suffix name="SiteSettings" label=""/>
   <suffix name="TaskManager" label=""/>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/history/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/history/histograms.xml
index d6533e5e8e0..d7342020d4a 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/history/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/history/histograms.xml
@@ -37,6 +37,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="History.BrowsingDataLifetime.Duration.BrowserShutdownDeletion"
+    units="ms" expires_after="2021-11-01">
+  <owner>ydago@chromium.org</owner>
+  <owner>dullweber@chromium.org</owner>
+  <summary>
+    The time that passed while performing a browsing data deletion using the
+    ClearBrowsingDataOnExitList policy. The deletion will be for all time.
+  </summary>
+</histogram>
+
 <histogram
     name="History.BrowsingDataLifetime.Duration.Scheduled{DeletionType}Deletion"
     units="ms" expires_after="2021-11-01">
@@ -53,6 +63,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </token>
 </histogram>
 
+<histogram name="History.BrowsingDataLifetime.State.BrowserShutdownDeletion"
+    enum="BooleanStartedCompleted" expires_after="2021-11-01">
+  <owner>ydago@chromium.org</owner>
+  <owner>dullweber@chromium.org</owner>
+  <summary>The states in which a deletion on shutdown went through.</summary>
+</histogram>
+
 <histogram
     name="History.BrowsingDataLifetime.State.Scheduled{DeletionType}Deletion"
     enum="BooleanStartedCompleted" expires_after="2021-11-01">
@@ -153,7 +170,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="History.ClearBrowsingData.FailedTasksChrome"
-    enum="ChromeBrowsingDataRemoverTasks" expires_after="2021-02-01">
+    enum="ChromeBrowsingDataRemoverTasks" expires_after="2021-04-01">
   <owner>dullweber@chromium.org</owner>
   <owner>msramek@chromium.org</owner>
   <summary>
@@ -209,20 +226,42 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="History.ClearBrowsingData.InstalledAppExcluded"
-    units="Boolean" expires_after="2021-03-12">
+    units="Boolean" expires_after="2022-02-16">
   <owner>jarrydg@chromium.org</owner>
   <owner>chrome-owp-storage@google.com</owner>
   <summary>
     Recorded when the user presses the 'clear' button when presented with the
     list of installed apps they might want to exclude from clearing browsing
-    data. This histogram will be true if the user choose to exclude at least one
-    installed app from clearing. The default has all apps selected, in which
+    data. This histogram will be true if the user chooses to exclude at least
+    one installed app from clearing. The default has all apps selected, in which
     case this enum would be false.
   </summary>
 </histogram>
 
+<histogram name="History.ClearBrowsingData.InstalledAppsDialogAction"
+    enum="InstalledAppsDialogActions" expires_after="2022-02-22">
+  <owner>jarrydg@chromium.org</owner>
+  <owner>chrome-owp-storage@google.com</owner>
+  <summary>
+    Recorded after the InstalledApps dialog is closed. This records the manner
+    in which the dialog was closed.
+  </summary>
+</histogram>
+
+<histogram name="History.ClearBrowsingData.InstalledAppsDialogShown"
+    units="Boolean" expires_after="2022-02-22">
+  <owner>jarrydg@chromium.org</owner>
+  <owner>chrome-owp-storage@google.com</owner>
+  <summary>
+    Recorded after the user clicks clear data on the CleaerBrowsingData dialog,
+    but before the installed apps dialog is shown to the user. The value will be
+    true if there are installed apps (and thus, the installed app dialog will be
+    shown), and false otherwise.
+  </summary>
+</histogram>
+
 <histogram name="History.ClearBrowsingData.InstalledDeselectedNum"
-    units="units" expires_after="2021-03-12">
+    units="units" expires_after="2022-02-16">
   <owner>jarrydg@chromium.org</owner>
   <owner>chrome-owp-storage@google.com</owner>
   <summary>
@@ -234,7 +273,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="History.ClearBrowsingData.InstalledDeselectedPercent"
-    units="%" expires_after="2021-03-12">
+    units="%" expires_after="2022-02-16">
   <owner>jarrydg@chromium.org</owner>
   <owner>chrome-owp-storage@google.com</owner>
   <summary>
@@ -300,6 +339,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="History.ClearBrowsingData.TimeSpentInDialog" units="ms"
     expires_after="M85">
+  <obsolete>
+    Removed 12/2020
+  </obsolete>
   <owner>dullweber@chromium.org</owner>
   <owner>msramek@chromium.org</owner>
   <summary>
@@ -332,7 +374,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="History.ClearBrowsingData.UserDeletedFromTab"
-    enum="ClearBrowsingDataTab" expires_after="2021-03-28">
+    enum="ClearBrowsingDataTab" expires_after="2021-08-01">
   <owner>dullweber@chromium.org</owner>
   <owner>msramek@chromium.org</owner>
   <summary>
@@ -390,7 +432,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="History.DomainCount1Day" units="domains"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>mpearson@chromium.org</owner>
   <owner>mjzhang@chromium.org</owner>
   <owner>chrome-analysis-team@google.com</owner>
@@ -415,7 +457,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="History.DomainCount28Day" units="domains"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>mpearson@chromium.org</owner>
   <owner>mjzhang@chromium.org</owner>
   <owner>chrome-analysis-team@google.com</owner>
@@ -441,7 +483,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="History.DomainCount7Day" units="domains"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>mpearson@chromium.org</owner>
   <owner>mjzhang@chromium.org</owner>
   <owner>chrome-analysis-team@google.com</owner>
@@ -467,7 +509,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="History.DomainCountQueryTime" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>mpearson@chromium.org</owner>
   <owner>mjzhang@chromium.org</owner>
   <owner>chrome-analysis-team@google.com</owner>
@@ -670,7 +712,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="History.MonthlyHostCount" units="hosts"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>mpearson@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
@@ -683,7 +725,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="History.MonthlyURLCount" units="urls"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>mpearson@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
@@ -694,7 +736,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="History.MonthlyVisitCount" units="visits"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>mpearson@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
@@ -817,7 +859,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="History.URLTableCount" units="units"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>mpearson@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
@@ -827,7 +869,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="History.VisitTableCount" units="units"
-    expires_after="2021-05-30">
+    expires_after="2021-08-01">
   <owner>mpearson@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
@@ -837,7 +879,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="History.WeeklyHostCount" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>mpearson@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
@@ -848,7 +890,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="History.WeeklyURLCount" units="units"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>mpearson@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
@@ -859,7 +901,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="History.WeeklyVisitCount" units="units"
-    expires_after="2021-05-30">
+    expires_after="2021-08-01">
   <owner>mpearson@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/holding_space/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/holding_space/histograms.xml
index 9b0e35391ef..e6a8f839fcc 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/holding_space/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/holding_space/histograms.xml
@@ -21,6 +21,30 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<histogram name="HoldingSpace.Animation.BubbleResize.Smoothness" units="%"
+    expires_after="2021-09-24">
+  <owner>dmblack@google.com</owner>
+  <owner>gzadina@google.com</owner>
+  <summary>
+    Records the smoothness of the holding space bubble resize animation. Note
+    that smoothness is expected be be between 0 and 100 (inclusively) with 100
+    representing ideal smoothness of &gt;= 60 frames per second. This histogram
+    is emitted when the resize animation ends.
+  </summary>
+</histogram>
+
+<histogram name="HoldingSpace.Animation.PodResize.Smoothness" units="%"
+    expires_after="2021-09-24">
+  <owner>dmblack@google.com</owner>
+  <owner>gzadina@google.com</owner>
+  <summary>
+    Records the smoothness of the holding space pod resize animation. Note that
+    smoothness is expected be be between 0 and 100 (inclusively) with 100
+    representing ideal smoothness of &gt;= 60 frames per second. This histogram
+    is emitted when the resize animation ends.
+  </summary>
+</histogram>
+
 <histogram name="HoldingSpace.Downloads.Action.All"
     enum="HoldingSpaceDownloadsAction" expires_after="2021-09-24">
   <owner>dmblack@google.com</owner>
@@ -31,9 +55,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="HoldingSpace.FilesAppChip.Action.All"
+    enum="HoldingSpaceFilesAppChipAction" expires_after="2021-09-24">
+  <owner>dmblack@google.com</owner>
+  <owner>gzadina@google.com</owner>
+  <summary>
+    Records an action taken on the Files app chip in holding space UI at the
+    moment the action is performed.
+  </summary>
+</histogram>
+
 <histogram base="true" name="HoldingSpace.Item.Action"
     enum="HoldingSpaceItemType" expires_after="2021-09-24">
-<!-- Name completed by histogram_suffixes name="HoldingSpaceActionType" -->
+<!-- Name completed by histogram_suffixes name="HoldingSpaceItemAction" -->
 
   <owner>dmblack@google.com</owner>
   <owner>gzadina@google.com</owner>
@@ -65,6 +99,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="HoldingSpace.Item.FailureToLaunch" enum="HoldingSpaceItemType"
+    expires_after="2021-09-24">
+  <owner>dmblack@google.com</owner>
+  <owner>gzadina@google.com</owner>
+  <summary>
+    Records a failure to launch a holding space item of a specific type at the
+    moment of failure.
+  </summary>
+</histogram>
+
 <histogram name="HoldingSpace.Pod.Action.All" enum="HoldingSpacePodAction"
     expires_after="2021-09-24">
   <owner>dmblack@google.com</owner>
@@ -115,6 +159,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <suffix name="Drag" label="The user dragged the item."/>
   <suffix name="Launch" label="The user launched the item."/>
   <suffix name="Pin" label="The user pinned the item."/>
+  <suffix name="Remove" label="The user removed the item."/>
   <suffix name="ShowInFolder" label="The user showed the item in its folder."/>
   <suffix name="Unpin" label="The user unpinned the item."/>
   <affected-histogram name="HoldingSpace.Item.Action"/>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/image/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/image/histograms.xml
index 4048882551e..7a451cacda0 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/image/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/image/histograms.xml
@@ -42,7 +42,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ImageAnnotationService.AccessibilityV1.ClientResult"
-    enum="ImageAnnotationServiceClientResult" expires_after="2021-03-28">
+    enum="ImageAnnotationServiceClientResult" expires_after="2021-08-09">
   <owner>dmazzoni@chromium.org</owner>
   <owner>amoylan@chromium.org</owner>
   <owner>martis@chromium.org</owner>
@@ -248,7 +248,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ImageFetcher.Events" enum="ImageFetcherEvent"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>fgorski@chromium.org</owner>
   <owner>wylieb@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/input/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/input/histograms.xml
index 5d90d56067e..745184d74d1 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/input/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/input/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="InputMethod.ActiveCount" units="units"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>myy@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -34,7 +34,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Assistive.Autocorrect.Actions"
-    enum="IMEAutocorrectActions" expires_after="2021-03-15">
+    enum="IMEAutocorrectActions" expires_after="2021-08-22">
   <owner>jopalmer@google.com</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -44,7 +44,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Assistive.Autocorrect.Count"
-    enum="IMETextInputClient" expires_after="2021-03-15">
+    enum="IMETextInputClient" expires_after="2021-07-18">
   <owner>myy@google.com</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -55,7 +55,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Assistive.Autocorrect.Delay" units="ms"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>jopalmer@google.com</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -65,7 +65,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Assistive.Coverage" enum="IMEAssistiveAction"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>jiwan@google.com</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -75,7 +75,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Assistive.Disabled" enum="IMEAssistiveAction"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>jiwan@google.com</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -87,7 +87,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Assistive.Disabled.Emoji"
-    enum="IMEAssistiveDisabledReason" expires_after="2021-03-15">
+    enum="IMEAssistiveDisabledReason" expires_after="2021-07-18">
   <owner>myy@google.com</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -99,7 +99,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Assistive.Disabled.PersonalInfo"
-    enum="IMEAssistiveDisabledReason" expires_after="2021-03-15">
+    enum="IMEAssistiveDisabledReason" expires_after="2021-07-18">
   <owner>myy@google.com</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -111,7 +111,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Assistive.EmojiSuggestAddition.AcceptanceIndex"
-    units="times" expires_after="2021-03-15">
+    units="times" expires_after="2021-07-18">
   <owner>myy@google.com</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -121,8 +121,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="InputMethod.Assistive.InsufficientData"
+    enum="IMEAssistiveAction" expires_after="2021-05-16">
+  <owner>jiwan@google.com</owner>
+  <owner>essential-inputs-team@google.com</owner>
+  <summary>
+    The number of times each assistive action could be triggered but there is
+    insufficient data to generate the suggestion. Recorded when we failed to
+    generate suggestions because of insufficient data.
+  </summary>
+</histogram>
+
 <histogram name="InputMethod.Assistive.Match" enum="IMEAssistiveAction"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>jiwan@google.com</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -134,8 +145,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="InputMethod.Assistive.NotAllowed" enum="IMEAssistiveAction"
+    expires_after="2021-05-16">
+  <owner>jiwan@google.com</owner>
+  <owner>essential-inputs-team@google.com</owner>
+  <summary>
+    The number of times each assistive action could be triggered but is blocked
+    because the text is not in the allowed websites or apps. Recorded when the
+    assistive action is blocked because the text is not in the allowed websites
+    or apps.
+  </summary>
+</histogram>
+
 <histogram name="InputMethod.Assistive.Success" enum="IMEAssistiveAction"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>jiwan@google.com</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -145,7 +168,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Assistive.TimeToAccept.Emoji" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>myy@google.com</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -155,7 +178,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Assistive.TimeToAccept.PersonalInfo" units="ms"
-    expires_after="2021-01-01">
+    expires_after="2021-07-27">
   <owner>jiwan@google.com</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -175,7 +198,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Assistive.TimeToDismiss.PersonalInfo" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>jiwan@google.com</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -185,7 +208,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Assistive.UserPref.Emoji" enum="BooleanEnabled"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>myy@google.com</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -196,7 +219,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Assistive.UserPref.PersonalInfo"
-    enum="BooleanEnabled" expires_after="2021-03-21">
+    enum="BooleanEnabled" expires_after="2021-07-27">
   <owner>myy@google.com</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -207,14 +230,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.AutoCorrectLevel" enum="IMECorrectionLevel"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>The auto-correction level for suggestion engine.</summary>
 </histogram>
 
 <histogram name="InputMethod.Category" enum="InputMethodCategory"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -224,7 +247,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Commit.Index" units="units"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -235,14 +258,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="InputMethod.Commit.Type2" enum="IMECommitType2"
     expires_after="M95">
+  <owner>dvallet@chromium.org</owner>
   <owner>shuchen@chromium.org</owner>
+  <owner>essential-inputs-team@google.com</owner>
   <summary>
     The suggestion accuracy type which the user chooses to commit.
   </summary>
 </histogram>
 
-<histogram name="InputMethod.CommitLength" units="units" expires_after="M95">
+<histogram name="InputMethod.CommitLength" units="characters"
+    expires_after="M95">
+  <owner>dvallet@chromium.org</owner>
   <owner>shuchen@chromium.org</owner>
+  <owner>essential-inputs-team@google.com</owner>
   <summary>The number of characters committed with composition text.</summary>
 </histogram>
 
@@ -257,7 +285,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Handwriting.Actions" enum="ImeHandwritingActions"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -299,7 +327,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Handwriting.CharsEdited10s" units="chars"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -309,7 +337,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Handwriting.CharsEdited5s" units="chars"
-    expires_after="2021-05-02">
+    expires_after="2021-08-09">
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -319,7 +347,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Handwriting.CharsEdited60s" units="chars"
-    expires_after="2021-03-01">
+    expires_after="2021-09-01">
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -329,17 +357,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.ID2" enum="InputMethodID2" expires_after="M95">
+  <owner>tranbaoduy@chromium.org</owner>
   <owner>shuchen@chromium.org</owner>
+  <owner>essential-inputs-team@google.com</owner>
   <summary>
-    The breakdown of input method usage by input method IDs. Recorded when the
-    user presses keys on physical or on-screen keyboard.
+    Breakdown of input method usage by input method IDs. Recorded for an input
+    method ID when the system's 'active input method' is switched to the input
+    method with that ID. Note: In this context, 'input method ID' refers to the
+    'global' input method IDs, i.e. tuple of the extension ID the input method
+    belongs to and the extension-local ID of the input method.
   </summary>
 </histogram>
 
 <histogram name="InputMethod.ImeMenu.ActivationChanged"
     enum="BooleanActivation" expires_after="M95">
+  <owner>dvallet@chromium.org</owner>
   <owner>azurewei@chromium.org</owner>
   <owner>shuchen@chromium.org</owner>
+  <owner>essential-inputs-team@google.com</owner>
   <summary>
     Whether the opt-in IME menu in the shelf has been activated.
   </summary>
@@ -347,8 +382,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="InputMethod.ImeMenu.EmojiHandwritingVoiceButton"
     enum="ImeMenuButtonType" expires_after="M95">
+  <owner>dvallet@chromium.org</owner>
   <owner>azurewei@chromium.org</owner>
   <owner>shuchen@chromium.org</owner>
+  <owner>essential-inputs-team@google.com</owner>
   <summary>
     The number of times users click emoji, handwriting or voice button in opt-in
     IME menu.
@@ -357,12 +394,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="InputMethod.ImeSwitch" enum="IMESwitchType"
     expires_after="M95">
+  <owner>dvallet@chromium.org</owner>
   <owner>shuchen@chromium.org</owner>
+  <owner>essential-inputs-team@google.com</owner>
   <summary>The trigger type of input method switches by user.</summary>
 </histogram>
 
 <histogram name="InputMethod.KeyEventLatency" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>Time taken by the engine to handle a key event.</summary>
@@ -386,8 +425,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="InputMethod.Mojo.Extension.ActivateIMELatency" units="ms"
     expires_after="2019-12-30">
+  <obsolete>
+    Obsolete since Q4 2019. Officially deprecated Nov 2020. This was meant for
+    rule-based input methods via extension and IME service, but as at circa Q4
+    2019, rule-based input methods stopped going through the extension.
+  </obsolete>
   <owner>googleo@chromium.org</owner>
   <owner>shuchen@chromium.org</owner>
+  <owner>essential-inputs-team@google.com</owner>
   <summary>
     The time taken to activate a new IME via IME Mojo service in the IME
     extension. It's from when the IME extension sends out an request to activate
@@ -397,14 +442,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.Mojo.Extension.Event" enum="IMEExtensionMojoEvent"
-    expires_after="2021-04-01">
-  <owner>shend@chromium.org</owner>
+    expires_after="2021-10-01">
+  <owner>googleo@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>The events of Mojo service in the IME Extension.</summary>
 </histogram>
 
 <histogram name="InputMethod.Mojo.Extension.Rulebased.ProcessLatency"
     units="ms" expires_after="2019-12-31">
+  <obsolete>
+    Obsolete since Q4 2019. Officially deprecated Nov 2020. This was meant for
+    rule-based input methods via extension and IME service, but as at circa Q4
+    2019, rule-based input methods stopped going through the extension.
+  </obsolete>
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -415,6 +465,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="InputMethod.Mojo.Extension.ServiceInitLatency" units="ms"
     expires_after="2019-12-31">
+  <obsolete>
+    Obsolete since Q4 2019. Officially deprecated Nov 2020. This was meant for
+    rule-based input methods via extension and IME service, but as at circa Q4
+    2019, rule-based input methods stopped going through the extension.
+  </obsolete>
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -425,8 +480,48 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="InputMethod.MultilingualExperiment.Autocorrect.Actions"
+    enum="IMEAutocorrectActions" expires_after="2021-06-30">
+  <owner>tranbaoduy@google.com</owner>
+  <owner>essential-inputs-team@google.com</owner>
+  <summary>
+    Same as InputMethod.Assistive.Autocorrect.Actions but only recorded for CrOS
+    1P experimental multilingual input methods.
+  </summary>
+</histogram>
+
+<histogram name="InputMethod.MultilingualExperiment.Autocorrect.Count"
+    enum="IMETextInputClient" expires_after="2021-06-30">
+  <owner>tranbaoduy@google.com</owner>
+  <owner>essential-inputs-team@google.com</owner>
+  <summary>
+    Same as InputMethod.Assistive.Autocorrect.Count but only recorded for CrOS
+    1P experimental multilingual input methods.
+  </summary>
+</histogram>
+
+<histogram name="InputMethod.MultilingualExperiment.Autocorrect.Delay"
+    units="ms" expires_after="2021-06-30">
+  <owner>tranbaoduy@google.com</owner>
+  <owner>essential-inputs-team@google.com</owner>
+  <summary>
+    Same as InputMethod.Assistive.Autocorrect.Delay but only recorded for CrOS
+    1P experimental multilingual input methods.
+  </summary>
+</histogram>
+
+<histogram name="InputMethod.NextWordPrediction" enum="BooleanEnabled"
+    expires_after="2021-08-15">
+  <owner>myy@chromium.org</owner>
+  <owner>essential-inputs-team@google.com</owner>
+  <summary>
+    Whether next word prediction is enabled for a user. Recorded when a specific
+    language settings page is updated or when the input extension is activated.
+  </summary>
+</histogram>
+
 <histogram name="InputMethod.PkCommit.Index" units="units"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
@@ -437,7 +532,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="InputMethod.PkCommit.Type" enum="IMECommitType2"
     expires_after="M95">
+  <owner>dvallet@chromium.org</owner>
   <owner>shuchen@chromium.org</owner>
+  <owner>essential-inputs-team@google.com</owner>
   <summary>
     The suggestion accuracy type which the user chooses to commit for physical
     keyboard autocorrect.
@@ -545,14 +642,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.VirtualKeyboard.Emoji.TriggerType"
-    enum="VirtualKeyboardEmojiTriggerType" expires_after="M89">
+    enum="VirtualKeyboardEmojiTriggerType" expires_after="M95">
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>How emojis were inserted.</summary>
 </histogram>
 
 <histogram name="InputMethod.VirtualKeyboard.ErrorType"
-    enum="VirtualKeyboardErrorTypeHashes" expires_after="2021-04-04">
+    enum="VirtualKeyboardErrorTypeHashes" expires_after="2021-08-09">
   <owner>shend@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>Errors from the virtual keyboard extension</summary>
@@ -607,7 +704,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InputMethod.VirtualKeyboard.InitLatency.KeyboardShownLongTail"
-    units="ms" expires_after="2021-03-28">
+    units="ms" expires_after="2021-08-01">
   <owner>jopalmer@chromium.org</owner>
   <owner>essential-inputs-team@google.com</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/instant/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/instant/histograms.xml
index 855fe0935df..3616df4b381 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/instant/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/instant/histograms.xml
@@ -52,7 +52,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstantTethering.BluetoothDiscoverySessionStarted"
-    enum="BooleanSuccess" expires_after="2021-05-02">
+    enum="BooleanSuccess" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -61,7 +61,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstantTethering.BluetoothDiscoverySessionStopped"
-    enum="BooleanSuccess" expires_after="2021-02-02">
+    enum="BooleanSuccess" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -71,7 +71,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="InstantTethering.ConnectionToHostResult.Failure"
     enum="InstantTethering_ConnectionToHostResult_Failure"
-    expires_after="2021-02-02">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -90,7 +90,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="InstantTethering.ConnectionToHostResult.Failure.ClientConnection"
     enum="InstantTethering_ConnectionToHostResult_Failure_ClientConnection"
-    expires_after="2021-02-02">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -110,7 +110,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="InstantTethering.ConnectionToHostResult.Failure.TetheringTimeout"
     enum="InstantTethering_ConnectionToHostResult_Failure_TetheringTimeout"
-    expires_after="2021-02-02">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -142,7 +142,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="InstantTethering.ConnectionToHostResult.ProvisioningFailureRate"
     enum="InstantTethering_ConnectionToHostResult_ProvisioningFailureRate"
-    expires_after="2021-02-02">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -162,7 +162,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="InstantTethering.ConnectionToHostResult.SuccessRate.Background"
     enum="InstantTethering_ConnectionToHostResult_SuccessRate"
-    expires_after="2021-04-04">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -179,7 +179,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstantTethering.FeatureState"
-    enum="InstantTethering_FeatureState" expires_after="2021-04-04">
+    enum="InstantTethering_FeatureState" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -195,7 +195,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstantTethering.HostScanBatchDuration" units="ms"
-    expires_after="2021-02-02">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -211,7 +211,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstantTethering.HostScanResult"
-    enum="InstantTethering_HostScanResult" expires_after="2021-05-09">
+    enum="InstantTethering_HostScanResult" expires_after="2021-07-11">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -229,7 +229,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstantTethering.HotspotUsageDuration" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -240,7 +240,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstantTethering.KeepAliveTickle.Result" enum="BooleanSuccess"
-    expires_after="2021-02-02">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -250,7 +250,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstantTethering.MultiDeviceFeatureState"
-    enum="MultiDevice_FeatureState" expires_after="2021-04-04">
+    enum="MultiDevice_FeatureState" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -262,7 +262,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="InstantTethering.NotificationInteractionType"
     enum="InstantTethering_NotificationInteractionType"
-    expires_after="2021-04-04">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -272,7 +272,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstantTethering.Performance.ConnectTetheringResponseDuration"
-    units="ms" expires_after="2021-02-02">
+    units="ms" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -282,7 +282,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstantTethering.Performance.ConnectToHostDuration.Background"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -293,7 +293,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstantTethering.Performance.ConnectToHotspotDuration"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -305,7 +305,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="InstantTethering.Performance.DisconnectTetheringRequestDuration"
-    units="ms" expires_after="2021-02-02">
+    units="ms" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -315,7 +315,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstantTethering.Performance.KeepAliveTickleResponseDuration"
-    units="ms" expires_after="2021-02-02">
+    units="ms" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -326,7 +326,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="InstantTethering.Performance.TetherAvailabilityResponseDuration"
-    units="ms" expires_after="2021-02-02">
+    units="ms" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -336,7 +336,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstantTethering.SessionCompletionReason"
-    enum="InstantTethering_SessionCompletionReason" expires_after="2021-02-02">
+    enum="InstantTethering_SessionCompletionReason" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -348,7 +348,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstantTethering.UserPreference.OnStartup"
-    enum="BooleanEnabled" expires_after="2021-04-04">
+    enum="BooleanEnabled" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -359,7 +359,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstantTethering.UserPreference.OnToggle"
-    enum="BooleanEnabled" expires_after="2021-02-02">
+    enum="BooleanEnabled" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/interstitial/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/interstitial/histograms.xml
index a64e3b64e1e..84f35607da2 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/interstitial/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/interstitial/histograms.xml
@@ -30,39 +30,45 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="interstitial.decision" enum="SecurityInterstitialDecision"
-    expires_after="M89">
+    expires_after="M94">
   <owner>estark@chromium.org</owner>
   <owner>carlosil@chromium.org</owner>
   <summary>
     User decision when presented with a security interstitial. As of M44,
     subresource interstitials were split into their own entries. As of M52,
     social_engineering_ads* and social_engineering_landing* interstitial reasons
-    are split into their own entries from phishing*.
+    are split into their own entries from phishing*. As of M90,
+    social_engineering_ads* and social_engineering_landing* interstitial reasons
+    have been removed because they don't trigger interstitials.
   </summary>
 </histogram>
 
 <histogram name="interstitial.decision.repeat_visit"
-    enum="SecurityInterstitialDecision" expires_after="M89">
-  <owner>felt@chromium.org</owner>
+    enum="SecurityInterstitialDecision" expires_after="M94">
   <owner>carlosil@chromium.org</owner>
+  <owner>security-enamel@chromium.org</owner>
   <summary>
     User decision when presented with a security interstitial, on a site that
     the user had previously visited. As of M44, subresource interstitials were
     split into their own entries. As of M52, social_engineering_ads* and
     social_engineering_landing* interstitial reasons are split into their own
-    entries from phishing*.
+    entries from phishing*. As of M90, social_engineering_ads* and
+    social_engineering_landing* interstitial reasons have been removed because
+    they don't trigger interstitials.
   </summary>
 </histogram>
 
 <histogram name="interstitial.interaction"
-    enum="SecurityInterstitialInteraction" expires_after="M89">
+    enum="SecurityInterstitialInteraction" expires_after="M94">
   <owner>estark@chromium.org</owner>
   <owner>carlosil@chromium.org</owner>
   <summary>
     User interactions with a security interstitial. As of M44, subresource
     interstitials were split into their own entries. As of M52,
     social_engineering_ads* and social_engineering_landing* interstitial reasons
-    are split into their own entries from phishing*.
+    are split into their own entries from phishing*. As of M90,
+    social_engineering_ads* and social_engineering_landing* interstitial reasons
+    have been removed because they don't trigger interstitials.
   </summary>
 </histogram>
 
@@ -79,7 +85,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="interstitial.ssl.cause.nonoverridable" enum="SSLErrorCauses"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>estark@chromium.org</owner>
   <owner>carlosil@chromium.org</owner>
   <summary>
@@ -96,7 +102,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="interstitial.ssl.cause.overridable" enum="SSLErrorCauses"
-    expires_after="M89">
+    expires_after="M94">
   <owner>estark@chromium.org</owner>
   <owner>carlosil@chromium.org</owner>
   <summary>
@@ -142,8 +148,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="interstitial.ssl.did_user_revoke_decisions2"
-    enum="BooleanRevoked" expires_after="M89">
+    enum="BooleanRevoked" expires_after="M94">
   <owner>carlosil@chromium.org</owner>
+  <owner>security-enamel@chromium.org</owner>
   <summary>
     Specifies when a user enters the page info menu whether or not the user
     pressed the SSL decisions revoke button. This is logged when the page info
@@ -161,7 +168,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="interstitial.ssl_error_handler" enum="SSLErrorHandlerEvent"
-    expires_after="M89">
+    expires_after="M94">
   <owner>meacer@chromium.org</owner>
   <owner>carlosil@chromium.org</owner>
   <owner>estark@chromium.org</owner>
@@ -184,7 +191,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="interstitial.ssl_error_type" enum="SSLErrorTypes"
-    expires_after="M89">
+    expires_after="M94">
   <owner>estark@chromium.org</owner>
   <owner>carlosil@chromium.org</owner>
   <summary>
@@ -255,6 +262,39 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="TypedNavigationUpgradeThrottle.Event"
+    enum="TypedNavigationUpgradeThrottleEvent" expires_after="2021-08-09">
+  <owner>meacer@chromium.org</owner>
+  <owner>trusty-transport@chromium.org</owner>
+  <summary>
+    Events for upgrading Default Omnibox Navigations to HTTPS feature. Recorded
+    when a navigation is started by typing a domain name without a scheme and
+    the URL is defaulted to HTTPS instead of HTTP.
+  </summary>
+</histogram>
+
+<histogram name="TypedNavigationUpgradeThrottle.UpgradeFailTime" units="ms"
+    expires_after="2021-08-09">
+  <owner>meacer@chromium.org</owner>
+  <owner>trusty-transport@chromium.org</owner>
+  <summary>
+    Records the duration to detect a failed HTTPS upgrade for omnibox
+    navigations typed without a scheme (i.e. HTTP fallbacks). Only recorded when
+    the HTTPS load fails with an SSL or net error. Not recorded when the upgrade
+    timer expires. Recorded once for a redirect chain.
+  </summary>
+</histogram>
+
+<histogram name="TypedNavigationUpgradeThrottle.UpgradeSuccessTime" units="ms"
+    expires_after="2021-08-09">
+  <owner>meacer@chromium.org</owner>
+  <owner>trusty-transport@chromium.org</owner>
+  <summary>
+    Records the duration to detect a successful HTTPS upgrade for omnibox
+    navigations typed without a scheme. Recorded once for a redirect chain.
+  </summary>
+</histogram>
+
 </histograms>
 
 </histogram-configuration>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/invalidation/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/invalidation/histograms.xml
new file mode 100644
index 00000000000..d3ecd3abe1f
--- /dev/null
+++ b/chromium/tools/metrics/histograms/histograms_xml/invalidation/histograms.xml
@@ -0,0 +1,163 @@
+<!--
+Copyright 2020 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<!--
+This file is used to generate a comprehensive list of invalidation
+(cf. components/invalidation/) histograms along with a detailed description for
+each one.
+
+For best practices on writing histogram descriptions, see
+https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/metrics/histograms/README.md
+
+Please send CLs to chromium-metrics-reviews@google.com rather than to specific
+individuals. These CLs will be automatically reassigned to a reviewer within
+about 5 minutes. This approach helps the metrics team to load-balance incoming
+reviews. Googlers can read more about this at go/gwsq-gerrit.
+-->
+
+<histogram-configuration>
+
+<histograms>
+
+<histogram name="DeprecatedInvalidatorRegistrar.CrashStatus"
+    enum="HandlerOwnerType" expires_after="M75">
+  <obsolete>
+    Expired in M75.
+  </obsolete>
+  <owner>melandory@chromium.org</owner>
+  <summary>
+    DeprecatedInvlalidatorRegistrar is crashing on the browser shut down. The
+    reason for the crash is that not all invalidation handlers de-registister
+    themselves. Histogram records the type of the handler which hasn't
+    unregistered itself. Analyzing the histogram will allow us to understand,
+    which handlers are causing the crash.
+  </summary>
+</histogram>
+
+<histogram name="FCMInvalidations.FailedSubscriptionsErrorCode"
+    enum="NetErrorCodes" expires_after="never">
+<!-- expires-never: For monitoring FCM based invalidations. -->
+
+  <owner>melandory@chromium.org</owner>
+  <owner>treib@chromium.org</owner>
+  <summary>Net error codes for failed subscription requests.</summary>
+</histogram>
+
+<histogram name="FCMInvalidations.FCMMessageStatus"
+    enum="FCMInvalidationMessageStatus" expires_after="never">
+<!-- expires-never: For monitoring FCM based invalidations. -->
+
+<!-- Name completed by histogram_suffixes name="FCMInvalidationSenders" -->
+
+  <owner>melandory@chromium.org</owner>
+  <owner>treib@chromium.org</owner>
+  <summary>
+    Status of the message from the FCM channel. Recorded upon receiving response
+    from the FCM channel.
+  </summary>
+</histogram>
+
+<histogram name="FCMInvalidations.InitialTokenRetrievalStatus"
+    enum="InstanceIDResult" expires_after="never">
+<!-- expires-never: For monitoring FCM based invalidations. -->
+
+  <owner>melandory@chromium.org</owner>
+  <owner>treib@chromium.org</owner>
+  <summary>
+    Status of the initial attempt to retrieve the instance id token.
+  </summary>
+</histogram>
+
+<histogram name="FCMInvalidations.ResetClientIDStatus" enum="InstanceIDResult"
+    expires_after="2020-10-19">
+  <obsolete>
+    Removed 2020-10.
+  </obsolete>
+  <owner>tschumann@chromium.org</owner>
+  <owner>treib@chromium.org</owner>
+  <summary>
+    Status of resetting the client instance ID, which includes unregistering
+    from FCM servers.
+  </summary>
+</histogram>
+
+<histogram name="FCMInvalidations.SubscriptionRequestStatus"
+    enum="FCMInvalidationSubscriptionStatus" expires_after="never">
+<!-- expires-never: For monitoring FCM based invalidations. -->
+
+  <owner>melandory@chromium.org</owner>
+  <owner>treib@chromium.org</owner>
+  <summary>
+    Status of subscription request to the Per User Topic server. Recorded upon
+    receiving response from server.
+  </summary>
+</histogram>
+
+<histogram name="FCMInvalidations.SubscriptionResponseCode"
+    enum="HttpResponseCode" expires_after="never">
+<!-- expires-never: For monitoring FCM based invalidations. -->
+
+  <owner>melandory@chromium.org</owner>
+  <owner>treib@chromium.org</owner>
+  <summary>
+    For each subcription request to the FCM Per-User-Topic server, log the
+    response received from the server.
+  </summary>
+</histogram>
+
+<histogram name="FCMInvalidations.SubscriptionResponseCodeForTopic"
+    enum="HttpResponseCode" expires_after="never">
+<!-- expires-never: For monitoring FCM based invalidations. -->
+
+  <owner>melandory@chromium.org</owner>
+  <owner>treib@chromium.org</owner>
+  <summary>
+    For each subcription request to the FCM Per-User-Topic server, log the
+    response received from the server per topic. Note: This is only recorded
+    with a data type suffix. The base version is never recorded.
+  </summary>
+</histogram>
+
+<histogram name="FCMInvalidations.TokenStateOnRegistrationRequest2"
+    enum="TokenStateOnRegistrationRequest" expires_after="never">
+<!-- expires-never: For monitoring FCM based invalidations. -->
+
+  <owner>melandory@chromium.org</owner>
+  <owner>treib@chromium.org</owner>
+  <summary>
+    Records the outcome of instance ID token requests (i.e. whether the token
+    changed). Such requests are made when invalidations are first enabled (e.g.
+    on sign-in), and then periodically every 24 hours.
+  </summary>
+</histogram>
+
+<histogram name="FCMInvalidations.UnsubscriptionRequestStatus"
+    enum="FCMInvalidationSubscriptionStatus" expires_after="never">
+<!-- expires-never: For monitoring FCM based invalidations. -->
+
+  <owner>melandory@chromium.org</owner>
+  <owner>treib@chromium.org</owner>
+  <summary>
+    Status of unsubscription request to the Per User Topic server. Recorded upon
+    receiving response from server.
+  </summary>
+</histogram>
+
+<histogram name="Invalidations.StatusChanged" enum="InvalidatorState"
+    expires_after="M85">
+  <obsolete>
+    Expired in M85.
+  </obsolete>
+  <owner>melandory@chromium.org</owner>
+  <summary>
+    Status of the invalidation component. The metric is recorded on startup
+    unless invalidations are disabled, plus when the state changes.
+  </summary>
+</histogram>
+
+</histograms>
+
+</histogram-configuration>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/ios/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/ios/histograms.xml
index c17cda04958..9a3f96dfaf3 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/ios/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/ios/histograms.xml
@@ -24,7 +24,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="IOS.CommittedNavigationHasContext" enum="Boolean"
     expires_after="2021-09-24">
   <owner>ajuma@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
     When a navigation is committed, it should have a non-null NavigationContext.
@@ -39,7 +38,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="IOS.CommittedURLMatchesCurrentItem" enum="Boolean"
     expires_after="2021-09-24">
   <owner>ajuma@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
     When a navigation is committed, the web view URL is expected to match that
@@ -51,7 +49,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.ContentExtension.DisplayCount" units="count"
-    expires_after="2021-05-02">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
@@ -61,7 +59,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.ContentExtension.Index" units="index"
-    expires_after="2021-11-01">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
@@ -108,7 +106,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.CredentialExtension.CopyPasswordCount" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
@@ -118,7 +116,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.CredentialExtension.CopyURLCount" units="count"
-    expires_after="2021-05-09">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
@@ -128,7 +126,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.CredentialExtension.CopyUsernameCount" units="count"
-    expires_after="2021-05-09">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
@@ -138,7 +136,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.CredentialExtension.DisplayCount" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
@@ -148,7 +146,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.CredentialExtension.FetchPasswordFailure" units="count"
-    expires_after="2021-05-09">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
@@ -159,7 +157,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.CredentialExtension.FetchPasswordNilArgument"
-    units="count" expires_after="2021-04-04">
+    units="count" expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
@@ -170,7 +168,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.CredentialExtension.PasswordUseCount" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
@@ -180,7 +178,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.CredentialExtension.QuickPasswordUseCount" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
@@ -191,7 +189,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.CredentialExtension.ReauthCount" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
@@ -201,7 +199,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.CredentialExtension.SearchCount" units="count"
-    expires_after="2021-05-09">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
@@ -213,7 +211,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="IOS.CredentialExtension.Service.Error.ReplaceCredentialIdentitiesWithIdentities"
     enum="iOSCredentialIdentityStoreErrorForReporting"
-    expires_after="2021-06-22">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
@@ -223,7 +221,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.CredentialExtension.ShowPasswordCount" units="count"
-    expires_after="2021-01-31">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>djean@chromium.org</owner>
   <summary>
@@ -233,9 +231,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.CriticalActionBackgroundTimeRemaining" units="ms"
-    expires_after="2021-03-28">
+    expires_after="2021-05-30">
+  <obsolete>
+    Recording removed 12/2020.
+  </obsolete>
   <owner>justincohen@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
   <summary>
     Recorded when app is running in the background and posted a background task.
     This time is obtained by calling UIApplication.backgroundTimeRemaining. When
@@ -264,7 +264,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.DefaultBrowserFullscreenPromo"
-    enum="IOSDefaultBrowserFullscreenPromoAction" expires_after="2021-03-01">
+    enum="IOSDefaultBrowserFullscreenPromoAction" expires_after="2022-02-01">
   <owner>thegreenfrog@chromium.org</owner>
   <owner>rohitrao@chromium.org</owner>
   <summary>
@@ -272,6 +272,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="IOS.DefaultBrowserFullscreenPromoRemindMe"
+    enum="IOSDefaultBrowserFullscreenPromoAction" expires_after="2021-07-01">
+  <owner>thegreenfrog@chromium.org</owner>
+  <owner>rohitrao@chromium.org</owner>
+  <summary>
+    The action taken by the user in response to the default browser promo with
+    the Remind Me Later button.
+  </summary>
+</histogram>
+
+<histogram name="IOS.DefaultBrowserFullscreenPromoRemindMeSecondPromo"
+    enum="IOSDefaultBrowserFullscreenPromoAction" expires_after="2021-07-01">
+  <owner>thegreenfrog@chromium.org</owner>
+  <owner>rohitrao@chromium.org</owner>
+  <summary>
+    The action taken by the user in response to the second default browser promo
+    after tapping on the Remind Me Later button.
+  </summary>
+</histogram>
+
 <histogram name="IOS.Dialogs.JavaScriptDialogClosed"
     enum="IOSJavaScriptDialogDismissalCause" expires_after="M80">
   <owner>kkhorimoto@chromium.org</owner>
@@ -281,6 +301,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="IOS.DragAndDrop.DragContent" enum="DragContent"
     expires_after="2020-03-01">
+  <obsolete>
+    Removed 12/2020 as it is no longer needed for analysis.
+  </obsolete>
   <owner>jif@chromium.org</owner>
   <summary>
     The type of content that the user is dragging into Chrome. Because a drag
@@ -327,7 +350,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="IOS.FinishedURLMatchesCurrentItem" enum="Boolean"
     expires_after="2021-10-26">
   <owner>ajuma@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
     When a navigation is finished, the web view URL is expected to match that of
@@ -339,9 +361,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.FormInputAccessory.ExecuteFormAssistActionException"
-    enum="FormInputAccessoryAction" expires_after="2021-06-01">
+    enum="FormInputAccessoryAction" expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
+  <owner>rohitrao@chromium.org</owner>
   <summary>
     Reports exceptions when trying to send a form input accessory action to the
     virtual keyboard.
@@ -357,7 +379,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="IOS.Incognito.TimeSpent" units="ms" expires_after="2021-05-09">
+<histogram name="IOS.Incognito.TimeSpent" units="ms" expires_after="2021-07-11">
   <owner>olivierrobin@chromium.org</owner>
   <owner>thegreenfrog@chromium.org</owner>
   <summary>
@@ -369,16 +391,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="IOS.IPHBubbleDismissalReason" enum="BubbleDismissalReason"
     expires_after="M77">
+  <obsolete>
+    Deprecated 12/2020 as it is no longer used for analysis.
+  </obsolete>
   <owner>pkl@chromium.org</owner>
   <summary>
     Tracks the reason for why the In Product Help bubble was dismissed.
   </summary>
 </histogram>
 
-<histogram name="IOS.IsDefaultBrowser" enum="Boolean"
-    expires_after="2021-09-21">
+<histogram name="IOS.IsDefaultBrowser" enum="Boolean" expires_after="never">
+<!-- expires-never: used internally for filtering -->
+
   <owner>thegreenfrog@chromium.org</owner>
   <owner>rohitrao@chromium.org</owner>
+  <owner>chrome-metrics-team@google.com</owner>
   <summary>
     As of iOS14, users will be able to set a default browser other than Safari.
     When Chrome is the default browser, it will receive all URL opens, which is
@@ -412,8 +439,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="IOS.LinkToText.ShouldOfferResult"
+    enum="LinkToTextShouldOfferResult" expires_after="2021-12-01">
+  <owner>tmartino@chromium.org</owner>
+  <owner>seblalancette@chromium.org</owner>
+  <summary>
+    The result of conditional disable/enable checking for the Link to Text
+    feature, including granular failure reasons when the feature is not offered.
+  </summary>
+</histogram>
+
 <histogram name="IOS.LocationPermissions.FirstRunModal.Interaction"
-    enum="LocationPermissionsFirstRunModalIOSEnum" expires_after="2021-05-31">
+    enum="LocationPermissionsFirstRunModalIOSEnum" expires_after="2021-08-01">
   <owner>thegreenfrog@chromium.org</owner>
   <owner>rohitrao@chromium.org</owner>
   <summary>
@@ -422,7 +459,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.LocationPermissionsUI" enum="LocationPermissionsIOSUI"
-    expires_after="2021-05-31">
+    expires_after="2021-08-01">
   <owner>thegreenfrog@chromium.org</owner>
   <owner>rohitrao@chromium.org</owner>
   <summary>
@@ -432,9 +469,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="IOS.MainThreadFreezeDetection.NotRunningAfterReport"
+    enum="IOSMainThreadFreezeDetectionNotRunningAfterReportBlock"
+    expires_after="2021-07-01">
+  <owner>justincohen@chromium.org</owner>
+  <owner>olivierrobin@chromium.org</owner>
+  <summary>
+    Recorded when the main thread recovers immediately after a freeze report was
+    generated.
+  </summary>
+</histogram>
+
 <histogram name="IOS.MainThreadFreezeDetection.RecoveredAfter" units="ms"
-    expires_after="2020-12-25">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-11-12">
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     The time during which main thread was not responding. 0 if application was
@@ -446,7 +494,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="IOS.MetricKit.ApplicationHangTime" units="ms"
     expires_after="2021-03-15">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     The durations of time in which the app is too busy to handle user
@@ -456,8 +504,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.MetricKit.ApplicationResumeTime" units="ms"
-    expires_after="2021-05-09">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-07-11">
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     The amount of time taken to resume the app from the background. Logged when
@@ -466,8 +514,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.MetricKit.AverageSuspendedMemory" units="MB"
-    expires_after="2021-04-25">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-06-27">
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     The average amount of memory in use by the app when it's suspended. Logged
@@ -476,8 +524,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.MetricKit.BackgroundExitData" enum="MetricKitExitData"
-    expires_after="2021-05-09">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-07-11">
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     The reason for the application termination in background. Logged when a
@@ -486,8 +534,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.MetricKit.BackgroundTimePerDay" units="ms"
-    expires_after="2021-03-15">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-07-27">
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     The total time the app is in the background. Logged when a MXMetricPayload
@@ -497,18 +545,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.MetricKit.ForegroundExitData" enum="MetricKitExitData"
-    expires_after="2021-03-15">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-07-18">
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
-    The reason for the application termination in background. Logged when a
-    MXMetricPayload is received (one per day).
+    The reason for the application termination in foreground. Recorded when a
+    MXMetricPayload is received from the OS (at most once per day) at
+    unspecified time. Records cumulative data collected and agregated since the
+    previous recording. All buckets from MetricKitExitData are available on iOS
+    14 and higher (unless MetricKitExitData bucket comments specify otherwise).
+    Recorded only if user opted in for sharing diagnostic data on iOS device.
+    All buckets except &quot;App exited normally&quot; are likely user-visible
+    terminations (this is a guess rather that verified fact).
   </summary>
 </histogram>
 
 <histogram name="IOS.MetricKit.ForegroundTimePerDay" units="s"
-    expires_after="2021-03-15">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-07-18">
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     The total time the app is in the foreground. Logged when a MXMetricPayload
@@ -518,8 +572,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.MetricKit.PeakMemoryUsage" units="MB"
-    expires_after="2021-03-15">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-07-18">
+  <owner>justinchhen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     The largest amount of memory used by the app. Logged when a MXMetricPayload
@@ -528,8 +582,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.MetricKit.TimeToFirstDraw" units="ms"
-    expires_after="2021-03-15">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-07-18">
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     The amount of time taken to launch the app. Logged when a MXMetricPayload is
@@ -555,9 +609,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.NSString.stringByReplacingCharactersInRange.NilArgument"
-    enum="Boolean" expires_after="2021-07-31">
+    enum="Boolean" expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
+  <owner>rohitrao@chromium.org</owner>
   <summary>
     NSString API: stringByReplacingCharactersInRange:withString: was invoked
     with a nil argument.
@@ -565,7 +619,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.NTP.Impression" enum="IOSNTPImpression"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>gambard@chromium.org</owner>
   <summary>
     The type of NTP impressions on iOS, split by type of suggestions shown
@@ -595,13 +649,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.PageLoadCount.Counts"
-    enum="IOSPageLoadCountNavigationType" expires_after="2021-04-11">
+    enum="IOSPageLoadCountNavigationType" expires_after="2021-08-15">
   <owner>danyao@chromium.org</owner>
   <summary>The number of navigation started events by navigation type.</summary>
 </histogram>
 
 <histogram name="IOS.PageLoadCount.LoadingStarted" units="units"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>danyao@chromium.org</owner>
   <summary>
     The &quot;true&quot; value of this boolean histogram counts the number of
@@ -621,7 +675,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="IOS.PageLoadTiming.OmnibarToPageLoaded" units="ms"
     expires_after="2021-09-22">
   <owner>ajuma@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
     Measures the time from the end of user input in the omnibox to when the page
@@ -631,9 +684,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.Reauth.Password.Autofill" enum="ReauthenticationEvent"
-    expires_after="2021-04-18">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
-  <owner>bling-team@google.com</owner>
+  <owner>sarraf@google.com</owner>
   <summary>
     Tracks the results and attempts of reauthentication when using password
     Autofill suggestions.
@@ -641,9 +694,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.Reauth.Password.ManualFallback"
-    enum="ReauthenticationEvent" expires_after="2021-04-18">
+    enum="ReauthenticationEvent" expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
-  <owner>bling-team@google.com</owner>
+  <owner>sarraf@google.com</owner>
   <summary>
     Tracks the results and attempts of reauthentication when using a password in
     Manual Fallback.
@@ -661,8 +714,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.RestoreNavigationItemCount" units="rank"
-    expires_after="2021-05-02">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-07-04">
+  <owner>gambard@chromium.org</owner>
   <owner>justincohen@chromium.org</owner>
   <summary>
     [iOS] The number of items Navigation Manager was requested to restore. 100
@@ -675,8 +728,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.RestoreNavigationTime" units="ms"
-    expires_after="2021-05-02">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-07-04">
+  <owner>gambard@chromium.org</owner>
   <owner>justincohen@chromium.org</owner>
   <summary>
     [iOS] Time spent on restoring committed Navigation Manager's items. Recorded
@@ -691,7 +744,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="IOS.SafeBrowsing.RedirectedRequestResponseHostsMatch"
     enum="BooleanMatched" expires_after="2021-11-06">
   <owner>ajuma@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
     The URL in a navigation request should have the same host as the URL in the
@@ -704,14 +756,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.SearchExtension.Action" enum="IOSSearchExtensionAction"
-    expires_after="2021-03-07">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>The action selected by the user in the Search Extension.</summary>
 </histogram>
 
 <histogram name="IOS.SearchExtension.DisplayCount" units="count"
-    expires_after="2021-05-02">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
@@ -721,7 +773,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.ShareExtension.ReceivedEntriesCount" units="files"
-    expires_after="2021-11-01">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
@@ -731,14 +783,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.ShareExtension.ReceivedEntry"
-    enum="IOSShareExtensionReceivedEntryType" expires_after="2021-11-01">
+    enum="IOSShareExtensionReceivedEntryType" expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>Type of the item received from the iOS share extension.</summary>
 </histogram>
 
 <histogram name="IOS.ShareExtension.ReceivedEntryDelay" units="ms"
-    expires_after="2021-11-01">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
@@ -748,7 +800,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.ShareExtension.Source"
-    enum="IOSShareExtensionReceivedEntrySource" expires_after="2021-11-01">
+    enum="IOSShareExtensionReceivedEntrySource" expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
@@ -757,6 +809,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.SharePageLatency" units="ms" expires_after="M77">
+  <obsolete>
+    Deprecated 12/2020 as it is no longer used for analysis.
+  </obsolete>
   <owner>pkl@chromium.org</owner>
   <summary>
     The latency in milliseconds between the start of the Share Page operation
@@ -765,7 +820,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.SiriShortcuts.Count" units="shortcuts"
-    expires_after="2021-02-28">
+    expires_after="2021-07-31">
   <owner>gujen@google.com</owner>
   <owner>sebsg@chromium.org</owner>
   <summary>
@@ -780,16 +835,42 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="IOS.Snapshots.CacheSize" units="KB" expires_after="2021-07-11">
+  <owner>ajuma@chromium.org</owner>
+  <owner>edchin@chromium.org</owner>
+  <summary>
+    The overall size of snapshots cache. Recorded when new snapshot is cached.
+  </summary>
+</histogram>
+
+<histogram name="IOS.Snapshots.ImageSize" units="KB" expires_after="2021-07-11">
+  <owner>ajuma@chromium.org</owner>
+  <owner>edchin@chromium.org</owner>
+  <summary>
+    The size of a single snapshot image. Recorded when new snapshot is taken and
+    RecordSnapshotSize flag is enabled.
+  </summary>
+</histogram>
+
+<histogram name="IOS.Snapshots.PDFSize" units="KB" expires_after="2021-07-11">
+  <owner>ajuma@chromium.org</owner>
+  <owner>edchin@chromium.org</owner>
+  <summary>
+    The size of a single snapshot PDF. Recorded when new snapshot is taken and
+    RecordSnapshotSize flag is enabled.
+  </summary>
+</histogram>
+
 <histogram name="IOS.Spotlight.Action" enum="IOSSpotlightAction"
-    expires_after="2021-02-28">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-05-16">
   <owner>olivierrobin@chromium.org</owner>
+  <owner>rohitrao@chromium.org</owner>
   <summary>The Spotlight Action pressed by the user.</summary>
 </histogram>
 
 <histogram name="IOS.Spotlight.Availability" enum="IOSSpotlightAvailability"
-    expires_after="2021-05-09">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-07-11">
+  <owner>rohitrao@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     Tracks the availability of the Spotlight indexation on the device. It is
@@ -799,23 +880,23 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.Spotlight.BookmarksIndexingDuration" units="ms"
-    expires_after="2021-05-09">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-07-11">
   <owner>olivierrobin@chromium.org</owner>
+  <owner>rohitrao@chromium.org</owner>
   <summary>Time spent in Spotlight initial indexation of bookmarks.</summary>
 </histogram>
 
 <histogram name="IOS.Spotlight.BookmarksInitialIndexSize" units="units"
-    expires_after="2021-05-09">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-07-11">
   <owner>olivierrobin@chromium.org</owner>
+  <owner>rohitrao@chromium.org</owner>
   <summary>Number of bookmarks indexed during initial indexation.</summary>
 </histogram>
 
 <histogram name="IOS.Spotlight.Origin" enum="IOSSpotlightOrigin"
-    expires_after="2021-05-02">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-08-09">
   <owner>olivierrobin@chromium.org</owner>
+  <owner>rohitrao@chromium.org</owner>
   <summary>
     This event is recorded each time a Chrome Spotlight entry is selected by the
     user. The enumeration indicates the nature of the Spotlight entry.
@@ -825,7 +906,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="IOS.StoreKit.ITunesURLsHandlingResult"
     enum="IOSITunesURLsStoreKitHandlingResult" expires_after="2021-06-23">
   <owner>mrefaat@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
+  <owner>rohitrao@chromium.org</owner>
   <summary>
     The result of StoreKit handling for a specific iTunes URL. Not Handled will
     be logged when the LinksHandler didn't handle a specific URL on purpose (not
@@ -837,23 +918,34 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="IOS.StoreKitLoadedSuccessfully" enum="BooleanSuccess"
     expires_after="2021-08-01">
   <owner>mrefaat@chromium.org</owner>
-  <owner>bling-team@google.org</owner>
+  <owner>bling-team@google.com</owner>
   <summary>
     Whether the StoreKit loaded the required iTunes product successfully or not.
   </summary>
 </histogram>
 
 <histogram name="IOS.TabSwitcher.PageChangeInteraction"
-    enum="IOSTabSwitcherPageChangeInteraction" expires_after="M85">
+    enum="IOSTabSwitcherPageChangeInteraction" expires_after="M99">
   <owner>marq@chromium.org</owner>
+  <owner>bling-team@google.com</owner>
   <summary>
     The UI interaction by which the user changed the visible page in the tab
     switcher.
   </summary>
 </histogram>
 
+<histogram name="IOS.TabSwitcher.TimeSpent" units="ms"
+    expires_after="2022-01-28">
+  <owner>mrefaat@chromium.org</owner>
+  <owner>marq@chromium.org</owner>
+  <summary>
+    The time the Tab switcher is displayed to the user. This histogram will
+    always be recorded once the user exit the tab switcher.
+  </summary>
+</histogram>
+
 <histogram name="IOS.Web.URLDidChangeToEmptyURL" enum="BooleanHit"
-    expires_after="2020-12-30">
+    expires_after="2021-11-30">
   <owner>gambard@chromium.org</owner>
   <owner>justincohen@chromium.org</owner>
   <summary>
@@ -864,7 +956,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.WidgetKit.Action" enum="IOSWidgetKitAction"
-    expires_after="2021-09-24">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>muradyan@google.com</owner>
   <summary>
@@ -874,7 +966,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="IOS.WidgetKit.{Status}" enum="IOSWidgetKitExtensionKind"
-    expires_after="2021-10-30">
+    expires_after="2021-12-11">
   <owner>javierrobles@chromium.org</owner>
   <owner>muradyan@chromium.org</owner>
   <summary>
@@ -895,7 +987,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="IOS.WKWebViewClobberedHistory" enum="Boolean"
     expires_after="2021-09-24">
   <owner>ajuma@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
     Measures the number of main frame navigations in slim navigation manager
@@ -919,6 +1010,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="IOS.WKWebViewLinkPreview" enum="IOSWKWebViewLinkPreviewAction"
     expires_after="M73">
+  <obsolete>
+    Deprecated 12/2020 as it is no longer used for analysis.
+  </obsolete>
   <owner>kkhorimoto@chromium.org</owner>
   <owner>pkl@chromium.org</owner>
   <summary>
@@ -926,6 +1020,90 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ManualFallback.PresentedOptions.AllPasswords"
+    units="Credentials" expires_after="2021-12-11">
+  <owner>javierrobles@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
+  <summary>
+    [iOS Only] Tracks the number of credentials presented to the user in the
+    &quot;Use other password...&quot; view in Manual Fallback. This is logged
+    everytime the user opens this view.
+  </summary>
+</histogram>
+
+<histogram name="ManualFallback.PresentedOptions.CreditCards" units="Cards"
+    expires_after="2021-12-11">
+  <owner>javierrobles@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
+  <summary>
+    [iOS Only] Tracks the number of cards presented to the user in Manual
+    Fallback. This is logged everytime the user opens this view.
+  </summary>
+</histogram>
+
+<histogram name="ManualFallback.PresentedOptions.Passwords" units="Credentials"
+    expires_after="2021-12-11">
+  <owner>javierrobles@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
+  <summary>
+    [iOS Only] Tracks the number of credentials presented to the user in the
+    Passwords Manual Fallback view. This is logged everytime the user opens this
+    view.
+  </summary>
+</histogram>
+
+<histogram name="ManualFallback.PresentedOptions.Profiles" units="Profiles"
+    expires_after="2021-12-11">
+  <owner>javierrobles@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
+  <summary>
+    [iOS Only] Tracks the number of profiles presented to the user in Manual
+    Fallback. This is logged everytime the user opens this view.
+  </summary>
+</histogram>
+
+<histogram name="ManualFallback.VisibleSuggestions.OpenCreditCards"
+    units="Suggestions" expires_after="2021-12-11">
+  <owner>javierrobles@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
+  <summary>
+    [iOS Only] Tracks the number of autofill suggestions present when the user
+    taps on the credit card button in manual fallback.
+  </summary>
+</histogram>
+
+<histogram name="ManualFallback.VisibleSuggestions.OpenPasswords"
+    units="Suggestions" expires_after="2021-12-11">
+  <owner>javierrobles@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
+  <summary>
+    [iOS Only] Tracks the number of password suggestions present when the user
+    taps on the password button in manual fallback.
+  </summary>
+</histogram>
+
+<histogram name="ManualFallback.VisibleSuggestions.OpenProfiles"
+    units="Suggestions" expires_after="2021-12-11">
+  <owner>javierrobles@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
+  <summary>
+    [iOS Only] Tracks the number of autofill suggestions present when the user
+    taps on the profiles (address) button in manual fallback.
+  </summary>
+</histogram>
+
+<histogram name="UserInterfaceStyle.CurrentlyUsed" enum="IOSUserInterfaceStyle"
+    expires_after="2021-12-11">
+  <owner>javierrobles@chromium.org</owner>
+  <owner>rkgibson@google.com</owner>
+  <owner>bling-team@google.com</owner>
+  <summary>
+    [iOS Only] Used on iOS 13+ to report the usage of Light and Dark mode. This
+    is logged at startup and on each user interface style change. Can be caused
+    by the system automatic switch or by the user manually changing the style.
+  </summary>
+</histogram>
+
 </histograms>
 
 </histogram-configuration>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/local/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/local/histograms.xml
index efccf4023da..3ce288092c0 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/local/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/local/histograms.xml
@@ -51,7 +51,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     expires_after="2021-06-30">
 <!-- Name completed by histogram_suffixes name="IndexId" -->
 
-  <owner>jiameng@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
@@ -65,7 +64,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     expires_after="2021-06-30">
 <!-- Name completed by histogram_suffixes name="IndexId" -->
 
-  <owner>jiameng@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
@@ -81,7 +79,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="LocalSearchService.MetricsDailyEventInterval"
     enum="DailyEventIntervalType" expires_after="2021-06-30">
-  <owner>jiameng@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
@@ -94,7 +91,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     expires_after="2021-06-30">
 <!-- Name completed by histogram_suffixes name="IndexId" -->
 
-  <owner>jiameng@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
@@ -109,7 +105,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     expires_after="2021-06-30">
 <!-- Name completed by histogram_suffixes name="IndexId" -->
 
-  <owner>jiameng@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
@@ -122,7 +117,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     enum="LocalSearchServiceResponseStatus" expires_after="2021-06-30">
 <!-- Name completed by histogram_suffixes name="IndexId" -->
 
-  <owner>jiameng@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
@@ -135,7 +129,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     expires_after="2021-06-30">
 <!-- Name completed by histogram_suffixes name="IndexId" -->
 
-  <owner>jiameng@chromium.org</owner>
   <owner>tby@chromium.org</owner>
   <owner>thanhdng@chromium.org</owner>
   <owner>wrong@chromium.org</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/login/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/login/histograms.xml
index 0e44b0930de..d3cd74e3478 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/login/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/login/histograms.xml
@@ -42,7 +42,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Login.BrowserShutdownTime" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-08-09">
   <owner>xiyuan@chromium.org</owner>
   <summary>
     Tracks the browser process shutdown time from when SIGTERM is sent to the
@@ -77,7 +77,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Login.FailureReason" enum="LoginFailureReason"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>achuith@chromium.org</owner>
   <summary>Chrome OS login failure reason.</summary>
 </histogram>
@@ -92,7 +92,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Login.MountNamespaceCreationSuccess" enum="Boolean"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>betuls@chromium.org</owner>
   <owner>jorgelo@chromium.org</owner>
   <owner>chromeos-security-core@google.com</owner>
@@ -128,8 +128,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Login.OfflineLoginWithHiddenUserPods"
+    enum="ChromeOSHiddenUserPodsOfflineLogin" expires_after="M95">
+  <owner>mslus@chromium.org</owner>
+  <owner>chromeos-commercial-identity@google.com</owner>
+  <summary>
+    Records offline login attempts with user pods hidden on the login screen.
+  </summary>
+</histogram>
+
 <histogram name="Login.OfflineSuccess.Attempts" units="units"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>rsorokin@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -148,7 +157,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Login.PasswordChanged.ReauthReason" enum="LoginReauthReasons"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>rsorokin@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -158,7 +167,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Login.PasswordChangeFlow" enum="LoginPasswordChangeFlow"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>xiyuan@chromium.org</owner>
   <owner>omrilio@chromium.org</owner>
   <summary>
@@ -167,7 +176,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Login.PasswordNotChanged.ReauthReason"
-    enum="LoginReauthReasons" expires_after="2021-03-15">
+    enum="LoginReauthReasons" expires_after="2021-07-18">
   <owner>rsorokin@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -176,6 +185,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Login.PasswordStoreSites.InitializedBeforeQuery"
+    enum="Boolean" expires_after="2021-11-30">
+  <owner>rajendrant@chromium.org</owner>
+  <owner>mcrouse@chromium.org</owner>
+  <summary>
+    Records whether the passworded sites list is initialized when the query for
+    sites happens. This is used to measure how many queries happened before the
+    list got populated the first time. Recorded on every query to the password
+    store.
+  </summary>
+</histogram>
+
 <histogram name="Login.PolicyFilesStatePerBoot" enum="LoginPolicyFilesState"
     expires_after="M81">
   <owner>cmasone@chromium.org</owner>
@@ -183,7 +204,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Login.PromptToCompleteLoginTime" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>rsorokin@chromium.org</owner>
   <owner>achuith@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
@@ -193,7 +214,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Login.PromptToLoginTime" units="ms" expires_after="2021-03-15">
+<histogram name="Login.PromptToLoginTime" units="ms" expires_after="2021-07-18">
   <owner>elijahtaylor@google.com</owner>
   <owner>yusukes@chromium.org</owner>
   <owner>rsorokin@chromium.org</owner>
@@ -205,7 +226,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Login.SessionExitType" enum="LoginSessionExitType"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>iby@chromium.org</owner>
   <summary>
     Tracks whether a ChromeOS user was logged out because Chrome repeatedly
@@ -220,13 +241,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Login.SuccessReason" enum="LoginSuccessReason"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>achuith@chromium.org</owner>
   <summary>Chrome OS login success reason.</summary>
 </histogram>
 
 <histogram name="Login.TokenCheckResponseTime" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>rsorokin@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -248,7 +269,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Login.UsersActive28Days" units="users"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>alemate@chromium.org</owner>
   <owner>achuith@chromium.org</owner>
   <summary>
@@ -258,7 +279,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Login.UsersActiveDaily" units="users"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>alemate@chromium.org</owner>
   <owner>achuith@chromium.org</owner>
   <summary>
@@ -268,7 +289,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Login.UsersActiveWeekly" units="users"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>alemate@chromium.org</owner>
   <owner>achuith@chromium.org</owner>
   <summary>
@@ -289,7 +310,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Login.UserType" enum="LoginUserType"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>cmasone@chromium.org</owner>
   <summary>
     Chrome OS histogram that keeps track of the way a user logs in and whether
diff --git a/chromium/tools/metrics/histograms/histograms_xml/media/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/media/histograms.xml
index 8ed421afe12..9e3a3e136e3 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/media/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/media/histograms.xml
@@ -41,7 +41,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Android.MediaPlayerSuccess" enum="MediaPlayerExitStatus"
-    expires_after="2021-04-05">
+    expires_after="2021-08-08">
   <owner>tguilbert@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>Android: Whether MediaPlayer exited without errors.</summary>
@@ -127,14 +127,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Autoplay" enum="AutoplaySource"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>mlamouri@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>Records the autoplay source of audios.</summary>
 </histogram>
 
 <histogram name="Media.Audio.Capture.DetectedMissingCallbacks"
-    enum="BooleanMissingCallbacks" expires_after="2021-06-01">
+    enum="BooleanMissingCallbacks" expires_after="2021-08-01">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -144,7 +144,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Capture.FramesProvided" units="frames"
-    expires_after="2021-04-04">
+    expires_after="2021-07-04">
   <owner>guidou@chromium.org</owner>
   <owner>armax@chromium.org</owner>
   <summary>
@@ -163,7 +163,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Capture.Glitches" units="glitches"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -195,7 +195,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Capture.LargestGlitchMs" units="ms"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -206,7 +206,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Capture.LostFramesInMs" units="ms"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -218,7 +218,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Capture.LowLatencyCallbackError"
-    enum="BooleanError" expires_after="2021-04-05">
+    enum="BooleanError" expires_after="2021-08-08">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -296,7 +296,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Capture.StreamCallbackError2"
-    enum="AudioCaptureDeviceError" expires_after="2021-04-25">
+    enum="AudioCaptureDeviceError" expires_after="2021-08-09">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -316,7 +316,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Capture.Win.InitError" enum="Hresult"
-    expires_after="2021-05-02">
+    expires_after="2021-07-27">
   <owner>tommi@chromium.org</owner>
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
@@ -327,7 +327,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Capture.Win.InitError.FormatRelated"
-    enum="AudioStreamFormatRelatedInitError" expires_after="2021-05-02">
+    enum="AudioStreamFormatRelatedInitError" expires_after="2021-07-27">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -339,7 +339,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Capture.Win.Open" enum="AudioStreamOpenResult"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>gudiou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -427,7 +427,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.OutputDeviceAuthorizationTime" units="ms"
-    expires_after="2021-04-05">
+    expires_after="2021-08-08">
   <owner>armax@chromium.org</owner>
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
@@ -493,7 +493,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Processing.TotalDelayMs" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>armax@chromium.org</owner>
   <owner>guidou@chromium.org</owner>
   <summary>
@@ -526,7 +526,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Render.FramesRequested" units="frames"
-    expires_after="2021-04-05">
+    expires_after="2021-06-27">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -541,7 +541,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Render.GetSourceDataTime.WebRTC"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-08-08">
   <owner>guidou@chromium.org</owner>
   <owner>armax@chromium.org</owner>
   <summary>
@@ -558,7 +558,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Render.GetSourceDataTimeMax.WebRTC"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-08-08">
   <owner>guidou@chromium.org</owner>
   <owner>armax@chromium.org</owner>
   <summary>
@@ -575,7 +575,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Render.Glitches" units="glitches"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -586,7 +586,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Render.LargestGlitchMs" units="ms"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -597,7 +597,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Render.LostFramesInMs" units="ms"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -623,7 +623,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Render.OutputDeviceAuthorizationTimedOut"
-    enum="BooleanTimedOut" expires_after="2021-04-05">
+    enum="BooleanTimedOut" expires_after="2021-08-08">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -633,7 +633,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Render.OutputDeviceStatus"
-    enum="OutputDeviceStatus" expires_after="2021-04-05">
+    enum="OutputDeviceStatus" expires_after="2021-08-08">
   <owner>armax@chromium.org</owner>
   <owner>dalecurtis@chromium.org</owner>
   <owner>guidou@chromium.org</owner>
@@ -655,7 +655,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Media.Audio.Render.SinkCache.GetOutputDeviceInfoCacheUtilization"
-    enum="GetOutputDeviceInfoCacheHit" expires_after="2021-04-05">
+    enum="GetOutputDeviceInfoCacheHit" expires_after="2021-08-08">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -677,7 +677,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Audio.Render.SinkCache.UsedForSinkCreation"
-    enum="BooleanUsage" expires_after="2021-04-05">
+    enum="BooleanUsage" expires_after="2021-08-09">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -783,7 +783,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.AudioCapturerAudioGlitches" enum="AudioGlitchResult"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -793,7 +793,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.AudioCapturerDroppedData" units="%"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -823,14 +823,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.AudioCodecProfile.AAC" enum="AudioCodecProfile"
-    expires_after="2020-12-01">
+    expires_after="2021-07-27">
   <owner>dalecurtis@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>Audio codec profile used in HTML5 media for AAC playback.</summary>
 </histogram>
 
 <histogram name="Media.AudioInputCbErrorMac" units="OSStatus"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>henrika@chromium.org</owner>
   <owner>webrtc-audio@google.com</owner>
   <summary>
@@ -847,7 +847,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.AudioInputControllerSessionSilenceReport"
-    enum="AudioInputSilenceReport" expires_after="2021-06-01">
+    enum="AudioInputSilenceReport" expires_after="2021-08-01">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -865,7 +865,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.AudioOutputController.CallbackError" enum="BooleanError"
-    expires_after="2021-04-05">
+    expires_after="2021-08-09">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -938,7 +938,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Media.AudioOutputResampler.OpenLowLatencyStream"
     enum="AudioOutputResamplerLowLatencyOpenStreamResult"
-    expires_after="2021-04-05">
+    expires_after="2021-08-09">
   <owner>armax@chromium.org</owner>
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
@@ -1031,7 +1031,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.AudioRendererAudioGlitches" enum="AudioGlitchResult"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>henrika@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -1041,7 +1041,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.AudioRendererImpl.SinkStatus" enum="OutputDeviceStatus"
-    expires_after="2021-04-05">
+    expires_after="2021-08-09">
   <owner>armax@chromium.org</owner>
   <owner>dalecurtis@chromium.org</owner>
   <owner>guidou@chromium.org</owner>
@@ -1056,7 +1056,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.AudioRendererMissedDeadline" units="%"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>dalecurtis@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -1137,7 +1137,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Capabilities.DecodingInfo.Time.Video" units="ms"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>chcunningham@chromium.org</owner>
   <owner>mlamouri@google.com</owner>
   <owner>media-dev@chromium.org</owner>
@@ -1148,7 +1148,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Capabilities.DecodingInfo.Time.Video.Clear" units="ms"
-    expires_after="2021-03-21">
+    expires_after="2021-08-09">
   <owner>chcunningham@chromium.org</owner>
   <owner>mlamouri@google.com</owner>
   <owner>media-dev@chromium.org</owner>
@@ -1226,7 +1226,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Controls.Show.Audio" enum="MediaControlsShowReason"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>mlamouri@chromium.org</owner>
   <summary>
     Record whether the default media controls of an audio element were shown and
@@ -1237,7 +1237,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Controls.Show.Video" enum="MediaControlsShowReason"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>mlamouri@chromium.org</owner>
   <summary>
     Record whether the default media controls of a video element were shown and
@@ -1293,8 +1293,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Media.D3D11.AV1Status" enum="MediaStatusCode"
+    expires_after="2021-06-13">
+  <owner>liberato@chromium.org</owner>
+  <owner>tmathmeyer@chromium.org</owner>
+  <summary>
+    This records the media::StatusCode from the AV1 accelerator. It is emitted
+    when the accelerator encounters an error during decoding.
+  </summary>
+</histogram>
+
 <histogram name="Media.D3D11.DecoderLifetimeProgression"
-    enum="D3D11LifetimeProgression" expires_after="2020-09-07">
+    enum="D3D11LifetimeProgression" expires_after="2021-08-15">
   <owner>liberato@chromium.org</owner>
   <owner>tmathmeyer@chromium.org</owner>
   <summary>
@@ -1304,8 +1314,40 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Media.D3D11.H264Status" enum="MediaStatusCode"
+    expires_after="2021-08-15">
+  <owner>liberato@chromium.org</owner>
+  <owner>tmathmeyer@chromium.org</owner>
+  <summary>
+    This records the media::StatusCode from the H264 accelerator. It is emitted
+    when the accelerator encounters an error during decoding.
+  </summary>
+</histogram>
+
+<histogram name="Media.D3D11.NotifyErrorStatus" enum="MediaStatusCode"
+    expires_after="2021-08-15">
+  <owner>liberato@chromium.org</owner>
+  <owner>tmathmeyer@chromium.org</owner>
+  <summary>
+    This records the media::StatusCode that was sent to NotifyError. kOk is not
+    recorded here. It is recorded when D3D11VideoDecoder reports an error to the
+    client. For decoder failures, an additional status code may be logged by the
+    accelerator -- see Media.D3D11{H264,VP9}Status for that.
+  </summary>
+</histogram>
+
+<histogram name="Media.D3D11.VP9Status" enum="MediaStatusCode"
+    expires_after="2021-08-15">
+  <owner>liberato@chromium.org</owner>
+  <owner>tmathmeyer@chromium.org</owner>
+  <summary>
+    This records the media::StatusCode from the VP9 accelerator. It is emitted
+    when the accelerator encounters an error during decoding.
+  </summary>
+</histogram>
+
 <histogram name="Media.D3D11.WasVideoSupported"
-    enum="D3D11VideoNotSupportedReason" expires_after="2020-09-07">
+    enum="D3D11VideoNotSupportedReason" expires_after="2021-08-15">
   <owner>liberato@chromium.org</owner>
   <owner>sandersd@chromium.org</owner>
   <owner>tmathmeyer@chromium.org</owner>
@@ -1393,6 +1435,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Media.DXVAVDA.DecoderLifetimeProgression"
+    enum="DXVALifetimeProgression" expires_after="2021-08-15">
+  <owner>liberato@chromium.org</owner>
+  <owner>tmathmeyer@chromium.org</owner>
+  <summary>
+    This enum allows us to count DXVAVideoDecoderWin specific crashes and
+    initialization failures. This is recorded whenever the decoder is
+    initialized or destroyed, or encounters an error.
+  </summary>
+</histogram>
+
 <histogram name="Media.DXVAVDA.PictureBufferMechanism"
     enum="PictureBufferMechanism" expires_after="2020-10-11">
   <owner>liberato@chromium.org</owner>
@@ -1405,7 +1458,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.DXVAVDA.UseD3D11" enum="DXVADXVersion"
-    expires_after="2020-10-11">
+    expires_after="2021-08-15">
   <owner>liberato@chromium.org</owner>
   <owner>tmathmeyer@chromium.org</owner>
   <owner>sandersd@chromium.org</owner>
@@ -1434,7 +1487,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.EME.CdmFileIO.FileSizeKBOnFirstRead" units="KB"
-    expires_after="2021-05-07">
+    expires_after="2021-07-11">
   <owner>xhwang@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1444,7 +1497,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Media.EME.CdmFileIO.TimeTo" units="ms"
-    expires_after="2021-05-07">
+    expires_after="2021-07-11">
   <owner>jrummell@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1483,13 +1536,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.EME.CdmLoadResult" enum="CdmLoadResult"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>xhwang@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>The result from an attempt to load a library CDM.</summary>
 </histogram>
 
-<histogram name="Media.EME.CdmLoadTime" units="ms" expires_after="2021-04-18">
+<histogram name="Media.EME.CdmLoadTime" units="ms" expires_after="2021-08-22">
   <owner>xhwang@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>The time spent to load a library CDM.</summary>
@@ -1513,6 +1566,32 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>The time it takes to create the CDM instance.</summary>
 </histogram>
 
+<histogram base="true" name="Media.EME.CreateSession.SessionType"
+    enum="EmeSessionType" expires_after="2021-05-07">
+  <owner>xhwang@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
+  <summary>EME session type passed into CreateSession.</summary>
+</histogram>
+
+<histogram name="Media.EME.CrosCdmType" enum="CrosCdmType"
+    expires_after="2022-01-15">
+  <owner>jkardatzke@chromium.org</owner>
+  <owner>cros-gfx-video@google.com</owner>
+  <summary>
+    Whether we used the platform CDM on Chrome OS that includes HW secure
+    Widevine support, or fell back to the Chrome SW CDM.
+  </summary>
+</histogram>
+
+<histogram name="Media.EME.CrosPlatformCdm.SystemCode" enum="CdmSystemCode"
+    expires_after="2022-01-15">
+  <owner>jkardatzke@chromium.org</owner>
+  <owner>cros-gfx-video@google.com</owner>
+  <summary>
+    System code count in promise rejection for ChromeOS platform CDM.
+  </summary>
+</histogram>
+
 <histogram name="Media.EME.EncryptedEvent" enum="BooleanEncryptedEvent"
     expires_after="2021-05-07">
   <owner>xhwang@chromium.org</owner>
@@ -1527,7 +1606,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.EME.EncryptedMediaEnabled" enum="BooleanEnabled"
-    expires_after="2021-05-07">
+    expires_after="2021-08-09">
   <owner>xhwang@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1610,7 +1689,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.EME.MediaDrm.GetOriginIdResult" enum="GetOriginIdResult"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>jrummell@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1622,7 +1701,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Media.EME.MediaDrm.PreprovisionedOriginId.NonPerAppProvisioningDevice"
-    units="units" expires_after="M90">
+    units="units" expires_after="2022-02-01">
   <owner>jrummell@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1633,7 +1712,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Media.EME.MediaDrm.PreprovisionedOriginId.PerAppProvisioningDevice"
-    units="units" expires_after="M90">
+    units="units" expires_after="2022-02-01">
   <owner>jrummell@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1665,7 +1744,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.EME.OutputProtection" enum="MediaOutputProtectionStatus"
-    expires_after="2021-05-07">
+    expires_after="2021-07-11">
   <owner>xhwang@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1674,8 +1753,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Media.EME.OutputProtection.PlatformCdm"
+    enum="MediaOutputProtectionStatus" expires_after="2022-01-15">
+  <owner>jkardatzke@chromium.org</owner>
+  <owner>cros-gfx-video@google.com</owner>
+  <summary>
+    Output protection query status and result. One query and one positive (no
+    unprotected external links) result (if any) are reported per CDM instance.
+  </summary>
+</histogram>
+
 <histogram name="Media.EME.RequestMediaKeySystemAccess"
-    enum="RequestMediaKeySystemAccessStatus" expires_after="2021-04-18">
+    enum="RequestMediaKeySystemAccessStatus" expires_after="2021-08-22">
   <owner>sandersd@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1700,7 +1789,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.EME.UrlProvisionFetcher.ResponseCode"
-    enum="CombinedHttpResponseAndNetErrorCode" expires_after="M90">
+    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2022-02-01">
   <owner>jrummell@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1710,7 +1799,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.EME.Widevine.VideoCapability.HasEmptyRobustness"
-    enum="BooleanEmpty" expires_after="2021-04-18">
+    enum="BooleanEmpty" expires_after="2021-08-22">
   <owner>xhwang@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1818,7 +1907,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Feeds.AggregateWatchtime" units="ms"
-    expires_after="2021-06-07">
+    expires_after="2021-08-09">
   <owner>beccahughes@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1829,7 +1918,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Feeds.Feed.ReadResult" enum="MediaFeedReadResult"
-    expires_after="2021-05-09">
+    expires_after="2021-08-09">
   <owner>beccahughes@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1892,7 +1981,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.GlobalMediaControls.DismissReason"
-    enum="GlobalMediaControlsDismissReason" expires_after="2021-04-18">
+    enum="GlobalMediaControlsDismissReason" expires_after="2021-08-22">
   <owner>steimel@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1903,7 +1992,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.GlobalMediaControls.InteractionDelayAfterPause"
-    units="ms" expires_after="2021-04-25">
+    units="ms" expires_after="2021-06-27">
   <owner>steimel@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1926,7 +2015,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.GlobalMediaControls.RepeatUsage" enum="BooleanIsRepeat"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>steimel@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1937,7 +2026,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.GlobalMediaControls.UserActionFocus"
-    enum="BooleanFocused" expires_after="2021-03-28">
+    enum="BooleanFocused" expires_after="2021-08-01">
   <owner>steimel@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1967,7 +2056,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.GpuMemoryBufferVideoFramePool.UnsupportedFormat"
-    enum="VideoPixelFormatUnion" expires_after="M82">
+    enum="VideoPixelFormatUnion" expires_after="2022-01-06">
   <owner>dcastagna@chromium.org</owner>
   <owner>mcasas@chromium.org</owner>
   <summary>
@@ -2011,7 +2100,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.HardwareKeyPressed" enum="MediaHardwareKeyAction"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>steimel@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -2033,7 +2122,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.HighLatencyAudioCaptureStartupSuccess"
-    enum="AudioCaptureStartupResult" expires_after="2021-03-28">
+    enum="AudioCaptureStartupResult" expires_after="2021-08-01">
   <owner>armax@chromium.org</owner>
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
@@ -2044,7 +2133,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.History.DatabaseSize" units="KB"
-    expires_after="2021-05-09">
+    expires_after="2021-08-09">
   <owner>beccahughes@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -2053,7 +2142,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.History.Init.Result" enum="MediaHistoryInitResult"
-    expires_after="2021-05-09">
+    expires_after="2021-08-09">
   <owner>beccahughes@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -2064,7 +2153,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.History.Init.ResultAfterDelete"
-    enum="MediaHistoryInitResult" expires_after="2021-05-09">
+    enum="MediaHistoryInitResult" expires_after="2021-08-09">
   <owner>beccahughes@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -2140,6 +2229,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Media.Kaleidoscope.DialogClosed"
+    enum="KaleidoscopeDialogClosedBoolean" expires_after="2021-08-19">
+  <owner>beccahughes@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
+  <summary>
+    Recorded each time a user closes a dialog inside Kaleidoscope with whether
+    the user opened a watch action from that dialog.
+  </summary>
+</histogram>
+
 <histogram name="Media.Kaleidoscope.FirstRunProgress"
     enum="KaleidoscopeFirstRunProgress" expires_after="2021-08-19">
   <owner>steimel@chromium.org</owner>
@@ -2183,6 +2282,27 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Media.Kaleidoscope.OpenedMediaRecommendation" enum="Boolean"
+    expires_after="2021-08-19">
+  <owner>beccahughes@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
+  <summary>
+    Recorded each time that Kaleidoscope is closed with whether the user opened
+    a media recommendation from Kaleidoscope during that session.
+  </summary>
+</histogram>
+
+<histogram name="Media.Kaleidoscope.TimeTakenToStartWatch" units="ms"
+    expires_after="2021-08-19">
+  <owner>beccahughes@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
+  <summary>
+    Recorded the first time in a Kaleidoscope session a user selects a watch
+    action in Kaleidoscope with the time taken from loading the page to the user
+    clicking on the watch action.
+  </summary>
+</histogram>
+
 <histogram base="true" name="Media.Learning.BinaryThreshold.Aggregate"
     enum="ConfusionMatrix" expires_after="2019-10-30">
 <!-- Name completed by histogram_suffixes
@@ -2258,7 +2378,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.LinuxAudioIO" enum="LinuxAudioIO"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>dalecurtis@chromium.org</owner>
   <summary>
     Audio IO layer used by the Linux OS, sampled once at startup of the browser.
@@ -2315,7 +2435,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.LowLatencyAudioCaptureStartupSuccess"
-    enum="AudioCaptureStartupResult" expires_after="2021-03-28">
+    enum="AudioCaptureStartupResult" expires_after="2021-08-01">
   <owner>armax@chromium.org</owner>
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
@@ -2337,7 +2457,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.MeanTimeBetweenRebuffers" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>dalecurtis@chromium.org</owner>
   <summary>
     The total watch time (see Media.WatchTime) of a given playback divided by
@@ -2346,7 +2466,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.MediaElement.ContentTypeParseable"
-    enum="ContentTypeParseableResult" expires_after="2021-05-07">
+    enum="ContentTypeParseableResult" expires_after="2021-07-27">
   <owner>jrummell@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -2456,7 +2576,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.MojoVideoDecoder.InitialPlaybackErrorCodecCounter"
-    units="instances" expires_after="2021-04-18">
+    units="instances" expires_after="2021-08-22">
   <owner>eugene@chromium.org</owner>
   <owner>liberato@chromium.org</owner>
   <summary>
@@ -2467,7 +2587,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.MojoVideoDecoder.InitialPlaybackSuccessCodecCounter"
-    units="instances" expires_after="2021-04-18">
+    units="instances" expires_after="2021-08-22">
   <owner>eugene@chromium.org</owner>
   <owner>liberato@chromium.org</owner>
   <summary>
@@ -2493,7 +2613,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Media.MSE.CodecChangeTime" units="ms"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>wolenetz@chromium.org</owner>
   <owner>sandersd@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
@@ -2515,7 +2635,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.MSE.DetectedShakaPackagerInMp4" enum="BooleanDetected"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>dalecurtis@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -2536,7 +2656,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.MSE.Mp4ConsecutiveEmptySamples" units="samples"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>wolenetz@chromium.org</owner>
   <owner>sandersd@chromium.org</owner>
   <summary>
@@ -2549,7 +2669,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.MSE.Mp4EmptySamplesInTRun" units="samples"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>wolenetz@chromium.org</owner>
   <owner>sandersd@chromium.org</owner>
   <summary>
@@ -2560,7 +2680,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.MSE.Mp4SampleSize" units="bytes"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>wolenetz@chromium.org</owner>
   <owner>sandersd@chromium.org</owner>
   <summary>
@@ -2571,7 +2691,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.MSE.Mp4TrunSampleCount" units="samples"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>wolenetz@chromium.org</owner>
   <owner>sandersd@chromium.org</owner>
   <summary>
@@ -2629,7 +2749,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Notification.ArtworkPresent" enum="Boolean"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>beccahughes@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -2640,7 +2760,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Notification.Cast.ArtworkPresent" enum="Boolean"
-    expires_after="2021-04-04">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <owner>media-dev@chromium.org</owner>
@@ -2652,7 +2772,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Notification.Cast.Count" units="count"
-    expires_after="2021-04-04">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <owner>media-dev@chromium.org</owner>
@@ -2663,7 +2783,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Notification.Cast.MetadataPresent"
-    enum="MediaNotificationMetadata" expires_after="2021-04-04">
+    enum="MediaNotificationMetadata" expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <owner>media-dev@chromium.org</owner>
@@ -2676,7 +2796,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Notification.Cast.UserAction" enum="MediaSessionAction"
-    expires_after="2021-04-25">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <owner>media-dev@chromium.org</owner>
@@ -2696,7 +2816,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Notification.Count" units="count"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>beccahughes@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -2707,7 +2827,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Notification.MetadataPresent"
-    enum="MediaNotificationMetadata" expires_after="2021-04-18">
+    enum="MediaNotificationMetadata" expires_after="2021-08-22">
   <owner>beccahughes@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -2718,7 +2838,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Notification.Source" enum="MediaNotificationSource"
-    expires_after="2021-04-18">
+    expires_after="2021-07-04">
   <owner>beccahughes@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -2729,7 +2849,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Notification.UserAction" enum="MediaSessionAction"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>beccahughes@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -2739,7 +2859,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.OutputStreamDuration" units="ms"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>guidou@chromium.org</owner>
   <owner>olka@chromium.org</owner>
   <summary>
@@ -2750,8 +2870,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Media.PeakWebMediaPlayerCount" units="players"
+    expires_after="M95">
+  <owner>dalecurtis@google.com</owner>
+  <owner>media-dev@chromium.org</owner>
+  <summary>
+    Records the peak number of WebMediaPlayer objects per RenderFrame upon
+    RenderFrame destruction (both cleanly and via render process termination).
+  </summary>
+</histogram>
+
 <histogram name="Media.Pepper.PlayedSound" enum="Boolean"
     expires_after="2021-03-01">
+  <obsolete>
+    Deprecated as of 2021/01.
+  </obsolete>
   <owner>mlamouri@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -2800,7 +2933,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.PipelineStatus" enum="PipelineStatus"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>prabhur@chromium.org</owner>
   <owner>dalecurtis@chromium.org</owner>
   <summary>
@@ -2810,7 +2943,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.PipelineStatus.Start" enum="PipelineStatus"
-    expires_after="2021-05-07">
+    expires_after="2021-08-09">
   <owner>xhwang@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -2923,6 +3056,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Media.Remoting.Compatibility" enum="RemotingCompatibility"
+    expires_after="2022-02-01">
+  <owner>takumif@chromium.org</owner>
+  <owner>openscreen-eng@google.com</owner>
+  <summary>
+    Whether the given media is compatible with media remoting. Recorded whenever
+    the conditions are met to start remoting (e.g. the media element is the
+    dominant page content and is not paused).
+  </summary>
+</histogram>
+
 <histogram name="Media.Remoting.SessionDuration" units="ms"
     expires_after="2021-07-01">
   <owner>miu@chromium.org</owner>
@@ -3031,8 +3175,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>Video width while remoting content.</summary>
 </histogram>
 
+<histogram name="Media.Remoting.VideoPixelRateSupport"
+    enum="RemotingVideoPixelRateSupport" expires_after="2022-02-01">
+  <owner>takumif@chromium.org</owner>
+  <owner>openscreen-eng@google.com</owner>
+  <summary>
+    Pixels-per-second in a video and whether the receiver supports its playback.
+    Recorded whenever we are about to start media remoting a video.
+  </summary>
+</histogram>
+
 <histogram name="Media.RtcLowLatencyVideoRenderer.AverageQueueLengthX10"
-    units="frames" expires_after="2021-05-31">
+    units="frames" expires_after="2021-08-09">
   <owner>kron@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
@@ -3043,7 +3197,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.RtcLowLatencyVideoRenderer.DrainedFramesPermille"
-    units="permille" expires_after="2021-05-31">
+    units="permille" expires_after="2021-08-09">
   <owner>kron@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
@@ -3054,7 +3208,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.RtcLowLatencyVideoRenderer.DroppedFramesPermille"
-    units="permille" expires_after="2021-05-31">
+    units="permille" expires_after="2021-08-09">
   <owner>kron@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
@@ -3065,7 +3219,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.RtcLowLatencyVideoRenderer.EnterDrainModeCount"
-    units="count" expires_after="2021-05-31">
+    units="count" expires_after="2021-08-09">
   <owner>kron@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
@@ -3086,7 +3240,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.RtcLowLatencyVideoRenderer.NoNewFrameToRenderPermille"
-    units="permille" expires_after="2021-05-31">
+    units="permille" expires_after="2021-08-09">
   <owner>kron@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
@@ -3097,7 +3251,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.RtcLowLatencyVideoRenderer.ReduceSteadyStateCount"
-    units="count" expires_after="2021-05-31">
+    units="count" expires_after="2021-08-09">
   <owner>kron@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
@@ -3108,7 +3262,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.RtcLowLatencyVideoRenderer.TotalFrames" units="frames"
-    expires_after="2021-05-31">
+    expires_after="2021-08-09">
   <owner>kron@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
@@ -3119,7 +3273,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.RtcLowLatencyVideoRenderer.TryToRenderFrameCount"
-    units="count" expires_after="2021-05-31">
+    units="count" expires_after="2021-08-09">
   <owner>kron@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
@@ -3163,7 +3317,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.RTCVideoDecoderInitializationLatencyMs" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-07-11">
   <owner>kron@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
@@ -3226,7 +3380,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Session.ActiveTime" units="ms"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>mlamouri@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -3239,7 +3393,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Session.Pause" enum="MediaSessionActionSource"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>mlamouri@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -3249,7 +3403,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Session.Play" enum="MediaSessionActionSource"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>mlamouri@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -3259,7 +3413,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Session.RequestAudioFocusResult" enum="BooleanSuccess"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>mlamouri@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -3268,7 +3422,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Session.Stop" enum="MediaSessionActionSource"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>mlamouri@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -3278,7 +3432,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Session.Suspended" enum="MediaSessionSuspendedSource"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>mlamouri@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -3462,6 +3616,31 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>Size of HTML5 media (when known), in MB.</summary>
 </histogram>
 
+<histogram
+    name="Media.Ui.GetCurrentBrowsingContextMedia.ExplicitSelection.UserInteraction"
+    enum="GetCurrentBrowsingContextMediaExplicitSelectionUserInteraction"
+    expires_after="2022-01-01">
+  <owner>eladalon@chromium.org</owner>
+  <owner>guidou@chromium.org</owner>
+  <owner>agpalak@chromium.org</owner>
+  <summary>
+    Records the result of the user's interaction with the media picker dialog
+    which is displayed following a call to getCurrentBrowsingContextMedia. This
+    histogram refers to the explicit-selection variant of the dialog.
+  </summary>
+</histogram>
+
+<histogram name="Media.Ui.GetDisplayMedia.UserInteraction"
+    enum="GetDisplayMediaUserInteraction" expires_after="2022-01-01">
+  <owner>eladalon@chromium.org</owner>
+  <owner>guidou@chromium.org</owner>
+  <owner>agpalak@chromium.org</owner>
+  <summary>
+    Records the result of the user's interaction with the media picker dialog
+    which is displayed following a call to getDisplayMedia.
+  </summary>
+</histogram>
+
 <histogram base="true" name="Media.UnderflowDuration2" units="ms"
     expires_after="never">
 <!-- expires-never: Media pipeline health metric. -->
@@ -3519,7 +3698,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.VAJDA.ResponseToClient"
-    enum="MjpegDecodeAcceleratorErrorCode" expires_after="2020-03-21">
+    enum="MjpegDecodeAcceleratorErrorCode" expires_after="2022-01-07">
   <owner>andrescj@chromium.org</owner>
   <owner>chromeos-gfx@chromium.org</owner>
   <summary>
@@ -3548,7 +3727,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Video.Autoplay" enum="AutoplaySource"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>mlamouri@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -3565,7 +3744,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Video.Autoplay.Muted.PlayMethod.BecomesVisible"
-    enum="Boolean" expires_after="2021-06-01">
+    enum="Boolean" expires_after="2021-08-01">
   <owner>mlamouri@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -3578,7 +3757,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Video.Autoplay.Muted.PlayMethod.OffscreenDuration"
-    units="ms" expires_after="2021-06-01">
+    units="ms" expires_after="2021-08-01">
   <owner>mlamouri@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -3588,7 +3767,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.Video.Autoplay.Muted.UnmuteAction" enum="BooleanSuccess"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>mlamouri@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -3663,7 +3842,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Media.Video.Roughness" units="ms" expires_after="2021-05-09">
+<histogram name="Media.Video.Roughness" units="ms" expires_after="2021-07-11">
   <owner>eugene@chromium.org</owner>
   <owner>videostack-eng@chromium.org</owner>
   <summary>
@@ -3691,7 +3870,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.VideoCapture.DelayUntilFirstFrame" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>guidou@chromium.org</owner>
   <owner>armax@chromium.org</owner>
   <summary>
@@ -3701,8 +3880,33 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Media.VideoCapture.Device.SupportedPixelFormat"
+    enum="VideoPixelFormatUnion" expires_after="2021-08-09">
+  <owner>eshr@google.com</owner>
+  <owner>handellm@google.com</owner>
+  <summary>
+    Counts each pixel format an enumerated video capture device supports. This
+    is recorded during the first device enumeration per Capture process launch.
+    (This is usually once per launch of Chrome unless the Capture process
+    crashes.)
+  </summary>
+</histogram>
+
+<histogram name="Media.VideoCapture.Device.SupportedResolution"
+    enum="VideoResolutionDesignation" expires_after="2021-08-09">
+  <owner>eshr@google.com</owner>
+  <owner>handellm@google.com</owner>
+  <summary>
+    Counts each resolution supported by an enumerated video capture device.
+    These are categorized by designation (eg. QVGA, HD, 4KUHD, etc) instead of
+    pixel count. This is recorded during the first device enumeration per
+    Capture process launch. (This is usually once per launch of Chrome unless
+    the Capture process crashes.)
+  </summary>
+</histogram>
+
 <histogram name="Media.VideoCapture.Error" enum="VideoCaptureError"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>mcasas@chromium.org</owner>
   <owner>guidou@chromium.org</owner>
   <owner>armax@chromium.org</owner>
@@ -3716,7 +3920,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.VideoCapture.FrameDrop"
-    enum="VideoCaptureFrameDropReason" expires_after="2021-05-02">
+    enum="VideoCaptureFrameDropReason" expires_after="2021-07-04">
   <owner>mcasas@chromium.org</owner>
   <owner>guidou@chromium.org</owner>
   <owner>armax@chromium.org</owner>
@@ -3733,7 +3937,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Media.VideoCapture.FrameRate" units="fps"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>mcasas@chromium.org</owner>
   <owner>guidou@chromium.org</owner>
   <owner>armax@chromium.org</owner>
@@ -3754,6 +3958,51 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Media.VideoCapture.Mac.Device.CapturedIOSurface"
+    enum="Boolean" expires_after="2021-08-09">
+  <owner>eshr@google.com</owner>
+  <owner>handellm@google.com</owner>
+  <summary>
+    A count of how often the capture device delivers an IOSurface to the capture
+    pipeline. This is recorded once per opening of the camera, when the first
+    video frame is captured.
+  </summary>
+</histogram>
+
+<histogram
+    name="Media.VideoCapture.Mac.Device.CapturedWithRequestedPixelFormat"
+    enum="Boolean" expires_after="2021-08-09">
+  <owner>eshr@google.com</owner>
+  <owner>handellm@google.com</owner>
+  <summary>
+    A boolean count of how often the requested pixel format is the one that was
+    actually captured. This is recorded once per opening of the camera, when the
+    first video frame is captured.
+  </summary>
+</histogram>
+
+<histogram name="Media.VideoCapture.Mac.Device.CapturedWithRequestedResolution"
+    enum="ResolutionComparison" expires_after="2021-08-09">
+  <owner>eshr@google.com</owner>
+  <owner>handellm@google.com</owner>
+  <summary>
+    An enumeration count of whether or not the requested resolution equals the
+    captured resolution, detailing which dimensions differ in the enum. This is
+    recorded once per opening of the camera, when the first video frame is
+    captured.
+  </summary>
+</histogram>
+
+<histogram name="Media.VideoCapture.Mac.Device.RequestedPixelFormat"
+    enum="VideoPixelFormatUnion" expires_after="2021-08-09">
+  <owner>eshr@google.com</owner>
+  <owner>handellm@google.com</owner>
+  <summary>
+    Counts the pixel formats requested by the VideoCaptureDevice on Mac. This is
+    recorded when the first video frame is captured.
+  </summary>
+</histogram>
+
 <histogram name="Media.VideoCapture.MacBook.AttemptCountWhenNoCamera"
     units="attempts" expires_after="2020-03-15">
   <owner>chfremer@chromium.org</owner>
@@ -3819,6 +4068,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Media.VideoCapture.Start" enum="Boolean"
+    expires_after="2022-01-26">
+  <owner>toprice@chromium.org</owner>
+  <owner>guidou@chromium.org</owner>
+  <summary>
+    Counts the start attempts for video capture, to be compared with the
+    StartOutcome enum histogram.
+  </summary>
+</histogram>
+
+<histogram name="Media.VideoCapture.StartOutcome"
+    enum="VideoCaptureStartOutcome" expires_after="2022-01-26">
+  <owner>toprice@chromium.org</owner>
+  <owner>guidou@chromium.org</owner>
+  <summary>
+    Counts the times Starting video capture results in success or failure (due
+    to eg timeouts etc).
+  </summary>
+</histogram>
+
 <histogram name="Media.VideoCapture.Width" units="pixels" expires_after="M99">
   <owner>mcasas@chromium.org</owner>
   <owner>handellm@chromium.org</owner>
@@ -3858,9 +4127,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Media.VideoCapture.Windows.NumberOfRetriesNeededForMFGetDeviceStreamCategory"
-    units="retries" expires_after="2021-02-01">
+    units="retries" expires_after="2022-02-01">
   <owner>guidou@chromium.org</owner>
-  <owner>armax@chromium.org</owner>
+  <owner>webrtc-dev@chromium.org</owner>
   <summary>
     Counts how many retries are needed for calls to MediaFoundation function
     GetDeviceStreamCategory before getting a result different from
@@ -3870,9 +4139,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Media.VideoCapture.Windows.NumberOfRetriesNeededForMFGetDeviceStreamCount"
-    units="retries" expires_after="2021-02-01">
+    units="retries" expires_after="2022-02-01">
   <owner>guidou@chromium.org</owner>
-  <owner>armax@chromium.org</owner>
+  <owner>webrtc-dev@chromium.org</owner>
   <summary>
     Counts how many retries are needed for calls to MediaFoundation function
     GetDeviceStreamCount before getting a result different from
@@ -3894,8 +4163,32 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>Measures the time taken for VideoCaptureManager::</summary>
 </histogram>
 
+<histogram name="Media.VideoCaptureManager.DeviceSessionLockDuration"
+    units="ms" expires_after="M95">
+  <owner>dalecurtis@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
+  <summary>
+    Records the length of time the screen was locked while a device capture
+    session is active. An entry is recorded upon screen unlock or upon closure
+    of all active device capture sessions.
+  </summary>
+</histogram>
+
+<histogram name="Media.VideoCaptureManager.DeviceSessionWasLocked"
+    enum="Boolean" expires_after="M95">
+  <owner>dalecurtis@chromium.org</owner>
+  <owner>media-dev@chromium.org</owner>
+  <summary>
+    Indicates if a device capture session encountered a screen lock during its
+    lifetime. An entry is recorded once upon session closure.
+  </summary>
+</histogram>
+
 <histogram name="Media.VideoCaptureManager.Event" enum="VideoCaptureEvent"
     expires_after="M82">
+  <obsolete>
+    Expired in M82.
+  </obsolete>
   <owner>chfremer@chromium.org</owner>
   <owner>mcasas@chromium.org</owner>
   <summary>
@@ -4041,7 +4334,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Media.VideoHeight.Initial" units="pixels"
-    expires_after="2021-05-07">
+    expires_after="2021-08-22">
   <owner>xhwang@chromium.org</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -4163,7 +4456,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Media.WatchTime" units="ms" expires_after="2021-04-18">
+<histogram name="Media.WatchTime" units="ms" expires_after="2021-08-22">
   <owner>dalecurtis@chromium.org</owner>
   <summary>
     Watch time is defined as the amount of elapsed media time for audio+video
@@ -4334,7 +4627,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="MediaRouter.Cast.App.Availability" units="ms"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
 <!-- Name completed by histogram_suffixes name="MediaRouterSuccess" -->
 
   <owner>takumif@chromium.org</owner>
@@ -4415,7 +4708,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Cast.LaunchSessionResponse.AppType"
-    enum="MediaRouterResponseReceiverAppType" expires_after="2021-06-08">
+    enum="MediaRouterResponseReceiverAppType" expires_after="2021-08-09">
   <owner>muyaoxu@google.com</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4445,7 +4738,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.CastStreaming.Audio.PlaybackOnReceiver"
-    enum="Boolean" expires_after="2021-07-01">
+    enum="Boolean" expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>muyaoxu@google.com</owner>
   <owner>openscreen-eng@google.com</owner>
@@ -4457,14 +4750,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.CastStreaming.Session.Launch" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>Total time to launch a Cast Streaming mirror session.</summary>
 </histogram>
 
 <histogram name="MediaRouter.CastStreaming.Session.Length" units="ms"
-    expires_after="2021-07-01">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4507,7 +4800,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.CastStreaming.Start.Failure"
-    enum="MirrorFailureType" expires_after="2021-04-04">
+    enum="MirrorFailureType" expires_after="2021-08-09">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4518,7 +4811,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.CastStreaming.Start.Failure.Native"
-    enum="MirroringServiceErrorType" expires_after="2021-05-09">
+    enum="MirroringServiceErrorType" expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4529,7 +4822,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.CastStreaming.Start.Success" enum="MirrorType"
-    expires_after="2021-04-04">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4549,7 +4842,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Cloud.PrefAtDialogOpen" enum="BooleanEnabled"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4559,7 +4852,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Cloud.PrefAtInit" enum="BooleanEnabled"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4569,7 +4862,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Dial.AvailableDevicesCount" units="devices"
-    expires_after="2021-05-09">
+    expires_after="2022-02-01">
   <owner>mfoltz@chromium.org</owner>
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
@@ -4580,7 +4873,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Dial.CreateRoute"
-    enum="MediaRouterDialCreateRouteResult" expires_after="2021-04-04">
+    enum="MediaRouterDialCreateRouteResult" expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>mfoltz@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
@@ -4591,7 +4884,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Dial.FetchAppInfo"
-    enum="MediaRouterDialFetchAppInfoResult" expires_after="2021-02-01">
+    enum="MediaRouterDialFetchAppInfoResult" expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>mfoltz@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
@@ -4602,7 +4895,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Dial.KnownDevicesCount" units="devices"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>mfoltz@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
@@ -4613,7 +4906,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Dial.ParseMessage"
-    enum="MediaRouterDialParseMessageResult" expires_after="2021-02-01">
+    enum="MediaRouterDialParseMessageResult" expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>mfoltz@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
@@ -4625,7 +4918,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Dial.ParsingError"
-    enum="MediaRouterDialParsingError" expires_after="2021-02-01">
+    enum="MediaRouterDialParsingError" expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>mfoltz@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
@@ -4637,7 +4930,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Dial.TerminateRoute"
-    enum="MediaRouterDialTerminateRouteResult" expires_after="2021-04-18">
+    enum="MediaRouterDialTerminateRouteResult" expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>mfoltz@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
@@ -4648,14 +4941,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Icon.Click.Location"
-    enum="MediaRouterDialogOpenOrigin" expires_after="2021-02-01">
+    enum="MediaRouterDialogOpenOrigin" expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>Location the user clicked to open the Media Router dialog.</summary>
 </histogram>
 
 <histogram name="MediaRouter.MirroringService.SessionError"
-    enum="MirroringServiceErrorType" expires_after="2021-04-04">
+    enum="MirroringServiceErrorType" expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4666,7 +4959,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.NetworkMonitor.ConnectionType"
-    enum="DiscoveryNetworkMonitorConnectionType" expires_after="2021-04-04">
+    enum="DiscoveryNetworkMonitorConnectionType" expires_after="2021-06-06">
+  <obsolete>
+    Unused after 2021-01-06.
+  </obsolete>
   <owner>btolsch@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4678,6 +4974,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="MediaRouter.NetworkMonitor.NetworkChangeEventDelta" units="ms"
     expires_after="2021-02-01">
+  <obsolete>
+    Unused after 2021-01-06.
+  </obsolete>
   <owner>btolsch@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4686,7 +4985,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.PresentationRequest.AvailabilityUrlType"
-    enum="PresentationUrlType" expires_after="2021-05-02">
+    enum="PresentationUrlType" expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>mfoltz@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
@@ -4706,7 +5005,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Provider.CreateRoute.Result"
-    enum="MediaRouteProviderResult" expires_after="2021-04-04">
+    enum="MediaRouteProviderResult" expires_after="2022-02-01">
 <!-- Name completed by histogram_suffixes name="MediaRouteProvider" -->
 
   <owner>takumif@chromium.org</owner>
@@ -4720,7 +5019,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Provider.JoinRoute.Result"
-    enum="MediaRouteProviderResult" expires_after="2021-04-04">
+    enum="MediaRouteProviderResult" expires_after="2022-02-01">
 <!-- Name completed by histogram_suffixes name="MediaRouteProvider" -->
 
   <owner>takumif@chromium.org</owner>
@@ -4734,7 +5033,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Provider.TerminateRoute.Result"
-    enum="MediaRouteProviderResult" expires_after="2021-04-04">
+    enum="MediaRouteProviderResult" expires_after="2022-02-01">
 <!-- Name completed by histogram_suffixes name="MediaRouteProvider" -->
 
   <owner>takumif@chromium.org</owner>
@@ -4748,7 +5047,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Provider.Version" enum="MediaRouteProviderVersion"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>mfoltz@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4758,7 +5057,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Provider.WakeReason"
-    enum="MediaRouteProviderWakeReason" expires_after="2021-02-01">
+    enum="MediaRouteProviderWakeReason" expires_after="2022-02-01">
   <owner>mfoltz@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4767,7 +5066,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Provider.Wakeup" enum="MediaRouteProviderWakeup"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>mfoltz@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4776,7 +5075,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Route.CreationOutcome"
-    enum="MediaRouterCreateRouteOutcome" expires_after="2021-02-01">
+    enum="MediaRouterCreateRouteOutcome" expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4786,7 +5085,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Sink.SelectedType" enum="MediaSinkType"
-    expires_after="2021-04-04">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4796,7 +5095,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Source.CastingSource"
-    enum="MediaRouterSourceTypes" expires_after="2021-04-04">
+    enum="MediaRouterSourceTypes" expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4806,7 +5105,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Source.LocalFileFormat" enum="MediaContainers"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4817,7 +5116,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Source.LocalFileSize" units="MB"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4829,7 +5128,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Ui.Action.CloseLatency" units="ms"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4840,7 +5139,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Ui.Action.StartLocal.Latency" units="ms"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4851,14 +5150,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Ui.Action.StartLocalPosition"
-    enum="MediaRouterSinkPositionLabel" expires_after="2021-02-01">
+    enum="MediaRouterSinkPositionLabel" expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>The index of the sink that was selected in the sink list.</summary>
 </histogram>
 
 <histogram name="MediaRouter.Ui.Action.StartLocalSessionSuccessful"
-    enum="BooleanSuccess" expires_after="2021-02-01">
+    enum="BooleanSuccess" expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4867,25 +5166,27 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Ui.Action.StopRoute" enum="MediaRouteType"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>The number of times a user stops different types of routes.</summary>
 </histogram>
 
 <histogram name="MediaRouter.Ui.Device.Count" units="units"
-    expires_after="2021-04-04">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
     Counts the number of devices known and populated to the Media Router dialog
     three seconds after the dialog loads. Always expected to be non-negative.
+    This includes data recorded from Clank, which uses Android's MediaRouter
+    framework.
   </summary>
 </histogram>
 
 <histogram name="MediaRouter.Ui.Dialog.ActivationLocationAndCastMode"
     enum="MediaRouterDialogActivationLocationAndCastMode"
-    expires_after="2021-04-04">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4895,7 +5196,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Ui.Dialog.IconStateAtOpen"
-    enum="MediaRouterIconState" expires_after="2021-02-01">
+    enum="MediaRouterIconState" expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4905,7 +5206,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Ui.Dialog.LoadedWithData" units="ms"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4915,7 +5216,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Ui.Dialog.Paint" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4925,7 +5226,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Ui.FirstAction" enum="MediaRouterUserAction"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4934,7 +5235,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Ui.IconStateAtInit" enum="MediaRouterIconState"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4946,7 +5247,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.Ui.Navigate.SourceSelection"
-    enum="MediaRouterSourceTypes" expires_after="2021-02-01">
+    enum="MediaRouterSourceTypes" expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -4955,7 +5256,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MediaRouter.WiredDisplay.AvailableDevicesCount" units="units"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/memory/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/memory/histograms.xml
index 595e4f9bdc8..d124dd026fe 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/memory/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/memory/histograms.xml
@@ -82,7 +82,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Memory.BackgroundTask.Browser.PrivateMemoryFootprint" units="MiB"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="BrowserRunningMode" -->
 
   <owner>hanxi@chromium.org</owner>
@@ -111,7 +111,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Memory.BackgroundTask.Browser.ResidentSet"
-    units="MiB" expires_after="2021-03-28">
+    units="MiB" expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="BrowserRunningMode" -->
 
   <owner>hanxi@chromium.org</owner>
@@ -228,7 +228,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Memory.Browser.MemoryFootprint.Active" units="MB"
     expires_after="2021-08-27">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     This metric is only recorded on iOS. Same as Memory.Browser.MemoryFootprint
@@ -239,7 +239,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Memory.Browser.MemoryFootprint.Active.Over200MBWatermark"
     enum="BooleanGreaterOrEqualThan200MB" expires_after="2021-08-27">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     This metric is only recorded on iOS when
@@ -255,7 +255,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Memory.Browser.MemoryFootprint.Background" units="MB"
     expires_after="2021-08-27">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     This metric is only recorded on iOS. Same as Memory.Browser.MemoryFootprint
@@ -271,7 +271,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Memory.Browser.MemoryFootprint.Inactive" units="MB"
     expires_after="2021-08-27">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     This metric is only recorded on iOS. Same as Memory.Browser.MemoryFootprint
@@ -283,9 +283,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.Browser.MemoryFootprint.NumLiveOverscroll" units="tabs"
-    expires_after="M88">
+    expires_after="2021-07-11">
+  <owner>ajuma@chromium.org</owner>
   <owner>rkgibson@google.com</owner>
-  <owner>eugenebut@chromium.org</owner>
   <summary>
     Investigation into crbug.com/1102494 shows that OverscrollActionsController
     is allocating thousands of objects in it's -initWithScrollView:. This is
@@ -298,9 +298,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.Browser.MemoryFootprint.NumOpenTabs" units="tabs"
-    expires_after="M88">
+    expires_after="2021-07-11">
+  <owner>ajuma@chromium.org</owner>
   <owner>rkgibson@google.com</owner>
-  <owner>eugenebut@chromium.org</owner>
   <summary>
     Investigation into crbug.com/1102494 shows that OverscrollActionsController
     is allocating thousands of objects in it's -initWithScrollView:. This is
@@ -314,7 +314,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Memory.Browser.MemoryFootprint.OnBackground" units="MiB"
     expires_after="2021-08-27">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     This metric is only recorded on iOS. Same as Memory.Browser.MemoryFootprint
@@ -388,8 +388,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>TBD.</summary>
 </histogram>
 
+<histogram name="Memory.Discardable.FreeListReleaseTime" units="ms"
+    expires_after="2021-08-01">
+  <owner>thiabaud@google.com</owner>
+  <owner>lizeb@chromium.org</owner>
+  <summary>
+    Records how long it takes for memory to be released from the freelist of the
+    discardable shared memory allocator with |madvise|.
+  </summary>
+</histogram>
+
 <histogram name="Memory.Discardable.FreelistSize.Foreground" units="KiB"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>thiabaud@google.com</owner>
   <owner>lizeb@chromium.org</owner>
   <summary>
@@ -399,7 +409,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.Discardable.LargeAllocationFromFreelist"
-    enum="BooleanLargeAllocationFromFreelist" expires_after="2021-05-09">
+    enum="BooleanLargeAllocationFromFreelist" expires_after="2021-07-11">
   <owner>thiabaud@google.com</owner>
   <owner>lizeb@chromium.org</owner>
   <summary>
@@ -409,7 +419,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.Discardable.LockingSuccess"
-    enum="BooleanLockingSuccess" expires_after="2021-05-09">
+    enum="BooleanLockingSuccess" expires_after="2021-07-11">
   <owner>thiabaud@google.com</owner>
   <owner>lizeb@chromium.org</owner>
   <summary>
@@ -419,7 +429,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.Discardable.Size.Foreground" units="KiB"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>thiabaud@google.com</owner>
   <owner>lizeb@chromium.org</owner>
   <summary>
@@ -429,7 +439,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.Discardable.VirtualSize.Foreground" units="KiB"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>thiabaud@google.com</owner>
   <owner>lizeb@chromium.org</owner>
   <summary>
@@ -705,7 +715,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Memory.Experimental.GpuChannelManagerPressureHandlerDuration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="GpuChannelManagerPressureHandlerDetails" -->
 
   <owner>sebmarchand@chromium.org</owner>
@@ -1006,7 +1016,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.Experimental.Renderer.HighestPrivateMemoryFootprint"
-    units="MB" expires_after="2021-05-09">
+    units="MB" expires_after="2021-07-11">
   <owner>tasak@google.com</owner>
   <owner>bartekn@google.com</owner>
   <summary>
@@ -1028,7 +1038,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Memory.Experimental.Renderer.PeakResidentSet.AtHighestPrivateMemoryFootprint"
-    units="MB" expires_after="2021-04-04">
+    units="MB" expires_after="2021-08-09">
   <owner>tasak@google.com</owner>
   <owner>bartekn@google.com</owner>
   <summary>
@@ -1038,7 +1048,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.Experimental.Renderer.Uptime" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>keishi@chromium.org</owner>
   <summary>
     The uptime of a render process in time ticks (excludes extensions). Emitted
@@ -1146,7 +1156,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Memory.Experimental.UserLevelMemoryPressureSignal.RendererPrivateMemoryFootprintBefore"
-    units="MB" expires_after="2021-04-18">
+    units="MB" expires_after="2021-08-22">
   <owner>keishi@chromium.org</owner>
   <owner>tasak@chromium.org</owner>
   <summary>
@@ -1283,7 +1293,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Memory.GPU.PeakMemoryAllocationSource" units="KB"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
 <!-- Name completed by a combination of the following two histogram_suffixes: -->
 
 <!-- histogram_suffixes name="GPU.PeakMemoryAllocationSourceBase" -->
@@ -1301,7 +1311,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Memory.GPU.PeakMemoryUsage" units="KB"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="GPU.PeakMemoryUsage" -->
 
   <owner>jonross@chromium.org</owner>
@@ -1445,7 +1455,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Memory.NativeLibrary.MappedAndResidentMemoryFootprintCollectionStatus"
-    enum="MappedAndResidentPagesDumpState" expires_after="2021-04-18">
+    enum="MappedAndResidentPagesDumpState" expires_after="2021-08-22">
   <owner>lizeb@chromium.org</owner>
   <owner>pasko@chromium.org</owner>
   <summary>
@@ -1461,7 +1471,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.NativeLibrary.NotResidentOrderedCodeMemoryFootprint"
-    units="KB" expires_after="2021-03-28">
+    units="KB" expires_after="2021-08-01">
   <owner>lizeb@chromium.org</owner>
   <summary>
     The size of the native library code which was ordered, yet is not resident
@@ -1557,7 +1567,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.OOMKill.Contents.MemAllocatedMB" units="MB"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>oshima@chromium.org</owner>
   <owner>alemate@chromium.org</owner>
   <summary>
@@ -1568,7 +1578,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.OOMKill.Contents.MemAvailableMB" units="MB"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>oshima@chromium.org</owner>
   <owner>alemate@chromium.org</owner>
   <summary>
@@ -1581,7 +1591,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.OOMKill.Contents.MemGraphicsMB" units="MB"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>oshima@chromium.org</owner>
   <owner>alemate@chromium.org</owner>
   <summary>
@@ -1602,7 +1612,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.OOMKill.Extensions.MemAllocatedMB" units="MB"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>oshima@chromium.org</owner>
   <owner>alemate@chromium.org</owner>
   <summary>
@@ -1626,7 +1636,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.OOMKill.Extensions.MemGraphicsMB" units="MB"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>oshima@chromium.org</owner>
   <owner>alemate@chromium.org</owner>
   <summary>
@@ -1636,7 +1646,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.OOMKill.Extensions.MemShmemMB" units="MB"
-    expires_after="2021-05-02">
+    expires_after="2021-08-01">
   <owner>oshima@chromium.org</owner>
   <owner>alemate@chromium.org</owner>
   <summary>
@@ -1677,7 +1687,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.PaintPreviewCompositor.PrivateMemoryFootprint"
-    units="MB" expires_after="2021-04-10">
+    units="MB" expires_after="2021-08-15">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
@@ -1691,7 +1701,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.PaintPreviewCompositor.PrivateSwapFootprint" units="MB"
-    expires_after="2021-04-10">
+    expires_after="2021-08-15">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
@@ -1722,7 +1732,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.PaintPreviewCompositor.SharedMemoryFootprint"
-    units="MB" expires_after="2021-04-10">
+    units="MB" expires_after="2021-08-15">
   <owner>ckitagawa@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
@@ -1735,6 +1745,134 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Memory.ParkableImage.DiskIsUsable.5min" enum="BooleanYesNo"
+    expires_after="M95">
+  <owner>thiabaud@google.com</owner>
+  <owner>lizeb@chromium.org</owner>
+  <summary>
+    Whether the disk allocator is usable. Recorded at the same time as
+    &quot;Memory.ParkableImage.*.5min&quot;. The disk may not be usable for
+    several reasons, including the profile being an Incognito one, permssions
+    error, or disk write error.
+  </summary>
+</histogram>
+
+<histogram name="Memory.ParkableImage.OnDiskSize.5min" units="KiB"
+    expires_after="M95">
+  <owner>thiabaud@google.com</owner>
+  <owner>lizeb@chromium.org</owner>
+  <summary>
+    Size of encoded image data of ParkableImages that are on disk. Collected
+    once, 5 minutes after the first ParkableImage is created.
+  </summary>
+</histogram>
+
+<histogram name="Memory.ParkableImage.Read.Latency" units="microseconds"
+    expires_after="M95">
+  <owner>thiabaud@google.com</owner>
+  <owner>lizeb@chromium.org</owner>
+  <summary>
+    Recorded each time a ParkableImage is read from disk. Records the time taken
+    to read a ParkableImage from disk. Note: This metric drops reports on
+    clients with low-resolution clocks, which means these reports will be biased
+    against a portion of the population on Windows. See
+    Windows.HasHighResolutionTimeTicks for the affected sample.
+  </summary>
+</histogram>
+
+<histogram name="Memory.ParkableImage.Read.Size" units="KiB"
+    expires_after="M95">
+  <owner>thiabaud@google.com</owner>
+  <owner>lizeb@chromium.org</owner>
+  <summary>
+    Recorded each time a ParkableImage is read from disk. Records the size of
+    the read, in KiB.
+  </summary>
+</histogram>
+
+<histogram name="Memory.ParkableImage.Read.Throughput" units="MiBps"
+    expires_after="M95">
+  <owner>thiabaud@google.com</owner>
+  <owner>lizeb@chromium.org</owner>
+  <summary>
+    Recorded each time a ParkableImage is read from disk. Records the throughput
+    of reading the ParkableImage from disk, in MiB/s.
+  </summary>
+</histogram>
+
+<histogram name="Memory.ParkableImage.TotalReadTime.5min" units="ms"
+    expires_after="M95">
+  <owner>thiabaud@google.com</owner>
+  <owner>lizeb@chromium.org</owner>
+  <summary>
+    Total time spent reading images from disk. Collected once, 5 minutes after
+    the first ParkableImage is created.
+  </summary>
+</histogram>
+
+<histogram name="Memory.ParkableImage.TotalSize.5min" units="KiB"
+    expires_after="M95">
+  <owner>thiabaud@google.com</owner>
+  <owner>lizeb@chromium.org</owner>
+  <summary>
+    Total size of encoded image data of ParkableImages. Collected once, 5
+    minutes after the first ParkableImage is created.
+  </summary>
+</histogram>
+
+<histogram name="Memory.ParkableImage.TotalWriteTime.5min" units="ms"
+    expires_after="M95">
+  <owner>thiabaud@google.com</owner>
+  <owner>lizeb@chromium.org</owner>
+  <summary>
+    Total time spent writing images to disk. Collected once, 5 minutes after the
+    first ParkableImage is created.
+  </summary>
+</histogram>
+
+<histogram name="Memory.ParkableImage.UnparkedSize.5min" units="KiB"
+    expires_after="M95">
+  <owner>thiabaud@google.com</owner>
+  <owner>lizeb@chromium.org</owner>
+  <summary>
+    Size of encoded image data of ParkableImages that are not written to disk.
+    Collected once, 5 minutes after the first ParkableImage is created.
+  </summary>
+</histogram>
+
+<histogram name="Memory.ParkableImage.Write.Latency" units="microseconds"
+    expires_after="M95">
+  <owner>thiabaud@google.com</owner>
+  <owner>lizeb@chromium.org</owner>
+  <summary>
+    Recorded each time a ParkableImage is written to disk. Records the time
+    taken to write the ParkableImage to disk. Note: This metric drops reports on
+    clients with low-resolution clocks, which means these reports will be biased
+    against a portion of the population on Windows. See
+    Windows.HasHighResolutionTimeTicks for the affected sample.
+  </summary>
+</histogram>
+
+<histogram name="Memory.ParkableImage.Write.Size" units="KiB"
+    expires_after="M95">
+  <owner>thiabaud@google.com</owner>
+  <owner>lizeb@chromium.org</owner>
+  <summary>
+    Recorded each time a ParkableImage is written to disk. Records the size of
+    the write, in KiB.
+  </summary>
+</histogram>
+
+<histogram name="Memory.ParkableImage.Write.Throughput" units="MiBps"
+    expires_after="M95">
+  <owner>thiabaud@google.com</owner>
+  <owner>lizeb@chromium.org</owner>
+  <summary>
+    Recorded each time a ParkableImage is written to disk. Records the
+    throughput of writing the ParkableImage to disk, in MiB/s.
+  </summary>
+</histogram>
+
 <histogram name="Memory.ParkableString.CompressedSizeKb" units="KB"
     expires_after="M87">
   <owner>lizeb@chromium.org</owner>
@@ -1985,8 +2123,39 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>Throughput of a ParkableString disk write.</summary>
 </histogram>
 
+<histogram name="Memory.PartitionAlloc.ThreadCache.BatchFillRate{ThreadType}"
+    units="%" expires_after="M92">
+  <owner>lizeb@chromium.org</owner>
+  <owner>bartekn@chromium.org</owner>
+  <summary>
+    Fraction of PartitionAlloc's thread cache allocations requests that required
+    a batch fill, that is cache hits touching the central allocator. Recorded
+    during memory dumps, at the same time as the Memory.*.PartitionAlloc.*
+    histograms. Data is collected for {ThreadType}.
+  </summary>
+  <token key="ThreadType">
+    <variant name="" summary="all threads"/>
+    <variant name=".MainThread" summary="the main thread only"/>
+  </token>
+</histogram>
+
+<histogram name="Memory.PartitionAlloc.ThreadCache.HitRate{ThreadType}"
+    units="%" expires_after="M92">
+  <owner>lizeb@chromium.org</owner>
+  <owner>bartekn@chromium.org</owner>
+  <summary>
+    Hit rate for PartitionAlloc's thread cache. Recorded during memory dumps, at
+    the same time as the Memory.*.PartitionAlloc.* histograms. Data is collected
+    for {ThreadType}.
+  </summary>
+  <token key="ThreadType">
+    <variant name="" summary="all threads"/>
+    <variant name=".MainThread" summary="the main thread only"/>
+  </token>
+</histogram>
+
 <histogram name="Memory.PressureLevel" enum="MemoryPressureLevel"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>chrisha@chromium.org</owner>
   <summary>
     The memory pressure level, which is recorded periodically. This shows the
@@ -2005,7 +2174,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Memory.PressureWindowDuration" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="Memory.Pressure.TransitionType" -->
 
   <owner>sebmarchand@chromium.org</owner>
@@ -2098,7 +2267,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.RendererProcessCount" units="processes"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>creis@chromium.org</owner>
   <owner>nasko@chromium.org</owner>
   <summary>
@@ -2137,7 +2306,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.RenderProcessHost.Count.InitializedAndNotDead"
-    units="processes" expires_after="2021-04-18">
+    units="processes" expires_after="2021-08-22">
   <owner>alexmos@chromium.org</owner>
   <owner>creis@chromium.org</owner>
   <owner>lukasza@chromium.org</owner>
@@ -2238,7 +2407,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Memory.Total.SystemCommitLimit" units="GB"
-    expires_after="2021-05-02">
+    expires_after="2021-07-27">
   <owner>sadrul@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -2370,15 +2539,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="MemoryAndroid.LowRamDevice" enum="Boolean" expires_after="M85">
+<histogram name="MemoryAndroid.LowRamDevice" enum="Boolean"
+    expires_after="never">
+<!-- expires-never: used internally for filtering -->
+
   <owner>ssid@chromium.org</owner>
+  <owner>chrome-metrics-team@google.com</owner>
   <summary>
     Whether Chrome is running in low ram mode. This histogram is reported on
     every upload by Android devices. A device is considered low-RAM if it has
     512MiB of RAM or lower (see SysUtils.detectLowEndDevice()).
-
-    Note: The low-RAM determination has changed in M-49, it used to be given
-    directly by the Android OS.
   </summary>
 </histogram>
 
diff --git a/chromium/tools/metrics/histograms/histograms_xml/mobile/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/mobile/histograms.xml
index adb71e2fdcb..e19cc81a435 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/mobile/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/mobile/histograms.xml
@@ -105,6 +105,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     <variant name="ReadingListEntry" summary="Reading List entry"/>
     <variant name="RecentTabsEntry" summary="Recent Tabs entry"/>
     <variant name="RecentTabsHeader" summary="Recent Tabs header/device"/>
+    <variant name="WebImage" summary="Image on a Web page"/>
+    <variant name="WebImageLink" summary="Image-Link on a Web page"/>
+    <variant name="WebLink" summary="Link on a Web page"/>
   </token>
 </histogram>
 
@@ -170,7 +173,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Mobile.Messages.Badge.Tapped"
-    enum="MobileMessagesBadgeState" expires_after="2021-03-20">
+    enum="MobileMessagesBadgeState" expires_after="2022-05-23">
 <!-- Name completed by histogram_suffixes name="Mobile.Messages.Type" -->
 
   <owner>sczs@chromium.org</owner>
@@ -179,7 +182,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Mobile.Messages.Banner.Dismiss"
-    enum="MobileMessagesBannerDismissType" expires_after="2021-03-20">
+    enum="MobileMessagesBannerDismissType" expires_after="2022-05-23">
 <!-- Name completed by histogram_suffixes name="Mobile.Messages.Type" -->
 
   <owner>sczs@chromium.org</owner>
@@ -188,7 +191,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Mobile.Messages.Banner.Event"
-    enum="MobileMessagesBannerEvent" expires_after="2021-03-20">
+    enum="MobileMessagesBannerEvent" expires_after="2022-05-27">
 <!-- Name completed by histogram_suffixes name="Mobile.Messages.Type" -->
 
   <owner>sczs@chromium.org</owner>
@@ -197,7 +200,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Mobile.Messages.Banner.OnScreenTime" units="ms"
-    expires_after="2021-03-20">
+    expires_after="2022-05-11">
   <owner>sczs@chromium.org</owner>
   <owner>thegreenfrog@google.com</owner>
   <summary>
@@ -208,7 +211,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Mobile.Messages.ConcurrentPresented" units="infobars"
-    expires_after="2021-03-20">
+    expires_after="2022-03-20">
   <owner>sczs@chromium.org</owner>
   <owner>thegreenfrog@chromium.org</owner>
   <summary>
@@ -218,7 +221,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Mobile.Messages.Confirm.Accept.Time" units="ms"
-    expires_after="2021-03-20">
+    expires_after="2022-07-27">
 <!-- Name completed by histogram_suffixes name="Mobile.Messages.Confirm.Type" -->
 
   <owner>sczs@chromium.org</owner>
@@ -230,7 +233,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Mobile.Messages.Confirm.Event"
-    enum="MobileMessagesConfirmInfobarEvents" expires_after="2021-03-20">
+    enum="MobileMessagesConfirmInfobarEvents" expires_after="2022-07-27">
 <!-- Name completed by histogram_suffixes name="Mobile.Messages.Confirm.Type" -->
 
   <owner>sczs@chromium.org</owner>
@@ -242,7 +245,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Mobile.Messages.Modal.Event"
-    enum="MobileMessagesModalEvent" expires_after="2021-03-20">
+    enum="MobileMessagesModalEvent" expires_after="2022-03-20">
 <!-- Name completed by histogram_suffixes name="Mobile.Messages.Type" -->
 
   <owner>sczs@chromium.org</owner>
@@ -251,7 +254,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Mobile.Messages.OverflowRow.Tapped"
-    enum="MobileMessagesInfobarType" expires_after="2021-03-20">
+    enum="MobileMessagesInfobarType" expires_after="2022-03-20">
   <owner>sczs@chromium.org</owner>
   <owner>thegreenfrog@chromium.org</owner>
   <summary>Records a tap on an Infobar overflow menu row.</summary>
@@ -267,7 +270,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Mobile.Messages.Passwords.Modal.Event"
-    enum="MobileMessagesPasswordsModalEvent" expires_after="2021-03-20">
+    enum="MobileMessagesPasswordsModalEvent" expires_after="2022-03-20">
 <!-- Name completed by histogram_suffixes name="Mobile.Messages.Password.Type" -->
 
   <owner>sczs@chromium.org</owner>
@@ -276,7 +279,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Mobile.Messages.Passwords.Modal.Present"
-    enum="MobileMessagesPasswordsModalPresent" expires_after="2021-03-20">
+    enum="MobileMessagesPasswordsModalPresent" expires_after="2022-03-20">
 <!-- Name completed by histogram_suffixes name="Mobile.Messages.Password.Type" -->
 
   <owner>sczs@chromium.org</owner>
@@ -285,14 +288,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Mobile.Messages.Save.Card.Modal.Event"
-    enum="MobileMessagesSaveCardModalEvent" expires_after="2021-03-20">
+    enum="MobileMessagesSaveCardModalEvent" expires_after="2022-03-20">
   <owner>sczs@chromium.org</owner>
   <owner>thegreenfrog@chromium.org</owner>
   <summary>Records Save Card specific Infobar Modal events.</summary>
 </histogram>
 
 <histogram name="Mobile.Messages.Translate.Banner.Event"
-    enum="MobileMessagesTranslateBannerEvent" expires_after="2021-03-20">
+    enum="MobileMessagesTranslateBannerEvent" expires_after="2022-03-20">
   <owner>sczs@chromium.org</owner>
   <owner>thegreenfrog@chromium.org</owner>
   <summary>
@@ -302,7 +305,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Mobile.Messages.Translate.Modal.Event"
-    enum="MobileMessagesTranslateModalEvent" expires_after="2021-03-20">
+    enum="MobileMessagesTranslateModalEvent" expires_after="2022-03-20">
   <owner>sczs@chromium.org</owner>
   <owner>thegreenfrog@chromium.org</owner>
   <summary>
@@ -312,7 +315,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Mobile.Messages.Translate.Modal.Present"
-    enum="MobileMessagesTranslateModalPresent" expires_after="2021-03-20">
+    enum="MobileMessagesTranslateModalPresent" expires_after="2022-03-20">
   <owner>sczs@chromium.org</owner>
   <owner>thegreenfrog@chromium.org</owner>
   <summary>
@@ -332,7 +335,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Mobile.Share.EntryPoints" enum="IOSActivityScenario"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>seblalancette@chromium.org</owner>
   <owner>chrome-sharing-core@google.com</owner>
   <summary>
@@ -488,7 +491,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Mobile.SystemNotification.NotifyFailure"
-    enum="SystemNotificationType" expires_after="2021-06-01">
+    enum="SystemNotificationType" expires_after="2021-08-22">
   <owner>knollr@chromium.org</owner>
   <owner>xingliu@chromium.org</owner>
   <summary>
@@ -511,7 +514,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Mobile.Translate.Unused.Count" units="units"
-    expires_after="2021-03-20">
+    expires_after="2022-03-20">
   <owner>sczs@chromium.org</owner>
   <owner>thegreenfrog@chromium.org</owner>
   <summary>
@@ -556,7 +559,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MobileDownload.DownloadLaterPromptStatus"
-    enum="DownloadLaterPromptStatus" expires_after="2021-06-01">
+    enum="DownloadLaterPromptStatus" expires_after="2021-08-01">
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>
@@ -566,7 +569,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MobileDownload.DownloadPromptStatus"
-    enum="DownloadPromptStatus" expires_after="2021-04-01">
+    enum="DownloadPromptStatus" expires_after="2022-02-16">
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>
@@ -576,7 +579,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MobileDownload.Location.Dialog.DirectoryType"
-    enum="DownloadLocationDirectoryType" expires_after="2021-03-01">
+    enum="DownloadLocationDirectoryType" expires_after="2022-02-16">
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>
@@ -587,7 +590,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MobileDownload.Location.Dialog.Result"
-    enum="DownloadLocationDialogResult" expires_after="2021-03-01">
+    enum="DownloadLocationDialogResult" expires_after="2022-02-16">
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>
@@ -597,21 +600,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MobileDownload.Location.Dialog.Suggestion.Events"
-    enum="DownloadLocationSuggestionEvent" expires_after="2021-05-02">
+    enum="DownloadLocationSuggestionEvent" expires_after="2022-02-16">
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>Records the download location suggestion event.</summary>
 </histogram>
 
 <histogram name="MobileDownload.Location.Dialog.SuggestionSelected"
-    enum="BooleanSelected" expires_after="2021-03-01">
+    enum="BooleanSelected" expires_after="2022-02-16">
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>Records the download location suggestion choice.</summary>
 </histogram>
 
 <histogram name="MobileDownload.Location.Dialog.Type"
-    enum="DownloadLocationDialogType" expires_after="2021-05-02">
+    enum="DownloadLocationDialogType" expires_after="2022-02-16">
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>
@@ -621,7 +624,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MobileDownload.Location.DirectoryType"
-    enum="DownloadLocationDirectoryType" expires_after="2021-05-02">
+    enum="DownloadLocationDirectoryType" expires_after="2022-02-16">
   <owner>xingliu@chromium.org</owner>
   <owner>dtrainor@chromium.org</owner>
   <owner>qinmin@chromium.org</owner>
@@ -633,14 +636,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MobileDownload.Location.Download.DirectoryType"
-    enum="DownloadLocationDirectoryType" expires_after="2021-05-02">
+    enum="DownloadLocationDirectoryType" expires_after="2022-02-16">
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>Records the directory type when download is completed.</summary>
 </histogram>
 
 <histogram name="MobileDownload.Location.Setting.DirectoryType"
-    enum="DownloadLocationDirectoryType" expires_after="2021-05-02">
+    enum="DownloadLocationDirectoryType" expires_after="2022-02-16">
   <owner>xingliu@chromium.org</owner>
   <owner>clank-downloads@google.com</owner>
   <summary>
@@ -819,8 +822,36 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="MobileFre.NativeInitialized" units="ms"
+    expires_after="2021-07-31">
+  <owner>skym@chromium.org</owner>
+  <owner>wenyufu@chromium.org</owner>
+  <summary>
+    Android: The amount of time spent between FRE started and native
+    initialization. Recorded when native is fully initialized.
+  </summary>
+</histogram>
+
+<histogram name="MobileFre.PolicyServiceInitDelayAfterNative{PolicyPresence}"
+    units="ms" expires_after="2021-07-31">
+  <owner>skym@chromium.org</owner>
+  <owner>wenyufu@chromium.org</owner>
+  <summary>
+    Android: The amount of time spent between native initialized and the
+    decision &quot;whether we need to wait to load policy service from
+    native&quot; has been made. The decision is made when no on-device policy is
+    found, or policy service is fully initialized. If the decision has been made
+    before native initialization, 0 will be recorded. Recorded during FRE only,
+    when on-device policy is {PolicyPresence}
+  </summary>
+  <token key="PolicyPresence">
+    <variant name=".WithoutPolicy" summary="not presented."/>
+    <variant name=".WithPolicy" summary="presented."/>
+  </token>
+</histogram>
+
 <histogram name="MobileFre.Progress" enum="MobileFreProgress"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>bsazonov@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
   <owner>droger@chromium.org</owner>
@@ -843,6 +874,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="MobileFre.TosFragment.SpinnerVisibleDuration" units="ms"
+    expires_after="2021-07-31">
+  <owner>skym@chromium.org</owner>
+  <owner>wenyufu@chromium.org</owner>
+  <summary>
+    Android: The amount of time that the small spinner, which become visible
+    after the ToS is accepted, is showing on screen.
+  </summary>
+</histogram>
+
 <histogram name="MobileFullscreenVideo.DurationAfterPotraitRotation" units="ms"
     expires_after="M85">
   <owner>qinmin@chromium.org</owner>
@@ -919,7 +960,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MobileIntent.FirstPartyToInternalScheme" enum="Boolean"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>peconn@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -966,7 +1007,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MobileOmnibox.PressedClipboardSuggestionAge" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-06-20">
   <owner>jdonnelly@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <summary>
@@ -1004,7 +1045,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MobileSignInPromo.BookmarkManager.ImpressionsTilXButton"
-    units="impressions" expires_after="2021-04-20">
+    units="impressions" expires_after="2021-08-09">
   <owner>jlebel@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
   <summary>
@@ -1024,7 +1065,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MobileSignInPromo.SettingsManager.ImpressionsTilSigninButtons"
-    units="impressions" expires_after="2021-04-20">
+    units="impressions" expires_after="2021-08-22">
   <owner>jlebel@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
   <summary>
@@ -1046,7 +1087,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MobileStartup.DailyLaunchCount" units="units"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>tedchoc@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -1078,8 +1119,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="MobileStartup.Experimental.LaunchCause" enum="LaunchCause"
+    expires_after="2022-01-07">
+  <obsolete>
+    Removed Experimental label in 02/2021.
+  </obsolete>
+  <owner>mthiesse@chromium.org</owner>
+  <owner>tedchoc@chromium.org</owner>
+  <owner>yfriedman@chromium.org</owner>
+  <summary>
+    Records what caused Chrome to be launched.
+
+    Recorded for all types of ChromeActivity, in all cases where Chrome becomes
+    visible to the user.
+  </summary>
+</histogram>
+
 <histogram name="MobileStartup.IntentToCreationTime" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>tedchoc@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
@@ -1090,8 +1147,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="MobileStartup.LaunchCause" enum="LaunchCause"
+    expires_after="2022-02-23">
+  <owner>mthiesse@chromium.org</owner>
+  <owner>tedchoc@chromium.org</owner>
+  <owner>yfriedman@chromium.org</owner>
+  <summary>
+    Records what caused Chrome to be launched.
+
+    Recorded for all types of ChromeActivity, in all cases where Chrome becomes
+    visible to the user, or intentionally transitions between Chrome Activities.
+  </summary>
+</histogram>
+
 <histogram name="MobileStartup.LaunchType" enum="LaunchType"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>tedchoc@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/multi_device/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/multi_device/histograms.xml
index a6dba769bf4..a1af15a2ca2 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/multi_device/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/multi_device/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="MultiDevice.BetterTogetherSuite.MultiDeviceFeatureState"
-    enum="MultiDevice_FeatureState" expires_after="2021-04-04">
+    enum="MultiDevice_FeatureState" expires_after="2021-08-08">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -33,7 +33,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MultiDevice.DeviceSyncService.FindEligibleDevices.Result"
-    enum="BooleanSuccess" expires_after="2021-04-04">
+    enum="BooleanSuccess" expires_after="2021-08-08">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>Result of trying to find eligible devices.</summary>
@@ -42,7 +42,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="MultiDevice.DeviceSyncService.FindEligibleDevices.Result.FailureReason"
     enum="MultiDevice_DeviceSyncService_DeviceSyncRequestFailureReason"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -53,7 +53,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="MultiDevice.DeviceSyncService.ForceEnrollmentNow.Result"
     enum="MultiDevice_DeviceSyncService_ForceCryptAuthOperationResult"
-    expires_after="2021-02-02">
+    expires_after="2022-02-02">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>Result for when ForceEnrollmentNow is called.</summary>
@@ -61,7 +61,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="MultiDevice.DeviceSyncService.ForceSyncNow.Result"
     enum="MultiDevice_DeviceSyncService_ForceCryptAuthOperationResult"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>Result for when ForceSyncNow is called.</summary>
@@ -69,7 +69,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="MultiDevice.DeviceSyncService.SetSoftwareFeatureState.Disable.FailedFeature"
-    enum="MultiDevice_DeviceSyncService_Features" expires_after="2021-04-04">
+    enum="MultiDevice_DeviceSyncService_Features" expires_after="2021-08-09">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -79,14 +79,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="MultiDevice.DeviceSyncService.SetSoftwareFeatureState.Enable.FailedFeature"
-    enum="MultiDevice_DeviceSyncService_Features" expires_after="2021-04-04">
+    enum="MultiDevice_DeviceSyncService_Features" expires_after="2021-08-09">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>Breaks down which features failed when attempted to enable.</summary>
 </histogram>
 
 <histogram name="MultiDevice.DeviceSyncService.SetSoftwareFeatureState.Result"
-    enum="BooleanSuccess" expires_after="2021-05-09">
+    enum="BooleanSuccess" expires_after="2021-07-11">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>Result of enabling and disabling features for devices.</summary>
@@ -95,7 +95,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="MultiDevice.DeviceSyncService.SetSoftwareFeatureState.Result.FailureReason"
     enum="MultiDevice_DeviceSyncService_DeviceSyncRequestFailureReason"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -106,7 +106,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="MultiDevice.ForgetHostConfirmed"
     enum="MultiDevice_VerifyAndForgetHostConfirmationState"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -115,7 +115,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MultiDevice.PostOOBESetupFlow.PageShown"
-    enum="MultiDevice_PostOOBESetupFlow_Page" expires_after="2021-04-04">
+    enum="MultiDevice_PostOOBESetupFlow_Page" expires_after="2021-08-09">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -132,7 +132,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="MultiDevice.SecureChannel.BLE.GattConnectionToAuthentication.EffectiveSuccessRateWithRetries"
-    enum="BooleanSuccess" expires_after="2021-04-04">
+    enum="BooleanSuccess" expires_after="2021-08-09">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -145,7 +145,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="MultiDevice.SecureChannel.BLE.Performance.ConnectionToAuthenticationDuration.Background"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-22">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -161,7 +161,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="MultiDevice.SecureChannel.BLE.Performance.ReceiveAdvertisementToConnectionDuration.Background"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-09">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -177,7 +177,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="MultiDevice.SecureChannel.BLE.Performance.StartScanToAuthenticationDuration.Background"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-08">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -194,7 +194,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="MultiDevice.SecureChannel.BLE.Performance.StartScanToConnectionDuration.Background"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-09">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -210,7 +210,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="MultiDevice.SecureChannel.BLE.Performance.StartScanToReceiveAdvertisementDuration.Background"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-08">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -226,7 +226,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="MultiDevice.SecureChannel.BLE.ReceiveAdvertisementToAuthentication.EffectiveSuccessRateWithRetries"
-    enum="BooleanSuccess" expires_after="2021-04-04">
+    enum="BooleanSuccess" expires_after="2021-08-15">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -238,7 +238,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="MultiDevice.SecureChannel.BLE.ReceiveAdvertisementToGattConnection.EffectiveSuccessRateWithRetries"
-    enum="BooleanSuccess" expires_after="2021-04-04">
+    enum="BooleanSuccess" expires_after="2021-08-09">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -274,6 +274,37 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="MultiDevice.SecureChannel.Nearby.DisconnectionReason"
+    enum="MultiDeviceNearbyDisconnectionReason" expires_after="2022-01-01">
+  <owner>khorimoto@chromium.org</owner>
+  <owner>better-together-dev@google.com</owner>
+  <summary>
+    Tracks reasons why a Nearby Connection established via SecureChannel ends up
+    disconnecting. Includes a &quot;Disconnection requested by client&quot;
+    value emitted during intentional disconnections as well as several error
+    enum values.
+
+    Emitted when a connection fails to become established, or emitted after it
+    is already established when it becomes disconnected.
+  </summary>
+</histogram>
+
+<histogram name="MultiDevice.SecureChannel.Nearby.EffectiveConnectionResult"
+    enum="BooleanSuccess" expires_after="2021-11-30">
+  <owner>khorimoto@chromium.org</owner>
+  <owner>better-together-dev@google.com</owner>
+  <summary>
+    Measures the effective success rate for Nearby Connections attempts via
+    SecureChannel. In this context, &quot;effective&quot; means that (1) a
+    failure followed by a successful retry is counted as a success, and (2)
+    repeated failures (e.g., due to users stuck in an unrecoverable state due to
+    Bluetooth issues) are only counted as a single failure.
+
+    Emitted upon each successful connection and one minute after a failed
+    connection with no subsequent successful retries.
+  </summary>
+</histogram>
+
 <histogram name="MultiDevice.SecureChannel.Nearby.MessageAction"
     enum="MultiDeviceNearbyMessageAction" expires_after="2021-11-30">
   <owner>khorimoto@chromium.org</owner>
@@ -285,6 +316,27 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="MultiDevice.SecureChannel.Nearby.OperationResult.{Function}"
+    enum="NearbyConnectionsStatus" expires_after="2022-01-01">
+  <owner>khorimoto@chromium.org</owner>
+  <owner>better-together-dev@google.com</owner>
+  <summary>
+    Records the result of invoking Nearby Connection's {Function} API function
+    within SecureChannel.
+
+    Emitted when the API call returns.
+  </summary>
+  <token key="Function">
+    <variant name="AcceptConnection"/>
+    <variant name="DisconnectFromEndpoint"/>
+    <variant name="InjectEndpoint"/>
+    <variant name="RequestConnection"/>
+    <variant name="SendPayload"/>
+    <variant name="StartDiscovery"/>
+    <variant name="StopDiscovery"/>
+  </token>
+</histogram>
+
 <histogram name="MultiDevice.SecureChannel.Nearby.SendMessageResult"
     enum="BooleanSuccess" expires_after="2021-11-30">
   <owner>khorimoto@chromium.org</owner>
@@ -310,8 +362,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="MultiDevice.Setup.HasDuplicateEligibleHostDeviceNames"
+    enum="BooleanDuplicate" expires_after="2021-08-22">
+  <owner>nohle@google.com</owner>
+  <owner>better-together-dev@google.com</owner>
+  <summary>
+    Records whether or not the list of eligible host phones has duplicate
+    devices names. This list is shown to users during multi-device setup, and
+    duplicate device names can cause confusion. Metric emitted when the user
+    starts multi-device setup.
+  </summary>
+</histogram>
+
 <histogram name="MultiDevice.Setup.HostStatus"
-    enum="MultiDevice_Setup_HostStatus" expires_after="2021-04-04">
+    enum="MultiDevice_Setup_HostStatus" expires_after="2021-08-08">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -322,7 +386,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MultiDevice.Setup.HostVerifier.DoesHostHaveCryptoData"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-08-09">
   <owner>nohle@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -337,7 +401,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="MultiDevice.VerifyButtonClicked"
     enum="MultiDevice_VerifyAndForgetHostConfirmationState"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/na_cl/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/na_cl/histograms.xml
index 5fe4d49361d..cb1c31e490a 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/na_cl/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/na_cl/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="NaCl.AppType" enum="NaClAppTypeEnum"
-    expires_after="2021-04-25">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -33,7 +33,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Client.Helper.InitState" enum="NaClHelperStatus"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -43,7 +43,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Client.Helper.StateOnFork" enum="NaClHelperStatus"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -54,7 +54,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Client.OSArch" enum="NaClOSArchEnum"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -62,7 +62,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.HttpStatusCodeClass.Manifest.InstalledApp"
-    enum="NaClHttpStatusCodeClass" expires_after="2020-12-31">
+    enum="NaClHttpStatusCodeClass" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -73,7 +73,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.HttpStatusCodeClass.Manifest.NotInstalledApp"
-    enum="NaClHttpStatusCodeClass" expires_after="2020-12-31">
+    enum="NaClHttpStatusCodeClass" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -84,7 +84,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.HttpStatusCodeClass.Nexe.InstalledApp"
-    enum="NaClHttpStatusCodeClass" expires_after="2020-12-31">
+    enum="NaClHttpStatusCodeClass" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -95,7 +95,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.HttpStatusCodeClass.Nexe.NotInstalledApp"
-    enum="NaClHttpStatusCodeClass" expires_after="2020-12-31">
+    enum="NaClHttpStatusCodeClass" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -106,7 +106,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.LoadStatus.Plugin" enum="NaClPluginErrorCode"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -114,7 +114,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.LoadStatus.Plugin.InstalledApp"
-    enum="NaClPluginErrorCode" expires_after="2020-12-31">
+    enum="NaClPluginErrorCode" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -125,7 +125,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.LoadStatus.Plugin.NotInstalledApp"
-    enum="NaClPluginErrorCode" expires_after="2020-12-31">
+    enum="NaClPluginErrorCode" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -136,7 +136,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.LoadStatus.SelLdr" enum="NaClSelLdrErrorCode"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -144,7 +144,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.LoadStatus.SelLdr.InstalledApp"
-    enum="NaClSelLdrErrorCode" expires_after="2020-12-31">
+    enum="NaClSelLdrErrorCode" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -154,7 +154,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.LoadStatus.SelLdr.NotInstalledApp"
-    enum="NaClSelLdrErrorCode" expires_after="2020-12-31">
+    enum="NaClSelLdrErrorCode" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -164,7 +164,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Manifest.IsDataURI" enum="NaClManifestType"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -173,7 +173,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="NaCl.ModuleUptime.Crash" units="ms" expires_after="2020-12-31">
+<histogram name="NaCl.ModuleUptime.Crash" units="ms" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -181,7 +181,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.ModuleUptime.Normal" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -189,7 +189,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Options.PNaCl.OptLevel" enum="PNaClOptionsOptLevelEnum"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -200,7 +200,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClCache.IsHit" enum="PNaClTranslationCacheEnum"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -211,7 +211,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.CompileKBPerSec" units="KB/s"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -222,7 +222,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.CompileTime" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -233,7 +233,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.LinkTime" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -244,7 +244,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.LoadCompiler" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -254,7 +254,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.LoadLinker" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -264,7 +264,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.PctCompiledWhenFullyDownloaded"
-    units="%" expires_after="2020-12-31">
+    units="%" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -276,7 +276,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.TotalUncachedKBPerSec" units="KB/s"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -288,7 +288,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.PNaClLoadTime.TotalUncachedTime" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -299,21 +299,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.ShutdownTime.Total" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
   <summary>The time it took the NaCl module to shut down.</summary>
 </histogram>
 
-<histogram name="NaCl.Perf.Size.Manifest" units="KB" expires_after="2020-12-31">
+<histogram name="NaCl.Perf.Size.Manifest" units="KB" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
   <summary>The size of the manifest file.</summary>
 </histogram>
 
-<histogram name="NaCl.Perf.Size.Nexe" units="KB" expires_after="2020-12-31">
+<histogram name="NaCl.Perf.Size.Nexe" units="KB" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -322,7 +322,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="NaCl.Perf.Size.Pexe" units="KB" expires_after="2020-12-31">
+<histogram name="NaCl.Perf.Size.Pexe" units="KB" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -333,7 +333,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.Size.PexeNexeSizePct" units="%"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -344,7 +344,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.Size.PNaClTranslatedNexe" units="KB"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -356,7 +356,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.LoadModule" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -364,7 +364,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.LoadModulePerMB" units="milliseconds/MB"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -375,7 +375,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.ManifestDownload" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -385,7 +385,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.NaClOverhead" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -397,7 +397,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.NaClOverheadPerMB"
-    units="milliseconds/MB" expires_after="2020-12-31">
+    units="milliseconds/MB" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -410,7 +410,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.NexeDownload" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -420,7 +420,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.NexeDownloadPerMB"
-    units="milliseconds/MB" expires_after="2020-12-31">
+    units="milliseconds/MB" expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -431,7 +431,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.Total" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -442,7 +442,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.Perf.StartupTime.TotalPerMB" units="milliseconds/MB"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -454,7 +454,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.ValidationCache.Query" enum="NaClValidationCacheEnum"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
@@ -464,7 +464,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NaCl.ValidationCache.Set" enum="NaClValidationCacheEnum"
-    expires_after="2020-12-31">
+    expires_after="2022-07-31">
   <owner>dschuff@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>bbudge@chromium.org</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/navigation/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/navigation/histograms.xml
index 3998e25b916..ce8dc534bd5 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/navigation/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/navigation/histograms.xml
@@ -21,6 +21,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<variants name="NavigationThrottleEvents">
+  <variant name="WillFailRequest"/>
+  <variant name="WillProcessResponse"/>
+  <variant name="WillRedirectRequest"/>
+  <variant name="WillStartRequest"/>
+</variants>
+
 <histogram name="BackForwardCache.AllSites.EvictedAfterDocumentRestoredReason"
     enum="BackForwardCacheEvictedAfterDocumentRestoredReason"
     expires_after="2021-10-01">
@@ -38,7 +45,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BackForwardCache.AllSites.HistoryNavigationOutcome"
-    enum="BackForwardCacheHistoryNavigationOutcome" expires_after="2021-04-18">
+    enum="BackForwardCacheHistoryNavigationOutcome" expires_after="2021-08-22">
   <owner>hajimehoshi@chromium.org</owner>
   <owner>bfcache-dev@chromium.org</owner>
   <summary>
@@ -52,7 +59,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="BackForwardCache.AllSites.HistoryNavigationOutcome.BlocklistedFeature"
-    enum="WebSchedulerTrackedFeature" expires_after="2021-04-25">
+    enum="WebSchedulerTrackedFeature" expires_after="2021-06-27">
   <owner>hajimehoshi@chromium.org</owner>
   <owner>bfcache-dev@chromium.org</owner>
   <summary>
@@ -69,7 +76,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="BackForwardCache.AllSites.HistoryNavigationOutcome.BrowsingInstanceNotSwappedReason"
     enum="BackForwardCacheBrowsingInstanceNotSwappedReason"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>hajimehoshi@chromium.org</owner>
   <owner>bfcache-dev@chromium.org</owner>
   <summary>
@@ -107,7 +114,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="BackForwardCache.AllSites.HistoryNavigationOutcome.NotRestoredReason"
-    enum="BackForwardCacheNotRestoredReason" expires_after="2021-04-11">
+    enum="BackForwardCacheNotRestoredReason" expires_after="2021-08-15">
   <owner>hajimehoshi@chromium.org</owner>
   <owner>bfcache-dev@chromium.org</owner>
   <summary>
@@ -123,7 +130,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="BackForwardCache.EvictedAfterDocumentRestoredReason"
     enum="BackForwardCacheEvictedAfterDocumentRestoredReason"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>hajimehoshi@chromium.org</owner>
   <owner>bfcache-dev@chromium.org</owner>
   <summary>
@@ -138,6 +145,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="BackForwardCache.Eviction.Renderer"
+    enum="BackForwardCacheRendererEvictionReason" expires_after="2021-10-01">
+  <owner>rakina@chromium.org</owner>
+  <owner>bfcache-dev@chromium.org</owner>
+  <summary>
+    Records the reason of renderer-initiated back-forward cache eviction.
+    Emitted when renderer evicts the page from back-forward cache.
+  </summary>
+</histogram>
+
 <histogram name="BackForwardCache.Eviction.TimeUntilProcessKilled" units="ms"
     expires_after="2021-10-01">
   <owner>hajimehoshi@chromium.org</owner>
@@ -150,7 +167,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="BackForwardCache.Experimental.UnexpectedIPCMessagePostedToCachedFrame.MethodHash"
-    enum="MojoInterfaceName" expires_after="2021-03-28">
+    enum="MojoInterfaceName" expires_after="2021-08-01">
   <owner>hbolaria@chromium.org</owner>
   <owner>altimin@chromium.org</owner>
   <owner>bfcache-dev@chromium.org</owner>
@@ -168,7 +185,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="BackForwardCache.Experimental.UnexpectedIPCMessagePostedToCachedFrame.TimeUntilIPCReceived"
-    units="ms" expires_after="2021-03-28">
+    units="ms" expires_after="2021-08-01">
   <owner>hbolaria@chromium.org</owner>
   <owner>altimin@chromium.org</owner>
   <owner>bfcache-dev@chromium.org</owner>
@@ -197,7 +214,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BackForwardCache.HistoryNavigationOutcome.BlocklistedFeature"
-    enum="WebSchedulerTrackedFeature" expires_after="2021-04-11">
+    enum="WebSchedulerTrackedFeature" expires_after="2021-08-15">
   <owner>hajimehoshi@chromium.org</owner>
   <owner>bfcache-dev@chromium.org</owner>
   <summary>
@@ -215,7 +232,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="BackForwardCache.HistoryNavigationOutcome.BrowsingInstanceNotSwappedReason"
     enum="BackForwardCacheBrowsingInstanceNotSwappedReason"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>hajimehoshi@chromium.org</owner>
   <owner>bfcache-dev@chromium.org</owner>
   <summary>
@@ -232,7 +249,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="BackForwardCache.HistoryNavigationOutcome.DisabledForRenderFrameHostReason"
     enum="BackForwardCacheDisabledForRenderFrameHostReason"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>carlscab@chromium.org</owner>
   <owner>hajimehoshi@chromium.org</owner>
   <owner>bfcache-dev@chromium.org</owner>
@@ -254,7 +271,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BackForwardCache.HistoryNavigationOutcome.NotRestoredReason"
-    enum="BackForwardCacheNotRestoredReason" expires_after="2021-04-11">
+    enum="BackForwardCacheNotRestoredReason" expires_after="2021-08-15">
   <owner>hajimehoshi@chromium.org</owner>
   <owner>bfcache-dev@chromium.org</owner>
   <summary>
@@ -284,6 +301,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="BackForwardCache.ProactiveSameSiteBISwap.EligibilityDuringCommit"
     enum="BackForwardCacheEligibilityDuringCommit" expires_after="M88">
+  <obsolete>
+    Removed from code in Feb 2021.
+  </obsolete>
   <owner>rakina@chromium.org</owner>
   <owner>altimin@chromium.org</owner>
   <owner>bfcache-dev@chromium.org</owner>
@@ -300,6 +320,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="BackForwardCache.ProactiveSameSiteBISwap.SameSiteNavigationDidSwap"
     enum="BackForwardCacheSameSiteNavigationDidSwap" expires_after="M88">
+  <obsolete>
+    Removed from code in Feb 2021.
+  </obsolete>
   <owner>rakina@chromium.org</owner>
   <owner>altimin@chromium.org</owner>
   <owner>bfcache-dev@chromium.org</owner>
@@ -313,6 +336,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="BackForwardCache.ProactiveSameSiteBISwap.UnloadRunsAfterCommit"
     enum="BackForwardCacheUnloadRunsAfterCommit" expires_after="M88">
+  <obsolete>
+    Removed from code in Feb 2021.
+  </obsolete>
   <owner>rakina@chromium.org</owner>
   <owner>altimin@chromium.org</owner>
   <owner>bfcache-dev@chromium.org</owner>
@@ -358,6 +384,22 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="BackForwardCache.Restore.DisableEvictionDelay" units="ms"
+    expires_after="2021-10-01">
+  <owner>carlscab@google.com</owner>
+  <owner>bfcache-dev@chromium.org</owner>
+  <summary>
+    Delay introduced by the IPC round trips to disable eviction in all the
+    renderers of a page stored in the back-forward cache. That is, the interval
+    of time between sending an SetPageLifecycleState IPC to each renderer and
+    receiving all the responses.
+
+    Recorded on reception of the last ACK reply. We added this histogram to
+    measure the impact of this extra round trip to the renderer when restoring a
+    page from the back-forward cache.
+  </summary>
+</histogram>
+
 <histogram name="BackForwardCache.Restore.NavigationToFirstPaint" units="ms"
     expires_after="2021-10-01">
   <owner>sreejakshetty@chromium.org</owner>
@@ -373,7 +415,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BackForwardCache.SameSite.ActionAfterPagehide2"
-    enum="BackForwardCacheActionAfterPagehide" expires_after="M88">
+    enum="BackForwardCacheActionAfterPagehide" expires_after="M93">
   <owner>rakina@chromium.org</owner>
   <owner>altimin@chromium.org</owner>
   <owner>bfcache-dev@chromium.org</owner>
@@ -396,7 +438,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="BackForwardCache.UnexpectedRendererToBrowserMessage.InterfaceName"
-    enum="MojoInterfaceName" expires_after="2021-05-09">
+    enum="MojoInterfaceName" expires_after="2021-08-09">
   <owner>carlscab@google.com</owner>
   <owner>bfcache-dev@chromium.org</owner>
   <summary>
@@ -603,7 +645,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Navigation.EngagementTime.HTTP" units="ms" expires_after="M89">
+<histogram name="Navigation.EngagementTime.HTTP" units="ms" expires_after="M94">
   <owner>estark@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -613,7 +655,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Navigation.EngagementTime.HTTPS" units="ms"
-    expires_after="M89">
+    expires_after="M94">
   <owner>estark@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -645,6 +687,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     this histogram, about:, chrome: and chrome-native: are considered
     chrome-internal; everything else is not.
 
+    The user action Navigation.Home.NotChromeInternal is also logged in the case
+    that false is logged to this histogram.
+
     This histogram is of special interest to the chrome-analysis-team@. Do not
     change its semantics or retire it without talking to them first.
   </summary>
@@ -652,8 +697,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Navigation.IOSNullContextInDidFailProvisionalNavigation"
     enum="Boolean" expires_after="M85">
+  <obsolete>
+    Removed from code in Jan 2021.
+  </obsolete>
   <owner>ajuma@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <summary>
     Logged when NavigationContext is null inside -[WKNavigationDelegate
     webView:didFailProvisionalNavigation]. If Chrome stopped logging this metric
@@ -663,7 +711,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Navigation.IsLockedProcess" enum="NavigationIsLockedProcess"
-    expires_after="2021-05-09">
+    expires_after="2021-12-21">
   <owner>alexmos@chromium.org</owner>
   <owner>lukasza@chromium.org</owner>
   <summary>
@@ -674,7 +722,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Navigation.IsLockedProcess.HTTPOrHTTPS"
-    enum="NavigationIsLockedProcess" expires_after="2020-12-31">
+    enum="NavigationIsLockedProcess" expires_after="2021-12-21">
   <owner>alexmos@chromium.org</owner>
   <owner>lukasza@chromium.org</owner>
   <summary>
@@ -685,7 +733,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Navigation.IsSameBrowsingInstance"
-    enum="NavigationIsSameBrowsingInstance" expires_after="2021-05-09">
+    enum="NavigationIsSameBrowsingInstance" expires_after="2021-08-09">
   <owner>arthursonzogni@chromium.org</owner>
   <owner>clamy@chromium.org</owner>
   <owner>nasko@chromium.org</owner>
@@ -702,7 +750,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Navigation.IsSameSiteInstance"
-    enum="NavigationIsSameSiteInstance" expires_after="2021-05-09">
+    enum="NavigationIsSameSiteInstance" expires_after="2021-07-11">
   <owner>arthursonzogni@chromium.org</owner>
   <owner>clamy@chromium.org</owner>
   <owner>nasko@chromium.org</owner>
@@ -751,7 +799,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Navigation.MainFrame.SiteEngagementLevel"
-    enum="SiteEngagementLevel" expires_after="2021-04-04">
+    enum="SiteEngagementLevel" expires_after="2021-08-09">
   <owner>meacer@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -761,7 +809,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Navigation.MainFrameFormSubmission.SiteEngagementLevel"
-    enum="SiteEngagementLevel" expires_after="2020-12-01">
+    enum="SiteEngagementLevel" expires_after="2021-04-04">
   <owner>meacer@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -781,7 +829,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Navigation.MainFrameHasRTLDomainDifferentPage2" enum="Boolean"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -794,7 +842,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Navigation.MainFrameProfileType2" enum="BrowserProfileType"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>rhalavati@chromium.org</owner>
   <owner>chrome-privacy-core@google.com</owner>
   <summary>
@@ -814,7 +862,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Navigation.MainFrameSchemeDifferentPage2"
-    enum="NavigationScheme" expires_after="2021-06-01">
+    enum="NavigationScheme" expires_after="2021-08-01">
   <owner>elawrence@chromium.org</owner>
   <owner>estark@chromium.org</owner>
   <summary>
@@ -826,7 +874,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Navigation.MainFrameSchemeDifferentPageOTR2"
-    enum="NavigationScheme" expires_after="2021-06-01">
+    enum="NavigationScheme" expires_after="2021-08-09">
   <owner>elawrence@chromium.org</owner>
   <owner>estark@chromium.org</owner>
   <summary>
@@ -887,19 +935,57 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Navigation.OriginAgentCluster.Result"
+    enum="OriginAgentClusterEndResult" expires_after="2022-01-26">
+  <owner>alexmos@chromium.org</owner>
+  <owner>creis@chromium.org</owner>
+  <owner>wjmaclean@chromium.org</owner>
+  <summary>
+    For every successful cross-document commit, this logs whether or how
+    OriginAgentCluster was involved. It tracks whether it was requested, as well
+    as whether the isolation was granted, which can be affected by other
+    documents in the same browsing context group.
+  </summary>
+</histogram>
+
+<histogram name="Navigation.PolicyBlocklistNavigationThrottle.PolicyLoadDelay"
+    units="ms" expires_after="2021-11-01">
+  <owner>ydago@chromium.org</owner>
+  <owner>pastarmovj@chromium.org</owner>
+  <summary>
+    The time spent waiting for policies to load before checking a navigation
+    against url blocking policies.
+  </summary>
+</histogram>
+
+<histogram
+    name="Navigation.PolicyBlocklistNavigationThrottle.PolicyLoadTimeout"
+    enum="Boolean" expires_after="2021-11-01">
+  <owner>ydago@chromium.org</owner>
+  <owner>pastarmovj@chromium.org</owner>
+  <summary>
+    Records if the policy load delay before PolicyBlocklistNavigationThrottle
+    checks a navigation against url blocking policies timed out. In case of a
+    timeout, the navigation resumes ignoring potential policy restrictions.
+  </summary>
+</histogram>
+
 <histogram name="Navigation.ReadyToCommitUntilCommit2" units="ms"
-    expires_after="M85">
+    expires_after="2021-10-09">
   <owner>clamy@chromium.org</owner>
   <owner>nasko@chromium.org</owner>
   <summary>
     The time needed to commit a navigation once it is ready to commit. This is
     the time between ReadyToCommit and DidFinishNavigation (for a navigation
     that commits).
+
+    Warning: this histogram was expired after M85 and brought back 2021-04-13;
+    data may be missing.
   </summary>
 </histogram>
 
 <histogram name="Navigation.RequiresDedicatedProcess"
-    enum="NavigationRequiresDedicatedProcess" expires_after="2021-03-07">
+    enum="NavigationRequiresDedicatedProcess" expires_after="2021-12-21">
   <owner>alexmos@chromium.org</owner>
   <owner>lukasza@chromium.org</owner>
   <summary>
@@ -910,7 +996,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Navigation.RequiresDedicatedProcess.HTTPOrHTTPS"
-    enum="NavigationRequiresDedicatedProcess" expires_after="2020-12-31">
+    enum="NavigationRequiresDedicatedProcess" expires_after="2021-12-21">
   <owner>alexmos@chromium.org</owner>
   <owner>lukasza@chromium.org</owner>
   <summary>
@@ -931,26 +1017,58 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Navigation.StartToCommit" units="ms" expires_after="M85">
+<histogram name="Navigation.StartToCommit" units="ms"
+    expires_after="2021-10-09">
   <owner>nasko@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
     The time delta between the start of a navigation and the time it is
     committed.
+
+    Warning: this histogram was expired after M85 and brought back 2021-04-13;
+    data may be missing.
+  </summary>
+</histogram>
+
+<histogram name="Navigation.ThrottleDeferTime.{Event}" units="ms"
+    expires_after="2022-03-11">
+  <owner>cduvall@chromium.org</owner>
+  <owner>jam@chromium.org</owner>
+  <summary>
+    Measures time a navigation throttle was deferred when on {Event}. Logged
+    every time a throttle defers a navigation.
+  </summary>
+  <token key="Event" variants="NavigationThrottleEvents"/>
+</histogram>
+
+<histogram name="Navigation.ThrottleExecutionTime.{Event}" units="ms"
+    expires_after="2022-03-11">
+  <owner>cduvall@chromium.org</owner>
+  <owner>jam@chromium.org</owner>
+  <summary>
+    Measures time a navigation throttle took to execute {Event}. Logged every
+    time a throttle runs.
   </summary>
+  <token key="Event" variants="NavigationThrottleEvents"/>
 </histogram>
 
 <histogram name="Navigation.TimeToReadyToCommit2" units="ms"
-    expires_after="M85">
+    expires_after="2021-10-09">
   <owner>clamy@chromium.org</owner>
   <owner>nasko@chromium.org</owner>
   <summary>
     The time delta between the start of a navigation and the time it is ready to
     commit.
+
+    Warning: this histogram was expired after M85 and brought back 2021-04-13;
+    data may be missing.
   </summary>
 </histogram>
 
 <histogram name="Navigation.TimeToURLJobStart" units="ms" expires_after="M85">
+  <obsolete>
+    Removed from code in M89 (Nov 2020), after expiring in M85.
+  </obsolete>
   <owner>carlosk@chromium.org</owner>
   <summary>
     Time between the start of a browser-started navigation request and the
@@ -982,6 +1100,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Navigation.VerifyDidCommitParams"
+    enum="VerifyDidCommitParamsDifference" expires_after="2021-08-22">
+  <owner>rakina@chromium.org</owner>
+  <owner>altimin@chromium.org</owner>
+  <summary>
+    Logs inconsistencies between browser- vs renderer-calculated values of
+    DidCommitProvisionalLoadParams which are detected in RenderFrameHostImpl's
+    VerifyThatBrowserAndRendererCalculatedDidCommitParamsMatch(). This is used
+    to trigger traces to be uploaded to analyze what happened in these
+    navigations.
+  </summary>
+</histogram>
+
 <histogram base="true" name="NavigationPredictor.ActionTaken"
     enum="NavigationPredictorActionTaken" expires_after="M85">
   <owner>tbansal@chromium.org</owner>
@@ -1036,7 +1167,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NavigationPredictor.IsPubliclyRoutable" enum="Boolean"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>tbansal@chromium.org</owner>
   <owner>ryansturm@chromium.org</owner>
   <summary>
@@ -1057,6 +1188,40 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram
+    name="NavigationPredictor.SearchEnginePreconnector.IsBrowserAppLikelyInForeground"
+    enum="BooleanForeground" expires_after="M95">
+  <owner>tbansal@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <summary>
+    Reports if the browser app was in foreground when a preconnect attempt was
+    made to the default search engine.
+  </summary>
+</histogram>
+
+<histogram name="NavigationSuggestion.DigitalAssetLinks.Event"
+    enum="NavigationSuggestionDigitalAssetLinkValidationEvent"
+    expires_after="2021-06-20">
+  <owner>meacer@chromium.org</owner>
+  <owner>security-enamel@chromium.org</owner>
+  <summary>
+    Tracks events when the currently navigated domain name is a lookalike and a
+    Digital Asset Link validation must be made between the lookalike and target
+    sites. If both sites serve valid asset links pointing to each other, the
+    lookalike warning UI is surpressed.
+  </summary>
+</histogram>
+
+<histogram name="NavigationSuggestion.DigitalAssetLinks.ValidationTime"
+    units="ms" expires_after="2021-05-30">
+  <owner>meacer@chromium.org</owner>
+  <owner>security-enamel@chromium.org</owner>
+  <summary>
+    Records the time duration to validate lookalike and target manifests. Only
+    recorded when both manifests are validated.
+  </summary>
+</histogram>
+
 <histogram name="NavigationSuggestion.Event" enum="NavigationSuggestionEvent"
     expires_after="M89">
   <obsolete>
@@ -1073,7 +1238,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NavigationSuggestion.Event2" enum="NavigationSuggestionEvent"
-    expires_after="M91">
+    expires_after="2021-08-22">
   <owner>meacer@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/nearby/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/nearby/histograms.xml
new file mode 100644
index 00000000000..ade7a8b2c13
--- /dev/null
+++ b/chromium/tools/metrics/histograms/histograms_xml/nearby/histograms.xml
@@ -0,0 +1,1057 @@
+<!--
+Copyright 2021 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<!--
+This file is used to generate a comprehensive list of Nearby histograms
+along with a detailed description for each histogram.
+
+For best practices on writing histogram descriptions, see
+https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/metrics/histograms/README.md
+
+Please send CLs to chromium-metrics-reviews@google.com rather than to specific
+individuals. These CLs will be automatically reassigned to a reviewer within
+about 5 minutes. This approach helps the metrics team to load-balance incoming
+reviews. Googlers can read more about this at go/gwsq-gerrit.
+-->
+
+<histogram-configuration>
+
+<histograms>
+
+<histogram name="Nearby.Connections.Bluetooth.Adapter.SetName.Result"
+    enum="BooleanSuccess" expires_after="2021-12-16">
+  <owner>hansberry@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records whether the request to set the adapter's name has succeeded. Emitted
+    when the request succeeds or fails.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Connections.Bluetooth.Adapter.SetScanMode.Result"
+    enum="BooleanSuccess" expires_after="2021-12-16">
+  <owner>hansberry@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records whether the request to set the adapter's scan mode has succeeded.
+    Emitted when the request succeeds or fails.
+  </summary>
+</histogram>
+
+<histogram
+    name="Nearby.Connections.Bluetooth.ClassicMedium.ConnectToService.Duration"
+    units="ms" expires_after="2021-12-15">
+  <owner>hansberry@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records time spent in milliseconds to establish a Bluetooth service
+    connection successfully.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Connections.Bluetooth.ClassicMedium.{Operation}.Result"
+    enum="BooleanSuccess" expires_after="2021-12-10">
+  <owner>hansberry@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>Records the result of {Operation}.</summary>
+  <token key="Operation">
+    <variant name="ConnectToService" summary="connecting to Bluetooth service"/>
+    <variant name="ListenForService" summary="listening for Bluetooth service"/>
+    <variant name="StartDiscovery" summary="initiating a discovery process"/>
+    <variant name="StopDiscovery" summary="stopping discovery"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Connections.Bluetooth.LEMedium.StartAdvertising.Result"
+    enum="BooleanSuccess" expires_after="2021-12-10">
+  <owner>hansberry@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records whether the request to start advertising has succeeded.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Connections.Bluetooth.LEMedium.StartScanning.Result"
+    enum="BooleanSuccess" expires_after="2021-12-10">
+  <owner>hansberry@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records whether BLE scanning has been initiated successfully.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Connections.Bluetooth.LEMedium.StopAdvertising.Result"
+    enum="BooleanSuccess" expires_after="2021-12-10">
+  <owner>hansberry@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records whether the request to stop advertising has succeeded.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Connections.Bluetooth.LEMedium.StopScanning.Result"
+    enum="BooleanSuccess" expires_after="2021-12-10">
+  <owner>hansberry@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>Records whether BLE scanning has been stopped successfully.</summary>
+</histogram>
+
+<histogram name="Nearby.Connections.Bluetooth.Socket.{Operation}.Result"
+    enum="BooleanSuccess" expires_after="2021-12-14">
+  <owner>hansberry@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>Records whether {Operation} has succeeded.</summary>
+  <token key="Operation">
+    <variant name="Read" summary="reading from the input stream"/>
+    <variant name="Write" summary="writing to the output stream"/>
+  </token>
+</histogram>
+
+<histogram
+    name="Nearby.Connections.InstantMessaging.{Direction}Express.OAuthTokenFetchResult"
+    enum="BooleanSuccess" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records whether or not the user was able to fetch the OAuth token necessary
+    to {Direction} the Instant Messaging API. Emitted at the conclusion of the
+    token request, which is attempted right before making HTTPS requests to the
+    Instant Messaging API.
+  </summary>
+  <token key="Direction">
+    <variant name="Receive" summary="start receiving messages from"/>
+    <variant name="Send" summary="send a message to"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Connections.InstantMessaging.{Direction}Express.Result"
+    enum="BooleanSuccess" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records whether an HTTPS call to {Direction} the Instant Messaging API
+    succeeds or fails. Emitted when the HTTPS call succeeds or fails.
+  </summary>
+  <token key="Direction">
+    <variant name="Receive" summary="start receiving messages from"/>
+    <variant name="Send" summary="send a message to"/>
+  </token>
+</histogram>
+
+<histogram
+    name="Nearby.Connections.InstantMessaging.{Direction}Express.Result.FailureReason"
+    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the network error code or HTTPS response code from a failed HTTPS
+    call to {Direction} the Instant Messaging API. Emitted when the HTTPS call
+    fails.
+  </summary>
+  <token key="Direction">
+    <variant name="Receive" summary="start receiving messages from"/>
+    <variant name="Send" summary="send a message to"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Connections.UtilityProcessShutdownReason"
+    enum="NearbyConnectionsUtilityProcessShutdownReason"
+    expires_after="2022-01-26">
+  <owner>hansberry@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records why the Sharing utility process, which hosts Nearby Connections, was
+    shut down: for an expected reason (i.e., shut down request from a client),
+    or another unexpected reason (e.g., a crash).
+  </summary>
+</histogram>
+
+<histogram
+    name="Nearby.Connections.UtilityProcessShutdownReason.DisconnectedMojoDependency"
+    enum="NearbyConnectionsUtilityProcessMojoDependencyName"
+    expires_after="2022-01-26">
+  <owner>hansberry@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records which Mojo dependency of the Sharing utility process disconnected.
+    This is a break down of the &quot;Mojo pipe disconnection&quot; bucket of
+    Nearby.Connections.UtilityProcessShutdownReason.
+  </summary>
+</histogram>
+
+<histogram
+    name="Nearby.Share.Certificates.Manager.BluetoothMacAddressPresentForPrivateCertificateCreation"
+    enum="BooleanPresent" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records whether or not a Bluetooth MAC address was able to be fetched during
+    the local device's private certificate creation. Emitted after private
+    certificates attempt to be created, which typically occurs every three days
+    if Nearby Share is enabled. This will only be emitted once if multiple
+    certificates are created at a time, for example, when all certificates are
+    created after onboarding.
+  </summary>
+</histogram>
+
+<histogram
+    name="Nearby.Share.Certificates.Manager.BluetoothMacAddressSetInPrivateCertificate"
+    enum="BooleanSet" expires_after="2021-08-19">
+  <obsolete>
+    Replaced 01/2021 with
+    Nearby.Share.Certificates.Manager.BluetoothMacAddressPresentForPrivateCertificateCreation
+  </obsolete>
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records whether or not a Bluetooth MAC address is set in the local device's
+    private certificate metadata during certificate creation. Emitted when
+    private certificates are created, which typically occurs every three days if
+    Nearby Share is enabled. This will only be emitted once if multiple
+    certificates are created at a time, for example, when all certificates are
+    created after onboarding.
+  </summary>
+</histogram>
+
+<histogram
+    name="Nearby.Share.Certificates.Manager.DownloadPublicCertificatesCount"
+    units="certificates" expires_after="2021-08-19">
+  <owner>cclem@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    If the Nearby Share certificate manager successfully downloads public
+    certificates, then record the total number of certificates downloaded across
+    all pages.
+  </summary>
+</histogram>
+
+<histogram
+    name="Nearby.Share.Certificates.Manager.DownloadPublicCertificatesFailuePageCount"
+    units="pages" expires_after="2021-08-19">
+  <owner>cclem@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    If the Nearby Share certificate manager fails to download public
+    certificates, then record the page number of the page on which the failure
+    occurred.
+  </summary>
+</histogram>
+
+<histogram
+    name="Nearby.Share.Certificates.Manager.DownloadPublicCertificatesHttpResult"
+    enum="NearbyShareHttpResult" expires_after="2021-08-19">
+  <owner>cclem@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the result of the async ListPublicCertificates API call to the
+    Nearby Sharing server when the certificate manager periodically downloads
+    public certificates. Recorded when the async callback is invoked or when the
+    call times out.
+  </summary>
+</histogram>
+
+<histogram
+    name="Nearby.Share.Certificates.Manager.DownloadPublicCertificatesSuccessPageCount"
+    units="pages" expires_after="2021-08-19">
+  <owner>cclem@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    If the Nearby Share certificate manager successfully downloads public
+    certificates, then record the number of pages downloaded by the RPC.
+  </summary>
+</histogram>
+
+<histogram
+    name="Nearby.Share.Certificates.Manager.DownloadPublicCertificatesSuccessRate"
+    enum="BooleanSuccess" expires_after="2021-08-19">
+  <owner>cclem@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records whether the Nearby Share certificate manager successfully downloaded
+    public certificates from the server and stored them in leveldb.
+  </summary>
+</histogram>
+
+<histogram
+    name="Nearby.Share.Certificates.Manager.GetDecryptedPublicCertificateResult"
+    enum="NearbyShareCertificateManagerGetDecryptedPublicCertificateResult"
+    expires_after="2021-08-19">
+  <owner>cclem@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the result of the async GetDecryptedPublicCertificate call in
+    certificate manager.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Share.Certificates.Storage.InitializeAttemptCount"
+    units="attempts" expires_after="2021-08-19">
+  <owner>cclem@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    If the Nearby Share certificate storage successfully initializes the public
+    certificate database, then record the number of attempts it took.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Share.Certificates.Storage.InitializeAttemptResult"
+    enum="NearbyShareCertificateStorageInitializationResult"
+    expires_after="2021-08-19">
+  <owner>cclem@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    For individual initialization attempts of the Nearby Share certificate
+    storage public certificate database, record the init status returned by
+    leveldb_proto.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Share.Certificates.Storage.{Operation}SuccessRate"
+    enum="BooleanSuccess" expires_after="2021-08-19">
+  <owner>cclem@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Record success rate of Nearby Share storage operation {Operation}.
+  </summary>
+  <token key="Operation">
+    <variant name="AddPublicCertificates" summary="AddPublicCertificates"/>
+    <variant name="ClearPublicCertificates" summary="ClearPublicCertificates"/>
+    <variant name="Initialize" summary="Initialize"/>
+    <variant name="RemoveExpiredPublicCertificates"
+        summary="RemoveExpiredPublicCertificates"/>
+    <variant name="ReplacePublicCertificatesDestroy"
+        summary="ReplacePublicCertificatesDestroy"/>
+    <variant name="ReplacePublicCertificatesUpdateEntries"
+        summary="ReplacePublicCertificatesUpdateEntries"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.Connection.EstablishOutgoingConnectionStatus"
+    enum="NearbyShareFinalStatus" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records whether an attempt to establish a connection to a receiving device
+    succeeded, failed, or was cancelled. Emitted after the user selects a device
+    to send a payload to but before the payload begins its transfer. Because the
+    sending device initiates the connection--via the Nearby Connections
+    library--this metric is only emitted for outgoing transfers.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Share.Connection.TimeToEstablishOutgoingConnection"
+    units="ms" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the time necessary to successfully establish a connection to a
+    receiving device. Emitted after the user selects a device to send a payload
+    to but before the payload begins its transfer, and this is only emitted
+    after a successful connection is established. Because the sending device
+    initiates the connection--via the Nearby Connections library--this metric is
+    only emitted for outgoing transfers.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Share.Contacts.DownloadPageCount.{Result}"
+    units="pages" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Contacts are downloaded in pages, i.e., multiple ListContactPeople RPC
+    request/responses. Records the {Result}. Emitted every time contacts are
+    downloaded for use in Nearby Share. Because contacts are not stored locally,
+    contacts are periodically downloaded for users with Nearby Share enabled and
+    additionally whenever a user enters Nearby Share settings or participates in
+    a sharing flow.
+  </summary>
+  <token key="Result">
+    <variant name="Failure" summary="page number of the first HTTP failure"/>
+    <variant name="Success"
+        summary="number of pages needed to download the user's full contact
+                 list"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.Contacts.DownloadResult" enum="BooleanSuccess"
+    expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records whether or not the full, possibly paginated contact download from
+    the Nearby server was successful. Emitted every time contacts are downloaded
+    for use in Nearby Share. Because contacts are not stored locally, contacts
+    are periodically downloaded for users with Nearby Share enabled and
+    additionally whenever a user enters Nearby Share settings or participates in
+    a sharing flow.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Share.Contacts.HttpResult" enum="NearbyShareHttpResult"
+    expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the result of each ListContactPeople RPC call to the Nearby Share
+    server. Emitted every time contacts are downloaded for use in Nearby Share.
+    Due to pagination, this is emitted for every page of contacts downloaded.
+    Because contacts are not stored locally, contacts are periodically
+    downloaded for users with Nearby Share enabled and additionally whenever a
+    user enters Nearby Share settings or participates in a sharing flow.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Share.Contacts.NumContacts.{Type}" units="contacts"
+    expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the number of {Type} contacts downloaded from the Nearby server.
+    Emitted every time contacts are downloaded for use in Nearby Share. Because
+    contacts are not stored locally, contacts are periodically downloaded for
+    users with Nearby Share enabled and additionally whenever a user enters
+    Nearby Share settings or participates in a sharing flow.
+  </summary>
+  <token key="Type">
+    <variant name="DeviceContactType" summary="device-type"/>
+    <variant name="GoogleContactType" summary="Google-type"/>
+    <variant name="Reachable" summary="reachable"/>
+    <variant name="Selected"
+        summary="selected (selected-contacts visibility mode only)"/>
+    <variant name="Unfiltered" summary="unfiltered"/>
+    <variant name="UnknownContactType" summary="unknown-type"/>
+    <variant name="Unreachable" summary="unreachable"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.Contacts.Percent{Type}" units="%"
+    expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the percentage of {Type} Emitted every time contacts are downloaded
+    for use in Nearby Share. Because contacts are not stored locally, contacts
+    are periodically downloaded for users with Nearby Share enabled and
+    additionally whenever a user enters Nearby Share settings or participates in
+    a sharing flow.
+  </summary>
+  <token key="Type">
+    <variant name="DeviceContactType"
+        summary="unfiltered contacts that are device-type contacts."/>
+    <variant name="Reachable"
+        summary="unfiltered contacts that are reachable."/>
+    <variant name="Selected"
+        summary="(filtered) contacts that are selected by the user in the
+                 setting/onboarding UI. Only emitted for users in
+                 selected-contacts visibility mode."/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.Contacts.TimeToDownload.{Result}" units="ms"
+    expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the time spent {Result}. Emitted every time contacts are downloaded
+    for use in Nearby Share. Because contacts are not stored locally, contacts
+    are periodically downloaded for users with Nearby Share enabled and
+    additionally whenever a user enters Nearby Share settings or participates in
+    a sharing flow.
+  </summary>
+  <token key="Result">
+    <variant name="Failure" summary="downloading contacts before failure"/>
+    <variant name="Success"
+        summary="to successfully download the user's full contact list"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.DeviceType{Direction}"
+    enum="NearbyShareDeviceType" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the device type that the user {Direction}. Emitted when a transfer
+    completes successfully, fails, or was aborted by the user, for example, by
+    cancelling the transfer.
+  </summary>
+  <token key="Direction">
+    <variant name="" summary="sent to or received from"/>
+    <variant name=".Receive" summary="received from"/>
+    <variant name=".Send" summary="sent to"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.Discovery.Delay.FromStartDiscoveryTo{EndState}"
+    units="ms" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the delay between the start of the discovery session and {EndState}.
+  </summary>
+  <token key="EndState">
+    <variant name="AnyDiscovery" summary="the discovery of any share target"/>
+    <variant name="FirstDiscovery"
+        summary="the discovery of the first share target"/>
+    <variant name="StartSend" summary="the start of a transfer"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.Discovery.FurthestDiscoveryProgress"
+    enum="NearbyShareDiscoveryProgress" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the furthest state reached in a single Nearby Share discovery
+    session. Emitted when the per-session discovery manager is destroyed.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Share.Discovery.LookUpSelectedShareTarget"
+    enum="BooleanFound" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records whether or not the selected share target on the Nearby Share
+    discovery page can be found in the per-session discovery manager's map of
+    discovered share targets. Emitted when the user selects a share target from
+    the discovery page and tries to proceed to the next step in the UI.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Share.Discovery.NumShareTargets.{Variation}"
+    units="share targets" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the number of share targets {Variation} in a single discovery
+    session. Emitted once during the discovery session.
+  </summary>
+  <token key="Variation">
+    <variant name="Discovered" summary="discovered"/>
+    <variant name="Lost" summary="lost"/>
+    <variant name="PresentWhenSendStarts" summary="present when a send starts"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.Discovery.{Operation}"
+    enum="NearbyShareServiceStatusCode" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the result of {Operation}. Emitted immediately after the operation
+    is attempted for each discovery session.
+  </summary>
+  <token key="Operation">
+    <variant name="StartDiscovery" summary="starting a discovery session"/>
+    <variant name="StartSend"
+        summary="beginning a transfer of an attachment to the selected share
+                 target on the discovery page"/>
+    <variant name="UnregisterSendSurface"
+        summary="unregistering the per-session discovery manager with the
+                 Nearby Share service"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.Enabled" enum="NearbyShareEnabledState"
+    expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records if the user has the Nearby Share feature enabled, and if not,
+    records why the feature is not enabled. For example, the feature is not
+    allowed by policy, or the user onboarded but later disabled the feature.
+    Emitted when the Nearby Share service starts. This happens at login if the
+    feature flag is on.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Share.IsKnownContact" enum="BooleanKnown"
+    expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records whether or not the device shared with is a known contact, i.e.,
+    contact-based sharing. Emitted when a transfer completes successfully,
+    fails, or was aborted by the user, for example, by cancelling the transfer.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Share.LocalDeviceData.DeviceDataUpdater.HttpResult"
+    enum="NearbyShareHttpResult" expires_after="2021-08-19">
+  <owner>cclem@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the result of the async UpdateDevice API call to the Nearby Sharing
+    server when the device data updater makes a request. Recorded when the async
+    callback is invoked or when the call times out.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Share.Medium.ChangedToMedium"
+    enum="NearbyConnectionsMedium" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the data-transfer medium that the Nearby Connections library
+    successfully switches to during a Nearby Share transfer. Emitted when the
+    Nearby Connections library notifies the client of a bandwidth upgrade.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Share.Medium.FinalPayloadStatus.{UpgradedMedium}"
+    enum="NearbyShareFinalStatus" expires_after="2021-08-19">
+  <obsolete>
+    Replaced 12/2020 with Nearby.Share.Payload.FinalStatus[...].
+  </obsolete>
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records whether a transfer succeeded, failed, or was cancelled when
+    transmitted over {UpgradedMedium}. Emitted when the payload transfer
+    finishes, independent of whether the transfer was successful.
+  </summary>
+  <token key="UpgradedMedium">
+    <variant name="NoMediumUpgrade" summary="the initial bandwidth medium"/>
+    <variant name="UnknownMediumUpgrade"
+        summary="an unknown bandwidth-upgraded medium"/>
+    <variant name="WebRtcUpgrade" summary="an upgraded WebRTC medium"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.Medium.InitiateBandwidthUpgradeResult"
+    enum="BooleanSuccess" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the result of Nearby Share starting a bandwidth upgrade via the
+    Nearby Connections library. This metric only records the result of
+    initiating the change not the result of fully finishing an upgrade. Also,
+    this metric does not capture automatic bandwidth upgrades initiated
+    internally by the Nearby Connections library. Emitted when the Nearby
+    Connections client explicitly requests a bandwidth upgrade.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Share.Medium.RequestedBandwidthUpgradeResult"
+    enum="BooleanUpgraded" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records if the transfer medium was successfully upgraded after an explicit
+    bandwidth upgrade request from the client. Emitted when the transfer channel
+    is disconnected after a bandwidth upgrade request was made by the client.
+  </summary>
+</histogram>
+
+<histogram name="Nearby.Share.Payload.AttachmentType{Variation}"
+    enum="NearbyShareAttachmentType" expires_after="2021-08-19">
+  <owner>cvandermerwe@google.com</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the attachment types from {Variation}. Emitted after all attachment
+    transfers conclude, successfully or not, for a given share target.
+  </summary>
+  <token key="Variation">
+    <variant name=""
+        summary="any Nearby Share attempt, agnostic of final result and
+                 direction"/>
+    <variant name=".Cancelled" summary="a cancelled Nearby Share attempt"/>
+    <variant name=".Failed" summary="a failed Nearby Share attempt"/>
+    <variant name=".Receive" summary="an incoming (receive) payload transfer"/>
+    <variant name=".Send" summary="an outgoing (send) payload transfer"/>
+    <variant name=".Succeeded" summary="a successful Nearby Share attempt"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.Payload.FinalStatus{UpgradedMedium}"
+    enum="NearbyShareFinalStatus" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records whether a payload transfer succeeded, failed, or was cancelled when
+    transmitted over {UpgradedMedium}. Emitted when the payload transfer
+    finishes, independent of whether the transfer was successful.
+  </summary>
+  <token key="UpgradedMedium">
+    <variant name="" summary="any medium"/>
+    <variant name=".NoMediumUpgrade" summary="the initial bandwidth medium"/>
+    <variant name=".UnknownMediumUpgrade"
+        summary="an unknown bandwidth-upgraded medium"/>
+    <variant name=".WebRtcUpgrade" summary="an upgraded WebRTC medium"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.Payload.Medium" enum="NearbyShareUpgradedMedium"
+    expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records if a payload transfer used an upgraded bandwidth medium, and if so,
+    which medium. Emitted when the payload transfer finishes, independent of
+    whether the transfer was successful.
+  </summary>
+</histogram>
+
+<histogram
+    name="Nearby.Share.Payload.Medium.Over5MbTransferred{ShareTargetType}"
+    enum="NearbyShareUpgradedMedium" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records if a payload transfer with {ShareTargetType} used an upgraded
+    bandwidth medium, and if so, which medium. Emitted when the payload transfer
+    finishes if over 5MB was transferred, independent of whether the transfer
+    was successful.
+  </summary>
+  <token key="ShareTargetType">
+    <variant name="" summary="any device type"/>
+    <variant name=".Laptop" summary="a laptop"/>
+    <variant name=".Phone" summary="a phone"/>
+    <variant name=".Tablet" summary="a tablet"/>
+    <variant name=".UnknownDeviceType" summary="an unknown device type"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.Payload.NumAttachments{Type}" units="attachments"
+    expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the number of {Type} attachments intended to be sent in a Nearby
+    Share transfer. Emitted when the transfer concludes, successfully or not.
+  </summary>
+  <token key="Type">
+    <variant name="" summary="text or file"/>
+    <variant name=".File" summary="file"/>
+    <variant name=".Text" summary="text"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.Payload.TotalSize{Variation}" units="KB"
+    expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the total payload size of a Nearby Share transfer {Variation}.
+    Emitted when the transfer concludes.
+  </summary>
+  <token key="Variation">
+    <variant name=""
+        summary="for all sharing scenarios, agnostic of final result, device
+                 type, or transfer medium"/>
+    <variant name=".Cancelled" summary="when the transfer is cancelled"/>
+    <variant name=".Failed" summary="when the transfer fails"/>
+    <variant name=".Laptop" summary="when sharing with a laptop"/>
+    <variant name=".NoMediumUpgrade"
+        summary="when using the initial bandwidth medium"/>
+    <variant name=".Phone" summary="when sharing with a phone"/>
+    <variant name=".Receive" summary="when receiving"/>
+    <variant name=".Send" summary="when sending"/>
+    <variant name=".Succeeded" summary="when the transfer succeeds"/>
+    <variant name=".Tablet" summary="when sharing with a tablet"/>
+    <variant name=".UnknownDeviceType"
+        summary="when sharing with an unknown device type"/>
+    <variant name=".UnknownMediumUpgrade"
+        summary="when using an unknown bandwidth-upgraded medium"/>
+    <variant name=".WebRtcUpgrade"
+        summary="when using an upgraded WebRTC medium"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.Payload.TransferRate{Variation}" units="KB/s"
+    expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the payload transfer rate of a Nearby Share transfer {Variation}.
+    Emitted when the transfer concludes.
+  </summary>
+  <token key="Variation">
+    <variant name=""
+        summary="for all sharing scenarios, agnostic of final result, device
+                 type, or transfer medium"/>
+    <variant name=".Cancelled" summary="when the transfer is cancelled"/>
+    <variant name=".Failed" summary="when the transfer fails"/>
+    <variant name=".Laptop" summary="when sharing with a laptop"/>
+    <variant name=".NoMediumUpgrade"
+        summary="when using the initial bandwidth medium"/>
+    <variant name=".Phone" summary="when sharing with a phone"/>
+    <variant name=".Receive" summary="when receiving"/>
+    <variant name=".Send" summary="when sending"/>
+    <variant name=".Succeeded" summary="when the transfer succeeds"/>
+    <variant name=".Tablet" summary="when sharing with a tablet"/>
+    <variant name=".UnknownDeviceType"
+        summary="when sharing with an unknown device type"/>
+    <variant name=".UnknownMediumUpgrade"
+        summary="when using an unknown bandwidth-upgraded medium"/>
+    <variant name=".WebRtcUpgrade"
+        summary="when using an upgraded WebRTC medium"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.StartAdvertising.Result.FailureReason{Mode}"
+    enum="NearbyShareStartAdvertisingFailureReason" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the reason Nearby Share advertising failed to start in {Mode} mode.
+  </summary>
+  <token key="Mode">
+    <variant name="" summary="BLE and high-visibility"/>
+    <variant name=".BLE" summary="BLE"/>
+    <variant name=".HighVisibility" summary="high-visibility"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.StartAdvertising.Result{Mode}"
+    enum="BooleanSuccess" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the result of starting Nearby Share advertising in {Mode} mode.
+  </summary>
+  <token key="Mode">
+    <variant name="" summary="BLE and high-visibility"/>
+    <variant name=".BLE" summary="BLE"/>
+    <variant name=".HighVisibility" summary="high-visibility"/>
+  </token>
+</histogram>
+
+<histogram
+    name="Nearby.Share.Transfer.CompletionStatus.NotCompletedReason{Direction}{ShareTargetType}"
+    enum="NearbyShareTransferNotCompletedReason" expires_after="2021-08-19">
+  <obsolete>
+    Replaced 12/2020 with Nearby.Share.Transfer.FinalStatus[...].
+  </obsolete>
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the reason a Nearby Share {Direction} transfer was not completed
+    when sharing with {ShareTargetType}. Emitted when a transfer aborts before
+    fully completing.
+  </summary>
+  <token key="Direction">
+    <variant name="" summary="outgoing (send) or incoming (receive)"/>
+    <variant name=".Receive" summary="incoming (receive)"/>
+    <variant name=".Send" summary="outgoing (send)"/>
+  </token>
+  <token key="ShareTargetType">
+    <variant name="" summary="any device type"/>
+    <variant name=".Laptop" summary="a laptop"/>
+    <variant name=".Phone" summary="a phone"/>
+    <variant name=".Tablet" summary="a tablet"/>
+    <variant name=".Unknown" summary="an unknown device type">
+      <obsolete>
+        Renamed 12/2020 to UnknownDeviceType.
+      </obsolete>
+    </variant>
+    <variant name=".UnknownDeviceType" summary="an unknown device type"/>
+  </token>
+</histogram>
+
+<histogram
+    name="Nearby.Share.Transfer.CompletionStatus{Direction}{ShareTargetType}"
+    enum="BooleanCompleted" expires_after="2021-08-19">
+  <obsolete>
+    Replaced 12/2020 with Nearby.Share.Transfer.FinalStatus[...].
+  </obsolete>
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records if a Nearby Share {Direction} transfer fully completes or not when
+    sharing with {ShareTargetType}. Emitted when a transfer completes
+    successfully, fails, or was aborted by the user, for example, by cancelling
+    the transfer. Note: This metric does not reflect success/failure. For
+    example, if a user manually cancels a transfer, that is not considered a
+    failure but it will be bucketed as &quot;Not Completed&quot;.
+  </summary>
+  <token key="Direction">
+    <variant name="" summary="outgoing (send) or incoming (receive)"/>
+    <variant name=".Receive" summary="incoming (receive)"/>
+    <variant name=".Send" summary="outgoing (send)"/>
+  </token>
+  <token key="ShareTargetType">
+    <variant name="" summary="any device type"/>
+    <variant name=".Laptop" summary="a laptop"/>
+    <variant name=".Phone" summary="a phone"/>
+    <variant name=".Tablet" summary="a tablet"/>
+    <variant name=".Unknown" summary="an unknown device type">
+      <obsolete>
+        Renamed 12/2020 to UnknownDeviceType.
+      </obsolete>
+    </variant>
+    <variant name=".UnknownDeviceType" summary="an unknown device type"/>
+  </token>
+</histogram>
+
+<histogram
+    name="Nearby.Share.Transfer.FinalStatus.{Direction}.{ShareTargetType}.{ContactStatus}"
+    enum="NearbyShareTransferFinalStatus" expires_after="2021-08-19">
+  <obsolete>
+    Replaced 01/2021 with Nearby.Share.Transfer.FinalStatus{Variation}, which
+    slices by only one dimension.
+  </obsolete>
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the final status of a Nearby Share {Direction} transfer with
+    {ShareTargetType} using {ContactStatus}. Emitted when a transfer completes
+    successfully, fails, or was aborted by the user, for example, by cancelling
+    the transfer.
+  </summary>
+  <token key="Direction">
+    <variant name="Receive" summary="incoming (receive)"/>
+    <variant name="Send" summary="outgoing (send)"/>
+  </token>
+  <token key="ShareTargetType">
+    <variant name="Laptop" summary="a laptop"/>
+    <variant name="Phone" summary="a phone"/>
+    <variant name="Tablet" summary="a tablet"/>
+    <variant name="UnknownDeviceType" summary="an unknown device type"/>
+  </token>
+  <token key="ContactStatus">
+    <variant name="Contact" summary="contact-based sharing"/>
+    <variant name="NonContact" summary="non-contact-based sharing"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.Transfer.FinalStatus{Variation}"
+    enum="NearbyShareTransferFinalStatus" expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the final status of a Nearby Share transfer {Variation}. Emitted
+    when a transfer completes successfully, fails, or was aborted by the user,
+    for example, by cancelling the transfer.
+  </summary>
+  <token key="Variation">
+    <variant name=""
+        summary="for all sharing scenarios, agnostic of send/receive, device
+                 type, or contact/non-contact"/>
+    <variant name=".Contact" summary="when sharing with a contact"/>
+    <variant name=".Laptop" summary="when sharing with a laptop"/>
+    <variant name=".NonContact" summary="when sharing with a non-contact"/>
+    <variant name=".Phone" summary="when sharing with a phone"/>
+    <variant name=".Receive" summary="when receiving"/>
+    <variant name=".Send" summary="when sending"/>
+    <variant name=".Tablet" summary="when sharing with a tablet"/>
+    <variant name=".UnknownDeviceType"
+        summary="when sharing with an unknown device type"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.Transfer.NumAttachments{Type}"
+    units="attachments" expires_after="2021-08-19">
+  <obsolete>
+    Renamed 12/2020 to Nearby.Share.Payload.NumAttachments[...].
+  </obsolete>
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the number of {Type} attachments intended to be sent in a Nearby
+    Share transfer. Emitted when the transfer concludes, successfully or not.
+  </summary>
+  <token key="Type">
+    <variant name="" summary="text or file"/>
+    <variant name=".File" summary="file"/>
+    <variant name=".Text" summary="text"/>
+  </token>
+</histogram>
+
+<histogram
+    name="Nearby.Share.Transfer.Rate{Direction}{ShareTargetType}{UpgradedMedium}{PayloadStatus}"
+    units="KB/s" expires_after="2021-08-19">
+  <obsolete>
+    Renamed 12/2020 to Nearby.Share.Payload.TransferRate[...].
+  </obsolete>
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the transfer rate of a Nearby Share {Direction} transfer that
+    {PayloadStatus} when sharing with {ShareTargetType} over {UpgradedMedium}.
+    Emitted when the transfer concludes.
+  </summary>
+  <token key="Direction">
+    <variant name="" summary="outgoing (send) or incoming (receive)"/>
+    <variant name=".Receive" summary="incoming (receive)"/>
+    <variant name=".Send" summary="outgoing (send)"/>
+  </token>
+  <token key="ShareTargetType">
+    <variant name="" summary="any device type"/>
+    <variant name=".Laptop" summary="a laptop"/>
+    <variant name=".Phone" summary="a phone"/>
+    <variant name=".Tablet" summary="a tablet"/>
+    <variant name=".Unknown" summary="an unknown device type"/>
+  </token>
+  <token key="UpgradedMedium">
+    <variant name="" summary="any possible bandwidth medium"/>
+    <variant name=".NoMediumUpgrade" summary="the initial bandwidth medium"/>
+    <variant name=".UnknownMediumUpgrade"
+        summary="an unknown bandwidth-upgraded medium"/>
+    <variant name=".WebRtcUpgrade" summary="an upgraded WebRTC medium"/>
+  </token>
+  <token key="PayloadStatus">
+    <variant name="" summary="succeeded, failed, or was cancelled"/>
+    <variant name=".Cancelled" summary="was cancelled"/>
+    <variant name=".Failed" summary="failed"/>
+    <variant name=".Succeeded" summary="succeeded"/>
+  </token>
+</histogram>
+
+<histogram
+    name="Nearby.Share.Transfer.TotalSize{Direction}{ShareTargetType}{UpgradedMedium}{PayloadStatus}"
+    units="KB" expires_after="2021-08-19">
+  <obsolete>
+    Renamed 12/2020 to Nearby.Share.Payload.TotalSize[...].
+  </obsolete>
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the total payload size of a Nearby Share {Direction} transfer that
+    {PayloadStatus} when sharing with {ShareTargetType} over {UpgradedMedium}.
+    Emitted when the transfer concludes.
+  </summary>
+  <token key="Direction">
+    <variant name="" summary="outgoing (send) or incoming (receive)"/>
+    <variant name=".Receive" summary="incoming (receive)"/>
+    <variant name=".Send" summary="outgoing (send)"/>
+  </token>
+  <token key="ShareTargetType">
+    <variant name="" summary="any device type"/>
+    <variant name=".Laptop" summary="a laptop"/>
+    <variant name=".Phone" summary="a phone"/>
+    <variant name=".Tablet" summary="a tablet"/>
+    <variant name=".Unknown" summary="an unknown device type"/>
+  </token>
+  <token key="UpgradedMedium">
+    <variant name="" summary="any possible bandwidth medium"/>
+    <variant name=".NoMediumUpgrade" summary="the initial bandwidth medium"/>
+    <variant name=".UnknownMediumUpgrade"
+        summary="an unknown bandwidth-upgraded medium"/>
+    <variant name=".WebRtcUpgrade" summary="an upgraded WebRTC medium"/>
+  </token>
+  <token key="PayloadStatus">
+    <variant name="" summary="succeeded, failed, or was cancelled"/>
+    <variant name=".Cancelled" summary="was cancelled"/>
+    <variant name=".Failed" summary="failed"/>
+    <variant name=".Succeeded" summary="succeeded"/>
+  </token>
+</histogram>
+
+<histogram name="Nearby.Share.VisibilityChoice" enum="NearbyShareVisibility"
+    expires_after="2021-08-19">
+  <owner>nohle@chromium.org</owner>
+  <owner>nearby-share-chromeos-eng@google.com</owner>
+  <summary>
+    Records the user's chosen degree of visibility to their contacts, selected
+    during onboarding or updated in settings. Emitted at login for users that
+    have Nearby Share enabled.
+  </summary>
+</histogram>
+
+</histograms>
+
+</histogram-configuration>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/net/OWNERS b/chromium/tools/metrics/histograms/histograms_xml/net/OWNERS
index e6f66a602ef..bd184bdee25 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/net/OWNERS
+++ b/chromium/tools/metrics/histograms/histograms_xml/net/OWNERS
@@ -5,3 +5,12 @@ dschinazi@chromium.org
 # If none of these reviewers are available, please send CLs to
 # <chromium-metrics-reviews@google.com>. See tools/metrics/histograms/OWNERS
 # for details.
+
+
+# Prefer chromium-metrics-reviews@google.com or the above owners instead.
+# Use the following owners only if:
+#  - The reviewer is available for review.
+#  - You work in the same area as them.
+#  - They are already a good reviewer for the non-metrics part of the CL.
+# See tools/metrics/histograms/histograms_xml/OWNERS for details.
+csharrison@chromium.org
diff --git a/chromium/tools/metrics/histograms/histograms_xml/net/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/net/histograms.xml
index 1782556e284..deea5097f1a 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/net/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/net/histograms.xml
@@ -21,8 +21,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<variants name="URLLoaderThrottleStages">
+  <variant name="BeforeWillProcessResponse"/>
+  <variant name="WillOnCompleteWithError"/>
+  <variant name="WillProcessResponse"/>
+  <variant name="WillRedirectRequest"/>
+  <variant name="WillStartRequest"/>
+</variants>
+
 <histogram name="Net.AlternateProtocolBrokenLocation"
-    enum="BrokenAlternateProtocolLocation" expires_after="2021-05-11">
+    enum="BrokenAlternateProtocolLocation" expires_after="2021-07-27">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -31,7 +39,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.AlternateProtocolUsage" enum="AlternateProtocolUsage"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -41,7 +49,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.AlternateProtocolUsageGoogle"
-    enum="AlternateProtocolUsage" expires_after="2021-05-11">
+    enum="AlternateProtocolUsage" expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -51,7 +59,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.AlternateServiceFailed" enum="NetErrorCodes"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>tbansal@chromium.org</owner>
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
@@ -299,7 +307,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Net.CertVerifier.NameNormalizationPrivateRoots"
-    enum="NetCertificateNameNormalization" expires_after="2021-04-26">
+    enum="NetCertificateNameNormalization" expires_after="2021-08-09">
   <owner>mattm@chromium.org</owner>
   <owner>rsleevi@chromium.org</owner>
   <summary>
@@ -351,7 +359,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.CertVerifier_TrialComparisonResult"
-    enum="CertVerifierTrialComparisonResult" expires_after="2021-04-26">
+    enum="CertVerifierTrialComparisonResult" expires_after="2021-08-22">
   <owner>mattm@chromium.org</owner>
   <owner>rsleevi@chromium.org</owner>
   <summary>
@@ -363,7 +371,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.ConnectionInfo.MainFrame" enum="ConnectionInfo"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -374,7 +382,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.ConnectionInfo.SubResource" enum="ConnectionInfo"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -445,7 +453,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.CountOfBrokenAlternativeServices" units="services"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -469,7 +477,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.CountOfRecentlyBrokenAlternativeServices" units="services"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -527,7 +535,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.DnsConfig.SecureDnsMode" enum="SecureDnsModeDetails"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -560,6 +568,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Net.DNS.DnsTask.ErrorBeforeFallback.Fast" enum="NetErrorCodes"
     expires_after="M77">
+  <obsolete>
+    Removed from code 2021-02.
+  </obsolete>
   <owner>pauljensen@chromium.org</owner>
   <owner>mef@chromium.org</owner>
   <summary>
@@ -570,6 +581,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Net.DNS.DnsTask.ErrorBeforeFallback.Slow" enum="NetErrorCodes"
     expires_after="M77">
+  <obsolete>
+    Removed from code 2021-02.
+  </obsolete>
   <owner>pauljensen@chromium.org</owner>
   <owner>mef@chromium.org</owner>
   <summary>
@@ -590,7 +604,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.DnsTask.SuccessTime" units="ms"
-    expires_after="2021-06-04">
+    expires_after="2021-08-09">
   <owner>ericorth@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -601,7 +615,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.DnsTransaction.AttemptType" enum="DNS.AttemptType"
-    expires_after="2021-02-28">
+    expires_after="2021-08-15">
   <owner>ericorth@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -612,7 +626,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Net.DNS.DnsTransaction.Insecure.FailureTime"
-    units="ms" expires_after="2021-02-28">
+    units="ms" expires_after="2021-07-28">
 <!-- Name completed by histogram_suffixes
    name="DohProviderId" -->
 
@@ -624,7 +638,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Net.DNS.DnsTransaction.Insecure.SuccessTime"
-    units="ms" expires_after="2021-02-28">
+    units="ms" expires_after="2021-07-28">
 <!-- Name completed by histogram_suffixes
    name="DohProviderId" -->
 
@@ -637,7 +651,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Net.DNS.DnsTransaction.SecureNotValidated.FailureError"
-    enum="NetErrorCodes" expires_after="2021-01-31">
+    enum="NetErrorCodes" expires_after="2021-07-31">
 <!-- Name completed by histogram_suffixes
    name="DohProviderId" -->
 
@@ -652,7 +666,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Net.DNS.DnsTransaction.SecureNotValidated.FailureTime" units="ms"
-    expires_after="2021-01-31">
+    expires_after="2021-07-31">
 <!-- Name completed by histogram_suffixes
    name="DohProviderId" -->
 
@@ -667,7 +681,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Net.DNS.DnsTransaction.SecureNotValidated.SuccessTime" units="ms"
-    expires_after="2021-01-31">
+    expires_after="2021-07-31">
 <!-- Name completed by histogram_suffixes
    name="DohProviderId" -->
 
@@ -682,7 +696,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Net.DNS.DnsTransaction.SecureValidated.FailureError"
-    enum="NetErrorCodes" expires_after="2021-02-28">
+    enum="NetErrorCodes" expires_after="2021-07-28">
 <!-- Name completed by histogram_suffixes
    name="DohProviderId" -->
 
@@ -698,7 +712,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Net.DNS.DnsTransaction.SecureValidated.FailureTime" units="ms"
-    expires_after="2021-02-28">
+    expires_after="2021-07-28">
 <!-- Name completed by histogram_suffixes
    name="DohProviderId" -->
 
@@ -713,7 +727,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Net.DNS.DnsTransaction.SecureValidated.SuccessTime" units="ms"
-    expires_after="2021-02-28">
+    expires_after="2021-07-28">
 <!-- Name completed by histogram_suffixes
    name="DohProviderId" -->
 
@@ -728,6 +742,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Net.DNS.DnsTransaction.SecureValidated.SuccessTimeoutRatio"
     units="10*ratio" expires_after="2020-12-20">
+  <obsolete>
+    Removed from code 2021-02.
+  </obsolete>
   <owner>ericorth@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -740,7 +757,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.DnsTransaction.UDP.IdMismatch"
-    enum="DNS.UdpIdMismatchStatus" expires_after="2021-04-04">
+    enum="DNS.UdpIdMismatchStatus" expires_after="2021-06-06">
+  <obsolete>
+    Removed from code 2021-01.
+  </obsolete>
   <owner>ericorth@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -752,6 +772,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Net.DNS.DnsTransaction.UDP.IdMismatch.OldestMatchTime"
     units="ms" expires_after="2021-04-04">
+  <obsolete>
+    Removed from code 2021-01.
+  </obsolete>
   <owner>ericorth@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -763,7 +786,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.DnsTransaction.UDP.LowEntropyReason"
-    enum="DNS.UdpLowEntropyReason" expires_after="2021-02-28">
+    enum="DNS.UdpLowEntropyReason" expires_after="never">
+<!-- expires-never: Core network stack health metric -->
+
   <owner>ericorth@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -775,6 +800,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Net.DNS.DnsTransaction.UDP.ReusedPort.Count"
     units="num recent uses" expires_after="2021-04-04">
+  <obsolete>
+    Removed from code 2021-01.
+  </obsolete>
   <owner>ericorth@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -785,6 +813,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Net.DNS.DnsTransaction.UDP.ReusedPort.MostRecentAge"
     units="ms" expires_after="2021-04-04">
+  <obsolete>
+    Removed from code 2021-01.
+  </obsolete>
   <owner>ericorth@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -796,7 +827,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Net.DNS.HTTPSSVC.RecordHttps.AnyProvider.ExpectNoerror.Parsable"
-    enum="BooleanValid" expires_after="2021-08-05">
+    enum="BooleanValid" expires_after="2021-09-14">
   <owner>ericorth@chromium.org</owner>
   <owner>dmcardle@chromium.org</owner>
   <summary>
@@ -808,7 +839,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Net.DNS.HTTPSSVC.RecordHttps.AnyProvider.ExpectNoerror.RecordWithError"
-    enum="Boolean" expires_after="2021-08-05">
+    enum="Boolean" expires_after="2021-09-14">
   <owner>ericorth@chromium.org</owner>
   <owner>dmcardle@chromium.org</owner>
   <summary>
@@ -819,7 +850,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Net.DNS.HTTPSSVC.RecordHttps.DnsRcode"
-    enum="HttpssvcDnsRcode" expires_after="2021-08-05">
+    enum="HttpssvcDnsRcode" expires_after="2021-09-14">
 <!-- Name completed by histogram_suffixes
   name="DohProviderId" and name="HttpssvcIntegrityExpectation" -->
 
@@ -835,7 +866,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Net.DNS.HTTPSSVC.RecordHttps.ExpectIntact.Parsable"
-    enum="BooleanValid" expires_after="2021-08-05">
+    enum="BooleanValid" expires_after="2021-09-14">
 <!-- Name completed by histogram_suffixes
   name="DohProviderId" -->
 
@@ -850,7 +881,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Net.DNS.HTTPSSVC.RecordHttps.ExpectIntact.RecordWithError"
-    units="records" expires_after="2021-08-05">
+    units="records" expires_after="2021-09-14">
 <!-- Name completed by histogram_suffixes
   name="DohProviderId" -->
 
@@ -865,7 +896,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Net.DNS.HTTPSSVC.RecordHttps.ResolveTimeHttpsRecord" units="ms"
-    expires_after="2021-08-05">
+    expires_after="2021-09-14">
 <!-- Name completed by histogram_suffixes
   name="DohProviderId" and name="HttpssvcIntegrityExpectation" -->
 
@@ -878,7 +909,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Net.DNS.HTTPSSVC.RecordHttps.ResolveTimeRatio"
-    units="scaled ratio (% / 10)" expires_after="2021-08-05">
+    units="scaled ratio (% / 10)" expires_after="2021-09-14">
 <!-- Name completed by histogram_suffixes
   name="DohProviderId" and name="HttpssvcIntegrityExpectation" -->
 
@@ -896,7 +927,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Net.DNS.HTTPSSVC.RecordIntegrity.DnsRcode"
-    enum="HttpssvcDnsRcode" expires_after="2021-03-14">
+    enum="HttpssvcDnsRcode" expires_after="2021-09-14">
 <!-- Name completed by histogram_suffixes
    name="DohProviderId" and name="HttpssvcIntegrityExpectation" -->
 
@@ -912,7 +943,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Net.DNS.HTTPSSVC.RecordIntegrity.ExpectIntact.Integrity"
-    enum="HttpssvcIntegrityJudgment" expires_after="2021-03-14">
+    enum="HttpssvcIntegrityJudgment" expires_after="2021-09-14">
 <!-- Name completed by histogram_suffixes
    name="DohProviderId" -->
 
@@ -927,7 +958,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Net.DNS.HTTPSSVC.RecordIntegrity.ExpectIntact.RecordWithError"
-    units="records" expires_after="2021-03-14">
+    units="records" expires_after="2021-09-14">
 <!-- Name completed by histogram_suffixes
    name="DohProviderId" -->
 
@@ -942,7 +973,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Net.DNS.HTTPSSVC.RecordIntegrity.ExpectNoerror.RecordReceived"
-    units="records" expires_after="2021-03-14">
+    units="records" expires_after="2021-09-14">
 <!-- Name completed by histogram_suffixes
    name="DohProviderId" -->
 
@@ -958,7 +989,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Net.DNS.HTTPSSVC.RecordIntegrity.ResolveTimeIntegrityRecord"
-    units="ms" expires_after="2021-03-14">
+    units="ms" expires_after="2021-09-14">
 <!-- Name completed by histogram_suffixes
    name="DohProviderId" and name="HttpssvcIntegrityExpectation" -->
 
@@ -972,7 +1003,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="Net.DNS.HTTPSSVC.RecordIntegrity.ResolveTimeNonIntegrityRecord"
-    units="ms" expires_after="2021-03-14">
+    units="ms" expires_after="2021-09-14">
 <!-- Name completed by histogram_suffixes
    name="DohProviderId" and name="HttpssvcIntegrityExpectation" -->
 
@@ -986,7 +1017,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Net.DNS.HTTPSSVC.RecordIntegrity.ResolveTimeRatio"
-    units="%" expires_after="2021-03-14">
+    units="%" expires_after="2021-09-14">
 <!-- Name completed by histogram_suffixes
    name="DohProviderId" and name="HttpssvcIntegrityExpectation" -->
 
@@ -1004,7 +1035,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.InsecureDnsTask.FailureTime" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>ericorth@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -1013,7 +1044,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.JobQueueTime.Failure" units="ms"
-    expires_after="2021-04-20">
+    expires_after="2021-08-22">
   <owner>dmcardle@chromium.org</owner>
   <owner>ericorth@chromium.org</owner>
   <summary>
@@ -1024,7 +1055,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.JobQueueTime.PerTransaction" units="ms"
-    expires_after="2021-04-20">
+    expires_after="2021-08-22">
   <owner>dmcardle@chromium.org</owner>
   <owner>ericorth@chromium.org</owner>
   <summary>
@@ -1037,7 +1068,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.JobQueueTime.Success" units="ms"
-    expires_after="2021-04-20">
+    expires_after="2021-08-22">
   <owner>dmcardle@chromium.org</owner>
   <owner>ericorth@chromium.org</owner>
   <summary>
@@ -1048,7 +1079,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.ProbeSequence.ConfigChange.Failure.AttemptTime"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-07-27">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1058,7 +1089,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.ProbeSequence.ConfigChange.Success.AttemptTime"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-07-11">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1068,7 +1099,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.ProbeSequence.NetworkChange.Failure.AttemptTime"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-01">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1078,7 +1109,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.ProbeSequence.NetworkChange.Success.AttemptTime"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-08">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1179,7 +1210,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.SecureDnsMode.Automatic.ResolveTime" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-07-18">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1191,7 +1222,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.SecureDnsMode.Off.ResolveTime" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-08-09">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1203,7 +1234,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.SecureDnsMode.Secure.ResolveTime" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-08-01">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1215,7 +1246,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.SecureDnsTask.DnsModeAutomatic.FailureTime" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-07-11">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1226,7 +1257,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.SecureDnsTask.DnsModeSecure.FailureTime" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-08-09">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1237,6 +1268,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Net.DNS.SecureDnsTaskFailure.FallbackDnsTask.Error"
     enum="NetErrorCodes" expires_after="2021-01-31">
+  <obsolete>
+    Removed from code 2021-01.
+  </obsolete>
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1247,6 +1281,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Net.DNS.SecureDnsTaskFailure.FallbackProcTask.Error"
     enum="NetErrorCodes" expires_after="2021-01-31">
+  <obsolete>
+    Removed from code 2021-01.
+  </obsolete>
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1257,7 +1294,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Net.DNS.UI.DropdownSelectionEvent"
-    enum="DohProviderId" expires_after="2021-05-02">
+    enum="DohProviderId" expires_after="2021-07-11">
 <!-- Name completed by histogram_suffixes
    name="DnsDropdownSelectionEvent" -->
 
@@ -1270,7 +1307,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.UI.ProbeAttemptSuccess" enum="Boolean"
-    expires_after="2021-05-02">
+    expires_after="2021-08-09">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1280,7 +1317,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.UI.ValidationAttemptSuccess" enum="Boolean"
-    expires_after="2021-05-02">
+    expires_after="2021-08-09">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1290,7 +1327,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.UpgradeConfig.DotUpgradeSucceeded" enum="Boolean"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1300,7 +1337,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.UpgradeConfig.HasPublicInsecureNameserver"
-    enum="Boolean" expires_after="2021-05-02">
+    enum="Boolean" expires_after="2021-07-04">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1311,7 +1348,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.UpgradeConfig.Ineligible.DohSpecified" enum="Boolean"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1321,7 +1358,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.UpgradeConfig.Ineligible.UnhandledOptions"
-    enum="Boolean" expires_after="2021-02-28">
+    enum="Boolean" expires_after="2021-11-28">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1332,7 +1369,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.DNS.UpgradeConfig.InsecureUpgradeSucceeded" enum="Boolean"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <summary>
@@ -1352,6 +1389,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Net.DomainReliability.BeaconOutcome"
+    enum="DomainReliabilityBeaconOutcome" expires_after="2021-12-11">
+  <owner>chlily@chromium.org</owner>
+  <owner>mmenke@chromium.org</owner>
+  <summary>
+    The outcome of a Domain Reliability beacon, logged upon destruction of the
+    beacon.
+  </summary>
+</histogram>
+
 <histogram name="Net.ErrAborted.CountPerUpload2" units="aborts"
     expires_after="M85">
   <owner>csharrison@chromium.org</owner>
@@ -1434,7 +1481,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.ErrorPageCounts" enum="NetErrorPageEvents"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>edwardjung@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -1446,7 +1493,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.ErrorPageCounts.SuggestionClicked"
-    enum="NetErrorOfflineSuggestionType" expires_after="2021-05-31">
+    enum="NetErrorOfflineSuggestionType" expires_after="2021-08-01">
   <owner>sclittle@chromium.org</owner>
   <owner>offline-dev@chromium.org</owner>
   <summary>
@@ -1456,7 +1503,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.ErrorPageCounts.SuggestionPresented"
-    enum="NetErrorOfflineSuggestionType" expires_after="2021-05-31">
+    enum="NetErrorOfflineSuggestionType" expires_after="2021-08-01">
   <owner>sclittle@chromium.org</owner>
   <owner>offline-dev@chromium.org</owner>
   <summary>
@@ -1467,7 +1514,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.ExpectCT.EntriesOnLoad" units="entries"
-    expires_after="2021-01-07">
+    expires_after="2021-08-07">
   <owner>mmenke@chromium.org</owner>
   <owner>estark@chromium.org</owner>
   <summary>
@@ -1546,7 +1593,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.HasBrokenNEON" enum="BooleanBroken"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>davidben@chromium.org</owner>
   <summary>
     Records, on startup, for ARM devices running Android, whether the CPU is
@@ -1555,7 +1602,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.HttpAuthCount" enum="HttpAuthCount"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>asanka@chromium.org</owner>
   <owner>mmenke@chromium.org</owner>
   <summary>
@@ -1577,14 +1624,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.HttpAuthPromptType" enum="HttpAuthPromptType"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>meacer@chromium.org</owner>
   <owner>src/chrome/browser/ui/login/OWNERS</owner>
   <summary>Type of the HTTP auth prompt displayed.</summary>
 </histogram>
 
 <histogram name="Net.HttpAuthTarget" enum="HttpAuthTarget"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>asanka@chromium.org</owner>
   <owner>mmenke@chromium.org</owner>
   <summary>
@@ -1623,8 +1670,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.HttpJob.PrefilterBytesRead" units="bytes"
-    expires_after="M85">
+    expires_after="M95">
   <owner>jkarlin@chromium.org</owner>
+  <owner>shivanisha@chromium.org</owner>
   <summary>
     Total prefilter (e.g., before decompression) bytes read for an HttpJob
     request.
@@ -1867,7 +1915,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.NetworkChangeNotifier.NewConnectionType"
-    enum="NetworkConnectionType" expires_after="2021-03-30">
+    enum="NetworkConnectionType" expires_after="2021-08-01">
   <owner>rockot@google.com</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -1876,6 +1924,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Net.NetworkChangeNotifierMac.GetCurrentConnectionTypeWaitTime"
+    units="ms" expires_after="2022-02-19">
+  <owner>ajuma@chromium.org</owner>
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    The amount of time (ms) spent waiting for the connection type to be
+    determined in NetworkChangeNotifierMac::GetCurrentConnectionType. This is
+    recorded the first time GetCurrentConnectionType is called, before the
+    connection type has been determined; it is not recorded again on subsequent
+    calls to this function.
+  </summary>
+</histogram>
+
 <histogram name="Net.NetworkConfigWatcherMac.SCDynamicStore.Create"
     enum="SCStatusCode" expires_after="M85">
   <owner>mef@chromium.org</owner>
@@ -1910,7 +1971,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.NetworkErrorLogging.SignedExchangeRequestOutcome"
-    enum="NetNetworkErrorLoggingRequestOutcome" expires_after="2021-01-24">
+    enum="NetNetworkErrorLoggingRequestOutcome" expires_after="M94">
   <owner>horo@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <owner>kinuko@chromium.org</owner>
@@ -1936,7 +1997,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.Ntlm.HashDependsOnLocale" enum="Boolean"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>eroman@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -1958,6 +2019,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Net.Port.SlipstreamRestricted" enum="SlipstreamPort"
+    expires_after="2021-06-01">
+  <owner>ricea@chromium.org</owner>
+  <owner>yhirano@chromium.org</owner>
+  <summary>
+    Ports which may be restricted due to the NAT Slipstream 2.0 vulnerability.
+    Logged for every valid port passed to net::IsPortAllowedForScheme(). Almost
+    all lookups will end up in the kOther bucket.
+
+    A top-level navigation will be counted 4 times, whereas a subresource will
+    only be counted once. This is not intentional, but may be useful to estimate
+    the level of breakage.
+  </summary>
+</histogram>
+
 <histogram name="Net.Prefetch.HitBytes" units="bytes" expires_after="M87">
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -2022,7 +2098,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.PushedStreamVaryResponseHeader"
-    enum="PushedStreamVaryResponseHeaderValues" expires_after="2021-05-11">
+    enum="PushedStreamVaryResponseHeaderValues" expires_after="2021-08-15">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -2032,7 +2108,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicActiveSessions" units="units"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2050,6 +2126,36 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Net.QuicChromiumClientStream.HandleOnCloseConnectionError"
+    enum="QuicErrorCodes" expires_after="2022-02-09">
+  <owner>renjietang@chromium.org</owner>
+  <owner>src/net/OWNERS</owner>
+  <summary>
+    Log the connection error code when QUIC stream handle closes.
+  </summary>
+</histogram>
+
+<histogram name="Net.QuicChromiumClientStream.HandleOnCloseNetError"
+    enum="NetErrorCodes" expires_after="2022-02-09">
+  <owner>renjietang@chromium.org</owner>
+  <owner>src/net/OWNERS</owner>
+  <summary>Log the net error code when QUIC stream handle closes.</summary>
+</histogram>
+
+<histogram name="Net.QuicChromiumClientStream.HandleOnCloseStreamError"
+    enum="QuicRstStreamErrorCodes" expires_after="2022-02-09">
+  <owner>renjietang@chromium.org</owner>
+  <owner>src/net/OWNERS</owner>
+  <summary>Log the stream error code when QUIC stream handle closes.</summary>
+</histogram>
+
+<histogram name="Net.QuicChromiumClientStream.TrailingHeadersProcessSuccess"
+    enum="BooleanSuccess" expires_after="2022-02-09">
+  <owner>renjietang@chromium.org</owner>
+  <owner>src/net/OWNERS</owner>
+  <summary>Log success rate of processing trailing headers.</summary>
+</histogram>
+
 <histogram name="Net.QuicClientHelloRejectReasons" enum="QuicRejectReasons"
     expires_after="2021-05-11">
   <owner>dschinazi@chromium.org</owner>
@@ -2060,7 +2166,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicConnection.WritePacketStatus" enum="QuicWriteStatus"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>wub@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2070,7 +2176,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicConnectivityMonitor.NumActiveDegradingSessions"
-    units="sessions" expires_after="2021-05-11">
+    units="sessions" expires_after="2021-07-11">
   <owner>zhongyi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2088,7 +2194,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Net.QuicConnectivityMonitor.NumActiveQuicSessionsAtNetworkChange"
-    units="sessions" expires_after="2021-05-11">
+    units="sessions" expires_after="2021-08-01">
   <owner>zhongyi@chromium.org</owner>
   <owner>rockot@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
@@ -2123,7 +2229,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Net.QuicConnectivityMonitor.NumAllSessionsDegradedAtNetworkChange"
-    units="sessions" expires_after="2021-05-11">
+    units="sessions" expires_after="2021-08-01">
   <owner>zhongyi@chromium.org</owner>
   <owner>rockot@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
@@ -2141,7 +2247,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Net.QuicConnectivityMonitor.NumSessionsTrackedSinceSpeculativeError"
-    units="sessions" expires_after="2021-05-11">
+    units="sessions" expires_after="2021-08-01">
   <owner>zhongyi@chromium.org</owner>
   <owner>rockot@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
@@ -2175,7 +2281,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicConnectivityMonitor.PercentageActiveDegradingSessions"
-    units="%" expires_after="2021-05-11">
+    units="%" expires_after="2021-07-11">
   <owner>zhongyi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2211,7 +2317,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicConnectivityMonitor.SessionDegradedBeforeWriteError"
-    enum="BooleanDetected" expires_after="2021-05-11">
+    enum="BooleanDetected" expires_after="2021-07-11">
   <owner>zhongyi@chromium.org</owner>
   <owner>rockot@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
@@ -2235,7 +2341,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicDroppedPacketReason" enum="QuicDroppedPacketReason"
-    expires_after="2021-05-11">
+    expires_after="2021-07-27">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2245,7 +2351,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicHandshakeNotConfirmedNumPacketsReceived" units="units"
-    expires_after="2021-05-11">
+    expires_after="2021-07-27">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2255,7 +2361,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicHandshakeState" enum="QuicHandshakeState"
-    expires_after="2021-05-11">
+    expires_after="2021-08-22">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2308,6 +2414,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Net.QuicHttpStream.ProcessResponseHeaderSuccess"
+    enum="BooleanSuccess" expires_after="2022-02-09">
+  <owner>renjietang@chromium.org</owner>
+  <owner>src/net/quic/OWNERS</owner>
+  <summary>
+    Log the success rate of HTTP layer reading QUIC response headers, for
+    investigating b/177893733.
+  </summary>
+</histogram>
+
+<histogram name="Net.QuicHttpStream.ResponseStatus"
+    enum="QuicRstStreamErrorCodes" expires_after="2022-02-09">
+  <owner>bnc@chromium.org</owner>
+  <owner>src/net/quic/OWNERS</owner>
+  <summary>
+    Stream error of QuicSpdyStream when QuicHttpStream::ComputeResponseStatus()
+    returns ERR_QUIC_PROTOCOL_ERROR, for investigating b/177893733.
+  </summary>
+</histogram>
+
 <histogram name="Net.QuicNetworkDegradingDurationTillConnected" units="ms"
     expires_after="2021-05-11">
   <owner>zhongyi@chromium.org</owner>
@@ -2349,7 +2475,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicNumSentClientHellos" units="units"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>The number of client hello messages sent.</summary>
@@ -2373,7 +2499,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.AbortedPendingStreamRequests"
-    units="stream requests" expires_after="2021-05-11">
+    units="stream requests" expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2424,7 +2550,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.CertVerificationResult" enum="NetErrorCodes"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2495,7 +2621,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.ClosedDuringInitializeSession" enum="Boolean"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2608,47 +2734,47 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.ConnectionCloseErrorCodeClient"
-    enum="QuicErrorCodes" expires_after="2021-05-11">
+    enum="QuicErrorCodes" expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
-    The QUIC error code which resulted in the Google QUIC connection being
-    closed by the client.
+    The QUIC error code which resulted in the QUIC connection being closed by
+    the client.
   </summary>
 </histogram>
 
 <histogram name="Net.QuicSession.ConnectionCloseErrorCodeClientGoogle"
-    enum="QuicErrorCodes" expires_after="2021-05-11">
+    enum="QuicErrorCodes" expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
-    The QUIC error code which resulted in the Google QUIC connection being
-    closed by the client to a server ending in .google.com.
+    The QUIC error code which resulted in the QUIC connection being closed by
+    the client to a Google server.
   </summary>
 </histogram>
 
 <histogram name="Net.QuicSession.ConnectionCloseErrorCodeServer"
-    enum="QuicErrorCodes" expires_after="2021-05-11">
+    enum="QuicErrorCodes" expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
-    The QUIC error code which resulted in the Google QUIC connection being
-    closed by the server.
+    The QUIC error code which resulted in the QUIC connection being closed by
+    the server.
   </summary>
 </histogram>
 
 <histogram name="Net.QuicSession.ConnectionCloseErrorCodeServerGoogle"
-    enum="QuicErrorCodes" expires_after="2021-05-11">
+    enum="QuicErrorCodes" expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
-    The QUIC error code which resulted in the Google QUIC connection being
-    closed by the server with a name ending in .google.com.
+    The QUIC error code which resulted in the QUIC connection being closed by
+    the a Google server.
   </summary>
 </histogram>
 
 <histogram name="Net.QuicSession.ConnectionCloseErrorCodeServerIetfApplication"
-    enum="QuicHttp3ErrorCodes" expires_after="2021-05-11">
+    enum="QuicHttp3ErrorCodes" expires_after="2021-07-27">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2659,18 +2785,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Net.QuicSession.ConnectionCloseErrorCodeServerIetfApplicationGoogle"
-    enum="QuicHttp3ErrorCodes" expires_after="2021-05-11">
+    enum="QuicHttp3ErrorCodes" expires_after="2021-07-27">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
     The QUIC application transport error code in a CONNECTION_CLOSE frame
-    received from the server with a name ending in .google.com.
+    received from a Google server.
   </summary>
 </histogram>
 
 <histogram
     name="Net.QuicSession.ConnectionCloseErrorCodeServerIetfApplicationGQuicErrorMissing"
-    enum="QuicHttp3ErrorCodes" expires_after="2021-05-11">
+    enum="QuicHttp3ErrorCodes" expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2686,13 +2812,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>src/net/quic/OWNERS</owner>
   <summary>
     The QUIC application transport error code in a CONNECTION_CLOSE frame
-    received from the server with a name ending in .google.com, when the GQUIC
-    error was missing.
+    received from a Google server, when the GQUIC error was missing.
   </summary>
 </histogram>
 
 <histogram name="Net.QuicSession.ConnectionCloseErrorCodeServerIetfTransport"
-    enum="QuicTransportErrorCodes" expires_after="2021-05-11">
+    enum="QuicTransportErrorCodes" expires_after="2021-07-27">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2703,18 +2828,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Net.QuicSession.ConnectionCloseErrorCodeServerIetfTransportGoogle"
-    enum="QuicTransportErrorCodes" expires_after="2021-05-11">
+    enum="QuicTransportErrorCodes" expires_after="2021-07-27">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
     The QUIC application transport error code in a CONNECTION_CLOSE frame
-    received from the server with a name ending in .google.com.
+    received from a Google server.
   </summary>
 </histogram>
 
 <histogram
     name="Net.QuicSession.ConnectionCloseErrorCodeServerIetfTransportGQuicErrorMissing"
-    enum="QuicTransportErrorCodes" expires_after="2021-05-11">
+    enum="QuicTransportErrorCodes" expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2725,18 +2850,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Net.QuicSession.ConnectionCloseErrorCodeServerIetfTransportGQuicErrorMissingGoogle"
-    enum="QuicTransportErrorCodes" expires_after="2021-05-11">
+    enum="QuicTransportErrorCodes" expires_after="2021-07-27">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
     The QUIC application transport error code in a CONNECTION_CLOSE frame
-    received from the server with a name ending in .google.com, when the GQUIC
-    error was missing.
+    received from a Google server, when the GQUIC error was missing.
   </summary>
 </histogram>
 
 <histogram name="Net.QuicSession.ConnectionDuration" units="ms"
-    expires_after="2021-05-11">
+    expires_after="2021-08-01">
   <owner>renjietang@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2753,7 +2877,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.ConnectionFlowControlBlocked"
-    enum="BooleanBlocked" expires_after="2021-05-11">
+    enum="BooleanBlocked" expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2772,7 +2896,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.ConnectionMigration"
-    enum="QuicConnectionMigrationStatus" expires_after="2021-05-11">
+    enum="QuicConnectionMigrationStatus" expires_after="2021-07-27">
   <owner>zhongyi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2782,7 +2906,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.ConnectionMigrationProbeSuccess"
-    enum="BooleanSuccess" expires_after="2021-05-11">
+    enum="BooleanSuccess" expires_after="2021-07-11">
+  <obsolete>
+    The histogram was marked obsolete Jan 2021, in favor of the new histogram
+    Net.QuicConnection.PathValidationSuccess.
+  </obsolete>
   <owner>fayang@chromium.org</owner>
   <owner>zhongyi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
@@ -2806,7 +2934,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.ConnectionTypeFromPeer" enum="AddressFamily"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2844,7 +2972,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.CryptoRetransmitCount.HandshakeConfirmed"
-    units="count" expires_after="2021-05-11">
+    units="count" expires_after="2021-07-11">
   <owner>fayang@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2853,7 +2981,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.CryptoRetransmitCount.HandshakeNotConfirmed"
-    units="count" expires_after="2021-05-11">
+    units="count" expires_after="2021-07-11">
   <owner>fayang@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2882,7 +3010,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.EncryptionEstablishedTime"
-    units="Milliseconds" expires_after="2021-05-11">
+    units="Milliseconds" expires_after="2021-08-09">
   <owner>fayang@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2902,12 +3030,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.FinchConfigIsValid" enum="Boolean"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
     Logged every time we parse a QUIC Finch config, and logs whether the config
-    was valid. Invalid configs are most likely to be obsolete configs.
+    was valid. Invalid configs are most likely to be obsolete configs. Note that
+    this is still logged (as true) when no variations config is present.
   </summary>
 </histogram>
 
@@ -2943,7 +3072,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.GoAwayReceivedForConnectionMigration"
-    enum="BooleanReceived" expires_after="2021-05-11">
+    enum="BooleanReceived" expires_after="2021-07-27">
   <owner>zhongyi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2954,7 +3083,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.HandshakeConfirmedTime" units="Milliseconds"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2964,7 +3093,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.HandshakeStatusOnConnectionMigration"
-    enum="BooleanConfirmed" expires_after="2021-05-11">
+    enum="BooleanConfirmed" expires_after="2021-07-27">
   <owner>zhongyi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -2994,7 +3123,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.HeaderCompressionRatioHpackReceived" units="%"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3003,7 +3132,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.HeaderCompressionRatioHpackSent" units="%"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3012,7 +3141,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.HeaderCompressionRatioQpackReceived" units="%"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3051,7 +3180,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.InitialRttEsitmateSource"
-    enum="InitialRttEstimateSource" expires_after="2021-05-11">
+    enum="InitialRttEstimateSource" expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3075,7 +3204,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.KeyUpdate.PerConnection2" units="count"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>mattm@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3086,7 +3215,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.KeyUpdate.PotentialPeerKeyUpdateAttemptCount"
-    units="count" expires_after="2021-05-11">
+    units="count" expires_after="2021-07-11">
   <owner>mattm@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3122,7 +3251,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.KeyUpdate.Supported"
-    enum="QuicKeyUpdateSupported" expires_after="2021-05-11">
+    enum="QuicKeyUpdateSupported" expires_after="2021-07-11">
   <owner>mattm@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3134,7 +3263,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Net.QuicSession.LastInFlightPacketSentTimeFromHandshakeCompletionWithPublicReset"
-    units="ms" expires_after="2021-05-11">
+    units="ms" expires_after="2021-08-09">
   <owner>fayang@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3144,7 +3273,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.LastSentPacketContentBeforePublicReset"
-    units="bitfield value" expires_after="2021-05-11">
+    units="bitfield value" expires_after="2021-08-09">
   <owner>fayang@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3164,7 +3293,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Net.QuicSession.MaxConsecutiveRtoWithForwardProgressAndBlackholeDetected"
-    units="count" expires_after="2021-05-11">
+    units="count" expires_after="2021-07-27">
   <owner>fayang@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3174,7 +3303,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.MaxReordering" units="units"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3192,7 +3321,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.MaxReorderingTimeLongRtt" units="%"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3211,7 +3340,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Net.QuicSession.MinRTT" units="ms" expires_after="2021-05-11">
+<histogram name="Net.QuicSession.MinRTT" units="ms" expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3230,7 +3359,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.NumActiveStreamsOnIdleTimeout" units="streams"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>renjietang@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3266,7 +3395,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.NumPendingStreamRequests"
-    units="stream requests" expires_after="2021-05-11">
+    units="stream requests" expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3277,7 +3406,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.NumPingsSent" units="pings"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>renjietang@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3286,7 +3415,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.NumStreamsWaitingToWriteOnIdleTimeout"
-    units="streams" expires_after="2021-05-11">
+    units="streams" expires_after="2021-07-11">
   <owner>renjietang@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3296,7 +3425,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.NumTotalStreams" units="units"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3349,7 +3478,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.PacketGapReceivedNearPing" units="count"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>zhongyi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3370,7 +3499,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.PacketLossRate" units="1/10th Percent"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3380,7 +3509,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.PacketRetransmitsPerMille" units="permille"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3400,8 +3529,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Net.QuicSession.PathValidationSuccess" enum="BooleanSuccess"
+    expires_after="2021-07-11">
+  <owner>renjietang@chromium.org</owner>
+  <owner>src/net/quic/OWNERS</owner>
+  <summary>
+    The result of path validation according to different migration causes.
+  </summary>
+</histogram>
+
 <histogram name="Net.QuicSession.PendingStreamsWaitTime" units="ms"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3421,7 +3559,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.PortMigration"
-    enum="QuicConnectionMigrationStatus" expires_after="2021-05-11">
+    enum="QuicConnectionMigrationStatus" expires_after="2021-07-11">
   <owner>zhongyi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>The result of a QUIC port migration attempt.</summary>
@@ -3469,7 +3607,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.Pushed" units="count"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3478,7 +3616,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.PushedAndClaimed" units="count"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3487,7 +3625,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.PushedAndUnclaimedBytes" units="count"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>zhongyi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3496,7 +3634,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.PushedBytes" units="count"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>zhongyi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3548,14 +3686,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.QuicVersion" units="units"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>Version of the QUIC protocol used for this connection.</summary>
 </histogram>
 
 <histogram name="Net.QuicSession.ReadError" enum="NetErrorCodes"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3565,7 +3703,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.ReadError.CurrentNetwork.HandshakeConfirmed"
-    enum="NetErrorCodes" expires_after="2021-05-11">
+    enum="NetErrorCodes" expires_after="2021-07-11">
   <owner>zhongyi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3575,7 +3713,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.ReceivedSettings.BlockedStreams" units="units"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3585,7 +3723,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.ReceivedSettings.CountPlusOne" units="units"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3595,7 +3733,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.ReceivedSettings.MaxHeaderListSize2"
-    units="bytes" expires_after="2021-05-11">
+    units="bytes" expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3605,7 +3743,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.ReceivedSettings.MaxTableCapacity2"
-    units="bytes" expires_after="2021-05-11">
+    units="bytes" expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3615,7 +3753,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.ReceivedSettings.ReservedCountPlusOne"
-    units="units" expires_after="2021-05-11">
+    units="units" expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3669,7 +3807,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.RstStreamErrorCodeServer"
-    enum="QuicRstStreamErrorCodes" expires_after="2021-05-11">
+    enum="QuicRstStreamErrorCodes" expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3700,7 +3838,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.SendPacketSize" units="bytes"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>zhongyi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3720,7 +3858,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.SmoothedRTT" units="ms"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3774,8 +3912,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Net.QuicSession.StopSendingErrorCodeClient"
+    enum="QuicRstStreamErrorCodes" expires_after="2021-05-11">
+  <owner>dschinazi@chromium.org</owner>
+  <owner>src/net/quic/OWNERS</owner>
+  <summary>The QUIC error code that we sent in a STOP_SENDING frame.</summary>
+</histogram>
+
+<histogram name="Net.QuicSession.StopSendingErrorCodeServer"
+    enum="QuicRstStreamErrorCodes" expires_after="2021-05-11">
+  <owner>dschinazi@chromium.org</owner>
+  <owner>src/net/quic/OWNERS</owner>
+  <summary>
+    The QUIC error code that we received in a STOP_SENDING frame.
+  </summary>
+</histogram>
+
 <histogram name="Net.QuicSession.StreamCloseErrorCodeClient.HandshakeConfirmed"
-    enum="QuicErrorCodes" expires_after="2021-05-11">
+    enum="QuicErrorCodes" expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3785,7 +3939,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.StreamCloseErrorCodeServer.HandshakeConfirmed"
-    enum="QuicErrorCodes" expires_after="2021-05-11">
+    enum="QuicErrorCodes" expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3795,7 +3949,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.StreamFlowControlBlocked"
-    enum="BooleanBlocked" expires_after="2021-05-11">
+    enum="BooleanBlocked" expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3867,7 +4021,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.TimedOutWithOpenStreams.HasUnackedPackets"
-    units="units" expires_after="2021-05-11">
+    units="units" expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3887,7 +4041,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.TimeFromResolveHostToConfirmConnection"
-    units="Milliseconds" expires_after="2021-05-11">
+    units="Milliseconds" expires_after="2021-08-01">
   <owner>renjietang@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3917,7 +4071,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.UndecryptablePacketsReceived" units="units"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3927,7 +4081,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.UndecryptablePacketsReceivedWithDecrypter"
-    units="units" expires_after="2021-05-11">
+    units="units" expires_after="2021-07-11">
   <owner>mattm@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3939,6 +4093,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Net.QuicSession.UnexpectedNotGoingAway"
     enum="QuicSessionLocations" expires_after="2021-05-11">
+  <obsolete>
+    This histogram was removed in Feb 2021, because the corresponded crash has
+    been fixed.
+  </obsolete>
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3949,6 +4107,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Net.QuicSession.UnexpectedObservers"
     enum="QuicSessionLocations" expires_after="2021-05-11">
+  <obsolete>
+    This histogram was removed in Feb 2021, because the corresponded crash has
+    been fixed.
+  </obsolete>
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3959,6 +4121,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Net.QuicSession.UnexpectedOpenStreams"
     enum="QuicSessionLocations" expires_after="2021-05-11">
+  <obsolete>
+    This histogram was removed in Feb 2021, because the corresponded crash has
+    been fixed.
+  </obsolete>
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3980,7 +4146,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.VerifyProofTime" units="ms"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -3991,7 +4157,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.WriteError" enum="NetErrorCodes"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -4001,7 +4167,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.WriteError.HandshakeConfirmed"
-    enum="NetErrorCodes" expires_after="2021-05-11">
+    enum="NetErrorCodes" expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -4031,7 +4197,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.ZeroRttReason"
-    enum="SSLHandshakeEarlyDataReason" expires_after="2021-05-11">
+    enum="SSLHandshakeEarlyDataReason" expires_after="2021-07-11">
   <owner>nharper@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -4041,7 +4207,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.ZeroRttReasonGoogle"
-    enum="SSLHandshakeEarlyDataReason" expires_after="2021-05-11">
+    enum="SSLHandshakeEarlyDataReason" expires_after="2021-07-11">
   <owner>renjietang@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -4052,7 +4218,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.ZeroRttReasonNonGoogle"
-    enum="SSLHandshakeEarlyDataReason" expires_after="2021-05-11">
+    enum="SSLHandshakeEarlyDataReason" expires_after="2021-07-11">
   <owner>renjietang@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -4063,7 +4229,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicSession.ZeroRttState" enum="ZeroRttState"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>renjietang@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>Whether 0-RTT was successfully used in the connection.</summary>
@@ -4134,6 +4300,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Net.QuicStreamFactory.DoConnectFailureLocation"
+    enum="JobProtocolErrorLocation" expires_after="2022-02-09">
+  <owner>renjietang@chromium.org</owner>
+  <owner>src/net/quic/OWNERS</owner>
+  <summary>
+    Log the location in QuicStreamFactory where QUIC_PROTOCOL_ERROR is reported.
+  </summary>
+</histogram>
+
 <histogram
     name="Net.QuicStreamFactory.MigrationBeforeHandshake.NewConnectionType"
     enum="NetworkConnectionType" expires_after="2021-05-11">
@@ -4233,7 +4408,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicTransportClient.ConnectionError" enum="NetErrorCodes"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>vasilvv@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>
@@ -4243,7 +4418,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.QuicTransportClient.Error" enum="NetErrorCodes"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>vasilvv@chromium.org</owner>
   <owner>src/net/quic/OWNERS</owner>
   <summary>The code for QuicTransport errors.</summary>
@@ -4306,7 +4481,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.RestrictedCookieManager.SiteForCookiesOK" enum="Boolean"
-    expires_after="M87">
+    expires_after="M95">
   <owner>morlovich@chromium.org</owner>
   <owner>chlily@chromium.org</owner>
   <summary>
@@ -4316,7 +4491,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.RestrictedCookieManager.TopFrameOriginOK" enum="Boolean"
-    expires_after="M87">
+    expires_after="M95">
   <owner>morlovich@chromium.org</owner>
   <owner>chlily@chromium.org</owner>
   <summary>
@@ -4339,7 +4514,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.SameSiteBlockedCookieSiteEngagement.CookieNoSameSite"
-    enum="SiteEngagementLevel" expires_after="2021-03-15">
+    enum="SiteEngagementLevel" expires_after="2021-07-18">
   <owner>chlily@chromium.org</owner>
   <owner>morlovich@chromium.org</owner>
   <summary>
@@ -4349,6 +4524,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Net.SiteDomainIsSafe" enum="Boolean" expires_after="M95">
+  <owner>mmenke@chromium.org</owner>
+  <owner>src/net/OWNERS</owner>
+  <summary>
+    Whether the origin passed to SchemefulSite's constructor is safe or not.
+    &quot;Unsafe&quot; sites have an eTLD+1 that is not a canonical hostname.
+    e.g., &quot;http://foo.127.1/&quot; has an eTLD+1 of &quot;127.1&quot;, but
+    the canonical form of &quot;http://127.1&quot; is
+    &quot;http://127.0.0.1&quot;. Logged for all origins with network hosts
+    (http, https, ws, etc). See https://crbug.com/1157010.
+  </summary>
+</histogram>
+
 <histogram name="Net.SocketUnchangeableReceiveBuffer" units="Bytes"
     expires_after="2021-05-11">
   <owner>dschinazi@chromium.org</owner>
@@ -4370,7 +4558,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.SpdyFrameStreamAndSessionFlowControlState"
-    enum="SpdyFrameFlowControlState" expires_after="2021-05-11">
+    enum="SpdyFrameFlowControlState" expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -4410,7 +4598,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.SpdyPushedStreamFate" enum="SpdyPushedStreamFate"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -4431,12 +4619,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.SpdySession.ClosedOnError" enum="NetErrorCodes"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
-  <summary>
-    Net error codes when SpdySession was closed, doesn't inlcuding net::OK.
-  </summary>
+  <summary>Net error codes when SpdySession was closed.</summary>
 </histogram>
 
 <histogram name="Net.SpdySession.CreateStreamWithSocketConnected"
@@ -4447,7 +4633,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.SpdySession.PushedAndUnclaimedBytes" units="count"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>zhongyi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -4456,7 +4642,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.SpdySession.PushedBytes" units="count"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>zhongyi@chromium.org</owner>
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
@@ -4475,14 +4661,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.SpdySessionErrorDetails2" enum="SpdyProtocolErrorDetails2"
-    expires_after="2021-05-11">
+    expires_after="2021-07-27">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>The type of SPDY Protocol error encountered.</summary>
 </histogram>
 
 <histogram name="Net.SpdySessionErrorDetails_Google2"
-    enum="SpdyProtocolErrorDetails2" expires_after="2021-05-11">
+    enum="SpdyProtocolErrorDetails2" expires_after="2021-07-27">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -4512,7 +4698,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.SpdyStreamsAbandonedPerSession" units="units"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -4521,14 +4707,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.SpdyStreamsPerSession" units="units"
-    expires_after="2021-05-11">
+    expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>The number of streams issued over a single session.</summary>
 </histogram>
 
 <histogram name="Net.SpdyStreamsPushedAndClaimedPerSession" units="units"
-    expires_after="2021-05-11">
+    expires_after="2021-07-11">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -4615,7 +4801,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.SSLHandshakeDetails" enum="SSLHandshakeDetails"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>davidben@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -4627,7 +4813,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.SSLHandshakeEarlyDataReason"
-    enum="SSLHandshakeEarlyDataReason" expires_after="2021-06-01">
+    enum="SSLHandshakeEarlyDataReason" expires_after="2021-08-09">
   <owner>davidben@chromium.org</owner>
   <owner>svaldez@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
@@ -4649,7 +4835,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.SSLLegacyCryptoFallback" enum="SSLLegacyCryptoFallback"
-    expires_after="2021-05-09">
+    expires_after="2021-07-27">
   <owner>davidben@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -4665,7 +4851,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.SSLNegotiatedAlpnProtocol"
-    enum="SSLNegotiatedAlpnProtocol" expires_after="2021-05-11">
+    enum="SSLNegotiatedAlpnProtocol" expires_after="2021-08-01">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -4675,7 +4861,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.SSLRSAKeyUsage.UnknownRoot" enum="RSAKeyUsage"
-    expires_after="2021-06-01">
+    expires_after="2021-08-09">
   <owner>davidben@chromium.org</owner>
   <summary>
     For each TLS connection which uses a unknown root, an RSA key, and TLS 1.2
@@ -4708,7 +4894,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.SSLVersionGoogle" enum="SSLOrQUICVersion"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>davidben@chromium.org</owner>
   <owner>rsleevi@chromium.org</owner>
   <summary>
@@ -4772,7 +4958,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.TcpConnectAttempt.Latency.Error" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>eroman@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -4783,7 +4969,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.TcpConnectAttempt.Latency.Success" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>eroman@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -4793,7 +4979,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.TcpConnectAttempt.LatencyPercentRTT.Error" units="%"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>eroman@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -4806,7 +4992,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.TcpConnectAttempt.LatencyPercentRTT.Success" units="%"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>eroman@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -4828,6 +5014,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram base="true" name="Net.TrustTokens.FetchFailedReason"
     enum="FetchFailedReasonOrResourceRequestBlockedReason"
     expires_after="2021-03-30">
+  <obsolete>
+    This was a temporary addition used for debugging during M88.
+  </obsolete>
 <!-- Name completed by histogram_suffixes name="TrustTokenOperationType" -->
 
   <owner>davidvc@chromium.org</owner>
@@ -4840,8 +5029,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Net.TrustTokens.IssuanceHelperLocalFulfillResult"
+    enum="FulfillTrustTokenIssuanceAnswerStatus" expires_after="2021-07-30">
+  <owner>davidvc@chromium.org</owner>
+  <owner>privacy-sandbox-dev@chromium.org</owner>
+  <summary>
+    For locally diverted platform-provided trust token issuance requests, the
+    results of the LocalOperationDelegate issuance delegation call. This is a
+    liveness metric that allows verifying that platform-provided trust token
+    issuance is working during the feature's initial rollout (and, if it isn't,
+    that helps debug the failures).
+  </summary>
+</histogram>
+
 <histogram base="true" name="Net.TrustTokens.NetErrorForFetchFailure"
-    enum="NetErrorCodes" expires_after="2021-03-30">
+    enum="NetErrorCodes" expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="TrustTokenOperationType" -->
 
   <owner>davidvc@chromium.org</owner>
@@ -4849,13 +5051,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>privacy-sandbox-dev@chromium.org</owner>
   <summary>
     The net error for a failed Fetch API call with an associated Trust Tokens
-    operation. This might help debug a surfeit of 'TypeError: failed to fetch'
-    observed in live testing.
+    operation. This was originally added to help debug a surfeit of 'TypeError:
+    failed to fetch' observed in live testing, and it is now retained since it's
+    useful for ongoing health monitoring.
   </summary>
 </histogram>
 
 <histogram base="true" name="Net.TrustTokens.NetErrorForTrustTokenOperation"
-    enum="NetErrorCodes" expires_after="2021-03-30">
+    enum="NetErrorCodes" expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="TrustTokenOperationType" -->
 
   <owner>davidvc@chromium.org</owner>
@@ -4868,58 +5071,47 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram base="true" name="Net.TrustTokens.OperationBeginTime" units="ms"
-    expires_after="2021-03-30">
-<!-- Name completed by histogram_suffixes name="TrustTokenOperationType" -->
-
-  <owner>davidvc@chromium.org</owner>
-  <owner>privacy-sandbox-dev@chromium.org</owner>
-  <summary>
-    Time taken to execute a Trust Tokens operation's outbound Begin half (see
-    network::TrustTokenRequestHelper).
-  </summary>
-</histogram>
-
-<histogram base="true" name="Net.TrustTokens.OperationFinalizeTime" units="ms"
-    expires_after="2021-03-30">
-<!-- Name completed by histogram_suffixes name="TrustTokenOperationType" -->
-
-  <owner>davidvc@chromium.org</owner>
-  <owner>privacy-sandbox-dev@chromium.org</owner>
-  <summary>
-    Time time to taken a Trust Tokens operation's inbound Finalize half (see
-    network::TrustTokenRequestHelper).
-  </summary>
-</histogram>
-
-<histogram base="true" name="Net.TrustTokens.OperationServerTime" units="ms"
-    expires_after="2021-03-30">
-<!-- Name completed by histogram_suffixes name="TrustTokenOperationType" -->
-
-  <owner>davidvc@chromium.org</owner>
-  <owner>privacy-sandbox-dev@chromium.org</owner>
-  <summary>
-    Time between finishing a Trust Tokens Tokens operation's outbound Begin half
-    and beginning its inbound Finalize half (see
-    network::TrustTokenRequestHelper).
-  </summary>
-</histogram>
-
-<histogram base="true" name="Net.TrustTokens.OperationTotalTime" units="ms"
-    expires_after="2021-03-30">
-<!-- Name completed by histogram_suffixes name="TrustTokenOperationType" -->
-
+<histogram base="true"
+    name="Net.TrustTokens.Operation{TimeSpan}Time.{Outcome}.{Type}{OptionalPlatformProvided}"
+    units="ms" expires_after="2021-07-30">
   <owner>davidvc@chromium.org</owner>
   <owner>privacy-sandbox-dev@chromium.org</owner>
   <summary>
-    Time elapsed from the beginning of a Trust Tokens operation's outbound Begin
-    half to the end of its inbound Finalize half (see
-    network::TrustTokenRequestHelper), when the operation succeeded overall.
-  </summary>
+    Time taken to execute various parts of a Trust Tokens operation: 1. Begin =
+    time taken to execute the operation's outbound Begin half 2. Server = time
+    from the end of the outbound Begin half to the beginning of the inbound
+    Finalize half 3. Finalize = time taken to execute the inbound Finalize half
+    4. Total = Begin + Server + Finalize (only recorded for operations that see
+    server responses)
+
+    The other variants (see histogram_suffixes_list's TrustTokenOperationType
+    entry): 1. Outcome (Success or Failure) 2. The type of Trust Tokens
+    operation 3. Whether the operation was platform-provided (i.e. executed by a
+    method other than a direct HTTP request to the issuer's server)
+  </summary>
+  <token key="TimeSpan">
+    <variant name="Begin"/>
+    <variant name="Finalize"/>
+    <variant name="Server"/>
+    <variant name="Total"/>
+  </token>
+  <token key="Outcome">
+    <variant name="Failure"/>
+    <variant name="Success"/>
+  </token>
+  <token key="Type">
+    <variant name="Issuance"/>
+    <variant name="Redemption"/>
+    <variant name="Signing"/>
+  </token>
+  <token key="OptionalPlatformProvided">
+    <variant name=""/>
+    <variant name=".PlatformProvided"/>
+  </token>
 </histogram>
 
 <histogram base="true" name="Net.TrustTokens.RequestHelperFactoryOutcome"
-    enum="TrustTokenRequestHelperFactoryOutcome" expires_after="2021-03-30">
+    enum="TrustTokenRequestHelperFactoryOutcome" expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="TrustTokenOperationType" -->
 
   <owner>davidvc@chromium.org</owner>
@@ -4950,14 +5142,36 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>Chromium error code from call to RandomBind() UDP socket.</summary>
 </histogram>
 
-<histogram name="Net.UDPSocketWinClose" units="ms" expires_after="2021-05-11">
+<histogram name="Net.UDPSocketWinClose" units="ms" expires_after="2021-08-09">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>The time spent in closesocket call in UDPSocketWin::Close.</summary>
 </histogram>
 
+<histogram name="Net.URLLoaderThrottleDeferTime.{Stage}" units="ms"
+    expires_after="2022-03-14">
+  <owner>cduvall@chromium.org</owner>
+  <owner>jam@chromium.org</owner>
+  <summary>
+    Measures time a URLLoaderThrottle was deferred when on {Stage}. Logged every
+    time a throttle defers a request.
+  </summary>
+  <token key="Stage" variants="URLLoaderThrottleStages"/>
+</histogram>
+
+<histogram name="Net.URLLoaderThrottleExecutionTime.{Stage}" units="ms"
+    expires_after="2022-03-14">
+  <owner>cduvall@chromium.org</owner>
+  <owner>jam@chromium.org</owner>
+  <summary>
+    Measures time a URLLoaderThrottle took to execute {Stage}. Logged every time
+    a throttle runs.
+  </summary>
+  <token key="Stage" variants="URLLoaderThrottleStages"/>
+</histogram>
+
 <histogram name="Net.URLRequest.ReferrerHasInformativePath"
-    enum="BooleanPathIsInformative" expires_after="2021-05-02">
+    enum="BooleanPathIsInformative" expires_after="2021-07-04">
 <!-- Name completed by histogram_suffixes name="ReferrerPolicySameOrigin" -->
 
   <owner>davidvc@chromium.org</owner>
@@ -4971,7 +5185,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.URLRequest.ReferrerPolicyForRequest"
-    enum="URLRequestReferrerPolicy" expires_after="2021-05-02">
+    enum="URLRequestReferrerPolicy" expires_after="2021-07-04">
 <!-- Name completed by histogram_suffixes name="ReferrerPolicySameOrigin" -->
 
   <owner>davidvc@chromium.org</owner>
@@ -4993,7 +5207,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Net.WebSocket.CloseCode" enum="WebSocketCloseCode"
-    expires_after="2020-12-01">
+    expires_after="2021-07-01">
   <owner>ricea@chromium.org</owner>
   <owner>yhirano@chromium.org</owner>
   <owner>yoichio@chromium.org</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/network/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/network/histograms.xml
index 7e2fff5b4d7..81c1c7d1db8 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/network/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/network/histograms.xml
@@ -22,14 +22,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="Network.3G.Gobi.Activation" units="ms" expires_after="M85">
+  <obsolete>
+    Removed 12/2020
+  </obsolete>
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <summary>The time the Gobi modem takes to complete activation.</summary>
 </histogram>
 
 <histogram name="Network.3G.Gobi.Connect" units="ms" expires_after="2019-12-31">
+  <obsolete>
+    Removed 12/2020
+  </obsolete>
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <summary>
     The time the Gobi modem takes to connect to the cellular network.
   </summary>
@@ -37,8 +41,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.3G.Gobi.Disconnect" units="ms"
     expires_after="2019-12-31">
+  <obsolete>
+    Removed 12/2020
+  </obsolete>
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <summary>
     The time the Gobi modem takes to disconnect from the cellular network.
   </summary>
@@ -46,22 +52,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.3G.Gobi.FirmwareDownload.Attempts" units="units"
     expires_after="M85">
+  <obsolete>
+    Removed 12/2020
+  </obsolete>
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <summary>Number of attempts taken to install Gobi firmware.</summary>
 </histogram>
 
 <histogram name="Network.3G.Gobi.FirmwareDownload.Time" units="ms"
     expires_after="M85">
+  <obsolete>
+    Removed 12/2020
+  </obsolete>
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <summary>The time it takes to install Gobi firmware.</summary>
 </histogram>
 
 <histogram name="Network.3G.Gobi.Registration" units="ms"
     expires_after="2019-12-31">
+  <obsolete>
+    Removed 12/2020
+  </obsolete>
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <summary>
     The time the Gobi modem takes to register on the cellular network.
   </summary>
@@ -69,8 +81,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.3G.Gobi.SetPower" enum="Network3GGobiError"
     expires_after="2019-12-31">
+  <obsolete>
+    Removed 12/2020
+  </obsolete>
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <summary>Errors experienced during Gobi device powerup.</summary>
 </histogram>
 
@@ -97,15 +111,59 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Cellular.Connection.TimeToConnected" units="ms"
     expires_after="2021-06-30">
   <owner>azeemarshad@chromium.org</owner>
-  <owner>cros-system-services-networking@google.com</owner>
+  <owner>cros-connectivity@google.com</owner>
   <summary>
     Tracks the amount fo time taken between when cellular device starts and
     finishes connecting.
   </summary>
 </histogram>
 
+<histogram name="Network.Cellular.ESim.ServiceAtLogin.Count" units="units"
+    expires_after="2022-03-01">
+  <owner>azeemarshad@chromium.org</owner>
+  <owner>cros-connectivit@google.com</owner>
+  <summary>
+    Tracks how many eSIM profiles are installed on the devices after a primary
+    user login.
+  </summary>
+</histogram>
+
+<histogram name="Network.Cellular.ESim.Usage.Count" enum="NetworkCellularUsage"
+    expires_after="2022-03-01">
+  <owner>azeemarshad@chromium.org</owner>
+  <owner>cros-connectivity@google.com</owner>
+  <summary>
+    Tracks the number of times a ESim cellular network is connected as the only
+    network, or with other network or not connected at all.
+  </summary>
+</histogram>
+
+<histogram name="Network.Cellular.PSim.ServiceAtLogin.Count" units="units"
+    expires_after="2022-03-01">
+  <owner>azeemarshad@chromium.org</owner>
+  <owner>cros-system-services-networking@google.com</owner>
+  <summary>
+    Tracks how many pSIM networks are available on the device after a primary
+    user login.
+  </summary>
+</histogram>
+
+<histogram name="Network.Cellular.PSim.Usage.Count" enum="NetworkCellularUsage"
+    expires_after="2022-03-01">
+  <owner>azeemarshad@chromium.org</owner>
+  <owner>cros-connectivity@google.com</owner>
+  <summary>
+    Tracks the number of times an PSim cellular network is connected as the only
+    network, or with other network or not connected at all.
+  </summary>
+</histogram>
+
 <histogram name="Network.Cellular.Usage.Count" enum="NetworkCellularUsage"
     expires_after="2021-06-30">
+  <obsolete>
+    Split into Network.Cellular.PSim.Usage.Count and
+    Network.Cellular.ESim.Usage.Count on 2/2021 in M91.
+  </obsolete>
   <owner>azeemarshad@chromium.org</owner>
   <owner>cros-system-services-networking@google.com</owner>
   <summary>
@@ -117,8 +175,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.Cellular.3GPPRegistrationDelayedDrop"
     enum="NetworkCellular3GPPRegistrationDelayedDrop"
     expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network diagnostic metric sampling the number of cellular network
@@ -129,8 +186,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.AutoConnectTotalTime" units="ms"
     expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network diagnostic metric sampling the total amount of time spent
@@ -141,8 +197,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.AutoConnectTries" units="units"
     expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network diagnostic metric sampling the number of auto-connect
@@ -153,8 +208,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.DevicePresenceStatus"
     enum="BooleanPresent" expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network metric that tracks the presence of a Cellular device in
@@ -164,8 +218,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.Disconnect"
     enum="NetworkDisconnectType" expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network usage metric that tracks whether the cellular network was
@@ -175,8 +228,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.Drop" enum="NetworkCellularTechnology"
     expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS cellular network metric that tracks the number of drops based on
@@ -186,8 +238,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.ExpiredLeaseLengthSeconds2"
     units="seconds" expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric that tracks the length of a lease for a
@@ -198,8 +249,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.IPv6ConnectivityStatus"
     enum="IPv6ConnectivityStatus" expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network metric that tracks the presence of complete IPv6
@@ -209,8 +259,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.NetworkConnectionIPType"
     enum="NetworkConnectionIPType" expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network metric that tracks the types of IP configuration used for
@@ -220,8 +269,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.OutOfCreditsReason"
     enum="NetworkCellularOutOfCreditsReason" expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS cellular network metric that tracks the number of out-of-credits
@@ -231,8 +279,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.PortalAttempts" units="units"
     expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network diagnostic metric sampling the number of portal detection
@@ -243,8 +290,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.PortalAttemptsToOnline" units="units"
     expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network diagnostic metric sampling the total number of portal
@@ -255,8 +301,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.PortalResult"
     enum="NetworkPortalResult" expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network diagnostic metric sampling the result of portal detections
@@ -275,8 +320,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.SignalStrengthBeforeDrop" units="units"
     expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network metric sampling the signal strength (0-100) of the
@@ -286,8 +330,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.TimeOnline" units="seconds"
     expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network metric sampling the time spent using cellular to transport
@@ -298,8 +341,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.TimeToConfig" units="ms"
     expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric sampling the time to join a cellular
@@ -309,8 +351,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.TimeToConnect" units="ms"
     expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric sampling the time to connect a cellular
@@ -320,8 +361,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.TimeToDisable" units="ms"
     expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric sampling the time to disable a cellular
@@ -331,8 +371,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.TimeToEnable" units="ms"
     expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric sampling the time to enable a cellular
@@ -342,8 +381,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.TimeToInitialize" units="ms"
     expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric sampling the time to initialize a
@@ -353,8 +391,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.TimeToOnline" units="ms"
     expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric sampling the time to determine that a
@@ -364,8 +401,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.TimeToPortal" units="ms"
     expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric sampling the time to determine that a
@@ -374,9 +410,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Network.Shill.Cellular.TimeToRedirectFound" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2021-12-01">
   <owner>matthewmwang@chromium.org</owner>
   <owner>hugobenichi@chromium.org</owner>
+  <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric sampling the time to determine that a
     cellular network is in a captive portal with a valid redirect URL after
@@ -386,8 +423,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.Cellular.TimeToScan" units="ms"
     expires_after="2021-12-01">
-  <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>ejcaruso@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric sampling the time to scan a cellular
@@ -396,9 +432,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Network.Shill.ConnectionDiagnosticsIssue"
-    enum="ConnectionDiagnosticsIssue" expires_after="M85">
+    enum="ConnectionDiagnosticsIssue" expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network metric that tracks the connectivity issue diagnosed by the
     ConnectionDiagnostics class in Shill. This metric is logged each time a
@@ -408,9 +444,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Network.Shill.CorruptedProfile" enum="NetworkCorruptedProfile"
-    expires_after="M78">
+    expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
+  <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS cellular network metric that tracks the number of corrupted
     profiles encountered by Shill.
@@ -500,7 +536,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     enum="ShillSuspendTerminationDarkResumeActionResult"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network diagnostic metric sampling the number of dark resume
@@ -511,7 +546,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.DarkResumeActionsTimeTaken" units="ms"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network diagnostic metric sampling the time in milliseconds it
@@ -522,7 +556,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.DarkResumeScanNumRetries" units="units"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network metric sampling the number of times a dark resume scan is
@@ -533,7 +566,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.DarkResumeScanRetryResult"
     enum="DarkResumeScanRetryResult" expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network metric that tracks whether dark resume scan retries led to
@@ -546,7 +578,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.DeviceConnectionStatus" enum="ConnectionStatus"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric that tracks the connection status of
@@ -557,7 +588,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.DeviceRemovedEvent" enum="DeviceTechnologyType"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network metric that tracks the network device removed events for
@@ -568,7 +598,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.DHCPClientMTUValue" units="bytes"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network diagnostic metric sampling the MTU value proposed by the
@@ -580,7 +609,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.DHCPClientStatus" enum="NetworkDhcpClientStatus"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network diagnostic metric sampling the current state of the DHCP
@@ -591,7 +619,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.DHCPOptionFailureDetected"
     enum="NetworkTechnology" expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network metric that tracks the number of DHCP option failures
@@ -604,7 +631,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.Ethernet.DevicePresenceStatus"
     enum="BooleanPresent" expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network metric that tracks the presence of an Ethernet device in
@@ -615,7 +641,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.Ethernet.Disconnect"
     enum="NetworkDisconnectType" expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network usage metric that tracks whether the Ethernet network was
@@ -626,7 +651,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.Ethernet.ExpiredLeaseLengthSeconds2"
     units="seconds" expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric that tracks the length of a lease for
@@ -638,7 +662,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.Ethernet.LinkMonitorBroadcastErrorsAtFailure"
     units="units" expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric that tracks the number of LinkMonitor
@@ -650,7 +673,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.Ethernet.LinkMonitorFailure"
     enum="LinkMonitorFailureType" expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS metric that signals the type of failure the LinkMonitor
@@ -661,7 +683,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.Ethernet.LinkMonitorResponseTimeSample"
     units="ms" expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric that tracks the number of milliseconds
@@ -672,7 +693,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.Ethernet.LinkMonitorSecondsToFailure"
     units="seconds" expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric that tracks the number of seconds from
@@ -683,7 +703,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.Ethernet.LinkMonitorUnicastErrorsAtFailure"
     units="units" expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric that tracks the number of LinkMonitor
@@ -695,7 +714,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.Ethernet.PortalAttempts" units="units"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network diagnostic metric sampling the number of portal detection
@@ -707,7 +725,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.Ethernet.PortalAttemptsToOnline" units="units"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network diagnostic metric sampling the total number of portal
@@ -719,7 +736,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.Ethernet.PortalResult"
     enum="NetworkPortalResult" expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network diagnostic metric sampling the result of portal detections
@@ -739,7 +755,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.Ethernet.TimeOnline" units="seconds"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network metric sampling the time spent using Ethernet to transport
@@ -751,7 +766,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.Ethernet.TimeToConfig" units="ms"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric sampling the time to join a wired
@@ -763,7 +777,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.Ethernet.TimeToInitialize" units="ms"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric sampling the time to initialize an
@@ -774,7 +787,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.Ethernet.TimeToOnline" units="ms"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric sampling the time to determine that an
@@ -785,7 +797,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.Ethernet.TimeToPortal" units="ms"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric sampling the time to determine that an
@@ -794,9 +805,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Network.Shill.Ethernet.TimeToRedirectFound" units="ms"
-    expires_after="2020-12-31">
+    expires_after="2021-12-01">
   <owner>matthewmwang@chromium.org</owner>
   <owner>hugobenichi@chromium.org</owner>
+  <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network performance metric sampling the time to determine that an
     Ethernet network is in a captive portal with a valid redirect URL after
@@ -894,7 +906,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.ServiceErrors" enum="NetworkServiceError"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS connection manager service errors across all technologies.
@@ -904,7 +915,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.ServicesOnSameNetwork" units="units"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network metric sampling the number of services that are connected
@@ -916,7 +926,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     enum="ShillSuspendTerminationDarkResumeActionResult"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network diagnostic metric sampling the number of suspend actions
@@ -938,7 +947,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     enum="ShillSuspendTerminationDarkResumeActionResult"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network diagnostic metric sampling the number of termination
@@ -950,7 +958,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.TerminationActionsTimeTaken" units="ms"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network diagnostic metric sampling the time in milliseconds it
@@ -961,7 +968,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Network.Shill.TimeToDrop" units="seconds"
     expires_after="2021-12-01">
   <owner>stevenjb@chromium.org</owner>
-  <owner>benchan@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
     Chrome OS network stability metric sampling the time in seconds between the
@@ -1363,6 +1369,38 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Network.Shill.Wifi.LinkMonitorsDetectionTimeDiff.ArpBetter"
+    units="ms" expires_after="M91">
+  <owner>jiejiang@chromium.org</owner>
+  <owner>cros-network-metrics@google.com</owner>
+  <summary>
+    Chrome OS metric that tracks the number of milliseconds between the
+    detection times for the same failure of NeighborLinkMonitor and
+    shill::LinkMonitor. Recorded after either of the link monitor detects an
+    error. The larger this value is, the better shill::LinkMonitor performs than
+    NeighborLinkMonitor. 0 means shill::LinkMonitor is no better than
+    NeighborLinkMonitor. If shill::LinkMonitor detects a failure but
+    NeighborLinkMonitor does not, the maximum value of a timeout will be
+    emitted.
+  </summary>
+</histogram>
+
+<histogram
+    name="Network.Shill.Wifi.LinkMonitorsDetectionTimeDiff.NeighborBetter"
+    units="ms" expires_after="2021-07-27">
+  <owner>jiejiang@chromium.org</owner>
+  <owner>cros-network-metrics@google.com</owner>
+  <summary>
+    Chrome OS metric that tracks the number of milliseconds between the
+    detection times for the same failure of patchpanel::NeighborLinkMonitor and
+    shill::LinkMonitor. Recorded after either of the link monitor detects an
+    error. The larger this value is, the better NeighborLinkMonitor performs
+    than shill::LinkMonitor. 0 means NeighborLinkMonitor is no better than
+    shill::LinkMonitor. If NeighborLinkMonitor detects a failure but
+    shill::LinkMonitor does not, the maxmium value of a timeout will be emitted.
+  </summary>
+</histogram>
+
 <histogram name="Network.Shill.Wifi.LinkMonitorSecondsToFailure"
     units="seconds" expires_after="2021-12-01">
   <owner>briannorris@chromium.org</owner>
@@ -1384,6 +1422,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Network.Shill.Wifi.NeighborLinkMonitorFailure"
+    enum="NeighborLinkMonitorFailureType" expires_after="2021-12-01">
+  <owner>jiejiang@chromium.org</owner>
+  <owner>cros-network-metrics@google.com</owner>
+  <summary>
+    Chrome OS metric that signals the type of failure the NeighborLinkMonitor
+    detected on 802.11 wireless network. Recorded after the NeighborLinkMonitor
+    detects a layer 2 connectivity failure to a neighbor.
+  </summary>
+</histogram>
+
 <histogram name="Network.Shill.Wifi.NetworkConnectionIPType"
     enum="NetworkConnectionIPType" expires_after="2021-12-01">
   <owner>briannorris@chromium.org</owner>
@@ -1597,6 +1646,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.WiFi.StoppedTxQueueLength" units="frames"
     expires_after="2021-12-01">
+  <obsolete>
+    Removed 12/2020
+  </obsolete>
   <owner>briannorris@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
@@ -1609,6 +1661,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Network.Shill.WiFi.StoppedTxQueueReason"
     enum="NetworkQueueStopReason" expires_after="2021-12-01">
+  <obsolete>
+    Removed 12/2020
+  </obsolete>
   <owner>briannorris@chromium.org</owner>
   <owner>cros-network-metrics@google.com</owner>
   <summary>
@@ -1968,7 +2023,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Network.Wifi.Synced.Connection.FailureReason"
-    enum="ConnectionFailureReason" expires_after="2021-04-22">
+    enum="ConnectionFailureReason" expires_after="2021-06-27">
   <owner>jonmann@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -1978,7 +2033,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Network.Wifi.Synced.Connection.Result" enum="BooleanSuccess"
-    expires_after="2021-04-22">
+    expires_after="2021-06-27">
   <owner>jonmann@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -1998,7 +2053,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Network.Wifi.Synced.ManualConnection.Result"
-    enum="BooleanSuccess" expires_after="2021-04-22">
+    enum="BooleanSuccess" expires_after="2021-06-27">
   <owner>jonmann@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -2008,7 +2063,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Network.Wifi.Synced.TotalCount" units="units"
-    expires_after="2021-04-22">
+    expires_after="2021-06-27">
   <owner>jonmann@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -2018,7 +2073,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Network.Wifi.Synced.UpdateOperation.FailureReason"
-    enum="ConnectionFailureReason" expires_after="2021-04-22">
+    enum="ConnectionFailureReason" expires_after="2021-07-27">
   <owner>jonmann@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -2029,7 +2084,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Network.Wifi.Synced.UpdateOperation.Result"
-    enum="BooleanSuccess" expires_after="2021-04-22">
+    enum="BooleanSuccess" expires_after="2021-06-27">
   <owner>jonmann@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -2039,6 +2094,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Network.Wifi.Synced.ZeroNetworksEligibleForSync.Reason"
+    enum="NetworkEligibilityStatus" expires_after="2021-11-01">
+  <owner>cvandermerwe@google.com</owner>
+  <owner>jonmann@chromium.org</owner>
+  <owner>better-together-dev@google.com</owner>
+  <summary>
+    Chrome OS metric logged for users who have the feature enabled but have zero
+    networks eligible for sync. Tracks the reasons why none of the networks are
+    eligible.
+  </summary>
+</histogram>
+
 <histogram name="NetworkService.ConcerningRequestHeader.AddedOnRedirect"
     enum="ConcerningHeaderPresent" expires_after="2019-11-01">
   <owner>mmenke@chromium.org</owner>
@@ -2089,7 +2156,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NetworkService.CorsForcedOffForIsolatedWorldOrigin"
-    enum="BooleanForceDisabled" expires_after="M92">
+    enum="BooleanForceDisabled" expires_after="2021-08-09">
   <owner>lukasza@chromium.org</owner>
   <owner>rdevlin.cronin@chromium.org</owner>
   <summary>
@@ -2184,7 +2251,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="NetworkService.URLLoader.RequestInitiatorOriginLockCompatibility"
-    enum="RequestInitiatorOriginLockCompatibility" expires_after="2021-05-02">
+    enum="RequestInitiatorOriginLockCompatibility" expires_after="2021-07-04">
   <owner>lukasza@chromium.org</owner>
   <owner>creis@chromium.org</owner>
   <owner>jam@chromium.org</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/new_tab_page/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/new_tab_page/histograms.xml
index 74e158385ce..ffea72a5478 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/new_tab_page/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/new_tab_page/histograms.xml
@@ -34,7 +34,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.ActioniOS" enum="NewTabPageActioniOS"
-    expires_after="2021-06-10">
+    expires_after="2021-08-09">
   <owner>justincohen@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
@@ -55,7 +55,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.BackgroundService.Collections.RequestLatency"
-    units="ms" expires_after="2021-01-01">
+    units="ms" expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -66,7 +66,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.BackgroundService.Images.RequestLatency" units="ms"
-    expires_after="2021-01-01">
+    expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -78,6 +78,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="NewTabPage.BackgroundService.NextImage.RequestLatency"
     units="ms" expires_after="M90">
+  <obsolete>
+    Never recorded. Marked obsolete 01/2021.
+  </obsolete>
   <owner>ramyan@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <summary>
@@ -87,6 +90,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="NewTabPage.Carts.CartCount" units="count"
+    expires_after="2021-08-01">
+  <owner>wychen@chromium.org</owner>
+  <owner>yuezhanggg@chromium.org</owner>
+  <owner>chrome-shopping@google.com</owner>
+  <summary>
+    Logged when the cart module is created. The value is equal to the initial
+    number of carts within the module (could be zero).
+  </summary>
+</histogram>
+
+<histogram name="NewTabPage.Carts.ClickCart" units="index"
+    expires_after="2021-08-01">
+  <owner>wychen@chromium.org</owner>
+  <owner>yuezhanggg@chromium.org</owner>
+  <owner>chrome-shopping@google.com</owner>
+  <summary>
+    Logged when a user clicks on a cart in the cart module. The value is equal
+    to the index of the cart.
+  </summary>
+</histogram>
+
 <histogram name="NewTabPage.ContentSuggestions.ArticlesListVisible"
     enum="BooleanVisible" expires_after="2021-07-01">
   <owner>freedjm@chromium.org</owner>
@@ -105,7 +130,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.ContentSuggestions.BackgroundFetchTrigger"
-    enum="BackgroundFetchTrigger" expires_after="M90">
+    enum="BackgroundFetchTrigger" expires_after="2021-08-22">
   <owner>carlosk@chromium.org</owner>
   <owner>freedjm@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -127,7 +152,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.ContentSuggestions.CountOnNtpOpenedIfVisible"
-    units="units" expires_after="M90">
+    units="units" expires_after="2021-06-20">
   <owner>carlosk@chromium.org</owner>
   <owner>freedjm@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -154,7 +179,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.ContentSuggestions.DismissedUnvisited"
-    units="index" expires_after="M90">
+    units="index" expires_after="2021-07-18">
   <owner>carlosk@chromium.org</owner>
   <owner>freedjm@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -169,7 +194,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.ContentSuggestions.DismissedVisited" units="index"
-    expires_after="M90">
+    expires_after="2021-07-18">
   <owner>carlosk@chromium.org</owner>
   <owner>freedjm@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -303,7 +328,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.ContentSuggestions.Opened" units="index"
-    expires_after="2021-07-01">
+    expires_after="never">
+<!-- expires-never: key feature metric.  We will need the Opened
+     metric as long as we have a feed, and it will be removed with the
+     feed code if the feed is ever removed. -->
+
   <owner>freedjm@chromium.org</owner>
   <owner>feed@chromium.org</owner>
   <summary>
@@ -334,7 +363,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.ContentSuggestions.OpenedAge" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>carlosk@chromium.org</owner>
   <owner>freedjm@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -372,7 +401,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.ContentSuggestions.Preferences.RemoteSuggestions"
-    enum="BooleanEnabled" expires_after="M90">
+    enum="BooleanEnabled" expires_after="2021-08-22">
   <owner>carlosk@chromium.org</owner>
   <owner>freedjm@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -393,7 +422,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.ContentSuggestions.Shown" units="index"
-    expires_after="2021-07-01">
+    expires_after="never">
+<!-- expires-never: key feature metric.  We will need the Shown
+       metric as long as we have a feed, and it will be removed with
+       the feed code if the feed is ever removed. -->
+
   <owner>freedjm@chromium.org</owner>
   <owner>feed@chromium.org</owner>
   <summary>
@@ -453,7 +486,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.ContentSuggestions.TimeSinceSuggestionFetched"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2021-08-22">
   <owner>carlosk@chromium.org</owner>
   <owner>freedjm@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -466,7 +499,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="NewTabPage.ContentSuggestions.TimeUntilFirstShownTrigger" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>carlosk@chromium.org</owner>
   <owner>freedjm@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -483,7 +516,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="NewTabPage.ContentSuggestions.TimeUntilFirstStartupTrigger"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2021-08-22">
   <owner>carlosk@chromium.org</owner>
   <owner>freedjm@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -535,7 +568,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.ContentSuggestions.UsageTimeLocal" units="units"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>carlosk@chromium.org</owner>
   <owner>freedjm@chromium.org</owner>
   <owner>feed@chromium.org</owner>
@@ -558,7 +591,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.CryptidRenderResult" enum="CryptidRenderResult"
-    expires_after="M90">
+    expires_after="2021-07-18">
   <owner>tmartino@chromium.org</owner>
   <owner>chrome-creation@google.com</owner>
   <summary>
@@ -585,7 +618,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.CustomizeChromeBackgroundAction"
-    enum="NTPCustomizeChromeBackgroundAction" expires_after="M90">
+    enum="NTPCustomizeChromeBackgroundAction" expires_after="2021-06-20">
   <owner>dbeam@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <summary>
@@ -596,7 +629,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.Customized" enum="NTPCustomizedFeatures"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -607,7 +640,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.CustomizedShortcuts"
-    enum="NTPCustomizedShortcutSettings" expires_after="2021-01-01">
+    enum="NTPCustomizedShortcutSettings" expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -619,7 +652,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.CustomizeLocalImageBackgroundAction"
-    enum="NTPCustomizeLocalImageBackgroundAction" expires_after="2021-01-01">
+    enum="NTPCustomizeLocalImageBackgroundAction" expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -631,7 +664,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.CustomizeShortcutAction"
-    enum="NTPCustomizeShortcutAction" expires_after="2021-01-01">
+    enum="NTPCustomizeShortcutAction" expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -651,6 +684,33 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="NewTabPage.Lens.LensSupportStatus" enum="LensSupportStatus"
+    expires_after="2021-11-18">
+  <owner>yusuyoutube@google.com</owner>
+  <owner>benwgold@google.com</owner>
+  <owner>fgorski@chromium.org</owner>
+  <owner>wylieb@chromium.org</owner>
+  <owner>lens-chrome@google.com</owner>
+  <summary>
+    Whether the user supports the camera assisted search with Google Lens and if
+    not, the reason why. Recorded only if the feature is enabled when the New
+    Tab Page search box is loaded.
+  </summary>
+</histogram>
+
+<histogram name="NewTabPage.Lens.TimeSpentInLens" units="ms"
+    expires_after="M94">
+  <owner>yusuyoutube@google.com</owner>
+  <owner>benwgold@google.com</owner>
+  <owner>fgorski@chromium.org</owner>
+  <owner>wylieb@chromium.org</owner>
+  <owner>lens-chrome@google.com</owner>
+  <summary>
+    Logged the elapsed time between the time when user enters the Google Lens
+    and the time when user returns to Chrome. Only logged on Android.
+  </summary>
+</histogram>
+
 <histogram name="NewTabPage.LoadTime" units="ms" expires_after="never">
 <!-- expires-never: "heartbeat" metric (internal: go/uma-heartbeats) -->
 
@@ -680,7 +740,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.LogoDownloadOutcome"
-    enum="NewTabPageLogoDownloadOutcome" expires_after="2021-01-01">
+    enum="NewTabPageLogoDownloadOutcome" expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -691,7 +751,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.LogoDownloadTime" units="ms"
-    expires_after="2021-01-01">
+    expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -704,7 +764,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.LogoImageDownloaded" enum="BooleanFromHTTPCache"
-    expires_after="2021-01-01">
+    expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -715,7 +775,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.LogoShown" enum="NewTabPageLogoShown"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -727,7 +787,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.LogoShownTime2" units="ms"
-    expires_after="2021-01-01">
+    expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -758,6 +818,25 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="NewTabPage.Modules.Disabled{Interaction}" enum="NtpModules"
+    expires_after="2022-01-01">
+  <owner>danielms@google.com</owner>
+  <owner>tiborg@chromium.org</owner>
+  <owner>chrome-desktop-ntp@google.com</owner>
+  <summary>
+    Logged when a module was disabled by {Interaction}. Only logged on the 1P
+    NTP. Note that even if the user has Google as their default search engine,
+    Incognito and Guest mode NTPs are not considered 1P and don't log this
+    histogram.
+  </summary>
+  <token key="Interaction">
+    <variant name="" summary="any interaction"/>
+    <variant name=".Customize" summary="the customize dialog"/>
+    <variant name=".ModuleRequest"
+        summary="a module request (e.g. action menu in header)"/>
+  </token>
+</histogram>
+
 <histogram name="NewTabPage.Modules.Dismissed" units="count"
     expires_after="2021-10-01">
   <owner>mahmadi@chromium.org</owner>
@@ -771,8 +850,52 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram base="true" name="NewTabPage.Modules.EnabledOnNTPLoad"
+    enum="BooleanEnabled" expires_after="2022-01-01">
+  <owner>danielms@google.com</owner>
+  <owner>tiborg@chromium.org</owner>
+  <owner>chrome-desktop-ntp@google.com</owner>
+  <summary>
+    Logs for each NTP module whether it was enabled after the NTP has
+    instantiated the modules. Only logged on the 1P NTP. Note that even if the
+    user has Google as their default search engine, Incognito and Guest mode
+    NTPs are not considered 1P and don't log this histogram.
+  </summary>
+</histogram>
+
+<histogram name="NewTabPage.Modules.Enabled{Interaction}" enum="NtpModules"
+    expires_after="2022-01-01">
+  <owner>danielms@google.com</owner>
+  <owner>tiborg@chromium.org</owner>
+  <owner>chrome-desktop-ntp@google.com</owner>
+  <summary>
+    Logged when a module was enabled by {Interaction}. Only logged on the 1P
+    NTP. Note that even if the user has Google as their default search engine,
+    Incognito and Guest mode NTPs are not considered 1P and don't log this
+    histogram.
+  </summary>
+  <token key="Interaction">
+    <variant name="" summary="any interaction"/>
+    <variant name=".Customize" summary="the customize dialog"/>
+    <variant name=".Toast" summary="clicking undo on the module disable toast"/>
+  </token>
+</histogram>
+
+<histogram name="NewTabPage.Modules.Hover" enum="NtpModules"
+    expires_after="2022-01-01">
+  <owner>danielms@google.com</owner>
+  <owner>tiborg@chromium.org</owner>
+  <owner>chrome-desktop-ntp@google.com</owner>
+  <summary>
+    Logged when the user hovers on a module. Only logged once per NTP and
+    module. Only logged on the 1P NTP. Note that even if the user has Google as
+    their default search engine, Incognito and Guest mode NTPs are not
+    considered 1P and dont't log this histogram.
+  </summary>
+</histogram>
+
 <histogram name="NewTabPage.Modules.Impression" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -785,8 +908,38 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="NewTabPage.Modules.ImpressionRatio" units="perdecage"
+    expires_after="2022-01-01">
+  <owner>danielms@google.com</owner>
+  <owner>tiborg@chromium.org</owner>
+  <owner>chrome-desktop-ntp@google.com</owner>
+  <summary>
+    Records the maximum amount that any (base histogram) or a particular (sub
+    histograms) module was visible in the NTP content's area between load and
+    unload of an NTP. The amount is recorded as the perdecage (x/10th) of the
+    module's total size. Logged when the NTP unloads, such as via navigating
+    somewhere else or closing the tab (switching tabs does not cause an unload).
+    Logs a value into the base histogram and the corresponding sub histogram for
+    each module that is present. Only logged on the 1P NTP. Note that even if
+    the user has Google as their default search engine, Incognito and Guest mode
+    NTPs are not considered 1P and don't log these histograms. It is possible
+    for this histogram to log a value of 0 if, for instance, the module was
+    always more than 90% below the fold.
+  </summary>
+</histogram>
+
+<histogram name="NewTabPage.Modules.LoadDuration" units="ms"
+    expires_after="2022-01-01">
+  <owner>danielms@google.com</owner>
+  <owner>tiborg@chromium.org</owner>
+  <owner>chrome-desktop-ntp@google.com</owner>
+  <summary>
+    Histogram of the time in milliseconds it took for an NTP module to load.
+  </summary>
+</histogram>
+
 <histogram name="NewTabPage.Modules.Loaded" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -810,7 +963,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.Modules.ShownTime" units="ms"
-    expires_after="2021-01-01">
+    expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -821,7 +974,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.Modules.Usage" units="count"
-    expires_after="2021-01-01">
+    expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -833,7 +986,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.Modules.VisibleOnNTPLoad" enum="BooleanVisible"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -863,7 +1016,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.MostVisitedAge" units="seconds"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -883,7 +1036,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.NumberOfTiles" units="units"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -900,7 +1053,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.OneGoogleBar.RequestLatency" units="ms"
-    expires_after="2021-01-01">
+    expires_after="2021-07-18">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -911,7 +1064,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.OneGoogleBar.ShownTime" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -922,7 +1075,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.Promo.EnhancedProtectionPromo"
-    enum="AndroidEnhancedProtectionPromoAction" expires_after="2021-05-02">
+    enum="AndroidEnhancedProtectionPromoAction" expires_after="2021-07-04">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-core@google.com</owner>
   <summary>
@@ -933,7 +1086,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="NewTabPage.Promo.EnhancedProtectionPromo.ImpressionUntilAction"
-    units="units" expires_after="2021-05-09">
+    units="units" expires_after="2021-07-11">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-core@google.com</owner>
   <summary>
@@ -945,7 +1098,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="NewTabPage.Promo.EnhancedProtectionPromo.ImpressionUntilDismissal"
-    units="units" expires_after="2021-02-01">
+    units="units" expires_after="2021-07-18">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-core@google.com</owner>
   <summary>
@@ -957,6 +1110,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="NewTabPage.Promo.HomepagePromo"
     enum="AndroidHomepagePromoAction" expires_after="2021-05-09">
+  <obsolete>
+    Removed in January 2021.
+  </obsolete>
   <owner>wenyufu@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -967,6 +1123,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="NewTabPage.Promo.HomepagePromo.ImpressionUntilAction"
     units="units" expires_after="2021-05-09">
+  <obsolete>
+    Removed in January 2021.
+  </obsolete>
   <owner>wenyufu@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -977,7 +1136,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.Promo.HomepagePromo.ImpressionUntilDismissal"
-    units="units" expires_after="2021-03-07">
+    units="units" expires_after="2021-05-16">
+  <obsolete>
+    Removed in January 2021.
+  </obsolete>
   <owner>wenyufu@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -1003,7 +1165,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.Promos.PromoBrowserCommand"
-    enum="PromoBrowserCommandEnum" expires_after="M90">
+    enum="PromoBrowserCommandEnum" expires_after="2022-01-01">
   <owner>mahmadi@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
   <summary>
@@ -1014,7 +1176,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.Promos.RequestLatency2" units="ms"
-    expires_after="2021-01-01">
+    expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -1025,7 +1187,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.Promos.ShownTime" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -1037,7 +1199,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.Realbox.CharTypedToRepaintLatency.ToPaint"
-    units="ms" expires_after="M83">
+    units="ms" expires_after="2022-01-01">
   <owner>mahmadi@chromium.org</owner>
   <owner>tommycli@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -1052,7 +1214,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.RecipeTasks.RecipeClick" units="index"
-    expires_after="2021-01-01">
+    expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -1063,7 +1225,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.RecipeTasks.RecipeDownloadCount" units="recipes"
-    expires_after="2021-03-01">
+    expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -1076,7 +1238,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.RecipeTasks.RelatedSearchClick" units="index"
-    expires_after="2021-01-01">
+    expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -1087,7 +1249,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.RecipeTasks.RelatedSearchDownloadCount"
-    units="count" expires_after="2021-03-01">
+    units="count" expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -1100,7 +1262,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.RepeatableQueries.ExtractedCount" units="count"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>mahmadi@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
   <summary>
@@ -1112,7 +1274,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.RepeatableQueries.ExtractionDuration" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>mahmadi@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
   <summary>
@@ -1164,7 +1326,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.SearchAvailableLoadTime2.ColdStart" units="ms"
-    expires_after="2021-06-08">
+    expires_after="2021-08-09">
   <owner>fgorski@chromium.org</owner>
   <owner>ender@google.com</owner>
   <owner>yyushkina@chromium.org</owner>
@@ -1176,7 +1338,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.SearchAvailableLoadTime2.WarmStart" units="ms"
-    expires_after="2021-06-08">
+    expires_after="2021-08-09">
   <owner>fgorski@chromium.org</owner>
   <owner>ender@google.com</owner>
   <owner>yyushkina@chromium.org</owner>
@@ -1233,7 +1395,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.ShoppingTasks.ProductClick" units="index"
-    expires_after="2021-01-01">
+    expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -1244,7 +1406,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.ShoppingTasks.ProductDownloadCount"
-    units="products" expires_after="2021-03-01">
+    units="products" expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -1257,7 +1419,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.ShoppingTasks.RelatedSearchClick" units="index"
-    expires_after="2021-01-01">
+    expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -1268,7 +1430,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.ShoppingTasks.RelatedSearchDownloadCount"
-    units="count" expires_after="2021-03-01">
+    units="count" expires_after="2021-08-15">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -1432,7 +1594,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.SuggestionsImpression" enum="MostVisitedTileIndex"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -1443,7 +1605,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.SuggestionsImpressionAge" units="seconds"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -1453,6 +1615,33 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="NewTabPage.TasksSurface.Lens.LensSupportStatus"
+    enum="LensSupportStatus" expires_after="2021-11-18">
+  <owner>yusuyoutube@google.com</owner>
+  <owner>benwgold@google.com</owner>
+  <owner>fgorski@chromium.org</owner>
+  <owner>wylieb@chromium.org</owner>
+  <owner>lens-chrome@google.com</owner>
+  <summary>
+    Whether the user supports the camera assisted search with Google Lens and if
+    not, the reason why. Recorded only if the feature is enabled when the Task
+    Surface search box is loaded.
+  </summary>
+</histogram>
+
+<histogram name="NewTabPage.TasksSurface.Lens.TimeSpentInLens" units="ms"
+    expires_after="M94">
+  <owner>yusuyoutube@google.com</owner>
+  <owner>benwgold@google.com</owner>
+  <owner>fgorski@chromium.org</owner>
+  <owner>wylieb@chromium.org</owner>
+  <owner>lens-chrome@google.com</owner>
+  <summary>
+    Logged the elapsed time between the time when user enters the Google Lens
+    and the time when user returns to Chrome. Only logged on Android.
+  </summary>
+</histogram>
+
 <histogram name="NewTabPage.TileFaviconType" enum="FaviconType"
     expires_after="M90">
   <owner>dbeam@chromium.org</owner>
@@ -1488,7 +1677,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.TileTitle" enum="NTPTileTitleSource"
-    expires_after="2021-01-01">
+    expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -1510,7 +1699,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.TileType" enum="NTPTileVisualType"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>dbeam@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <summary>
@@ -1521,7 +1710,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.TileTypeClicked" enum="NTPTileVisualType"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>dbeam@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <summary>
@@ -1556,7 +1745,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.URLState" enum="NewTabURLState"
-    expires_after="2021-01-01">
+    expires_after="2022-01-01">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
@@ -1601,7 +1790,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NewTabPage.VoiceActions" enum="NewTabPageVoiceAction"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>tiborg@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <owner>chrome-desktop-ntp@google.com</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/notifications/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/notifications/histograms.xml
index fee85849470..53f4b169d34 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/notifications/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/notifications/histograms.xml
@@ -31,8 +31,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Android.JobStartDelay" units="ms"
-    expires_after="M90">
+    expires_after="M96">
   <owner>peter@chromium.org</owner>
+  <owner>knollr@chromium.org</owner>
   <summary>
     Records the delay between scheduling a job with the JobScheduler (with a
     desired latency of 0ms, in response to a notification click) and receiving
@@ -41,7 +42,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Android.SitesChannel" enum="BooleanUsage"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>peter@chromium.org</owner>
   <summary>
     Recorded when the Sites channel (which we hope to deprecate) is used as a
@@ -86,7 +87,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Blocker.ScreenCapture.Action.{Action}"
-    units="notifications" expires_after="M91">
+    units="notifications" expires_after="M93">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -102,8 +103,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </token>
 </histogram>
 
+<histogram name="Notifications.Blocker.ScreenCapture.ActionTiming.{Action}"
+    units="ms" expires_after="M93">
+  <owner>knollr@chromium.org</owner>
+  <owner>peter@chromium.org</owner>
+  <summary>
+    Records the time between showing the 'Notifications muted' notification and
+    the user taking an action on it. Logged each time the user interacts with
+    the notification. {Action}
+  </summary>
+  <token key="Action">
+    <variant name="Body"/>
+    <variant name="Close"/>
+    <variant name="Show"/>
+  </token>
+</histogram>
+
 <histogram name="Notifications.Blocker.ScreenCapture.ClosedCount"
-    units="notifications" expires_after="M91">
+    units="notifications" expires_after="M93">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -114,7 +131,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Blocker.ScreenCapture.MutedCount"
-    units="notifications" expires_after="M91">
+    units="notifications" expires_after="M93">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -127,7 +144,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Blocker.ScreenCapture.ReplacedCount"
-    units="notifications" expires_after="M91">
+    units="notifications" expires_after="M93">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -137,6 +154,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Notifications.Blocker.ScreenCapture.RevealDuration" units="ms"
+    expires_after="M93">
+  <owner>knollr@chromium.org</owner>
+  <owner>peter@chromium.org</owner>
+  <summary>
+    Records the time from the start of a screen capture session until the user
+    decided to reveal notification content again. Only logged if and when the
+    user takes that action.
+  </summary>
+</histogram>
+
+<histogram name="Notifications.Blocker.ScreenCapture.SessionDuration"
+    units="ms" expires_after="M93">
+  <owner>knollr@chromium.org</owner>
+  <owner>peter@chromium.org</owner>
+  <summary>
+    Records the length of a screen capture session. Notifications will be muted
+    initially but the user may reveal them during a session. This metric will be
+    logged after the screen capture session ends.
+  </summary>
+</histogram>
+
 <histogram name="Notifications.Chime.Android.Events" enum="ChimeEvent"
     expires_after="never">
   <owner>hesen@chromium.org</owner>
@@ -164,7 +203,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Cros.Actions" enum="NotificationTypeDetailed"
-    expires_after="2021-03-15">
+    expires_after="2021-12-31">
+  <owner>tbarzic@chromium.org</owner>
   <owner>tengs@chromium.org</owner>
   <owner>gzadina@google.com</owner>
   <summary>
@@ -174,7 +214,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Database.DeleteAllForOriginsResult"
-    enum="NotificationDatabaseStatus" expires_after="M90">
+    enum="NotificationDatabaseStatus" expires_after="M94">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -184,7 +224,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Database.DeleteBeforeWriteResult"
-    enum="NotificationDatabaseStatus" expires_after="M88">
+    enum="NotificationDatabaseStatus" expires_after="M94">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -195,7 +235,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Database.DeleteResult"
-    enum="NotificationDatabaseStatus" expires_after="M88">
+    enum="NotificationDatabaseStatus" expires_after="M94">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -205,7 +245,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Database.DeleteServiceWorkerRegistrationResult"
-    enum="NotificationDatabaseStatus" expires_after="M88">
+    enum="NotificationDatabaseStatus" expires_after="M94">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -215,7 +255,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Database.DestroyResult"
-    enum="NotificationDatabaseStatus" expires_after="M88">
+    enum="NotificationDatabaseStatus" expires_after="M94">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -224,8 +264,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Notifications.Database.ExpiredNotificationCount"
+    units="notifications" expires_after="M94">
+  <owner>knollr@chromium.org</owner>
+  <owner>peter@chromium.org</owner>
+  <summary>
+    Records the number of expired notifications that were stored in the database
+    and therefore got removed and closed on the system. Logged once at startup
+    and every time we synchronize notifications after that (e.g. to schedule the
+    next notification trigger event).
+  </summary>
+</histogram>
+
 <histogram name="Notifications.Database.OldestNotificationTimeInMinutes"
-    units="minutes" expires_after="M90">
+    units="minutes" expires_after="2021-08-22">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <owner>adelm@google.com</owner>
@@ -236,7 +288,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Database.OpenAfterCorruptionResult"
-    enum="NotificationDatabaseStatus" expires_after="M88">
+    enum="NotificationDatabaseStatus" expires_after="M94">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -257,7 +309,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Database.ReadForServiceWorkerResult"
-    enum="NotificationDatabaseStatus" expires_after="M88">
+    enum="NotificationDatabaseStatus" expires_after="M94">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -267,7 +319,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Database.ReadResourcesForTriggeredResult"
-    enum="NotificationDatabaseStatus" expires_after="M90">
+    enum="NotificationDatabaseStatus" expires_after="M94">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -278,7 +330,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Database.ReadResourcesResult"
-    enum="NotificationDatabaseStatus" expires_after="M90">
+    enum="NotificationDatabaseStatus" expires_after="M94">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -289,7 +341,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Database.ReadResult"
-    enum="NotificationDatabaseStatus" expires_after="M90">
+    enum="NotificationDatabaseStatus" expires_after="2021-08-22">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -299,7 +351,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Database.WriteResult"
-    enum="NotificationDatabaseStatus" expires_after="M90">
+    enum="NotificationDatabaseStatus" expires_after="2021-08-22">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -309,7 +361,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Database.WriteTriggeredResult"
-    enum="NotificationDatabaseStatus" expires_after="M90">
+    enum="NotificationDatabaseStatus" expires_after="M94">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -386,8 +438,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.NotifierType" enum="NotifierType"
-    expires_after="M85">
+    expires_after="2021-12-31">
+  <owner>tbarzic@chromium.org</owner>
   <owner>tengs@chromium.org</owner>
+  <owner>gzadina@google.com</owner>
   <summary>
     The number of times a notification was added for the various types of
     sources.
@@ -395,7 +449,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Permissions.RevokeDeleteCount" units="units"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -404,6 +458,31 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram
+    name="Notifications.Permissions.UNNotification.Banners.PermissionStatus"
+    enum="UNNotificationPermissionStatus" expires_after="2021-08-22">
+  <owner>adelm@google.com</owner>
+  <owner>knollr@chromium.org</owner>
+  <owner>peter@chromium.org</owner>
+  <summary>
+    The permission status for sending out UNNotifications through the
+    Notification Platform Bridge Mac UNNotification. This is recorded while
+    instantiating the bridge.
+  </summary>
+</histogram>
+
+<histogram name="Notifications.Permissions.UNNotification.Banners.Style"
+    enum="UNNotificationStyle" expires_after="M94">
+  <owner>adelm@google.com</owner>
+  <owner>knollr@chromium.org</owner>
+  <owner>peter@chromium.org</owner>
+  <summary>
+    The style of notifications being used for sending out UNNotifications
+    through the Notification Platform Bridge Mac UNNotification. This is
+    recorded while instantiating the bridge.
+  </summary>
+</histogram>
+
 <histogram name="Notifications.PerNotificationActions"
     enum="NotificationActionType" expires_after="M85">
   <owner>dewittj@chromium.org</owner>
@@ -416,7 +495,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.PersistentNotificationActionCount"
-    units="buttons" expires_after="M90">
+    units="buttons" expires_after="2021-08-22">
   <owner>peter@chromium.org</owner>
   <summary>
     The number of action buttons the developer provided for a persistent Web
@@ -425,7 +504,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.PersistentNotificationDisplayResult"
-    enum="PersistentNotificationDisplayResult" expires_after="M91">
+    enum="PersistentNotificationDisplayResult" expires_after="2021-08-22">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -435,7 +514,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.PersistentWebNotificationClickResult"
-    enum="PlatformNotificationStatus" expires_after="M90">
+    enum="PlatformNotificationStatus" expires_after="2021-08-22">
   <owner>peter@chromium.org</owner>
   <owner>deepak.m1@samsung.com</owner>
   <summary>
@@ -445,7 +524,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.PersistentWebNotificationCloseResult"
-    enum="PlatformNotificationStatus" expires_after="M90">
+    enum="PlatformNotificationStatus" expires_after="2021-08-22">
   <owner>peter@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
   <summary>
@@ -667,7 +746,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Triggers.HasShowTrigger" enum="Boolean"
-    expires_after="M91">
+    expires_after="2021-08-22">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -678,7 +757,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Triggers.ShowTriggerDelay" units="days"
-    expires_after="M91">
+    expires_after="2021-06-27">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -689,6 +768,22 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Notifications.UsingNativeNotificationCenter"
     enum="BooleanNativeNotifications" expires_after="never">
+  <obsolete>
+    Replaced by Notifications.UsingSystemNotificationCenter in October 2020.
+  </obsolete>
+<!-- expires-never: core to the notification user experience. -->
+
+  <owner>peter@chromium.org</owner>
+  <owner>knollr@chromium.org</owner>
+  <owner>thomasanderson@chromium.org</owner>
+  <summary>
+    Indicates if Chrome is using system notifications or the Chrome notification
+    center. Logged on each start up.
+  </summary>
+</histogram>
+
+<histogram name="Notifications.UsingSystemNotificationCenter"
+    enum="BooleanSystemNotifications" expires_after="never">
 <!-- expires-never: core to the notification user experience. -->
 
   <owner>peter@chromium.org</owner>
@@ -702,6 +797,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Notifications.WebPlatform.{Action}.TimeToActivity" units="ms"
     expires_after="M96">
+  <obsolete>
+    From 2021-03 use Notifications.WebPlatform2 instead.
+  </obsolete>
   <owner>peconn@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -717,6 +815,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Notifications.WebPlatform.{Action}.TimeToClose" units="ms"
     expires_after="M96">
+  <obsolete>
+    From 2021-03 use Notifications.WebPlatform2 instead.
+  </obsolete>
   <owner>peconn@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -730,8 +831,38 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </token>
 </histogram>
 
+<histogram name="Notifications.WebPlatformV2.{Action}.TimeToActivity"
+    units="ms" expires_after="M96">
+  <owner>peconn@chromium.org</owner>
+  <owner>peter@chromium.org</owner>
+  <summary>
+    Records the delay between the user clicking on the {Action} of a web
+    platform notification, and an Activity being launched. Only records if the
+    duration is less than 10 seconds.
+  </summary>
+  <token key="Action">
+    <variant name="ActionButton" summary="action button"/>
+    <variant name="Body" summary="body"/>
+  </token>
+</histogram>
+
+<histogram name="Notifications.WebPlatformV2.{Action}.TimeToClose" units="ms"
+    expires_after="M96">
+  <owner>peconn@chromium.org</owner>
+  <owner>peter@chromium.org</owner>
+  <summary>
+    Records the delay between the user clicking on the {Action} of a web
+    platform notification, and the notification being closed. Only records if
+    the duration is less than 10 seconds.
+  </summary>
+  <token key="Action">
+    <variant name="ActionButton" summary="action button"/>
+    <variant name="Body" summary="body"/>
+  </token>
+</histogram>
+
 <histogram name="Notifications.Windows.ActivationStatus"
-    enum="WindowsNotificationActivationStatus" expires_after="M90">
+    enum="WindowsNotificationActivationStatus" expires_after="M94">
   <owner>finnur@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <owner>chengx@chromium.org</owner>
@@ -742,7 +873,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Windows.CloseStatus"
-    enum="WindowsNotificationCloseStatus" expires_after="M90">
+    enum="WindowsNotificationCloseStatus" expires_after="M94">
   <owner>finnur@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -752,7 +883,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Windows.CreateToastManagerErrorCode"
-    enum="Hresult" expires_after="M87">
+    enum="Hresult" expires_after="M94">
   <owner>finnur@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -764,7 +895,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Windows.DisplayFailure" enum="Hresult"
-    expires_after="M87">
+    expires_after="M94">
   <owner>finnur@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -774,7 +905,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Windows.DisplayStatus"
-    enum="WindowsNotificationDisplayStatus" expires_after="M90">
+    enum="WindowsNotificationDisplayStatus" expires_after="M94">
   <owner>finnur@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -787,7 +918,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Windows.GetDisplayedLaunchIdStatus"
-    enum="WindowsNotificationGetDisplayedLaunchIdStatus" expires_after="M87">
+    enum="WindowsNotificationGetDisplayedLaunchIdStatus" expires_after="M94">
   <owner>finnur@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -798,7 +929,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Windows.GetDisplayedStatus"
-    enum="WindowsNotificationGetDisplayedStatus" expires_after="M87">
+    enum="WindowsNotificationGetDisplayedStatus" expires_after="M94">
   <owner>finnur@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -809,7 +940,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Windows.GetNotificationLaunchIdStatus"
-    enum="WindowsNotificationGetNotificationLaunchIdStatus" expires_after="M87">
+    enum="WindowsNotificationGetNotificationLaunchIdStatus" expires_after="M94">
   <owner>finnur@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -820,7 +951,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Windows.GetSettingPolicy"
-    enum="WindowsNotificationGetSettingPolicy" expires_after="M90">
+    enum="WindowsNotificationGetSettingPolicy" expires_after="M94">
   <owner>finnur@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -829,8 +960,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Notifications.Windows.GetSettingPolicyStartup"
+    enum="WindowsNotificationGetSettingPolicy" expires_after="M94">
+  <owner>finnur@chromium.org</owner>
+  <owner>knollr@chromium.org</owner>
+  <owner>peter@chromium.org</owner>
+  <summary>
+    The policy value provided by get_Setting in NotificationPlatformBridgeWin
+    (Windows only). Logged only once at startup on a task runner.
+  </summary>
+</histogram>
+
 <histogram name="Notifications.Windows.GetSettingStatus"
-    enum="WindowsNotificationGetSettingStatus" expires_after="M87">
+    enum="WindowsNotificationGetSettingStatus" expires_after="M94">
   <owner>finnur@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -839,8 +981,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Notifications.Windows.GetSettingStatusStartup"
+    enum="WindowsNotificationGetSettingStatus" expires_after="M94">
+  <owner>finnur@chromium.org</owner>
+  <owner>knollr@chromium.org</owner>
+  <owner>peter@chromium.org</owner>
+  <summary>
+    The return value of get_Setting calls in NotificationPlatformBridgeWin
+    (Windows only). Logged only once at startup on a task runner.
+  </summary>
+</histogram>
+
 <histogram name="Notifications.Windows.HandleEventStatus"
-    enum="WindowsNotificationHandleEventStatus" expires_after="M87">
+    enum="WindowsNotificationHandleEventStatus" expires_after="M94">
   <owner>finnur@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -850,7 +1003,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Windows.HistoryStatus"
-    enum="WindowsNotificationHistoryStatus" expires_after="M87">
+    enum="WindowsNotificationHistoryStatus" expires_after="M94">
   <owner>finnur@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -870,7 +1023,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Windows.OnFailedStatus"
-    enum="WindowsNotificationOnFailedStatus" expires_after="M87">
+    enum="WindowsNotificationOnFailedStatus" expires_after="M94">
   <owner>chengx@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -880,7 +1033,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Windows.SetReadyCallbackStatus2"
-    enum="WindowsNotificationSetReadyCallbackStatus2" expires_after="M90">
+    enum="WindowsNotificationSetReadyCallbackStatus2" expires_after="M94">
   <owner>chengx@chromium.org</owner>
   <owner>finnur@chromium.org</owner>
   <owner>peter@chromium.org</owner>
@@ -891,7 +1044,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Windows.ShowFailedErrorCode" enum="Hresult"
-    expires_after="M87">
+    expires_after="M94">
   <owner>finnur@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -902,7 +1055,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.Windows.StartMenuShortcutStatus"
-    enum="WindowsNotificationStartMenuShortcutStatus" expires_after="M90">
+    enum="WindowsNotificationStartMenuShortcutStatus" expires_after="M94">
   <owner>chengx@chromium.org</owner>
   <owner>finnur@chromium.org</owner>
   <owner>peter@chromium.org</owner>
@@ -913,7 +1066,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Notifications.XPCConnectionEvent" enum="XPCConnectionEvent"
-    expires_after="M87">
+    expires_after="M94">
   <owner>peter@chromium.org</owner>
   <owner>rsesek@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/obsolete_histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/obsolete_histograms.xml
index 2dbae872490..850d262dff3 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/obsolete_histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/obsolete_histograms.xml
@@ -25690,7 +25690,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="GPU.BlacklistFeatureTestResultsWindows"
-    enum="GPUBlacklistFeatureTestResultsWindows" expires_after="2018-02-28">
+    enum="GPUBlocklistFeatureTestResultsWindows" expires_after="2018-02-28">
   <obsolete>
     Replaced by GPU.BlacklistFeatureTestResultsWindows2 in M67.
   </obsolete>
@@ -29317,6 +29317,23 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>The Linux distro used. Logged on each start up.</summary>
 </histogram>
 
+<histogram name="Linux.X11.ServerRTT" units="microseconds" expires_after="M77">
+  <obsolete>
+    Removed 11/20 due to lack of usage.
+  </obsolete>
+  <owner>thomasanderson@chromium.org</owner>
+  <summary>
+    RTT between Chrome and the X11 server. Tracked in X11EventSource by
+    measuring the latency to receive a property event after changing a property.
+
+    Warning: This metric may include reports from clients with low-resolution
+    clocks (i.e. on Windows, ref. |TimeTicks::IsHighResolution()|). Such reports
+    will cause this metric to have an abnormal distribution. When considering
+    revising this histogram, see UMA_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES for the
+    solution.
+  </summary>
+</histogram>
+
 <histogram name="LoadingPredictor.SubresourceConnectDuration" units="ms"
     expires_after="2018-02-28">
   <obsolete>
@@ -35955,7 +35972,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Navigation.TimeToCommit" units="ms" expires_after="2018-03-30">
   <obsolete>
-    Removed March 2018 in favor of Navigation.StartToCommit variants.
+    Removed March 2018 in favor of Navigation.StartToCommit variants. Removed
+    from code in November 2020 (M89).
   </obsolete>
   <owner>carlosk@chromium.org</owner>
   <summary>
@@ -81652,11 +81670,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Sync.NonRedundantInvalidationPerModelType"
     enum="SyncModelTypes" expires_after="M77">
   <obsolete>
-    Was used during the launch for the new implementation.
+    Deprecated in 10/2019. Was used during the launch of the new implementation.
   </obsolete>
   <owner>melandory@chromium.org</owner>
   <summary>
-    The sync datatype of the recieved invalidation with fresh version.
+    WARNING: The recordings here are incorrect (crbug.com/1158476).
+
+    The sync datatype of the received invalidation with fresh version.
   </summary>
 </histogram>
 
diff --git a/chromium/tools/metrics/histograms/histograms_xml/offline/OWNERS b/chromium/tools/metrics/histograms/histograms_xml/offline/OWNERS
new file mode 100644
index 00000000000..c96d97e5577
--- /dev/null
+++ b/chromium/tools/metrics/histograms/histograms_xml/offline/OWNERS
@@ -0,0 +1,4 @@
+# If these reviewers are unavailable, please send CLs to
+# <chromium-metrics-reviews@google.com>. See tools/metrics/histograms/histograms_xml/OWNERS
+# for details.
+tbansal@chromium.org
\ No newline at end of file
diff --git a/chromium/tools/metrics/histograms/histograms_xml/offline/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/offline/histograms.xml
index a2bcb42b46c..5dc9c7dd3b3 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/offline/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/offline/histograms.xml
@@ -21,8 +21,32 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<histogram name="Offline.Measurements.MeasurementInterval" units="minutes"
+    expires_after="2021-04-04">
+  <owner>curranmax@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    The specified interval (in minutes) which the offline measurements
+    experiment will periodically run. This value is logged when Chrome starts up
+    for users where this feature is enabled.
+  </summary>
+</histogram>
+
+<histogram name="Offline.Measurements.TimeBetweenChecks" units="minutes"
+    expires_after="2021-04-04">
+  <owner>curranmax@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    The time (in minutes) between the last check and current check for the
+    offline measurements experiment. This value is logged each time the offline
+    measurements background task runs.
+  </summary>
+</histogram>
+
 <histogram name="OfflineIndicator.ConnectivityChanged.DeviceState.Offline"
-    enum="OfflineIndicatorSurfaceState" expires_after="2021-05-09">
+    enum="OfflineIndicatorSurfaceState" expires_after="2021-07-11">
+  <owner>curranmax@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
   <owner>sinansahin@google.com</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -33,7 +57,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OfflineIndicator.ConnectivityChanged.DeviceState.Online"
-    enum="OfflineIndicatorSurfaceState" expires_after="2021-01-01">
+    enum="OfflineIndicatorSurfaceState" expires_after="2021-05-09">
+  <owner>curranmax@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
   <owner>sinansahin@google.com</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -53,8 +79,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="OfflineIndicator.ShownDuration" units="s"
-    expires_after="2021-05-09">
+<histogram name="OfflineIndicator.ShownDuration" units="ms"
+    expires_after="2021-07-11">
+  <obsolete>
+    Removed M90. Replaced by OfflineIndicator.ShownDurationV2.
+  </obsolete>
+  <owner>curranmax@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
   <owner>sinansahin@google.com</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -63,6 +94,100 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="OfflineIndicator.ShownDurationV2" units="ms"
+    expires_after="2021-08-01">
+  <owner>curranmax@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    The duration the offline indicator was shown. Recorded when the offline
+    indicator stops being shown. There are two differences between this
+    histogram and OfflineIndicator.ShownDuration: 1) the maximum bucket size and
+    total number of buckets are higher in this histogram, and 2) this histogram
+    is persisted in perfs. The second point means that if the user backgrounds
+    then kills Chrome when the Offline Indicator was shown, then we will still
+    record a sample. Note that in this case, when the user opens Chrome again
+    and if the Offline Indicator is shown, then it will be treated as a
+    continuation from before Chrome was killed.
+  </summary>
+</histogram>
+
+<histogram name="OfflineIndicator.ShownDurationV2.InBackground" units="ms"
+    expires_after="2021-08-01">
+  <owner>curranmax@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    The duration the offline indicator was shown and Chrome was in the
+    background. Samples are only recorded to this histogram if Chrome was in the
+    background at some point while the offline indicator was shown. This is
+    recorded when the offline indicator stops being shown. The data for this
+    histogram is persisted in perfs, so if Chrome is killed, then we will still
+    record a sample. Note that in this case, when the user opens Chrome again
+    and the offline indicator is shown, then it will be treated as a
+    continuation from before Chrome was killed.
+  </summary>
+</histogram>
+
+<histogram name="OfflineIndicator.ShownDurationV2.InForeground" units="ms"
+    expires_after="2021-08-01">
+  <owner>curranmax@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    The duration the offline indicator was shown and Chrome was in the
+    foreground. This is recorded every time the offline indicator stops being
+    shown. The data for this histogram is persisted in perfs, so if Chrome is
+    killed, then we will still record a sample. Note that in this case, when the
+    user opens Chrome again and the offline indicator is shown, then it will be
+    treated as a continuation from before Chrome was killed.
+  </summary>
+</histogram>
+
+<histogram
+    name="OfflineIndicator.ShownDurationV2.InForegroundWithoutBeingBackgrounded"
+    units="ms" expires_after="2021-08-01">
+  <owner>curranmax@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    The duration the offline indicator was shown and Chrome was in the
+    foreground. Samples are only recorded to this histogram if Chrome was never
+    in the background while the offline indicator was shown. This is recoreded
+    when the offline indicator stops being shown. The data for this histogram is
+    persisted in perfs, so if Chrome is killed, then we will still record a
+    sample. Note that in this case, when the user opens Chrome again and the
+    offline indicator is shown, then it will be treated as a continuation from
+    before Chrome was killed.
+  </summary>
+</histogram>
+
+<histogram name="OfflineIndicator.ShownDurationV2.NumTimesBackgrounded"
+    units="times backgrounded" expires_after="2021-08-01">
+  <owner>curranmax@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    The number of times Chrome was backgrounded while the offline indicator was
+    shown. This is recorded every time the offline indicator stops being shown.
+    The data for this histogram is persisted in perfs, so if Chrome is killed,
+    then we will still record a sample. Note that in this case, when the user
+    opens Chrome again and the offline indicator is shown, then it will be
+    treated as a continuation from before Chrome was killed.
+  </summary>
+</histogram>
+
+<histogram name="OfflineIndicator.ShownDurationV2.UntilFirstTimeBackgrounded"
+    units="ms" expires_after="2021-08-01">
+  <owner>curranmax@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    The duration the offline indicator was first shown and in the foreground
+    until Chrome was backgrounded. Samples are only recorded to this histogram
+    if Chrome was in the background at some point while the offline indicator
+    was shown. This is recoreded when the offline indicator stops being shown.
+    The data for this histogram is persisted in perfs, so if Chrome is killed,
+    then we will still record a sample. Note that in this case, when the user
+    opens Chrome again and the offline indicator is shown, then it will be
+    treated as a continuation from before Chrome was killed.
+  </summary>
+</histogram>
+
 <histogram base="true" name="OfflinePages.AccessCount" units="units"
     expires_after="M85">
   <owner>jianli@chromium.org</owner>
@@ -111,7 +236,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OfflinePages.AutoFetch.CompleteNotificationAction"
-    enum="OfflinePagesAutoFetchNotificationAction" expires_after="2021-05-31">
+    enum="OfflinePagesAutoFetchNotificationAction" expires_after="2021-08-01">
   <owner>sclittle@chromium.org</owner>
   <owner>offline-dev@chromium.org</owner>
   <summary>
@@ -121,7 +246,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OfflinePages.AutoFetch.InProgressNotificationAction"
-    enum="OfflinePagesAutoFetchNotificationAction" expires_after="2021-05-31">
+    enum="OfflinePagesAutoFetchNotificationAction" expires_after="2021-08-01">
   <owner>sclittle@chromium.org</owner>
   <owner>offline-dev@chromium.org</owner>
   <summary>
@@ -281,6 +406,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="OfflinePages.Background.OffliningPreviewStatus"
     enum="BooleanEnabled" expires_after="2021-01-25">
+  <obsolete>
+    Removed 22 Jan 2021.
+  </obsolete>
   <owner>petewil@chromium.org</owner>
   <owner>offline-dev@chromium.org</owner>
   <summary>
@@ -537,6 +665,22 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>Result of removing an offline copy for a page.</summary>
 </histogram>
 
+<histogram name="OfflinePages.DidNavigationThrottleCancelNavigation"
+    enum="Boolean" expires_after="M94">
+  <owner>curranmax@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Whether or not the OfflinePageNavigationThrottle canceled a navigation
+    request. Requests are only canceled if and only if the navigation request
+    was initiated by the renderer and the request headers contain the
+    &quot;X-Chrome-offline&quot; header.
+
+    This histogram is recorded each time Chrome tries to create an
+    OfflinePageNavigationThrottle, which only happens on Android (since Offline
+    Pages is on enabled there).
+  </summary>
+</histogram>
+
 <histogram name="OfflinePages.DownloadRequestTimeSinceDuplicateRequested"
     units="seconds" expires_after="2021-06-25">
   <owner>dewittj@chromium.org</owner>
@@ -622,7 +766,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OfflinePages.OfflineUsage.NotOfflineResilient"
-    enum="OfflinePagesOfflineUsage" expires_after="2021-05-31">
+    enum="OfflinePagesOfflineUsage" expires_after="2021-08-01">
   <owner>sclittle@chromium.org</owner>
   <owner>offline-dev@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/omnibox/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/omnibox/histograms.xml
index e30cd6acbc2..e6e38ffa14a 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/omnibox/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/omnibox/histograms.xml
@@ -47,7 +47,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.BitmapFetchLatency" units="ms"
-    expires_after="2021-04-23">
+    expires_after="2021-06-27">
 <!-- Name completed by histogram_suffixes name="Omnibox.BitmapFetchLatencyCacheSplit" -->
 
   <owner>manukh@chromium.org</owner>
@@ -64,7 +64,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.CharTypedToRepaintLatency" units="ms"
-    expires_after="2021-03-23">
+    expires_after="2021-06-30">
   <owner>jdonnelly@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -221,7 +221,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.CutOrCopyAllText" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-06-30">
   <owner>jdonnelly@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
@@ -274,7 +274,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.EnteredKeywordMode2" enum="OmniboxEnteredKeywordMode2"
-    expires_after="2021-04-04">
+    expires_after="2021-06-30">
   <owner>jdonnelly@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
@@ -336,7 +336,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Omnibox.HoverTime" units="ms" expires_after="M88">
+<histogram name="Omnibox.HoverTime" units="ms" expires_after="M94">
   <owner>estark@chromium.org</owner>
   <owner>carlosil@chromium.org</owner>
   <summary>
@@ -389,7 +389,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.IsPasteAndGo" enum="Boolean"
-    expires_after="2021-01-30">
+    expires_after="2021-06-30">
   <owner>jdonnelly@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
@@ -407,7 +407,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Omnibox.IsPopupOpen" enum="Boolean" expires_after="2021-01-30">
+<histogram name="Omnibox.IsPopupOpen" enum="Boolean" expires_after="2021-06-30">
   <owner>mpearson@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
@@ -442,8 +442,34 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Omnibox.Lens.LensSupportStatus" enum="LensSupportStatus"
+    expires_after="2021-11-18">
+  <owner>yusuyoutube@google.com</owner>
+  <owner>benwgold@google.com</owner>
+  <owner>fgorski@chromium.org</owner>
+  <owner>wylieb@chromium.org</owner>
+  <owner>lens-chrome@google.com</owner>
+  <summary>
+    Whether the user supports the camera assisted search with Google Lens and if
+    not, the reason why. Recorded only if the feature is enabled when the
+    omnibox is loaded.
+  </summary>
+</histogram>
+
+<histogram name="Omnibox.Lens.TimeSpentInLens" units="ms" expires_after="M94">
+  <owner>yusuyoutube@google.com</owner>
+  <owner>benwgold@google.com</owner>
+  <owner>fgorski@chromium.org</owner>
+  <owner>wylieb@chromium.org</owner>
+  <owner>lens-chrome@google.com</owner>
+  <summary>
+    Logged the elapsed time between the time when user enters the Google Lens
+    and the time when user returns to Chrome. Only logged on Android.
+  </summary>
+</histogram>
+
 <histogram name="Omnibox.LocalHistoryZeroSuggest.AsyncDeleteTime" units="ms"
-    expires_after="M87">
+    expires_after="2022-01-01">
   <owner>mahmadi@chromium.org</owner>
   <owner>tommycli@chromium.org</owner>
   <summary>
@@ -454,7 +480,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.LocalHistoryZeroSuggest.SearchTermsExtractedCount"
-    units="count" expires_after="M87">
+    units="count" expires_after="2022-01-01">
   <owner>mahmadi@chromium.org</owner>
   <owner>tommycli@chromium.org</owner>
   <summary>
@@ -466,7 +492,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.LocalHistoryZeroSuggest.SearchTermsExtractionTime"
-    units="ms" expires_after="M87">
+    units="ms" expires_after="2022-01-01">
   <owner>mahmadi@chromium.org</owner>
   <owner>tommycli@chromium.org</owner>
   <summary>
@@ -477,7 +503,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.LocalHistoryZeroSuggest.SyncDeleteTime" units="ms"
-    expires_after="M87">
+    expires_after="2022-01-01">
   <owner>mahmadi@chromium.org</owner>
   <owner>tommycli@chromium.org</owner>
   <summary>
@@ -488,7 +514,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.MatchStability.AsyncMatchChange2" units="position"
-    expires_after="2021-05-02">
+    expires_after="2021-06-30">
   <owner>tommycli@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
   <summary>
@@ -518,7 +544,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.MatchStability.AsyncMatchChangedInAnyPosition"
-    enum="BooleanChanged" expires_after="2021-05-02">
+    enum="BooleanChanged" expires_after="2021-06-30">
   <owner>tommycli@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
   <summary>
@@ -581,7 +607,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.OnDeviceHeadSuggest.ResultCount" units="count"
-    expires_after="2021-05-09">
+    expires_after="2021-08-09">
   <owner>cch@chromium.org</owner>
   <owner>suggest-2g@google.com</owner>
   <summary>
@@ -600,7 +626,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Omnibox.Paste" units="count" expires_after="2021-01-30">
+<histogram name="Omnibox.Paste" units="count" expires_after="2021-06-30">
   <owner>jdonnelly@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
@@ -610,7 +636,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Omnibox.PasteAndGo" units="count" expires_after="2021-04-11">
+<histogram name="Omnibox.PasteAndGo" units="count" expires_after="M89">
+  <obsolete>
+    Removed 2021-01 due to redundancy with Omnibox.IsPasteAndGo.
+  </obsolete>
   <owner>mpearson@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
   <summary>
@@ -620,7 +649,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.PedalShown" enum="SuggestionPedalType"
-    expires_after="2021-06-01">
+    expires_after="2021-06-30">
   <owner>jdonnelly@chromium.org</owner>
   <owner>orinj@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
@@ -661,7 +690,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.Search.OffTheRecord" enum="BooleanOffTheRecord"
-    expires_after="2021-06-01">
+    expires_after="2021-06-30">
   <owner>rhalavati@chromium.org</owner>
   <owner>chrome-privacy-core@google.com</owner>
   <summary>
@@ -681,8 +710,40 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Omnibox.SearchPrefetch.PrefetchEligibilityReason"
+    enum="SearchPrefetchEligibilityReason" expires_after="M94">
+  <owner>ryansturm@chromium.org</owner>
+  <owner>chrome-omnibox-team@google.com</owner>
+  <summary>
+    The reason that a search prefetch request from the autocomplete/omnibox
+    suggest pipeline was not eligible to be prefetched (or 'Prefetched' if it
+    was prefetched). Recorded when a prefetch is requested from suggest if the
+    prefetch match type (default match) is allowed by feature policy.
+  </summary>
+</histogram>
+
+<histogram name="Omnibox.SearchPrefetch.PrefetchFinalStatus"
+    enum="SearchPrefetchFinalStatus" expires_after="M94">
+  <owner>ryansturm@chromium.org</owner>
+  <owner>chrome-omnibox-team@google.com</owner>
+  <summary>
+    The status of a Search Prefetch request when it is deleted by expiration or
+    by serving the request.
+  </summary>
+</histogram>
+
+<histogram name="Omnibox.SearchPrefetch.PrefetchServingReason"
+    enum="SearchPrefetchServingReason" expires_after="M94">
+  <owner>ryansturm@chromium.org</owner>
+  <owner>chrome-omnibox-team@google.com</owner>
+  <summary>
+    The reason that a navigation request could or could not serve a prefetch
+    request. Recorded for all main frame navigations.
+  </summary>
+</histogram>
+
 <histogram name="Omnibox.SearchProviderMatches" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-06-30">
   <owner>jdonnelly@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
@@ -694,7 +755,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.SelectedPosition" units="position"
-    expires_after="2021-06-30">
+    expires_after="2021-08-22">
   <owner>jdonnelly@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
@@ -727,7 +788,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.Start.WantAsyncMatches" enum="Boolean"
-    expires_after="2021-03-01">
+    expires_after="2021-06-30">
   <owner>tommycli@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
   <summary>
@@ -744,7 +805,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.SuggestionUsed.AnswerInSuggest"
-    enum="SuggestionAnswerOptionalType" expires_after="2021-06-01">
+    enum="SuggestionAnswerOptionalType" expires_after="2021-06-30">
   <owner>jdonnelly@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
@@ -780,7 +841,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.SuggestionUsed.Pedal" enum="SuggestionPedalType"
-    expires_after="2021-06-01">
+    expires_after="2021-06-30">
   <owner>jdonnelly@chromium.org</owner>
   <owner>orinj@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
@@ -873,7 +934,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.SuggestRequest.Failure.GoogleResponseTime" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-06-30">
   <owner>mpearson@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
   <owner>cch@chromium.org</owner>
@@ -885,7 +946,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.SuggestRequest.Success.GoogleResponseTime" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-06-30">
   <owner>mpearson@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
   <owner>cch@chromium.org</owner>
@@ -897,7 +958,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.SuggestRequest.Success.PrefetchImagesCount"
-    units="count" expires_after="2021-04-09">
+    units="count" expires_after="2021-06-30">
   <owner>manukh@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
@@ -908,7 +969,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.SuggestRequests" enum="OmniboxSuggestRequests"
-    expires_after="2021-05-09">
+    expires_after="2021-06-30">
   <owner>mpearson@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
   <owner>cch@chromium.org</owner>
@@ -918,6 +979,37 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Omnibox.TabMatchTime" units="microseconds"
+    expires_after="2021-06-30">
+  <owner>gangwu@chromium.org</owner>
+  <owner>jdonnelly@chromium.org</owner>
+  <owner>mpearson@chromium.org</owner>
+  <owner>chrome-omnibox-team@google.com</owner>
+  <summary>
+    This histogram reports the amount of time it takes to match one set of
+    suggestions against all open tabs. This metric is collected once for every
+    time a new set of suggestions is received. This includes the Omnibox Focus
+    event (when zero-prefix suggestions are offered) and every subsequent key
+    stroke, including deletion, backspace etc.
+
+    Each keystroke produces multiple events offering autocomplete matches: a)
+    one synchronous, when Start() is called. b) any number of intermediate
+    events, depending on whether Providers request the update. c) one at the
+    end, when the process completes.
+
+    Since these are produced about 3 times per keystroke, the total time
+    consumed per Omnibox interaction is - optimistically -
+    3*Omnibox.TypedLength*TabMatchTime. this excludes all the time spent
+    formulating the query, such as correcting the input. This metric does not
+    express the cumulative time spent matching the tabs (because we do not have
+    a metric that counts the number of suggestions the user actually fetched -
+    eg. we do not count the number of suggestions received when user pressed the
+    backspace key).
+
+    This histogram only records metrics on machines with high-resolution clocks.
+  </summary>
+</histogram>
+
 <histogram name="Omnibox.ToggleSuggestionGroupId.Off" enum="SuggestionGroupId"
     expires_after="2021-08-01">
   <owner>mahmadi@google.com</owner>
@@ -956,11 +1048,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     not take into account any redirects that destination URL may do before
     finally serving a page. In other words, it's the scheme of the first request
     in a possible chain.
+
+    Due to a bug, recorded paste-and-go actions through M-88 (inclusive).
+    Excluded in M-89+.
   </summary>
 </histogram>
 
 <histogram name="Omnibox.UserTextCleared" enum="OmniboxUserTextCleared"
     expires_after="M85">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>kenjibaheux@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
@@ -993,7 +1091,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.ZeroSuggest.Eligible.OnFocusV2"
-    enum="ZeroSuggestEligibleOnFocus" expires_after="2021-04-04">
+    enum="ZeroSuggestEligibleOnFocus" expires_after="2021-06-30">
   <owner>mpearson@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
   <summary>
@@ -1026,7 +1124,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.ZeroSuggest.Eligible.OnProfileOpen"
-    enum="BooleanSupported" expires_after="2021-01-31">
+    enum="BooleanSupported" expires_after="2021-06-30">
   <owner>mpearson@chromium.org</owner>
   <owner>jdonnelly@chromium.org</owner>
   <summary>
@@ -1053,7 +1151,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Omnibox.ZeroSuggestRequests" enum="OmniboxZeroSuggestRequests"
-    expires_after="2021-04-04">
+    expires_after="2021-06-30">
   <owner>ender@chromium.org</owner>
   <owner>tommycli@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/oobe/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/oobe/histograms.xml
index 7ef6c40a1c8..9d4ddcc6735 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/oobe/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/oobe/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="OOBE.ArcTermsOfServiceScreen.ReviewFollowingSetup"
-    enum="BooleanChecked" expires_after="2021-02-14">
+    enum="BooleanChecked" expires_after="2021-07-27">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -32,7 +32,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OOBE.BootToSignInCompleted" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-08-08">
   <owner>alemate@chromium.org</owner>
   <owner>rsorokin@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
@@ -44,15 +44,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
-    Time spent on error screens during enrollment or autoenrollment.
+    Time spent on error screens during enrollment or autoenrollment. Recorded
+    when user leaves error screen.
   </summary>
 </histogram>
 
 <histogram name="OOBE.ErrorScreensTime.Signin" units="ms"
-    expires_after="2020-12-06">
+    expires_after="2021-08-01">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
-  <summary>Time spent on error screens during signin.</summary>
+  <summary>
+    Time spent on error screens during signin. Recorded when user leaves error
+    screen.
+  </summary>
 </histogram>
 
 <histogram name="OOBE.ErrorScreensTime.Supervised" units="ms"
@@ -60,19 +64,23 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
-    Time spent on error screens during supervised user creation.
+    Time spent on error screens during supervised user creation. Recorded when
+    user leaves error screen.
   </summary>
 </histogram>
 
 <histogram name="OOBE.ErrorScreensTime.Update" units="ms"
-    expires_after="2021-02-07">
+    expires_after="2021-08-01">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
-  <summary>Time spent on error screens during update.</summary>
+  <summary>
+    Time spent on error screens during update. Recorded when user leaves error
+    screen.
+  </summary>
 </histogram>
 
 <histogram name="OOBE.EulaScreen.UserActions" enum="EulaScreenUserAction"
-    expires_after="2021-02-02">
+    expires_after="2021-08-01">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -94,7 +102,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OOBE.FingerprintSetupScreen.UserActions"
-    enum="FingerprintSetupScreenUserAction" expires_after="2021-04-04">
+    enum="FingerprintSetupScreenUserAction" expires_after="2021-08-09">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -114,12 +122,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="OOBE.GestureNavigationScreen.PageShownTime"
-    units="ms" expires_after="2021-04-01">
+    units="ms" expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes
      name="GestureNavigationOOBEPage" -->
 
   <owner>mmourgos@chromium.org</owner>
-  <owner>tbarzic@chormium.org</owner>
+  <owner>tbarzic@chromium.org</owner>
   <summary>
     Records the amount of time that each page within the gesture navigation OOBE
     screen is shown. Recorded when the gesture navigation oobe screen is
@@ -128,7 +136,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OOBE.MarketingOptInScreen.BackendConnector"
-    enum="MarketingOptInBackendConnectorEvent" expires_after="2021-03-30">
+    enum="MarketingOptInBackendConnectorEvent" expires_after="2021-08-01">
   <owner>rrsilva@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -140,7 +148,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OOBE.MarketingOptInScreen.Event"
-    enum="MarketingOptInScreenEvent" expires_after="2021-03-30">
+    enum="MarketingOptInScreenEvent" expires_after="2021-08-01">
   <owner>rrsilva@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -150,7 +158,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OOBE.MarketingOptInScreen.GeolocationResolve"
-    enum="MarketingOptInGeolocationEvent" expires_after="2021-03-30">
+    enum="MarketingOptInGeolocationEvent" expires_after="2021-08-01">
   <owner>rrsilva@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -159,7 +167,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OOBE.MarketingOptInScreen.GeolocationResolveLength"
-    units="chars" expires_after="2021-03-30">
+    units="chars" expires_after="2021-08-09">
   <owner>rrsilva@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -189,6 +197,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>Number of times error screen has appeared during update.</summary>
 </histogram>
 
+<histogram name="OOBE.PinSetupScreen.UserActions"
+    enum="PinSetupScreenUserAction" expires_after="2021-07-30">
+  <owner>raleksandrov@google.com</owner>
+  <owner>cros-oac@google.com</owner>
+  <summary>
+    Tracks all user actions on the PinSetup screen. Recorded when user clicks on
+    buttons on the PinSetup screen or when screen is automatically skipped.
+  </summary>
+</histogram>
+
 <histogram name="OOBE.RecommendApps.Fetcher.AppCount" units="apps"
     expires_after="2021-07-30">
   <owner>raleksandrov@google.com</owner>
@@ -264,14 +282,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OOBE.StepCompletionTimeByExitReason" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>Time spent on specific OOBE screen grouped by exit reason.</summary>
 </histogram>
 
 <histogram name="OOBE.SyncConsentScreen.Behavior" enum="SyncConsentBehavior"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>jamescook@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -283,7 +301,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OOBE.SyncConsentScreen.ReviewFollowingSetup"
-    enum="BooleanChecked" expires_after="2021-04-11">
+    enum="BooleanChecked" expires_after="2021-08-09">
   <owner>raleksandrov@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -293,7 +311,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OOBE.SyncConsentScreen.SyncEnabled" enum="BooleanEnabled"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>jamescook@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -304,7 +322,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OOBE.SyncConsentScreen.UserChoice"
-    enum="SyncConsentUserChoice" expires_after="2021-04-04">
+    enum="SyncConsentUserChoice" expires_after="2021-08-09">
   <owner>jamescook@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -314,7 +332,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OOBE.UpdateScreen.StageTime.Check" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-01">
   <owner>dkuzmin@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -324,7 +342,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OOBE.UpdateScreen.StageTime.Download" units="ms"
-    expires_after="2021-02-01">
+    expires_after="2021-08-01">
   <owner>dkuzmin@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -334,7 +352,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OOBE.UpdateScreen.StageTime.Finalize" units="ms"
-    expires_after="2021-02-01">
+    expires_after="2021-08-01">
   <owner>dkuzmin@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -344,7 +362,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OOBE.UpdateScreen.StageTime.Verify" units="ms"
-    expires_after="2021-02-01">
+    expires_after="2021-08-01">
   <owner>dkuzmin@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -365,7 +383,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OOBE.WebUIToViewsSwitch.Duration" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>rsorokin@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -374,7 +392,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OOBE.WelcomeScreen.A11yUserActions"
-    enum="WelcomeScreenA11yUserAction" expires_after="2021-04-11">
+    enum="WelcomeScreenA11yUserAction" expires_after="2021-08-15">
   <owner>dkuzmin@google.com</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -384,6 +402,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="OOBE.WelcomeScreen.AcceptChromeVoxHint" enum="BooleanEnabled"
+    expires_after="2021-04-11">
+  <owner>akihiroota@google.com</owner>
+  <owner>cros-oac@google.com</owner>
+  <summary>
+    Whether or not the user accepted the ChromeVox hint. Recorded when the user
+    interacts with the ChromeVox hint dialog.
+  </summary>
+</histogram>
+
+<histogram name="OOBE.WelcomeScreen.ChromeVoxHintSpokenSuccess"
+    enum="BooleanEnabled" expires_after="2021-04-11">
+  <owner>akihiroota@google.com</owner>
+  <owner>cros-oac@google.com</owner>
+  <summary>
+    Whether or not the ChromeVox hint was successfully spoken. Recorded when the
+    ChromeVox hint dialog is shown.
+  </summary>
+</histogram>
+
 </histograms>
 
 </histogram-configuration>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/optimization/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/optimization/histograms.xml
index 145628dd176..421be35f0ac 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/optimization/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/optimization/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram base="true" name="OptimizationGuide.ApplyDecision"
-    enum="OptimizationGuideOptimizationTypeDecision" expires_after="2021-04-04">
+    enum="OptimizationGuideOptimizationTypeDecision" expires_after="M94">
   <owner>sophiechang@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -32,7 +32,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="OptimizationGuide.ApplyDecisionAsync"
-    enum="OptimizationGuideOptimizationTypeDecision" expires_after="2021-04-04">
+    enum="OptimizationGuideOptimizationTypeDecision" expires_after="M94">
   <owner>sophiechang@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -45,7 +45,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.ClearFetchedHints.StoreAvailable"
-    units="BooleanAvailable" expires_after="2021-01-31">
+    units="BooleanAvailable" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -55,7 +55,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.ClearHostModelFeatures.StoreAvailable"
-    units="BooleanAvailable" expires_after="2021-03-31">
+    units="BooleanAvailable" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -65,7 +65,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.HintCache.HintType.Loaded"
-    enum="HintCacheStoreEntryType" expires_after="2021-03-31">
+    enum="HintCacheStoreEntryType" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -76,7 +76,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="OptimizationGuide.HintCacheLevelDBStore.LoadMetadataResult"
     enum="OptimizationGuideHintCacheLevelDBStoreLoadMetadataResult"
-    expires_after="2021-03-31">
+    expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -86,8 +86,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.HintCacheLevelDBStore.Status"
-    enum="OptimizationGuideHintCacheLevelDBStoreStatus"
-    expires_after="2021-04-18">
+    enum="OptimizationGuideHintCacheLevelDBStoreStatus" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -97,7 +96,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="OptimizationGuide.HintsFetcher.GetHintsRequest.ActiveRequestCanceled"
-    units="counts" expires_after="2021-03-31">
+    units="counts" expires_after="M94">
   <owner>sophiechang@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -106,7 +105,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.HintsFetcher.GetHintsRequest.FetchLatency"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="M94">
   <owner>sophiechang@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -117,7 +116,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.HintsFetcher.GetHintsRequest.HintCount"
-    units="units" expires_after="2021-04-04">
+    units="units" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -127,7 +126,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.HintsFetcher.GetHintsRequest.HostCount"
-    units="total host count" expires_after="2021-03-15">
+    units="total host count" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -137,7 +136,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.HintsFetcher.GetHintsRequest.NetErrorCode"
-    enum="NetErrorCodes" expires_after="2021-04-04">
+    enum="NetErrorCodes" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -147,7 +146,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.HintsFetcher.GetHintsRequest.Status"
-    enum="HttpResponseCode" expires_after="2021-04-04">
+    enum="HttpResponseCode" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -157,7 +156,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.HintsFetcher.GetHintsRequest.UrlCount"
-    units="total url count" expires_after="2021-01-31">
+    units="total url count" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -167,8 +166,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.HintsFetcher.RequestStatus.BatchUpdate"
-    enum="OptimizationGuideHintsFetcherRequestStatus"
-    expires_after="2021-04-04">
+    enum="OptimizationGuideHintsFetcherRequestStatus" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -179,8 +177,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.HintsFetcher.RequestStatus.PageNavigation"
-    enum="OptimizationGuideHintsFetcherRequestStatus"
-    expires_after="2021-04-04">
+    enum="OptimizationGuideHintsFetcherRequestStatus" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -193,6 +190,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="OptimizationGuide.HintsFetcher.TopHostProvider.BlacklistSize.OnInitialize"
     units="total host count" expires_after="2021-03-31">
+  <obsolete>
+    Deprecated as of 2021/02.
+  </obsolete>
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -204,6 +204,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="OptimizationGuide.HintsFetcher.TopHostProvider.BlacklistSize.OnRequest"
     units="total host count" expires_after="2021-03-31">
+  <obsolete>
+    Deprecated as of 2021/02.
+  </obsolete>
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -213,8 +216,30 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram
+    name="OptimizationGuide.HintsFetcher.TopHostProvider.BlocklistSize.OnInitialize"
+    units="total host count" expires_after="M94">
+  <owner>mcrouse@chromium.org</owner>
+  <owner>sophiechang@chromium.org</owner>
+  <summary>
+    Records the number of hosts placed on the HintsFetcherTopHostBlocklist when
+    it is initialized.
+  </summary>
+</histogram>
+
+<histogram
+    name="OptimizationGuide.HintsFetcher.TopHostProvider.BlocklistSize.OnRequest"
+    units="total host count" expires_after="M94">
+  <owner>mcrouse@chromium.org</owner>
+  <owner>sophiechang@chromium.org</owner>
+  <summary>
+    Records the number of hosts on the HintsFetcherTopHostBlocklist when top
+    hosts are requested.
+  </summary>
+</histogram>
+
+<histogram
     name="OptimizationGuide.HintsManager.ConcurrentPageNavigationFetches"
-    units="counts" expires_after="2021-03-31">
+    units="counts" expires_after="M94">
   <owner>sophiechang@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -227,7 +252,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="OptimizationGuide.HintsManager.RaceNavigationFetchAttemptStatus"
     enum="OptimizationGuideRaceNavigationFetchAttemptStatus"
-    expires_after="2021-04-04">
+    expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -238,7 +263,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.IsPredictionModelValid" units="BooleanValid"
-    expires_after="2021-03-31">
+    expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -249,7 +274,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="OptimizationGuide.OptimizationFilterStatus"
-    enum="OptimizationGuideOptimizationFilterStatus" expires_after="2021-04-04">
+    enum="OptimizationGuideOptimizationFilterStatus" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -260,7 +285,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.OptimizationHintsComponent.MajorVersion"
-    units="major version number" expires_after="2021-03-31">
+    units="major version number" expires_after="M94">
   <owner>sophiechang@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -271,8 +296,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram
+    name="OptimizationGuide.PredictionManager.DownloadServiceAvailabilityBlockedFetch"
+    units="BooleanBlocked" expires_after="M94">
+  <owner>sophiechang@chromium.org</owner>
+  <owner>mcrouse@chromium.org</owner>
+  <summary>
+    Records whether the Download Service was unavailable and blocked a fetch
+    that would have happened otherwise. Only recorded if model downloads are
+    enabled for the session.
+  </summary>
+</histogram>
+
+<histogram
     name="OptimizationGuide.PredictionManager.HasHostModelFeaturesForHost"
-    enum="Boolean" expires_after="2021-01-31">
+    enum="Boolean" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -282,7 +319,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.PredictionManager.HostModelFeaturesMapSize"
-    units="total host count" expires_after="2021-03-31">
+    units="total host count" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -292,9 +329,53 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="OptimizationGuide.PredictionManager.IsDownloadUrlValid"
+    units="BooleanValid" expires_after="M94">
+  <owner>sophiechang@chromium.org</owner>
+  <owner>mcrouse@chromium.org</owner>
+  <summary>
+    Records whether the download URL received from the remote Optimization Guide
+    server is valid.
+  </summary>
+</histogram>
+
+<histogram base="true"
+    name="OptimizationGuide.PredictionManager.ModelTypeChanged"
+    units="BooleanChanged" expires_after="M94">
+  <owner>sophiechang@chromium.org</owner>
+  <owner>mcrouse@chromium.org</owner>
+  <summary>
+    Records whether the model type changed from model proto to model file, or
+    vice versa when the in-memory model for an optimization target has been
+    loaded.
+  </summary>
+</histogram>
+
+<histogram
+    name="OptimizationGuide.PredictionModelDownloadManager.DownloadSucceeded"
+    units="BooleanSucceeded" expires_after="M94">
+  <owner>sophiechang@chromium.org</owner>
+  <owner>mcrouse@chromium.org</owner>
+  <summary>
+    Records whether the Download Service notified whether a model download has
+    succeeded or failed.
+  </summary>
+</histogram>
+
+<histogram
+    name="OptimizationGuide.PredictionModelDownloadManager.DownloadVerificationStatus"
+    enum="OptimizationGuidePredictionModelDownloadStatus" expires_after="M94">
+  <owner>sophiechang@chromium.org</owner>
+  <owner>mcrouse@chromium.org</owner>
+  <summary>
+    The status of verifying and processing model downloads. Recorded once per
+    file that was successfully downloaded via the Download Service.
+  </summary>
+</histogram>
+
 <histogram base="true"
     name="OptimizationGuide.PredictionModelEvaluationLatency" units="ms"
-    expires_after="2021-04-04">
+    expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -305,9 +386,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="OptimizationGuide.PredictionModelExpired"
+    units="BooleanExpired" expires_after="M94">
+  <owner>sophiechang@chromium.org</owner>
+  <owner>mcrouse@chromium.org</owner>
+  <summary>
+    Records whether a prediction model expired if it was not updated or used
+    within the last 30 days by default, but can change subject to Finch
+    configuration.
+  </summary>
+</histogram>
+
 <histogram
     name="OptimizationGuide.PredictionModelFetcher.GetModelsRequest.HostCount"
-    units="total host count" expires_after="2021-03-31">
+    units="total host count" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -319,7 +411,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="OptimizationGuide.PredictionModelFetcher.GetModelsResponse.HostModelFeatureCount"
-    units="units" expires_after="2021-03-31">
+    units="units" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -330,7 +422,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="OptimizationGuide.PredictionModelFetcher.GetModelsResponse.NetErrorCode"
-    enum="NetErrorCodes" expires_after="2021-03-31">
+    enum="NetErrorCodes" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -341,7 +433,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="OptimizationGuide.PredictionModelFetcher.GetModelsResponse.Status"
-    enum="HttpResponseCode" expires_after="2021-03-31">
+    enum="HttpResponseCode" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -351,7 +443,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.PredictionModelLoadedVersion"
-    units="version number" expires_after="2021-03-31">
+    units="version number" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -363,7 +455,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="OptimizationGuide.PredictionModelStore.HostModelFeaturesLoadMetadataResult"
-    enum="BooleanLoaded" expires_after="2021-03-31">
+    enum="BooleanLoaded" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -373,7 +465,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.PredictionModelUpdateVersion"
-    units="version number" expires_after="2021-03-31">
+    units="version number" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -383,7 +475,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.PredictionModelValidationLatency" units="ms"
-    expires_after="2021-03-31">
+    expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -395,7 +487,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.ProcessHintsResult"
-    enum="OptimizationGuideProcessHintsResult" expires_after="2021-04-04">
+    enum="OptimizationGuideProcessHintsResult" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -406,7 +498,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OptimizationGuide.RemoteFetchingEnabled"
-    units="BooleanEnabled" expires_after="2021-04-04">
+    units="BooleanEnabled" expires_after="M94">
   <owner>sophiechang@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -419,8 +511,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="OptimizationGuide.ShouldTargetNavigation.PredictionModelStatus"
-    enum="OptimizationGuidePredictionManagerModelStatus"
-    expires_after="2021-04-04">
+    enum="OptimizationGuidePredictionManagerModelStatus" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>sophiechang@chromium.org</owner>
   <summary>
@@ -432,8 +523,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="OptimizationGuide.TargetDecision"
-    enum="OptimizationGuideOptimizationTargetDecision"
-    expires_after="2021-03-31">
+    enum="OptimizationGuideOptimizationTargetDecision" expires_after="M94">
   <owner>sophiechang@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/others/OWNERS b/chromium/tools/metrics/histograms/histograms_xml/others/OWNERS
index 0f60bbbbced..4729d629df6 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/others/OWNERS
+++ b/chromium/tools/metrics/histograms/histograms_xml/others/OWNERS
@@ -4,5 +4,6 @@
 #  - You work in the same area as them.
 #  - They are already a good reviewer for the non-metrics part of the CL.
 # See tools/metrics/histograms/histograms_xml/OWNERS for details.
+csharrison@chromium.org
 tbansal@chromium.org
 tby@chromium.org
diff --git a/chromium/tools/metrics/histograms/histograms_xml/others/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/others/histograms.xml
index 322624022a9..a84c7983ec6 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/others/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/others/histograms.xml
@@ -33,8 +33,47 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <variant name=".Unknown" summary="unknown but not the default search engine"/>
 </variants>
 
+<variants name="VoiceIntentTargetVariant">
+  <variant name="Assistant" summary="Assistant voice transcription."/>
+  <variant name="System" summary="System voice transcription."/>
+</variants>
+
+<variants name="WebContentsObserverMethods">
+  <variant name="DidChangeVisibleSecurityState"/>
+  <variant name="DidFinishLoad"/>
+  <variant name="DidFinishNavigation"/>
+  <variant name="DidFirstVisuallyNonEmptyPaint"/>
+  <variant name="DidRedirectNavigation"/>
+  <variant name="DidStartLoading"/>
+  <variant name="DidStartNavigation"/>
+  <variant name="DidStopLoading"/>
+  <variant name="DocumentAvailableInMainFrame"/>
+  <variant name="DOMContentLoaded"/>
+  <variant name="LoadProgressChanged"/>
+  <variant name="NavigationEntryChanged"/>
+  <variant name="NavigationEntryCommitted"/>
+  <variant name="NavigationEntryDeleted"/>
+  <variant name="OnVisibilityChanged"/>
+  <variant name="RenderFrameCreated"/>
+  <variant name="RenderFrameDeleted"/>
+  <variant name="RenderViewReady"/>
+  <variant name="TitleWasSet"/>
+</variants>
+
+<histogram name="AccountManager.AccountAdditionResultStatus"
+    enum="AccountManagerAccountAdditionResultStatus" expires_after="2022-02-01">
+  <owner>sinhak@chromium.org</owner>
+  <owner>anastasiian@chromium.org</owner>
+  <summary>
+    Records the result of in-session account addition (or re-authentication)
+    triggers on Chrome OS. This is recorded whenever an in-session account
+    addition (or re-authentication) is triggered and user finishes or cancels
+    the flow.
+  </summary>
+</histogram>
+
 <histogram name="AccountManager.AccountAdditionSource"
-    enum="AccountManagerAccountAdditionSource" expires_after="2021-03-28">
+    enum="AccountManagerAccountAdditionSource" expires_after="2021-08-01">
   <owner>sinhak@chromium.org</owner>
   <owner>anastasiian@chromium.org</owner>
   <summary>
@@ -47,7 +86,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AccountManager.EduCoexistence.CreateRaptResult"
-    enum="GaiaReAuthProofTokenStatus" expires_after="2021-06-01">
+    enum="GaiaReAuthProofTokenStatus" expires_after="2021-08-01">
   <owner>sinhak@chromium.org</owner>
   <owner>anastasiian@chromium.org</owner>
   <summary>
@@ -58,7 +97,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AccountManager.EduCoexistence.FetchAccessTokenResult"
-    enum="GoogleServiceAuthError" expires_after="2021-06-01">
+    enum="GoogleServiceAuthError" expires_after="2021-08-01">
   <owner>sinhak@chromium.org</owner>
   <owner>anastasiian@chromium.org</owner>
   <summary>
@@ -79,7 +118,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AccountManager.EduCoexistence.FlowResult"
-    enum="EduCoexistenceFlowResult" expires_after="2021-06-01">
+    enum="EduCoexistenceFlowResult" expires_after="2021-08-01">
   <owner>sinhak@chromium.org</owner>
   <owner>anastasiian@chromium.org</owner>
   <summary>
@@ -88,6 +127,30 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="AccountManager.EduCoexistenceV2.InSessionFlowResult"
+    enum="EduCoexistenceFlowV2Result" expires_after="2021-11-01">
+  <owner>agawronska@chromium.org</owner>
+  <owner>danan@chromium.org</owner>
+  <owner>yilkal@chromium.org</owner>
+  <owner>cros-families-eng@google.com</owner>
+  <summary>
+    Records the last completed step in the EDU account addition flow. Allows to
+    track the drop rate by important states during the in session flow.
+  </summary>
+</histogram>
+
+<histogram name="AccountManager.EduCoexistenceV2.OnboardingFlowResult"
+    enum="EduCoexistenceFlowV2Result" expires_after="2021-11-01">
+  <owner>agawronska@chromium.org</owner>
+  <owner>danan@chromium.org</owner>
+  <owner>yilkal@chromium.org</owner>
+  <owner>cros-families-eng@google.com</owner>
+  <summary>
+    Records the last completed step in the EDU account addition flow. Allows to
+    track the drop rate by important states during onboarding.
+  </summary>
+</histogram>
+
 <histogram name="AccountManager.InitializationTime" units="microseconds"
     expires_after="2021-08-09">
   <owner>sinhak@chromium.org</owner>
@@ -99,7 +162,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AccountManager.ManageAccountsServiceType"
-    enum="GaiaServiceType" expires_after="2021-01-24">
+    enum="GaiaServiceType" expires_after="2022-01-24">
   <owner>sinhak@chromium.org</owner>
   <owner>anastasiian@chromium.org</owner>
   <summary>
@@ -108,7 +171,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AccountManager.Migrations.Result" enum="BooleanSuccess"
-    expires_after="2021-03-28">
+    expires_after="2021-08-09">
   <owner>sinhak@chromium.org</owner>
   <summary>
     Tracks the final result of migrating accounts to Chrome OS Account Manager.
@@ -130,7 +193,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AccountManager.MirrorReauthenticationRequest"
-    enum="BooleanHit" expires_after="2021-03-28">
+    enum="BooleanHit" expires_after="2021-08-09">
   <owner>sinhak@chromium.org</owner>
   <owner>anastasiian@chromium.org</owner>
   <summary>
@@ -141,7 +204,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AccountManager.NumAccounts" units="count"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>sinhak@chromium.org</owner>
   <summary>
     Tracks the number of accounts stored in Chrome OS Account Manager by a given
@@ -150,7 +213,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AccountManager.TokenLoadStatus"
-    enum="AccountManagerTokenLoadStatus" expires_after="2021-06-07">
+    enum="AccountManagerTokenLoadStatus" expires_after="2021-08-09">
   <owner>sinhak@chromium.org</owner>
   <owner>anastasiian@chromium.org</owner>
   <summary>
@@ -302,7 +365,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Ads.Media.Duration" units="ms" expires_after="2021-03-28">
+<histogram name="Ads.Media.Duration" units="ms" expires_after="2021-08-01">
   <owner>johnidel@chromium.org</owner>
   <owner>dalecurtis@chromium.org</owner>
   <summary>
@@ -316,7 +379,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Ads.Media.LoadType" enum="MediaLoadType"
-    expires_after="2021-04-11">
+    expires_after="2021-08-09">
   <owner>johnidel@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -362,7 +425,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AnchorElementMetrics.Clicked.OnDSE.SameHost"
-    enum="BooleanAnchorElementSameHost" expires_after="2021-05-02">
+    enum="BooleanAnchorElementSameHost" expires_after="2021-08-09">
   <owner>tbansal@chromium.org</owner>
   <summary>
     True if the target link of the anchor element has the same host as the root
@@ -371,7 +434,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AnchorElementMetrics.Clicked.OnNonDSE.SameHost"
-    enum="BooleanAnchorElementSameHost" expires_after="2021-04-20">
+    enum="BooleanAnchorElementSameHost" expires_after="2021-08-22">
   <owner>tbansal@chromium.org</owner>
   <owner>ryansturm@chromium.org</owner>
   <owner>src/chrome/browser/navigation_predictor/OWNERS</owner>
@@ -404,7 +467,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AnimatedImage.NumOfFramesSkipped" units="count"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>khushalsagar@chromium.org</owner>
   <summary>
     If the frame rate for the image animation can not be reached, frames in the
@@ -507,7 +570,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AppBanners.BeforeInstallEvent"
-    enum="AppBannersBeforeInstallEvent" expires_after="2021-01-01">
+    enum="AppBannersBeforeInstallEvent" expires_after="2021-06-01">
   <owner>dominickn@chromium.org</owner>
   <owner>pjmclachlan@google.com</owner>
   <summary>
@@ -521,7 +584,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AppBanners.DismissEvent" enum="AppBannersDismissEvent"
-    expires_after="2021-05-09">
+    expires_after="2021-08-01">
   <owner>pjmclachlan@google.com</owner>
   <owner>pcovell@google.com</owner>
   <summary>
@@ -533,7 +596,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AppBanners.DisplayEvent" enum="AppBannersDisplayEvent"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>pjmclachlan@google.com</owner>
   <owner>pcovell@google.com</owner>
   <summary>
@@ -545,7 +608,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AppBanners.InstallableStatusCode"
-    enum="AppBannersInstallableStatusCode" expires_after="2021-04-04">
+    enum="AppBannersInstallableStatusCode" expires_after="2021-08-09">
   <owner>dominickn@chromium.org</owner>
   <owner>pjmclachlan@google.com</owner>
   <summary>
@@ -558,7 +621,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AppBanners.InstallEvent" enum="AppBannersInstallEvent"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>pjmclachlan@google.com</owner>
   <owner>pcovell@google.com</owner>
   <summary>
@@ -570,7 +633,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AppBanners.MinutesFromFirstVisitToBannerShown" units="minutes"
-    expires_after="2021-01-01">
+    expires_after="2021-06-01">
   <owner>dominickn@chromium.org</owner>
   <owner>pjmclachlan@google.com</owner>
   <summary>
@@ -582,7 +645,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AppBanners.UserResponse" enum="AppBannersUserResponse"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>dominickn@chromium.org</owner>
   <owner>pjmclachlan@google.com</owner>
   <summary>
@@ -632,14 +695,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="appcache.UpdateJob.Canceled" enum="BooleanCanceled"
-    expires_after="2021-05-25">
+    expires_after="2021-08-09">
   <owner>cmp@chromium.org</owner>
   <owner>pwnall@chromium.org</owner>
   <summary>Tracks whether the update job was canceled.</summary>
 </histogram>
 
 <histogram name="appcache.UpdateJob.ExistingCorruptionFixedInUpdate"
-    units="resources" expires_after="2021-05-25">
+    units="resources" expires_after="2021-08-09">
   <owner>cmp@chromium.org</owner>
   <owner>pwnall@chromium.org</owner>
   <summary>
@@ -652,7 +715,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="appcache.UpdateJob.ExistingResourceCheck" units="units"
-    expires_after="2021-05-25">
+    expires_after="2021-08-09">
   <owner>cmp@chromium.org</owner>
   <owner>pwnall@chromium.org</owner>
   <summary>
@@ -662,7 +725,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="appcache.UpdateJob.ExistingResourceCorrupt" units="units"
-    expires_after="2021-05-25">
+    expires_after="2021-08-09">
   <owner>cmp@chromium.org</owner>
   <owner>pwnall@chromium.org</owner>
   <summary>
@@ -675,7 +738,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="appcache.UpdateJob.ExistingResourceCorruptionRecovery"
-    units="units" expires_after="2021-05-25">
+    units="units" expires_after="2021-07-27">
   <owner>cmp@chromium.org</owner>
   <owner>pwnall@chromium.org</owner>
   <summary>
@@ -693,7 +756,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="appcache.UpdateJob.ExistingResourceNotCorrupt"
-    units="resources" expires_after="2021-05-25">
+    units="resources" expires_after="2021-08-09">
   <owner>cmp@chromium.org</owner>
   <owner>pwnall@chromium.org</owner>
   <summary>
@@ -706,7 +769,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="appcache.UpdateJob.ExistingResourceOnlyCorrupt"
-    units="resources" expires_after="2021-05-25">
+    units="resources" expires_after="2021-08-09">
   <owner>cmp@chromium.org</owner>
   <owner>enne@chromium.org</owner>
   <summary>
@@ -721,7 +784,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="appcache.UpdateJob.ExistingResourceOnlyNotCorrupt"
-    units="resources" expires_after="2021-05-25">
+    units="resources" expires_after="2021-08-09">
   <owner>cmp@chromium.org</owner>
   <owner>enne@chromium.org</owner>
   <summary>
@@ -736,7 +799,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="appcache.UpdateJob.ExistingResourceReused" units="units"
-    expires_after="2021-05-25">
+    expires_after="2021-08-09">
   <owner>cmp@chromium.org</owner>
   <owner>pwnall@chromium.org</owner>
   <summary>
@@ -746,14 +809,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="appcache.UpdateJob.FinalInternalState"
-    enum="AppCacheUpdateJobInternalState" expires_after="2021-05-25">
+    enum="AppCacheUpdateJobInternalState" expires_after="2021-08-09">
   <owner>cmp@chromium.org</owner>
   <owner>pwnall@chromium.org</owner>
   <summary>Tracks the final internal state for the update job.</summary>
 </histogram>
 
 <histogram name="appcache.UpdateJob.ResourceFreshness" units="days"
-    expires_after="2021-05-25">
+    expires_after="2021-08-09">
   <owner>cmp@chromium.org</owner>
   <owner>pwnall@chromium.org</owner>
   <summary>
@@ -773,7 +836,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AppManagement.AppDetailViews" enum="AppManagementUserAction"
-    expires_after="2021-03-15">
+    expires_after="2021-07-27">
 <!-- Name completed by histogram_suffixes name="AppType" -->
 
   <owner>jshikaram@chromium.org</owner>
@@ -785,7 +848,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AppManagement.EntryPoints" enum="AppManagementEntryPoint"
-    expires_after="2021-03-15">
+    expires_after="2021-08-09">
   <owner>jshikaram@chromium.org</owner>
   <owner>dominickn@chromium.org</owner>
   <summary>The ways the user opens up the App Management interface.</summary>
@@ -793,6 +856,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AsyncDNS.ConfigChange" enum="BooleanSuccess"
     expires_after="M77">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>pauljensen@chromium.org</owner>
   <owner>mef@chromium.org</owner>
   <summary>
@@ -802,6 +868,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AsyncDNS.ConfigNotifyInterval" units="ms" expires_after="M77">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>pauljensen@chromium.org</owner>
   <owner>mef@chromium.org</owner>
   <summary>
@@ -810,6 +879,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AsyncDNS.ConfigParseDuration" units="ms" expires_after="M81">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>pauljensen@chromium.org</owner>
   <owner>mef@chromium.org</owner>
   <summary>Duration of time spent parsing DnsConfig.</summary>
@@ -817,6 +889,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AsyncDNS.ConfigParsePosix" enum="AsyncDNSConfigParsePosix"
     expires_after="M77">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>pauljensen@chromium.org</owner>
   <owner>mef@chromium.org</owner>
   <summary>
@@ -826,6 +901,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AsyncDNS.ConfigParseWin" enum="AsyncDNSConfigParseWin"
     expires_after="M77">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>pauljensen@chromium.org</owner>
   <owner>mef@chromium.org</owner>
   <summary>
@@ -835,6 +913,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AsyncDNS.HostParseResult" enum="BooleanSuccess"
     expires_after="M77">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>pauljensen@chromium.org</owner>
   <owner>mef@chromium.org</owner>
   <summary>Whether DnsHosts were parsed successfully.</summary>
@@ -842,6 +923,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AsyncDNS.HostsChange" enum="BooleanSuccess"
     expires_after="M77">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>pauljensen@chromium.org</owner>
   <owner>mef@chromium.org</owner>
   <summary>
@@ -851,6 +935,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AsyncDNS.HostsNotifyInterval" units="ms" expires_after="M77">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>pauljensen@chromium.org</owner>
   <owner>mef@chromium.org</owner>
   <summary>
@@ -859,6 +946,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AsyncDNS.HostsParseDuration" units="ms" expires_after="M77">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>pauljensen@chromium.org</owner>
   <owner>mef@chromium.org</owner>
   <summary>Duration of time spent parsing DnsHosts.</summary>
@@ -866,6 +956,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AsyncDNS.HostsParseWin" enum="AsyncDNSHostsParseWin"
     expires_after="M77">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>pauljensen@chromium.org</owner>
   <owner>mef@chromium.org</owner>
   <summary>
@@ -874,6 +967,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="AsyncDNS.ServerCount" units="units" expires_after="2021-03-21">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>pauljensen@chromium.org</owner>
   <owner>mef@chromium.org</owner>
   <summary>
@@ -884,6 +980,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AsyncDNS.UnchangedConfigInterval" units="ms"
     expires_after="M77">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>pauljensen@chromium.org</owner>
   <owner>mef@chromium.org</owner>
   <summary>
@@ -894,6 +993,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AsyncDNS.UnchangedHostsInterval" units="ms"
     expires_after="2021-01-31">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>ericorth@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -904,6 +1006,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="AsyncDNS.WatchStatus" enum="AsyncDNSWatchStatus"
     expires_after="2021-01-31">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>ericorth@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -921,7 +1026,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Aura.WebContentsWindowUnOccludedTime" units="ms"
-    expires_after="2021-02-28">
+    expires_after="2021-07-11">
   <owner>alemate@chromium.org</owner>
   <owner>oshima@chromium.org</owner>
   <summary>
@@ -950,16 +1055,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Autocomplete.Events" enum="AutocompleteEvents"
-    expires_after="M85">
+    expires_after="M95">
   <owner>seblalancette@chromium.org</owner>
   <summary>
     Autocomplete events recorded when the user interacts with suggestions served
     from Autocomplete.
+
+    Note that this histogram was disabled after M85 and was only reenabled on
+    25.02.2021.
   </summary>
 </histogram>
 
 <histogram name="Autocomplete.MatchType" enum="AutocompleteMatchType"
-    expires_after="2021-05-21">
+    expires_after="2021-07-27">
   <owner>tbansal@chromium.org</owner>
   <owner>ryansturm@chromium.org</owner>
   <owner>chrome-omnibox-team@google.com</owner>
@@ -1151,6 +1259,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Badging.AppBadgeUpdate.Mac.Result"
     enum="UpdateAppBadgeMacResult" expires_after="M88">
+  <obsolete>
+    Removed in M88 as it's no longer needed.
+  </obsolete>
   <owner>phillis@chromium.org</owner>
   <owner>cmumford@chromium.org</owner>
   <summary>The result from updating the app badge on macOS.</summary>
@@ -1218,7 +1329,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>Records whenever a Blimp tab toggles visibility.</summary>
 </histogram>
 
-<histogram name="BlueZ.AdapterLost" units="seconds" expires_after="2021-03-15">
+<histogram name="BlueZ.AdapterLost" units="seconds" expires_after="2021-12-31">
   <owner>mcchou@chromium.org</owner>
   <summary>
     This is specific to Chrome OS. Records a duration of a Bluetooth adapter
@@ -1227,7 +1338,54 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="BlueZ.ChipLost2" units="seconds" expires_after="2021-03-15">
+<histogram name="BlueZ.AdvertisementMonitor.NumOfMonitors" units="count"
+    expires_after="2021-12-31">
+  <owner>apusaka@chromium.org</owner>
+  <owner>chromeos-bt-platform-sw-core@google.com</owner>
+  <summary>
+    This is specific to Chrome OS. Records the number of active advertisement
+    monitors every couple of minutes. This helps us to gauge the additional
+    power requirement for the advertisement monitor feature.
+  </summary>
+</histogram>
+
+<histogram name="BlueZ.AdvertisementMonitor.{Filter}.FilterPatternsPerMinute"
+    units="count" expires_after="2021-12-31">
+  <owner>apusaka@chromium.org</owner>
+  <owner>chromeos-bt-platform-sw-core@google.com</owner>
+  <summary>
+    This is specific to Chrome OS. Records the number of advertisement packet
+    received in the user space while the advertisement monitor is done using
+    {Filter} filtering. This helps us to gauge the additional power requirement
+    for the advertisement monitor feature.
+  </summary>
+  <token key="Filter">
+    <variant name="MSFT"/>
+    <variant name="SW"/>
+  </token>
+</histogram>
+
+<histogram name="BlueZ.AdvertisementMonitor.{Filter}.{Operation}.Result"
+    enum="BlueZResultOfAdvertisementMonitor" expires_after="2021-12-31">
+  <owner>apusaka@chromium.org</owner>
+  <owner>chromeos-bt-platform-sw-core@google.com</owner>
+  <summary>
+    This is specific to Chrome OS. Records the outcome of {Operation} operation
+    of advertisement monitor when {Filter} filtering is used. This helps us to
+    verify the correctness of this feature as well as to point out possible
+    regression.
+  </summary>
+  <token key="Filter">
+    <variant name="MSFT"/>
+    <variant name="SW"/>
+  </token>
+  <token key="Operation">
+    <variant name="Add"/>
+    <variant name="Remove"/>
+  </token>
+</histogram>
+
+<histogram name="BlueZ.ChipLost2" units="seconds" expires_after="2021-12-31">
   <owner>sonnysasaka@chromium.org</owner>
   <summary>
     This is specific to Chrome OS. Records a duration of a Bluetooth adapter
@@ -1237,7 +1395,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BlueZ.NumberOfExistingAdvertisements" units="advertisements"
-    expires_after="M81">
+    expires_after="2021-12-31">
   <owner>mcchou@chromium.org</owner>
   <summary>
     This is specific to Chrome OS. Records the number of existing advertisements
@@ -1248,7 +1406,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BlueZ.PerProfile.ConnectionResult"
-    enum="BlueZResultOfPerProfileConnection" expires_after="M89">
+    enum="BlueZResultOfPerProfileConnection" expires_after="2021-12-31">
 <!-- Name completed by histogram_suffixes name="BlueZPerProfileResult" -->
 
   <owner>mmandlik@google.com</owner>
@@ -1261,7 +1419,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BlueZ.PerProfile.ProbingResult"
-    enum="BlueZResultOfPerProfileProbing" expires_after="M89">
+    enum="BlueZResultOfPerProfileProbing" expires_after="2021-12-31">
 <!-- Name completed by histogram_suffixes name="BlueZPerProfileResult" -->
 
   <owner>mmandlik@google.com</owner>
@@ -1274,7 +1432,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BlueZ.ReasonOfDisconnection" enum="BlueZReasonOfDisconnection"
-    expires_after="2020-11-08">
+    expires_after="2021-12-31">
   <owner>mcchou@chromium.org</owner>
   <summary>
     This is specific to Chrome OS. Records the reason of Bluetooth disconnection
@@ -1284,7 +1442,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BlueZ.ResultOfAdvertisementRegistration"
-    enum="BlueZResultOfAdvertisementRegistration" expires_after="M85">
+    enum="BlueZResultOfAdvertisementRegistration" expires_after="2021-12-31">
   <owner>mcchou@chromium.org</owner>
   <summary>
     This is specific to Chrome OS. Records the outcomes of advertisement
@@ -1294,7 +1452,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BlueZ.ResultOfConnection" enum="BlueZResultOfConnection"
-    expires_after="2021-04-25">
+    expires_after="2021-12-31">
   <owner>mcchou@chromium.org</owner>
   <summary>
     This is specific to Chrome OS. Records the outcomes of connection requests
@@ -1304,7 +1462,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BlueZ.ResultOfPairing" enum="BlueZResultOfPairing"
-    expires_after="2021-04-11">
+    expires_after="2021-12-31">
   <owner>mcchou@chromium.org</owner>
   <summary>
     This is specific to Chrome OS. Records the outcomes of pairing with remote
@@ -1314,7 +1472,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BlueZ.TimeLengthOfAdvertisement" units="seconds"
-    expires_after="M85">
+    expires_after="2021-12-31">
   <owner>mcchou@chromium.org</owner>
   <summary>
     This is specific to Chrome OS. Records the duration when the local device is
@@ -1325,7 +1483,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BlueZ.TimeLengthOfDiscoverable" units="seconds"
-    expires_after="M81">
+    expires_after="2021-12-31">
   <owner>mcchou@chromium.org</owner>
   <summary>
     This is specific to Chrome OS. Records the duration when the local device is
@@ -1336,7 +1494,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BlueZ.TimeLengthOfDiscovering" units="seconds"
-    expires_after="2020-11-01">
+    expires_after="2021-12-31">
   <owner>mcchou@chromium.org</owner>
   <summary>
     This is specific to Chrome OS. Records the duration for the local device to
@@ -1346,7 +1504,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="BlueZ.TimeLengthOfPairing" units="seconds" expires_after="M82">
+<histogram name="BlueZ.TimeLengthOfPairing" units="seconds"
+    expires_after="2021-12-31">
   <owner>mcchou@chromium.org</owner>
   <summary>
     This is specific to Chrome OS. Records the duration taken to finish a
@@ -1356,7 +1515,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BlueZ.TimeLengthOfSetupConnection" units="seconds"
-    expires_after="M82">
+    expires_after="2021-12-31">
   <owner>mcchou@chromium.org</owner>
   <summary>
     This is specific to Chrome OS. Records the duration taken to finish a
@@ -1367,7 +1526,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BlueZ.TypeOfDiscovery" enum="BlueZTypeOfDiscovery"
-    expires_after="2020-03-01">
+    expires_after="2021-12-31">
   <owner>mcchou@chromium.org</owner>
   <summary>
     This is specific to Chrome OS. Records the types of device discovery
@@ -1377,7 +1536,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BlueZ.TypeOfFoundDevice" enum="BlueZTypeOfFoundDevice"
-    expires_after="M85">
+    expires_after="2021-12-31">
   <owner>mcchou@chromium.org</owner>
   <summary>
     This is specific to Chrome OS. Records the types of discovered devices in
@@ -1424,7 +1583,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="BookmarkManager.ResultsRenderedTime" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>calamity@chromium.org</owner>
   <owner>dbeam@chromium.org</owner>
   <summary>
@@ -1435,16 +1594,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Bookmarks.AddedPerProfileType" enum="BrowserProfileType"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>rhalavati@chromium.org</owner>
   <owner>chrome-privacy-core@google.com</owner>
   <summary>
     This histogram records when a bookmark is added sliced on profile type.
+
+    This was not recorded for Android before M90. Reading list and partner
+    bookmarks aren't reported by it.
   </summary>
 </histogram>
 
 <histogram name="Bookmarks.BookmarkAllTabsWithTabsCount.Incognito" units="tabs"
-    expires_after="2021-06-01">
+    expires_after="2021-08-09">
   <owner>rhalavati@chromium.org</owner>
   <owner>chrome-privacy-core@google.com</owner>
   <summary>
@@ -1454,7 +1616,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Bookmarks.BookmarkAllTabsWithTabsCount.Regular" units="tabs"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>rhalavati@chromium.org</owner>
   <owner>chrome-privacy-core@google.com</owner>
   <summary>
@@ -1463,6 +1625,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Bookmarks.BookmarksBarStatus.OnReadingListOpened"
+    enum="BookmarkBarPrefAndState" expires_after="2021-08-15">
+  <owner>corising@chromium.org</owner>
+  <owner>chrome-desktop-ui-sea@google.com</owner>
+  <summary>
+    This records the Boomarks bar pref state and status when the reading list is
+    opened. This will help determine how often the reading list is accessed from
+    the NTP where the bookmarks bar is always visible and the bookmark bar pref
+    state for those from the NTP. (Desktop only).
+  </summary>
+</histogram>
+
 <histogram name="Bookmarks.BookmarksInFolder" units="bookmarks"
     expires_after="M85">
   <owner>calamity@chromium.org</owner>
@@ -1483,7 +1657,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Bookmarks.Count.OnProfileLoad" units="bookmarks"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>supertri@chromium.org</owner>
   <owner>isherman@chromium.org</owner>
   <owner>aidanday@google.com</owner>
@@ -1512,75 +1686,38 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Bookmarks.Count.OnProfileLoad.DuplicateUrl2" units="bookmarks"
-    expires_after="2021-04-04">
+<histogram name="Bookmarks.Count.OnProfileLoad.Duplicate{UniquenessCriterion}"
+    units="bookmarks" expires_after="2021-06-06">
   <owner>mastiz@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
-    The number of bookmarks a user has saved with a URL that is also present in
-    at least one other bookmark. This excludes not only folders (which don't
-    have a URL) but it also excludes one bookmark per unique URL (that is, all
-    except one are considered duplicates). Recorded when bookmarks are loaded
-    into storage from disk if there is at least one duplicate.
-  </summary>
-</histogram>
-
-<histogram name="Bookmarks.Count.OnProfileLoad.DuplicateUrlAndTitle"
-    units="bookmarks" expires_after="2021-04-04">
-  <owner>mastiz@chromium.org</owner>
-  <owner>sky@chromium.org</owner>
-  <summary>
-    The number of bookmarks a user has saved with a URL and title pair that is
-    also present in at least one other bookmark. This excludes not only folders
-    (which don't have a URL) but it also excludes one bookmark per unique URL
-    and title pair (that is, all except one are considered duplicates). Recorded
-    when bookmarks are loaded into storage from disk if there is at least one
-    duplicate.
-  </summary>
-</histogram>
-
-<histogram name="Bookmarks.Count.OnProfileLoad.DuplicateUrlAndTitleAndParent"
-    units="bookmarks" expires_after="2021-04-04">
-  <owner>mastiz@chromium.org</owner>
-  <owner>sky@chromium.org</owner>
-  <summary>
-    The number of bookmarks a user has saved with a URL, title and parent triple
-    that is also present in at least one other bookmark. This excludes not only
+    The number of bookmarks a user has saved with a {UniquenessCriterion} that
+    is also present in at least one other bookmark. This excludes not only
     folders (which don't have a URL) but it also excludes one bookmark per
-    unique URL, title and parent triple (that is, all except one are considered
+    unique {UniquenessCriterion} (that is, all except one are considered
     duplicates). Recorded when bookmarks are loaded into storage from disk if
     there is at least one duplicate.
   </summary>
+  <token key="UniquenessCriterion">
+    <variant name="Url2" summary="URL"/>
+    <variant name="UrlAndTitle" summary="URL-title pair"/>
+    <variant name="UrlAndTitleAndParent" summary="URL-title-parent triple"/>
+  </token>
 </histogram>
 
-<histogram name="Bookmarks.Count.OnProfileLoad.UniqueUrl" units="bookmarks"
-    expires_after="2021-04-04">
-  <owner>mastiz@chromium.org</owner>
-  <owner>sky@chromium.org</owner>
-  <summary>
-    The number of unique URLs among bookmarks saved by the user. Recorded when
-    bookmarks are loaded into storage from disk.
-  </summary>
-</histogram>
-
-<histogram name="Bookmarks.Count.OnProfileLoad.UniqueUrlAndTitle"
-    units="bookmarks" expires_after="2021-04-04">
-  <owner>mastiz@chromium.org</owner>
-  <owner>sky@chromium.org</owner>
-  <summary>
-    The number of unique URL-title pairs among bookmarks saved by the user.
-    Recorded when bookmarks are loaded into storage from disk.
-  </summary>
-</histogram>
-
-<histogram name="Bookmarks.Count.OnProfileLoad.UniqueUrlAndTitleAndParent"
-    units="bookmarks" expires_after="2021-04-04">
+<histogram name="Bookmarks.Count.OnProfileLoad.Unique{UniquenessCriterion}"
+    units="bookmarks" expires_after="2021-06-06">
   <owner>mastiz@chromium.org</owner>
   <owner>sky@chromium.org</owner>
   <summary>
-    The number of unique URL-title-parent triples among bookmarks saved by the
+    The number of unique {UniquenessCriterion}s among bookmarks saved by the
     user. Recorded when bookmarks are loaded into storage from disk.
   </summary>
+  <token key="UniquenessCriterion">
+    <variant name="Url" summary="URL"/>
+    <variant name="UrlAndTitle" summary="URL-title pair"/>
+    <variant name="UrlAndTitleAndParent" summary="URL-title-parent triple"/>
+  </token>
 </histogram>
 
 <histogram name="Bookmarks.Count.OpenInIncognito" units="bookmarks"
@@ -1643,13 +1780,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Bookmarks.EntryPoint" enum="BookmarksEntryPoint"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>ianwen@chromium.org</owner>
   <summary>How users add a new bookmark.</summary>
 </histogram>
 
 <histogram name="Bookmarks.LaunchLocation" enum="BookmarkLaunchLocation"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>ianwen@chromium.org</owner>
   <summary>Logs a UI location from which a bookmark is launched.</summary>
 </histogram>
@@ -1667,8 +1804,37 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Bookmarks.OpenBookmarkManager.PerProfileType"
+    enum="BrowserProfileType" expires_after="2022-03-01">
+  <owner>roagarwal@chromium.org</owner>
+  <owner>chrome-incognito@google.com</owner>
+  <summary>
+    This records the number of times the bookmark manager is opened from regular
+    or Incognito tab. This histogram only records the count from
+    ChromeTabbedActivity where we actually have the Bookmark manager UI.
+    Recorded when the bookmark menu item is clicked in Android.
+  </summary>
+</histogram>
+
+<histogram name="Bookmarks.OpenBookmarkTimeInterval.{BookmarkType}" units="ms"
+    expires_after="2022-02-15">
+  <owner>dtrainor@chromium.org</owner>
+  <owner>xingliu@chromium.org</owner>
+  <summary>
+    Logs the duration in milliseconds between bookmark creation time and
+    bookmark open time based on device local time. Recorded when {BookmarkType}
+    is opened. Bookmark folder is not considered. The creation and open can
+    happen on different runs of Chrome.
+  </summary>
+  <token key="BookmarkType">
+    <variant name="Normal" summary="a normal bookmark."/>
+    <variant name="Partner" summary="a partner bookmark."/>
+    <variant name="ReadingList" summary="a reading list article."/>
+  </token>
+</histogram>
+
 <histogram name="Bookmarks.OpenBookmarkType" enum="BookmarkType"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>wychen@chromium.org</owner>
   <summary>
     Logs whether the bookmark entry is a user bookmark or a partner bookmark
@@ -1677,7 +1843,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Bookmarks.ReadingList.NumberOfItems" units="items"
-    expires_after="M91">
+    expires_after="2021-08-01">
   <owner>shaktisahu@chromium.org</owner>
   <owner>xingliu@chromium.org</owner>
   <summary>
@@ -1687,7 +1853,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Bookmarks.ReadingList.NumberOfReadItems" units="items"
-    expires_after="M91">
+    expires_after="2021-07-11">
   <owner>shaktisahu@chromium.org</owner>
   <owner>xingliu@chromium.org</owner>
   <summary>
@@ -1697,7 +1863,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Bookmarks.ReadingList.NumberOfUnreadItems" units="items"
-    expires_after="M91">
+    expires_after="2021-08-09">
   <owner>shaktisahu@chromium.org</owner>
   <owner>xingliu@chromium.org</owner>
   <summary>
@@ -1706,8 +1872,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Bookmarks.StarEntryPoint.ClickedAction"
+    enum="StarEntryPointAction" expires_after="2021-08-09">
+  <owner>corising@chromium.org</owner>
+  <owner>chrome-desktop-ui-sea@google.com</owner>
+  <summary>
+    Recorded when an action in the Bookmark icon menu is clicked.
+  </summary>
+</histogram>
+
 <histogram name="Bookmarks.UsageCountPerProfileType" enum="BrowserProfileType"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>rhalavati@chromium.org</owner>
   <owner>chrome-privacy-core@google.com</owner>
   <summary>
@@ -1716,14 +1891,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="BootTime.Total2" units="ms" expires_after="2021-04-25">
+<histogram name="BootTime.Total2" units="ms" expires_after="2021-06-27">
   <owner>bccheng@chromium.org</owner>
   <owner>semenzato@chromium.org</owner>
   <summary>Time from power on to login panel ready (Chrome OS).</summary>
 </histogram>
 
 <histogram name="BrotliFilter.CompressionPercent" units="%"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>eustas@chromium.org</owner>
   <summary>Compressed/Decompressed size ratio.</summary>
 </histogram>
@@ -1746,7 +1921,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Canvas.TextMetrics.SetFont" units="microseconds"
-    expires_after="M90">
+    expires_after="2022-01-31">
   <owner>yiyix@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>
@@ -1777,7 +1952,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CaptivePortal.DetectResult" enum="CaptivePortalDetectResult"
-    expires_after="2021-03-15">
+    expires_after="2021-08-01">
   <owner>meacer@chromium.org</owner>
   <summary>Records the result of a captive portal probe.</summary>
 </histogram>
@@ -1818,7 +1993,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CaptivePortal.ProbeReason" enum="CaptivePortalProbeReason"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>ericorth@chromium.org</owner>
   <owner>doh-core@google.com</owner>
   <owner>cros-networking@google.com</owner>
@@ -1882,7 +2057,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cast.Sender.CastMediaType" enum="MediaContainers"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>takumif@chromium.org</owner>
   <owner>mfoltz@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
@@ -1904,6 +2079,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Cast.Sender.CastTimeRemainingPercentage" units="%"
     expires_after="2021-07-01">
+  <obsolete>
+    Deprecated as of 2021/02 as it's not been collected for a while due to
+    refactoring. A new metrics,
+    &quot;Cast.Sender.Clank.CastTimeRemainingPercentage&quot; now collects the
+    same data but at a different location.
+  </obsolete>
   <owner>mfoltz@chromium.org</owner>
   <owner>openscreen-eng@google.com</owner>
   <summary>
@@ -1913,8 +2094,56 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Cast.Sender.Clank.CastTimeRemainingPercentage" units="count"
+    expires_after="2022-02-09">
+  <owner>muyaoxu@google.com</owner>
+  <owner>openscreen-eng@google.com</owner>
+  <summary>
+    Records the percentage of the video left at the time the remote playback is
+    stopped. This will be recorded when the playback is stopped by the user, or
+    when it's stopped by the cast device. To reduce the number of empty buckets,
+    the result is rounded and a value of 1 means 10%.
+  </summary>
+</histogram>
+
+<histogram name="Cast.Sender.Clank.FullscreenControlsAction"
+    enum="MediaCommand" expires_after="2022-02-09">
+  <owner>muyaoxu@google.com</owner>
+  <owner>openscreen-eng@google.com</owner>
+  <summary>
+    Record each interaction with the fullscreen remote playback controls on
+    Clank.
+  </summary>
+</histogram>
+
+<histogram name="Cast.Sender.Clank.NotificationControlsAction"
+    enum="CastNotificationControls" expires_after="2022-02-09">
+  <owner>muyaoxu@google.com</owner>
+  <owner>openscreen-eng@google.com</owner>
+  <summary>
+    Record each interaction with the cast notification controls on Clank.
+  </summary>
+</histogram>
+
+<histogram name="Cast.Sender.Clank.SessionTimeWithoutMediaElementPercentage"
+    units="count" expires_after="2022-02-09">
+  <owner>muyaoxu@google.com</owner>
+  <owner>openscreen-eng@google.com</owner>
+  <summary>
+    Records the ratio of the time the media element was detached from the remote
+    playback session to the total duration of the session (as from when the
+    element has been attached till when the session stopped or disconnected). To
+    reduce the number of empty buckets, the result is rounded and a value of 1
+    means 10%.
+  </summary>
+</histogram>
+
 <histogram name="Cast.Sender.DeviceType" enum="RemotePlaybackDeviceType"
     expires_after="2021-06-01">
+  <obsolete>
+    Deprecated as of 2021/02 as it's not been collected for a while due to
+    refactoring.
+  </obsolete>
   <owner>tguilbert@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1926,6 +2155,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Cast.Sender.FullscreenControlsActionWithMediaElement"
     enum="MediaCommand" expires_after="2021-06-01">
+  <obsolete>
+    Deprecated as of 2021/02 as it's not been collected for a while due to
+    refactoring.
+  </obsolete>
   <owner>tguilbert@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1936,6 +2169,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Cast.Sender.FullscreenControlsActionWithoutMediaElement"
     enum="MediaCommand" expires_after="2021-06-01">
+  <obsolete>
+    Deprecated as of 2021/02 as it's not been collected for a while due to
+    refactoring.
+  </obsolete>
   <owner>tguilbert@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1946,6 +2183,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Cast.Sender.MediaElementPresentWhenShowFullscreenControls"
     enum="BooleanPresent" expires_after="2021-06-01">
+  <obsolete>
+    Deprecated as of 2021/02 as it's not been collected for a while due to
+    refactoring.
+  </obsolete>
   <owner>tguilbert@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1954,8 +2195,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Cast.Sender.RemotePlayback.InitiationLocation"
+    enum="RemotePlaybackInitiationLocation" expires_after="2022-01-05">
+  <owner>muyaoxu@google.com</owner>
+  <owner>openscreen-eng@google.com</owner>
+  <summary>
+    Records where the user started RemotePlayback on Clank. This does not
+    include RemotePlayback sessions initiated through the Cast SDK.
+  </summary>
+</histogram>
+
 <histogram name="Cast.Sender.SessionTimeWithoutMediaElementPercentage"
     units="%" expires_after="2021-06-01">
+  <obsolete>
+    Deprecated as of 2021/02 as it's not been collected for a while due to
+    refactoring. A new metrics,
+    &quot;Cast.Sender.Clank.SessionTimeWithoutMediaElementPercentage&quot; now
+    collects the same data but at a different location.
+  </obsolete>
   <owner>tguilbert@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1968,6 +2225,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Cast.Sender.UrlResolveResult"
     enum="RemotePlaybackUrlResolveResult" expires_after="2021-06-01">
+  <obsolete>
+    Deprecated as of 2021/02 as it's not been collected for a while due to
+    refactoring.
+  </obsolete>
   <owner>tguilbert@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <summary>
@@ -1977,7 +2238,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Cast.Sender.VideoEncodeAcceleratorInitializeSuccess"
-    enum="BooleanSuccess" expires_after="2021-04-04">
+    enum="BooleanSuccess" expires_after="2021-08-15">
   <owner>posciak@chromium.org</owner>
   <summary>
     Indicates whether initialization of a video encode accelerator for Cast
@@ -2040,7 +2301,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChildAccountReconcilor.ForcedUserExitOnReconcileError"
-    enum="BooleanHit" expires_after="2021-02-23">
+    enum="BooleanHit" expires_after="2021-07-27">
   <owner>sinhak@chromium.org</owner>
   <owner>escordeiro@chromium.org</owner>
   <summary>
@@ -2071,7 +2332,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChildProcess.Crashed.UtilityProcessHash"
-    enum="UtilityProcessNameHash" expires_after="2021-04-11">
+    enum="UtilityProcessNameHash" expires_after="2021-08-15">
   <owner>wfh@chromium.org</owner>
   <owner>chrome-stability-core@google.com</owner>
   <summary>
@@ -2175,7 +2436,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ChildProcess.Launched.UtilityProcessHash"
-    enum="UtilityProcessNameHash" expires_after="2021-04-04">
+    enum="UtilityProcessNameHash" expires_after="2021-08-09">
   <owner>wfh@chromium.org</owner>
   <summary>
     Count of child utility process launches, bucketed by the hash of their
@@ -2193,14 +2454,41 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ChromiumAndroidLinker.RelroAvailableImmediately"
+    enum="BooleanRelroAvailableImmediately" expires_after="2021-07-07">
+  <owner>lizeb@chromium.org</owner>
+  <owner>pasko@chromium.org</owner>
+  <summary>
+    Recorded when RELRO is replaced with a shared memory region, in all
+    processes consuming RELRO. Indicates whether the shared RELRO was available
+    synchronously right after the native library was loaded. ModernLinker only.
+  </summary>
+</histogram>
+
+<histogram name="ChromiumAndroidLinker.RelroProvidedSuccessfully"
+    enum="BooleanSuccess" expires_after="2021-07-07">
+  <owner>lizeb@chromium.org</owner>
+  <owner>pasko@chromium.org</owner>
+  <summary>
+    Recorded when the native library is loaded by the Chromium linker, and an
+    attempt to spawn a shared RELRO region is made. Indicates whether the
+    attempt was a success. If the number of samples from
+    &quot;ChromiumAndroidLinker.RelroAvailableImmediately&quot; where the
+    availability was not immediate is large compared to the counts of successful
+    RELRO spawns, it would indicate potential startup performance improvements
+    when starting child process(es) during early browser startup phases.
+    ModernLinker only.
+  </summary>
+</histogram>
+
 <histogram name="ChromiumAndroidLinker.RelroSharingStatus"
     enum="RelroSharingStatus" expires_after="2021-05-06">
   <owner>lizeb@chromium.org</owner>
   <owner>pasko@chromium.org</owner>
   <summary>
-    In each process that has successfully loaded the native library indicates
-    whether using shared RELRO was attempted and what the result was. Currently
-    it is only reported in ModernLinker.
+    Recorded when RELRO is replaced with a shared memory region, in all
+    processes consuming RELRO. Indicates whether the replacement was a success.
+    ModernLinker only.
   </summary>
 </histogram>
 
@@ -2387,7 +2675,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ClientHints.CriticalCHRestart" enum="CriticalCHRestart"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>aarontag@chromium.org</owner>
   <owner>yoavweiss@chromium.org</owner>
   <summary>
@@ -2395,10 +2683,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="ClientHints.PersistDuration" units="ms" expires_after="M88">
+<histogram name="ClientHints.PersistDuration" units="ms"
+    expires_after="2021-08-22">
   <owner>yoavweiss@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <owner>mkwst@chromium.org</owner>
+  <owner>aarontag@chromium.org</owner>
   <summary>
     Duration for which the origin requested the client hints to be persisted.
     Collected on the renderer side.
@@ -2406,20 +2696,23 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ClientHints.UpdateEventCount" units="count"
-    expires_after="M88">
+    expires_after="2021-08-22">
   <owner>yoavweiss@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <owner>mkwst@chromium.org</owner>
+  <owner>aarontag@chromium.org</owner>
   <summary>
     Count of events when the client hints needs to be persisted to the disk by
     the browser.
   </summary>
 </histogram>
 
-<histogram name="ClientHints.UpdateSize" units="count" expires_after="M88">
+<histogram name="ClientHints.UpdateSize" units="count"
+    expires_after="2021-08-22">
   <owner>yoavweiss@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <owner>mkwst@chromium.org</owner>
+  <owner>aarontag@chromium.org</owner>
   <summary>
     Count of client hints that need to be persisted to the disk. Recorded by the
     renderer.
@@ -2427,7 +2720,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Clipboard.ExtensionContentScriptReadHasUserActivation"
-    units="proportion" expires_after="2021-04-01">
+    units="proportion" expires_after="2021-08-09">
+  <obsolete>
+    Removed February 2021 as enough data was collected.
+  </obsolete>
   <owner>huangdarwin@chromium.org</owner>
   <owner>src/third_party/blink/renderer/modules/clipboard/OWNERS</owner>
   <summary>
@@ -2437,7 +2733,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Clipboard.Read" enum="ClipboardFormatRead"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>huangdarwin@chromium.org</owner>
   <owner>src/ui/base/clipboard/OWNERS</owner>
   <summary>
@@ -2462,7 +2758,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Clipboard.Write" enum="ClipboardFormatWrite"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>huangdarwin@chromium.org</owner>
   <owner>src/ui/base/clipboard/OWNERS</owner>
   <summary>
@@ -2473,7 +2769,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Clipboard.X11StoreCopyPasteDuration" units="ms"
-    expires_after="M90">
+    expires_after="M95">
   <owner>dcheng@chromium.org</owner>
   <owner>pkotwicz@chromium.org</owner>
   <summary>
@@ -2528,7 +2824,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="CompositorLatency" units="microseconds"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>sadrul@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
@@ -2546,7 +2842,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="CompositorLatency.CompositorOnlyFrame"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-08-09">
   <owner>sadrul@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
@@ -2577,7 +2873,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="CompositorLatency.DroppedFrame"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-08-09">
   <owner>sadrul@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
@@ -2596,7 +2892,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="CompositorLatency.MissedDeadlineFrame"
-    units="microseconds" expires_after="2021-03-16">
+    units="microseconds" expires_after="2021-07-18">
   <owner>sadrul@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
@@ -2614,7 +2910,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CompositorLatency.Type" enum="FrameReportType"
-    expires_after="2021-03-16">
+    expires_after="2021-07-18">
   <owner>sadrul@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
@@ -2624,7 +2920,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ConfigureDisplays.External.Modeset.AttemptSucceeded"
-    enum="BooleanSuccess" expires_after="2021-03-15">
+    enum="BooleanSuccess" expires_after="2021-07-18">
   <owner>dcastagna@chromium.org</owner>
   <owner>marcheu@chromium.org</owner>
   <owner>chromeos-gfx@chromium.org</owner>
@@ -2638,7 +2934,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ConfigureDisplays.External.Modeset.FinalStatus"
-    enum="BooleanSuccess" expires_after="2021-03-15">
+    enum="BooleanSuccess" expires_after="2021-07-18">
   <owner>dcastagna@chromium.org</owner>
   <owner>marcheu@chromium.org</owner>
   <owner>chromeos-gfx@chromium.org</owner>
@@ -2651,7 +2947,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ConfigureDisplays.External.Modeset.RefreshRate" units="Hz"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>dcastagna@chromium.org</owner>
   <owner>marcheu@chromium.org</owner>
   <owner>chromeos-gfx@chromium.org</owner>
@@ -2676,7 +2972,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ConfigureDisplays.Internal.Modeset.AttemptSucceeded"
-    enum="BooleanSuccess" expires_after="2021-03-15">
+    enum="BooleanSuccess" expires_after="2021-08-01">
   <owner>dcastagna@chromium.org</owner>
   <owner>marcheu@chromium.org</owner>
   <owner>chromeos-gfx@chromium.org</owner>
@@ -2716,7 +3012,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ConfigureDisplays.Internal.Modeset.Resolution"
-    enum="DisplayResolution" expires_after="2021-03-15">
+    enum="DisplayResolution" expires_after="2021-07-18">
   <owner>dcastagna@chromium.org</owner>
   <owner>marcheu@chromium.org</owner>
   <owner>chromeos-gfx@chromium.org</owner>
@@ -2728,6 +3024,42 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ConfigureDisplays.Modeset.MstExternalDisplaysCount"
+    units="count" expires_after="2021-11-20">
+  <owner>gildekel@chromium.org</owner>
+  <owner>dcastagna@chromium.org</owner>
+  <owner>chromeos-gfx@chromium.org</owner>
+  <summary>
+    Total number of external displays connected via MST and being configured.
+    This is recorded every time an external display is connected/disconnected,
+    or when the display mode of a screen is about to change.
+  </summary>
+</histogram>
+
+<histogram name="ConfigureDisplays.Modeset.MstExternalDisplaysPercentage"
+    units="%" expires_after="2021-11-20">
+  <owner>gildekel@chromium.org</owner>
+  <owner>dcastagna@chromium.org</owner>
+  <owner>chromeos-gfx@chromium.org</owner>
+  <summary>
+    Percentage of external displays connected via MST and being configured. This
+    is recorded every time an external display is connected/disconnected, or
+    when the display mode of a screen is about to change.
+  </summary>
+</histogram>
+
+<histogram name="ConfigureDisplays.Modeset.TotalExternalDisplaysCount"
+    units="count" expires_after="2021-11-20">
+  <owner>gildekel@chromium.org</owner>
+  <owner>dcastagna@chromium.org</owner>
+  <owner>chromeos-gfx@chromium.org</owner>
+  <summary>
+    Total number of external displays being configured. This is recorded every
+    time an external display is connected/disconnected, or when the display mode
+    of a screen is about to change.
+  </summary>
+</histogram>
+
 <histogram name="Conflicts.ConfirmedBadModules" units="modules"
     expires_after="2018-08-30">
   <owner>chrisha@chromium.org</owner>
@@ -2818,9 +3150,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContextMenu.CancelSystemTouches" enum="BooleanHit"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>michaeldo@chromium.org</owner>
-  <owner>src/ios/web/web_state/ui/OWNERS</owner>
+  <owner>src/ios/web/OWNERS</owner>
   <summary>
     Logs true when the system touches are cancelled in order to show the Context
     Menu instead of performing a default system action. Only logged on iOS.
@@ -2828,9 +3160,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContextMenu.DelayedElementDetails"
-    enum="ContextMenuDelayedElementDetails" expires_after="2020-12-11">
+    enum="ContextMenuDelayedElementDetails" expires_after="2021-05-23">
   <owner>michaeldo@chromium.org</owner>
-  <owner>src/ios/web/web_state/ui/OWNERS</owner>
+  <owner>src/ios/web/OWNERS</owner>
   <summary>
     Logged when DOM element details are not yet available when the user
     completes a long press. Also logs if the context menu was shown once the
@@ -2841,9 +3173,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContextMenu.DOMElementFrame" enum="ContextMenuDOMElementFrame"
-    expires_after="2021-02-14">
+    expires_after="2021-08-01">
   <owner>michaeldo@chromium.org</owner>
-  <owner>src/ios/web/web_state/ui/OWNERS</owner>
+  <owner>src/ios/web/OWNERS</owner>
   <summary>
     Logged when the Context Menu will be displayed. Also logs if the element for
     the last touch was found in the main frame or a iframe. Only logged on iOS.
@@ -2851,7 +3183,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContextMenu.iOS.CopyImage" enum="ContextMenuIOSCopyImage"
-    expires_after="2021-04-18">
+    expires_after="2021-08-01">
   <owner>mrsuyi@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
@@ -2861,7 +3193,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContextMenu.iOS.GetImageDataByJsResult"
-    enum="ContextMenuIOSGetImageDataByJsResult" expires_after="2021-03-15">
+    enum="ContextMenuIOSGetImageDataByJsResult" expires_after="2021-07-18">
   <owner>mrsuyi@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
@@ -2872,7 +3204,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContextMenu.LensChip.Event" enum="LensChipEvent"
-    expires_after="M90">
+    expires_after="2021-06-20">
   <owner>yusuyoutube@google.com</owner>
   <owner>benwgold@google.com</owner>
   <summary>
@@ -2881,8 +3213,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="ContextMenu.LensSupportStatus"
-    enum="ContextMenuLensSupportStatus" expires_after="2021-03-15">
+<histogram name="ContextMenu.LensSupportStatus" enum="LensSupportStatus"
+    expires_after="2021-07-18">
   <owner>benwgold@google.com</owner>
   <owner>lens-chrome@google.com</owner>
   <summary>
@@ -2921,7 +3253,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="ContextMenu.SelectedOptionDesktop"
-    enum="ContextMenuOptionDesktop" expires_after="2021-05-02">
+    enum="ContextMenuOptionDesktop" expires_after="2021-07-04">
   <owner>avi@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <summary>
@@ -2953,7 +3285,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContextMenu.Shown" enum="BooleanPresent"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>mpearson@chromium.org</owner>
   <summary>
     Recorded when a context menu is shown, sliced by whether a web contents was
@@ -2981,8 +3313,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ContextMenu.TimeToSelectShare" units="ms"
+    expires_after="2021-07-11">
+  <owner>gayane@chromium.org</owner>
+  <owner>chrome-shared-highlighting@google.com</owner>
+  <summary>
+    Records how long it takes to press on &quot;Share&quot; from the time
+    context menu is shown. Android only.
+  </summary>
+</histogram>
+
 <histogram name="ContextMenu.TimeToTakeAction.Abandoned" units="ms"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>twellington@chromium.org</owner>
   <owner>clank-app-team@google.com</owner>
   <summary>
@@ -2995,7 +3337,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContextMenu.TimeToTakeAction.SelectedItem" units="ms"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>twellington@chromium.org</owner>
   <owner>clank-app-team@google.com</owner>
   <summary>
@@ -3014,7 +3356,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContextMenu.ViewsTextServices.Emoji" enum="Boolean"
-    expires_after="M91">
+    expires_after="2021-08-09">
   <owner>ramyan@chromium.org</owner>
   <owner>yyushkina@chromium.org</owner>
   <summary>
@@ -3024,9 +3366,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ContextMenu.WaitingForElementDetails" enum="BooleanHit"
-    expires_after="2020-12-11">
+    expires_after="2021-08-09">
   <owner>michaeldo@chromium.org</owner>
-  <owner>src/ios/web/web_state/ui/OWNERS</owner>
+  <owner>src/ios/web/OWNERS</owner>
   <summary>
     Logs true when the context menu gesture recognizer fully recognizes a long
     press, but is still waiting on the DOM element details before the context
@@ -3035,7 +3377,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Conversions.ClearDataTime" units="ms"
-    expires_after="2021-01-30">
+    expires_after="2021-08-15">
   <owner>johnidel@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -3045,7 +3387,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Conversions.ExtraReportDelay" units="ms"
-    expires_after="2021-01-30">
+    expires_after="2021-08-09">
   <owner>johnidel@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -3057,7 +3399,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Conversions.RegisteredConversionsPerPage" units="conversions"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>johnidel@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -3070,7 +3412,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Conversions.ReportStatus" enum="ConversionReportStatus"
-    expires_after="2021-01-30">
+    expires_after="2021-08-09">
   <owner>johnidel@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -3079,6 +3421,59 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Conversions.Storage.ClearDataWithFilterDuration" units="ms"
+    expires_after="M95">
+  <owner>johnidel@chromium.org</owner>
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    Records the time it took to do perform a clear operation on the database
+    when supplied an origin filter. Recorded when the conversion database
+    finishes performing a clear operation. Note that filters may vary in size
+    and computation complexity, skewing this metric aribtrarily.
+  </summary>
+</histogram>
+
+<histogram name="Conversions.Storage.CreationTime" units="ms"
+    expires_after="M95">
+  <owner>johnidel@chromium.org</owner>
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    Records the time it took to initialize a new conversions database from
+    scratch. Recorded when the conversion database finishes initialization.
+  </summary>
+</histogram>
+
+<histogram name="Conversions.Storage.MigrationTime" units="ms"
+    expires_after="M95">
+  <owner>johnidel@chromium.org</owner>
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    Records the time it took to migrate a preexisting conversions database to
+    the latest schema. Recorded when the conversion database finishes
+    initialization.
+  </summary>
+</histogram>
+
+<histogram name="Conversions.Storage.Sql.InitStatus"
+    enum="ConversionStorageSqlInitStatus" expires_after="2021-12-12">
+  <owner>johnidel@chromium.org</owner>
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    Records initialisation statuses of ConversionStorageSql. Note: currently
+    ConversionStorageSql is initialised lazily.
+  </summary>
+</histogram>
+
+<histogram name="Conversions.TimeFromConversionToReportSend" units="hours"
+    expires_after="M95">
+  <owner>johnidel@chromium.org</owner>
+  <owner>csharrison@chromium.org</owner>
+  <summary>
+    Records the time between a conversion and its reporting. This is emitted
+    whenever a conversion report is sent.
+  </summary>
+</histogram>
+
 <histogram name="CopylessPaste.CacheHit" enum="CopylessCacheHit"
     expires_after="2020-03-01">
   <owner>wychen@chromium.org</owner>
@@ -3200,7 +3595,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Crashpad.ExceptionEncountered"
-    enum="CrashpadExceptionProcessingState" expires_after="M90">
+    enum="CrashpadExceptionProcessingState" expires_after="2021-08-22">
   <owner>jperaza@chromium.org</owner>
   <owner>crashpad-dev@chromium.org</owner>
   <summary>
@@ -3238,7 +3633,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="CrashReport.BreakpadIOSUploadOutcome"
     enum="FoundationPopularErrorCode" expires_after="2021-09-01">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     Reports the Foundation error code of an attempt to upload a breakpad crash
@@ -3247,7 +3642,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="CrashReport.Sender.ActiveRuntime" units="ms"
-    expires_after="2021-03-21">
+    expires_after="2021-05-23">
+  <obsolete>
+    As of 2020-12, we've decided on a timeout and no longer need this metric.
+  </obsolete>
   <owner>mutexlox@chromium.org</owner>
   <owner>iby@chromium.org</owner>
   <owner>cros-telemetry@google.com</owner>
@@ -3260,6 +3658,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="CrashReport.Sender.Runtime" units="ms"
     expires_after="2021-01-15">
+  <obsolete>
+    As of 2020-12, we've decided on a timeout and no longer need this metric.
+  </obsolete>
   <owner>mutexlox@chromium.org</owner>
   <owner>iby@chromium.org</owner>
   <owner>cros-telemetry@google.com</owner>
@@ -3276,7 +3677,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataUse.AllServicesKB" enum="DataUseServicesHash"
-    expires_after="M90">
+    expires_after="2021-12-20">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -3291,7 +3692,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="DataUse.AppTabState" units="bytes" expires_after="M90">
+<histogram name="DataUse.AppTabState" units="bytes" expires_after="2021-12-20">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -3301,7 +3702,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataUse.BackgroundToDataRecievedPerByte" units="ms"
-    expires_after="M90">
+    expires_after="2021-12-20">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -3312,7 +3713,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataUse.BackgroundToFirstDownstream" units="ms"
-    expires_after="M90">
+    expires_after="2021-12-20">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -3336,7 +3737,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="DataUse.BytesReceived2" units="bytes" expires_after="M92">
+<histogram name="DataUse.BytesReceived2" units="bytes"
+    expires_after="2021-12-20">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -3345,7 +3747,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="DataUse.BytesSent" units="bytes" expires_after="M90">
+<histogram name="DataUse.BytesSent" units="bytes" expires_after="2021-12-20">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -3355,7 +3757,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataUse.ContentType.UserTrafficKB" enum="DataUseContentType"
-    expires_after="M90">
+    expires_after="2021-12-20">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -3364,7 +3766,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="DataUse.FavIcon.Downstream" units="bytes" expires_after="M90">
+<histogram name="DataUse.FavIcon.Downstream" units="bytes"
+    expires_after="2021-12-20">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -3375,7 +3778,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataUse.FavIcon.Downstream.Non200Response" units="bytes"
-    expires_after="M90">
+    expires_after="2021-12-20">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -3385,7 +3788,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DataUse.PageTransition.UserTrafficKB"
-    enum="DataUsePageTransition" expires_after="M90">
+    enum="DataUsePageTransition" expires_after="2021-12-20">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -3394,7 +3797,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="DataUse.TrafficSize.User" units="bytes" expires_after="M90">
+<histogram name="DataUse.TrafficSize.User" units="bytes"
+    expires_after="2021-12-20">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -3555,7 +3959,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="DemoMode.ActiveApp" enum="DemoModeApp" expires_after="M92">
+<histogram name="DemoMode.ActiveApp" enum="DemoModeApp"
+    expires_after="2021-08-09">
   <owner>drcrash@chromium.org</owner>
   <owner>cros-demo-mode-eng@google.com</owner>
   <summary>
@@ -3564,7 +3969,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="DemoMode.AppLaunched" enum="DemoModeApp" expires_after="M92">
+<histogram name="DemoMode.AppLaunched" enum="DemoModeApp"
+    expires_after="2021-08-09">
   <owner>drcrash@chromium.org</owner>
   <owner>cros-demo-mode-eng@google.com</owner>
   <summary>
@@ -3575,7 +3981,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DemoMode.AppLaunchSource" enum="DemoModeAppLaunchSource"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>drcrash@chromium.org</owner>
   <owner>cros-demo-mode-eng@google.com</owner>
   <summary>
@@ -3584,7 +3990,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="DemoMode.DwellTime" units="seconds" expires_after="M92">
+<histogram name="DemoMode.DwellTime" units="seconds" expires_after="2021-08-09">
   <owner>drcrash@chromium.org</owner>
   <owner>cros-demo-mode-eng@google.com</owner>
   <summary>
@@ -3596,7 +4002,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DemoMode.IdleLogoutWarningEvent"
-    enum="DemoModeIdleLogoutWarningEvent" expires_after="M92">
+    enum="DemoModeIdleLogoutWarningEvent" expires_after="2021-08-09">
   <owner>drcrash@chromium.org</owner>
   <owner>cros-demo-mode-eng@google.com</owner>
   <summary>
@@ -3634,7 +4040,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="DemoMode.SessionLength" units="minutes" expires_after="M92">
+<histogram name="DemoMode.SessionLength" units="minutes"
+    expires_after="2021-08-09">
   <owner>drcrash@chromium.org</owner>
   <owner>cros-demo-mode-eng@google.com</owner>
   <summary>
@@ -3648,7 +4055,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DemoMode.Setup.DownloadDuration" units="minutes"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>drcrash@chromium.org</owner>
   <owner>cros-demo-mode-eng@google.com</owner>
   <summary>
@@ -3658,7 +4065,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DemoMode.Setup.EnrollDuration" units="minutes"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>drcrash@chromium.org</owner>
   <owner>cros-demo-mode-eng@google.com</owner>
   <summary>
@@ -3668,7 +4075,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DemoMode.Setup.LoadingDuration" units="minutes"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>drcrash@chromium.org</owner>
   <owner>cros-demo-mode-eng@google.com</owner>
   <summary>
@@ -3679,7 +4086,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="DemoMode.Setup.NumRetries" units="units" expires_after="M92">
+<histogram name="DemoMode.Setup.NumRetries" units="units"
+    expires_after="2021-08-09">
   <owner>drcrash@chromium.org</owner>
   <owner>cros-demo-mode-eng@google.com</owner>
   <summary>
@@ -3689,7 +4097,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="DemoMode.UniqueAppsLaunched" units="units" expires_after="M92">
+<histogram name="DemoMode.UniqueAppsLaunched" units="units"
+    expires_after="2021-08-09">
   <owner>drcrash@chromium.org</owner>
   <owner>cros-demo-mode-eng@google.com</owner>
   <summary>
@@ -3698,18 +4107,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="DeprecatedInvalidatorRegistrar.CrashStatus"
-    enum="HandlerOwnerType" expires_after="M75">
-  <owner>melandory@chromium.org</owner>
-  <summary>
-    DeprecatedInvlalidatorRegistrar is crashing on the browser shut down. The
-    reason for the crash is that not all invalidation handlers de-registister
-    themselves. Histogram records the type of the handler which hasn't
-    unregistered itself. Analyzing the histogram will allow us to understand,
-    which handlers are causing the crash.
-  </summary>
-</histogram>
-
 <histogram name="Dialog.Create" enum="BooleanCreated" expires_after="M85">
   <owner>pdyson@chromium.org</owner>
   <summary>
@@ -3736,8 +4133,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="DirectSockets.PermissionDeniedFailures"
+    enum="DirectSocketPermissionFailureType" expires_after="2022-1-20">
+  <owner>ericwilligers@chromium.org</owner>
+  <owner>glenrob@chromium.org</owner>
+  <summary>
+    Record how often each permission check (e.g. permissions policy, transient
+    activation, user dialog, hostname resolving to non-public address, rate
+    limiting, CORS, enterprise policy) cause Permission Denied failures.
+    Recorded when the permission is denied.
+  </summary>
+</histogram>
+
 <histogram name="Discarding.DiscardCandidatesCount" units="tabs"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>sebmarchand@chromium.org</owner>
   <owner>catan-team@chromium.org</owner>
   <summary>
@@ -3761,7 +4170,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Discarding.HighPMFPolicy.DiscardAttemptsCount" units="tabs"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>sebmarchand@chromium.org</owner>
   <owner>catan-team@chromium.org</owner>
   <summary>
@@ -3774,7 +4183,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Discarding.HighPMFPolicy.DiscardSuccess"
-    units="BooleanSuccess" expires_after="2021-04-04">
+    units="BooleanSuccess" expires_after="2021-06-06">
   <owner>sebmarchand@chromium.org</owner>
   <owner>catan-team@chromium.org</owner>
   <summary>
@@ -3784,7 +4193,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Discarding.HighPMFPolicy.MemoryPressureLevel"
-    enum="MemoryPressureLevel" expires_after="2021-04-04">
+    enum="MemoryPressureLevel" expires_after="2021-06-06">
   <owner>sebmarchand@chromium.org</owner>
   <owner>catan-team@chromium.org</owner>
   <summary>
@@ -3804,7 +4213,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Discarding.HighPMFPolicy.SuccessfulDiscardsCount" units="tabs"
-    expires_after="2021-04-04">
+    expires_after="2021-06-06">
   <owner>sebmarchand@chromium.org</owner>
   <owner>catan-team@chromium.org</owner>
   <summary>
@@ -3845,7 +4254,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Discarding.OnCriticalPressure.TotalRSS_PercentOfRAM" units="%"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>sebmarchand@chromium.org</owner>
   <owner>catan-team@chromium.org</owner>
   <summary>
@@ -3916,7 +4325,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Display.ParseEdidFailure" enum="ParseEdidFailure"
-    expires_after="2021-05-01">
+    expires_after="2021-07-11">
   <owner>sashamcintosh@chromium.org</owner>
   <owner>chromeos-gfx@google.com</owner>
   <summary>
@@ -4027,7 +4436,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="DnsProbe.ProbeDuration2" units="ms" expires_after="2021-06-04">
+<histogram name="DnsProbe.ProbeDuration2" units="ms" expires_after="2021-08-09">
   <owner>ericorth@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -4036,7 +4445,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DnsProbe.ProbeResult" enum="DnsProbe.ProbeStatus"
-    expires_after="2021-06-04">
+    expires_after="2021-08-09">
   <owner>ericorth@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>Result of DNS diagnostics probes sent by the probe service.</summary>
@@ -4053,6 +4462,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Document.OutliveTimeAfterShutdown.DestroyedBeforeProcessDies"
     units="units" expires_after="M77">
+  <obsolete>
+    Removed in M90.
+  </obsolete>
   <owner>hajimehoshi@chromium.org</owner>
   <owner>keishi@chromium.org</owner>
   <summary>
@@ -4064,6 +4476,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Document.OutliveTimeAfterShutdown.GCCount" enum="GCCount"
     expires_after="M77">
+  <obsolete>
+    Removed in M90.
+  </obsolete>
   <owner>hajimehoshi@chromium.org</owner>
   <owner>keishi@chromium.org</owner>
   <summary>
@@ -4167,7 +4582,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DocumentScan.ScanFailed" enum="DocumentScanSaneBackend"
-    expires_after="2021-03-15">
+    expires_after="2021-07-27">
   <owner>fletcherw@chromium.org</owner>
   <owner>bmgordon@chromium.org</owner>
   <owner>project-bolton@google.com</owner>
@@ -4178,7 +4593,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DocumentScan.ScanRequested" enum="DocumentScanSaneBackend"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>fletcherw@chromium.org</owner>
   <owner>bmgordon@chromium.org</owner>
   <owner>project-bolton@google.com</owner>
@@ -4189,7 +4604,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DocumentScan.ScanSucceeded" enum="DocumentScanSaneBackend"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>fletcherw@chromium.org</owner>
   <owner>bmgordon@chromium.org</owner>
   <owner>project-bolton@google.com</owner>
@@ -4241,6 +4656,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Downgrade.CacheDirMove.FailureCount" units="count"
     expires_after="2020-12-31">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>grt@chromium.org</owner>
   <summary>
     The number of items within the Cache directory that could not be moved aside
@@ -4251,6 +4669,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Downgrade.CacheDirMove.Result" enum="BooleanSuccess"
     expires_after="2020-12-31">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>grt@chromium.org</owner>
   <summary>
     Indicates whether or not moving a user's cache dir following a downgrade
@@ -4260,6 +4681,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Downgrade.InvalidSnapshotMove.FailureCount" units="count"
     expires_after="2020-12-31">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>grt@chromium.org</owner>
   <owner>ydago@chromium.org</owner>
   <summary>
@@ -4270,6 +4694,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Downgrade.InvalidSnapshotMove.Result" enum="BooleanSuccess"
     expires_after="2020-12-31">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>grt@chromium.org</owner>
   <owner>ydago@chromium.org</owner>
   <summary>
@@ -4280,6 +4707,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Downgrade.RestoreSnapshot.CleanupAfterFailure.Result"
     enum="BooleanSuccess" expires_after="2020-12-31">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>grt@chromium.org</owner>
   <owner>ydago@chromium.org</owner>
   <summary>
@@ -4290,6 +4720,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Downgrade.RestoreSnapshot.FailureCount" units="count"
     expires_after="2020-12-31">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>grt@chromium.org</owner>
   <owner>ydago@chromium.org</owner>
   <summary>
@@ -4299,7 +4732,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Downgrade.RestoreSnapshot.Result"
-    enum="SnapshotOperationResult" expires_after="2020-12-31">
+    enum="SnapshotOperationResult" expires_after="never">
+<!-- expires-never: To monitor snapshot restoration results. -->
+
   <owner>grt@chromium.org</owner>
   <owner>ydago@chromium.org</owner>
   <summary>
@@ -4309,7 +4744,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Downgrade.TakeSnapshot.FailureCount" units="count"
-    expires_after="2021-03-21">
+    expires_after="2021-08-09">
   <owner>grt@chromium.org</owner>
   <owner>ydago@chromium.org</owner>
   <summary>
@@ -4319,7 +4754,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Downgrade.TakeSnapshot.ItemFailure" enum="SnapshotItemId"
-    expires_after="2021-03-21">
+    expires_after="2021-08-09">
   <owner>grt@chromium.org</owner>
   <owner>ydago@chromium.org</owner>
   <summary>
@@ -4328,8 +4763,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Downgrade.TakeSnapshot.MoveExistingSnapshot.FailureCount"
+    units="count" expires_after="2020-12-31">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
+  <owner>grt@chromium.org</owner>
+  <owner>ydago@chromium.org</owner>
+  <summary>
+    The number of items within an existing snapshot directory that could not be
+    moved aside before replacing it with a newer snapshot.
+  </summary>
+</histogram>
+
 <histogram name="Downgrade.TakeSnapshot.MoveExistingSnapshot.Result"
     enum="BooleanSuccess" expires_after="2020-12-31">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>grt@chromium.org</owner>
   <owner>ydago@chromium.org</owner>
   <summary>
@@ -4340,6 +4791,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Downgrade.TakeSnapshot.ProfileDirectoryCreation.Result"
     enum="BooleanSuccess" expires_after="2020-12-31">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>grt@chromium.org</owner>
   <owner>ydago@chromium.org</owner>
   <summary>
@@ -4349,7 +4803,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Downgrade.TakeSnapshot.Result" enum="SnapshotOperationResult"
-    expires_after="2021-03-07">
+    expires_after="2021-08-01">
   <owner>grt@chromium.org</owner>
   <owner>ydago@chromium.org</owner>
   <summary>
@@ -4359,7 +4813,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Downgrade.Type" enum="UserDataDowngradeType"
-    expires_after="2021-05-09">
+    expires_after="2021-08-09">
   <owner>grt@chromium.org</owner>
   <summary>
     The type of User Data downgrade detected, if any. The &quot;none&quot;
@@ -4376,9 +4830,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Downgrade.UserDataDirMove.Result" enum="BooleanSuccess"
+<histogram name="Downgrade.UserDataDirMove.Result" enum="UserDataMoveResult"
     expires_after="2020-12-31">
   <owner>grt@chromium.org</owner>
+  <owner>ydago@chromium.org</owner>
   <summary>
     Indicates whether or not moving a user's User Data dir following a downgrade
     succeeded or failed.
@@ -4386,9 +4841,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Drive.PushNotificationInitiallyEnabled" enum="BooleanEnabled"
-    expires_after="M91">
-  <owner>dats@chromium.org</owner>
-  <owner>austinct@chromium.org</owner>
+    expires_after="2021-08-22">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Tracks whether the push notification is initially enabled for Drive.
     Recorded when the first notification is processed. Notification is emulated
@@ -4397,9 +4852,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Drive.PushNotificationRegistered" enum="BooleanRegistered"
-    expires_after="M91">
-  <owner>dats@chromium.org</owner>
-  <owner>austinct@chromium.org</owner>
+    expires_after="2021-08-22">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Tracks whether the push notification request is registered correctly for
     Drive. Recorded when the push notification manager is initialized.
@@ -4407,39 +4862,39 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DriveCommon.Lifecycle.FirstLaunchTime" units="ms"
-    expires_after="2021-04-19">
-  <owner>dats@chromium.org</owner>
-  <owner>sammc@chromium.org</owner>
+    expires_after="2021-08-09">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     How long did it take to launch Google Drive for the first time.
   </summary>
 </histogram>
 
 <histogram name="DriveCommon.Lifecycle.Mount" enum="DriveMountStatus"
-    expires_after="2021-04-19">
-  <owner>dats@chromium.org</owner>
-  <owner>sammc@chromium.org</owner>
+    expires_after="2021-08-22">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>Records outcomes of attempts to mount Google Drive.</summary>
 </histogram>
 
 <histogram name="DriveCommon.Lifecycle.MountTime" units="ms"
-    expires_after="2021-04-19">
-  <owner>dats@chromium.org</owner>
-  <owner>sammc@chromium.org</owner>
+    expires_after="2021-08-22">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>How long did it take to mount Google Drive.</summary>
 </histogram>
 
 <histogram name="DriveCommon.Lifecycle.Unmount" enum="DriveMountStatus"
     expires_after="2021-04-19">
-  <owner>dats@chromium.org</owner>
-  <owner>sammc@chromium.org</owner>
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>Records outcomes of attempts to unmount Google Drive.</summary>
 </histogram>
 
 <histogram name="DriveCommon.LocalSearch.OfflineSearchTime" units="ms"
     expires_after="2021-04-19">
-  <owner>dats@chromium.org</owner>
-  <owner>sammc@chromium.org</owner>
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     How long did it take to perform a lookup of pinned files in local Google
     Drive cache.
@@ -4448,8 +4903,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="DriveCommon.LocalSearch.SharedSearchTime" units="ms"
     expires_after="2021-04-19">
-  <owner>dats@chromium.org</owner>
-  <owner>sammc@chromium.org</owner>
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     How long did it take to perform a search of shared files in local Google
     Drive cache.
@@ -4458,8 +4913,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="DriveCommon.LocalSearch.TextSearchTime" units="ms"
     expires_after="2021-04-19">
-  <owner>dats@chromium.org</owner>
-  <owner>sammc@chromium.org</owner>
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     How long did it take to search a title in local Google Drive cache.
   </summary>
@@ -4467,8 +4922,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="DriveCommon.RemoteSearch.SharedSearchTime" units="ms"
     expires_after="2021-04-19">
-  <owner>dats@chromium.org</owner>
-  <owner>sammc@chromium.org</owner>
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     How long did it take to perform a search of shared files in online Google
     Drive.
@@ -4477,17 +4932,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="DriveCommon.RemoteSearch.TextSearchTime" units="ms"
     expires_after="2021-04-19">
-  <owner>dats@chromium.org</owner>
-  <owner>sammc@chromium.org</owner>
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     How long did it take to perform a search in online Google Drive.
   </summary>
 </histogram>
 
 <histogram name="DriveOffline.CrosAutoEnableOutcome"
-    enum="CrosEnableDriveOfflineOutcome" expires_after="2021-03-05">
-  <owner>slangley@chromium.org</owner>
-  <owner>weifangsun@chromium.org</owner>
+    enum="CrosEnableDriveOfflineOutcome" expires_after="2022-02-05">
+  <owner>simmonsjosh@google.com</owner>
+  <owner>src/ui/file_manager/OWNERS</owner>
   <summary>
     Outcome of enabling Google Drive offline mode automatically when a user
     first logs into a Chrome OS device. This process involves opening a hidden
@@ -4497,7 +4952,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DrmUtil.CreateDisplaySnapshot.BitsPerChannel" units="bits"
-    expires_after="M89">
+    expires_after="2022-01-03">
   <owner>andrescj@chromium.org</owner>
   <owner>mcasas@chromium.org</owner>
   <owner>chromeos-gfx@google.com</owner>
@@ -4508,7 +4963,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DrmUtil.CreateDisplaySnapshot.HasEdidBlob" enum="Boolean"
-    expires_after="2021-04-18">
+    expires_after="2022-01-03">
   <owner>andrescj@chromium.org</owner>
   <owner>mcasas@chromium.org</owner>
   <owner>chromeos-gfx@google.com</owner>
@@ -4519,7 +4974,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DrmUtil.CreateDisplaySnapshot.IsHDR" enum="Boolean"
-    expires_after="M89">
+    expires_after="2022-01-03">
   <owner>andrescj@chromium.org</owner>
   <owner>mcasas@chromium.org</owner>
   <owner>chromeos-gfx@google.com</owner>
@@ -4531,7 +4986,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="DrmUtil.GetColorSpaceFromEdid.ChecksOutcome"
-    enum="EdidColorSpaceChecksOutcome" expires_after="2021-01-03">
+    enum="EdidColorSpaceChecksOutcome" expires_after="2022-01-03">
   <owner>andrescj@chromium.org</owner>
   <owner>mcasas@chromium.org</owner>
   <owner>chromeos-gfx@google.com</owner>
@@ -4543,7 +4998,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="EasyUnlock.AuthEvent.DidUserManuallyUnlockPhone"
-    enum="EasyUnlockDidUserManuallyUnlockPhone" expires_after="2021-02-02">
+    enum="EasyUnlockDidUserManuallyUnlockPhone" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -4555,7 +5010,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="EasyUnlock.AuthEvent.SignIn" enum="EasyUnlockAuthEvent"
-    expires_after="2021-04-04">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -4567,7 +5022,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="EasyUnlock.AuthEvent.SignIn.Duration" units="ms"
-    expires_after="2021-02-02">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -4577,7 +5032,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="EasyUnlock.AuthEvent.Unlock" enum="EasyUnlockAuthEvent"
-    expires_after="2021-04-04">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -4589,7 +5044,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="EasyUnlock.AuthEvent.Unlock.Duration" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -4601,7 +5056,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="EasyUnlock.AuthProximity.RemoteDeviceModelHash"
-    enum="EasyUnlockDeviceModelHash" expires_after="2021-02-02">
+    enum="EasyUnlockDeviceModelHash" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -4615,7 +5070,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="EasyUnlock.AuthProximity.RollingRssi" units="dBm"
-    expires_after="2021-02-02">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -4636,7 +5091,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="EasyUnlock.RemoteLockScreenState"
-    enum="EasyUnlockRemoteLockScreenState" expires_after="2021-02-02">
+    enum="EasyUnlockRemoteLockScreenState" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -4650,7 +5105,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="EasyUnlock.StartupTimeFromSuspend" units="ms"
-    expires_after="2021-02-02">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -4683,7 +5138,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="EphemeralTab.Ctr" enum="BooleanOpened" expires_after="M92">
+<histogram name="EphemeralTab.Ctr" enum="BooleanOpened"
+    expires_after="2021-08-09">
   <owner>donnd@chromium.org</owner>
   <owner>jinsukkim@chromium.org</owner>
   <summary>
@@ -4692,7 +5148,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="EphemeralTab.CtrPeek" enum="BooleanOpened" expires_after="M92">
+<histogram name="EphemeralTab.CtrPeek" enum="BooleanOpened"
+    expires_after="2021-08-09">
   <owner>donnd@chromium.org</owner>
   <owner>jinsukkim@chromium.org</owner>
   <summary>
@@ -4701,7 +5158,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="EphemeralTab.DurationOpened" units="ms" expires_after="M92">
+<histogram name="EphemeralTab.DurationOpened" units="ms"
+    expires_after="2021-08-09">
   <owner>donnd@chromium.org</owner>
   <owner>jinsukkim@chromium.org</owner>
   <summary>
@@ -4710,7 +5168,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="EphemeralTab.DurationPeeked" units="ms" expires_after="M92">
+<histogram name="EphemeralTab.DurationPeeked" units="ms"
+    expires_after="2021-08-09">
   <owner>donnd@chromium.org</owner>
   <owner>jinsukkim@chromium.org</owner>
   <summary>
@@ -4780,7 +5239,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ExploreSites.CatalogRequestResult"
-    enum="ExploreSitesCatalogUpdateRequestResult" expires_after="2021-04-18">
+    enum="ExploreSitesCatalogUpdateRequestResult" expires_after="2021-07-27">
   <owner>dewittj@chromium.org</owner>
   <owner>petewil@chromium.org</owner>
   <summary>Results of the Explore Sites network request for a catalog.</summary>
@@ -4855,7 +5314,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ExploreSites.MonthlyHostCount" units="hosts"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>dimich@chromium.org</owner>
   <summary>
     Number of unique hosts visited by the user during the last 30 days. Reported
@@ -4888,7 +5347,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ExploreSites.RequestStatus" enum="ExploreSitesRequestStatus"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>dimich@chromium.org</owner>
   <owner>freedjm@chromium.org</owner>
   <summary>
@@ -4898,7 +5357,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ExploreSites.SiteTilesClickIndex2" units="units"
-    expires_after="2021-04-18">
+    expires_after="2021-08-09">
   <owner>dewittj@chromium.org</owner>
   <owner>petewil@chromium.org</owner>
   <summary>
@@ -4922,6 +5381,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="FamilyUser.ArcAppsCount" units="Number of Apps"
     expires_after="2021-08-12">
+  <obsolete>
+    Replaced with FamilyUser.ArcAppsCount2 in M90.
+  </obsolete>
   <owner>tobyhuang@chromium.org</owner>
   <owner>cros-families-eng@google.com</owner>
   <summary>
@@ -4932,6 +5394,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="FamilyUser.BorealisAppsCount" units="Number of Apps"
     expires_after="2021-08-12">
+  <obsolete>
+    Replaced with FamilyUser.BorealisAppsCount2 in M90.
+  </obsolete>
   <owner>tobyhuang@chromium.org</owner>
   <owner>cros-families-eng@google.com</owner>
   <summary>
@@ -4956,6 +5421,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="FamilyUser.CrostiniAppsCount" units="Number of Apps"
     expires_after="2021-08-12">
+  <obsolete>
+    Replaced with FamilyUser.CrostiniAppsCount2 in M90.
+  </obsolete>
   <owner>tobyhuang@chromium.org</owner>
   <owner>cros-families-eng@google.com</owner>
   <summary>
@@ -4964,8 +5432,23 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="FamilyUser.DeviceOwner" enum="Boolean"
+    expires_after="2021-08-12">
+  <owner>agawronska@chromium.org</owner>
+  <owner>tobyhuang@chromium.org</owner>
+  <owner>xiqiruan@chromium.org</owner>
+  <owner>cros-families-eng@google.com</owner>
+  <summary>
+    Records whether the current primary user is the owner of device. Reports at
+    the beginning of the first active session daily.
+  </summary>
+</histogram>
+
 <histogram name="FamilyUser.EnabledExtensionsCount"
     units="Number of Extensions" expires_after="2021-08-12">
+  <obsolete>
+    Replaced with FamilyUser.EnabledExtensionsCount2 in M90.
+  </obsolete>
   <owner>tobyhuang@chromium.org</owner>
   <owner>cros-families-eng@google.com</owner>
   <summary>
@@ -4976,6 +5459,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="FamilyUser.ExtensionAppsCount" units="Number of Apps"
     expires_after="2021-08-12">
+  <obsolete>
+    Replaced with FamilyUser.ExtensionAppsCount2 in M90.
+  </obsolete>
   <owner>tobyhuang@chromium.org</owner>
   <owner>cros-families-eng@google.com</owner>
   <summary>
@@ -4985,8 +5471,36 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="FamilyUser.FamilyLinkUsersCount" units="Number of Users"
+    expires_after="2021-08-12">
+  <owner>agawronska@chromium.org</owner>
+  <owner>tobyhuang@chromium.org</owner>
+  <owner>xiqiruan@chromium.org</owner>
+  <owner>cros-families-eng@google.com</owner>
+  <summary>
+    Records the number of family link users on a Chrome OS device at the
+    beginning of the first active session daily.
+  </summary>
+</histogram>
+
+<histogram name="FamilyUser.GaiaUsersCount" units="Number of Users"
+    expires_after="2022-02-12">
+  <owner>agawronska@chromium.org</owner>
+  <owner>tobyhuang@chromium.org</owner>
+  <owner>xiqiruan@chromium.org</owner>
+  <owner>cros-families-eng@google.com</owner>
+  <summary>
+    Records the number of Gaia users on a Chrome OS device, at the beginning of
+    the first active session daily for all user types except incognito session.
+    The user count could be 0 if the managed device has ephemeral user policy.
+  </summary>
+</histogram>
+
 <histogram name="FamilyUser.InstalledExtensionsCount"
     units="Number of Extensions" expires_after="2021-08-12">
+  <obsolete>
+    Replaced with FamilyUser.InstalledExtensionsCount2 in M90.
+  </obsolete>
   <owner>tobyhuang@chromium.org</owner>
   <owner>cros-families-eng@google.com</owner>
   <summary>
@@ -4995,8 +5509,37 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="FamilyUser.ManagedSiteList" enum="FamilyLinkManagedSiteList"
+    expires_after="2021-08-12">
+  <owner>agawronska@chromium.org</owner>
+  <owner>tobyhuang@chromium.org</owner>
+  <owner>xiqiruan@chromium.org</owner>
+  <owner>cros-families-eng@google.com</owner>
+  <summary>
+    Records whether managed sites approved list and blocked list are enabled for
+    currently active Family Link user. Reports at the beginning of the first
+    active session daily. Ignores the reports during OOBE and sign out.
+  </summary>
+</histogram>
+
+<histogram name="FamilyUser.NewUserAdded" enum="NewUserAdded"
+    expires_after="2021-12-12">
+  <owner>agawronska@chromium.org</owner>
+  <owner>tobyhuang@chromium.org</owner>
+  <owner>xiqiruan@chromium.org</owner>
+  <owner>cros-families-eng@google.com</owner>
+  <summary>
+    Reports NewUserAdded enum when a new Family Link user or regular user is
+    successfully added to Chrome OS device. Other user types fall into the other
+    bucket. Reports when the user session starts.
+  </summary>
+</histogram>
+
 <histogram name="FamilyUser.OtherAppsCount" units="Number of Apps"
     expires_after="2021-08-12">
+  <obsolete>
+    Replaced with individual app types in M90.
+  </obsolete>
   <owner>tobyhuang@chromium.org</owner>
   <owner>cros-families-eng@google.com</owner>
   <summary>
@@ -5059,8 +5602,25 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="FamilyUser.TimeLimitPolicyTypes" enum="TimeLimitPolicyType"
+    expires_after="2021-12-12">
+  <owner>agawronska@chromium.org</owner>
+  <owner>tobyhuang@chromium.org</owner>
+  <owner>xiqiruan@chromium.org</owner>
+  <owner>cros-families-eng@google.com</owner>
+  <summary>
+    Records what time limit policy types are enabled for the currently active
+    Family Link user. Enabling multiple policies would report multiple buckets
+    to UMA. Reports at the beginning of the first active session daily.
+  </summary>
+</histogram>
+
 <histogram name="FamilyUser.TotalAppsCount" units="Number of Apps"
     expires_after="2021-08-12">
+  <obsolete>
+    We only know the individual app type totals, not the overall total, after
+    M90.
+  </obsolete>
   <owner>tobyhuang@chromium.org</owner>
   <owner>cros-families-eng@google.com</owner>
   <summary>
@@ -5069,8 +5629,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="FamilyUser.TotalUsersCount" units="Number of Users"
+    expires_after="M90">
+  <obsolete>
+    Removed in M90. Use FamilyUser.GaiaUsersCount instead.
+  </obsolete>
+  <owner>agawronska@chromium.org</owner>
+  <owner>tobyhuang@chromium.org</owner>
+  <owner>xiqiruan@chromium.org</owner>
+  <owner>cros-families-eng@google.com</owner>
+  <summary>
+    Records the number of users for all user types on a Chrome OS device at the
+    beginning of the first active session daily.
+  </summary>
+</histogram>
+
 <histogram name="FamilyUser.WebAppsCount" units="Number of Apps"
     expires_after="2021-08-12">
+  <obsolete>
+    Replaced with FamilyUser.WebAppsCount2 in M90.
+  </obsolete>
   <owner>tobyhuang@chromium.org</owner>
   <owner>cros-families-eng@google.com</owner>
   <summary>
@@ -5079,6 +5657,57 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="FamilyUser.WebFilterType" enum="FamilyLinkWebFilterType"
+    expires_after="2021-08-12">
+  <owner>agawronska@chromium.org</owner>
+  <owner>tobyhuang@chromium.org</owner>
+  <owner>xiqiruan@chromium.org</owner>
+  <owner>cros-families-eng@google.com</owner>
+  <summary>
+    Records the web filter type for currently active Family Link user. Reports
+    at the beginning of the first active session daily. Ignores the reports
+    during OOBE and sign out.
+  </summary>
+</histogram>
+
+<histogram name="FamilyUser.{AppType}AppsCount2" units="Number of Apps"
+    expires_after="2022-02-04">
+  <owner>tobyhuang@chromium.org</owner>
+  <owner>cros-families-eng@google.com</owner>
+  <summary>
+    Around once per day, records the number of recently used {AppType} apps in
+    the past day.
+  </summary>
+  <token key="AppType">
+    <variant name="Arc"/>
+    <variant name="Borealis"/>
+    <variant name="BuiltIn"/>
+    <variant name="Crostini"/>
+    <variant name="Extension"/>
+    <variant name="Lacros"/>
+    <variant name="MacOs"/>
+    <variant name="PluginVm"/>
+    <variant name="Remote"/>
+    <variant name="Unknown"/>
+    <variant name="Web"/>
+  </token>
+</histogram>
+
+<histogram name="FamilyUser.{ExtensionStatus}ExtensionsCount2"
+    units="Number of Extensions" expires_after="2022-02-04">
+  <owner>tobyhuang@chromium.org</owner>
+  <owner>cros-families-eng@google.com</owner>
+  <summary>
+    Records the number of non-component {ExtensionStatus} regular browser
+    extensions and themes around once per day, regardless of when they were last
+    used.
+  </summary>
+  <token key="ExtensionStatus">
+    <variant name="Enabled" summary="enabled"/>
+    <variant name="Installed" summary="installed"/>
+  </token>
+</histogram>
+
 <histogram name="FaultTolerantHeap" enum="FaultTolerantHeap"
     expires_after="M77">
   <owner>brucedawson@chromium.org</owner>
@@ -5140,114 +5769,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="FCMInvalidations.FailedSubscriptionsErrorCode"
-    enum="NetErrorCodes" expires_after="never">
-<!-- expires-never: For monitoring FCM based invalidations. -->
-
-  <owner>melandory@chromium.org</owner>
-  <summary>Net error codes for failed subscription requests.</summary>
-</histogram>
-
-<histogram name="FCMInvalidations.FCMMessageStatus"
-    enum="FCMInvalidationMessageStatus" expires_after="never">
-<!-- expires-never: For monitoring FCM based invalidations. -->
-
-<!-- Name completed by histogram_suffixes name="FCMInvalidationSenders" -->
-
-  <owner>melandory@chromium.org</owner>
-  <owner>treib@chromium.org</owner>
-  <summary>
-    Status of the message from the FCM channel. Recorded upon receiving response
-    from the FCM channel.
-  </summary>
-</histogram>
-
-<histogram name="FCMInvalidations.InitialTokenRetrievalStatus"
-    enum="InstanceIDResult" expires_after="never">
-<!-- expires-never: For monitoring FCM based invalidations. -->
-
-  <owner>melandory@chromium.org</owner>
-  <owner>treib@chromium.org</owner>
-  <summary>
-    Status of the initial attempt to retrieve the instance id token.
-  </summary>
-</histogram>
-
-<histogram name="FCMInvalidations.ResetClientIDStatus" enum="InstanceIDResult"
-    expires_after="2020-10-19">
-  <obsolete>
-    Removed 2020-10.
-  </obsolete>
-  <owner>tschumann@chromium.org</owner>
-  <owner>treib@chromium.org</owner>
-  <summary>
-    Status of resetting the client instance ID, which includes unregistering
-    from FCM servers.
-  </summary>
-</histogram>
-
-<histogram name="FCMInvalidations.SubscriptionRequestStatus"
-    enum="FCMInvalidationSubscriptionStatus" expires_after="never">
-<!-- expires-never: For monitoring FCM based invalidations. -->
-
-  <owner>melandory@chromium.org</owner>
-  <owner>treib@chromium.org</owner>
-  <summary>
-    Status of subscription request to the Per User Topic server. Recorded upon
-    receiving response from server.
-  </summary>
-</histogram>
-
-<histogram name="FCMInvalidations.SubscriptionResponseCode"
-    enum="HttpResponseCode" expires_after="never">
-<!-- expires-never: For monitoring FCM based invalidations. -->
-
-  <owner>melandory@chromium.org</owner>
-  <owner>treib@chromium.org</owner>
-  <summary>
-    For each subcription request to the FCM Per-User-Topic server, log the
-    response received from the server.
-  </summary>
-</histogram>
-
-<histogram name="FCMInvalidations.SubscriptionResponseCodeForTopic"
-    enum="HttpResponseCode" expires_after="never">
-<!-- expires-never: For monitoring FCM based invalidations. -->
-
-  <owner>melandory@chromium.org</owner>
-  <owner>treib@chromium.org</owner>
-  <summary>
-    For each subcription request to the FCM Per-User-Topic server, log the
-    response received from the server per topic. Note: This is only recorded
-    with a data type suffix. The base version is never recorded.
-  </summary>
-</histogram>
-
-<histogram name="FCMInvalidations.TokenStateOnRegistrationRequest2"
-    enum="TokenStateOnRegistrationRequest" expires_after="never">
-<!-- expires-never: For monitoring FCM based invalidations. -->
-
-  <owner>melandory@chromium.org</owner>
-  <owner>treib@chromium.org</owner>
-  <summary>
-    Records the outcome of instance ID token requests (i.e. whether the token
-    changed). Such requests are made when invalidations are first enabled (e.g.
-    on sign-in), and then periodically every 24 hours.
-  </summary>
-</histogram>
-
-<histogram name="FCMInvalidations.UnsubscriptionRequestStatus"
-    enum="FCMInvalidationSubscriptionStatus" expires_after="never">
-<!-- expires-never: For monitoring FCM based invalidations. -->
-
-  <owner>melandory@chromium.org</owner>
-  <owner>treib@chromium.org</owner>
-  <summary>
-    Status of unsubscription request to the Per User Topic server. Recorded upon
-    receiving response from server.
-  </summary>
-</histogram>
-
 <histogram name="Feedback.HappinessTrackingSurvey.BubbleUsage"
     enum="HappinessTrackingSurveyDesktopBubbleUsage" expires_after="M82">
   <owner>weili@chromium.org</owner>
@@ -5260,7 +5781,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Feedback.HappinessTrackingSurvey.ShouldShowSurveyReason"
-    enum="HappinessTrackingSurveyShouldShowSurveyReasons" expires_after="M90">
+    enum="HappinessTrackingSurveyShouldShowSurveyReasons"
+    expires_after="2021-07-04">
   <owner>sauski@google.com</owner>
   <owner>msramek@chromium.org</owner>
   <summary>
@@ -5278,14 +5800,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FirstRun.IOSFirebaseConfigured" enum="FirebaseConfiguredState"
-    expires_after="M87">
+    expires_after="M89">
   <owner>ghendel@chromium.org</owner>
   <owner>pkl@chromium.org</owner>
   <summary>Track whether Firebase is enabled or not at app startup.</summary>
 </histogram>
 
 <histogram name="FirstRun.LaunchSource" enum="FirstRunLaunchSource"
-    expires_after="2021-02-28">
+    expires_after="2021-07-27">
   <owner>jlebel@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
@@ -5333,7 +5855,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FirstRun.NewUserExperience.NtpBackgroundInteraction"
-    enum="NuxNtpBackgroundInteractions" expires_after="2021-03-21">
+    enum="NuxNtpBackgroundInteractions" expires_after="2021-07-27">
   <owner>hcarmona@chromium.org</owner>
   <owner>johntlee@chromium.org</owner>
   <summary>
@@ -5382,7 +5904,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FirstRun.Sentinel.Created" enum="FirstRunSentinelResult"
-    expires_after="2021-04-20">
+    expires_after="2021-08-22">
   <owner>jlebel@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
   <summary>Result of sentinel file has been written.</summary>
@@ -5408,10 +5930,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FirstUserAction.BackgroundTime" units="minutes"
-    expires_after="M90">
+    expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="FirstUserActionType" and name="FirstUserActionTypeDevice" -->
 
-  <owner>eugenebut@chromium.org</owner>
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     WARNING: The list of actions used to identify new tasks hasn't been
@@ -5425,8 +5947,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FirstUserAction.HandsetUserActionType"
-    enum="FirstUserActionType" expires_after="M90">
-  <owner>eugenebut@chromium.org</owner>
+    enum="FirstUserActionType" expires_after="2021-08-22">
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     WARNING: The list of actions used to identify new tasks hasn't been
@@ -5440,8 +5962,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="FirstUserAction.TabletUserActionType"
-    enum="FirstUserActionType" expires_after="M90">
-  <owner>eugenebut@chromium.org</owner>
+    enum="FirstUserActionType" expires_after="2021-08-22">
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     WARNING: The list of actions used to identify new tasks hasn't been
@@ -5553,7 +6075,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Fonts.AccessAPI.EnumerationTime" units="ms"
-    expires_after="M90">
+    expires_after="2021-06-20">
   <owner>oyiptong@chromium.org</owner>
   <owner>storage-dev@chromium.org</owner>
   <summary>Time spent enumerating fonts.</summary>
@@ -5614,7 +6136,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Gamepad.KnownGamepadConnectedWithId"
-    enum="GamepadVendorProduct" expires_after="2021-04-04">
+    enum="GamepadVendorProduct" expires_after="2021-08-09">
   <owner>mattreynolds@chromium.org</owner>
   <owner>deviceapi-team@google.com</owner>
   <summary>
@@ -5631,7 +6153,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Gamepad.UnknownGamepadConnected" enum="GamepadSource"
-    expires_after="2021-04-04">
+    expires_after="2021-07-18">
   <owner>mattreynolds@chromium.org</owner>
   <owner>deviceapi-team@google.com</owner>
   <summary>
@@ -5814,7 +6336,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Graphics.PresentationTimestamp.InvalidBeforeSwap" units="ms"
-    expires_after="2021-03-01">
+    expires_after="2021-09-01">
   <owner>sadrul@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
@@ -5827,7 +6349,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Graphics.PresentationTimestamp.InvalidFromFuture" units="ms"
-    expires_after="2021-03-01">
+    expires_after="2021-09-01">
   <owner>sadrul@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
@@ -5839,7 +6361,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Graphics.PresentationTimestamp.LargePresentationDelta"
-    units="ms" expires_after="2021-03-01">
+    units="ms" expires_after="2021-09-01">
   <owner>sadrul@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
@@ -5851,8 +6373,30 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Graphics.Smoothness.95pctPercentDroppedFrames_1sWindow"
+    units="%" expires_after="2021-11-12">
+  <owner>behdadb@chromium.org</owner>
+  <owner>sadrul@chromium.org</owner>
+  <summary>
+    The percent dropped frame is calculated for each sliding window of 1 second
+    length and added to a histogram, and then the 95 percentile of that
+    histogram is reported as 95pctPercentDroppedFrames_1sWindow.
+
+    The sliding windows cover the duration of page-load (From start of page-load
+    until user navigates away, or closes the tab/chrome, or when app goes to
+    background). Note that this means that this metric will bias toward tabs
+    that are closed more quickly, and might underreport tabs that remain open
+    for a long duration.
+
+    PercentDroppedFrames is measured by tracking the number of frames which were
+    not displayed on screen out of the total number of frames expected to be
+    produced and displayed. In other words, the lower this number is, the
+    smoother experience.
+  </summary>
+</histogram>
+
 <histogram name="Graphics.Smoothness.Checkerboarding" units="%"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>sadrul@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
@@ -5867,6 +6411,49 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Graphics.Smoothness.Diagnostic.DiscardedDependentCount"
+    units="dependent reporters" expires_after="2022-02-01">
+  <owner>sadrul@chromium.org</owner>
+  <owner>behdadb@chromium.org</owner>
+  <summary>
+    Diagnostic metric to measure how many dependent reporters have been
+    discarded.
+
+    The reporters might be dependant on another reporter (when having partial
+    updates) but if the number of dependents go over a limit we would discard
+    them earlier. This metric count how many of such reporters been discarded
+    earlier than expected as a result of outstanding number of dependent
+    reporters. The metric will be reported at the end of each frame if there has
+    been any discarded dependent reporters.
+  </summary>
+</histogram>
+
+<histogram
+    name="Graphics.Smoothness.Diagnostic.DroppedFrameAfterScrollStart.Frames"
+    units="vsyncs" expires_after="2021-09-01">
+  <owner>sadrul@chromium.org</owner>
+  <owner>behdadb@chromium.org</owner>
+  <summary>
+    Diagnostic metric to measure how long after scroll-start a frame is dropped.
+
+    For every frame dropped during a scroll, this metric reports how long after
+    scroll started the frame dropped (in number of vsyncs).
+  </summary>
+</histogram>
+
+<histogram
+    name="Graphics.Smoothness.Diagnostic.DroppedFrameAfterScrollStart.Time"
+    units="ms" expires_after="2021-09-01">
+  <owner>sadrul@chromium.org</owner>
+  <owner>behdadb@chromium.org</owner>
+  <summary>
+    Diagnostic metric to measure how long after scroll-start a frame is dropped.
+
+    For every frame dropped during a scroll, this metric reports how long after
+    scroll started the frame dropped (in milliseconds).
+  </summary>
+</histogram>
+
 <histogram name="Graphics.Smoothness.Diagnostic.ReadSharedMemoryDuration"
     units="microseconds" expires_after="2021-09-01">
   <owner>sadrul@chromium.org</owner>
@@ -5892,7 +6479,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Graphics.Smoothness.FrameSequenceLength" units="count"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>sadrul@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
@@ -5921,6 +6508,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Graphics.Smoothness.MaxPercentDroppedFrames_1sWindow"
+    units="%" expires_after="2021-11-12">
+  <owner>behdadb@chromium.org</owner>
+  <owner>sadrul@chromium.org</owner>
+  <summary>
+    Tracks the percent of dropped frames for in a 1 second sliding window.
+
+    PercentDroppedFrames is measured by tracking the number of frames which were
+    not displayed on screen out of the total number of frames expected to be
+    produced and displayed. In other words, the lower this number is, the
+    smoother experience.
+  </summary>
+</histogram>
+
 <histogram name="Graphics.Smoothness.MaxStale" units="ms"
     expires_after="2021-11-01">
   <owner>sadrul@chromium.org</owner>
@@ -5945,7 +6546,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Graphics.Smoothness.PercentDroppedFrames" units="%"
-    expires_after="2020-12-31">
+    expires_after="2021-09-30">
   <owner>sadrul@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
@@ -5966,7 +6567,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Graphics.Smoothness.PercentDroppedFrames.AllAnimations"
-    units="%" expires_after="2021-05-09">
+    units="%" expires_after="2021-09-30">
   <owner>sadrul@chromium.org</owner>
   <owner>ericrk@chromium.org</owner>
   <summary>
@@ -5987,7 +6588,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Graphics.Smoothness.PercentDroppedFrames.AllInteractions"
-    units="%" expires_after="2021-05-09">
+    units="%" expires_after="2021-09-30">
   <owner>sadrul@chromium.org</owner>
   <owner>ericrk@chromium.org</owner>
   <summary>
@@ -6008,7 +6609,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Graphics.Smoothness.PercentDroppedFrames.AllSequences"
-    units="%" expires_after="2021-05-09">
+    units="%" expires_after="2021-09-30">
   <owner>sadrul@chromium.org</owner>
   <owner>ericrk@chromium.org</owner>
   <summary>
@@ -6027,7 +6628,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Graphics.Smoothness.PercentMissedDeadlineFrames"
-    units="%" expires_after="2020-12-31">
+    units="%" expires_after="2021-09-30">
   <owner>sadrul@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
@@ -6046,7 +6647,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Graphics.Smoothness.PercentMissedDeadlineFrames.AllAnimations"
-    units="%" expires_after="2020-12-31">
+    units="%" expires_after="2021-09-30">
   <owner>sadrul@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
@@ -6066,7 +6667,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Graphics.Smoothness.PercentMissedDeadlineFrames.AllInteractions"
-    units="%" expires_after="2020-12-31">
+    units="%" expires_after="2021-09-30">
   <owner>sadrul@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
@@ -6085,7 +6686,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Graphics.Smoothness.PercentMissedDeadlineFrames.AllSequences"
-    units="%" expires_after="2021-03-28">
+    units="%" expires_after="2021-09-30">
   <owner>sadrul@chromium.org</owner>
   <owner>graphics-dev@chromium.org</owner>
   <summary>
@@ -6102,6 +6703,55 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram
+    name="Graphics.Smoothness.PerSession.95pctPercentDroppedFrames_1sWindow"
+    units="%" expires_after="2021-11-18">
+  <owner>sadrul@chromium.org</owner>
+  <owner>graphics-dev@chromium.org</owner>
+  <summary>
+    Tracks the 95th percentile of dropped frames percent of a sliding window of
+    1 second. The metric is reported once per page-load when the page closes. If
+    there are fewer than 20 sliding windows for calculating 95th percentile, the
+    max value will be used instead of 95th percentile.
+
+    PercentDroppedFrames is measured by tracking the number of frames which were
+    not displayed on screen out of the total number of frames expected to be
+    produced and displayed. In other words, the lower this number is, the
+    smoother experience.
+  </summary>
+</histogram>
+
+<histogram name="Graphics.Smoothness.PerSession.AveragePercentDroppedFrames"
+    units="%" expires_after="2021-11-18">
+  <owner>sadrul@chromium.org</owner>
+  <owner>graphics-dev@chromium.org</owner>
+  <summary>
+    Tracks the percent of dropped frames. The metric is reported once per
+    page-load when the page closes.
+
+    AveragePercentDroppedFrames is measured by tracking the number of frames
+    which were not displayed on screen out of the total number of frames
+    expected to be produced and displayed. In other words, the lower this number
+    is, the smoother experience.
+  </summary>
+</histogram>
+
+<histogram
+    name="Graphics.Smoothness.PerSession.MaxPercentDroppedFrames_1sWindow"
+    units="%" expires_after="2021-11-18">
+  <owner>sadrul@chromium.org</owner>
+  <owner>graphics-dev@chromium.org</owner>
+  <summary>
+    Tracks the Max of dropped frames percent of a sliding window of 1 second.
+    The metric is reported once per page-load when the page closes.
+
+    PercentDroppedFrames is measured by tracking the number of frames which were
+    not displayed on screen out of the total number of frames expected to be
+    produced and displayed. In other words, the lower this number is, the
+    smoother experience.
+  </summary>
+</histogram>
+
 <histogram name="Graphics.Smoothness.Stale" units="ms"
     expires_after="2021-11-01">
   <owner>sadrul@chromium.org</owner>
@@ -6168,7 +6818,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="GridTabSwitcher.FramePerSecond" units="frame/sec"
-    expires_after="2021-02-14">
+    expires_after="2021-08-09">
   <owner>yusufo@chromium.org</owner>
   <owner>wychen@chromium.org</owner>
   <summary>
@@ -6212,7 +6862,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Hardware.Concurrency" units="CPU cores"
-    expires_after="2021-05-02">
+    expires_after="2021-07-27">
   <owner>sadrul@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -6242,7 +6892,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Hardware.TotalDiskSpace" units="GB" expires_after="2021-05-02">
+<histogram name="Hardware.TotalDiskSpace" units="GB" expires_after="2021-08-09">
   <owner>sadrul@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -6252,7 +6902,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="HeapProfiling.ProfiledProcess.Type"
-    enum="HeapProfilingProcessType" expires_after="2021-05-02">
+    enum="HeapProfilingProcessType" expires_after="2021-08-09">
   <owner>erikchen@chromium.org</owner>
   <owner>chrome-memory@google.com</owner>
   <summary>
@@ -6436,7 +7086,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="HttpCache.AccessToDone" units="ms" expires_after="2021-05-02">
+<histogram name="HttpCache.AccessToDone" units="ms" expires_after="2021-08-09">
   <owner>morlovich@chromium.org</owner>
   <summary>
     For every http cache transaction with a pattern (see HttpCache.Pattern), the
@@ -6491,8 +7141,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="HttpCache.HardReset" enum="Boolean" expires_after="2021-06-15">
-  <owner>ericrobinson@chromium.org</owner>
   <owner>shivanisha@chromium.org</owner>
+  <owner>jkarlin@chromium.org</owner>
   <summary>
     Whether the HttpCache was forced to reset upon creation, effectively
     clearing out its previous content. This is recorded when the cache is
@@ -6501,7 +7151,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="HttpCache.MaxFileSizeOnInit" units="KB"
-    expires_after="2021-05-02">
+    expires_after="2021-08-09">
   <owner>shivanisha@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -6531,7 +7181,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="HttpCache.Pattern" enum="HttpCachePattern"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>morlovich@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>For each http cache transaction, the recorded pattern.</summary>
@@ -6556,7 +7206,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Hwsec.Attestation.Status"
-    enum="HwsecAttestationOpsStatus" expires_after="2021-04-20">
+    enum="HwsecAttestationOpsStatus" expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="AttestationOps" -->
 
   <owner>garryxiao@chromium.org</owner>
@@ -6567,13 +7217,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Hyphenation.Open" units="ms" expires_after="2021-05-09">
+<histogram name="Hyphenation.Open" units="ms" expires_after="2021-07-11">
   <owner>kojii@chromium.org</owner>
   <owner>layout-dev@chromium.org</owner>
   <summary>The time it takes to open a hyphenation dictionary.</summary>
 </histogram>
 
-<histogram name="Hyphenation.Open.File" units="ms" expires_after="2021-05-09">
+<histogram name="Hyphenation.Open.File" units="ms" expires_after="2021-07-11">
   <owner>kojii@chromium.org</owner>
   <owner>layout-dev@chromium.org</owner>
   <summary>The time it takes to open a hyphenation dictionary file.</summary>
@@ -6634,7 +7284,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ImportantFile.DeleteOnCloseError" enum="PlatformFileError"
-    expires_after="2021-01-19">
+    expires_after="M89">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>grt@chromium.org</owner>
   <owner>xaerox@yandex-team.ru</owner>
   <summary>
@@ -6644,7 +7297,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ImportantFile.FileCreateError" enum="PlatformFileError"
-    expires_after="2021-03-21">
+    expires_after="2021-07-11">
   <owner>grt@chromium.org</owner>
   <owner>xaerox@yandex-team.ru</owner>
   <summary>
@@ -6653,7 +7306,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ImportantFile.FileDeleteNoRetryError" enum="PlatformFileError"
-    expires_after="2021-05-02">
+    expires_after="2021-08-15">
   <owner>grt@chromium.org</owner>
   <owner>xaerox@yandex-team.ru</owner>
   <summary>
@@ -6663,7 +7316,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ImportantFile.FileDeleteRetryExceededError"
-    enum="PlatformFileError" expires_after="2021-03-21">
+    enum="PlatformFileError" expires_after="2021-08-15">
   <owner>grt@chromium.org</owner>
   <owner>xaerox@yandex-team.ru</owner>
   <summary>
@@ -6672,7 +7325,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ImportantFile.FileDeleteRetrySuccessCount"
-    units="attept number" expires_after="2021-05-02">
+    units="attept number" expires_after="2021-08-09">
   <owner>grt@chromium.org</owner>
   <owner>xaerox@yandex-team.ru</owner>
   <summary>
@@ -6682,7 +7335,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ImportantFile.FileRenameError" enum="PlatformFileError"
-    expires_after="2021-03-21">
+    expires_after="2021-08-01">
   <owner>grt@chromium.org</owner>
   <owner>xaerox@yandex-team.ru</owner>
   <summary>
@@ -6690,8 +7343,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ImportantFile.FileReplaceRetryCount" units="attempt count"
+    expires_after="2021-06-30">
+  <owner>brucedawson@chromium.org</owner>
+  <owner>grt@chromium.org</owner>
+  <summary>
+    The number of retries needed to successfully move the temporary file to its
+    final location. Zero means that ReplaceFile worked the first time. Ten means
+    that it never succeeded.
+  </summary>
+</histogram>
+
 <histogram name="ImportantFile.FileWriteError" enum="PlatformFileError"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>grt@chromium.org</owner>
   <owner>xaerox@yandex-team.ru</owner>
   <summary>
@@ -6700,8 +7364,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ImportantFile.SerializationDuration" units="ms"
+    expires_after="2021-08-09">
+  <owner>battre@chromium.org</owner>
+  <owner>gab@chromium.org</owner>
+  <summary>CPU time used to serialize preferences into a JSON string.</summary>
+</histogram>
+
 <histogram name="ImportantFile.TempFileFailures" enum="TempFileFailure"
-    expires_after="2021-03-21">
+    expires_after="2021-08-15">
   <owner>grt@chromium.org</owner>
   <owner>lassey@google.com</owner>
   <summary>
@@ -6907,7 +7578,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InProductHelp.Config.ParsingEvent" enum="ConfigParsingEvent"
-    expires_after="M91">
+    expires_after="2021-08-22">
   <owner>nyquist@chromium.org</owner>
   <owner>xingliu@chromium.org</owner>
   <summary>
@@ -6917,7 +7588,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="InProductHelp.Db.Init" enum="BooleanSuccess"
-    expires_after="M91">
+    expires_after="2021-08-22">
   <owner>nyquist@chromium.org</owner>
   <owner>xingliu@chromium.org</owner>
 <!-- Name completed by histogram_suffixes name="IPHDatabase" -->
@@ -6928,7 +7599,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="InProductHelp.Db.Load" enum="BooleanSuccess"
-    expires_after="M91">
+    expires_after="2021-08-22">
   <owner>nyquist@chromium.org</owner>
   <owner>xingliu@chromium.org</owner>
 <!-- Name completed by histogram_suffixes name="IPHDatabase" -->
@@ -6939,7 +7610,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InProductHelp.Db.TotalEvents" units="events"
-    expires_after="M91">
+    expires_after="2021-08-22">
   <owner>nyquist@chromium.org</owner>
   <owner>xingliu@chromium.org</owner>
   <summary>
@@ -6949,7 +7620,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="InProductHelp.Db.Update" enum="BooleanSuccess"
-    expires_after="M91">
+    expires_after="2021-08-22">
   <owner>nyquist@chromium.org</owner>
   <owner>xingliu@chromium.org</owner>
 <!-- Name completed by histogram_suffixes name="IPHDatabase" -->
@@ -6960,7 +7631,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="InProductHelp.NotifyEventReadyState"
-    enum="BooleanSuccess" expires_after="M91">
+    enum="BooleanSuccess" expires_after="2021-08-22">
   <owner>nyquist@chromium.org</owner>
   <owner>xingliu@chromium.org</owner>
 <!-- Name completed by histogram_suffixes name="IPHFeatures" -->
@@ -6984,7 +7655,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InProductHelp.Promos.Snooze" units="SnoozeType"
-    expires_after="M88">
+    expires_after="2021-07-18">
 <!-- Name completed by histogram_suffixes name="IPHFeatures" -->
 
   <owner>kerenzhu@chromium.org</owner>
@@ -6997,7 +7668,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InProductHelp.Promos.SnoozeCountAtAcknowledge" units="times"
-    expires_after="M88">
+    expires_after="2021-07-18">
 <!-- Name completed by histogram_suffixes name="IPHFeatures" -->
 
   <owner>kerenzhu@chromium.org</owner>
@@ -7009,7 +7680,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InProductHelp.Promos.SnoozeCountAtFollow" units="times"
-    expires_after="M88">
+    expires_after="2021-07-18">
 <!-- Name completed by histogram_suffixes name="IPHFeatures" -->
 
   <owner>kerenzhu@chromium.org</owner>
@@ -7022,7 +7693,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InProductHelp.Promos.SnoozeCountAtTrigger" units="times"
-    expires_after="M88">
+    expires_after="2021-07-18">
 <!-- Name completed by histogram_suffixes name="IPHFeatures" -->
 
   <owner>kerenzhu@chromium.org</owner>
@@ -7034,7 +7705,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InProductHelp.ShouldTriggerHelpUI" enum="TriggerHelpUIResult"
-    expires_after="M91">
+    expires_after="2021-08-22">
   <owner>nyquist@chromium.org</owner>
   <owner>xingliu@chromium.org</owner>
 <!-- Name completed by histogram_suffixes name="IPHFeatures" -->
@@ -7063,7 +7734,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstanceID.GetToken.NetErrorCode" enum="NetErrorCodes"
-    expires_after="M90">
+    expires_after="M94">
   <owner>peter@chromium.org</owner>
   <owner>platform-capabilities@chromium.org</owner>
   <summary>
@@ -7073,7 +7744,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstanceID.GetToken.OptionsCount" units="options"
-    expires_after="M91">
+    expires_after="M89">
+  <obsolete>
+    Deprecated as of 11/2020
+  </obsolete>
   <owner>peter@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
   <summary>
@@ -7083,7 +7757,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="InstanceID.GetToken.RequestStatus"
-    enum="GCMRegistrationRequestStatus" expires_after="M90">
+    enum="GCMRegistrationRequestStatus" expires_after="M94">
   <owner>peter@chromium.org</owner>
   <summary>Status code of the outcome of GetToken request.</summary>
 </histogram>
@@ -7114,15 +7788,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Invalidations.StatusChanged" enum="InvalidatorState"
-    expires_after="M85">
-  <owner>melandory@chromium.org</owner>
-  <summary>
-    Status of the invalidation component. The metric is recorded on startup
-    unless invalidations are disabled, plus when the state changes.
-  </summary>
-</histogram>
-
 <histogram name="IPC.AttachmentBrokerPrivileged.BrokerAttachmentError"
     enum="IPCAttachmentBrokerPrivilegedBrokerAttachmentError"
     expires_after="M85">
@@ -7143,159 +7808,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="IsolatedPrerender.AfterClick.Mainframe.CookieWaitTime"
-    units="ms" expires_after="M90">
-  <owner>robertogden@chromium.org</owner>
-  <owner>ryansturm@chromium.org</owner>
-  <owner>tbansal@chromium.org</owner>
-  <summary>
-    Records the amount of time that the navigation to a previously prefetched
-    page was delayed because cookies had to be copied from the isolated cookie
-    jar.
-  </summary>
-</histogram>
-
-<histogram name="IsolatedPrerender.AfterClick.Subresources.UsedCache"
-    enum="BooleanCacheHit" expires_after="M90">
-  <owner>robertogden@chromium.org</owner>
-  <owner>ryansturm@chromium.org</owner>
-  <owner>tbansal@chromium.org</owner>
-  <summary>
-    Records whether a previously prefetched subresource from an Isolated
-    Prerender was served from cache when its page was later navigated to.
-  </summary>
-</histogram>
-
-<histogram name="IsolatedPrerender.Prefetch.Mainframe.BodyLength" units="bytes"
-    expires_after="M90">
-  <owner>robertogden@chromium.org</owner>
-  <owner>ryansturm@chromium.org</owner>
-  <owner>tbansal@chromium.org</owner>
-  <summary>
-    Records the response body length as cached in memory encountered when
-    isolated prefetching a mainframe HTML resource from the Google Search Result
-    Page. Recorded for non-network error prefetches only.
-  </summary>
-</histogram>
-
-<histogram name="IsolatedPrerender.Prefetch.Mainframe.ConnectTime" units="ms"
-    expires_after="M90">
-  <owner>robertogden@chromium.org</owner>
-  <owner>ryansturm@chromium.org</owner>
-  <owner>tbansal@chromium.org</owner>
-  <summary>
-    Records the time taken to establish a socket connection when isolated
-    prefetching a mainframe HTML resource from the Google Search Result Page.
-    Recorded for non-network error prefetches only.
-  </summary>
-</histogram>
-
-<histogram name="IsolatedPrerender.Prefetch.Mainframe.CookiesToCopy"
-    units="count" expires_after="M90">
-  <owner>robertogden@chromium.org</owner>
-  <owner>ryansturm@chromium.org</owner>
-  <owner>tbansal@chromium.org</owner>
-  <summary>
-    Records the number of cookies that needed to be copied from the prefetch
-    navigation to the user's profile after a prefetched link is navigated to.
-  </summary>
-</histogram>
-
-<histogram name="IsolatedPrerender.Prefetch.Mainframe.NetError"
-    enum="NetErrorCodes" expires_after="M90">
-  <owner>robertogden@chromium.org</owner>
-  <owner>ryansturm@chromium.org</owner>
-  <owner>tbansal@chromium.org</owner>
-  <summary>
-    Records the Net Error encountered when isolated prefetching a mainframe HTML
-    resource from the Google Search Result Page. Recorded for every completed
-    prefetch.
-  </summary>
-</histogram>
-
-<histogram name="IsolatedPrerender.Prefetch.Mainframe.RespCode"
-    enum="HttpResponseCode" expires_after="M90">
-  <owner>robertogden@chromium.org</owner>
-  <owner>ryansturm@chromium.org</owner>
-  <owner>tbansal@chromium.org</owner>
-  <summary>
-    Records the HTTP response code encountered isolated prefetching a mainframe
-    HTML resource from the Google Search Result Page. Recorded for non-network
-    error prefetches only. Redirects are not included here.
-  </summary>
-</histogram>
-
-<histogram name="IsolatedPrerender.Prefetch.Mainframe.TotalRedirects"
-    units="count" expires_after="M90">
-  <owner>robertogden@chromium.org</owner>
-  <owner>ryansturm@chromium.org</owner>
-  <owner>tbansal@chromium.org</owner>
-  <summary>
-    Records the total number of redirects encountered while doing all the
-    prefetches on an eligible Google Search Result page. Only recorded when at
-    least one prefetch was attempted.
-  </summary>
-</histogram>
-
-<histogram name="IsolatedPrerender.Prefetch.Mainframe.TotalTime" units="ms"
-    expires_after="M90">
-  <owner>robertogden@chromium.org</owner>
-  <owner>ryansturm@chromium.org</owner>
-  <owner>tbansal@chromium.org</owner>
-  <summary>
-    Records the total time taken when isolated prefetching a mainframe HTML
-    resource from the Google Search Result Page. Recorded for successful
-    non-network error prefetches only.
-  </summary>
-</histogram>
-
-<histogram name="IsolatedPrerender.Prefetch.Subresources.NetError"
-    enum="NetErrorCodes" expires_after="M90">
-  <owner>robertogden@chromium.org</owner>
-  <owner>ryansturm@chromium.org</owner>
-  <owner>tbansal@chromium.org</owner>
-  <summary>
-    Records the net error encountered when prefetching a single subresource
-    during Isolated Prerenders.
-  </summary>
-</histogram>
-
-<histogram name="IsolatedPrerender.Prefetch.Subresources.Quantity"
-    units="count" expires_after="M90">
-  <owner>robertogden@chromium.org</owner>
-  <owner>ryansturm@chromium.org</owner>
-  <owner>tbansal@chromium.org</owner>
-  <summary>
-    Records the number of subresources that were NoStatePrefetch'd during an
-    Isolated Prerender. Recorded once for each page that is NoStatePrefetch'd
-    during Isolated Prerenders.
-  </summary>
-</histogram>
-
-<histogram name="IsolatedPrerender.Prefetch.Subresources.RespCode"
-    enum="HttpResponseCode" expires_after="M90">
-  <owner>robertogden@chromium.org</owner>
-  <owner>ryansturm@chromium.org</owner>
-  <owner>tbansal@chromium.org</owner>
-  <summary>
-    Records the HTTP response code encountered when prefetching a single
-    subresource during Isolated Prerenders.
-  </summary>
-</histogram>
-
-<histogram name="IsolatedPrerender.SpareRenderer.CountStartedOnSRP"
-    units="count" expires_after="M90">
-  <owner>robertogden@chromium.org</owner>
-  <owner>ryansturm@chromium.org</owner>
-  <owner>tbansal@chromium.org</owner>
-  <summary>
-    Records the number of spare renderers that were attempted to be started on
-    the SRP, when the feature param is enabled.
-  </summary>
-</histogram>
-
 <histogram name="JSDialogs.OnBeforeUnloadStayVsLeave" enum="StayVsLeave"
     expires_after="M77">
+  <obsolete>
+    Removed 2020 November.
+  </obsolete>
   <owner>avi@chromium.org</owner>
   <summary>
     For onbeforeunload dialogs, the user's choice between staying on the page
@@ -7325,7 +7842,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Kerberos.AcquireKerberosTgtTime" units="ms"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -7335,7 +7852,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Kerberos.DailyActiveUsers" enum="KerberosUserType"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -7347,7 +7864,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Kerberos.EncryptionTypesAcquireKerberosTgt"
-    enum="KerberosEncryptionTypes" expires_after="M90">
+    enum="KerberosEncryptionTypes" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -7358,7 +7875,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Kerberos.NumberOfAccounts.Managed" units="units"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -7369,7 +7886,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Kerberos.NumberOfAccounts.RememberedPassword" units="units"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -7381,7 +7898,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Kerberos.NumberOfAccounts.Total" units="units"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -7391,7 +7908,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Kerberos.NumberOfAccounts.Unmanaged" units="units"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -7402,7 +7919,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Kerberos.NumberOfAccounts.UseLoginPassword" units="units"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -7414,7 +7931,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Kerberos.Result.AcquireKerberosTgt" enum="KerberosErrorType"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -7424,7 +7941,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Kerberos.Result.AddAccount" enum="KerberosErrorType"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -7434,7 +7951,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Kerberos.Result.ClearAccounts" enum="KerberosErrorType"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -7445,7 +7962,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Kerberos.Result.GetKerberosFiles" enum="KerberosErrorType"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -7456,7 +7973,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Kerberos.Result.ListAccounts" enum="KerberosErrorType"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -7466,7 +7983,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Kerberos.Result.RemoveAccount" enum="KerberosErrorType"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -7476,7 +7993,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Kerberos.Result.SetConfig" enum="KerberosErrorType"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -7486,7 +8003,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Kerberos.Result.ValidateConfig" enum="KerberosErrorType"
-    expires_after="M90">
+    expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -7497,7 +8014,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Kerberos.ValidateConfigErrorCode"
-    enum="KerberosConfigErrorCode" expires_after="M90">
+    enum="KerberosConfigErrorCode" expires_after="M97">
   <owner>fsandrade@chromium.org</owner>
   <owner>tomdobro@chromium.org</owner>
   <summary>
@@ -7508,7 +8025,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Keyboard.ShortcutViewer.StartupTime" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>jamescook@chromium.org</owner>
   <owner>msw@chromium.org</owner>
   <owner>wutao@chromium.org</owner>
@@ -7520,8 +8037,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="KeyboardAccessory.AccessoryActionImpression"
-    enum="AccessoryAction" expires_after="2021-03-21">
+    enum="AccessoryAction" expires_after="2021-07-27">
   <owner>fhorschig@chromium.org</owner>
+  <owner>ioanap@chromium.org</owner>
   <summary>
     Android only. Records whenever users faces an action in the accessory bar or
     one of its sheets.
@@ -7529,8 +8047,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="KeyboardAccessory.AccessoryActionSelected"
-    enum="AccessoryAction" expires_after="2021-03-21">
+    enum="AccessoryAction" expires_after="2021-07-27">
   <owner>fhorschig@chromium.org</owner>
+  <owner>ioanap@chromium.org</owner>
   <summary>
     Android only. Records whenever users select an action in the accessory bar
     or one of its sheets.
@@ -7538,7 +8057,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="KeyboardAccessory.AccessoryBarShown"
-    enum="AccessoryBarContents" expires_after="2021-03-21">
+    enum="AccessoryBarContents" expires_after="2021-07-27">
   <owner>fhorschig@chromium.org</owner>
   <owner>ioanap@chromium.org</owner>
   <summary>
@@ -7549,8 +8068,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="KeyboardAccessory.AccessorySheetSuggestionCount" units="count"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>fhorschig@chromium.org</owner>
+  <owner>ioanap@chromium.org</owner>
   <summary>
     Android only. Records how many suggestions a user faced when opening a
     sheet. The base histogram counts impressions across all sheets.
@@ -7558,8 +8078,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="KeyboardAccessory.AccessorySheetSuggestionsSelected"
-    enum="AccessorySuggestionType" expires_after="2021-03-21">
+    enum="AccessorySuggestionType" expires_after="2021-07-27">
   <owner>fhorschig@chromium.org</owner>
+  <owner>ioanap@chromium.org</owner>
   <summary>
     Android only. Records which type of suggestion was selected from an open
     sheet.
@@ -7567,8 +8088,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="KeyboardAccessory.AccessorySheetTriggered"
-    enum="AccessorySheetTrigger" expires_after="2021-03-21">
+    enum="AccessorySheetTrigger" expires_after="2021-07-27">
   <owner>fhorschig@chromium.org</owner>
+  <owner>ioanap@chromium.org</owner>
   <summary>
     Android only. Records how often the bottom sheet was opened or closed by a
     user and the overall count of closures. Closing buckets may be logged up to
@@ -7577,7 +8099,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="KeyboardAccessory.AccessoryToggleClicked"
-    enum="AccessoryToggleType" expires_after="M90">
+    enum="AccessoryToggleType" expires_after="2021-07-27">
   <owner>ioanap@chromium.org</owner>
   <owner>fhorschig@chromium.org</owner>
   <summary>
@@ -7588,7 +8110,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="KeyboardAccessory.AccessoryToggleImpression"
-    enum="AccessoryToggleType" expires_after="M90">
+    enum="AccessoryToggleType" expires_after="2021-07-27">
   <owner>ioanap@chromium.org</owner>
   <owner>fhorschig@chromium.org</owner>
   <summary>
@@ -7598,7 +8120,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="KeyboardAccessory.DisabledSavingAccessoryImpressions"
-    enum="BooleanShown" expires_after="M90">
+    enum="BooleanShown" expires_after="M95">
   <owner>ioanap@chromium.org</owner>
   <owner>fhorschig@chromium.org</owner>
   <summary>
@@ -7610,34 +8132,37 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="KeyboardAccessory.GenerationDialogChoice"
-    enum="GenerationDialogChoice" expires_after="M90">
-<!-- Name completed by histogram_suffixes name="PasswordGenerationType" -->
-
+<histogram name="KeyboardAccessory.GenerationDialogChoice.{GenerationType}"
+    enum="GenerationDialogChoice" expires_after="M95">
   <owner>ioanap@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
     Android only. Records the interactions with the password generation dialog
-    for automatic generation.
+    for {GenerationType}. Recorded when the user taps a button in the dialog or
+    dismsses it.
   </summary>
+  <token key="GenerationType">
+    <variant name="Automatic" summary="automatic generation"/>
+    <variant name="Manual" summary="manual generation"/>
+  </token>
 </histogram>
 
 <histogram name="Kiosk.Launch.CryptohomeFailure" enum="LoginFailureReason"
-    expires_after="2021-03-21">
+    expires_after="2021-07-25">
   <owner>xiyuan@chromium.org</owner>
   <owner>apotapchuk@chromium.org</owner>
   <summary>Tracks cryptohome failure during kiosk launch.</summary>
 </histogram>
 
 <histogram name="Kiosk.Launch.Error" enum="KioskLaunchError"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>xiyuan@chromium.org</owner>
   <owner>apotapchuk@chromium.org</owner>
   <summary>Tracks kiosk launch errors.</summary>
 </histogram>
 
 <histogram name="Kiosk.LaunchType" enum="KioskLaunchType"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>xiyuan@chromium.org</owner>
   <owner>aghuie@chromium.org</owner>
   <summary>
@@ -7646,25 +8171,52 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="LanguageDetection.TFLiteModel.LanguageDetectionModelState"
+    enum="LanguageDetectionModelState" expires_after="M94">
+  <owner>mcrouse@chromium.org</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    The state of the language detection model used by a TranslateAgent. Recorded
+    once per model load attempt for each renderer process.
+  </summary>
+</histogram>
+
+<histogram name="LanguageDetection.TFLiteModel.WasModelAvailableForDetection"
+    enum="BooleanAvailable" expires_after="M94">
+  <owner>mcrouse@chromium.org</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    Whether the TFLite-based language detection model was available when page
+    content was extracted and a language determination was needed. Recorded once
+    per page load.
+  </summary>
+</histogram>
+
 <histogram name="LanguageSettings.Actions" enum="LanguageSettingsActionType"
-    expires_after="2020-12-01">
-  <owner>googleo@chromium.org</owner>
+    expires_after="2021-12-01">
+  <owner>perrier@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
-    The actions taken on languages settings, recorded every time they happen.
-    This histogram will record every single event that happens separately.
+    The actions on the languages settings page that result in a preference
+    change. This histogram will record every single event that happens
+    separately. See LanguageSettings.PageImpressions for how often language
+    settings sections are seen.
   </summary>
 </histogram>
 
 <histogram name="LanguageSettings.PageImpression"
-    enum="LanguageSettingsPageType" expires_after="2021-05-09">
+    enum="LanguageSettingsPageType" expires_after="2021-12-01">
   <owner>googleo@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
-  <summary>The type of panes which language settings loads.</summary>
+  <summary>
+    Impressions of pages, sections, or dialogs viewed from language settings.
+    Page impressions do not result in preferences changes. See
+    LanguageSettings.Actions for preference change counts.
+  </summary>
 </histogram>
 
 <histogram name="LanguageUsage.AcceptLanguage" enum="LanguageCode"
-    expires_after="2021-04-04">
+    expires_after="2021-12-01">
   <owner>perrier@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -7674,7 +8226,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="LanguageUsage.AcceptLanguage.Count" units="units"
-    expires_after="2021-06-01">
+    expires_after="2021-12-01">
   <owner>dvallet@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -7684,7 +8236,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="LanguageUsage.ApplicationLanguage" enum="LanguageCode"
-    expires_after="2021-04-04">
+    expires_after="2021-12-01">
   <owner>perrier@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -7694,7 +8246,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="LanguageUsage.MostFrequentPageLanguages" enum="LanguageCode"
-    expires_after="M90">
+    expires_after="2021-12-01">
   <owner>perrier@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -7704,6 +8256,63 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="LanguageUsage.UI.Android.Availability"
+    enum="LanguageUsage.UI.Android.Availability" expires_after="2021-12-01">
+  <owner>perrier@chromium.org</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    The availability status of Android system languages for use as the Chromium
+    UI language. If the Chromium UI language is overridden, it must be
+    avaliable. The default language is the one used by the JVM for localization.
+    This will be different from the top Android language if the top Android
+    language is not available for localization in Chromium. For more info, see
+    the Android documentation on LocaleList.getDefault().
+
+    This histogram is recorded during onForgroundStart() for Android.
+  </summary>
+</histogram>
+
+<histogram name="LanguageUsage.UI.Android.Correctness"
+    enum="LanguageUsage.UI.Android.Correctness" expires_after="2021-12-01">
+  <owner>perrier@chromium.org</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    The status of the current Chromium UI. It is correct when the UI matches
+    what the JVM default language is set to.
+
+    This histogram is recorded during onForgroundStart() for Android.
+  </summary>
+</histogram>
+
+<histogram name="LanguageUsage.UI.Android.Correctness.NoOverride"
+    enum="LanguageUsage.UI.Android.Correctness" expires_after="2021-12-01">
+  <owner>perrier@chromium.org</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    The status of the current Chromium UI when the UI language is not
+    overridden. The UI language is correct when it matches the default Android
+    system language. If no Android language is available as the Chromium
+    language, then the UI is by definition incorrect.
+
+    This histogram is recorded during onForgroundStart() for Android.
+  </summary>
+</histogram>
+
+<histogram name="LanguageUsage.UI.Android.Correctness.Override"
+    enum="LanguageUsage.UI.Android.Correctness" expires_after="2021-12-01">
+  <owner>perrier@chromium.org</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    The status of the current Chromium UI when the UI language is overridden.
+    The UI language is correct when it matches the override UI value set as the
+    default locale. The Native UI language can be different from the Java UI
+    language if Play Store daily hygiene has not run since an override language
+    was set.
+
+    This histogram is recorded during onForgroundStart() for Android.
+  </summary>
+</histogram>
+
 <histogram name="Launch.FlagsAtStartup" enum="LoginCustomFlags"
     expires_after="never">
 <!-- expires-never: monitors use of all flags. -->
@@ -7719,7 +8328,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Launch.HomeScreen" enum="LaunchFromHomeScreen"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>dominickn@chromium.org</owner>
   <owner>hartmanng@chromium.org</owner>
   <owner>peconn@chromium.org</owner>
@@ -7729,7 +8338,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Launch.HomeScreenSource" enum="LaunchFromHomeScreenSource"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>dominickn@chromium.org</owner>
   <owner>hartmanng@chromium.org</owner>
   <owner>peconn@chromium.org</owner>
@@ -7772,7 +8381,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Launch.WebAppDisplayMode" enum="WebAppDisplayMode"
-    expires_after="M87">
+    expires_after="M96">
   <owner>peter@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
   <summary>
@@ -7876,6 +8485,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Layout.ScrollAnchor.AdjustedScrollOffset" enum="BooleanHit"
     expires_after="M77">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>skobes@chromium.org</owner>
   <summary>
     Records the number of times ScrollAnchor adjusts the scroll offset.
@@ -7884,6 +8496,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Layout.ScrollAnchor.RestorationStatus"
     enum="ScrollAnchorRestorationStatus" expires_after="M77">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>pnoland@chromium.org</owner>
   <summary>
     Records the status of attempts to restore a serialized scroll anchor.
@@ -7901,6 +8516,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Layout.ScrollAnchor.SuppressedBySanaclap" enum="BooleanHit"
     expires_after="M81">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>ymalik@chromium.org</owner>
   <summary>
     Records the number of times scroll anchoring is suppressed because of the
@@ -7967,7 +8585,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Lens.ImageClassification.ClassificationTime.EarlyTerminatedMs"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2021-07-04">
   <owner>yusuyoutube@google.com</owner>
   <owner>benwgold@google.com</owner>
   <summary>
@@ -7978,7 +8596,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Lens.ImageClassification.ClassificationTime.SuccessOnQueryResultMs"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2021-08-22">
   <owner>yusuyoutube@google.com</owner>
   <owner>benwgold@google.com</owner>
   <summary>
@@ -7988,7 +8606,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Lens.ImageClassification.ResultState"
-    enum="LensClassifyResultState" expires_after="M90">
+    enum="LensClassifyResultState" expires_after="2021-08-22">
   <owner>yusuyoutube@google.com</owner>
   <owner>benwgold@google.com</owner>
   <summary>
@@ -7998,7 +8616,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Lens.ImageClassification.SdkError" enum="LensSdkError"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>yusuyoutube@google.com</owner>
   <owner>benwgold@google.com</owner>
   <summary>
@@ -8009,7 +8627,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="LevelDB.ApproximateMemTableMemoryUse" units="bytes"
-    expires_after="2021-01-03">
+    expires_after="2021-08-24">
   <owner>nyquist@chromium.org</owner>
   <owner>salg@google.com</owner>
   <summary>
@@ -8071,7 +8689,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Linux.Distro.Debian" enum="LinuxDistroDebianVersion"
-    expires_after="2021-04-19">
+    expires_after="2021-08-22">
   <owner>thestig@chromium.org</owner>
   <owner>thomasanderson@chromium.org</owner>
   <summary>
@@ -8081,7 +8699,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Linux.Distro.Fedora" enum="LinuxDistroFedoraVersion"
-    expires_after="2021-04-19">
+    expires_after="2021-08-22">
   <owner>thestig@chromium.org</owner>
   <owner>thomasanderson@chromium.org</owner>
   <summary>
@@ -8091,7 +8709,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Linux.Distro.OpenSuseLeap"
-    enum="LinuxDistroOpenSuseLeapVersion" expires_after="2021-04-19">
+    enum="LinuxDistroOpenSuseLeapVersion" expires_after="2021-08-22">
   <owner>thestig@chromium.org</owner>
   <owner>thomasanderson@chromium.org</owner>
   <summary>
@@ -8101,7 +8719,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Linux.Distro.Ubuntu" enum="LinuxDistroUbuntuVersion"
-    expires_after="2021-04-19">
+    expires_after="2021-08-22">
   <owner>thestig@chromium.org</owner>
   <owner>thomasanderson@chromium.org</owner>
   <summary>
@@ -8110,14 +8728,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Linux.Distro2" enum="LinuxDistro2" expires_after="2021-04-19">
+<histogram name="Linux.Distro2" enum="LinuxDistro2" expires_after="2021-08-22">
   <owner>thestig@chromium.org</owner>
   <owner>thomasanderson@chromium.org</owner>
   <summary>The Linux distro used. Logged on each start up.</summary>
 </histogram>
 
 <histogram name="Linux.GlibcVersion" enum="LinuxGlibcVersion"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>thestig@chromium.org</owner>
   <owner>thomasanderson@chromium.org</owner>
   <summary>
@@ -8137,7 +8755,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Linux.WindowManager" enum="LinuxWindowManagerName"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>pkotwicz@chromium.org</owner>
   <owner>thomasanderson@chromium.org</owner>
   <summary>
@@ -8154,22 +8772,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Linux.X11.ServerRTT" units="microseconds" expires_after="M77">
-  <owner>thomasanderson@chromium.org</owner>
-  <summary>
-    RTT between Chrome and the X11 server. Tracked in X11EventSource by
-    measuring the latency to receive a property event after changing a property.
-
-    Warning: This metric may include reports from clients with low-resolution
-    clocks (i.e. on Windows, ref. |TimeTicks::IsHighResolution()|). Such reports
-    will cause this metric to have an abnormal distribution. When considering
-    revising this histogram, see UMA_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES for the
-    solution.
-  </summary>
-</histogram>
-
 <histogram name="LiteVideo.CanApplyLiteVideo.HintCache.HasHint"
-    enum="BooleanAvailable" expires_after="M90">
+    enum="BooleanAvailable" expires_after="2021-08-22">
   <owner>mcrouse@chromium.org</owner>
   <owner>rajendrant@chromium.org</owner>
   <summary>
@@ -8180,7 +8784,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="LiteVideo.CanApplyLiteVideo.UserBlocklist"
-    enum="LiteVideoBlocklistReason" expires_after="M90">
+    enum="LiteVideoBlocklistReason" expires_after="2021-08-22">
   <owner>mcrouse@chromium.org</owner>
   <owner>rajendrant@chromium.org</owner>
   <summary>
@@ -8192,7 +8796,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="LiteVideo.HintAgent.ActiveThrottleSize" units="count"
-    expires_after="M90">
+    expires_after="M94">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -8202,7 +8806,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="LiteVideo.HintAgent.HasHint" units="boolean"
-    expires_after="M90">
+    expires_after="2021-06-27">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -8212,7 +8816,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="LiteVideo.LiteVideoDecider.OptGuideHintCacheSize"
-    units="count" expires_after="M90">
+    units="count" expires_after="2021-08-22">
   <owner>mcrouse@chromium.org</owner>
   <owner>rajendrant@chromium.org</owner>
   <summary>
@@ -8222,7 +8826,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="LiteVideo.NavigationMetrics.FrameRebufferMapSize"
-    units="count" expires_after="M90">
+    units="count" expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>rajendrant@chromium.org</owner>
   <summary>
@@ -8232,7 +8836,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="LiteVideo.OriginHints.ParseResult" enum="BooleanSuccess"
-    expires_after="M90">
+    expires_after="M94">
   <owner>mcrouse@chromium.org</owner>
   <owner>rajendrant@chromium.org</owner>
   <summary>
@@ -8243,7 +8847,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="LiteVideo.URLLoader.ThrottleLatency" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -8254,7 +8858,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="LoadingPredictor.OptimizationHintsReceiveStatus"
     enum="LoadingPredictorOptimizationHintsReceiveStatus"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>sophiechang@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -8265,7 +8869,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="LoadingPredictor.PreconnectCount" units="origins"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>alexilin@chromium.org</owner>
   <summary>
     The number of origins that were preconnected for a page load. It includes
@@ -8275,7 +8879,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="LoadingPredictor.PreconnectHitsPercentage" units="%"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>alexilin@chromium.org</owner>
   <summary>
     The percentage of origins that were preconnected and requested by a page
@@ -8286,7 +8890,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="LoadingPredictor.PreconnectLearningCount"
-    units="origins" expires_after="2021-04-11">
+    units="origins" expires_after="2021-08-15">
   <owner>alexilin@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -8296,7 +8900,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="LoadingPredictor.PreconnectLearningPrecision"
-    units="%" expires_after="2021-04-11">
+    units="%" expires_after="2021-08-15">
   <owner>alexilin@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -8308,7 +8912,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="LoadingPredictor.PreconnectLearningRecall"
-    units="%" expires_after="2021-04-18">
+    units="%" expires_after="2021-08-09">
   <owner>alexilin@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -8331,7 +8935,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="LoadingPredictor.PreresolveCount" units="hosts"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>alexilin@chromium.org</owner>
   <summary>
     The number of hosts that were preresolved for a page load. It includes only
@@ -8371,7 +8975,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="MachineLearningService.CpuTimeMicrosec"
-    units="microseconds" expires_after="2021-01-01">
+    units="microseconds" expires_after="2021-07-01">
 <!-- Name completed by histogram_suffixes
      name="MachineLearningServiceRequests" -->
 
@@ -8385,7 +8989,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MachineLearningService.CpuUsageMilliPercent"
-    units="1/1000ths of %" expires_after="2021-04-18">
+    units="1/1000ths of %" expires_after="2021-08-22">
   <owner>alanlxl@chromium.org</owner>
   <owner>amoylan@chromium.org</owner>
   <summary>
@@ -8397,7 +9001,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram base="true"
     name="MachineLearningService.CreateGraphExecutorResult.Event"
     enum="MachineLearningServiceCreateGraphExecutorResultEvent"
-    expires_after="2021-03-15">
+    expires_after="2021-09-15">
   <owner>amoylan@chromium.org</owner>
   <owner>alanlxl@chromium.org</owner>
   <summary>
@@ -8406,7 +9010,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="MachineLearningService.ExecuteResult.Event"
-    enum="MachineLearningServiceExecuteResultEvent" expires_after="2021-03-15">
+    enum="MachineLearningServiceExecuteResultEvent" expires_after="2021-09-15">
   <owner>amoylan@chromium.org</owner>
   <owner>alanlxl@chromium.org</owner>
   <summary>
@@ -8414,9 +9018,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="MachineLearningService.GrammarChecker.Check.Event"
+    enum="Boolean" expires_after="2021-12-31">
+  <owner>jiwan@chromium.org</owner>
+  <owner>amoylan@chromium.org</owner>
+  <summary>The result of grammar check, which can be OK or ERROR.</summary>
+</histogram>
+
+<histogram name="MachineLearningService.GrammarChecker.LoadModelResult.Event"
+    enum="MachineLearningServiceLoadModelResultEvent"
+    expires_after="2021-12-31">
+  <owner>jiwan@chromium.org</owner>
+  <owner>amoylan@chromium.org</owner>
+  <summary>
+    The result of load grammar model, which can be OK or some specific error.
+    The error code could be logged in machine learning service in chrome or in
+    chromeos when grammar model is not loaded successfully.
+  </summary>
+</histogram>
+
 <histogram name="MachineLearningService.HandwritingModel.LoadModelResult.Event"
     enum="MachineLearningServiceLoadHandwritingModelResultEvent"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>amoylan@chromium.org</owner>
   <owner>alanlxl@chromium.org</owner>
   <owner>charleszhao@chromium.org</owner>
@@ -8428,7 +9051,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MachineLearningService.HandwritingModel.Recognize.Event"
-    enum="Boolean" expires_after="2021-03-15">
+    enum="Boolean" expires_after="2021-07-18">
   <owner>amoylan@chromium.org</owner>
   <owner>alanlxl@chromium.org</owner>
   <owner>charleszhao@chromium.org</owner>
@@ -8440,7 +9063,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="MachineLearningService.LoadModelResult"
     enum="MachineLearningServiceLoadModelResultEvent"
-    expires_after="2021-03-15">
+    expires_after="2021-09-15">
   <owner>amoylan@chromium.org</owner>
   <owner>alanlxl@chromium.org</owner>
   <summary>
@@ -8452,7 +9075,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true" name="MachineLearningService.LoadModelResult.Event"
     enum="MachineLearningServiceLoadModelResultEvent"
-    expires_after="2021-03-15">
+    expires_after="2021-09-15">
   <owner>amoylan@chromium.org</owner>
   <owner>alanlxl@chromium.org</owner>
   <summary>
@@ -8461,7 +9084,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MachineLearningService.MojoConnectionEvent"
-    enum="MachineLearningServiceMojoConnectionEvent" expires_after="2021-03-28">
+    enum="MachineLearningServiceMojoConnectionEvent" expires_after="2021-08-01">
   <owner>alanlxl@chromium.org</owner>
   <owner>amoylan@chromium.org</owner>
   <summary>
@@ -8471,7 +9094,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MachineLearningService.PeakTotalMemoryKb" units="KB"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>alanlxl@chromium.org</owner>
   <owner>amoylan@chromium.org</owner>
   <owner>honglinyu@chromium.org</owner>
@@ -8482,7 +9105,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="MachineLearningService.TotalMemoryDeltaKb"
-    units="KB" expires_after="2021-01-01">
+    units="KB" expires_after="2021-07-01">
   <owner>amoylan@chromium.org</owner>
   <owner>alanlxl@chromium.org</owner>
   <owner>honglinyu@chromium.org</owner>
@@ -8492,7 +9115,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MachineLearningService.TotalMemoryKb" units="KB"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>alanlxl@chromium.org</owner>
   <owner>amoylan@chromium.org</owner>
   <owner>honglinyu@chromium.org</owner>
@@ -8514,7 +9137,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ManagedUsers.FilteringResult"
-    enum="SupervisedUserSafetyFilterResult" expires_after="2021-06-02">
+    enum="SupervisedUserSafetyFilterResult" expires_after="2021-08-15">
   <owner>agawronska@chromium.org</owner>
   <owner>cros-families@google.com</owner>
   <summary>
@@ -8593,12 +9216,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="ManagedUsers.Whitelist.Count" units="whitelists"
-    expires_after="2021-06-02">
+<histogram name="ManagedUsers.Whitelist.Count" units="allowlists"
+    expires_after="M88">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>agawronska@chromium.org</owner>
   <owner>cros-families@google.com</owner>
   <summary>
-    The number of whitelists installed for a supervised user. Recorded at every
+    The number of allowlists installed for a supervised user. Recorded at every
     profile startup.
   </summary>
 </histogram>
@@ -8613,7 +9239,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Manifest.HasProperty" enum="Boolean"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>mgiuca@chromium.org</owner>
   <owner>mlamouri@chromium.org</owner>
   <summary>
@@ -8635,77 +9261,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="ManualFallback.PresentedOptions.AllPasswords"
-    units="Credentials" expires_after="2021-03-21">
-  <owner>javierrobles@chromium.org</owner>
-  <owner>gambard@chromium.org</owner>
-  <summary>
-    Tracks the number of credentials presented to the user in the &quot;Use
-    other password...&quot; view in Manual Fallback. This is logged everytime
-    the user opens this view.
-  </summary>
-</histogram>
-
-<histogram name="ManualFallback.PresentedOptions.CreditCards" units="Cards"
-    expires_after="2021-03-21">
-  <owner>javierrobles@chromium.org</owner>
-  <owner>gambard@chromium.org</owner>
-  <summary>
-    Tracks the number of cards presented to the user in Manual Fallback. This is
-    logged everytime the user opens this view.
-  </summary>
-</histogram>
-
-<histogram name="ManualFallback.PresentedOptions.Passwords" units="Credentials"
-    expires_after="2021-03-21">
-  <owner>javierrobles@chromium.org</owner>
-  <owner>gambard@chromium.org</owner>
-  <summary>
-    Tracks the number of credentials presented to the user in the Passwords
-    Manual Fallback view. This is logged everytime the user opens this view.
-  </summary>
-</histogram>
-
-<histogram name="ManualFallback.PresentedOptions.Profiles" units="Profiles"
-    expires_after="2021-03-21">
-  <owner>javierrobles@chromium.org</owner>
-  <owner>gambard@chromium.org</owner>
-  <summary>
-    Tracks the number of profiles presented to the user in Manual Fallback. This
-    is logged everytime the user opens this view.
-  </summary>
-</histogram>
-
-<histogram name="ManualFallback.VisibleSuggestions.OpenCreditCards"
-    units="Suggestions" expires_after="2021-01-15">
-  <owner>javierrobles@chromium.org</owner>
-  <owner>gambard@chromium.org</owner>
-  <summary>
-    Tracks the number of autofill suggestions present when the user taps on the
-    credit card button in manual fallback.
-  </summary>
-</histogram>
-
-<histogram name="ManualFallback.VisibleSuggestions.OpenPasswords"
-    units="Suggestions" expires_after="2021-01-15">
-  <owner>javierrobles@chromium.org</owner>
-  <owner>gambard@chromium.org</owner>
-  <summary>
-    Tracks the number of password suggestions present when the user taps on the
-    password button in manual fallback.
-  </summary>
-</histogram>
-
-<histogram name="ManualFallback.VisibleSuggestions.OpenProfiles"
-    units="Suggestions" expires_after="2021-01-15">
-  <owner>javierrobles@chromium.org</owner>
-  <owner>gambard@chromium.org</owner>
-  <summary>
-    Tracks the number of autofill suggestions present when the user taps on the
-    profiles (address) button in manual fallback.
-  </summary>
-</histogram>
-
 <histogram name="Mist.SwitchResult" enum="MistSwitchResult" expires_after="M77">
   <owner>akhouderchah@chromium.org</owner>
   <owner>benchan@chromium.org</owner>
@@ -8774,9 +9329,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="ModuleBlacklistCache.BlacklistPathUpdated"
     enum="BooleanSuccess" expires_after="M85">
+  <obsolete>
+    Renamed to ModuleBlocklistCache.BlocklistPathUpdated.
+  </obsolete>
   <owner>pmonette@chromium.org</owner>
   <summary>
-    Records the result of writing the path of the module blacklist cache to the
+    Records the result of writing the path of the module blocklist cache to the
     registry so that chrome_elf.dll can use it. A value is emitted every time
     the cache is updated because another instance of Chrome with a different
     User Data directory could have overwritten the path to point to their own
@@ -8785,19 +9343,25 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ModuleBlacklistCache.BlacklistStatus"
-    enum="ModuleBlacklistStatus" expires_after="M85">
+    enum="ModuleBlocklistStatus" expires_after="M85">
+  <obsolete>
+    Renamed to ModuleBlocklistCache.BlocklistStatus.
+  </obsolete>
   <owner>pmonette@chromium.org</owner>
   <summary>
-    The status of a blacklisted module in the process. Recorded when the cache
+    The status of a blocklisted module in the process. Recorded when the cache
     is updated.
   </summary>
 </histogram>
 
 <histogram name="ModuleBlacklistCache.DeleteResult" enum="BooleanSuccess"
     expires_after="M82">
+  <obsolete>
+    Renamed to ModuleBlocklistCache.DeleteResult.
+  </obsolete>
   <owner>pmonette@chromium.org</owner>
   <summary>
-    The result of deleting the module blacklist cache when third-party module
+    The result of deleting the module blocklist cache when third-party module
     blocking is disabled. Attempting to delete an empty file is considered a
     success.
   </summary>
@@ -8805,34 +9369,109 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="ModuleBlacklistCache.ExpectedMD5Digest" enum="Boolean"
     expires_after="M85">
+  <obsolete>
+    Renamed to ModuleBlocklistCache.ExpectedMD5Digest.
+  </obsolete>
   <owner>pmonette@chromium.org</owner>
   <summary>
-    Records whether the MD5 digest of the module blacklist cache matched the one
+    Records whether the MD5 digest of the module blocklist cache matched the one
     recorded in the Local State file.
   </summary>
 </histogram>
 
 <histogram name="ModuleBlacklistCache.ModuleCount" units="modules"
     expires_after="M85">
+  <obsolete>
+    Renamed to ModuleBlocklistCache.ModuleCount.
+  </obsolete>
   <owner>pmonette@chromium.org</owner>
   <summary>
-    Records the number of modules in the module blacklist cache at the time it
+    Records the number of modules in the module blocklist cache at the time it
     was written to disk.
   </summary>
 </histogram>
 
 <histogram name="ModuleBlacklistCache.ReadResult"
-    enum="ModuleBlacklistCacheReadResult" expires_after="M85">
+    enum="ModuleBlocklistCacheReadResult" expires_after="M85">
+  <obsolete>
+    Renamed to ModuleBlocklistCache.ReadResult.
+  </obsolete>
   <owner>pmonette@chromium.org</owner>
   <summary>
-    The result of reading the current module blacklist cache while updating it.
+    The result of reading the current module blocklist cache while updating it.
   </summary>
 </histogram>
 
 <histogram name="ModuleBlacklistCache.WriteResult" enum="BooleanSuccess"
     expires_after="M85">
+  <obsolete>
+    Renamed to ModuleBlocklistCache.WriteResult.
+  </obsolete>
+  <owner>pmonette@chromium.org</owner>
+  <summary>The result of writing the updated module blocklist cache.</summary>
+</histogram>
+
+<histogram name="ModuleBlocklistCache.BlocklistPathUpdated"
+    enum="BooleanSuccess" expires_after="M85">
+  <owner>pmonette@chromium.org</owner>
+  <summary>
+    Records the result of writing the path of the module blocklist cache to the
+    registry so that chrome_elf.dll can use it. A value is emitted every time
+    the cache is updated because another instance of Chrome with a different
+    User Data directory could have overwritten the path to point to their own
+    version of the cache.
+  </summary>
+</histogram>
+
+<histogram name="ModuleBlocklistCache.BlocklistStatus"
+    enum="ModuleBlocklistStatus" expires_after="M85">
+  <owner>pmonette@chromium.org</owner>
+  <summary>
+    The status of a blocklisted module in the process. Recorded when the cache
+    is updated.
+  </summary>
+</histogram>
+
+<histogram name="ModuleBlocklistCache.DeleteResult" enum="BooleanSuccess"
+    expires_after="M82">
   <owner>pmonette@chromium.org</owner>
-  <summary>The result of writing the updated module blacklist cache.</summary>
+  <summary>
+    The result of deleting the module blocklist cache when third-party module
+    blocking is disabled. Attempting to delete an empty file is considered a
+    success.
+  </summary>
+</histogram>
+
+<histogram name="ModuleBlocklistCache.ExpectedMD5Digest" enum="Boolean"
+    expires_after="M85">
+  <owner>pmonette@chromium.org</owner>
+  <summary>
+    Records whether the MD5 digest of the module blocklist cache matched the one
+    recorded in the Local State file.
+  </summary>
+</histogram>
+
+<histogram name="ModuleBlocklistCache.ModuleCount" units="modules"
+    expires_after="M85">
+  <owner>pmonette@chromium.org</owner>
+  <summary>
+    Records the number of modules in the module blocklist cache at the time it
+    was written to disk.
+  </summary>
+</histogram>
+
+<histogram name="ModuleBlocklistCache.ReadResult"
+    enum="ModuleBlocklistCacheReadResult" expires_after="M85">
+  <owner>pmonette@chromium.org</owner>
+  <summary>
+    The result of reading the current module blocklist cache while updating it.
+  </summary>
+</histogram>
+
+<histogram name="ModuleBlocklistCache.WriteResult" enum="BooleanSuccess"
+    expires_after="M85">
+  <owner>pmonette@chromium.org</owner>
+  <summary>The result of writing the updated module blocklist cache.</summary>
 </histogram>
 
 <histogram name="ModuleIntegrityVerification.BytesModified" units="bytes"
@@ -8857,6 +9496,45 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Mojo.Channel.Linux.SharedMemWriteBytes" units="bytes"
+    expires_after="2021-11-01">
+  <owner>bgeffon@chromium.org</owner>
+  <owner>rockot@google.com</owner>
+  <summary>
+    The size in bytes of individual messages written into shared memory.
+  </summary>
+</histogram>
+
+<histogram name="Mojo.Channel.Linux.SharedMemWriteBytes_Fail_NoLock"
+    units="bytes" expires_after="2021-11-01">
+  <owner>bgeffon@chromium.org</owner>
+  <owner>rockot@google.com</owner>
+  <summary>
+    The size in bytes of individual messages that could not be written due to
+    lock contention.
+  </summary>
+</histogram>
+
+<histogram name="Mojo.Channel.Linux.SharedMemWriteBytes_Fail_NoSpace"
+    units="bytes" expires_after="2021-11-01">
+  <owner>bgeffon@chromium.org</owner>
+  <owner>rockot@google.com</owner>
+  <summary>
+    The size in bytes of individual messages that could not be written due to
+    shared memory buffer exhaustion.
+  </summary>
+</histogram>
+
+<histogram name="Mojo.Channel.Linux.SharedMemWriteBytes_Fail_TooLarge"
+    units="bytes" expires_after="2021-11-01">
+  <owner>bgeffon@chromium.org</owner>
+  <owner>rockot@google.com</owner>
+  <summary>
+    The size in bytes of individual messages that could not be written due to
+    message being larger than the shared buffer size.
+  </summary>
+</histogram>
+
 <histogram name="Mojo.Channel.WriteMessageHandles" units="count"
     expires_after="2021-07-01">
   <owner>amistry@chromium.org</owner>
@@ -8914,7 +9592,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Mojo.Connector.MaxUnreadMessageQuotaUsed" units="messages"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>siggi@chromium.org</owner>
   <owner>rockot@chromium.org</owner>
   <summary>
@@ -8936,14 +9614,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     expires_after="M87">
   <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@chromium.org</owner>
-  <summary>Tracks mouse acceleration setting changes by the user.</summary>
+  <summary>
+    Tracks mouse acceleration setting changes by the user. Only reported on
+    Chrome OS.
+  </summary>
 </histogram>
 
 <histogram name="Mouse.Acceleration.Started" enum="BooleanEnabled"
     expires_after="M87">
   <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@chromium.org</owner>
-  <summary>Tracks mouse acceleration setting on startup.</summary>
+  <summary>
+    Tracks mouse acceleration setting on startup. Only reported on Chrome OS.
+  </summary>
 </histogram>
 
 <histogram name="Mouse.PointerSensitivity.Changed" enum="PointerSensitivity"
@@ -8952,7 +9635,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Tracks mouse sensitivity setting changes by the user. This replaces the old
-    Mouse.Sensitivity.Changed metric.
+    Mouse.Sensitivity.Changed metric. Only reported on Chrome OS.
   </summary>
 </histogram>
 
@@ -8962,29 +9645,36 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Tracks mouse sensitivity setting on startup. This replaces the old
-    Mouse.Sensitivity.Started metric.
+    Mouse.Sensitivity.Started metric. Only reported on Chrome OS.
   </summary>
 </histogram>
 
 <histogram name="Mouse.ReverseScroll.Changed" enum="BooleanEnabled"
     expires_after="M77">
   <owner>lannm@chromium.org</owner>
-  <summary>Tracks mouse reverse scroll setting changes by the user.</summary>
+  <summary>
+    Tracks mouse reverse scroll setting changes by the user. Only reported on
+    Chrome OS.
+  </summary>
 </histogram>
 
 <histogram name="Mouse.ReverseScroll.Started" enum="BooleanEnabled"
     expires_after="M85">
   <owner>lannm@chromium.org</owner>
-  <summary>Tracks mouse reverse scroll setting on startup.</summary>
+  <summary>
+    Tracks mouse reverse scroll setting on startup. Only reported on Chrome OS.
+  </summary>
 </histogram>
 
 <histogram base="true" name="Mouse.ScrollAcceleration" enum="BooleanEnabled"
-    expires_after="2021-03-15">
+    expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="PreferenceChangeType" -->
 
   <owner>khorimoto@chromium.org</owner>
   <owner>zentaro@chromium.org</owner>
-  <summary>Whether mouse scroll acceleration is enabled.</summary>
+  <summary>
+    Whether mouse scroll acceleration is enabled. Only reported on Chrome OS.
+  </summary>
 </histogram>
 
 <histogram base="true" name="Mouse.ScrollSensitivity" enum="PointerSensitivity"
@@ -8993,11 +9683,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
   <owner>khorimoto@chromium.org</owner>
   <owner>zentaro@chromium.org</owner>
-  <summary>Mouse scroll sensitivity value.</summary>
+  <summary>Mouse scroll sensitivity value. Only reported on Chrome OS.</summary>
 </histogram>
 
 <histogram name="MPArch.ChildProcessLaunchFirst" units="units"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>ppi@chromium.org</owner>
   <summary>
     The time it takes to spawn the first child subprocess (including sandbox
@@ -9006,7 +9696,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MPArch.ChildProcessLaunchSubsequent" units="units"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>ppi@chromium.org</owner>
   <summary>
     The time it takes to spawn child sub processes not counting the first one.
@@ -9046,7 +9736,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MultiDeviceSetup.OOBE.UserChoice"
-    enum="MultiDeviceSetupOOBEUserChoice" expires_after="2021-04-04">
+    enum="MultiDeviceSetupOOBEUserChoice" expires_after="2021-08-09">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <owner>hsuregan@chromium.org</owner>
@@ -9057,7 +9747,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MultiDeviceSetup_NotificationClicked"
-    enum="MultiDeviceSetupNotification" expires_after="2021-04-04">
+    enum="MultiDeviceSetupNotification" expires_after="2021-08-09">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -9067,7 +9757,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MultiDeviceSetup_NotificationDismissed"
-    enum="MultiDeviceSetupNotification" expires_after="2021-04-04">
+    enum="MultiDeviceSetupNotification" expires_after="2021-08-09">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -9078,7 +9768,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MultiDeviceSetup_NotificationShown"
-    enum="MultiDeviceSetupNotification" expires_after="2021-02-02">
+    enum="MultiDeviceSetupNotification" expires_after="2022-02-02">
   <owner>vecore@google.com</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -9105,7 +9795,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="MultiProfile.UsersPerSessionIncremental" units="units"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>skuhne@chromium.org</owner>
   <summary>
     The number of users simultaneously signed into a multiprofile session on
@@ -9117,7 +9807,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NativeFileSystemAPI.ConfirmReadDirectoryResult"
-    enum="PermissionAction" expires_after="2021-06-01">
+    enum="PermissionAction" expires_after="2021-08-01">
   <owner>mek@chromium.org</owner>
   <owner>src/content/browser/file_system_access/OWNERS</owner>
   <summary>
@@ -9127,7 +9817,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NativeFileSystemAPI.FileChooserResult" units="units"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>mek@chromium.org</owner>
   <owner>src/content/browser/file_system_access/OWNERS</owner>
   <summary>
@@ -9137,7 +9827,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NativeFileSystemAPI.ReadPermissionRequestOutcome"
-    enum="NativeFileSystemPermissionRequestOutcome" expires_after="2021-06-01">
+    enum="NativeFileSystemPermissionRequestOutcome" expires_after="2021-08-01">
   <owner>mek@chromium.org</owner>
   <owner>src/content/browser/file_system_access/OWNERS</owner>
   <summary>
@@ -9147,7 +9837,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NativeFileSystemAPI.SensitiveDirectoryAccessResult"
-    enum="SensitiveDirectoryAccessResult" expires_after="2021-06-01">
+    enum="SensitiveDirectoryAccessResult" expires_after="2021-08-01">
   <owner>mek@chromium.org</owner>
   <owner>src/content/browser/file_system_access/OWNERS</owner>
   <summary>
@@ -9157,7 +9847,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NativeFileSystemAPI.WritePermissionRequestOutcome"
-    enum="NativeFileSystemPermissionRequestOutcome" expires_after="2021-06-01">
+    enum="NativeFileSystemPermissionRequestOutcome" expires_after="2021-08-01">
   <owner>mek@chromium.org</owner>
   <owner>src/content/browser/file_system_access/OWNERS</owner>
   <summary>
@@ -9248,7 +9938,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NativeTheme.GetSystemColor.UsesColorProvider" enum="Boolean"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>pkasting@chromium.org</owner>
   <owner>robliao@chromium.org</owner>
   <summary>Records if the color provider computed the color.</summary>
@@ -9266,7 +9956,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NCN.NetworkOperatorMCCMNC" units="units"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>tbansal@chromium.org</owner>
   <owner>bengr@google.com</owner>
   <summary>
@@ -9277,435 +9967,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram
-    name="Nearby.Share.Certificates.Manager.DownloadPublicCertificatesCount"
-    units="certificates" expires_after="2021-08-19">
-  <owner>cclem@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    If the Nearby Share certificate manager successfully downloads public
-    certificates, then record the total number of certificates downloaded across
-    all pages.
-  </summary>
-</histogram>
-
-<histogram
-    name="Nearby.Share.Certificates.Manager.DownloadPublicCertificatesFailuePageCount"
-    units="pages" expires_after="2021-08-19">
-  <owner>cclem@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    If the Nearby Share certificate manager fails to download public
-    certificates, then record the page number of the page on which the failure
-    occurred.
-  </summary>
-</histogram>
-
-<histogram
-    name="Nearby.Share.Certificates.Manager.DownloadPublicCertificatesHttpResult"
-    enum="NearbyShareHttpResult" expires_after="2021-08-19">
-  <owner>cclem@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records the result of the async ListPublicCertificates API call to the
-    Nearby Sharing server when the certificate manager periodically downloads
-    public certificates. Recorded when the async callback is invoked or when the
-    call times out.
-  </summary>
-</histogram>
-
-<histogram
-    name="Nearby.Share.Certificates.Manager.DownloadPublicCertificatesSuccessPageCount"
-    units="pages" expires_after="2021-08-19">
-  <owner>cclem@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    If the Nearby Share certificate manager successfully downloads public
-    certificates, then record the number of pages downloaded by the RPC.
-  </summary>
-</histogram>
-
-<histogram
-    name="Nearby.Share.Certificates.Manager.DownloadPublicCertificatesSuccessRate"
-    enum="BooleanSuccess" expires_after="2021-08-19">
-  <owner>cclem@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records whether the Nearby Share certificate manager successfully downloaded
-    public certificates from the server and stored them in leveldb.
-  </summary>
-</histogram>
-
-<histogram
-    name="Nearby.Share.Certificates.Manager.GetDecryptedPublicCertificateResult"
-    enum="NearbyShareCertificateManagerGetDecryptedPublicCertificateResult"
-    expires_after="2021-08-19">
-  <owner>cclem@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records the result of the async GetDecryptedPublicCertificate call in
-    certificate manager.
-  </summary>
-</histogram>
-
-<histogram name="Nearby.Share.Certificates.Storage.InitializeAttemptCount"
-    units="attempts" expires_after="2021-08-19">
-  <owner>cclem@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    If the Nearby Share certificate storage successfully initializes the public
-    certificate database, then record the number of attempts it took.
-  </summary>
-</histogram>
-
-<histogram name="Nearby.Share.Certificates.Storage.InitializeAttemptResult"
-    enum="NearbyShareCertificateStorageInitializationResult"
-    expires_after="2021-08-19">
-  <owner>cclem@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    For individual initialization attempts of the Nearby Share certificate
-    storage public certificate database, record the init status returned by
-    leveldb_proto.
-  </summary>
-</histogram>
-
-<histogram name="Nearby.Share.Certificates.Storage.{Operation}SuccessRate"
-    enum="BooleanSuccess" expires_after="2021-08-19">
-  <owner>cclem@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Record success rate of Nearby Share storage operation {Operation}.
-  </summary>
-  <token key="Operation">
-    <variant name="AddPublicCertificates" summary="AddPublicCertificates"/>
-    <variant name="ClearPublicCertificates" summary="ClearPublicCertificates"/>
-    <variant name="Initialize" summary="Initialize"/>
-    <variant name="RemoveExpiredPublicCertificates"
-        summary="RemoveExpiredPublicCertificates"/>
-    <variant name="ReplacePublicCertificatesDestroy"
-        summary="ReplacePublicCertificatesDestroy"/>
-    <variant name="ReplacePublicCertificatesUpdateEntries"
-        summary="ReplacePublicCertificatesUpdateEntries"/>
-  </token>
-</histogram>
-
-<histogram name="Nearby.Share.Discovery.Delay.FromStartDiscoveryTo{EndState}"
-    units="ms" expires_after="2021-08-19">
-  <owner>nohle@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records the delay between the start of the discovery session and {EndState}.
-  </summary>
-  <token key="EndState">
-    <variant name="AnyDiscovery" summary="the discovery of any share target"/>
-    <variant name="FirstDiscovery"
-        summary="the discovery of the first share target"/>
-    <variant name="StartSend" summary="the start of a transfer"/>
-  </token>
-</histogram>
-
-<histogram name="Nearby.Share.Discovery.FurthestDiscoveryProgress"
-    enum="NearbyShareDiscoveryProgress" expires_after="2021-08-19">
-  <owner>nohle@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records the furthest state reached in a single Nearby Share discovery
-    session. Emitted when the per-session discovery manager is destroyed.
-  </summary>
-</histogram>
-
-<histogram name="Nearby.Share.Discovery.LookUpSelectedShareTarget"
-    enum="BooleanFound" expires_after="2021-08-19">
-  <owner>nohle@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records whether or not the selected share target on the Nearby Share
-    discovery page can be found in the per-session discovery manager's map of
-    discovered share targets. Emitted when the user selects a share target from
-    the discovery page and tries to proceed to the next step in the UI.
-  </summary>
-</histogram>
-
-<histogram name="Nearby.Share.Discovery.NumShareTargets.{Variation}"
-    units="share targets" expires_after="2021-08-19">
-  <owner>nohle@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records the number of share targets {Variation} in a single discovery
-    session. Emitted once during the discovery session.
-  </summary>
-  <token key="Variation">
-    <variant name="Discovered" summary="discovered"/>
-    <variant name="Lost" summary="lost"/>
-    <variant name="PresentWhenSendStarts" summary="present when a send starts"/>
-  </token>
-</histogram>
-
-<histogram name="Nearby.Share.Discovery.{Operation}"
-    enum="NearbyShareServiceStatusCode" expires_after="2021-08-19">
-  <owner>nohle@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records the result of {Operation}. Emitted immediately after the operation
-    is attempted for each discovery session.
-  </summary>
-  <token key="Operation">
-    <variant name="StartDiscovery" summary="starting a discovery session"/>
-    <variant name="StartSend"
-        summary="beginning a transfer of an attachment to the selected share
-                 target on the discovery page"/>
-    <variant name="UnregisterSendSurface"
-        summary="unregistering the per-session discovery manager with the
-                 Nearby Share service"/>
-  </token>
-</histogram>
-
-<histogram name="Nearby.Share.Enabled" enum="NearbyShareEnabledState"
-    expires_after="2021-08-19">
-  <owner>nohle@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records if the user has the Nearby Share feature enabled, and if not,
-    records why the feature is not enabled. For example, the feature is not
-    allowed by policy, or the user onboarded but later disabled the feature.
-    Emitted when the Nearby Share service starts. This happens at login if the
-    feature flag is on.
-  </summary>
-</histogram>
-
-<histogram name="Nearby.Share.LocalDeviceData.DeviceDataUpdater.HttpResult"
-    enum="NearbyShareHttpResult" expires_after="2021-08-19">
-  <owner>cclem@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records the result of the async UpdateDevice API call to the Nearby Sharing
-    server when the device data updater makes a request. Recorded when the async
-    callback is invoked or when the call times out.
-  </summary>
-</histogram>
-
-<histogram name="Nearby.Share.Medium.ChangedToMedium"
-    enum="NearbyConnectionsMedium" expires_after="2021-08-19">
-  <owner>nohle@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records the data-transfer medium that the Nearby Connections library
-    successfully switches to during a Nearby Share transfer. Emitted when the
-    Nearby Connections library notifies the client of a bandwidth upgrade.
-  </summary>
-</histogram>
-
-<histogram name="Nearby.Share.Medium.FinalPayloadStatus.{UpgradedMedium}"
-    enum="NearbyShareFinalPayloadStatus" expires_after="2021-08-19">
-  <owner>nohle@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records whether a transfer succeeded, failed, or was cancelled when
-    transmitted over {UpgradedMedium}. Emitted when the payload transfer
-    finishes, independent of whether the transfer was successful.
-  </summary>
-  <token key="UpgradedMedium">
-    <variant name="NoMediumUpgrade" summary="the initial bandwidth medium"/>
-    <variant name="UnknownMediumUpgrade"
-        summary="an unknown bandwidth-upgraded medium"/>
-    <variant name="WebRtcUpgrade" summary="an upgraded WebRTC medium"/>
-  </token>
-</histogram>
-
-<histogram name="Nearby.Share.Medium.InitiateBandwidthUpgradeResult"
-    enum="BooleanSuccess" expires_after="2021-08-19">
-  <owner>nohle@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records the result of Nearby Share starting a bandwidth upgrade via the
-    Nearby Connections library. This metric only records the result of
-    initiating the change not the result of fully finishing an upgrade. Also,
-    this metric does not capture automatic bandwidth upgrades initiated
-    internally by the Nearby Connections library. Emitted when the Nearby
-    Connections client explicitly requests a bandwidth upgrade.
-  </summary>
-</histogram>
-
-<histogram name="Nearby.Share.Medium.RequestedBandwidthUpgradeResult"
-    enum="BooleanUpgraded" expires_after="2021-08-19">
-  <owner>nohle@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records if the transfer medium was successfully upgraded after an explicit
-    bandwidth upgrade request from the client. Emitted when the transfer channel
-    is disconnected after a bandwidth upgrade request was made by the client.
-  </summary>
-</histogram>
-
-<histogram name="Nearby.Share.StartAdvertising.Result.FailureReason{Mode}"
-    enum="NearbyShareStartAdvertisingFailureReason" expires_after="2021-08-19">
-  <owner>nohle@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records the reason Nearby Share advertising failed to start in {Mode} mode.
-  </summary>
-  <token key="Mode">
-    <variant name="" summary="BLE and high-visibility"/>
-    <variant name=".BLE" summary="BLE"/>
-    <variant name=".HighVisibility" summary="high-visibility"/>
-  </token>
-</histogram>
-
-<histogram name="Nearby.Share.StartAdvertising.Result{Mode}"
-    enum="BooleanSuccess" expires_after="2021-08-19">
-  <owner>nohle@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records the result of starting Nearby Share advertising in {Mode} mode.
-  </summary>
-  <token key="Mode">
-    <variant name="" summary="BLE and high-visibility"/>
-    <variant name=".BLE" summary="BLE"/>
-    <variant name=".HighVisibility" summary="high-visibility"/>
-  </token>
-</histogram>
-
-<histogram
-    name="Nearby.Share.Transfer.CompletionStatus.NotCompletedReason{Direction}{ShareTargetType}"
-    enum="NearbyShareTransferNotCompletedReason" expires_after="2021-08-19">
-  <owner>nohle@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records the reason a Nearby Share {Direction} transfer was not completed
-    when sharing with {ShareTargetType}. Emitted when a transfer aborts before
-    fully completing.
-  </summary>
-  <token key="Direction">
-    <variant name="" summary="outgoing (send) or incoming (receive)"/>
-    <variant name=".Receive" summary="incoming (receive)"/>
-    <variant name=".Send" summary="outgoing (send)"/>
-  </token>
-  <token key="ShareTargetType">
-    <variant name="" summary="any device type"/>
-    <variant name=".Laptop" summary="a laptop"/>
-    <variant name=".Phone" summary="a phone"/>
-    <variant name=".Tablet" summary="a tablet"/>
-    <variant name=".Unknown" summary="an unknown device type"/>
-  </token>
-</histogram>
-
-<histogram
-    name="Nearby.Share.Transfer.CompletionStatus{Direction}{ShareTargetType}"
-    enum="BooleanCompleted" expires_after="2021-08-19">
-  <owner>nohle@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records if a Nearby Share {Direction} transfer fully completes or not when
-    sharing with {ShareTargetType}. Emitted when a transfer completes
-    successfully, fails, or was aborted by the user, for example, by cancelling
-    the transfer. Note: This metric does not reflect success/failure. For
-    example, if a user manually cancels a transfer, that is not considered a
-    failure but it will be bucketed as &quot;Not Completed&quot;.
-  </summary>
-  <token key="Direction">
-    <variant name="" summary="outgoing (send) or incoming (receive)"/>
-    <variant name=".Receive" summary="incoming (receive)"/>
-    <variant name=".Send" summary="outgoing (send)"/>
-  </token>
-  <token key="ShareTargetType">
-    <variant name="" summary="any device type"/>
-    <variant name=".Laptop" summary="a laptop"/>
-    <variant name=".Phone" summary="a phone"/>
-    <variant name=".Tablet" summary="a tablet"/>
-    <variant name=".Unknown" summary="an unknown device type"/>
-  </token>
-</histogram>
-
-<histogram name="Nearby.Share.Transfer.NumAttachments{Type}"
-    units="attachments" expires_after="2021-08-19">
-  <owner>nohle@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records the number of {Type} attachments intended to be sent in a Nearby
-    Share transfer. Emitted when the transfer concludes, successfully or not.
-  </summary>
-  <token key="Type">
-    <variant name="" summary="text or file"/>
-    <variant name=".File" summary="file"/>
-    <variant name=".Text" summary="text"/>
-  </token>
-</histogram>
-
-<histogram
-    name="Nearby.Share.Transfer.Rate{Direction}{ShareTargetType}{UpgradedMedium}{PayloadStatus}"
-    units="KB/s" expires_after="2021-08-19">
-  <owner>nohle@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records the transfer rate of a Nearby Share {Direction} transfer that
-    {PayloadStatus} when sharing with {ShareTargetType} over {UpgradedMedium}.
-    Emitted when the transfer concludes.
-  </summary>
-  <token key="Direction">
-    <variant name="" summary="outgoing (send) or incoming (receive)"/>
-    <variant name=".Receive" summary="incoming (receive)"/>
-    <variant name=".Send" summary="outgoing (send)"/>
-  </token>
-  <token key="ShareTargetType">
-    <variant name="" summary="any device type"/>
-    <variant name=".Laptop" summary="a laptop"/>
-    <variant name=".Phone" summary="a phone"/>
-    <variant name=".Tablet" summary="a tablet"/>
-    <variant name=".Unknown" summary="an unknown device type"/>
-  </token>
-  <token key="UpgradedMedium">
-    <variant name="" summary="any possible bandwidth medium"/>
-    <variant name=".NoMediumUpgrade" summary="the initial bandwidth medium"/>
-    <variant name=".UnknownMediumUpgrade"
-        summary="an unknown bandwidth-upgraded medium"/>
-    <variant name=".WebRtcUpgrade" summary="an upgraded WebRTC medium"/>
-  </token>
-  <token key="PayloadStatus">
-    <variant name="" summary="succeeded, failed, or was cancelled"/>
-    <variant name=".Cancelled" summary="was cancelled"/>
-    <variant name=".Failed" summary="failed"/>
-    <variant name=".Succeeded" summary="succeeded"/>
-  </token>
-</histogram>
-
-<histogram
-    name="Nearby.Share.Transfer.TotalSize{Direction}{ShareTargetType}{UpgradedMedium}{PayloadStatus}"
-    units="KB" expires_after="2021-08-19">
-  <owner>nohle@chromium.org</owner>
-  <owner>better-together-dev@google.com</owner>
-  <summary>
-    Records the total payload size of a Nearby Share {Direction} transfer that
-    {PayloadStatus} when sharing with {ShareTargetType} over {UpgradedMedium}.
-    Emitted when the transfer concludes.
-  </summary>
-  <token key="Direction">
-    <variant name="" summary="outgoing (send) or incoming (receive)"/>
-    <variant name=".Receive" summary="incoming (receive)"/>
-    <variant name=".Send" summary="outgoing (send)"/>
-  </token>
-  <token key="ShareTargetType">
-    <variant name="" summary="any device type"/>
-    <variant name=".Laptop" summary="a laptop"/>
-    <variant name=".Phone" summary="a phone"/>
-    <variant name=".Tablet" summary="a tablet"/>
-    <variant name=".Unknown" summary="an unknown device type"/>
-  </token>
-  <token key="UpgradedMedium">
-    <variant name="" summary="any possible bandwidth medium"/>
-    <variant name=".NoMediumUpgrade" summary="the initial bandwidth medium"/>
-    <variant name=".UnknownMediumUpgrade"
-        summary="an unknown bandwidth-upgraded medium"/>
-    <variant name=".WebRtcUpgrade" summary="an upgraded WebRTC medium"/>
-  </token>
-  <token key="PayloadStatus">
-    <variant name="" summary="succeeded, failed, or was cancelled"/>
-    <variant name=".Cancelled" summary="was cancelled"/>
-    <variant name=".Failed" summary="failed"/>
-    <variant name=".Succeeded" summary="succeeded"/>
-  </token>
-</histogram>
-
 <histogram name="net.HttpIdentSrcURL" units="requests" expires_after="M85">
   <owner>tsepez@chromium.org</owner>
   <summary>
@@ -9741,7 +10002,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NQE.CachedNetworkQualityAvailable" enum="BooleanAvailable"
-    expires_after="2021-04-05">
+    expires_after="2021-08-09">
   <owner>tbansal@chromium.org</owner>
   <owner>bengr@chromium.org</owner>
   <summary>
@@ -9751,7 +10012,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NQE.CellularSignalStrength.ECTReduction"
-    units="ECT level reduction" expires_after="2021-04-04">
+    units="ECT level reduction" expires_after="2021-08-09">
   <owner>tbansal@chromium.org</owner>
   <summary>
     Number of buckets by which effective connection type was reduced or capped
@@ -9761,7 +10022,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NQE.CellularSignalStrength.LevelAvailable"
-    enum="BooleanAvailable" expires_after="2021-04-04">
+    enum="BooleanAvailable" expires_after="2021-08-09">
   <owner>tbansal@chromium.org</owner>
   <owner>bengr@chromium.org</owner>
   <summary>
@@ -9799,7 +10060,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NQE.EffectiveConnectionType.OnECTComputation"
-    enum="NQEEffectiveConnectionType" expires_after="2021-04-11">
+    enum="NQEEffectiveConnectionType" expires_after="2021-08-15">
   <owner>tbansal@chromium.org</owner>
   <owner>src/net/nqe/OWNERS</owner>
   <summary>
@@ -9809,7 +10070,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NQE.EndToEndRTT.OnECTComputation" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>tbansal@chromium.org</owner>
   <owner>src/net/nqe/OWNERS</owner>
   <summary>
@@ -9819,8 +10080,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="NQE.HttpRttReduction.BasedOnRTTCounts" units="ms"
+    expires_after="2021-10-01">
+  <owner>tbansal@chromium.org</owner>
+  <owner>bengr@chromium.org</owner>
+  <summary>
+    Duration by which HTTP RTT was reduced because of low confidence.
+  </summary>
+</histogram>
+
 <histogram name="NQE.Kbps.OnECTComputation" units="Kbps"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>bengr@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -9841,7 +10111,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="NQE.Prefs.ReadCount" units="count" expires_after="2021-04-05">
+<histogram name="NQE.Prefs.ReadCount" units="count" expires_after="2021-08-09">
   <owner>tbansal@chromium.org</owner>
   <owner>bengr@chromium.org</owner>
   <summary>
@@ -9850,7 +10120,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="NQE.Prefs.ReadSize" units="count" expires_after="2021-04-05">
+<histogram name="NQE.Prefs.ReadSize" units="count" expires_after="2021-08-09">
   <owner>tbansal@chromium.org</owner>
   <owner>bengr@chromium.org</owner>
   <summary>
@@ -9859,7 +10129,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="NQE.Prefs.WriteCount" units="count" expires_after="2021-04-05">
+<histogram name="NQE.Prefs.WriteCount" units="count" expires_after="2021-08-09">
   <owner>tbansal@chromium.org</owner>
   <owner>bengr@chromium.org</owner>
   <summary>
@@ -9869,7 +10139,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NQE.RTT.ObservationSource" enum="NQEObservationSource"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>tbansal@chromium.org</owner>
   <owner>bengr@chromium.org</owner>
   <summary>
@@ -9880,7 +10150,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NQE.RTT.OnECTComputation" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>bengr@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -9900,7 +10170,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="NQE.TransportRTT.OnECTComputation" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>bengr@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -9922,7 +10192,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OAuth2Login.MergeSessionFailure" enum="GoogleServiceAuthError"
-    expires_after="2020-11-29">
+    expires_after="2021-11-29">
   <owner>droger@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
@@ -9933,7 +10203,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OAuth2Login.MergeSessionRetry" enum="GoogleServiceAuthError"
-    expires_after="2020-11-29">
+    expires_after="2021-11-29">
   <owner>droger@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
@@ -9944,7 +10214,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OAuth2Login.PostMergeVerification"
-    enum="PostMergeVerificationOutcome" expires_after="M88">
+    enum="PostMergeVerificationOutcome" expires_after="2021-06-17">
   <owner>droger@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
@@ -9956,7 +10226,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OAuth2Login.PreMergeVerification"
-    enum="PostMergeVerificationOutcome" expires_after="M88">
+    enum="PostMergeVerificationOutcome" expires_after="2021-06-17">
   <owner>droger@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
@@ -9968,7 +10238,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OAuth2Login.SessionRestore" enum="GaiaSessionRestoreOutcome"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>droger@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
@@ -9976,7 +10246,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OAuth2Login.SessionRestoreTimeToFailure" units="ms"
-    expires_after="2020-12-17">
+    expires_after="2021-06-17">
   <owner>droger@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
@@ -9984,7 +10254,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OAuth2Login.SessionRestoreTimeToSuccess" units="ms"
-    expires_after="2020-12-17">
+    expires_after="2021-06-17">
   <owner>droger@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
@@ -9994,7 +10264,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OccludedWindowMouseEvents" units="events"
-    expires_after="2021-05-02">
+    expires_after="2021-07-27">
   <owner>davidbienvenu@chromium.org</owner>
   <owner>fdoray@chromium.org</owner>
   <summary>
@@ -10006,7 +10276,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OffscreenCanvas.TextMetrics.SetFont" units="microseconds"
-    expires_after="2021-01-31">
+    expires_after="2022-01-31">
   <owner>yiyix@chromium.org</owner>
   <owner>fserb@chromium.org</owner>
   <summary>
@@ -10022,7 +10292,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OriginTrials.ValidationResult" enum="OriginTrialTokenStatus"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>chasej@chromium.org</owner>
   <owner>iclelland@chromium.org</owner>
   <owner>feature-control@chromium.org</owner>
@@ -10034,7 +10304,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OSCrypt.BackendUsage" enum="LinuxPasswordStoreUsage"
-    expires_after="2020-12-01">
+    expires_after="2021-07-01">
   <owner>cfroussios@chromium.org</owner>
   <owner>mamir@chromium.org</owner>
   <summary>
@@ -10044,7 +10314,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OSCrypt.Win.KeyDecryptionError" enum="WinGetLastError"
-    expires_after="2021-05-02">
+    expires_after="2021-08-01">
   <owner>wfh@chromium.org</owner>
   <owner>forshaw@chromium.org</owner>
   <summary>
@@ -10114,7 +10384,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="OSX.NativeShare" units="BooleanSuccess"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>lgrey@chromium.org</owner>
   <summary>
     Whether the user successfully shared via a native sharing extensions after
@@ -10397,7 +10667,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaintHolding.CommitTrigger2" enum="PaintHoldingCommitTrigger2"
-    expires_after="2021-01-15">
+    expires_after="2021-07-15">
   <owner>schenney@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -10407,7 +10677,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PaintHolding.InputTiming2" enum="PaintHoldingInputTiming"
-    expires_after="2021-01-15">
+    expires_after="2021-07-15">
   <owner>schenney@chromium.org</owner>
   <owner>paint-dev@chromium.org</owner>
   <summary>
@@ -10416,7 +10686,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PartnerBookmark.Count2" units="bookmarks"
-    expires_after="2021-04-03">
+    expires_after="2021-08-09">
   <owner>bttk@chromium.org</owner>
   <owner>wychen@chromium.org</owner>
   <summary>
@@ -10447,7 +10717,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PDF.Actions" enum="ChromePDFViewerActions"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>hnakashima@chromium.org</owner>
   <summary>
     Tracks user actions in the PDF viewer. Logged when the document is opened
@@ -10459,7 +10729,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="PDF.FormType" enum="PDFFormTypes" expires_after="2021-03-21">
+<histogram name="PDF.FormType" enum="PDFFormTypes" expires_after="2021-07-27">
   <owner>rharrison@chromium.org</owner>
   <owner>thestig@chromium.org</owner>
   <summary>
@@ -10468,7 +10738,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="PDF.HasAttachment" enum="Boolean" expires_after="2021-04-11">
+<histogram name="PDF.HasAttachment" enum="Boolean" expires_after="2021-08-15">
   <owner>hnakashima@chromium.org</owner>
   <owner>thestig@chromium.org</owner>
   <summary>
@@ -10478,7 +10748,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PDF.IsTagged" enum="BooleanIsTagged"
-    expires_after="2021-03-29">
+    expires_after="2021-08-01">
   <owner>dmazzoni@chromium.org</owner>
   <owner>thestig@chromium.org</owner>
   <summary>
@@ -10487,7 +10757,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PDF.LinkHighlightOverlapsInPage" units="overlaps"
-    expires_after="2021-05-02">
+    expires_after="2021-07-27">
   <owner>thestig@chromium.org</owner>
   <owner>ankk@microsoft.com</owner>
   <owner>mohitb@microsoft.com</owner>
@@ -10501,7 +10771,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PDF.LoadStatus" enum="ChromePDFViewerLoadStatus"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>kmoon@chromium.org</owner>
   <owner>thestig@chromium.org</owner>
   <summary>
@@ -10511,7 +10781,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="PDF.PageCount" units="pages" expires_after="2021-05-09">
+<histogram name="PDF.PageCount" units="pages" expires_after="2021-07-11">
   <owner>hnakashima@chromium.org</owner>
   <owner>thestig@chromium.org</owner>
   <summary>
@@ -10519,7 +10789,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="PDF.Version" enum="PDFVersion" expires_after="2021-04-01">
+<histogram name="PDF.Version" enum="PDFVersion" expires_after="2021-08-09">
   <owner>dhoss@chromium.org</owner>
   <owner>thestig@chromium.org</owner>
   <summary>Tracks versions of documents opened in the PDF viewer.</summary>
@@ -10534,7 +10804,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Pepper.InterfaceUsed" enum="PepperInterface"
-    expires_after="2021-03-15">
+    expires_after="2021-07-27">
   <owner>bbudge@chromium.org</owner>
   <owner>raymes@chromium.org</owner>
   <summary>
@@ -10564,19 +10834,22 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PerformanceHints.Observer.HintForURLResult"
-    enum="PerformanceHintsObserverHintForURLResult" expires_after="2021-03-28">
-  <owner>jds@chromium.org</owner>
+    enum="PerformanceHintsObserverHintForURLResult" expires_after="2021-08-01">
+  <owner>jds@google.com</owner>
   <owner>src/chrome/browser/performance_hints/OWNERS</owner>
   <summary>
     Records the result of querying PerformanceHintsObserver for a URL-specific
     performance hint. This enables tracking how often the
     OptimizationGuideDecider provides a hint in time for a HintForURL request.
+
+    This is recorded once for each surface shown (e.g. once per link context
+    menu opened).
   </summary>
 </histogram>
 
 <histogram name="PerformanceHints.Observer.PerformanceClassForURL"
-    enum="PerformanceHintsPerformanceClass" expires_after="2021-01-24">
-  <owner>jds@chromium.org</owner>
+    enum="PerformanceHintsPerformanceClass" expires_after="2021-08-01">
+  <owner>jds@google.com</owner>
   <owner>src/chrome/browser/performance_hints/OWNERS</owner>
   <summary>
     Records the PerformanceClass determined for a given URL. This value
@@ -10587,19 +10860,25 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true" name="PerformanceHints.Observer.SourceLookupStatus"
     enum="PerformanceHintsObserverSourceLookupStatus"
-    expires_after="2021-03-28">
-  <owner>jds@chromium.org</owner>
+    expires_after="2021-08-01">
+  <owner>jds@google.com</owner>
   <owner>src/chrome/browser/performance_hints/OWNERS</owner>
   <summary>
     Records the result of a hint lookup in a single source (e.g. link hints of
     the current page, the page's OptimizationMetadata, etc). See the
     PerformanceHintsSource suffix for name completions. All source suffix
     histograms should have the same total count.
+
+    This is recorded for each source once per surface shown (e.g. each source is
+    recorded once per link context menu opened).
   </summary>
 </histogram>
 
 <histogram name="PerformanceManager.AgentsByTime" units="units"
     expires_after="2020-12-04">
+  <obsolete>
+    Removed 2020-11.
+  </obsolete>
   <owner>bokan@chromium.org</owner>
   <owner>kouhei@chromium.org</owner>
   <owner>platform-architecture-dev@chromium.org</owner>
@@ -10612,6 +10891,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="PerformanceManager.AgentsPerRendererByTime" units="units"
     expires_after="2020-12-04">
+  <obsolete>
+    Removed 2020-11.
+  </obsolete>
   <owner>bokan@chromium.org</owner>
   <owner>kouhei@chromium.org</owner>
   <owner>platform-architecture-dev@chromium.org</owner>
@@ -10624,6 +10906,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="PerformanceManager.AgentsUniqueByTime" units="units"
     expires_after="2020-12-04">
+  <obsolete>
+    Removed 2020-11.
+  </obsolete>
   <owner>bokan@chromium.org</owner>
   <owner>kouhei@chromium.org</owner>
   <owner>platform-architecture-dev@chromium.org</owner>
@@ -10829,7 +11114,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="PLT.iOS.BrowserInitiatedPageLoadTime" units="ms"
     expires_after="2022-08-09">
   <owner>djean@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
+  <owner>ajuma@chromium.org</owner>
   <summary>
     Page load time for Browser-initiated navigations. Recorded when
     CRWWebRequestController::didFinishWithURL completes successfully. iOS
@@ -10840,7 +11125,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="PLT.iOS.RendererInitiatedPageLoadTime" units="ms"
     expires_after="2022-08-09">
   <owner>djean@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
+  <owner>ajuma@chromium.org</owner>
   <summary>
     Page load time for Renderer-initiated navigations. Recorded when
     CRWWebRequestController::didFinishWithURL completes successfully. iOS
@@ -10882,6 +11167,47 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram base="true" name="PointingStick.Acceleration" enum="BooleanEnabled"
+    expires_after="2021-04-01">
+<!-- Name completed by histogram_suffixes name="PreferenceChangeType" -->
+
+  <owner>hcutts@chromium.org</owner>
+  <owner>khorimoto@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>
+    Acceleration setting for pointing sticks (typically TrackPoints, the
+    miniature red joysticks found in some laptop keyboards). Only reported on
+    Chrome OS.
+  </summary>
+</histogram>
+
+<histogram base="true" name="PointingStick.PointerSensitivity"
+    enum="PointerSensitivity" expires_after="2021-04-01">
+<!-- Name completed by histogram_suffixes name="PreferenceChangeType" -->
+
+  <owner>hcutts@chromium.org</owner>
+  <owner>khorimoto@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>
+    Sensitivity value for pointing sticks (typically TrackPoints, the miniature
+    red joysticks found in some laptop keyboards). Only reported on Chrome OS.
+  </summary>
+</histogram>
+
+<histogram base="true" name="PointingStick.PrimaryButtonRight"
+    enum="PointerPrimaryButton" expires_after="2021-04-01">
+<!-- Name completed by histogram_suffixes name="PreferenceChangeType" -->
+
+  <owner>hcutts@chromium.org</owner>
+  <owner>khorimoto@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>
+    Setting for the primary button of pointing sticks (typically TrackPoints,
+    the miniature red joysticks found in some laptop keyboards). Only reported
+    on Chrome OS.
+  </summary>
+</histogram>
+
 <histogram name="PreferredApps.FileIOAction" enum="PreferredAppsFileIOAction"
     expires_after="M89">
   <obsolete>
@@ -10911,7 +11237,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PrefetchedSignedExchangeCache.BodySize" units="bytes"
-    expires_after="2021-03-28">
+    expires_after="M94">
   <owner>horo@chromium.org</owner>
   <owner>webpackage-dev@chromium.org</owner>
   <summary>
@@ -10922,7 +11248,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PrefetchedSignedExchangeCache.BodySizeTotal" units="bytes"
-    expires_after="2021-03-28">
+    expires_after="M94">
   <owner>horo@chromium.org</owner>
   <owner>webpackage-dev@chromium.org</owner>
   <summary>
@@ -10934,7 +11260,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PrefetchedSignedExchangeCache.Count" units="count"
-    expires_after="2021-03-28">
+    expires_after="M94">
   <owner>horo@chromium.org</owner>
   <owner>webpackage-dev@chromium.org</owner>
   <summary>
@@ -10946,7 +11272,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PrefetchedSignedExchangeCache.HeadersSizeTotal" units="bytes"
-    expires_after="2021-01-24">
+    expires_after="M94">
   <owner>horo@chromium.org</owner>
   <owner>webpackage-dev@chromium.org</owner>
   <summary>
@@ -10972,8 +11298,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Prerender.Experimental.PrerenderHostFinalStatus"
+    enum="PrerenderHostFinalStatus" expires_after="2022-01-27">
+  <owner>falken@chromium.org</owner>
+  <owner>nhiroki@chromium.org</owner>
+  <summary>
+    Final status for a prerendering attempt. Recorded by PrerenderHost in the
+    browser process once its final status has been reached.
+  </summary>
+</histogram>
+
 <histogram name="Prerender.FinalStatus" enum="PrerenderFinalStatus"
-    expires_after="2021-04-22">
+    expires_after="2021-06-27">
   <owner>ryansturm@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -11118,7 +11454,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Previews.CacheControlNoTransform.BlockedPreview"
-    enum="PreviewsType" expires_after="2021-03-31">
+    enum="PreviewsType" expires_after="2021-08-09">
   <owner>sophiechang@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <owner>src/components/previews/OWNERS</owner>
@@ -11206,7 +11542,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Previews.EligibilityReason" enum="PreviewsEligibilityReason"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>ryansturm@chromium.org</owner>
   <summary>
     When evaluating whether to show a user a preview, the preview might be
@@ -11221,7 +11557,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Previews.LitePageNotificationInfoBar"
-    enum="PreviewsLitePageInfoBarAction" expires_after="2021-03-28">
+    enum="PreviewsLitePageInfoBarAction" expires_after="2021-08-09">
   <owner>robertogden@chromium.org</owner>
   <owner>src/components/data_reduction_proxy/OWNERS</owner>
   <summary>
@@ -11230,7 +11566,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Previews.OmniboxAction" enum="PreviewsUserOmniboxAction"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>robertogden@chromium.org</owner>
   <summary>User interactions with the Previews Android Omnibox UI.</summary>
 </histogram>
@@ -11255,7 +11591,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Previews.PageEndReason" enum="PageEndReason"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>robertogden@chromium.org</owner>
   <summary>Records why the page load ended on a given preview type.</summary>
 </histogram>
@@ -11276,7 +11612,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Privacy.AccessContextAudit.CookieDomainCount" units="units"
-    expires_after="M89">
+    expires_after="M93">
   <owner>msramek@chromium.org</owner>
   <owner>sauski@google.com</owner>
   <summary>
@@ -11287,7 +11623,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Privacy.AccessContextAudit.DatabaseSize" units="KiB"
-    expires_after="M89">
+    expires_after="M93">
   <owner>msramek@chromium.org</owner>
   <owner>sauski@google.com</owner>
   <summary>
@@ -11298,7 +11634,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Privacy.AccessContextAudit.RecordCount" units="units"
-    expires_after="M89">
+    expires_after="M93">
   <owner>msramek@chromium.org</owner>
   <owner>sauski@google.com</owner>
   <summary>
@@ -11309,7 +11645,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Privacy.AccessContextAudit.StorageOriginCount" units="units"
-    expires_after="M89">
+    expires_after="M93">
   <owner>msramek@chromium.org</owner>
   <owner>sauski@google.com</owner>
   <summary>
@@ -11320,7 +11656,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Privacy.AccessContextAudit.TopFrameOriginCount" units="units"
-    expires_after="M89">
+    expires_after="M93">
   <owner>msramek@chromium.org</owner>
   <owner>sauski@google.com</owner>
   <summary>
@@ -11351,17 +11687,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Privacy.CookieControlsSetting" enum="CookieControlsMode"
-    expires_after="M89">
+    expires_after="never">
+<!-- expires-never: tracked as an important privacy metric. -->
+
   <owner>dullweber@chromium.org</owner>
   <owner>huanzhong@chromium.org</owner>
   <summary>
-    Whether the cookie controls setting is enabled. Recorded at the Profile
-    startup.
+    Whether third-party cookies are blocked in incognito mode or completely.
+    Recorded at the Profile startup.
   </summary>
 </histogram>
 
 <histogram name="Privacy.DoNotTrackSetting" enum="BooleanEnabled"
-    expires_after="2021-03-15">
+    expires_after="never">
+<!-- expires-never: tracked as an important privacy metric. -->
+
   <owner>mkwst@chromium.org</owner>
   <owner>msramek@chromium.org</owner>
   <summary>
@@ -11371,7 +11711,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Privacy.ThirdPartyCookieBlockingEnabledForSite" enum="Boolean"
-    expires_after="M89">
+    expires_after="M93">
   <owner>dullweber@chromium.org</owner>
   <owner>huanzhong@chromium.org</owner>
   <summary>
@@ -11397,7 +11737,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Process.Sandbox.Launch.Error" enum="WinGetLastError"
-    expires_after="2021-05-02">
+    expires_after="2021-07-27">
   <owner>forshaw@chromium.org</owner>
   <owner>wfh@chromium.org</owner>
   <summary>
@@ -11439,14 +11779,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ProtoDB.DestroySuccess" enum="BooleanSuccess"
-    expires_after="M86">
+    expires_after="2021-08-24">
   <owner>nyquist@chromium.org</owner>
   <owner>ssid@chromium.org</owner>
   <summary>Whether a ProtoDB Destroy call was successful or not.</summary>
 </histogram>
 
 <histogram name="ProtoDB.GetErrorStatus" enum="LevelDBStatus"
-    expires_after="M86">
+    expires_after="2021-08-24">
   <owner>nyquist@chromium.org</owner>
   <owner>ssid@chromium.org</owner>
   <summary>
@@ -11454,34 +11794,35 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="ProtoDB.GetFound" enum="Boolean" expires_after="M86">
+<histogram name="ProtoDB.GetFound" enum="Boolean" expires_after="2021-08-24">
   <owner>nyquist@chromium.org</owner>
   <owner>ssid@chromium.org</owner>
   <summary>Whether a ProtoDB Get call found what was requested.</summary>
 </histogram>
 
-<histogram name="ProtoDB.GetSuccess" enum="BooleanSuccess" expires_after="M86">
+<histogram name="ProtoDB.GetSuccess" enum="BooleanSuccess"
+    expires_after="2021-08-24">
   <owner>nyquist@chromium.org</owner>
   <owner>ssid@chromium.org</owner>
   <summary>Whether a ProtoDB Get call was successful or not.</summary>
 </histogram>
 
 <histogram name="ProtoDB.InitStatus" enum="LevelDBStatus"
-    expires_after="2021-04-11">
+    expires_after="2021-08-24">
   <owner>nyquist@chromium.org</owner>
   <owner>ssid@chromium.org</owner>
   <summary>The LevelDB Status from a ProtoDatabase Init call.</summary>
 </histogram>
 
 <histogram name="ProtoDB.LoadEntriesSuccess" enum="BooleanSuccess"
-    expires_after="M86">
+    expires_after="2021-08-24">
   <owner>nyquist@chromium.org</owner>
   <owner>ssid@chromium.org</owner>
   <summary>Whether a ProtoDB LoadEntries call was successful or not.</summary>
 </histogram>
 
 <histogram name="ProtoDB.LoadKeysAndEntriesSuccess" enum="BooleanSuccess"
-    expires_after="M86">
+    expires_after="2021-08-24">
   <owner>nyquist@chromium.org</owner>
   <owner>ssid@chromium.org</owner>
   <summary>
@@ -11490,14 +11831,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ProtoDB.LoadKeysSuccess" enum="BooleanSuccess"
-    expires_after="M86">
+    expires_after="2021-08-24">
   <owner>nyquist@chromium.org</owner>
   <owner>ssid@chromium.org</owner>
   <summary>Whether a ProtoDB LoadKeys call was successful or not.</summary>
 </histogram>
 
 <histogram name="ProtoDB.SharedDbInitStatus" enum="ProtoDatabaseInitState"
-    expires_after="2021-04-18">
+    expires_after="2021-08-24">
   <owner>ssid@chromium.org</owner>
   <owner>salg@chromium.org</owner>
   <summary>
@@ -11511,7 +11852,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ProtoDB.UpdateErrorStatus" enum="LevelDBStatus"
-    expires_after="M86">
+    expires_after="2021-08-24">
   <owner>nyquist@chromium.org</owner>
   <owner>ssid@chromium.org</owner>
   <summary>
@@ -11520,14 +11861,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ProtoDB.UpdateSuccess" enum="BooleanSuccess"
-    expires_after="M86">
+    expires_after="2021-08-24">
   <owner>nyquist@chromium.org</owner>
   <owner>ssid@chromium.org</owner>
   <summary>Whether a ProtoDB UpdateEntries call was successful or not.</summary>
 </histogram>
 
 <histogram name="ProximityAuth.BleWeaveConnectionResult"
-    enum="ProximityAuth_BleWeaveConnectionResult" expires_after="2021-04-11">
+    enum="ProximityAuth_BleWeaveConnectionResult" expires_after="2021-08-15">
   <owner>hansberry@chromium.org</owner>
   <summary>
     Provides a breakdown of how often each BLE weave connection result occurs.
@@ -11536,7 +11877,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="ProximityAuth.BluetoothGattConnectionResult"
     enum="ProximityAuth_BluetoothGattConnectionResult"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>hansberry@chromium.org</owner>
   <summary>
     Provides a breakdown of how many times each possible Bluetooth GATT
@@ -11550,7 +11891,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="ProximityAuth.BluetoothGattNotifySessionResult"
     enum="ProximityAuth_BluetoothGattServiceOperationResult"
-    expires_after="2021-03-21">
+    expires_after="2021-08-01">
   <owner>hansberry@chromium.org</owner>
   <summary>
     Provides a breakdown of how many times each possible Bluetooth GATT
@@ -11631,8 +11972,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PushMessaging.DeliveryStatus" enum="PushEventStatus"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>peter@chromium.org</owner>
+  <owner>knollr@chromium.org</owner>
   <summary>
     When a Service Worker receives a push message, this records whether the
     overall operation was successful, or otherwise the type of error
@@ -11641,8 +11983,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PushMessaging.DeliveryStatus.FindServiceWorker"
-    enum="ServiceWorkerStatusCode" expires_after="M90">
+    enum="ServiceWorkerStatusCode" expires_after="M96">
   <owner>peter@chromium.org</owner>
+  <owner>knollr@chromium.org</owner>
   <summary>
     When attempting to deliver a push message to a Service Worker, this records
     the result of finding the Service Worker registration given its ID and
@@ -11651,8 +11994,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PushMessaging.DeliveryStatus.ServiceWorkerEvent"
-    enum="ServiceWorkerStatusCode" expires_after="M87">
+    enum="ServiceWorkerStatusCode" expires_after="M96">
   <owner>peter@chromium.org</owner>
+  <owner>knollr@chromium.org</owner>
   <summary>
     When a Service Worker receives a push message, this records the precise
     result received from the Service Worker code.
@@ -11660,8 +12004,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PushMessaging.GetRegistrationStatus"
-    enum="PushGetRegistrationStatus" expires_after="M87">
+    enum="PushGetRegistrationStatus" expires_after="M94">
   <owner>peter@chromium.org</owner>
+  <owner>knollr@chromium.org</owner>
   <summary>
     When a webpage asks for details about its current push messaging
     registration, this records whether the request is successful, or otherwise
@@ -11670,7 +12015,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PushMessaging.PushSubscriptionChangeStatus"
-    enum="PushEventStatus" expires_after="M87">
+    enum="PushEventStatus" expires_after="M94">
   <owner>peter@chromium.org</owner>
   <owner>rayankans@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
@@ -11683,7 +12028,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PushMessaging.ReceivedMessageInBackground" enum="Boolean"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>peter@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
   <summary>
@@ -11696,7 +12041,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PushMessaging.RegistrationStatus"
-    enum="PushRegistrationStatus" expires_after="M87">
+    enum="PushRegistrationStatus" expires_after="M94">
   <owner>peter@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
   <summary>
@@ -11724,7 +12069,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PushMessaging.TimeToReadPersistedMessages" units="ms"
-    expires_after="2021-02-28">
+    expires_after="M94">
   <owner>peter@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
   <summary>
@@ -11736,8 +12081,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PushMessaging.UnregistrationGCMResult" enum="GCMClientResult"
-    expires_after="M87">
+    expires_after="M94">
   <owner>peter@chromium.org</owner>
+  <owner>knollr@chromium.org</owner>
   <summary>
     When unregistering a legacy non-InstanceID push messaging subscription, this
     records the result returned by the GCMDriver (note that exceeding the
@@ -11746,7 +12092,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PushMessaging.UnregistrationIIDResult" enum="InstanceIDResult"
-    expires_after="M90">
+    expires_after="M94">
   <owner>peter@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
   <summary>
@@ -11757,8 +12103,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PushMessaging.UnregistrationReason"
-    enum="PushUnregistrationReason" expires_after="M87">
+    enum="PushUnregistrationReason" expires_after="M94">
   <owner>peter@chromium.org</owner>
+  <owner>knollr@chromium.org</owner>
   <summary>
     When unregistering a website from push messaging, this records the reason
     why it is being unregistered.
@@ -11766,8 +12113,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PushMessaging.UnregistrationStatus"
-    enum="PushUnregistrationStatus" expires_after="M87">
+    enum="PushUnregistrationStatus" expires_after="M94">
   <owner>peter@chromium.org</owner>
+  <owner>knollr@chromium.org</owner>
   <summary>
     When unregistering a website from push messaging, this records whether the
     request is successful, or otherwise the type of error encountered.
@@ -11775,8 +12123,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PushMessaging.UserVisibleStatus" enum="PushUserVisibleStatus"
-    expires_after="M87">
+    expires_after="M96">
   <owner>peter@chromium.org</owner>
+  <owner>knollr@chromium.org</owner>
   <summary>
     When a Service Worker receives a push message, this records whether it
     showed user-visible UX (like a notification), or whether we showed a forced
@@ -11785,7 +12134,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PushMessaging.VisibleNotificationCount" units="notifications"
-    expires_after="M89">
+    expires_after="M94">
   <owner>knollr@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -11796,12 +12145,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Rappor.DailyEvent.IntervalType" enum="DailyEventIntervalType"
     expires_after="M85">
+  <obsolete>
+    Removed in M90
+  </obsolete>
   <owner>holte@chromium.org</owner>
   <summary>Counts how often daily interval events were fired.</summary>
 </histogram>
 
 <histogram name="Rappor.DiscardReason" enum="RapporDiscardReason"
     expires_after="M77">
+  <obsolete>
+    Removed in M90
+  </obsolete>
   <owner>holte@chromium.org</owner>
   <summary>
     For each Rappor log that is discarded, the reason that it was discarded.
@@ -11810,12 +12165,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Rappor.FailedUploadErrorCode" enum="NetErrorCodes"
     expires_after="M77">
+  <obsolete>
+    Removed in M90
+  </obsolete>
   <owner>holte@chromium.org</owner>
   <summary>Net error codes for failed Rappor uploads.</summary>
 </histogram>
 
 <histogram name="Rappor.LoadCohortResult" enum="RapporLoadResultType"
     expires_after="M77">
+  <obsolete>
+    Removed in M90
+  </obsolete>
   <owner>holte@chromium.org</owner>
   <summary>
     Success or errors encountered when loading Rappor cohort pref.
@@ -11824,6 +12185,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Rappor.LoadSecretResult" enum="RapporLoadResultType"
     expires_after="M77">
+  <obsolete>
+    Removed in M90
+  </obsolete>
   <owner>holte@chromium.org</owner>
   <summary>
     Success or errors encountered when loading Rappor secret pref.
@@ -11832,6 +12196,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Rappor.UploadResponseCode" enum="HttpResponseCode"
     expires_after="M77">
+  <obsolete>
+    Removed in M90
+  </obsolete>
   <owner>holte@chromium.org</owner>
   <summary>
     For each upload to the Rappor server, log the response received from the
@@ -11839,6 +12206,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ReadingList.BookmarkBarState.On{Frequency}AddToReadingList"
+    enum="BookmarkBarState" expires_after="M92">
+  <owner>corising@chromium.org</owner>
+  <owner>chrome-desktop-ui-sea@google.com</owner>
+  <summary>
+    The state of the bookmark bar recorded {Frequency} a user adds to the
+    reading list. (Desktop only).
+  </summary>
+  <token key="Frequency">
+    <variant name="Every" summary="every time"/>
+    <variant name="First" summary="the first time"/>
+  </token>
+</histogram>
+
 <histogram name="ReadingList.ContextMenu" enum="ReadingListContextMenuActions"
     expires_after="2021-04-15">
   <owner>gambard@chromium.org</owner>
@@ -11859,7 +12240,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ReadingList.Download.Status" enum="ReadingListDownloadStatus"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>gambard@chromium.org</owner>
   <owner>bling-team@google.com</owner>
   <summary>Final status of the download of a reading list entry.</summary>
@@ -11876,14 +12257,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ReadingList.OfflineVersionDisplayed" enum="Boolean"
-    expires_after="2021-04-15">
+    expires_after="2021-07-04">
   <owner>gambard@chromium.org</owner>
   <owner>bling-team@google.com</owner>
   <summary>Whether the displayed version is the offline one.</summary>
 </histogram>
 
 <histogram name="ReadingList.Read.AgeOnDeletion" units="hours"
-    expires_after="2021-04-15">
+    expires_after="2021-07-18">
   <owner>gambard@chromium.org</owner>
   <owner>bling-team@google.com</owner>
   <summary>
@@ -11892,7 +12273,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ReadingList.Read.Number" units="count"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>gambard@chromium.org</owner>
   <owner>bling-team@google.com</owner>
   <summary>Number of read entries in reading list.</summary>
@@ -11908,12 +12289,89 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ReadingList.Unread.Number" units="count"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>gambard@chromium.org</owner>
   <owner>bling-team@google.com</owner>
   <summary>Number of unread entries in reading list.</summary>
 </histogram>
 
+<histogram name="ReadingList.WebUI.InitialEntriesRenderTime" units="ms"
+    expires_after="2021-08-15">
+  <owner>corising@chromium.org</owner>
+  <owner>chrome-desktop-ui-sea@google.com</owner>
+  <summary>
+    Records the time taken to load the Read Later WebUI and render (at least)
+    the initial list of entries. This is roughly equivalent to 'time to first
+    meaningful paint' for the Read Later UI.
+  </summary>
+</histogram>
+
+<histogram name="ReadingList.WebUI.LoadCompletedTime" units="ms"
+    expires_after="2021-08-15">
+  <owner>corising@chromium.org</owner>
+  <owner>chrome-desktop-ui-sea@google.com</owner>
+  <summary>
+    The amount of time between the render frame host StartProvisionalLoad event
+    and the render frame DocumentOnLoadCompleted event for the Read Later WebUI
+    page.
+  </summary>
+</histogram>
+
+<histogram name="ReadingList.WebUI.LoadDocumentTime" units="ms"
+    expires_after="2021-08-15">
+  <owner>corising@chromium.org</owner>
+  <owner>chrome-desktop-ui-sea@google.com</owner>
+  <summary>
+    The amount of time between the render frame host StartProvisionalLoad and
+    DidFinishDocumentLoad events for the Read Later WebUI page.
+  </summary>
+</histogram>
+
+<histogram name="ReadingList.WebUI.ReadingListDataReceived" units="ms"
+    expires_after="2021-08-15">
+  <obsolete>
+    Deprecated as of 2021/02. Metric is no longer needed.
+  </obsolete>
+  <owner>corising@chromium.org</owner>
+  <owner>chrome-desktop-ui-sea@google.com</owner>
+  <summary>
+    The time taken for the WebUI in the renderer to receive the full list of
+    entries for the current user profile. This is measured as the time from when
+    the data was first requested by the WebUI to when the data was received by
+    the WebUI.
+  </summary>
+</histogram>
+
+<histogram name="ReadingList.WindowDisplayedDuration" units="ms"
+    expires_after="2021-08-08">
+  <owner>corising@chromium.org</owner>
+  <owner>chrome-desktop-ui-sea@google.com</owner>
+  <summary>
+    Records the amount of time between when a reading list bubble is opened and
+    when it is closed. It does so by recording the difference in time between
+    when the the hosting WebUIBubbleDialogView's Widget is first created and
+    when the widget is destroyed. This is logged on Desktop only.
+  </summary>
+</histogram>
+
+<histogram name="ReadingList.{ReadStatus}.Count.{Variation}" units="count"
+    expires_after="M92">
+  <owner>corising@chromium.org</owner>
+  <owner>chrome-desktop-ui-sea@google.com</owner>
+  <summary>
+    The number of {ReadStatus} items in the reading list. Recorded {Variation}.
+  </summary>
+  <token key="ReadStatus">
+    <variant name="Read" summary="read"/>
+    <variant name="Unread" summary="unread"/>
+  </token>
+  <token key="Variation">
+    <variant name="OnModelLoaded"
+        summary="when the reading list model is loaded"/>
+    <variant name="OnUMAUpload" summary="every UMA upload"/>
+  </token>
+</histogram>
+
 <histogram name="RecoveryComponent.Event" enum="RecoveryComponentEvent"
     expires_after="M77">
   <owner>robertshield@chromium.org</owner>
@@ -11922,6 +12380,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true" name="RecurrenceRanker.InitializationStatus"
     enum="RecurrenceRankerInitializationStatus" expires_after="2021-02-01">
+  <obsolete>
+    Removed January 2021.
+  </obsolete>
 <!-- Name completed by histogram_suffixes
        name="RecurrenceRankerModel" -->
 
@@ -11935,6 +12396,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true" name="RecurrenceRanker.JsonConfigConversionStatus"
     enum="BooleanSuccess" expires_after="2021-02-01">
+  <obsolete>
+    Removed January 2021.
+  </obsolete>
 <!-- Name completed by histogram_suffixes
        name="RecurrenceRankerModel" -->
 
@@ -11948,6 +12412,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true" name="RecurrenceRanker.SerializationStatus"
     enum="RecurrenceRankerSerializationStatus" expires_after="2021-02-01">
+  <obsolete>
+    Removed January 2021.
+  </obsolete>
 <!-- Name completed by histogram_suffixes
        name="RecurrenceRankerModel" -->
 
@@ -11960,6 +12427,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true" name="RecurrenceRanker.Usage"
     enum="RecurrenceRankerUsage" expires_after="2021-02-01">
+  <obsolete>
+    Removed January 2021.
+  </obsolete>
 <!-- Name completed by histogram_suffixes
        name="RecurrenceRankerModel" -->
 
@@ -11971,7 +12441,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="RelaunchNotification.ShowResult"
-    enum="RelaunchNotificationShowResult" expires_after="M90">
+    enum="RelaunchNotificationShowResult" expires_after="2021-06-20">
+  <obsolete>
+    Removed in M90.
+  </obsolete>
   <owner>ayaelattar@chromium.org</owner>
   <owner>grt@chromium.org</owner>
   <summary>
@@ -12015,7 +12488,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="RenderTextHarfBuzz.GetFallbackFontsTime" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-08-09">
   <owner>ccameron@chromium.org</owner>
   <owner>etienneb@chromium.org</owner>
   <summary>
@@ -12026,7 +12499,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="RenderTextHarfBuzz.GetFallbackFontTime" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-08-09">
   <owner>ccameron@chromium.org</owner>
   <owner>etienneb@chromium.org</owner>
   <summary>
@@ -12037,7 +12510,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="RenderTextHarfBuzz.ShapeRunsFallback" enum="ShapeRunFallback"
-    expires_after="2021-05-09">
+    expires_after="2021-08-09">
   <owner>ccameron@chromium.org</owner>
   <owner>etienneb@chromium.org</owner>
   <summary>
@@ -12047,7 +12520,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="RenderTextHarfBuzz.ShapeRunsWithFallbackFontsTime" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-08-09">
   <owner>ccameron@chromium.org</owner>
   <owner>etienneb@chromium.org</owner>
   <summary>
@@ -12074,6 +12547,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>
     Count of renderer view context menu items (Only commands now) used.
 
+    The user action RenderViewContextMenu.Used.IDC_CONTENT_CONTEXT_SEARCHWEBFOR
+    is also logged in case that IDC_CONTENT_CONTEXT_SEARCHWEBFOR is logged to
+    this histogram.
+
     This histogram is of special interest to the chrome-analysis-team@. Do not
     change its semantics or retire it without talking to them first.
   </summary>
@@ -12266,6 +12743,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="ResourceScheduler.DelayableRequests.WaitTimeToAvoidContentionWithNonDelayableRequest"
     units="ms" expires_after="M85">
+  <obsolete>
+    Obsoleted M85.
+  </obsolete>
   <owner>tbansal@chromium.org</owner>
   <summary>
     Records how long after the start of a delayable resource request, a
@@ -12277,6 +12757,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="ResourceScheduler.NonDelayableLastEndToNonDelayableStart"
     units="ms" expires_after="M85">
+  <obsolete>
+    Obsoleted M85.
+  </obsolete>
   <owner>tbansal@chromium.org</owner>
   <owner>dougarnett@chromium.org</owner>
   <summary>
@@ -12289,7 +12772,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="ResourceScheduler.NonDelayableLastEndToNonDelayableStart.NonDelayableNotInFlight"
-    units="ms" expires_after="2021-09-01">
+    units="ms" expires_after="2020-12-14">
+  <obsolete>
+    Obsoleted M89.
+  </obsolete>
   <owner>tbansal@chromium.org</owner>
   <owner>dougarnett@chromium.org</owner>
   <summary>
@@ -12401,6 +12887,22 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram
+    name="ResourceScheduler.WeakSignalThrottling.WeakSignalDuration.{NetworkType}"
+    units="ms" expires_after="2021-12-01">
+  <owner>eseckler@chromium.org</owner>
+  <owner>khokhlov@chromium.org</owner>
+  <owner>skyostil@chromium.org</owner>
+  <summary>
+    Records the duration of the period when some low-priority requests were
+    throttled due to weak radio signal. Only supported on Android.
+  </summary>
+  <token key="NetworkType">
+    <variant name="Cell"/>
+    <variant name="Wifi"/>
+  </token>
+</histogram>
+
 <histogram name="Rlz.SetRlzPingSent" enum="BooleanSuccess" expires_after="M85">
   <owner>wzang@chromium.org</owner>
   <summary>
@@ -12410,7 +12912,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Rollback.OobeRestoreResult" enum="Rollback_OobeRestoreResult"
-    expires_after="2021-04-18">
+    expires_after="2021-06-01">
   <owner>mpolzer@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -12419,7 +12921,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Rollback.RollbackSaveResult"
-    enum="Rollback_RollbackSaveResult" expires_after="2021-01-01">
+    enum="Rollback_RollbackSaveResult" expires_after="2021-06-01">
   <owner>mpolzer@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -12510,7 +13012,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SB2.RemoteCall.CanCheckUrl" enum="BooleanCanCheckUrl"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -12539,7 +13041,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="SB2.RemoteCall.Elapsed" units="ms" expires_after="2021-05-02">
+<histogram name="SB2.RemoteCall.Elapsed" units="ms" expires_after="2021-07-04">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -12568,7 +13070,7 @@ Safe Browsing lookups, which is critical for security. -->
 </histogram>
 
 <histogram name="SB2.RemoteCall.Result" enum="SB2RemoteCallResult"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -12602,13 +13104,28 @@ Safe Browsing lookups, which is critical for security. -->
   </summary>
 </histogram>
 
+<histogram name="SB2.RequestDestination" enum="RequestDestination"
+    expires_after="2021-07-11">
+  <owner>vakh@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    Request destinations of resources that were inspected by Safe Browsing in
+    the SafeBrowsingResourceThrottle.
+  </summary>
+</histogram>
+
 <histogram name="SB2.ResourceTypes2" enum="ContentResourceType2"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Resource types of resources that were inspected by Safe Browsing in the
     SafeBrowsingResourceThrottle.
+
+    Starting M89, this metric is derived from
+    network::mojom::RequestDestination. kPrefetch, kFavicon, kXhr, kPing,
+    kNavigationPreloadMainFrame, and kNavigationPreloadSubFrame are all mapped
+    to kSubResource.
   </summary>
 </histogram>
 
@@ -12752,7 +13269,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SBIRS.UploadResult" enum="ReportProcessingResult"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>caitkp@google.com</owner>
   <summary>
     The result of an attempted report upload by the safe browsing incident
@@ -12826,7 +13343,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SBMultipartUploader.SuccessfulUploadDuration" units="s"
-    expires_after="M90">
+    expires_after="2021-07-18">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -12858,11 +13375,12 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="ScreenLocker.AuthenticationFailure" enum="UnlockType"
-    expires_after="2021-03-28">
+    expires_after="never">
+<!-- expires-never: Core metric for monitoring Chrome OS lock screen regressions.  -->
+
   <owner>antrim@chromium.org</owner>
-  <owner>jessejames@chromium.org</owner>
   <owner>rsorokin@chromium.org</owner>
-  <owner>ultrotter@chromium.org</owner>
+  <owner>cros-oac@google.com</owner>
   <summary>
     What type of authentication was attempted when the user failed to unlock the
     lock screen.
@@ -12870,20 +13388,22 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="ScreenLocker.AuthenticationFailureTime" units="ms"
-    expires_after="2021-01-06">
+    expires_after="never">
+<!-- expires-never: Core metric for monitoring Chrome OS lock screen regressions.  -->
+
   <owner>antrim@chromium.org</owner>
-  <owner>jessejames@chromium.org</owner>
   <owner>rsorokin@chromium.org</owner>
-  <owner>ultrotter@chromium.org</owner>
+  <owner>cros-oac@google.com</owner>
   <summary>The time spent for authentication in case of a failure.</summary>
 </histogram>
 
 <histogram name="ScreenLocker.AuthenticationSuccess" enum="UnlockType"
-    expires_after="2021-03-28">
+    expires_after="never">
+<!-- expires-never: Core metric for monitoring Chrome OS lock screen regressions.  -->
+
   <owner>antrim@chromium.org</owner>
-  <owner>jessejames@chromium.org</owner>
   <owner>rsorokin@chromium.org</owner>
-  <owner>ultrotter@chromium.org</owner>
+  <owner>cros-oac@google.com</owner>
   <summary>
     What type of authentication was attempted when the user successfully
     unlocked the lock screen.
@@ -12891,35 +13411,37 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="ScreenLocker.AuthenticationSuccessTime" units="ms"
-    expires_after="2021-01-06">
+    expires_after="never">
+<!-- expires-never: Core metric for monitoring Chrome OS lock screen regressions.  -->
+
   <owner>antrim@chromium.org</owner>
-  <owner>jessejames@chromium.org</owner>
   <owner>rsorokin@chromium.org</owner>
-  <owner>ultrotter@chromium.org</owner>
+  <owner>cros-oac@google.com</owner>
   <summary>The time spent for authentication in case of a success.</summary>
 </histogram>
 
-<histogram name="ScreenLocker.ScreenLockTime" units="ms"
-    expires_after="2021-01-06">
+<histogram name="ScreenLocker.ScreenLockTime" units="ms" expires_after="never">
+<!-- expires-never: Core metric for monitoring Chrome OS lock screen regressions.  -->
+
   <owner>antrim@chromium.org</owner>
-  <owner>jessejames@chromium.org</owner>
   <owner>rsorokin@chromium.org</owner>
-  <owner>ultrotter@chromium.org</owner>
+  <owner>cros-oac@google.com</owner>
   <summary>The time spent before the screen locker is ready.</summary>
 </histogram>
 
 <histogram name="SendTabToSelf.AndroidShareSheet.ClickResult"
-    enum="SendTabToSelfClickResult" expires_after="M88">
+    enum="SendTabToSelfClickResult" expires_after="M97">
   <owner>jeffreycohen@chromium.org</owner>
   <owner>tgupta@chromium.org</owner>
+  <owner>chrome-sharing-core@google.com</owner>
   <summary>Tracks the user flow for sending a tab for SendTabToSelf.</summary>
 </histogram>
 
 <histogram base="true" name="SendTabToSelf.ClickResult"
-    enum="SendTabToSelfClickResult" expires_after="M88">
+    enum="SendTabToSelfClickResult" expires_after="M97">
   <owner>jeffreycohen@chromium.org</owner>
-  <owner>sebsg@chromium.org</owner>
   <owner>tgupta@chromium.org</owner>
+  <owner>chrome-sharing-core@google.com</owner>
   <summary>
     Record whether the user has clicked the item when it is shown.
   </summary>
@@ -12935,7 +13457,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="Servicification.Startup2" enum="ServicificationStartupMode"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>hanxi@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
   <owner>hnakashima@chromium.org</owner>
@@ -12948,7 +13470,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="Servicification.Startup3" enum="ServicificationStartupMode"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>hanxi@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
   <owner>hnakashima@chromium.org</owner>
@@ -13025,7 +13547,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="Setup.Install.LzmaUnPackStatus" enum="UnPackStatus"
-    expires_after="2021-03-22">
+    expires_after="2022-03-22">
   <owner>zmin@chromium.org</owner>
   <owner>grt@chromium.org</owner>
   <summary>Record the status of unpacking the contents of a 7z file.</summary>
@@ -13101,26 +13623,41 @@ should be kept until we remove incident reporting. -->
   <summary>Win32 APIs that error out during setup.</summary>
 </histogram>
 
-<histogram name="SharedHighlights.LinkGenerated" units="BooleanSuccess"
-    expires_after="2021-05-09">
+<histogram name="SharedHighlights.AsyncTask.Iterations" units="iterations"
+    expires_after="2021-07-11">
   <owner>gayane@chromium.org</owner>
   <owner>chrome-shared-highlighting@google.com</owner>
   <summary>
-    Indicates whether text fragment selector generation was successful.
+    Indicates number of iterations it took for AsyncFindBuffer to finish the
+    search. AsyncFindBuffer is used only for validating generated text fragment
+    selectors for Shared Highlighting.
+  </summary>
+</histogram>
+
+<histogram name="SharedHighlights.AsyncTask.SearchDuration" units="ms"
+    expires_after="2021-07-11">
+  <owner>gayane@chromium.org</owner>
+  <owner>chrome-shared-highlighting@google.com</owner>
+  <summary>
+    Time it took in milliseconds for AsyncFindBuffer to finish the search.
+    AsyncFindBuffer is used only for validating generated text fragment
+    selectors for Shared Highlighting.
   </summary>
 </histogram>
 
 <histogram name="SharedHighlights.LinkGenerated.Error"
-    enum="LinkGenerationError" expires_after="2021-05-09">
+    enum="LinkGenerationError" expires_after="2021-07-11">
   <owner>gayane@chromium.org</owner>
   <owner>chrome-shared-highlighting@google.com</owner>
   <summary>
-    Indicates error that caused text fragment selector generation to fail.
+    Records errors that caused text fragment selector generation to fail.
+    Recorded for all the failed link generation runs. This histogram is a
+    superset of |SharedHighlights.LinkGenerated.Error.Requested|.
   </summary>
 </histogram>
 
 <histogram name="SharedHighlights.LinkGenerated.Error.Iterations"
-    units="iterations" expires_after="2021-05-09">
+    units="iterations" expires_after="2021-07-11">
   <owner>gayane@chromium.org</owner>
   <owner>chrome-shared-highlighting@google.com</owner>
   <summary>
@@ -13129,8 +13666,18 @@ should be kept until we remove incident reporting. -->
   </summary>
 </histogram>
 
+<histogram name="SharedHighlights.LinkGenerated.Error.Requested"
+    enum="LinkGenerationError" expires_after="2021-07-11">
+  <owner>gayane@chromium.org</owner>
+  <owner>chrome-shared-highlighting@google.com</owner>
+  <summary>
+    Records errors that caused text fragment selector generation to fail.
+    Recorded only for failure cases that were requested by users.
+  </summary>
+</histogram>
+
 <histogram name="SharedHighlights.LinkGenerated.Error.TimeToGenerate"
-    units="ms" expires_after="2021-05-09">
+    units="ms" expires_after="2021-07-11">
   <owner>gayane@chromium.org</owner>
   <owner>chrome-shared-highlighting@google.com</owner>
   <summary>
@@ -13140,7 +13687,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SharedHighlights.LinkGenerated.Iterations" units="iterations"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>gayane@chromium.org</owner>
   <owner>chrome-shared-highlighting@google.com</owner>
   <summary>
@@ -13150,7 +13697,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SharedHighlights.LinkGenerated.ParamLength" units="characters"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>gayane@chromium.org</owner>
   <owner>chrome-shared-highlighting@google.com</owner>
   <summary>
@@ -13162,7 +13709,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SharedHighlights.LinkGenerated.SelectionLength"
-    units="characters" expires_after="2021-05-09">
+    units="characters" expires_after="2021-07-11">
   <owner>gayane@chromium.org</owner>
   <owner>chrome-shared-highlighting@google.com</owner>
   <summary>
@@ -13172,7 +13719,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SharedHighlights.LinkGenerated.SelectorParameters"
-    enum="TextFragmentAnchorParameters" expires_after="2021-05-09">
+    enum="TextFragmentAnchorParameters" expires_after="2021-07-11">
   <owner>gayane@chromium.org</owner>
   <owner>chrome-shared-highlighting@google.com</owner>
   <summary>
@@ -13182,7 +13729,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SharedHighlights.LinkGenerated.TimeToGenerate" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>gayane@chromium.org</owner>
   <owner>chrome-shared-highlighting@google.com</owner>
   <summary>
@@ -13191,6 +13738,23 @@ should be kept until we remove incident reporting. -->
   </summary>
 </histogram>
 
+<histogram name="SharedHighlights.LinkGenerated{Requested}"
+    units="BooleanSuccess" expires_after="2021-07-11">
+  <owner>gayane@chromium.org</owner>
+  <owner>chrome-shared-highlighting@google.com</owner>
+  <summary>
+    Indicates whether text fragment selector generation was successful for
+    {Requested}.
+  </summary>
+  <token key="Requested">
+    <variant name="" summary="all cases"/>
+    <variant name=".RequestedAfterReady"
+        summary="cases when selector is requested after its ready."/>
+    <variant name=".RequestedBeforeReady"
+        summary="cases when selector is requested before its ready."/>
+  </token>
+</histogram>
+
 <histogram name="SharedMemory.MapBlockedForSecurity" enum="BooleanBlocked"
     expires_after="M85">
   <owner>dcheng@chromium.org</owner>
@@ -13281,7 +13845,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.CertificateFetch.CacheHit"
-    enum="BooleanCacheHit" expires_after="2021-04-01">
+    enum="BooleanCacheHit" expires_after="M94">
   <owner>ksakamoto@chromium.org</owner>
   <owner>kinuko@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13292,7 +13856,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.CertVerificationResult" enum="NetErrorCodes"
-    expires_after="2021-04-01">
+    expires_after="M94">
   <owner>ksakamoto@chromium.org</owner>
   <owner>kinuko@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13302,7 +13866,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.CTVerificationResult" enum="CTComplianceStatus"
-    expires_after="2021-04-01">
+    expires_after="M94">
   <owner>ksakamoto@chromium.org</owner>
   <owner>kinuko@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13312,7 +13876,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.FallbackRedirectLoop" enum="BooleanDetected"
-    expires_after="2021-04-01">
+    expires_after="M94">
   <owner>ksakamoto@chromium.org</owner>
   <owner>kinuko@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13326,7 +13890,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.LoadResult2" enum="SignedExchangeLoadResult"
-    expires_after="2021-04-01">
+    expires_after="M94">
   <owner>ksakamoto@chromium.org</owner>
   <owner>kinuko@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13337,7 +13901,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.OCSPResponseStatus" enum="OCSPResponseStatus"
-    expires_after="2021-04-01">
+    expires_after="M94">
   <owner>ksakamoto@chromium.org</owner>
   <owner>kinuko@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13348,7 +13912,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.OCSPRevocationStatus"
-    enum="OCSPRevocationStatus" expires_after="2021-04-01">
+    enum="OCSPRevocationStatus" expires_after="M94">
   <owner>ksakamoto@chromium.org</owner>
   <owner>kinuko@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13360,7 +13924,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.Prefetch.LoadResult2"
-    enum="SignedExchangeLoadResult" expires_after="2021-04-01">
+    enum="SignedExchangeLoadResult" expires_after="M94">
   <owner>kinuko@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13371,7 +13935,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.Prefetch.Precision.30Seconds"
-    enum="BooleanUsage" expires_after="2021-04-01">
+    enum="BooleanUsage" expires_after="M94">
   <owner>kinuko@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13384,7 +13948,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.Prefetch.Recall.30Seconds" enum="BooleanUsage"
-    expires_after="2021-04-01">
+    expires_after="M94">
   <owner>kinuko@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13396,7 +13960,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.SignatureVerificationError.Expired"
-    units="seconds" expires_after="2021-04-01">
+    units="seconds" expires_after="M94">
   <owner>kinuko@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13407,7 +13971,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.SignatureVerificationError.NotYetValid"
-    units="seconds" expires_after="2021-04-01">
+    units="seconds" expires_after="M94">
   <owner>ksakamoto@chromium.org</owner>
   <owner>kinuko@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13418,7 +13982,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.SignatureVerificationResult"
-    enum="SignedExchangeSignatureVerificationResult" expires_after="2021-04-01">
+    enum="SignedExchangeSignatureVerificationResult" expires_after="M94">
   <owner>kinuko@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13429,7 +13993,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.Time.CertificateFetch.Failure" units="ms"
-    expires_after="2021-04-01">
+    expires_after="M94">
   <owner>ksakamoto@chromium.org</owner>
   <owner>kinuko@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13440,7 +14004,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.Time.CertificateFetch.Success" units="ms"
-    expires_after="2021-04-01">
+    expires_after="M94">
   <owner>ksakamoto@chromium.org</owner>
   <owner>kinuko@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13451,7 +14015,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.Time.SignatureVerify" units="ms"
-    expires_after="2021-04-01">
+    expires_after="M94">
   <owner>ksakamoto@chromium.org</owner>
   <owner>kinuko@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13462,7 +14026,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.TimeUntilExpiration" units="seconds"
-    expires_after="2021-04-01">
+    expires_after="M94">
   <owner>kinuko@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13474,7 +14038,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.ValidityPingDuration" units="ms"
-    expires_after="2021-04-01">
+    expires_after="M94">
   <owner>kinuko@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13485,7 +14049,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SignedExchange.ValidityPingResult"
-    enum="SignedExchangeValidityPingResult" expires_after="2021-04-01">
+    enum="SignedExchangeValidityPingResult" expires_after="M94">
   <owner>kinuko@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <owner>horo@chromium.org</owner>
@@ -13514,7 +14078,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SiteEngagementService.EngagementScore" units="units"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>calamity@chromium.org</owner>
   <owner>dominickn@chromium.org</owner>
   <summary>
@@ -13525,7 +14089,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SiteEngagementService.EngagementScoreBucket" units="%"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>calamity@chromium.org</owner>
   <owner>dominickn@chromium.org</owner>
   <summary>
@@ -13536,7 +14100,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SiteEngagementService.EngagementType"
-    enum="SiteEngagementServiceEngagementType" expires_after="2021-05-09">
+    enum="SiteEngagementServiceEngagementType" expires_after="2021-07-11">
   <owner>calamity@chromium.org</owner>
   <owner>dominickn@chromium.org</owner>
   <summary>
@@ -13546,7 +14110,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SiteEngagementService.MeanEngagement" units="units"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>calamity@chromium.org</owner>
   <owner>dominickn@chromium.org</owner>
   <summary>
@@ -13557,7 +14121,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SiteEngagementService.MedianEngagement" units="units"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>calamity@chromium.org</owner>
   <owner>dominickn@chromium.org</owner>
   <summary>
@@ -13568,7 +14132,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SiteEngagementService.OriginsEngaged" units="units"
-    expires_after="2021-03-07">
+    expires_after="2021-07-18">
   <owner>calamity@chromium.org</owner>
   <owner>dominickn@chromium.org</owner>
   <summary>
@@ -13605,7 +14169,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SiteEngagementService.TotalEngagement" units="units"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>calamity@chromium.org</owner>
   <owner>dominickn@chromium.org</owner>
   <summary>
@@ -13616,7 +14180,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SiteIsolatedCodeCache.JS.Behaviour"
-    enum="SiteIsolatedCodeCacheJSBehaviour" expires_after="2021-05-09">
+    enum="SiteIsolatedCodeCacheJSBehaviour" expires_after="2021-07-11">
   <owner>mythria@chromium.org</owner>
   <owner>v8-team@google.com</owner>
   <summary>
@@ -13747,7 +14311,10 @@ should be kept until we remove incident reporting. -->
 
 <histogram
     name="SiteIsolation.FileSystemApi.CanAccessDataForOriginFailure.IsHttpBasedScheme"
-    enum="BooleanHttpBasedOrOtherScheme" expires_after="2021-01-31">
+    enum="BooleanHttpBasedOrOtherScheme" expires_after="2020-12-21">
+  <obsolete>
+    Removed in Dec 2020 / M89.
+  </obsolete>
   <owner>lukasza@chromium.org</owner>
   <owner>nasko@chromium.org</owner>
   <summary>
@@ -13768,6 +14335,48 @@ should be kept until we remove incident reporting. -->
   </summary>
 </histogram>
 
+<histogram name="SiteIsolation.ORB.ResponseHeadersHeuristic.Decision"
+    enum="OpaqueResponseBlocking_ResponseHeadersHeuristic" expires_after="M92">
+  <owner>creis@chromium.org</owner>
+  <owner>lukasza@chromium.org</owner>
+  <summary>
+    The approximation of a route that Opaque Response Blocking (ORB) algorithm
+    would have taken to decide whether to block the response or not. The logged
+    value is based on heuristics that only look at the HTTP response headers,
+    and attempt to approximate if the full ORB algorithm would need to parse the
+    response body as Javascript (vs also reaching a decision purely based on the
+    HTTP response headers).
+
+    Note that only partial ORB algorithm is used for logging the UMA (e.g. no
+    multimedia sniffing and/or 206-response processing is done). This means that
+    the results overestimate how many responses need Javascript parsing.
+
+    Logged for each final HTTP/HTTPS response processed by the NetworkService.
+  </summary>
+</histogram>
+
+<histogram name="SiteIsolation.ORB.ResponseHeadersHeuristic.{OrbDecision}"
+    enum="RequestDestination" expires_after="M92">
+  <owner>creis@chromium.org</owner>
+  <owner>lukasza@chromium.org</owner>
+  <summary>
+    The request destination (e.g. script vs image) of a response that Opaque
+    Response Blocking (ORB) algorithm processed {OrbDecision}.
+
+    Note that only partial ORB algorithm is used for logging the UMA (e.g. no
+    multimedia sniffing and/or 206-response processing is done). This means that
+    the results overestimate how many responses need Javascript parsing.
+
+    Logged for each final HTTP/HTTPS response processed by the NetworkService.
+  </summary>
+  <token key="OrbDecision">
+    <variant name="ProcessedBasedOnHeaders"
+        summary="based on HTTP response headers"/>
+    <variant name="RequiresJavascriptParsing"
+        summary="with required Javascript parsing"/>
+  </token>
+</histogram>
+
 <histogram name="SiteIsolation.OutOfProcessIframes" units="units"
     expires_after="2021-09-30">
   <owner>alexmos@chromium.org</owner>
@@ -13811,6 +14420,20 @@ should be kept until we remove incident reporting. -->
   </summary>
 </histogram>
 
+<histogram
+    name="SiteIsolation.ReusePendingOrCommittedSite.TimeSinceReusableProcessDestroyed"
+    units="ms" expires_after="2021-07-01">
+  <owner>jessemckenna@google.com</owner>
+  <owner>olivierli@chromium.org</owner>
+  <summary>
+    Recorded on navigations with a ProcessReusePolicy of
+    REUSE_PENDING_OR_COMMITTED_SITE (mostly subframe navigations). Measures the
+    time since a RenderProcessHost hosting the destination URL was last
+    destroyed, up to 10 seconds. If no host matching the destination was
+    recently destroyed, a sentinel value of 20 seconds is used.
+  </summary>
+</histogram>
+
 <histogram name="SiteIsolation.SavedUserTriggeredIsolatedOrigins.Size"
     units="origins" expires_after="2021-09-30">
   <owner>alexmos@chromium.org</owner>
@@ -13901,7 +14524,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="Skia.SubmitRenderPasses" units="renderpasses"
-    expires_after="2021-04-29">
+    expires_after="2021-07-04">
   <owner>egdaniel@google.com</owner>
   <owner>bsalomon@google.com</owner>
   <summary>
@@ -13914,7 +14537,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="Skia.VulkanMemoryAllocator.AmountAllocated" units="KB"
-    expires_after="2021-04-29">
+    expires_after="2021-07-04">
   <owner>egdaniel@google.com</owner>
   <owner>bsalomon@google.com</owner>
   <summary>
@@ -13959,13 +14582,17 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="Spellcheck.Android.Available" enum="BooleanAvailable"
-    expires_after="M77">
+    expires_after="2021-08-09">
   <owner>timvolodine@chromium.org</owner>
+  <owner>chrome-language@google.com</owner>
   <summary>
     Whether the Android spellchecking service was available at the start of a
     new spellchecking session. Note that the user can disable the Android
     spellchecking service in settings, in which case it will show up as not
     available in the histogram.
+
+    Warning: for chrome versions 78-88 this histogram was listed as expired, so
+    for that period the data might be missing or incomplete.
   </summary>
 </histogram>
 
@@ -13981,19 +14608,25 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SpellCheck.MisspellRatio" units="%" expires_after="M90">
+  <obsolete>
+    Removed 2021/01: the relevant code path isn't used anymore.
+  </obsolete>
   <owner>gujen@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>The percentage of misspelled words within checked words.</summary>
 </histogram>
 
 <histogram name="SpellCheck.ReplaceRatio" units="%" expires_after="M90">
+  <obsolete>
+    Removed 2021/01: the relevant code path isn't used anymore.
+  </obsolete>
   <owner>gujen@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>The percentage of replaced words within misspelled words.</summary>
 </histogram>
 
 <histogram name="SpellCheck.SpellingService.Enabled" enum="BooleanEnabled"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>groby@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -14004,7 +14637,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SpellCheck.SpellingService.RequestDuration" units="ms"
-    expires_after="2021-01-31">
+    expires_after="2021-07-11">
   <owner>yyushkina@google.com</owner>
   <owner>gujen@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -14016,7 +14649,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SpellCheck.SpellingService.RequestHttpResponseCode"
-    enum="HttpResponseCode" expires_after="2021-04-11">
+    enum="HttpResponseCode" expires_after="2021-07-04">
   <owner>yyushkina@google.com</owner>
   <owner>gujen@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -14024,7 +14657,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SpellCheck.SpellingService.RequestResultType"
-    enum="ServiceRequestResultType" expires_after="2021-04-04">
+    enum="ServiceRequestResultType" expires_after="2021-07-04">
   <owner>yyushkina@google.com</owner>
   <owner>gujen@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -14035,7 +14668,8 @@ should be kept until we remove incident reporting. -->
   </summary>
 </histogram>
 
-<histogram name="SpellCheck.SuggestionHitRatio" units="%" expires_after="M90">
+<histogram name="SpellCheck.SuggestionHitRatio" units="%"
+    expires_after="2021-08-22">
   <owner>gujen@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -14044,7 +14678,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram base="true" name="Spellcheck.Windows.ChromeLocalesSupport"
-    units="locales" expires_after="2021-05-02">
+    units="locales" expires_after="2021-07-27">
   <owner>gujen@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -14064,7 +14698,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram base="true" name="Spellcheck.Windows.SpellcheckLocalesSupport"
-    units="locales" expires_after="2021-05-02">
+    units="locales" expires_after="2021-07-27">
   <owner>gujen@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -14080,7 +14714,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram base="true" name="Spellcheck.Windows.SpellcheckRequestDuration"
-    units="ms" expires_after="2021-05-02">
+    units="ms" expires_after="2021-07-27">
   <owner>gujen@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -14094,7 +14728,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram base="true" name="Spellcheck.Windows.SuggestionGatheringDuration"
-    units="ms" expires_after="2021-05-02">
+    units="ms" expires_after="2021-07-27">
   <owner>gujen@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -14297,7 +14931,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SSL.MixedContentShown" enum="MixedContentType"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>carlosil@chromium.org</owner>
   <summary>Tracks when mixed content is displayed or run.</summary>
 </histogram>
@@ -14317,8 +14951,9 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SSORecallPromo.AccountsAvailable" units="units"
-    expires_after="2020-11-30">
+    expires_after="2021-04-20">
   <owner>msarda@chromium.org</owner>
+  <owner>chrome-signin-team@google.com</owner>
   <summary>
     Number of accounts available for Single Sign On with the current device,
     recorded at the time the SSO Promo is shown.
@@ -14326,16 +14961,18 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SSORecallPromo.PromoAction" enum="SSOPromoUserAction"
-    expires_after="2020-11-30">
+    expires_after="2021-04-20">
   <owner>msarda@chromium.org</owner>
+  <owner>chrome-signin-team@google.com</owner>
   <summary>
     Action the user takes when the Single Sign On promotion is shown.
   </summary>
 </histogram>
 
 <histogram name="SSORecallPromo.PromoSeenCount" units="units"
-    expires_after="2020-11-30">
+    expires_after="2021-04-20">
   <owner>msarda@chromium.org</owner>
+  <owner>chrome-signin-team@google.com</owner>
   <summary>
     Number of times the promotion has been seen on the current device.
   </summary>
@@ -14352,7 +14989,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="Style.InvalidationTime" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>futhark@chromium.org</owner>
   <summary>
     Microseconds spent in StyleEngine::InvalidateStyle. Only samples from high
@@ -14361,7 +14998,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="Style.RebuildLayoutTreeTime" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>futhark@chromium.org</owner>
   <summary>
     Microseconds spent in RebuildLayoutTree called from Document::UpdateStyle.
@@ -14369,13 +15006,51 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="Style.RecalcTime" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>futhark@chromium.org</owner>
   <summary>
     Microseconds spent in RecalcStyle called from Document::UpdateStyle.
   </summary>
 </histogram>
 
+<histogram name="SubresourceWebBundles.ContentLength" units="bytes"
+    expires_after="M94">
+  <owner>horo@chromium.org</owner>
+  <owner>webpackage-dev@chromium.org</owner>
+  <summary>
+    The value of content length header of a subresource web bundle, or zero if
+    the content-length header is missing.
+  </summary>
+</histogram>
+
+<histogram name="SubresourceWebBundles.LoadResult"
+    enum="SubresourceWebBundleLoadResult" expires_after="M94">
+  <owner>horo@chromium.org</owner>
+  <owner>webpackage-dev@chromium.org</owner>
+  <summary>The result of loading subresource web bundles.</summary>
+</histogram>
+
+<histogram name="SubresourceWebBundles.MaxMemoryUsagePerProcess" units="bytes"
+    expires_after="M94">
+  <owner>horo@chromium.org</owner>
+  <owner>webpackage-dev@chromium.org</owner>
+  <summary>
+    The max memory usage per renderer process for subresource web bundles which
+    are kept in the network process's memory. Recorded when all the subresource
+    web bundles for the renderer process are released.
+  </summary>
+</histogram>
+
+<histogram name="SubresourceWebBundles.ReceivedSize" units="bytes"
+    expires_after="M94">
+  <owner>horo@chromium.org</owner>
+  <owner>webpackage-dev@chromium.org</owner>
+  <summary>
+    The received data size of a subresource web bundle. Recorded when received
+    all the body of the subresource web bundle.
+  </summary>
+</histogram>
+
 <histogram name="Suggestions.FailedRequestErrorCode" enum="NetErrorCodes"
     expires_after="2020-02-23">
   <owner>mathp@chromium.org</owner>
@@ -14425,7 +15100,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SupervisedUsers.ExtensionEnablement"
-    enum="SupervisedUserExtensionEnablement" expires_after="2021-05-13">
+    enum="SupervisedUserExtensionEnablement" expires_after="2021-07-18">
   <owner>tobyhuang@chromium.org</owner>
   <owner>agawronska@chromium.org</owner>
   <owner>danan@chromium.org</owner>
@@ -14442,7 +15117,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SupervisedUsers.ExtensionInstallDialog"
-    enum="SupervisedUserExtensionInstallDialog" expires_after="2021-05-02">
+    enum="SupervisedUserExtensionInstallDialog" expires_after="2021-07-04">
   <owner>tobyhuang@chromium.org</owner>
   <owner>agawronska@chromium.org</owner>
   <owner>danan@chromium.org</owner>
@@ -14458,7 +15133,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SupervisedUsers.ExtensionInstallDialog.AskedParentUserTime"
-    units="ms" expires_after="2021-05-02">
+    units="ms" expires_after="2021-07-04">
   <owner>tobyhuang@chromium.org</owner>
   <owner>agawronska@chromium.org</owner>
   <owner>danan@chromium.org</owner>
@@ -14470,7 +15145,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SupervisedUsers.ExtensionInstallDialog.ChildCanceledUserTime"
-    units="ms" expires_after="2021-05-02">
+    units="ms" expires_after="2021-07-04">
   <owner>tobyhuang@chromium.org</owner>
   <owner>agawronska@chromium.org</owner>
   <owner>danan@chromium.org</owner>
@@ -14519,7 +15194,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SupervisedUsers.ParentPermissionDialog"
-    enum="SupervisedUserParentPermissionDialog" expires_after="2021-05-02">
+    enum="SupervisedUserParentPermissionDialog" expires_after="2021-07-04">
   <owner>tobyhuang@chromium.org</owner>
   <owner>agawronska@chromium.org</owner>
   <owner>danan@chromium.org</owner>
@@ -14562,7 +15237,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SupervisedUsers.ParentPermissionDialog.ParentCanceledUserTime"
-    units="ms" expires_after="2021-05-02">
+    units="ms" expires_after="2021-08-01">
   <owner>tobyhuang@chromium.org</owner>
   <owner>agawronska@chromium.org</owner>
   <owner>danan@chromium.org</owner>
@@ -14574,7 +15249,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SupervisedUsers.PerAppTimeLimits.AppsWithTimeLimit"
-    units="Apps" expires_after="2021-03-15">
+    units="Apps" expires_after="2021-07-18">
   <owner>agawronska@chromium.org</owner>
   <owner>yilkal@chromium.org</owner>
   <owner>cros-families@google.com</owner>
@@ -14585,7 +15260,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SupervisedUsers.PerAppTimeLimits.BlockedAppsCount"
-    units="Apps" expires_after="2021-03-15">
+    units="Apps" expires_after="2021-07-11">
   <owner>agawronska@chromium.org</owner>
   <owner>yilkal@chromium.org</owner>
   <owner>cros-families@google.com</owner>
@@ -14596,7 +15271,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SupervisedUsers.PerAppTimeLimits.Engagement" units="Apps"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>agawronska@chromium.org</owner>
   <owner>yilkal@chromium.org</owner>
   <owner>cros-families@google.com</owner>
@@ -14608,7 +15283,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="SupervisedUsers.PerAppTimeLimits.PolicyChangeCount"
-    units="Changes" expires_after="2021-03-15">
+    units="Changes" expires_after="2021-07-18">
   <owner>agawronska@chromium.org</owner>
   <owner>yilkal@chromium.org</owner>
   <owner>cros-families@google.com</owner>
@@ -14638,6 +15313,24 @@ should be kept until we remove incident reporting. -->
   </summary>
 </histogram>
 
+<histogram name="Supervision.ParentAccessCode.ValidationResult.{Action}"
+    enum="ParentAccessCodeValidationResult" expires_after="2022-03-17">
+  <owner>agawronska@chromium.org</owner>
+  <owner>cros-families-eng@google.com</owner>
+  <summary>
+    The result of the parent access code validation for {Action} action. Logged
+    every time the code is validated from the parent access dialog.
+  </summary>
+  <token key="Action">
+    <variant name="AddUser"/>
+    <variant name="All"/>
+    <variant name="ClockChange"/>
+    <variant name="Reauth"/>
+    <variant name="TimeLimits"/>
+    <variant name="TimezoneChange"/>
+  </token>
+</histogram>
+
 <histogram name="Supervision.StatusReport.Event"
     enum="SupervisionStatusReportEvent" expires_after="M85">
   <owner>escordeiro@google.com</owner>
@@ -14648,8 +15341,75 @@ should be kept until we remove incident reporting. -->
   </summary>
 </histogram>
 
+<histogram name="SyncFileSystem.ConflictResolutionPolicy"
+    enum="SyncFSConflictResolutionPolicy" expires_after="M85">
+  <owner>tzik@chromium.org</owner>
+  <summary>
+    Overridden conflict resolution policy of Sync FileSystem API. Recorded for
+    each API call to override the policy.
+  </summary>
+</histogram>
+
+<histogram name="SyncFileSystem.Database.Open" enum="LevelDBStatus"
+    expires_after="M77">
+  <owner>tzik@chromium.org</owner>
+  <summary>The result of opening the Sync FileSystem backend database.</summary>
+</histogram>
+
+<histogram name="SyncFileSystem.MetadataNumber" units="units"
+    expires_after="M85">
+  <owner>tzik@chromium.org</owner>
+  <summary>
+    The number of cached backing remote file metadata in the Sync FileSystem
+    database. Recorded at the initialization phase of Sync FileSystem.
+  </summary>
+</histogram>
+
+<histogram name="SyncFileSystem.RegisteredAppNumber" units="units"
+    expires_after="M85">
+  <owner>tzik@chromium.org</owner>
+  <summary>
+    The number of Chrome Apps that uses Sync FileSystem with V2 backend.
+    Recorded at the initialization phase of Sync FileSystem.
+  </summary>
+</histogram>
+
+<histogram name="SyncFileSystem.RegisterOriginResult"
+    enum="SyncFSRemoteServiceState" expires_after="2018-08-30">
+  <owner>tzik@chromium.org</owner>
+  <summary>
+    The result of the registration of Chrome App to Sync FileSystem.
+  </summary>
+</histogram>
+
+<histogram name="SyncFileSystem.RegisterOriginTime" units="ms"
+    expires_after="M77">
+  <owner>peria@chromium.org</owner>
+  <owner>tzik@chromium.org</owner>
+  <summary>
+    Time elapsed to register a Chrome App to SyncFilesystem. Recorded for each
+    registration request by apps.
+  </summary>
+</histogram>
+
+<histogram name="SyncFileSystem.TrackerDB.Open" enum="LevelDBStatus"
+    expires_after="2018-08-30">
+  <owner>tzik@chromium.org</owner>
+  <summary>The result of opening the Sync FileSystem tracker database.</summary>
+</histogram>
+
+<histogram name="SyncFileSystem.TrackerNumber" units="units"
+    expires_after="M85">
+  <owner>tzik@chromium.org</owner>
+  <summary>
+    The number of the directory tree node that maps backing files to local files
+    in the Sync FileSystem database. Recorded at the initialization phase of
+    SyncFileSystem.
+  </summary>
+</histogram>
+
 <histogram name="Tablet.AppDrag.EndWindowState"
-    enum="AppWindowDragEndWindowState" expires_after="2021-06-01">
+    enum="AppWindowDragEndWindowState" expires_after="2021-08-09">
   <owner>minch@chromium.org</owner>
   <owner>omrilio@chromium.org</owner>
   <summary>
@@ -14670,7 +15430,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="Tablet.AppWindowDrag.InSplitView.CountOfPerUserSession"
-    units="times" expires_after="2021-06-01">
+    units="times" expires_after="2021-08-01">
   <owner>minch@chromium.org</owner>
   <owner>omrilio@chromium.org</owner>
   <summary>
@@ -14691,7 +15451,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="Tablet.TabDrag.CountOfPerUserSession" units="times"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>minch@chromium.org</owner>
   <owner>omrilio@chromium.org</owner>
   <summary>
@@ -14702,7 +15462,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="Tablet.TabDrag.DragType" enum="TabDragType"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>minch@chromium.org</owner>
   <owner>omrilio@chromium.org</owner>
   <summary>
@@ -14712,7 +15472,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="Tablet.TabDrag.InSplitView.CountOfPerUserSession"
-    units="times" expires_after="2021-06-01">
+    units="times" expires_after="2021-08-01">
   <owner>minch@chromium.org</owner>
   <owner>omrilio@chromium.org</owner>
   <summary>
@@ -14723,7 +15483,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="Tablet.WindowDrag.DragEndEventType"
-    enum="WindowDragEndEventType" expires_after="2021-06-01">
+    enum="WindowDragEndEventType" expires_after="2021-08-01">
   <owner>minch@chromium.org</owner>
   <owner>omrilio@chromium.org</owner>
   <summary>
@@ -14764,7 +15524,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="TextFragmentAnchor.ElementIdFragmentFound" enum="Boolean"
-    expires_after="2021-03-07">
+    expires_after="2021-12-31">
   <owner>nburris@chromium.org</owner>
   <owner>bokan@chromium.org</owner>
   <summary>
@@ -14775,7 +15535,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="TextFragmentAnchor.LinkOpenSource"
-    enum="TextFragmentLinkOpenSource" expires_after="2021-05-09">
+    enum="TextFragmentLinkOpenSource" expires_after="2021-07-11">
   <owner>gayane@chromium.org</owner>
   <owner>chrome-shared-highlighting@google.com</owner>
   <summary>
@@ -14795,7 +15555,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="TextFragmentAnchor{TextFragmentSource}.AmbiguousMatch"
-    enum="Boolean" expires_after="2021-03-07">
+    enum="Boolean" expires_after="2021-12-31">
   <owner>nburris@chromium.org</owner>
   <owner>bokan@chromium.org</owner>
   <summary>
@@ -14808,7 +15568,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="TextFragmentAnchor{TextFragmentSource}.DidScrollIntoView"
-    enum="Boolean" expires_after="2021-05-09">
+    enum="Boolean" expires_after="2021-12-31">
   <owner>nburris@chromium.org</owner>
   <owner>bokan@chromium.org</owner>
   <summary>
@@ -14822,7 +15582,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="TextFragmentAnchor{TextFragmentSource}.DirectiveLength"
-    units="characters" expires_after="2021-05-09">
+    units="characters" expires_after="2021-12-31">
   <owner>nburris@chromium.org</owner>
   <owner>bokan@chromium.org</owner>
   <summary>
@@ -14837,7 +15597,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="TextFragmentAnchor{TextFragmentSource}.EndTextLength"
-    units="characters" expires_after="2021-03-07">
+    units="characters" expires_after="2021-12-31">
   <owner>nburris@chromium.org</owner>
   <owner>bokan@chromium.org</owner>
   <summary>
@@ -14851,7 +15611,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="TextFragmentAnchor{TextFragmentSource}.ExactTextLength"
-    units="characters" expires_after="2021-05-09">
+    units="characters" expires_after="2021-12-31">
   <owner>nburris@chromium.org</owner>
   <owner>bokan@chromium.org</owner>
   <summary>
@@ -14865,7 +15625,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="TextFragmentAnchor{TextFragmentSource}.ListItemMatch"
-    units="Boolean" expires_after="2021-03-07">
+    units="Boolean" expires_after="2021-12-31">
   <owner>nburris@chromium.org</owner>
   <owner>bokan@chromium.org</owner>
   <summary>
@@ -14879,7 +15639,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="TextFragmentAnchor{TextFragmentSource}.MatchRate" units="%"
-    expires_after="2021-05-09">
+    expires_after="2021-12-31">
   <owner>nburris@chromium.org</owner>
   <owner>bokan@chromium.org</owner>
   <summary>
@@ -14892,7 +15652,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="TextFragmentAnchor{TextFragmentSource}.Parameters"
-    enum="TextFragmentAnchorParameters" expires_after="2021-05-09">
+    enum="TextFragmentAnchorParameters" expires_after="2021-12-31">
   <owner>nburris@chromium.org</owner>
   <owner>bokan@chromium.org</owner>
   <summary>
@@ -14906,7 +15666,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="TextFragmentAnchor{TextFragmentSource}.RangeMatchLength"
-    units="characters" expires_after="2021-03-07">
+    units="characters" expires_after="2021-12-31">
   <owner>nburris@chromium.org</owner>
   <owner>bokan@chromium.org</owner>
   <summary>
@@ -14920,7 +15680,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="TextFragmentAnchor{TextFragmentSource}.ScrollCancelled"
-    enum="Boolean" expires_after="2021-03-07">
+    enum="Boolean" expires_after="2021-12-31">
   <owner>nburris@chromium.org</owner>
   <owner>bokan@chromium.org</owner>
   <summary>
@@ -14934,7 +15694,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="TextFragmentAnchor{TextFragmentSource}.SelectorCount"
-    units="selectors" expires_after="2021-05-09">
+    units="selectors" expires_after="2021-12-31">
   <owner>nburris@chromium.org</owner>
   <owner>bokan@chromium.org</owner>
   <summary>
@@ -14946,8 +15706,23 @@ should be kept until we remove incident reporting. -->
   <token key="TextFragmentSource" variants="TextFragmentSource"/>
 </histogram>
 
+<histogram name="TextFragmentAnchor{TextFragmentSource}.SpansMultipleBlocks"
+    units="Boolean" expires_after="2021-12-31">
+  <owner>bokan@chromium.org</owner>
+  <owner>input-dev@chromium.org</owner>
+  <summary>
+    Whether or not a range-based text fragment match crosses any block
+    boundaries. That is, the start and end of the range are in different blocks
+    or in the same block but contain an intervening block. Only recorded for
+    range-based (start,end) text fragments. Only recorded on successful match.
+
+    Recorded from text fragment links followed from {TextFragmentSource}.
+  </summary>
+  <token key="TextFragmentSource" variants="TextFragmentSource"/>
+</histogram>
+
 <histogram name="TextFragmentAnchor{TextFragmentSource}.StartTextLength"
-    units="characters" expires_after="2021-03-07">
+    units="characters" expires_after="2021-12-31">
   <owner>nburris@chromium.org</owner>
   <owner>bokan@chromium.org</owner>
   <summary>
@@ -14961,7 +15736,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="TextFragmentAnchor{TextFragmentSource}.TableCellMatch"
-    units="Boolean" expires_after="2021-03-07">
+    units="Boolean" expires_after="2021-12-31">
   <owner>nburris@chromium.org</owner>
   <owner>bokan@chromium.org</owner>
   <summary>
@@ -14975,7 +15750,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="TextFragmentAnchor{TextFragmentSource}.TimeToScrollIntoView"
-    units="ms" expires_after="2021-05-09">
+    units="ms" expires_after="2021-12-31">
   <owner>nburris@chromium.org</owner>
   <owner>bokan@chromium.org</owner>
   <summary>
@@ -14990,7 +15765,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="TextFragmentAnchor{TextFragmentSource}.TimeToScrollToTop"
-    units="ms" expires_after="2021-03-07">
+    units="ms" expires_after="2021-12-31">
   <owner>nburris@chromium.org</owner>
   <owner>bokan@chromium.org</owner>
   <summary>
@@ -15005,103 +15780,6 @@ should be kept until we remove incident reporting. -->
   <token key="TextFragmentSource" variants="TextFragmentSource"/>
 </histogram>
 
-<histogram name="TextToSpeech.Event" enum="TextToSpeechEvent"
-    expires_after="M89">
-  <owner>dmazzoni@chromium.org</owner>
-  <summary>
-    Events fired by the text-to-speech engine when speaking an utterance.
-  </summary>
-</histogram>
-
-<histogram name="TextToSpeech.Utterance.FromExtensionAPI"
-    enum="TextToSpeechFromExtensionAPI" expires_after="M89">
-  <owner>dmazzoni@chromium.org</owner>
-  <owner>katie@chromium.org</owner>
-  <summary>
-    Indicates if an utterance spoken via synthesized text-to-speech was
-    triggered by the Chrome TTS extension API or the web speech API.
-  </summary>
-</histogram>
-
-<histogram name="TextToSpeech.Utterance.HasGender" enum="TextToSpeechHasGender"
-    expires_after="M73">
-  <owner>dmazzoni@chromium.org</owner>
-  <summary>
-    True if an utterance spoken via synthesized text-to-speech requested a
-    specific gender.
-  </summary>
-</histogram>
-
-<histogram name="TextToSpeech.Utterance.HasLang" enum="TextToSpeechHasLang"
-    expires_after="M89">
-  <owner>dmazzoni@chromium.org</owner>
-  <owner>katie@chromium.org</owner>
-  <summary>
-    True if an utterance spoken via synthesized text-to-speech specified a
-    language code.
-  </summary>
-</histogram>
-
-<histogram name="TextToSpeech.Utterance.HasPitch" enum="TextToSpeechHasPitch"
-    expires_after="M89">
-  <owner>dmazzoni@chromium.org</owner>
-  <owner>katie@chromium.org</owner>
-  <summary>
-    True if an utterance spoken via synthesized text-to-speech requested a
-    specific pitch other than the default.
-  </summary>
-</histogram>
-
-<histogram name="TextToSpeech.Utterance.HasRate" enum="TextToSpeechHasRate"
-    expires_after="M89">
-  <owner>dmazzoni@chromium.org</owner>
-  <owner>katie@chromium.org</owner>
-  <summary>
-    True if an utterance spoken via synthesized text-to-speech requested a
-    specific speech rate other than the default.
-  </summary>
-</histogram>
-
-<histogram name="TextToSpeech.Utterance.HasVoiceName"
-    enum="TextToSpeechHasVoiceName" expires_after="M89">
-  <owner>dmazzoni@chromium.org</owner>
-  <owner>katie@chromium.org</owner>
-  <summary>
-    True if an utterance spoken via synthesized text-to-speech requested a
-    specific voice by name.
-  </summary>
-</histogram>
-
-<histogram name="TextToSpeech.Utterance.HasVolume" enum="TextToSpeechHasVolume"
-    expires_after="M89">
-  <owner>dmazzoni@chromium.org</owner>
-  <owner>katie@chromium.org</owner>
-  <summary>
-    True if an utterance spoken via synthesized text-to-speech requested a
-    specific volume other than the default.
-  </summary>
-</histogram>
-
-<histogram name="TextToSpeech.Utterance.Native" enum="TextToSpeechNative"
-    expires_after="M89">
-  <owner>dmazzoni@chromium.org</owner>
-  <owner>katie@chromium.org</owner>
-  <summary>
-    True if an utterance is spoken with native speech provided by the operating
-    system, otherwise it's spoken via a Chrome extension that implements
-    text-to-speech support.
-  </summary>
-</histogram>
-
-<histogram name="TextToSpeech.Utterance.TextLength" units="bytes"
-    expires_after="M89">
-  <owner>dmazzoni@chromium.org</owner>
-  <owner>katie@chromium.org</owner>
-  <summary>
-    The length of an utterance to be spoken via synthesized text-to-speech.
-  </summary>
-</histogram>
-
 <histogram name="ThirdPartyModules.Certificates.Microsoft" units="certificates"
     expires_after="M85">
   <owner>chrisha@chromium.org</owner>
@@ -15305,7 +15983,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="ThreadWatcher.Unresponsive" units="ms"
-    expires_after="2021-05-11">
+    expires_after="2021-08-01">
   <owner>dschinazi@chromium.org</owner>
   <owner>src/net/OWNERS</owner>
   <summary>
@@ -15325,6 +16003,9 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="Thumbnails.CopyFromSurfaceTime" units="ms" expires_after="M90">
+  <obsolete>
+    Removed 01/2021.
+  </obsolete>
   <owner>dfried@chromium.org</owner>
   <owner>pbos@chromium.org</owner>
   <summary>
@@ -15356,6 +16037,9 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="Thumbnails.ProcessBitmapTime" units="ms" expires_after="M90">
+  <obsolete>
+    Removed 01/2021.
+  </obsolete>
   <owner>dfried@chromium.org</owner>
   <owner>pbos@chromium.org</owner>
   <summary>
@@ -15365,7 +16049,7 @@ should be kept until we remove incident reporting. -->
 </histogram>
 
 <histogram name="TileManager.ExceededMemoryBudget" enum="TileMemoryBudget"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>pdr@chromium.org</owner>
   <owner>vmpstr@chromium.org</owner>
   <summary>
@@ -15440,6 +16124,25 @@ should be kept until we use this API.  -->
   <summary>Number of retries until the final response was recorded.</summary>
 </histogram>
 
+<histogram name="Toolbar.ChromeLabs.{State}LabAction"
+    enum="ChromeLabsSelectedLab" expires_after="M96">
+  <owner>elainechien@chromium.org</owner>
+  <owner>robliao@chromium.org</owner>
+  <summary>
+    Chrome Labs features user-facing experiments through a button in the
+    toolbar.
+
+    This metric tracks which experiment (also called lab in the context of
+    Chrome Labs) a user selects {State} for. This histogram is emitted to when
+    {State} is selected in the combobox of the ChromeLabs dialog.
+  </summary>
+  <token key="State">
+    <variant name="Default" summary="Default state selected for lab"/>
+    <variant name="Disable" summary="Disabled state selected for lab"/>
+    <variant name="Enable" summary="Enabled state selected for lab"/>
+  </token>
+</histogram>
+
 <histogram name="Toolbar.Menu.NewIncognitoTabPresentationDuration" units="ms"
     expires_after="M85">
   <owner>peterlaurens@chromium.org</owner>
@@ -15482,8 +16185,9 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="TouchBar.Default.Metrics" enum="DefaultTouchBarActions"
-    expires_after="M85">
-  <owner>spqchan@chromium.org</owner>
+    expires_after="2021-08-22">
+  <owner>ellyjones@chromium.org</owner>
+  <owner>chrome-mac-dev@google.com</owner>
   <summary>Tracks the usage of the default touch bar buttons.</summary>
 </histogram>
 
@@ -15491,14 +16195,19 @@ should be kept until we use this API.  -->
     expires_after="M87">
   <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@chromium.org</owner>
-  <summary>Tracks touchpad acceleration setting changes by the user.</summary>
+  <summary>
+    Tracks touchpad acceleration setting changes by the user. Only reported on
+    Chrome OS.
+  </summary>
 </histogram>
 
 <histogram name="Touchpad.Acceleration.Started" enum="BooleanEnabled"
     expires_after="M87">
   <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@chromium.org</owner>
-  <summary>Tracks touchpad acceleration setting on startup.</summary>
+  <summary>
+    Tracks touchpad acceleration setting on startup. Only reported on Chrome OS.
+  </summary>
 </histogram>
 
 <histogram name="Touchpad.Device" enum="TouchpadDeviceState"
@@ -15511,14 +16220,20 @@ should be kept until we use this API.  -->
     expires_after="2021-07-15">
   <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
-  <summary>Tracks touchpad natural scroll setting changes by the user.</summary>
+  <summary>
+    Tracks touchpad natural scroll setting changes by the user. Only reported on
+    Chrome OS.
+  </summary>
 </histogram>
 
 <histogram name="Touchpad.NaturalScroll.Started" enum="BooleanEnabled"
     expires_after="2021-07-15">
   <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
-  <summary>Tracks touchpad natural scroll setting on startup.</summary>
+  <summary>
+    Tracks touchpad natural scroll setting on startup. Only reported on Chrome
+    OS.
+  </summary>
 </histogram>
 
 <histogram name="Touchpad.PointerSensitivity.Changed" enum="PointerSensitivity"
@@ -15527,7 +16242,7 @@ should be kept until we use this API.  -->
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Tracks touchpad sensitivity setting changes by the user. This replaces the
-    old Touchpad.Sensitivity.Changed metric.
+    old Touchpad.Sensitivity.Changed metric. Only reported on Chrome OS.
   </summary>
 </histogram>
 
@@ -15537,7 +16252,7 @@ should be kept until we use this API.  -->
   <owner>cros-peripherals@google.com</owner>
   <summary>
     Tracks touchpad sensitivity setting on startup. This replaces the old
-    Touchpad.Sensitivity.Started metric.
+    Touchpad.Sensitivity.Started metric. Only reported on Chrome OS.
   </summary>
 </histogram>
 
@@ -15547,7 +16262,9 @@ should be kept until we use this API.  -->
 
   <owner>khorimoto@chromium.org</owner>
   <owner>zentaro@chromium.org</owner>
-  <summary>Whether touchpad scroll acceleration is enabled.</summary>
+  <summary>
+    Whether touchpad scroll acceleration is enabled. Only reported on Chrome OS.
+  </summary>
 </histogram>
 
 <histogram base="true" name="Touchpad.ScrollSensitivity"
@@ -15556,44 +16273,59 @@ should be kept until we use this API.  -->
 
   <owner>khorimoto@chromium.org</owner>
   <owner>zentaro@chromium.org</owner>
-  <summary>Touchpad scroll sensitivity value.</summary>
+  <summary>
+    Touchpad scroll sensitivity value. Only reported on Chrome OS.
+  </summary>
 </histogram>
 
 <histogram name="Touchpad.TapDragging.Changed" enum="BooleanEnabled"
     expires_after="2021-07-15">
   <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
-  <summary>Tracks touchpad TapDragging setting changes by the user.</summary>
+  <summary>
+    Tracks touchpad TapDragging setting changes by the user. Only reported on
+    Chrome OS.
+  </summary>
 </histogram>
 
 <histogram name="Touchpad.TapDragging.Started" enum="BooleanEnabled"
     expires_after="2021-07-15">
   <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
-  <summary>Tracks touchpad TapDragging setting on startup.</summary>
+  <summary>
+    Tracks touchpad TapDragging setting on startup. Only reported on Chrome OS.
+  </summary>
 </histogram>
 
 <histogram name="Touchpad.TapToClick.Changed" enum="BooleanEnabled"
     expires_after="2021-07-15">
   <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
-  <summary>Tracks touchpad TapToClick setting changes by the user.</summary>
+  <summary>
+    Tracks touchpad TapToClick setting changes by the user. Only reported on
+    Chrome OS.
+  </summary>
 </histogram>
 
 <histogram name="Touchpad.TapToClick.Started" enum="BooleanEnabled"
     expires_after="2021-07-15">
   <owner>zentaro@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
-  <summary>Tracks touchpad TapToClick setting changes by the user.</summary>
+  <summary>
+    Tracks touchpad TapToClick setting changes by the user. Only reported on
+    Chrome OS.
+  </summary>
 </histogram>
 
 <histogram name="TouchScreen.MissedTOUCHEVENTF_UP" enum="BooleanHit"
-    expires_after="M77">
-  <owner>nzolghadr@chromium.org</owner>
+    expires_after="M95">
+  <owner>girard@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
-    The touch device driver failed to send a TOUCHEVENTF_UP, and chromium
-    generated a simulated event to maintain consistency/correctness.
+    Recorded when a touch event excludes an active touch (a touch-id/dwId that
+    previously generated a TOUCHEVENTF_DOWN, and has not since generated a
+    TOUCHEVENTF_UP). Chromium generates a simulated event to maintain
+    consistency/correctness. Only recorded on Windows.
 
     This workaround will be removed once usage drops off. See
     https://crbug.com/811273 for details.
@@ -15602,7 +16334,7 @@ should be kept until we use this API.  -->
 
 <histogram name="Touchscreen.TouchEventsEnabled"
     enum="TouchEventFeatureDetectionState" expires_after="M77">
-  <owner>tdresser@chromium.org</owner>
+  <owner>flackr@chromium.org</owner>
   <summary>
     Tracks whether Touch Event Feature Detection is enabled. This is based on
     the touch events enabled flag and the presence of a touchscreen.
@@ -15618,8 +16350,11 @@ should be kept until we use this API.  -->
   </details>
 </histogram>
 
-<histogram name="TPM.EarlyResetDuringCommand" units="count" expires_after="M85">
-  <owner>semenzato@google.com</owner>
+<histogram name="TPM.EarlyResetDuringCommand" units="count"
+    expires_after="2021-12-21">
+  <owner>apronin@chromium.org</owner>
+  <owner>mnissler@chromium.org</owner>
+  <owner>cros-hwsec+uma@chromium.org</owner>
   <summary>
     Reported at boot if the previous boot session was interrupted in the middle
     of a TPM command during the first 30 seconds of uptime.
@@ -15627,7 +16362,7 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="Tracing.Background.FinalizationDisallowedReason"
-    enum="TracingFinalizationDisallowedReason" expires_after="2021-04-04">
+    enum="TracingFinalizationDisallowedReason" expires_after="2021-08-09">
   <owner>ssid@chromium.org</owner>
   <summary>
     Reason why background tracing finalization was not allowed. Also see
@@ -15637,7 +16372,7 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="Tracing.Background.FinalizingTraceSizeInKB" units="KB"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>oysteine@chromium.org</owner>
   <summary>
     The size, in kilobytes, of a finalized trace ready to be uploaded.
@@ -15663,7 +16398,7 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="Tracing.Background.ScenarioState"
-    enum="BackgroundTracingState" expires_after="2021-04-11">
+    enum="BackgroundTracingState" expires_after="2021-08-15">
   <owner>oysteine@chromium.org</owner>
   <summary>
     Records state of the Background Tracing system, from when scenarios are
@@ -15723,7 +16458,7 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="TrustedWebActivity.LocationDelegationEnrolled" enum="Boolean"
-    expires_after="2021-05-09">
+    expires_after="2021-06-30">
   <owner>eirage@chromium.org</owner>
   <owner>peconn@chromium.org</owner>
   <summary>
@@ -15734,7 +16469,7 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="TrustedWebActivity.LocationPermissionChanged"
-    enum="TrustedWebActivityPermissionChanged" expires_after="2020-12-31">
+    enum="TrustedWebActivityPermissionChanged" expires_after="2021-06-30">
   <owner>eirage@chromium.org</owner>
   <owner>peconn@chromium.org</owner>
   <summary>
@@ -15744,7 +16479,7 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="TrustedWebActivity.LocationPermissionRequestIsGranted"
-    enum="Boolean" expires_after="2020-12-31">
+    enum="Boolean" expires_after="2021-06-30">
   <owner>eirage@chromium.org</owner>
   <owner>peconn@chromium.org</owner>
   <summary>
@@ -15754,7 +16489,7 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="TrustedWebActivity.LocationUpdateErrorCode"
-    enum="TrustedWebActivityLocationErrorCode" expires_after="2020-12-31">
+    enum="TrustedWebActivityLocationErrorCode" expires_after="2021-06-30">
   <owner>eirage@chromium.org</owner>
   <owner>peconn@chromium.org</owner>
   <summary>
@@ -15767,7 +16502,7 @@ should be kept until we use this API.  -->
 
 <histogram name="TrustedWebActivity.QualityEnforcementViolation"
     enum="TrustedWebActivityQualityEnforcementViolationType"
-    expires_after="2021-05-09">
+    expires_after="2021-12-31">
   <owner>eirage@chromium.org</owner>
   <owner>peconn@chromium.org</owner>
   <summary>
@@ -15778,7 +16513,7 @@ should be kept until we use this API.  -->
 
 <histogram name="TrustedWebActivity.QualityEnforcementViolation.Crashed"
     enum="TrustedWebActivityQualityEnforcementViolationType"
-    expires_after="2021-03-07">
+    expires_after="2021-12-31">
   <owner>eirage@chromium.org</owner>
   <owner>peconn@chromium.org</owner>
   <summary>
@@ -15798,7 +16533,7 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="TrustedWebActivity.SplashScreenShown" enum="Boolean"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>peconn@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -15827,7 +16562,7 @@ should be kept until we use this API.  -->
   </summary>
 </histogram>
 
-<histogram name="UI.DeviceScale" units="%" expires_after="2021-05-02">
+<histogram name="UI.DeviceScale" units="%" expires_after="2021-07-27">
   <owner>bsep@chromium.org</owner>
   <summary>
     The device scales available on the system at startup. A system may report
@@ -15911,6 +16646,9 @@ should be kept until we use this API.  -->
 
 <histogram name="UpgradeDetector.PollType" enum="InstalledVersionPollType"
     expires_after="M89">
+  <obsolete>
+    Removed in M90.
+  </obsolete>
   <owner>grt@chromium.org</owner>
   <owner>ydago@chromium.org</owner>
   <summary>
@@ -15921,7 +16659,7 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="UpgradeDetector.RollbackReason"
-    enum="UpgradeDetectorRollbackReason" expires_after="2021-04-18">
+    enum="UpgradeDetectorRollbackReason" expires_after="2021-08-22">
   <owner>mpolzer@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -16005,7 +16743,7 @@ should be kept until we use this API.  -->
 </histogram>
 
 <histogram name="UsageStats.Events" enum="UsageStatsEvents"
-    expires_after="2021-05-02">
+    expires_after="2021-07-11">
   <owner>pnoland@chromium.org</owner>
   <owner>fgorski@chromium.org</owner>
   <summary>
@@ -16028,20 +16766,8 @@ should be kept until we use this API.  -->
   <summary>The time it took to download user's profile picture.</summary>
 </histogram>
 
-<histogram name="UserInterfaceStyle.CurrentlyUsed" enum="IOSUserInterfaceStyle"
-    expires_after="2021-01-15">
-  <owner>javierrobles@chromium.org</owner>
-  <owner>rkgibson@google.com</owner>
-  <owner>bling-team@google.com</owner>
-  <summary>
-    [iOS] Used on iOS 13+ to report the usage of Light and Dark mode. This is
-    logged at startup and on each user interface style change. Can be caused by
-    the system automatic switch or by the user manually changing the style.
-  </summary>
-</histogram>
-
 <histogram name="UserManager.LoginUserType" enum="UserType"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>achuith@chromium.org</owner>
   <summary>
     The number of users of different types that log in to the system (Chrome
@@ -16089,6 +16815,9 @@ regressions. -->
 
 <histogram name="UserSessionManager.RestoreOnCrash.AccountIdValid"
     enum="BooleanValid" expires_after="2021-02-16">
+  <obsolete>
+    Removed 01/2021.
+  </obsolete>
   <owner>rsorokin@chromium.org</owner>
   <owner>cros-oac@google.com</owner>
   <summary>
@@ -16150,7 +16879,7 @@ regressions. -->
 </histogram>
 
 <histogram name="Viewport.DidScalePage" enum="BooleanDidScalePage"
-    expires_after="M90">
+    expires_after="M97">
   <owner>bokan@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
@@ -16162,7 +16891,7 @@ regressions. -->
 </histogram>
 
 <histogram name="Viewport.MaxPageScale" enum="PageScaleFactorRange"
-    expires_after="M90">
+    expires_after="M97">
   <owner>bokan@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
@@ -16176,11 +16905,12 @@ regressions. -->
 </histogram>
 
 <histogram name="Viewport.MetaTagType" enum="MetaTagTypeEnum"
-    expires_after="M95">
+    expires_after="M97">
   <owner>bokan@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     The viewport meta tag type seen on each page load. Only recorded on Android.
+    Recorded when the page finishes loading.
   </summary>
 </histogram>
 
@@ -16241,6 +16971,27 @@ regressions. -->
   </summary>
 </histogram>
 
+<histogram name="Viz.DisplayCompositor.OverlayNumProposedCandidates"
+    units="units" expires_after="2021-07-01">
+  <owner>petermcneeley@chromium.org</owner>
+  <owner>dcastagna@chromium.org</owner>
+  <summary>
+    A count of the number of proposed overlay candidates available for overlay
+    selection. Recorded every time a frame is rendered by the display
+    compositor.
+  </summary>
+</histogram>
+
+<histogram name="Viz.DisplayCompositor.OverlayQuadMaterial"
+    enum="OverlayQuadMaterial" expires_after="2021-07-01">
+  <owner>petermcneeley@chromium.org</owner>
+  <owner>dcastagna@chromium.org</owner>
+  <summary>
+    Quad material for current promoted overlay, per frame. Recorded every time a
+    frame is rendered by the display compositor.
+  </summary>
+</histogram>
+
 <histogram name="Viz.DisplayCompositor.OverlayStrategy"
     enum="OverlayStrategies" expires_after="2021-07-01">
   <owner>dcastagna@chromium.org</owner>
@@ -16251,8 +17002,18 @@ regressions. -->
   </summary>
 </histogram>
 
+<histogram name="Viz.DisplayCompositor.OverlaySwitchInterval" units="ms"
+    expires_after="2021-07-01">
+  <owner>petermcneeley@chromium.org</owner>
+  <owner>dcastagna@chromium.org</owner>
+  <summary>
+    The time, in milliseconds, since the change in overlay selection. Recorded
+    every time a frame is rendered by the display compositor.
+  </summary>
+</histogram>
+
 <histogram name="Viz.DisplayCompositor.RootDamageRect.Overlay"
-    enum="BooleanOverlayDamageRect" expires_after="2021-03-15">
+    enum="BooleanOverlayDamageRect" expires_after="2021-12-01">
   <owner>magchen@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -16261,7 +17022,7 @@ regressions. -->
 </histogram>
 
 <histogram name="Viz.DisplayCompositor.RootDamageRect.Underlay"
-    enum="UnderlayDamageRect" expires_after="2020-12-31">
+    enum="UnderlayDamageRect" expires_after="2021-12-01">
   <owner>magchen@chromium.org</owner>
   <owner>zmo@chromium.org</owner>
   <summary>
@@ -16292,7 +17053,7 @@ regressions. -->
 </histogram>
 
 <histogram name="Viz.FrameSinkVideoCapturer.RGBA.CaptureDuration" units="ms"
-    expires_after="2021-03-07">
+    expires_after="2021-07-18">
   <owner>samans@chromium.org</owner>
   <owner>sadrul@chromium.org</owner>
   <owner>viz-team-wat@google.com</owner>
@@ -16314,8 +17075,8 @@ regressions. -->
 </histogram>
 
 <histogram name="VoiceInteraction.AssistantActionPerformed{Source}"
-    enum="AssistantActionPerformed" expires_after="2021-04-04">
-  <owner>jds@chromium.org</owner>
+    enum="AssistantActionPerformed" expires_after="2021-08-22">
+  <owner>jds@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
     Android: The action performed by Assistant upon being invoked during a voice
@@ -16334,33 +17095,86 @@ regressions. -->
   </token>
 </histogram>
 
+<histogram name="VoiceInteraction.AssistantIntent.TranslateExtrasAttached"
+    enum="BooleanSuccess" expires_after="2021-06-04">
+  <owner>jds@google.com</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    Android: Whether Translate extras were successfully attached to an Assistant
+    intent. This is recorded just before the intent is sent to Assistant, and is
+    only recorded if the Translate extras are enabled.
+  </summary>
+</histogram>
+
 <histogram name="VoiceInteraction.DismissedEventSource"
-    enum="VoiceInteractionEventSource" expires_after="2021-03-28">
+    enum="VoiceInteractionEventSource" expires_after="2021-08-22">
   <owner>wylieb@chromium.org</owner>
   <owner>tedchoc@chromium.org</owner>
   <owner>yusufo@chromium.org</owner>
   <summary>
     Android: The source of a dismissed voice search, such as omnibox or NTP.
+    This is recorded after the dismissed intent returns to Chrome.
+  </summary>
+</histogram>
+
+<histogram name="VoiceInteraction.DismissedEventTarget"
+    enum="VoiceIntentTarget" expires_after="2021-08-22">
+  <owner>wylieb@chromium.org</owner>
+  <owner>tedchoc@chromium.org</owner>
+  <owner>yusufo@chromium.org</owner>
+  <summary>
+    Android: The target of a dismissed voice search, such as the system
+    transcription dialog or Assistant. This is recorded after the dismissed
+    intent returns to Chrome.
   </summary>
 </histogram>
 
 <histogram name="VoiceInteraction.FailureEventSource"
-    enum="VoiceInteractionEventSource" expires_after="2021-04-04">
+    enum="VoiceInteractionEventSource" expires_after="2021-08-22">
+  <owner>wylieb@chromium.org</owner>
+  <owner>tedchoc@chromium.org</owner>
+  <owner>yusufo@chromium.org</owner>
+  <summary>
+    Android: The source of a failed voice search, such as omnibox or NTP. This
+    is recorded after any intent failure, which could occur before an intent is
+    sent (if the send fails) or after the intent returns unsuccessfully. It will
+    only be recorded once.
+  </summary>
+</histogram>
+
+<histogram name="VoiceInteraction.FailureEventTarget" enum="VoiceIntentTarget"
+    expires_after="2021-08-22">
   <owner>wylieb@chromium.org</owner>
   <owner>tedchoc@chromium.org</owner>
   <owner>yusufo@chromium.org</owner>
   <summary>
-    Android: The source of a failed voice search, such as omnibox or NTP.
+    Android: The target of a failed voice search, such as the system
+    transcription dialog or Assistant. This is recorded after any intent
+    failure, which could occur before an intent is sent (if the send fails) or
+    after the intent returns unsuccessfully. It will only be recorded once.
   </summary>
 </histogram>
 
 <histogram name="VoiceInteraction.FinishEventSource"
-    enum="VoiceInteractionEventSource" expires_after="2021-03-28">
+    enum="VoiceInteractionEventSource" expires_after="2021-08-22">
   <owner>wylieb@chromium.org</owner>
   <owner>tedchoc@chromium.org</owner>
   <owner>yusufo@chromium.org</owner>
   <summary>
     Android: The source of a successful voice search, such as omnibox or NTP.
+    This is recorded immediately after the successful intent returns to Chrome.
+  </summary>
+</histogram>
+
+<histogram name="VoiceInteraction.FinishEventTarget" enum="VoiceIntentTarget"
+    expires_after="2021-08-22">
+  <owner>wylieb@chromium.org</owner>
+  <owner>tedchoc@chromium.org</owner>
+  <owner>yusufo@chromium.org</owner>
+  <summary>
+    Android: The target of a successful voice search, such as the system
+    transcription dialog or Assistant. This is recorded immediately after the
+    successful intent returns to Chrome.
   </summary>
 </histogram>
 
@@ -16374,7 +17188,7 @@ regressions. -->
 </histogram>
 
 <histogram name="VoiceInteraction.QueryDuration.Android" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-22">
   <owner>wylieb@chromium.org</owner>
   <owner>tedchoc@chromium.org</owner>
   <summary>
@@ -16384,8 +17198,22 @@ regressions. -->
   </summary>
 </histogram>
 
+<histogram name="VoiceInteraction.QueryDuration.Android.Target.{Target}"
+    units="ms" expires_after="2021-08-22">
+  <owner>wylieb@chromium.org</owner>
+  <owner>tedchoc@chromium.org</owner>
+  <summary>
+    Records the time it takes between the user clicking the mic and chrome
+    receiving the transcribed voice query. This is recorded after an Assistant
+    intent has completed successfully. This histogram is limited to intents sent
+    to {Target}. See VoiceInteraction.QueryDuration.Android for the total count
+    across all targets.
+  </summary>
+  <token key="Target" variants="VoiceIntentTargetVariant"/>
+</histogram>
+
 <histogram name="VoiceInteraction.QueryDuration.Android{Action}" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-22">
   <owner>wylieb@chromium.org</owner>
   <owner>tedchoc@chromium.org</owner>
   <summary>
@@ -16407,22 +17235,47 @@ regressions. -->
 </histogram>
 
 <histogram name="VoiceInteraction.StartEventSource"
-    enum="VoiceInteractionEventSource" expires_after="2021-03-28">
+    enum="VoiceInteractionEventSource" expires_after="2021-08-22">
   <owner>wylieb@chromium.org</owner>
   <owner>tedchoc@chromium.org</owner>
   <owner>yusufo@chromium.org</owner>
   <summary>
     Android: The source of a voice search start event, such as omnibox or NTP.
+    This is recorded immediately before the voice transcription intent is sent.
+  </summary>
+</histogram>
+
+<histogram name="VoiceInteraction.StartEventTarget" enum="VoiceIntentTarget"
+    expires_after="2021-08-22">
+  <owner>wylieb@chromium.org</owner>
+  <owner>tedchoc@chromium.org</owner>
+  <owner>yusufo@chromium.org</owner>
+  <summary>
+    Android: The target of a voice search start event, such as the system
+    transcription dialog or Assistant. This is recorded immediately before the
+    voice transcription intent is sent.
   </summary>
 </histogram>
 
 <histogram name="VoiceInteraction.UnexpectedResultSource"
-    enum="VoiceInteractionEventSource" expires_after="2021-01-24">
+    enum="VoiceInteractionEventSource" expires_after="2021-08-22">
   <owner>wylieb@chromium.org</owner>
   <owner>tedchoc@chromium.org</owner>
   <summary>
     Android: The source of an incoming result that doesn't align with an
-    outgoing request from Chrome.
+    outgoing request from Chrome. This is recorded when the extraneous intent
+    response is received.
+  </summary>
+</histogram>
+
+<histogram name="VoiceInteraction.UnexpectedResultTarget"
+    enum="VoiceIntentTarget" expires_after="2021-08-22">
+  <owner>wylieb@chromium.org</owner>
+  <owner>tedchoc@chromium.org</owner>
+  <summary>
+    Android: The target of an intent result that doesn't align with an outgoing
+    request from Chrome. This is recorded when the extraneous intent response is
+    received.
   </summary>
 </histogram>
 
@@ -16435,22 +17288,51 @@ regressions. -->
 </histogram>
 
 <histogram name="VoiceInteraction.VoiceResultConfidenceValue" units="%"
-    expires_after="2021-03-28">
+    expires_after="2021-08-22">
   <owner>wylieb@chromium.org</owner>
   <owner>tedchoc@chromium.org</owner>
   <owner>yusufo@chromium.org</owner>
   <summary>
     Android: Records the confidence value of a successful voice search as a
-    percentage.
+    percentage. This is recorded when the voice intent returns successfully.
   </summary>
 </histogram>
 
+<histogram name="VoiceInteraction.VoiceResultConfidenceValue.{Target}"
+    units="%" expires_after="2021-08-22">
+  <owner>wylieb@chromium.org</owner>
+  <owner>tedchoc@chromium.org</owner>
+  <owner>yusufo@chromium.org</owner>
+  <summary>
+    Android: Records the confidence value of a successful voice search as a
+    percentage, limited to intents sent to {Target}. This is recorded when the
+    voice intent returns successfully.
+  </summary>
+  <token key="Target" variants="VoiceIntentTargetVariant"/>
+</histogram>
+
 <histogram name="VoiceInteraction.VoiceSearchResult" enum="BooleanSuccess"
-    expires_after="2021-03-28">
+    expires_after="2021-08-22">
   <owner>wylieb@chromium.org</owner>
   <owner>tedchoc@chromium.org</owner>
   <owner>yusufo@chromium.org</owner>
-  <summary>Android: Records whether the voice search produced results.</summary>
+  <summary>
+    Android: Records whether the voice search produced results. This is recorded
+    when the voice intent returns successfully.
+  </summary>
+</histogram>
+
+<histogram name="VoiceInteraction.VoiceSearchResult.{Target}"
+    enum="BooleanSuccess" expires_after="2021-08-22">
+  <owner>wylieb@chromium.org</owner>
+  <owner>tedchoc@chromium.org</owner>
+  <owner>yusufo@chromium.org</owner>
+  <summary>
+    Android: Records whether the voice search produced results, limited to
+    intents sent to {Target}. This is recorded when the voice intent returns
+    successfully.
+  </summary>
+  <token key="Target" variants="VoiceIntentTargetVariant"/>
 </histogram>
 
 <histogram name="VRFreNotComplete" enum="BooleanHit" expires_after="M85">
@@ -16470,7 +17352,7 @@ regressions. -->
   </summary>
 </histogram>
 
-<histogram name="VRSessionVideoCount" units="units" expires_after="2021-05-10">
+<histogram name="VRSessionVideoCount" units="units" expires_after="2021-07-11">
   <owner>alcooper@chromium.org</owner>
   <owner>xr-dev@chromium.org</owner>
   <summary>
@@ -16479,7 +17361,7 @@ regressions. -->
   </summary>
 </histogram>
 
-<histogram name="VRSessionVideoTime" units="ms" expires_after="2021-05-10">
+<histogram name="VRSessionVideoTime" units="ms" expires_after="2021-07-11">
   <owner>alcooper@chromium.org</owner>
   <owner>xr-dev@chromium.org</owner>
   <summary>
@@ -16489,15 +17371,15 @@ regressions. -->
   </summary>
 </histogram>
 
-<histogram name="VRViewerType" enum="VRViewerType" expires_after="2021-05-10">
+<histogram name="VRViewerType" enum="VRViewerType" expires_after="2021-07-18">
   <owner>alcooper@chromium.org</owner>
   <owner>xr-dev@chromium.org</owner>
   <summary>The type of headset being used for VR.</summary>
 </histogram>
 
 <histogram name="Web.CurrentOriginEqualsLastCommittedOrigin"
-    enum="BooleanEqual" expires_after="2020-12-31">
-  <owner>eugenebut@chromium.org</owner>
+    enum="BooleanEqual" expires_after="2021-11-17">
+  <owner>ajuma@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
     [iOS] Reports URL matches between the return value from the WebState's
@@ -16512,7 +17394,7 @@ regressions. -->
 </histogram>
 
 <histogram name="Webapp.AddToHomescreenDialog.Timeout" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-08-09">
   <owner>dominickn@chromium.org</owner>
   <owner>peconn@chromium.org</owner>
   <summary>
@@ -16532,7 +17414,7 @@ regressions. -->
 </histogram>
 
 <histogram name="Webapp.CheckServiceWorker.Status"
-    enum="ServiceWorkerOfflineCapability" expires_after="2021-06-01">
+    enum="ServiceWorkerOfflineCapability" expires_after="2021-08-01">
   <owner>asamidoi@chromium.org</owner>
   <owner>shimazu@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
@@ -16545,7 +17427,7 @@ regressions. -->
 </histogram>
 
 <histogram name="Webapp.CheckServiceWorker.Time" units="ms"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>asamidoi@chromium.org</owner>
   <owner>shimazu@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
@@ -16558,7 +17440,7 @@ regressions. -->
 </histogram>
 
 <histogram base="true" name="WebApp.Engagement"
-    enum="SiteEngagementServiceEngagementType" expires_after="2021-05-09">
+    enum="SiteEngagementServiceEngagementType" expires_after="2021-07-11">
   <owner>calamity@chromium.org</owner>
   <owner>mgiuca@chromium.org</owner>
   <owner>loyso@chromium.org</owner>
@@ -16610,7 +17492,7 @@ regressions. -->
 </histogram>
 
 <histogram name="Webapp.Install.DisplayMode2" enum="WebAppDisplayMode"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>ericwilligers@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
@@ -16622,7 +17504,7 @@ regressions. -->
 </histogram>
 
 <histogram name="Webapp.Install.InstallBounce" enum="WebappInstallSource"
-    expires_after="2021-03-07">
+    expires_after="2021-08-22">
   <owner>dominickn@chromium.org</owner>
   <owner>alancutter@chromium.org</owner>
   <summary>
@@ -16633,7 +17515,7 @@ regressions. -->
 </histogram>
 
 <histogram name="Webapp.Install.InstallEvent" enum="WebappInstallSource"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>dominickn@chromium.org</owner>
   <owner>loyso@chromium.org</owner>
   <owner>calamity@chromium.org</owner>
@@ -16656,7 +17538,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebApp.InstallIphPromo.Result" enum="WebAppInstallIphResult"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>phillis@chromium.org</owner>
   <owner>dmurph@chromium.org</owner>
   <summary>
@@ -16666,7 +17548,7 @@ regressions. -->
 </histogram>
 
 <histogram name="Webapp.InstallResult" enum="WebAppInstallResultCode"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
 <!-- Name completed by histogram_suffixes name="WebAppType" -->
 
   <owner>calamity@chromium.org</owner>
@@ -16677,8 +17559,10 @@ regressions. -->
 <histogram base="true"
     name="Webapp.InstallResultExtensionDisabledReason.System.Profiles"
     enum="ExtensionDisableReason" expires_after="2020-12-31">
-<!-- Name completed by histogram_suffixes name="WebAppSystemProfileCategory" -->
-
+  <obsolete>
+    Removed 11/2020, as the relevant code path is no longer executed after BMO
+    launch.
+  </obsolete>
   <owner>calamity@chromium.org</owner>
   <owner>ortuno@chromium.org</owner>
   <summary>
@@ -16693,8 +17577,10 @@ regressions. -->
 <histogram base="true"
     name="Webapp.InstallResultExtensionError.System.Profiles"
     enum="ExtensionInstallationCrxInstallError" expires_after="2020-12-31">
-<!-- Name completed by histogram_suffixes name="WebAppSystemProfileCategory" -->
-
+  <obsolete>
+    Removed 11/2020, as the relevant code path is no longer executed after BMO
+    launch.
+  </obsolete>
   <owner>calamity@chromium.org</owner>
   <owner>ortuno@chromium.org</owner>
   <summary>
@@ -16703,7 +17589,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebApp.Launcher.LaunchResult"
-    enum="WebAppLauncherLaunchResult" expires_after="2021-04-10">
+    enum="WebAppLauncherLaunchResult" expires_after="2021-08-09">
   <owner>davidbienvenu@chromium.org</owner>
   <owner>jessemckenna@google.com</owner>
   <summary>
@@ -16713,7 +17599,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebApp.Launcher.UpdateResult"
-    enum="WebAppLauncherUpdateResult" expires_after="2021-04-10">
+    enum="WebAppLauncherUpdateResult" expires_after="2021-08-09">
   <owner>davidbienvenu@chromium.org</owner>
   <owner>jessemckenna@google.com</owner>
   <summary>
@@ -16724,6 +17610,9 @@ regressions. -->
 
 <histogram name="WebApp.Migration.UserDisplayModeCleanUp"
     enum="BooleanMigrated" expires_after="2021-01-01">
+  <obsolete>
+    Removed 12/2020.
+  </obsolete>
   <owner>alancutter@chromium.org</owner>
   <owner>dxie@google.com</owner>
   <owner>loyso@google.com</owner>
@@ -16737,8 +17626,19 @@ regressions. -->
   </summary>
 </histogram>
 
+<histogram name="WebApp.Mover.Result" enum="WebAppMoverResult"
+    expires_after="2021-08-09">
+  <owner>dmurph@chromium.org</owner>
+  <owner>desktop-pwas-team@google.com</owner>
+  <summary>
+    Records the result of running the WebAppMover, which runs on Chrome startup.
+    It uninstalls a set of WebApps and then installs a single WebApp as a
+    replacement.
+  </summary>
+</histogram>
+
 <histogram name="Webapp.NavigationStatus" enum="BooleanSuccess"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>peter@chromium.org</owner>
   <owner>hartmanng@chromium.org</owner>
   <summary>
@@ -16759,7 +17659,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebApp.Preinstalled.DisabledCount" units="apps"
-    expires_after="2021-04-01">
+    expires_after="2021-08-08">
   <owner>alancutter@chromium.org</owner>
   <owner>desktop-pwas-team@google.com</owner>
   <summary>
@@ -16769,7 +17669,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebApp.Preinstalled.EnabledCount" units="apps"
-    expires_after="2021-04-01">
+    expires_after="2021-08-22">
   <owner>alancutter@chromium.org</owner>
   <owner>desktop-pwas-team@google.com</owner>
   <summary>
@@ -16778,6 +17678,17 @@ regressions. -->
   </summary>
 </histogram>
 
+<histogram name="WebApp.Preinstalled.UninstallAndReplaceCount" units="apps"
+    expires_after="2021-04-01">
+  <owner>alancutter@chromium.org</owner>
+  <owner>desktop-pwas-team@google.com</owner>
+  <summary>
+    Records how many preinstalled web app installations uninstalled and replaced
+    an old default app (web app or Chrome app). This corresponds to the
+    &quot;uninstall_and_replace&quot; field in preinstalled web app configs.
+  </summary>
+</histogram>
+
 <histogram name="WebApp.Shortcuts.Creation.Result"
     enum="ShortcutsCreationResult" expires_after="M93">
   <owner>phillis@chromium.org</owner>
@@ -16785,6 +17696,18 @@ regressions. -->
   <summary>Records the result of shortcut creation for PWA.</summary>
 </histogram>
 
+<histogram name="WebApp.Shortcuts.Deletion.Success" enum="BooleanSuccess"
+    expires_after="M93">
+  <owner>phillis@chromium.org</owner>
+  <owner>dmurph@chromium.org</owner>
+  <owner>sunggch@microsoft.com</owner>
+  <summary>
+    Records the result of shortcut deletion for a PWA. This occurs when an
+    installed PWA is uninstalled, which can be triggered by user, policy admin,
+    or sync system depending on the situation.
+  </summary>
+</histogram>
+
 <histogram name="Webapp.SyncInitiatedUninstallResult" enum="BooleanSuccess"
     expires_after="2022-01-01">
   <owner>alancutter@chromium.org</owner>
@@ -16796,7 +17719,7 @@ regressions. -->
 </histogram>
 
 <histogram name="Webapp.SystemApps.FreshInstallDuration" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>calamity@chromium.org</owner>
   <owner>ortuno@chromium.org</owner>
   <summary>
@@ -16830,7 +17753,7 @@ regressions. -->
 </histogram>
 
 <histogram name="Webapp.UninstallDialogAction"
-    enum="WebappUninstallDialogAction" expires_after="2021-05-09">
+    enum="WebappUninstallDialogAction" expires_after="2021-07-11">
   <owner>benwells@chromium.org</owner>
   <owner>dominickn@chromium.org</owner>
   <owner>loyso@chromium.org</owner>
@@ -16840,8 +17763,9 @@ regressions. -->
 </histogram>
 
 <histogram name="Webapp.Update.ManifestUpdateResult"
-    enum="WebAppManifestUpdateResult" expires_after="M89">
+    enum="WebAppManifestUpdateResult" expires_after="2021-08-09">
   <owner>alancutter@chromium.org</owner>
+  <owner>desktop-pwas-team@chromium.org</owner>
   <owner>loyso@chromium.org</owner>
   <owner>raymes@chromium.org</owner>
   <summary>
@@ -16852,141 +17776,34 @@ regressions. -->
   </summary>
 </histogram>
 
-<histogram name="Webapp.WebAppUrlLoaderPrepareForLoadResult"
-    enum="WebAppUrlLoaderResult" expires_after="2021-05-02">
-  <owner>qjw@chromium.org</owner>
-  <owner>ortuno@chromium.org</owner>
+<histogram name="Webapp.Update.ManifestUpdateResult.DefaultApp"
+    enum="WebAppManifestUpdateResult" expires_after="M92">
+  <owner>alancutter@chromium.org</owner>
+  <owner>tsergeant@chromium.org</owner>
   <owner>desktop-pwas-team@google.com</owner>
-  <summary>Records the result of WebAppUrlLoader::PrepareForLoad().</summary>
-</histogram>
-
-<histogram name="WebAuthentication.AttestationPromptResult"
-    enum="WebAuthenticationAttestationPromptResult" expires_after="2020-11-29">
-  <owner>agl@chromium.org</owner>
-  <summary>
-    Tracks events related to prompting users for permission to pass WebAuthn
-    attestation information back to origins. &quot;Queried&quot; means that the
-    embedder was queried for a decision. (Since such decisions can be resolved
-    by enterprise policy, that doesn't imply that a user saw a permissions
-    prompt in every case.) Then one of four things can happen: a timeout, a
-    positive or negative resolution, or the request is abandoned. The latter
-    case occurs when, for example, the tab is closed or the user navigates away.
-  </summary>
-</histogram>
-
-<histogram name="WebAuthentication.CableV1DiscoveryEvent"
-    enum="WebAuthenticationCableV1DiscoveryEvent" expires_after="2021-04-04">
-  <owner>agl@chromium.org</owner>
-  <owner>martinkr@google.com</owner>
-  <summary>
-    Records events that occur during caBLE v1 authenticator discovery so that
-    potential discovery failures can be identified.
-  </summary>
-</histogram>
-
-<histogram name="WebAuthentication.CredentialRequestAllowCredentialsCount"
-    units="credentials" expires_after="2021-03-07">
-  <owner>kenrb@chromium.org</owner>
-  <owner>martinkr@google.com</owner>
-  <summary>
-    When a relying party is attempting to authenticate a user using the
-    WebAuthentication API, this metric reports the number of valid credentials
-    that the RP has registered for the user.
-  </summary>
-</histogram>
-
-<histogram name="WebAuthentication.GetAssertionRequestTransport"
-    enum="WebAuthenticationFidoTransport" expires_after="2021-03-07">
-  <owner>kenrb@chromium.org</owner>
-  <owner>martinkr@google.com</owner>
-  <summary>
-    Records the transport used for all WebAuthentication GetAssertion requests
-    sent to authenticators. This does not necessarily mean that there was a
-    success response from any given authenticator.
-  </summary>
-</histogram>
-
-<histogram name="WebAuthentication.GetAssertionResponseTransport"
-    enum="WebAuthenticationFidoTransport" expires_after="2021-03-07">
-  <owner>kenrb@chromium.org</owner>
-  <owner>martinkr@google.com</owner>
-  <summary>
-    Records the transport used when an authenticator responds with success to a
-    WebAuthentication GetAssertion request.
-  </summary>
-</histogram>
-
-<histogram name="WebAuthentication.IsUVPlatformAuthenticatorAvailable"
-    enum="Boolean" expires_after="2021-06-30">
-  <owner>kenrb@chromium.org</owner>
-  <owner>martinkr@google.com</owner>
-  <summary>
-    Record at startup whether the current system has a platform authenticator
-    available; i.e. whether IsUVPAA JS call would return true or false.
-  </summary>
-</histogram>
-
-<histogram name="WebAuthentication.MakeCredentialExcludeCredentialsCount"
-    units="credentials" expires_after="2021-03-07">
-  <owner>kenrb@chromium.org</owner>
-  <owner>martinkr@google.com</owner>
-  <summary>
-    When a relying party is attempting to register a credential for a new user
-    using the WebAuthentication API, this metric reports the number of existing
-    credentials already registered in order to prevent re-registration.
-  </summary>
-</histogram>
-
-<histogram name="WebAuthentication.MakeCredentialRequestTransport"
-    enum="WebAuthenticationFidoTransport" expires_after="2021-03-07">
-  <owner>kenrb@chromium.org</owner>
-  <owner>martinkr@google.com</owner>
-  <summary>
-    Records the transport used for all WebAuthentication MakeCredential requests
-    sent to authenticators. This does not necessarily mean that there was a
-    success response from any given authenticator.
-  </summary>
-</histogram>
-
-<histogram name="WebAuthentication.MakeCredentialResponseTransport"
-    enum="WebAuthenticationFidoTransport" expires_after="2021-03-07">
-  <owner>kenrb@chromium.org</owner>
-  <owner>martinkr@google.com</owner>
   <summary>
-    Records the transport used when an authenticator responds with success to a
-    WebAuthentication MakeCredential request.
+    Identical to Webapp.Update.ManifestUpdateResult but restricted to just
+    default installed web apps.
   </summary>
 </histogram>
 
-<histogram name="WebAuthentication.RelyingPartySecurityCheckFailure"
-    enum="WebAuthenticationRelyingPartySecurityCheckFailure"
-    expires_after="2020-12-31">
-  <owner>kenrb@chromium.org</owner>
-  <owner>martinkr@google.com</owner>
-  <summary>
-    Records failures associated with verifying the relying party origin when
-    that relying party is attempting to make a credential or get an assertion
-    using the WebAuthentication API. Failures include when the relying party's
-    origin is opaque or non-secure, or when the caller-provided relying party ID
-    or app ID is not valid for this origin.
-  </summary>
+<histogram name="Webapp.WebAppUrlLoaderPrepareForLoadResult"
+    enum="WebAppUrlLoaderResult" expires_after="2021-07-04">
+  <owner>qjw@chromium.org</owner>
+  <owner>ortuno@chromium.org</owner>
+  <owner>desktop-pwas-team@google.com</owner>
+  <summary>Records the result of WebAppUrlLoader::PrepareForLoad().</summary>
 </histogram>
 
-<histogram name="WebAuthentication.U2FAttestationPromptResult"
-    enum="WebAuthenticationU2FAttestationPromptResult"
-    expires_after="2021-04-04">
-  <owner>agl@chromium.org</owner>
+<histogram name="WebContentsObserver.{Method}" units="ms"
+    expires_after="2021-09-15">
+  <owner>cduvall@chromium.org</owner>
+  <owner>jam@chromium.org</owner>
   <summary>
-    Tracks events related to prompting users for permission to pass U2F
-    attestation information back to origins. &quot;Queried&quot; means that the
-    embedder was queried for a decision. (Since such decisions can be resolved
-    by enterprise policy, that doesn't imply that a user saw a permissions
-    prompt in every case.) Then either a positive or negative result can happen.
-    However, note some complications: a negative will be recorded when the tab
-    is closed or the user navigates away, and a positive result will be recorded
-    when the user accepts the permission prompt but the request has already
-    timed out.
+    Measures the time it takes to call all observers of the WebContents observer
+    method {Method}. Logged every time the method is called.
   </summary>
+  <token key="Method" variants="WebContentsObserverMethods"/>
 </histogram>
 
 <histogram name="WebContextFetcher.Time.RunJavaScript" units="ms"
@@ -17004,7 +17821,6 @@ regressions. -->
 <histogram name="WebController.BackForwardListOutOfSync" enum="BooleanHit"
     expires_after="2021-12-25">
   <owner>ajuma@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
     [iOS] Counts the number of time the backForwardList of the WebView gets out
@@ -17016,7 +17832,6 @@ regressions. -->
 <histogram name="WebController.BackForwardListOutOfSyncInProvisionalNavigation"
     enum="IOSOutOfSyncURLAction" expires_after="2021-12-25">
   <owner>ajuma@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
     [iOS] Records the action take when the backForwardList of the WebView is out
@@ -17028,7 +17843,7 @@ regressions. -->
 
 <histogram name="WebController.CertVerificationErrorsCacheHit"
     enum="BooleanCacheHit" expires_after="2021-05-01">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>ajuma@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
     [iOS] Report cache hit/miss for WKWebView cert verification.
@@ -17039,7 +17854,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebController.ExternalURLRequestBlocking"
-    enum="IOSExternalURLRequestStatus" expires_after="2021-04-25">
+    enum="IOSExternalURLRequestStatus" expires_after="2021-08-09">
   <owner>mrefaat@chromium.org</owner>
   <summary>
     [iOS] Measures the proportion of external URL requests that originate from a
@@ -17049,7 +17864,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebFont.BlankTextShownTime" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
@@ -17060,7 +17875,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebFont.CacheHit" enum="WebFontCacheHit"
-    expires_after="2021-03-21">
+    expires_after="2021-07-25">
   <owner>hajimehoshi@chromium.org</owner>
   <owner>kenjibaheux@chromium.org</owner>
   <owner>kouhei@chromium.org</owner>
@@ -17084,7 +17899,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebFont.DownloadTime.0.Under10KB" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
@@ -17094,7 +17909,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebFont.DownloadTime.1.10KBTo50KB" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
@@ -17104,7 +17919,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebFont.DownloadTime.2.50KBTo100KB" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
@@ -17114,7 +17929,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebFont.DownloadTime.3.100KBTo1MB" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
@@ -17124,7 +17939,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebFont.DownloadTime.4.Over1MB" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
@@ -17134,7 +17949,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebFont.DownloadTime.LoadError" units="ms"
-    expires_after="2021-01-20">
+    expires_after="2021-06-13">
   <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
@@ -17154,7 +17969,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebFont.HadBlankText" enum="BooleanHadBlankText"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>kenjibaheux@chromium.org</owner>
   <owner>ksakamoto@chromium.org</owner>
   <summary>
@@ -17165,7 +17980,7 @@ regressions. -->
 </histogram>
 
 <histogram base="true" name="WebFont.HttpCacheStatus" enum="HttpCachePattern"
-    expires_after="2020-11-08">
+    expires_after="2021-11-08">
   <owner>yaoxia@chromium.org</owner>
   <owner>shivanisha@chromium.org</owner>
   <summary>
@@ -17185,7 +18000,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebFont.LocalFontUsed" enum="BooleanUsage"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>hajimehoshi@chromium.org</owner>
   <owner>kenjibaheux@chromium.org</owner>
   <owner>kouhei@chromium.org</owner>
@@ -17247,6 +18062,9 @@ regressions. -->
 
 <histogram name="WebP.DecodedImageFormat" enum="WebpDecodedFormat"
     expires_after="2020-12-13">
+  <obsolete>
+    No longer recorded in M89.
+  </obsolete>
   <owner>droger@chromium.org</owner>
   <summary>
     Histogram for the format of decoded WebP images on iOS, as Chrome re-encodes
@@ -17255,7 +18073,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebShare.ApiCount" enum="WebShareMethod"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>mgiuca@chromium.org</owner>
   <summary>
     Counts the number of calls to navigator.share. Includes both successful and
@@ -17279,7 +18097,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebsiteSettings.Action" enum="WebsiteSettingsAction"
-    expires_after="M90">
+    expires_after="M93">
   <owner>estark@chromium.org</owner>
   <owner>dullweber@chromium.org</owner>
   <summary>
@@ -17299,7 +18117,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebsiteSettings.AllSitesAction2"
-    enum="WebSiteSettingsAllSitesAction2" expires_after="2021-04-18">
+    enum="WebSiteSettingsAllSitesAction2" expires_after="2021-08-09">
   <owner>jarrydg@chromium.org</owner>
   <owner>mxcai@chromium.org</owner>
   <summary>
@@ -17308,6 +18126,25 @@ regressions. -->
   </summary>
 </histogram>
 
+<histogram name="WebsiteSettings.Discoverability.Action"
+    enum="WebsiteSettingsDiscoverabilityAction" expires_after="M94">
+  <owner>eokoyomon@chromium.org</owner>
+  <owner>dullweber@chromium.org</owner>
+  <summary>
+    Tracks actions related to page info when discoverability has been activated.
+  </summary>
+</histogram>
+
+<histogram name="WebsiteSettings.Discoverability.TimeToOpen" units="ms"
+    expires_after="M94">
+  <owner>eokoyomon@chromium.org</owner>
+  <owner>dullweber@chromium.org</owner>
+  <summary>
+    Records the amount of time the discoverability icon is shown in the omnibox
+    before the user clicks into page info.
+  </summary>
+</histogram>
+
 <histogram name="WebsiteSettings.Menu.PermissionChanged" enum="ContentType"
     expires_after="M81">
   <owner>miguelg@chromium.org</owner>
@@ -17371,8 +18208,12 @@ regressions. -->
 </histogram>
 
 <histogram name="WebsiteSettings.Menu.PermissionChanged.SessionOnly"
-    enum="ContentType" expires_after="M90">
-  <owner>timloh@chromium.org</owner>
+    enum="ContentType" expires_after="M96">
+  <owner>andypaicu@chromium.org</owner>
+  <owner>engedy@chromium.org</owner>
+  <owner>hkamila@chromium.org</owner>
+  <owner>ravjit@chromium.org</owner>
+  <owner>elklm@chromium.org</owner>
   <summary>
     Count of how often a specific content type (permission) is changed to the
     session only value using the content settings menu. This option only exists
@@ -17381,7 +18222,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebsiteSettings.OriginInfo.PermissionChanged"
-    enum="ContentType" expires_after="M90">
+    enum="ContentType" expires_after="2021-08-22">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -17395,7 +18236,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebsiteSettings.OriginInfo.PermissionChanged.Allowed"
-    enum="ContentType" expires_after="M90">
+    enum="ContentType" expires_after="2021-08-22">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -17409,7 +18250,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebsiteSettings.OriginInfo.PermissionChanged.Blocked"
-    enum="ContentType" expires_after="M90">
+    enum="ContentType" expires_after="2021-08-22">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -17443,13 +18284,13 @@ regressions. -->
 </histogram>
 
 <histogram name="WebUI.CreatedForUrl" enum="WebUIUrlHashes"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>dbeam@chromium.org</owner>
   <summary>URLs for which Chrome creates WebUIControllers.</summary>
 </histogram>
 
 <histogram name="WebUI.Settings.PathVisited" enum="WebUISettingsPathHashes"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>dschuyler@chromium.org</owner>
   <owner>tbuckley@chromium.org</owner>
   <owner>bettes@chromium.org</owner>
@@ -17462,7 +18303,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebUITabStrip.CloseAction" enum="WebUITabStripCloseActions"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>collinbaker@chromium.org</owner>
   <owner>dfried@chromium.org</owner>
   <summary>
@@ -17473,7 +18314,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebUITabStrip.CloseTabAction"
-    enum="WebUITabStripCloseTabActions" expires_after="2021-03-21">
+    enum="WebUITabStripCloseTabActions" expires_after="2021-08-09">
   <owner>johntlee@chromium.org</owner>
   <owner>dpapad@chromium.org</owner>
   <summary>
@@ -17484,7 +18325,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebUITabStrip.OpenAction" enum="WebUITabStripOpenActions"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>collinbaker@chromium.org</owner>
   <owner>dfried@chromium.org</owner>
   <summary>
@@ -17495,7 +18336,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebUITabStrip.OpenDuration" units="ms"
-    expires_after="2021-03-21">
+    expires_after="2021-08-09">
   <owner>collinbaker@chromium.org</owner>
   <owner>dfried@chromium.org</owner>
   <summary>
@@ -17514,7 +18355,8 @@ regressions. -->
   </summary>
 </histogram>
 
-<histogram name="WebUITabStrip.TabCreation" units="ms" expires_after="M90">
+<histogram name="WebUITabStrip.TabCreation" units="ms"
+    expires_after="2021-08-22">
   <owner>robliao@chromium.org</owner>
   <owner>johntlee@chromium.org</owner>
   <summary>
@@ -17522,7 +18364,8 @@ regressions. -->
   </summary>
 </histogram>
 
-<histogram name="WebUITabStrip.TabDataReceived" units="ms" expires_after="M90">
+<histogram name="WebUITabStrip.TabDataReceived" units="ms"
+    expires_after="2021-08-22">
   <owner>robliao@chromium.org</owner>
   <owner>johntlee@chromium.org</owner>
   <summary>
@@ -17563,8 +18406,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WebView.ApiCall" enum="WebViewApiCall"
-    expires_after="2021-07-24">
-  <owner>changwan@chromium.org</owner>
+    expires_after="2022-01-31">
   <owner>ntfschr@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>Records calls to WebView APIs in WebViewChromium.</summary>
@@ -17682,7 +18524,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WindowOcclusionChanged" enum="WindowOcclusionState"
-    expires_after="2021-05-02">
+    expires_after="2021-07-27">
   <owner>davidbienvenu@chromium.org</owner>
   <owner>fdoray@chromium.org</owner>
   <summary>
@@ -17704,7 +18546,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WrenchMenu.MenuAction" enum="WrenchMenuAction"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>ainslie@chromium.org</owner>
   <owner>edwardjung@chromium.org</owner>
   <summary>Number of times that each menu item is clicked.</summary>
@@ -17720,7 +18562,7 @@ regressions. -->
 </histogram>
 
 <histogram name="WrenchMenu.TimeToAction" units="units"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>ainslie@chromium.org</owner>
   <owner>edwardjung@chromium.org</owner>
   <summary>
@@ -17790,6 +18632,17 @@ regressions. -->
   </summary>
 </histogram>
 
+<histogram name="XR.ARCore.DepthBufferSizeInPixels" units="pixels"
+    expires_after="2021-12-01">
+  <owner>bialpio@chromium.org</owner>
+  <owner>xr-dev@chromium.org</owner>
+  <summary>
+    Recorded on every frame for as long as depth data is requested in an XR
+    session backed by ARCore device. Measures the number of pixels (width *
+    height) in the depth buffer obtained from ARCore.
+  </summary>
+</histogram>
+
 <histogram name="XR.RuntimeUsed" enum="XRDeviceId" expires_after="2021-07-01">
   <owner>alcooper@chromium.org</owner>
   <owner>mlamouri@google.com</owner>
@@ -17811,7 +18664,7 @@ regressions. -->
 </histogram>
 
 <histogram name="XR.WebXR.ReferenceSpace.Succeeded" enum="XRReferenceSpaceType"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>alcooper@chromium.org</owner>
   <owner>xr-dev@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/page/OWNERS b/chromium/tools/metrics/histograms/histograms_xml/page/OWNERS
new file mode 100644
index 00000000000..001432d5224
--- /dev/null
+++ b/chromium/tools/metrics/histograms/histograms_xml/page/OWNERS
@@ -0,0 +1,7 @@
+# Prefer chromium-metrics-reviews@google.com instead.
+# Use the following owners only if:
+#  - The reviewer is available for review.
+#  - You work in the same area as them.
+#  - They are already a good reviewer for the non-metrics part of the CL.
+# See tools/metrics/histograms/OWNERS for details.
+csharrison@chromium.org
diff --git a/chromium/tools/metrics/histograms/histograms_xml/page/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/page/histograms.xml
index 2f0afe3e68a..da1b22b9fcb 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/page/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/page/histograms.xml
@@ -21,6 +21,31 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<variants name="RequestDestination">
+  <variant name="audio"/>
+  <variant name="audioworklet"/>
+  <variant name="document"/>
+  <variant name="embed"/>
+  <variant name="empty"/>
+  <variant name="font"/>
+  <variant name="frame"/>
+  <variant name="iframe"/>
+  <variant name="image"/>
+  <variant name="manifest"/>
+  <variant name="object"/>
+  <variant name="paintworklet"/>
+  <variant name="report"/>
+  <variant name="script"/>
+  <variant name="serviceworker"/>
+  <variant name="sharedworker"/>
+  <variant name="style"/>
+  <variant name="track"/>
+  <variant name="video"/>
+  <variant name="webbundle"/>
+  <variant name="worker"/>
+  <variant name="xslt"/>
+</variants>
+
 <histogram name="PageActionController.ExtensionsWithPageActions" units="units"
     expires_after="2021-12-01">
   <owner>rdevlin.cronin@chromium.org</owner>
@@ -34,6 +59,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram base="true"
     name="PageLoad.AdPaintTiming.NavigationToFirstContentfulPaint2" units="ms"
     expires_after="2021-07-31">
+  <obsolete>
+    Replaced by PageLoad.PaintTiming.NavigationToLargestContentfulPaint3 in Jan
+    2021 to increase the bucket range.
+  </obsolete>
+  <owner>jkarlin@chromium.org</owner>
+  <owner>johnidel@chromium.org</owner>
+  <summary>
+    Records the time from frame navigation start to FirstContentfulPaint of each
+    ad frame that receives a FirstContentfulPaint. The time could be quite
+    large, as some ads don't paint until they're scrolled into view. But the
+    metric is still useful in aggregate.
+
+    Recorded for all ad frames with non-zero bytes or cpu usage that receive a
+    FirstContentfulPaint. Recorded when the ad frame or page is destroyed.
+  </summary>
+</histogram>
+
+<histogram base="true"
+    name="PageLoad.AdPaintTiming.NavigationToFirstContentfulPaint3" units="ms"
+    expires_after="2021-12-31">
   <owner>jkarlin@chromium.org</owner>
   <owner>johnidel@chromium.org</owner>
   <summary>
@@ -48,7 +93,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.BackForwardCache.Event"
-    enum="PageLoadBackForwardCacheEvent" expires_after="2021-04-01">
+    enum="PageLoadBackForwardCacheEvent" expires_after="2021-08-15">
   <owner>altimin@chromium.org</owner>
   <owner>bmcquade@chromium.org</owner>
   <owner>hajimehoshi@chromium.org</owner>
@@ -74,7 +119,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Clients.Ads.AdDensity.MaxPercentByArea" units="%"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>justinmron@chromium.org</owner>
   <owner>johnidel@chromium.org</owner>
   <summary>
@@ -87,7 +132,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Clients.Ads.AdDensity.MaxPercentByHeight" units="%"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>justinmron@chromium.org</owner>
   <owner>johnidel@chromium.org</owner>
   <summary>
@@ -123,7 +168,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Clients.Ads.AllPages.PercentNetworkBytesAds"
-    units="%" expires_after="2021-03-28">
+    units="%" expires_after="2021-08-09">
   <owner>alexmt@chromium.org</owner>
   <owner>johnidel@chromium.org</owner>
   <summary>
@@ -149,7 +194,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Clients.Ads.FrameCounts.IgnoredByRestrictedAdTagging"
-    enum="BooleanIgnored" expires_after="2021-04-04">
+    enum="BooleanIgnored" expires_after="2021-08-09">
   <owner>johnidel@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -165,7 +210,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Clients.Ads.HeavyAds.DisallowedByBlocklist"
-    enum="BooleanBlocked" expires_after="2021-03-28">
+    enum="BooleanBlocked" expires_after="2021-08-01">
   <owner>johnidel@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -189,7 +234,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Clients.Ads.HeavyAds.IgnoredByReload"
-    enum="BooleanIgnored" expires_after="2021-03-28">
+    enum="BooleanIgnored" expires_after="2021-08-09">
   <owner>johnidel@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -203,7 +248,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Clients.Ads.HeavyAds.NetworkBytesAtFrameUnload"
-    units="bytes" expires_after="2021-04-04">
+    units="bytes" expires_after="2021-08-09">
   <owner>johnidel@chromium.org</owner>
   <owner>justinmiron@google.com</owner>
   <summary>
@@ -215,7 +260,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Clients.Ads.HeavyAds.UserDidReload"
-    enum="BooleanReloaded" expires_after="2021-03-28">
+    enum="BooleanReloaded" expires_after="2021-08-09">
   <owner>johnidel@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -231,6 +276,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>cammie@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <owner>johnidel@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     The maximum reported number of kilobytes of memory used by V8 by the main
     frame in this pageload.
@@ -244,9 +290,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="PageLoad.Clients.Ads.Memory.MissedMeasurementCount"
     units="count" expires_after="2021-04-18">
+  <obsolete>
+    Removed 02/2021. Seen to be ~0.04 (sample mean) compared to a sample mean
+    UpdateCount of ~58.38 measured over all OSes for Dev and Canary for ending
+    date 10/28/2020 with 7-day aggregation.
+  </obsolete>
   <owner>cammie@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <owner>johnidel@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     The number of V8 per-frame memory measurements received by
     AdsPageLoadMetricsObserver after the corresponding RenderFrameHost has
@@ -260,6 +312,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>cammie@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <owner>johnidel@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     The number of V8 memory measurement updates received by
     AdsPageLoadMetricsObserver per pageload. Only recorded if the page has at
@@ -281,116 +334,163 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.Clients.AMP.Experimental.PageTiming.InputToNavigation.Subframe"
-    units="ms" expires_after="M78">
+    units="ms" expires_after="M97">
   <owner>bmcquade@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
+  <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
     The time from the user input that triggers the top-level navigation for an
     AMP document to the time that the navigation for the AMP document is
     initiated in the AMP frame. This gives insight into how often AMP documents
     are navigated to via same document navigations without being prerendered.
+
+    This histogram has incomplete data. It expired after M78 and was re-added in
+    M90.
   </summary>
 </histogram>
 
 <histogram
     name="PageLoad.Clients.AMP.Experimental.PageTiming.MainFrameToSubFrameNavigationDelta.Subframe"
-    units="ms" expires_after="M78">
+    units="ms" expires_after="M97">
   <owner>bmcquade@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
+  <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
     The time from the main frame navigation to the subsequent subframe
     navigation for the AMP document. Only recorded for non-same-page
     navigations.
+
+    This histogram has incomplete data. It expired after M78 and was re-added in
+    M90.
   </summary>
 </histogram>
 
 <histogram
     name="PageLoad.Clients.AMP.Experimental.PageTiming.NavigationToInput.Subframe"
-    units="ms" expires_after="M78">
+    units="ms" expires_after="M97">
   <owner>bmcquade@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
+  <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
     The time from navigation in the AMP frame to the user input that triggers
     the top-level navigation for that AMP document. This gives insight into the
     delta between when an AMP frame is prerendered and when it is actually
     displayed for same document navigations.
+
+    This histogram has incomplete data. It expired after M78 and was re-added in
+    M90.
   </summary>
 </histogram>
 
 <histogram
     name="PageLoad.Clients.AMP.InteractiveTiming.FirstInputDelay4.Subframe"
-    units="ms" expires_after="M85">
+    units="ms" expires_after="M97">
   <owner>bmcquade@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
+  <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
     Measures First Input Delay, the duration between the hardware timestamp and
     the start of event processing on the main thread for the first meaningful
     input per navigation, in an AMP subframe document. Recorded on first page
     interaction. See https://goo.gl/tr1oTZ for a detailed explanation. Excludes
     scrolls. Only same-document navigations are included.
+
+    This histogram has incomplete data. It expired after M78 and was re-added in
+    M90.
   </summary>
 </histogram>
 
 <histogram
     name="PageLoad.Clients.AMP.InteractiveTiming.FirstInputDelay4.Subframe.FullNavigation"
-    units="ms" expires_after="M85">
+    units="ms" expires_after="M97">
   <owner>bmcquade@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
+  <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
     Measures First Input Delay, the duration between the hardware timestamp and
     the start of event processing on the main thread for the first meaningful
     input per navigation, in an AMP subframe document. Recorded on first page
     interaction. See https://goo.gl/tr1oTZ for a detailed explanation. Excludes
     scrolls. Only non-same-document navigations are included.
+
+    This histogram has incomplete data. It expired after M78 and was re-added in
+    M90.
   </summary>
 </histogram>
 
 <histogram
     name="PageLoad.Clients.AMP.LayoutInstability.CumulativeShiftScore.Subframe"
-    units="scorex10" expires_after="2019-09-10">
+    units="scorex10" expires_after="M97">
   <owner>bmcquade@chromium.org</owner>
   <owner>skobes@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
+  <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
     Measures the cumulative layout shift score (bit.ly/lsm-explainer) that has
     occurred in the AMP subframe. Recorded for same-document AMP navigations in
     the main frame, at the end of the AMP document lifetime, such as when the
     document is being navigated away from.
+
+    This histogram has incomplete data. It expired after M78 and was re-added in
+    M90.
   </summary>
 </histogram>
 
 <histogram
     name="PageLoad.Clients.AMP.LayoutInstability.CumulativeShiftScore.Subframe.FullNavigation"
-    units="scorex10" expires_after="2019-09-10">
+    units="scorex10" expires_after="M97">
   <owner>bmcquade@chromium.org</owner>
   <owner>skobes@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
+  <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
     Measures the cumulative layout shift score (bit.ly/lsm-explainer) that has
     occurred in the AMP subframe. Recorded for non same-document AMP navigations
     in the main frame, at the end of the AMP document lifetime, such as when the
     document is being navigated away from.
+
+    This histogram has incomplete data. It expired after M78 and was re-added in
+    M90.
   </summary>
 </histogram>
 
 <histogram
     name="PageLoad.Clients.AMP.PaintTiming.InputToFirstContentfulPaint.Subframe"
-    units="ms" expires_after="M85">
+    units="ms" expires_after="M97">
   <owner>bmcquade@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
+  <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
     The time from user input to first &quot;contentful&quot; paint in an AMP
     subframe document. Will be zero or near-zero in cases where the AMP subframe
     document was prerendered. Only same-document navigations are included.
+
+    This histogram has incomplete data. It expired after M78 and was re-added in
+    M90.
   </summary>
 </histogram>
 
 <histogram
     name="PageLoad.Clients.AMP.PaintTiming.InputToFirstContentfulPaint.Subframe.FullNavigation"
-    units="ms" expires_after="M85">
+    units="ms" expires_after="M97">
   <owner>bmcquade@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
+  <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
     The time from user input to first &quot;contentful&quot; paint in an AMP
     subframe document. Only non-same-document navigations are included.
+
+    This histogram has incomplete data. It expired after M78 and was re-added in
+    M90.
   </summary>
 </histogram>
 
 <histogram
     name="PageLoad.Clients.AMP.PaintTiming.InputToLargestContentfulPaint.Subframe"
-    units="ms" expires_after="2020-01-24">
+    units="ms" expires_after="M97">
   <owner>bmcquade@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
+  <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
     The time from user input to largest &quot;contentful&quot; paint in an AMP
     subframe document. Only same-document navigations are included.
@@ -401,13 +501,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
     Will be zero or near-zero in cases where the AMP subframe document was
     prerendered.
+
+    This histogram has incomplete data. It expired after M78 and was re-added in
+    M90.
   </summary>
 </histogram>
 
 <histogram
     name="PageLoad.Clients.AMP.PaintTiming.InputToLargestContentfulPaint.Subframe.FullNavigation"
-    units="ms" expires_after="2020-01-24">
+    units="ms" expires_after="M97">
   <owner>bmcquade@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
+  <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
     The time from user input to largest &quot;contentful&quot; paint in an AMP
     subframe document. Only non-same-document navigations are included.
@@ -415,6 +520,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     Excludes any content painted after user input. The value is recorded at the
     end of each page load unless there is an abort or user input before text or
     image paint. See http://bit.ly/fcp_plus_plus for details.
+
+    This histogram has incomplete data. It expired after M78 and was re-added in
+    M90.
   </summary>
 </histogram>
 
@@ -539,6 +647,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="PageLoad.Clients.SubresourceLoading.CookiesQueryTime"
     units="ms" expires_after="M90">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -550,6 +661,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="PageLoad.Clients.SubresourceLoading.DaysSinceLastVisitToOrigin"
     units="days" expires_after="M90">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -561,6 +675,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="PageLoad.Clients.SubresourceLoading.HasPreviousVisitToOrigin"
     enum="BooleanPreviouslyVisited" expires_after="M90">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -574,6 +691,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="PageLoad.Clients.SubresourceLoading.HistoryQueryTime"
     units="ms" expires_after="M90">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -585,6 +705,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="PageLoad.Clients.SubresourceLoading.LoadedCSSJSBeforeFCP.Cached"
     units="count of subresources" expires_after="M90">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -596,6 +719,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="PageLoad.Clients.SubresourceLoading.LoadedCSSJSBeforeFCP.Noncached"
     units="count of subresources" expires_after="M90">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -607,6 +733,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="PageLoad.Clients.SubresourceLoading.MainFrameHadCookies"
     enum="Boolean" expires_after="M90">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -616,7 +745,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.Clients.ThirdParty.Frames.NavigationToFirstContentfulPaint3"
-    units="ms" expires_after="2021-04-18">
+    units="ms" expires_after="2021-08-22">
   <owner>jkarlin@chromium.org</owner>
   <owner>johnidel@chromium.org</owner>
   <summary>
@@ -627,7 +756,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Clients.ThirdParty.Origins.CookieRead2" units="Count"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>jkarlin@chromium.org</owner>
   <owner>yaoxia@chromium.org</owner>
   <summary>
@@ -637,7 +766,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Clients.ThirdParty.Origins.CookieWrite2"
-    units="Count" expires_after="2021-03-28">
+    units="Count" expires_after="2021-08-01">
   <owner>jkarlin@chromium.org</owner>
   <owner>yaoxia@chromium.org</owner>
   <summary>
@@ -648,7 +777,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Clients.ThirdParty.Origins.LocalStorageAccess2"
-    units="Count" expires_after="2021-05-02">
+    units="Count" expires_after="2021-07-04">
   <owner>yaoxia@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -658,7 +787,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Clients.ThirdParty.Origins.SessionStorageAccess2"
-    units="Count" expires_after="2021-05-09">
+    units="Count" expires_after="2021-07-11">
   <owner>yaoxia@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -669,7 +798,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.Clients.ThirdParty.PaintTiming.NavigationToLargestContentfulPaint.HasThirdPartyFont"
-    units="ms" expires_after="2020-12-31">
+    units="ms" expires_after="2021-12-31">
   <owner>shivanisha@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -679,10 +808,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram base="true" name="PageLoad.Cpu" units="units"
-    expires_after="2022-01-05">
-  <owner>ericrobinson@chromium.org</owner>
-  <owner>csharrison@chromium.org</owner>
+<histogram base="true" name="PageLoad.Cpu" units="units" expires_after="M92">
+  <owner>johnidel@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     Only recorded if the page has at least one identified ad frame. Recorded in
     PageLoadMetrics when the page is destroyed. Cpu measures the wall time of
@@ -695,7 +823,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="PageLoad.Cpu.TotalUsage" units="ms" expires_after="2021-04-04">
+<histogram name="PageLoad.Cpu.TotalUsage" units="ms" expires_after="2021-11-18">
   <owner>alexmt@chromium.org</owner>
   <owner>johnidel@chromium.org</owner>
   <summary>
@@ -707,7 +835,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Cpu.TotalUsageForegrounded" units="ms"
-    expires_after="2020-11-18">
+    expires_after="2021-11-18">
   <owner>alexmt@chromium.org</owner>
   <owner>johnidel@chromium.org</owner>
   <summary>
@@ -719,7 +847,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.DocumentTiming.NavigationToDOMContentLoadedEventFired"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-09">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -729,7 +857,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.DocumentTiming.NavigationToLoadEventFired" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -739,7 +867,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="PageLoad.Experimental.AbortTiming.Background"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-09">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -750,7 +878,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="PageLoad.Experimental.AbortTiming.Close"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-09">
   <owner>csharrison@chromium.org</owner>
   <summary>
     This metric is still experimental and not yet ready to be relied upon.
@@ -761,7 +889,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="PageLoad.Experimental.AbortTiming.ForwardBackNavigation" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>csharrison@chromium.org</owner>
   <summary>
     This metric is still experimental and not yet ready to be relied upon.
@@ -771,7 +899,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="PageLoad.Experimental.AbortTiming.NewNavigation"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-09">
   <owner>csharrison@chromium.org</owner>
   <summary>
     This metric is still experimental and not yet ready to be relied upon.
@@ -791,7 +919,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="PageLoad.Experimental.AbortTiming.Reload"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-09">
   <owner>csharrison@chromium.org</owner>
   <summary>
     This metric is still experimental and not yet ready to be relied upon.
@@ -801,7 +929,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="PageLoad.Experimental.AbortTiming.Stop" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>csharrison@chromium.org</owner>
   <summary>
     This metric is still experimental and not yet ready to be relied upon.
@@ -823,7 +951,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Experimental.Bytes.Network" units="KB"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>jkarlin@chromium.org</owner>
   <summary>
     The number of prefiltered (e.g., compressed) response body KiloBytes loaded
@@ -834,7 +962,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Experimental.Bytes.NetworkIncludingHeaders"
-    units="KB" expires_after="2021-04-04">
+    units="KB" expires_after="2021-08-09">
   <owner>jkarlin@chromium.org</owner>
   <summary>
     The number of prefiltered (e.g., compressed) KiloBytes loaded over the
@@ -845,7 +973,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Experimental.Bytes.Total2" units="KB"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>jkarlin@chromium.org</owner>
   <owner>johnidel@chromium.org</owner>
   <summary>
@@ -869,10 +997,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Experimental.ClickInputBurst" units="count"
-    expires_after="2021-05-02">
+    expires_after="2021-08-09">
   <owner>dougarnett@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
-  <owner>tdresser@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
   <summary>
     The maximum size click input burst for the page load. A click input burst is
     a sequence of user click inputs at approximately the same screen position
@@ -914,7 +1042,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.Experimental.EarlyHints.EarlyHintsToFinalResponseStart"
-    units="ms" expires_after="2021-06-11">
+    units="ms" expires_after="2021-08-15">
   <owner>nhiroki@chromium.org</owner>
   <owner>chrome-loading@google.com</owner>
   <summary>
@@ -927,7 +1055,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.Experimental.EarlyHints.FinalRequestStartToEarlyHints"
-    units="ms" expires_after="2021-06-11">
+    units="ms" expires_after="2021-08-15">
   <owner>nhiroki@chromium.org</owner>
   <owner>chrome-loading@google.com</owner>
   <summary>
@@ -939,7 +1067,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.Experimental.EarlyHints.FirstRequestStartToEarlyHints"
-    units="ms" expires_after="2021-06-11">
+    units="ms" expires_after="2021-08-15">
   <owner>nhiroki@chromium.org</owner>
   <owner>chrome-loading@google.com</owner>
   <summary>
@@ -950,9 +1078,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Experimental.InputTiming.InputToNavigationStart"
-    units="ms" expires_after="2021-04-18">
+    units="ms" expires_after="2021-08-22">
   <owner>sullivan@chromium.org</owner>
-  <owner>tdresser@chromium.org</owner>
   <summary>
     The time between the OS-level input event that initiated a navigation, and
     the navigation actually starting.
@@ -963,7 +1090,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     name="PageLoad.Experimental.InputTiming.InputToNavigationStart.Background"
     units="ms" expires_after="2020-09-05">
   <owner>sullivan@chromium.org</owner>
-  <owner>tdresser@chromium.org</owner>
   <summary>
     The time between the OS-level input event that initiated a navigation, and
     the navigation actually starting, for background loads.
@@ -974,7 +1100,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     name="PageLoad.Experimental.InputTiming.InputToNavigationStart.FromLinkClick"
     units="ms" expires_after="2020-09-05">
   <owner>sullivan@chromium.org</owner>
-  <owner>tdresser@chromium.org</owner>
   <summary>
     The time between the OS-level click/tap event and navigation start, for
     clicks on links in the renderer.
@@ -985,7 +1110,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     name="PageLoad.Experimental.InputTiming.InputToNavigationStart.FromOmnibox"
     units="ms" expires_after="2020-09-05">
   <owner>sullivan@chromium.org</owner>
-  <owner>tdresser@chromium.org</owner>
   <summary>
     The time between the OS-level keypress/tap event in the omnibox and
     navigation start, for navigations from the omnibox.
@@ -1042,7 +1166,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.Experimental.NavigationTiming.FirstResponseStartToFirstLoaderCallback"
-    units="ms" expires_after="2021-05-08">
+    units="ms" expires_after="2021-08-01">
   <owner>nhiroki@chromium.org</owner>
   <owner>chrome-loading@google.com</owner>
   <summary>
@@ -1054,7 +1178,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.Experimental.NavigationTiming.NavigationStartToFinalLoaderCallback"
-    units="ms" expires_after="2021-05-08">
+    units="ms" expires_after="2021-08-15">
   <owner>nhiroki@chromium.org</owner>
   <owner>chrome-loading@google.com</owner>
   <summary>
@@ -1065,7 +1189,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.Experimental.NavigationTiming.NavigationStartToFinalRequestStart"
-    units="ms" expires_after="2021-05-08">
+    units="ms" expires_after="2021-08-15">
   <owner>nhiroki@chromium.org</owner>
   <owner>chrome-loading@google.com</owner>
   <summary>
@@ -1076,7 +1200,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.Experimental.NavigationTiming.NavigationStartToFinalResponseStart"
-    units="ms" expires_after="2021-05-08">
+    units="ms" expires_after="2021-08-15">
   <owner>nhiroki@chromium.org</owner>
   <owner>chrome-loading@google.com</owner>
   <summary>
@@ -1087,7 +1211,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.Experimental.NavigationTiming.NavigationStartToFirstLoaderCallback"
-    units="ms" expires_after="2021-05-08">
+    units="ms" expires_after="2021-08-01">
   <owner>nhiroki@chromium.org</owner>
   <owner>chrome-loading@google.com</owner>
   <summary>
@@ -1098,7 +1222,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.Experimental.NavigationTiming.NavigationStartToFirstRequestStart"
-    units="ms" expires_after="2021-05-08">
+    units="ms" expires_after="2021-07-11">
   <owner>nhiroki@chromium.org</owner>
   <owner>chrome-loading@google.com</owner>
   <summary>
@@ -1109,7 +1233,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.Experimental.NavigationTiming.NavigationStartToFirstResponseStart"
-    units="ms" expires_after="2021-05-08">
+    units="ms" expires_after="2021-08-01">
   <owner>nhiroki@chromium.org</owner>
   <owner>chrome-loading@google.com</owner>
   <summary>
@@ -1120,7 +1244,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.Experimental.NavigationTiming.NavigationStartToNavigationCommitSent"
-    units="ms" expires_after="2021-05-08">
+    units="ms" expires_after="2021-07-11">
   <owner>nhiroki@chromium.org</owner>
   <owner>chrome-loading@google.com</owner>
   <summary>
@@ -1130,7 +1254,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Experimental.PageLoadType" enum="PageLoadType"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>npm@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
@@ -1143,6 +1267,67 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram
+    name="PageLoad.Experimental.PageTiming.CachedResourceLoadTime.{RequestDestination}"
+    units="ms" expires_after="2021-10-05">
+  <owner>cduvall@chromium.org</owner>
+  <owner>jam@chromium.org</owner>
+  <summary>
+    Measures the time from load start to when headers have been received for
+    resource requests which come from the cache. Logged for every
+    {RequestDestination} resource request from the cache.
+  </summary>
+  <token key="RequestDestination" variants="RequestDestination"/>
+</histogram>
+
+<histogram
+    name="PageLoad.Experimental.PageTiming.CommitSentToFirstSubresourceLoadStart"
+    units="ms" expires_after="2021-10-05">
+  <owner>cduvall@chromium.org</owner>
+  <owner>jam@chromium.org</owner>
+  <summary>
+    Measures the time from when the navigation commit was sent to the renderer
+    to the first subresource load start. Logged for every page load which has
+    subresources.
+  </summary>
+</histogram>
+
+<histogram
+    name="PageLoad.Experimental.PageTiming.NavigationToFirstSubresourceLoadStart"
+    units="ms" expires_after="2021-10-05">
+  <owner>cduvall@chromium.org</owner>
+  <owner>jam@chromium.org</owner>
+  <summary>
+    Measures the time from navigation start to the first subresource load start.
+    Logged for every page load which has subresources.
+  </summary>
+</histogram>
+
+<histogram
+    name="PageLoad.Experimental.PageTiming.ResourceLoadTime.{RequestDestination}"
+    units="ms" expires_after="2021-10-05">
+  <owner>cduvall@chromium.org</owner>
+  <owner>jam@chromium.org</owner>
+  <summary>
+    Measures the time from load start to when headers have been received for
+    resource requests which do not come from the cache. Logged for every
+    {RequestDestination} resource request which is not from the cache.
+  </summary>
+  <token key="RequestDestination" variants="RequestDestination"/>
+</histogram>
+
+<histogram
+    name="PageLoad.Experimental.PageTiming.TotalSubresourceLoadTimeAtFirstContentfulPaint"
+    units="ms" expires_after="2021-10-05">
+  <owner>cduvall@chromium.org</owner>
+  <owner>jam@chromium.org</owner>
+  <summary>
+    Measures the aggregate time of subresource requests (from start to when
+    headers have been received) which have been completed before the first
+    contentful paint. Logged for every page load.
+  </summary>
+</histogram>
+
 <histogram name="PageLoad.Experimental.PaintTiming.FirstMeaningfulPaintStatus"
     enum="FirstMeaningfulPaintStatus" expires_after="2021-01-31">
   <owner>ksakamoto@chromium.org</owner>
@@ -1155,7 +1340,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Experimental.PaintTiming.InputToFirstContentfulPaint"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-09">
   <owner>sullivan@chromium.org</owner>
   <summary>
     The time between the OS-level input event that initiated a navigation, and
@@ -1196,7 +1381,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.Experimental.PaintTiming.NavigationToFirstMeaningfulPaint"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-09">
   <owner>ksakamoto@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
@@ -1220,7 +1405,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Experimental.TotalForegroundDuration" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>npm@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
@@ -1236,9 +1421,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.FrameCounts.AdFrames.PerFrame.CreativeOriginStatus"
-    enum="CrossOriginCreativeStatus" expires_after="2020-12-31">
+    enum="CrossOriginCreativeStatus" expires_after="2021-06-30">
   <owner>cammie@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     For each identified ad frame, whether the origin of the ad creative frame
     matches or differs from the origin of the main frame.
@@ -1252,9 +1438,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.FrameCounts.AdFrames.PerFrame.CreativeOriginStatusWithThrottling"
-    enum="CrossOriginCreativeStatusWithThrottling" expires_after="2020-12-31">
+    enum="CrossOriginCreativeStatusWithThrottling" expires_after="2021-06-30">
   <owner>cammie@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     For each identified ad frame, whether the origin of the ad creative frame
     matches or differs from the origin of the main frame, further split by
@@ -1271,8 +1458,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.FrameCounts.AdFrames.PerFrame.OriginStatus"
-    enum="CrossOriginAdStatus" expires_after="M88">
-  <owner>ericrobinson@chromium.org</owner>
+    enum="CrossOriginAdStatus" expires_after="M92">
+  <owner>johnidel@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     For each identified ad frame, whether the origin of the ad matches the
     origin of the main frame, differs from the origin of the main frame, or is
@@ -1286,7 +1474,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.FrameCounts.AdFrames.PerFrame.UserActivation"
-    enum="AdUserActivationStatus" expires_after="2021-01-17">
+    enum="AdUserActivationStatus" expires_after="2021-10-01">
   <owner>johnidel@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -1319,6 +1507,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true" name="PageLoad.HeavyAds.ComputedType2"
     enum="HeavyAdStatus2" expires_after="2021-02-01">
+  <obsolete>
+    Removed 01/2020, use PageLoad.HeavyAds.ComputedTypeWithThresholdNoise
+    instead.
+  </obsolete>
   <owner>johnidel@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -1334,7 +1526,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="PageLoad.HeavyAds.ComputedTypeWithThresholdNoise"
-    enum="HeavyAdStatus2" expires_after="2021-02-01">
+    enum="HeavyAdStatus2" expires_after="2022-02-01">
   <owner>johnidel@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -1354,7 +1546,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="PageLoad.HeavyAds.InterventionType2"
-    enum="HeavyAdStatus2" expires_after="2021-02-01">
+    enum="HeavyAdStatus2" expires_after="2022-02-01">
   <owner>johnidel@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -1371,15 +1563,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="PageLoad.InputTiming.NavigationToFirstNonScroll.AfterPaint"
     units="ms" expires_after="M77">
-  <owner>tdresser@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
   <summary>
     Measures the time to first non-scroll input after the first paint.
   </summary>
 </histogram>
 
 <histogram name="PageLoad.InputTiming.NavigationToFirstScroll.AfterPaint"
-    units="ms" expires_after="2021-06-22">
-  <owner>tdresser@chromium.org</owner>
+    units="ms" expires_after="2021-08-22">
+  <owner>flackr@chromium.org</owner>
   <owner>input-dev@chromium.org</owner>
   <summary>
     Measures the time to first scroll input after the first paint.
@@ -1406,7 +1598,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     expires_after="never">
 <!-- expires-never: guiding metric (internal: go/chrome-browser-guiding-metrics) -->
 
-  <owner>tdresser@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <owner>chrome-analysis-team@google.com</owner>
   <summary>
@@ -1423,8 +1615,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.InteractiveTiming.FirstInputTimestamp4" units="ms"
-    expires_after="2021-04-25">
-  <owner>tdresser@chromium.org</owner>
+    expires_after="2021-06-27">
+  <owner>sullivan@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
     The duration between navigation start and the hardware timestamp of the
@@ -1437,7 +1629,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     expires_after="never">
 <!-- expires-never: guiding metric (internal: go/chrome-browser-guiding-metrics) -->
 
-  <owner>tdresser@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <owner>chrome-analysis-team@google.com</owner>
   <summary>
@@ -1466,7 +1658,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.InteractiveTiming.LongestInputDelay4" units="ms"
-    expires_after="2021-01-23">
+    expires_after="M97">
   <owner>sullivan@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
@@ -1477,7 +1669,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.InteractiveTiming.LongestInputTimestamp4" units="ms"
-    expires_after="2021-01-23">
+    expires_after="M97">
   <owner>sullivan@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
@@ -1500,7 +1692,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Internal.ClientRedirect.NavigationWithoutPaint"
-    enum="Boolean" expires_after="2021-04-18">
+    enum="Boolean" expires_after="2021-08-09">
   <owner>bmcquade@chromium.org</owner>
   <summary>
     Counts how often a client-side redirect was initiated from a page that did
@@ -1512,7 +1704,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Internal.ErrorCode" enum="InternalErrorLoadEvent"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>csharrison@chromium.org</owner>
   <owner>bmcquade@chromium.org</owner>
   <summary>
@@ -1521,7 +1713,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Internal.NavigationStartedInForeground"
-    enum="BooleanForeground" expires_after="2021-04-04">
+    enum="BooleanForeground" expires_after="2021-08-09">
   <owner>bmcquade@chromium.org</owner>
   <summary>Whether a navigation started in the foreground.</summary>
 </histogram>
@@ -1593,7 +1785,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.Internal.PaintTiming.LargestContentfulPaint.ContentType"
-    enum="LargestContentType" expires_after="2021-04-04">
+    enum="LargestContentType" expires_after="2021-08-09">
   <owner>maxlg@chromium.org</owner>
   <owner>npm@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
@@ -1607,7 +1799,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PageLoad.Internal.PaintTiming.LargestContentfulPaint.MainFrame.ContentType"
-    enum="LargestContentType" expires_after="2021-04-04">
+    enum="LargestContentType" expires_after="2021-08-09">
   <owner>maxlg@chromium.org</owner>
   <owner>npm@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
@@ -1731,9 +1923,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.LayoutInstability.CumulativeShiftScore"
-    units="scorex10" expires_after="2021-04-04">
+    units="scorex10" expires_after="never">
+<!-- expires-never: guiding metric (internal: go/chrome-browser-guiding-metrics) -->
+
   <owner>bmcquade@chromium.org</owner>
   <owner>skobes@chromium.org</owner>
+  <owner>chrome-analysis-team@google.com</owner>
   <summary>
     Measures the cumulative layout shift score (bit.ly/lsm-explainer) that has
     occurred on the page (including all subframes). Recorded at the end of the
@@ -1741,6 +1936,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     tab is being closed. Stable since M79; previous versions are expermental and
     subject to fluctuation between releases.
 
+    This histogram is of special interest to the chrome-analysis-team@. Do not
+    change its semantics or retire it without talking to them first.
+
     Log of major changes: http://bit.ly/chrome-speed-metrics-changelog
   </summary>
 </histogram>
@@ -1760,7 +1958,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.LayoutInstability.CumulativeShiftScore.MainFrame"
-    units="scorex10" expires_after="2021-04-04">
+    units="scorex10" expires_after="2021-08-09">
   <owner>bmcquade@chromium.org</owner>
   <owner>skobes@chromium.org</owner>
   <summary>
@@ -1785,10 +1983,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Memory.Aggregate.Max" units="KiB"
-    expires_after="2021-01-31">
+    expires_after="2021-07-31">
   <owner>cammie@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <owner>johnidel@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     The maximum reported aggregate number of kilobytes of memory used by V8 by
     ad frames in this pageload. The value recorded is the maximum simultaneous
@@ -1802,10 +2001,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.Memory.PerFrame.Max" units="KiB"
-    expires_after="2021-01-31">
+    expires_after="2021-07-31">
   <owner>cammie@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <owner>johnidel@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     The maximum reported number of kilobytes of memory used by V8 by frames in
     the ad frame tree in this pageload. The value recorded is the maximum
@@ -1828,7 +2028,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.PageTiming.ForegroundDuration" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>bmcquade@chromium.org</owner>
   <summary>
     For page loads that start in the foreground, measures the duration of time
@@ -1865,7 +2065,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.PageTiming.NavigationToFirstForeground" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -1876,8 +2076,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.PaintTiming.ForegroundToFirstContentfulPaint"
-    units="ms" expires_after="2021-04-04">
-  <owner>tdresser@chromium.org</owner>
+    units="ms" expires_after="2021-08-09">
+  <owner>sullivan@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
     Measures the time from a background tab being switched to the foreground to
@@ -1887,7 +2087,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="PageLoad.PaintTiming.ForegroundToFirstPaint" units="ms"
     expires_after="2020-08-14">
-  <owner>tdresser@chromium.org</owner>
+  <owner>sullivan@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
     Measures the time from a background tab being switched to the foreground to
@@ -1950,8 +2150,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.PaintTiming.NavigationToFirstImagePaint" units="ms"
-    expires_after="2021-04-04">
-  <owner>tdresser@chromium.org</owner>
+    expires_after="2021-08-09">
+  <owner>sullivan@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
     Measures the time from navigation timing's navigation start to the time the
@@ -1961,7 +2161,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.PaintTiming.NavigationToFirstPaint" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>ksakamoto@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
@@ -2008,9 +2208,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.PaintTiming.NavigationToLargestContentfulPaint"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-08">
   <owner>maxlg@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
+  <owner>chrome-analysis-team@google.com</owner>
   <summary>
     Measures the time from navigation timing's navigation start to the time the
     largest content (text or image) is first painted, across all frames.
@@ -2022,13 +2223,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     PageLoad.PaintTiming.NavigationToLargestContentfulPaint2 and will become
     obsolete soon.
 
+    Do not modify this metric in any way without contacting
+    speed-metrics-dev@chromium.org AND chrome-analysis-team@google.com.
+
     Log of major changes: http://bit.ly/chrome-speed-metrics-changelog
   </summary>
 </histogram>
 
 <histogram
     name="PageLoad.PaintTiming.NavigationToLargestContentfulPaint.MainFrame"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-09">
   <owner>maxlg@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
   <summary>
@@ -2069,7 +2273,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.PaintTiming.ParseStartToFirstContentfulPaint"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-09">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <owner>speed-metrics-dev@chromium.org</owner>
@@ -2080,7 +2284,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.ParseTiming.NavigationToParseStart" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -2112,7 +2316,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.ParseTiming.ParseBlockedOnScriptLoad" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
@@ -2134,12 +2338,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageLoad.ParseTiming.ParseDuration" units="ms"
-    expires_after="M81">
+    expires_after="2021-10-09">
   <owner>bmcquade@chromium.org</owner>
   <owner>csharrison@chromium.org</owner>
   <summary>
     Measures the time that the HTML parser was active, for main frame documents
     that finished parsing.
+
+    Warning: this histogram was expired after M81 and brought back 2021-04-13;
+    data may be missing.
   </summary>
 </histogram>
 
@@ -2195,7 +2402,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageSerialization.MhtmlGeneration.FinalSaveStatus"
-    enum="MhtmlGenerationFinalSaveStatus" expires_after="2021-04-04">
+    enum="MhtmlGenerationFinalSaveStatus" expires_after="2021-08-08">
   <owner>sclittle@chromium.org</owner>
   <owner>offline-dev@chromium.org</owner>
   <summary>Final status of the MHTML save operation for a page.</summary>
@@ -2268,7 +2475,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PageSerialization.MhtmlLoading.LoadResult"
-    enum="MhtmlLoadResult" expires_after="2021-04-04">
+    enum="MhtmlLoadResult" expires_after="2021-06-27">
   <owner>sclittle@chromium.org</owner>
   <owner>offline-dev@chromium.org</owner>
   <summary>Reports the result of an attempt to load an MHTML archive.</summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/password/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/password/histograms.xml
index d7679e3c840..99273d56c83 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/password/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/password/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="PasswordBubble.CompromisedBubble.CheckClicked"
-    enum="BooleanClicked" expires_after="2021-05-09">
+    enum="BooleanClicked" expires_after="2021-07-11">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -32,7 +32,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordBubble.CompromisedBubble.Type"
-    enum="PasswordBubbleFollowupType" expires_after="2021-05-09">
+    enum="PasswordBubbleFollowupType" expires_after="2021-07-11">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -42,7 +42,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordBubble.DisplayDisposition"
-    enum="PasswordBubbleDisplayDisposition" expires_after="2021-04-04">
+    enum="PasswordBubbleDisplayDisposition" expires_after="2021-08-09">
   <owner>vasilii@chromium.org</owner>
   <summary>
     When the password management bubble opened, what state was it in?
@@ -50,7 +50,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordGeneration.Event" enum="PasswordGenerationEvent"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>kolos@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
@@ -67,7 +67,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordGeneration.GeneratedPasswordWasEdited"
-    enum="BooleanGeneratedPasswordWasEdited" expires_after="2021-05-09">
+    enum="BooleanGeneratedPasswordWasEdited" expires_after="2021-07-11">
   <owner>kolos@chromium.org</owner>
   <summary>
     Measures the frequency of user editing of generated passwords. Uploaded once
@@ -77,6 +77,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="PasswordGeneration.IsTriggeredManually"
     enum="BooleanIsGenerationTriggeredManually" expires_after="M81">
+  <obsolete>
+    Expired in M82; deleted in M90.
+  </obsolete>
   <owner>kolos@chromium.org</owner>
   <summary>
     Measures the frequency of manually triggered password generations.
@@ -84,14 +87,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordGeneration.PopupShown"
-    enum="PasswordGenerationPopupShown" expires_after="M92">
+    enum="PasswordGenerationPopupShown" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>kazinova@google.com</owner>
   <summary>Records an entry if (and only if) a popup was shown.</summary>
 </histogram>
 
 <histogram name="PasswordGeneration.SubmissionAvailableEvent"
-    enum="PasswordSubmissionEvent" expires_after="M90">
+    enum="PasswordSubmissionEvent" expires_after="M95">
   <owner>jdoerrie@chromium.org</owner>
   <owner>kolos@chromium.org</owner>
   <summary>
@@ -102,7 +105,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordGeneration.SubmissionEvent"
-    enum="PasswordSubmissionEvent" expires_after="2021-05-09">
+    enum="PasswordSubmissionEvent" expires_after="2021-07-11">
   <owner>jdoerrie@chromium.org</owner>
   <owner>kolos@chromium.org</owner>
   <summary>
@@ -113,7 +116,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordGeneration.UploadStarted" enum="Boolean"
-    expires_after="M90">
+    expires_after="M95">
   <owner>jdoerrie@chromium.org</owner>
   <owner>kolos@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
@@ -127,7 +130,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordGeneration.UserDecision"
-    enum="PasswordGenerationUserEvent" expires_after="2021-03-28">
+    enum="PasswordGenerationUserEvent" expires_after="2021-08-01">
   <owner>ioanap@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -145,7 +148,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AbleToSavePasswordsOnSuccessfulLogin"
-    enum="BooleanSuccess" expires_after="M90">
+    enum="BooleanSuccess" expires_after="2021-08-22">
   <owner>vasilii@chromium.org</owner>
   <owner>src/components/password_manager/OWNERS</owner>
   <summary>
@@ -156,7 +159,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AcceptedSaveUpdateSubmissionIndicatorEvent"
-    enum="SubmissionIndicatorEvent" expires_after="M90">
+    enum="SubmissionIndicatorEvent" expires_after="2021-08-22">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -167,7 +170,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AccessPasswordInSettings"
-    enum="AccessPasswordInSettingsEvent" expires_after="M92">
+    enum="AccessPasswordInSettingsEvent" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -196,7 +199,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="PasswordManager.AccountsPerSiteHiRes"
-    units="units" expires_after="2021-04-18">
+    units="units" expires_after="2021-08-22">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -208,7 +211,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AccountStorage.ClearedOnStartup"
-    enum="PasswordAccountStoreClearedOnStartup" expires_after="M90">
+    enum="PasswordAccountStoreClearedOnStartup" expires_after="M95">
   <owner>mamir@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -218,7 +221,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AccountStorage.ClearedOptInForAllAccounts"
-    units="accounts" expires_after="M90">
+    units="accounts" expires_after="M95">
   <owner>mamir@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -230,7 +233,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AccountStorage.MoveToAccountStoreFlowAccepted"
-    enum="PasswordManager.MoveToAccountStoreTrigger" expires_after="2021-06-18">
+    enum="PasswordManager.MoveToAccountStoreTrigger" expires_after="M95">
   <owner>treib@chromium.org</owner>
   <owner>victorvianna@google.com</owner>
   <summary>
@@ -242,7 +245,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AccountStorage.MoveToAccountStoreFlowOffered"
-    enum="PasswordManager.MoveToAccountStoreTrigger" expires_after="2021-06-19">
+    enum="PasswordManager.MoveToAccountStoreTrigger" expires_after="M95">
   <owner>treib@chromium.org</owner>
   <owner>victorvianna@google.com</owner>
   <summary>
@@ -252,8 +255,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram
+    name="PasswordManager.AccountStorage.MoveToAccountStorePasswordsCount"
+    units="credentials" expires_after="M95">
+  <owner>mamir@chromium.org</owner>
+  <owner>treib@chromium.org</owner>
+  <summary>
+    Records the number of credentials the user decided to move from the device
+    store to the account store from moving multiple passwords dialog in
+    settings. Recorded after the user hits the action button in the dialog.
+    Recorded only in Win/Mac/Linux.
+  </summary>
+</histogram>
+
 <histogram name="PasswordManager.AccountStorage.NumOptedInAccountsAfterOptIn"
-    units="accounts" expires_after="M90">
+    units="accounts" expires_after="M95">
   <owner>mamir@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -264,7 +280,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AccountStorage.NumOptedInAccountsAfterOptOut"
-    units="accounts" expires_after="M90">
+    units="accounts" expires_after="M95">
   <owner>mamir@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -276,7 +292,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PasswordManager.AccountStorage.SignedInAccountFoundDuringOptOut"
-    enum="Boolean" expires_after="2021-05-06">
+    enum="Boolean" expires_after="M95">
   <owner>treib@chromium.org</owner>
   <owner>victorvianna@google.com</owner>
   <summary>
@@ -291,7 +307,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PasswordManager.AccountStorage.UnsyncedPasswordsFoundDuringSignOut"
-    units="passwords" expires_after="2021-06-18">
+    units="passwords" expires_after="M95">
   <owner>treib@chromium.org</owner>
   <owner>victorvianna@google.com</owner>
   <summary>
@@ -302,7 +318,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="PasswordManager.AccountStorageUserStateDuration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="M95">
 <!-- Name completed by histogram_suffixes name="PasswordAccountStorageUserState" -->
 
   <owner>mamir@chromium.org</owner>
@@ -331,7 +347,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="PasswordManager.AccountStore.AccountsPerSiteHiRes"
-    units="units" expires_after="M90">
+    units="units" expires_after="M95">
   <owner>jdoerrie@chromium.org</owner>
   <owner>mamir@chromium.org</owner>
   <owner>treib@chromium.org</owner>
@@ -346,7 +362,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="PasswordManager.AccountStore.BlacklistedSitesHiRes" units="sites"
-    expires_after="M90">
+    expires_after="M95">
   <owner>jdoerrie@chromium.org</owner>
   <owner>mamir@chromium.org</owner>
   <owner>treib@chromium.org</owner>
@@ -359,7 +375,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AccountStore.EmptyUsernames.CountInDatabase"
-    units="units" expires_after="M90">
+    units="units" expires_after="M95">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <owner>mamir@chromium.org</owner>
@@ -371,7 +387,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AccountStore.InaccessiblePasswords"
-    units="saved passwords" expires_after="M90">
+    units="saved passwords" expires_after="M95">
   <owner>vasilii@chromium.org</owner>
   <owner>mamir@chromium.org</owner>
   <owner>treib@chromium.org</owner>
@@ -382,7 +398,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="PasswordManager.AccountStore.TimesPasswordUsed"
-    units="PasswordUses" expires_after="M90">
+    units="PasswordUses" expires_after="M95">
   <owner>battre@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <owner>mamir@chromium.org</owner>
@@ -398,7 +414,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="PasswordManager.AccountStore.TotalAccountsHiRes.ByType" units="units"
-    expires_after="M90">
+    expires_after="M95">
   <owner>battre@chromium.org</owner>
   <owner>mamir@chromium.org</owner>
   <owner>treib@chromium.org</owner>
@@ -413,7 +429,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true"
     name="PasswordManager.AccountStore.TotalAccountsHiRes.WithScheme"
-    units="accounts" expires_after="M90">
+    units="accounts" expires_after="M95">
   <owner>battre@chromium.org</owner>
   <owner>mamir@chromium.org</owner>
   <owner>treib@chromium.org</owner>
@@ -428,7 +444,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AccountStoreBlocklistedEntriesAfterOptIn"
-    units="credentials" expires_after="M90">
+    units="credentials" expires_after="M95">
   <owner>treib@chromium.org</owner>
   <owner>mamir@chromium.org</owner>
   <summary>
@@ -438,7 +454,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AccountStoreCredentialsAfterOptIn"
-    units="credentials" expires_after="M90">
+    units="credentials" expires_after="M95">
   <owner>treib@chromium.org</owner>
   <owner>mamir@chromium.org</owner>
   <summary>
@@ -448,7 +464,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AccountStoreVsProfileStore.{DifferenceType}"
-    units="accounts" expires_after="M90">
+    units="accounts" expires_after="M95">
   <owner>mamir@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -476,7 +492,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AccountStoreVsProfileStore2.{DifferenceType}"
-    units="accounts" expires_after="M90">
+    units="accounts" expires_after="M95">
   <owner>mamir@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -549,7 +565,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AffiliationFetcher.FetchResult"
-    enum="AffiliationFetchResult" expires_after="M90">
+    enum="AffiliationFetchResult" expires_after="2021-07-18">
   <owner>engedy@chromium.org</owner>
   <summary>
     Whether the network fetch succeeded, failed due to network/server errors, or
@@ -557,8 +573,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="PasswordManager.AffiliationService.GetChangePasswordUsage"
+    enum="GetChangePasswordUrlMetric" expires_after="M93">
+  <owner>vsemeniuk@google.com</owner>
+  <owner>vasilii@chromium.org</owner>
+  <summary>
+    Usage and timing of the Affiliation Service GetChangePasswordUrl call.
+  </summary>
+</histogram>
+
 <histogram name="PasswordManager.AllPasswordsBottomSheet.UserAction"
-    enum="AllPasswordsBottomSheetActions" expires_after="M90">
+    enum="AllPasswordsBottomSheetActions" expires_after="2021-08-22">
   <owner>redatawfik@google.com</owner>
   <owner>fhorschig@chromium.org</owner>
   <summary>
@@ -580,17 +605,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.Android.PasswordCredentialEntry"
-    enum="PasswordManagerAndroidPasswordEntryActions" expires_after="M90">
+    enum="PasswordManagerAndroidPasswordEntryActions" expires_after="M95">
   <owner>fhorschig@chromium.org</owner>
   <owner>ioanap@chromium.org</owner>
   <summary>
     Records the action taken with a password credential entry in the preferences
-    on Android.
+    on Android. This includes opening the UI surface.
   </summary>
 </histogram>
 
 <histogram name="PasswordManager.Android.PasswordCredentialEntry.Password"
-    enum="PasswordManagerAndroidPasswordActions" expires_after="M90">
+    enum="PasswordManagerAndroidPasswordActions" expires_after="M95">
   <owner>fhorschig@chromium.org</owner>
   <owner>ioanap@chromium.org</owner>
   <summary>
@@ -600,47 +625,53 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.Android.PasswordCredentialEntry.Username"
-    enum="PasswordManagerAndroidUsernameActions" expires_after="M90">
+    enum="PasswordManagerAndroidUsernameActions" expires_after="M95">
   <owner>fhorschig@chromium.org</owner>
   <owner>ioanap@chromium.org</owner>
   <summary>
     Records the action taken with a username of a password credential entry in
-    the preferences on Android.
+    the preferences on Android. It can be analyzed together with
+    PasswordManager.Android.PasswordCredentialEntry which records how many times
+    this UI was shown.
   </summary>
 </histogram>
 
 <histogram name="PasswordManager.Android.PasswordCredentialEntry.Website"
-    enum="PasswordManagerAndroidWebsiteActions" expires_after="M90">
+    enum="PasswordManagerAndroidWebsiteActions" expires_after="M95">
   <owner>fhorschig@chromium.org</owner>
   <owner>ioanap@chromium.org</owner>
   <summary>
     Records the action taken with a website of a password credential entry on
-    Android.
+    Android. It can be analyzed together with
+    PasswordManager.Android.PasswordCredentialEntry which records how many times
+    this UI was shown.
   </summary>
 </histogram>
 
 <histogram name="PasswordManager.Android.PasswordExceptionEntry"
-    enum="PasswordManagerAndroidPasswordEntryActions" expires_after="M90">
+    enum="PasswordManagerAndroidPasswordEntryActions" expires_after="M95">
   <owner>fhorschig@chromium.org</owner>
   <owner>ioanap@chromium.org</owner>
   <summary>
     Records the action taken with a password exception entry in the preferences
-    on Android.
+    on Android. This includes opening the UI surface.
   </summary>
 </histogram>
 
 <histogram name="PasswordManager.Android.PasswordExceptionEntry.Website"
-    enum="PasswordManagerAndroidWebsiteActions" expires_after="M90">
+    enum="PasswordManagerAndroidWebsiteActions" expires_after="M95">
   <owner>fhorschig@chromium.org</owner>
   <owner>ioanap@chromium.org</owner>
   <summary>
     Records the action taken with a website of a password exception entry in the
-    preferences on Android.
+    preferences on Android. It can be analyzed together with
+    PasswordManager.Android.PasswordExceptionEntry which records how many times
+    this UI was shown.
   </summary>
 </histogram>
 
 <histogram name="PasswordManager.ApplySyncChanges.AddLoginSyncError"
-    enum="PasswordAddLoginSyncError" expires_after="2021-01-31">
+    enum="PasswordAddLoginSyncError" expires_after="2021-07-31">
   <owner>mamir@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -651,7 +682,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.ApplySyncChanges.UpdateLoginSyncError"
-    enum="PasswordUpdateLoginSyncError" expires_after="2021-01-31">
+    enum="PasswordUpdateLoginSyncError" expires_after="2021-07-31">
   <owner>mamir@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -662,7 +693,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.ApplySyncChangesState"
-    enum="PasswordApplySyncChangesState" expires_after="2021-01-31">
+    enum="PasswordApplySyncChangesState" expires_after="2021-07-31">
   <owner>mamir@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -673,7 +704,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AutomaticChange.AcceptanceWithAutoButton"
-    enum="PasswordCheckResolutionAction" expires_after="M90">
+    enum="PasswordCheckResolutionAction" expires_after="2021-08-15">
   <owner>kolos@chromium.org</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -683,7 +714,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AutomaticChange.AcceptanceWithoutAutoButton"
-    enum="PasswordCheckResolutionAction" expires_after="M90">
+    enum="PasswordCheckResolutionAction" expires_after="2021-08-08">
   <owner>kolos@chromium.org</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -693,7 +724,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AutomaticChange.ForSitesWithScripts"
-    enum="PasswordCheckResolutionAction" expires_after="M90">
+    enum="PasswordCheckResolutionAction" expires_after="2021-08-15">
   <owner>kolos@chromium.org</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -704,7 +735,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.AutoSigninFirstRunDialog"
-    enum="AutoSigninFirstRun" expires_after="2021-02-14">
+    enum="AutoSigninFirstRun" expires_after="2021-06-27">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -713,7 +744,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="PasswordManager.BlacklistedSitesHiRes"
-    units="sites" expires_after="M92">
+    units="sites" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -735,7 +766,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.CanceledCredentials"
-    units="credentials" expires_after="2021-02-01">
+    units="credentials" expires_after="2021-07-01">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -745,7 +776,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.CanceledTime" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -754,7 +785,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.CheckedCredentials"
-    units="credentials" expires_after="2021-04-04">
+    units="credentials" expires_after="2021-08-09">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -764,14 +795,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.Error"
-    enum="PasswordLeakDetectionError" expires_after="2021-04-04">
+    enum="PasswordLeakDetectionError" expires_after="2021-08-09">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>Error encountered during the password bulk check.</summary>
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.LeaksFound" units="credentials"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -790,7 +821,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.PasswordCheckReferrerAndroid"
-    enum="PasswordCheckReferrerAndroid" expires_after="M90">
+    enum="PasswordCheckReferrerAndroid" expires_after="2021-08-22">
   <owner>ioanap@chromium.org</owner>
   <owner>fhorschig@chromium.org</owner>
   <summary>
@@ -800,7 +831,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.Time" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -809,7 +840,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.TimePerCredential" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -819,14 +850,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.UserAction"
-    enum="PasswordCheckInteraction" expires_after="2021-04-04">
+    enum="PasswordCheckInteraction" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>User actions performed on the Password Check settings page.</summary>
 </histogram>
 
 <histogram name="PasswordManager.BulkCheck.UserActionAndroid"
-    enum="PasswordCheckUIUserActionAndroid" expires_after="2021-04-04">
+    enum="PasswordCheckUIUserActionAndroid" expires_after="2021-08-09">
   <owner>ioanap@chromium.org</owner>
   <owner>fhorschigg@chromium.org</owner>
   <summary>User actions performed on the Password Check settings view.</summary>
@@ -875,32 +906,32 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.CleanedUpPasswords" units="units"
-    expires_after="M90">
+    expires_after="M95">
   <owner>vasilii@chromium.org</owner>
   <owner>src/components/password_manager/OWNERS</owner>
   <summary>
     Collects positive number of undecryptable passwords that were successfully
-    deleted when syncing was enabled. Called for sync user for each profile if
-    there is at least one password deleted when merging logins from Sync and
+    deleted when syncing was enabled. Recorded for sync users for each profile
+    if there is at least one password deleted when merging logins from Sync and
     local database.
   </summary>
 </histogram>
 
-<histogram name="PasswordManager.CompromisedCredentials" enum="CompromiseType"
-    expires_after="2021-04-26">
+<histogram name="PasswordManager.CompromisedCredentials"
+    enum="InsecureCredentialsType" expires_after="2021-07-27">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
-    Collects the type of compromised credential when it is added, updated, or
-    removed from the table. Compromised credentials are saved passwords that are
-    added when they are leaked or phished, updated when signon_realm and/or
-    username is changed, or removed when the password is dropped from the
-    password_manager or the password has changed.
+    Collects the type of insecure credential when it is added to or removed from
+    the table. Insecure credentials are properties of saved passwords that are
+    added when they are identified as leaked, phished, weak, or reused. They are
+    removed when the password is dropped from the password_manager or the
+    password has changed.
   </summary>
 </histogram>
 
 <histogram name="PasswordManager.CompromisedCredentials.CountLeaked"
-    units="credentials" expires_after="2021-03-28">
+    units="credentials" expires_after="2021-08-01">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -910,7 +941,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PasswordManager.CompromisedCredentials.CountLeakedAfterBulkCheck"
-    units="credentials" expires_after="2021-03-28">
+    units="credentials" expires_after="2021-08-01">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -920,7 +951,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.CompromisedCredentials.CountPhished"
-    units="credentials" expires_after="2021-03-28">
+    units="credentials" expires_after="2021-07-27">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -929,7 +960,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.CredentialsCountFromAccountStoreAfterUnlock"
-    units="credentials" expires_after="2021-05-09">
+    units="credentials" expires_after="M95">
   <owner>fhorschig@chromium.org</owner>
   <owner>mamir@chromium.org</owner>
   <summary>
@@ -940,7 +971,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.CredentialsWithDuplicates" units="units"
-    expires_after="M90">
+    expires_after="M95">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -955,7 +986,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.CredentialsWithMismatchedDuplicates"
-    units="units" expires_after="M90">
+    units="units" expires_after="M95">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -970,7 +1001,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.DefaultPasswordStoreSet"
-    enum="PasswordManager.Store" expires_after="M90">
+    enum="PasswordManager.Store" expires_after="2021-08-22">
   <owner>mamir@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -980,7 +1011,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.DeleteUndecryptableLoginsReturnValue"
-    enum="DeleteCorruptedPasswordsResult" expires_after="M89">
+    enum="DeleteCorruptedPasswordsResult" expires_after="M93">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -991,7 +1022,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.DropdownShown.OffTheRecord" units="units"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>rhalavati@chromium.org</owner>
   <owner>chrome-privacy-core@google.com</owner>
   <summary>
@@ -1014,9 +1045,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.EditsInSaveBubble"
-    enum="PasswordManagerEditsInSaveBubbleEnum" expires_after="2021-01-30">
-  <owner>battre@chromium.org</owner>
+    enum="PasswordManagerEditsInSaveBubbleEnum" expires_after="2021-06-30">
   <owner>vasilii@chromium.org</owner>
+  <owner>jdoerrie@chromium.org</owner>
   <summary>
     Indication whether users change the credentials (username and password) in
     the save bubble of the password manager, considering only cases where the
@@ -1026,6 +1057,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="PasswordManager.EmptyUsernames.CountInDatabase" units="units"
     expires_after="M89">
+  <obsolete>
+    Obsolete since M90.
+  </obsolete>
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -1035,7 +1069,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.Enabled" enum="BooleanEnabled"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1055,7 +1089,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.FilledCredentialWasFromAndroidApp"
-    enum="PasswordManagerFilledAndroidCredentials" expires_after="M90">
+    enum="PasswordManagerFilledAndroidCredentials" expires_after="M95">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1064,7 +1098,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.FillingAssistance"
-    enum="PasswordManagerFillingAssistance" expires_after="2021-04-04">
+    enum="PasswordManagerFillingAssistance" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -1088,7 +1122,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.FillingSource"
-    enum="PasswordManagerFillingSource" expires_after="2021-04-25">
+    enum="PasswordManagerFillingSource" expires_after="2021-06-27">
   <owner>mamir@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -1100,7 +1134,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.FillSuggestionsIncludeAndroidAppCredentials"
-    enum="PasswordManagerOfferedAndroidCredentials" expires_after="M90">
+    enum="PasswordManagerOfferedAndroidCredentials" expires_after="M95">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1110,7 +1144,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.FirstRendererFillingResult"
-    enum="PasswordManagerFirstRendererFillingResult" expires_after="M92">
+    enum="PasswordManagerFirstRendererFillingResult" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -1123,7 +1157,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.FirstWaitForUsernameReason"
-    enum="PasswordManagerFirstWaitForUsernameReason" expires_after="M92">
+    enum="PasswordManagerFirstWaitForUsernameReason" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -1136,7 +1170,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.FormDataDeserializationStatus"
-    enum="FormDataDeserializationStatus" expires_after="M90">
+    enum="FormDataDeserializationStatus" expires_after="M95">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1146,8 +1180,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="PasswordManager.FormSubmission.PerProfileType"
+    enum="BrowserProfileType" expires_after="2022-02-02">
+  <owner>rhalavati@chromium.org</owner>
+  <owner>chrome-privacy-core@google.com</owner>
+  <summary>
+    This histogram records the browser profile type when a password form is
+    submitted.
+  </summary>
+</histogram>
+
+<histogram name="PasswordManager.FormVisited.PerProfileType"
+    enum="BrowserProfileType" expires_after="2022-02-02">
+  <owner>rhalavati@chromium.org</owner>
+  <owner>chrome-privacy-core@google.com</owner>
+  <summary>
+    This histogram records the browser profile type when a password form is
+    visited. This is recorded once for each frame.
+  </summary>
+</histogram>
+
 <histogram name="PasswordManager.GeneratedFormHasNoFormManager"
-    enum="BooleanFormManager" expires_after="M90">
+    enum="BooleanFormManager" expires_after="M95">
   <owner>jdoerrie@chromium.org</owner>
   <owner>kolos@chromium.org</owner>
   <summary>
@@ -1192,7 +1246,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.HttpCredentials"
-    enum="PasswordManagerHttpCredentialType" expires_after="M90">
+    enum="PasswordManagerHttpCredentialType" expires_after="M95">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1204,9 +1258,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.HttpPasswordMigrationCount"
-    units="saved credentials" expires_after="M90">
-  <owner>vasilii@chromium.org</owner>
+    units="saved credentials" expires_after="M95">
   <owner>jdoerrie@chromium.org</owner>
+  <owner>vasilii@chromium.org</owner>
   <summary>
     Number of HTTP saved passwords that were migrated to HTTPS. Recorded on
     HTTPS password form load when there are no credentials saved.
@@ -1214,7 +1268,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.HttpPasswordMigrationMode"
-    enum="HttpPasswordMigrationMode" expires_after="M90">
+    enum="HttpPasswordMigrationMode" expires_after="M95">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1224,24 +1278,27 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.ImportedPasswordsPerUserInCSV" units="units"
-    expires_after="M90">
+    expires_after="M95">
   <owner>vasilii@chromium.org</owner>
   <owner>src/components/password_manager/OWNERS</owner>
-  <summary>The number of passwords imported in CSV format per user</summary>
+  <summary>
+    The number of passwords imported in CSV format per user. Recorded when the
+    user imports passwords within the password settings.
+  </summary>
 </histogram>
 
 <histogram name="PasswordManager.ImportPasswordFromCSVResult"
-    enum="PasswordImportFromCSVResult" expires_after="M90">
+    enum="PasswordImportFromCSVResult" expires_after="M95">
   <owner>vasilii@chromium.org</owner>
   <owner>src/components/password_manager/OWNERS</owner>
   <summary>
     The response code of successful or failed password import attempt from a CSV
-    file.
+    file. Recorded when the user imports passwords within the password settings.
   </summary>
 </histogram>
 
 <histogram name="PasswordManager.InaccessiblePasswords" units="saved passwords"
-    expires_after="M89">
+    expires_after="M95">
   <owner>vasilii@chromium.org</owner>
   <owner>mamir@chromium.org</owner>
   <summary>
@@ -1269,7 +1326,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.IsSyncPasswordHashSaved"
-    enum="IsSyncPasswordHashSaved" expires_after="2021-04-04">
+    enum="IsSyncPasswordHashSaved" expires_after="2021-08-08">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1291,7 +1348,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.ItemSelected.OffTheRecord" units="units"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>rhalavati@chromium.org</owner>
   <owner>chrome-privacy-core@google.com</owner>
   <summary>
@@ -1301,7 +1358,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.JavaScriptOnlyValueInSubmittedForm"
-    enum="JavaScriptOnlyValueInPasswordForm" expires_after="M92">
+    enum="JavaScriptOnlyValueInPasswordForm" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -1311,7 +1368,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.LeakDetection.AccessTokenFetchStatus"
-    enum="GoogleServiceAuthError" expires_after="M92">
+    enum="GoogleServiceAuthError" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1321,7 +1378,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.LeakDetection.AccessTokenNetErrorCode"
-    enum="NetErrorCodes" expires_after="M92">
+    enum="NetErrorCodes" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1331,21 +1388,22 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.LeakDetection.AnalyzeSingleLeakResponseResult"
-    enum="PasswordAnalyzeLeakResponseResult" expires_after="M92">
+    enum="PasswordAnalyzeLeakResponseResult" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>Result of analyzing a single leak response.</summary>
 </histogram>
 
 <histogram name="PasswordManager.LeakDetection.AnalyzeSingleLeakResponseTime"
-    units="ms" expires_after="M92">
+    units="ms" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>The time it took to analyze a single leak lookup response.</summary>
 </histogram>
 
 <histogram name="PasswordManager.LeakDetection.DialogDismissalReason"
-    enum="PasswordLeakDetectionDialogDismissalReason" expires_after="M92">
+    enum="PasswordLeakDetectionDialogDismissalReason"
+    expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1374,7 +1432,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.LeakDetection.HttpResponseCode"
-    enum="HttpResponseCode" expires_after="M92">
+    enum="HttpResponseCode" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1384,7 +1442,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.LeakDetection.IsPasswordReused" enum="Boolean"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -1394,7 +1452,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.LeakDetection.IsPasswordSaved" enum="Boolean"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -1413,7 +1471,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.LeakDetection.LookupSingleLeakResponseResult"
-    enum="PasswordLeakLookupResponseResult" expires_after="M92">
+    enum="PasswordLeakLookupResponseResult" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1433,7 +1491,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.LeakDetection.NotifyIsLeakedTime" units="ms"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1443,7 +1501,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.LeakDetection.ObtainAccessTokenTime"
-    units="ms" expires_after="M92">
+    units="ms" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1453,7 +1511,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.LeakDetection.PrepareSingleLeakRequestTime"
-    units="ms" expires_after="M92">
+    units="ms" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1462,7 +1520,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.LeakDetection.ReceiveSingleLeakResponseTime"
-    units="ms" expires_after="M92">
+    units="ms" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1472,7 +1530,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.LeakDetection.SingleLeakResponsePrefixes"
-    units="prefixes" expires_after="M92">
+    units="prefixes" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1482,7 +1540,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.LeakDetection.SingleLeakResponseSize"
-    units="bytes" expires_after="M92">
+    units="bytes" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1492,14 +1550,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.LoginDatabaseInit"
-    enum="LoginDatabaseInitError" expires_after="M89">
+    enum="LoginDatabaseInitError" expires_after="2021-08-22">
   <owner>vasilii@chromium.org</owner>
   <owner>mamir@chromium.org</owner>
   <summary>An error on LoginDatabase initialization.</summary>
 </histogram>
 
 <histogram name="PasswordManager.ManagePasswordsReferrer"
-    enum="ManagePasswordsReferrer" expires_after="M92">
+    enum="ManagePasswordsReferrer" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1555,7 +1613,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.MergeSyncData.AddLoginSyncError"
-    enum="PasswordAddLoginSyncError" expires_after="2021-04-25">
+    enum="PasswordAddLoginSyncError" expires_after="2021-07-31">
   <owner>mamir@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -1566,7 +1624,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.MergeSyncData.UpdateLoginSyncError"
-    enum="PasswordUpdateLoginSyncError" expires_after="2021-01-31">
+    enum="PasswordUpdateLoginSyncError" expires_after="2021-07-31">
   <owner>mamir@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -1577,7 +1635,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.MoveUIDismissalReason"
-    enum="PasswordManagerUIDismissalReason" expires_after="M90">
+    enum="PasswordManagerUIDismissalReason" expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="PasswordAccountStorageUserState" -->
 
   <owner>mamir@chromium.org</owner>
@@ -1590,7 +1648,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.NewlySavedPasswordIsGenerated"
-    enum="BooleanNewlySavedPasswordIsGenerated" expires_after="2021-04-04">
+    enum="BooleanNewlySavedPasswordIsGenerated" expires_after="2021-08-08">
   <owner>nepper@chromium.org</owner>
   <owner>battre@chromium.org</owner>
   <owner>kolos@chromium.org</owner>
@@ -1601,7 +1659,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.NonSyncPasswordHashChange"
-    enum="GaiaPasswordHashChange" expires_after="2021-03-27">
+    enum="GaiaPasswordHashChange" expires_after="2021-08-01">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1636,7 +1694,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.OsPasswordStatus"
-    enum="PasswordManagerOsPasswordStatus" expires_after="2021-02-28">
+    enum="PasswordManagerOsPasswordStatus" expires_after="2021-07-28">
   <owner>vasilii@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -1646,6 +1704,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="PasswordManager.OtherPossibleUsernamesUsage"
     enum="OtherPossibleUsernamesUsage" expires_after="M90">
+  <obsolete>
+    Obsolete since M90.
+  </obsolete>
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1655,7 +1716,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.PasswordDropdownItemSelected"
-    enum="PasswordDropdownSelectedOption" expires_after="2021-04-04">
+    enum="PasswordDropdownSelectedOption" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1664,14 +1725,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.PasswordDropdownShown"
-    enum="PasswordDropdownState" expires_after="2021-04-04">
+    enum="PasswordDropdownState" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>Logs the state of the password dropdown when it's shown.</summary>
 </histogram>
 
 <histogram name="PasswordManager.PasswordEditUpdatedValues"
-    enum="PasswordEditUpdatedValues" expires_after="M92">
+    enum="PasswordEditUpdatedValues" expires_after="2021-08-09">
   <owner>vsemeniuk@google.com</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1681,7 +1742,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.PasswordReuse.NumberOfMatches"
-    units="credentials" expires_after="2021-01-30">
+    units="credentials" expires_after="2021-07-18">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1697,7 +1758,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.PasswordReuse.PasswordFieldDetected"
-    enum="PasswordReusePasswordFieldDetected" expires_after="2021-01-30">
+    enum="PasswordReusePasswordFieldDetected" expires_after="2021-07-18">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1728,7 +1789,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.PasswordReuse.TotalPasswords"
-    units="credentials" expires_after="2021-01-30">
+    units="credentials" expires_after="2021-07-27">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1747,6 +1808,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="PasswordManager.PasswordSavedWithManualFallback"
     enum="BooleanPasswordSavedWithFallback" expires_after="2020-05-24">
+  <obsolete>
+    Obsolete since M90.
+  </obsolete>
   <owner>kolos@chromium.org</owner>
   <summary>
     Measures whether users save passwords with automatic prompt or manual
@@ -1755,7 +1819,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.PasswordScriptsFetcher.CacheState"
-    enum="PasswordScriptsFetcherCacheState" expires_after="M89">
+    enum="PasswordScriptsFetcherCacheState" expires_after="2021-08-09">
   <owner>kolos@chromium.org</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -1766,7 +1830,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PasswordManager.PasswordScriptsFetcher.HttpResponseAndNetErrorCode"
-    enum="CombinedHttpResponseAndNetErrorCode" expires_after="M89">
+    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-08-09">
   <owner>kolos@chromium.org</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -1776,14 +1840,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.PasswordScriptsFetcher.ParsingResult"
-    enum="PasswordScriptsFetcherParsingResult" expires_after="M89">
+    enum="PasswordScriptsFetcherParsingResult" expires_after="2021-08-09">
   <owner>kolos@chromium.org</owner>
   <owner>battre@chromium.org</owner>
   <summary>Result of parsing of a list of available password scripts.</summary>
 </histogram>
 
 <histogram name="PasswordManager.PasswordScriptsFetcher.ResponseTime"
-    units="ms" expires_after="M89">
+    units="ms" expires_after="2021-08-09">
   <owner>kolos@chromium.org</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -1792,7 +1856,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.PasswordStoreDeletionsHaveSynced"
-    enum="BooleanSuccess" expires_after="M90">
+    enum="BooleanSuccess" expires_after="2021-08-22">
   <owner>dullweber@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <owner>mamir@chromium.org</owner>
@@ -1806,7 +1870,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.PasswordStoreInitResult" enum="BooleanSuccess"
-    expires_after="M90">
+    expires_after="M95">
   <owner>vasilii@chromium.org</owner>
   <owner>src/components/password_manager/OWNERS</owner>
   <summary>
@@ -1816,7 +1880,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.PasswordSyncState" enum="PasswordSyncState"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1848,7 +1912,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.ReauthToAccessPasswordInSettings"
-    enum="PasswordManager.ReauthResult" expires_after="M90">
+    enum="PasswordManager.ReauthResult" expires_after="M95">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1859,7 +1923,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.RemoveCompromisedCredentials"
-    enum="PasswordStoreChange" expires_after="2021-04-04">
+    enum="PasswordStoreChange" expires_after="2021-08-09">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1869,7 +1933,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.RemoveCompromisedCredentials.RemoveReason"
-    enum="RemoveCompromisedCredentialsReason" expires_after="2021-04-04">
+    enum="RemoveCompromisedCredentialsReason" expires_after="2021-08-09">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1888,7 +1952,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.RequirementsSpecFetcher.NetErrorCode"
-    enum="NetErrorCodes" expires_after="2021-04-04">
+    enum="NetErrorCodes" expires_after="2021-08-09">
   <owner>battre@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -1916,7 +1980,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.ReusedPasswordType" enum="ReusedPasswordType"
-    expires_after="2021-01-30">
+    expires_after="2021-07-18">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1938,7 +2002,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.SavedGaiaPasswordHashCount" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-07-11">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1949,7 +2013,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.SaveUIDismissalReason"
-    enum="PasswordManagerUIDismissalReason" expires_after="2021-04-04">
+    enum="PasswordManagerUIDismissalReason" expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="PasswordAccountStorageUserState" -->
 
   <owner>vasilii@chromium.org</owner>
@@ -1959,7 +2023,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.SaveUIDismissalReasonAfterUnblacklisting"
-    enum="PasswordManagerUIDismissalReason" expires_after="M90">
+    enum="PasswordManagerUIDismissalReason" expires_after="2021-06-20">
   <owner>ioanap@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1970,7 +2034,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.SavingOnUsernameFirstFlow"
-    enum="SavingOnUsernameFirstFlow" expires_after="M92">
+    enum="SavingOnUsernameFirstFlow" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -1981,7 +2045,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.StoreDecryptionResult"
-    enum="PasswordDecryptionResult" expires_after="2021-06-01">
+    enum="PasswordDecryptionResult" expires_after="2021-08-09">
   <owner>cfroussios@chromium.org</owner>
   <owner>jdoerrie@chromium.org</owner>
   <summary>
@@ -1990,7 +2054,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.StoresUsedForFillingInLast28Days"
-    enum="PasswordManagerFillingSource" expires_after="M90">
+    enum="PasswordManagerFillingSource" expires_after="2021-08-22">
   <owner>mamir@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -2002,7 +2066,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.StoresUsedForFillingInLast7Days"
-    enum="PasswordManagerFillingSource" expires_after="M90">
+    enum="PasswordManagerFillingSource" expires_after="2021-08-22">
   <owner>mamir@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -2014,7 +2078,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.SubmittedFormFrame"
-    enum="SubmittedPasswordFormFrame" expires_after="M90">
+    enum="SubmittedPasswordFormFrame" expires_after="2021-08-22">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -2024,7 +2088,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.SubmittedFormType" enum="PasswordFormType"
-    expires_after="M90">
+    expires_after="M95">
   <owner>jdoerrie@chromium.org</owner>
   <owner>kolos@chromium.org</owner>
   <summary>
@@ -2057,7 +2121,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.SuccessfulSubmissionIndicatorEvent"
-    enum="SubmissionIndicatorEvent" expires_after="M90">
+    enum="SubmissionIndicatorEvent" expires_after="2021-08-22">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -2078,7 +2142,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.SyncMetadataReadError"
-    enum="PasswordSyncMetadataReadError" expires_after="2021-05-09">
+    enum="PasswordSyncMetadataReadError" expires_after="2021-08-01">
   <owner>mamir@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -2088,7 +2152,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.SyncPasswordHashChange"
-    enum="GaiaPasswordHashChange" expires_after="2021-03-27">
+    enum="GaiaPasswordHashChange" expires_after="2021-08-01">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -2098,7 +2162,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.TimeBetweenStoreAndServer" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>jdoerrie@chromium.org</owner>
   <owner>battre@chromium.org</owner>
   <summary>
@@ -2109,9 +2173,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="PasswordManager.TimesPasswordUsed"
-    units="PasswordUses" expires_after="2021-01-30">
-  <owner>battre@chromium.org</owner>
+    units="PasswordUses" expires_after="2021-06-30">
   <owner>jdoerrie@chromium.org</owner>
+  <owner>battre@chromium.org</owner>
   <summary>
     The number of times each saved password from the profile-scoped storage has
     been used to log in. Split by whether created by the user or generated by
@@ -2122,7 +2186,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="PasswordManager.TotalAccountsHiRes.ByType"
-    units="units" expires_after="2021-04-18">
+    units="units" expires_after="2021-08-22">
   <owner>battre@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -2134,7 +2198,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="PasswordManager.TotalAccountsHiRes.WithScheme"
-    units="accounts" expires_after="2021-04-25">
+    units="accounts" expires_after="2021-06-27">
   <owner>battre@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -2147,7 +2211,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.TouchToFill.CredentialIndex" units="index"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>fhorschig@chromium.org</owner>
   <summary>
@@ -2157,7 +2221,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.TouchToFill.DismissalReason"
-    enum="BottomSheet.StateChangeReason" expires_after="2021-04-04">
+    enum="BottomSheet.StateChangeReason" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>fhorschig@chromium.org</owner>
   <summary>
@@ -2183,7 +2247,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.UIDismissalReason"
-    enum="PasswordManagerUIDismissalReason" expires_after="2021-01-31">
+    enum="PasswordManagerUIDismissalReason" expires_after="2021-08-15">
   <owner>vasilii@chromium.org</owner>
   <summary>
     Why was the password manager's UI (bubble or infobar) closed? Save and
@@ -2192,13 +2256,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.UpdateUIDismissalReason"
-    enum="PasswordManagerUIDismissalReason" expires_after="2021-04-04">
+    enum="PasswordManagerUIDismissalReason" expires_after="2021-08-09">
   <owner>vasilii@chromium.org</owner>
   <summary>Why was the update password UI (bubble or infobar) closed?</summary>
 </histogram>
 
 <histogram name="PasswordManager.UsernameCorrectionFound"
     enum="BooleanUsernameCorrectionVote" expires_after="M85">
+  <obsolete>
+    Obsolete since M86.
+  </obsolete>
   <owner>kolos@chromium.org</owner>
   <summary>
     Chrome saves locally all fields a user typed on a sign-up form. If Chrome
@@ -2210,7 +2277,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.UsernameDetectionMethod"
-    enum="UsernameDetectionMethod" expires_after="M85">
+    enum="UsernameDetectionMethod" expires_after="M93">
+  <owner>jdoerrie@chromium.org</owner>
   <owner>kolos@chromium.org</owner>
   <summary>
     Measures what method was used for username field detection in the renderer
@@ -2224,7 +2292,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.WeakCheck.CheckedPasswords" units="passwords"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -2233,7 +2301,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.WeakCheck.PasswordScore"
-    enum="PasswordWeaknessScore" expires_after="M92">
+    enum="PasswordWeaknessScore" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -2242,14 +2310,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="PasswordManager.WeakCheck.Time" units="ms" expires_after="M92">
+<histogram name="PasswordManager.WeakCheck.Time" units="ms"
+    expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>The time it took to complete the passwords weak check.</summary>
 </histogram>
 
 <histogram name="PasswordManager.WeakCheck.WeakPasswords" units="passwords"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -2259,7 +2328,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PasswordManager.WellKnownChangePassword.GetChangePasswordUsage"
-    enum="GetChangePasswordUrlMetric" expires_after="2021-04-04">
+    enum="GetChangePasswordUrlMetric" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -2270,7 +2339,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.WellKnownChangePassword.GstaticFetchErrorCode"
-    enum="NetErrorCodes" expires_after="2021-05-02">
+    enum="NetErrorCodes" expires_after="2021-07-04">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -2280,7 +2349,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="PasswordManager.WellKnownChangePassword.GstaticFetchHttpResponseCode"
-    enum="HttpResponseCode" expires_after="2021-05-02">
+    enum="HttpResponseCode" expires_after="2021-07-04">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -2289,7 +2358,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.WellKnownChangePassword.GstaticFetchResult"
-    enum="ChangePasswordUrlFetchResult" expires_after="2021-04-04">
+    enum="ChangePasswordUrlFetchResult" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>
@@ -2299,14 +2368,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordManager.WellKnownChangePassword.GstaticFetchTime"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-09">
   <owner>jdoerrie@chromium.org</owner>
   <owner>vasilii@chromium.org</owner>
   <summary>Logs the loading time for the gstatic file request.</summary>
 </histogram>
 
 <histogram name="PasswordProtection.DomFeatureExtractionDuration" units="ms"
-    expires_after="2021-01-30">
+    expires_after="2021-07-30">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -2341,7 +2410,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordProtection.InterstitialString"
-    enum="PasswordProtectionInterstitialStringType" expires_after="2021-01-30">
+    enum="PasswordProtectionInterstitialStringType" expires_after="2021-07-27">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -2351,7 +2420,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordProtection.ModalWarningDialogAction"
-    enum="PasswordProtectionWarningAction" expires_after="2021-04-11">
+    enum="PasswordProtectionWarningAction" expires_after="2021-08-15">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -2362,7 +2431,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordProtection.ModalWarningDialogLifetime" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -2373,7 +2442,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordProtection.PageInfoAction"
-    enum="PasswordProtectionWarningAction" expires_after="2021-04-11">
+    enum="PasswordProtectionWarningAction" expires_after="2021-08-15">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -2405,8 +2474,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordProtection.PasswordProtectionResponseOrErrorCode"
-    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2020-11-29">
-  <owner>vakh@chromium.org</owner>
+    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-11-29">
+  <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Response or error codes for PasswordProtectionRequest. Logged after chrome
@@ -2437,7 +2506,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordProtection.RequestNetworkDuration" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -2447,7 +2516,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="PasswordProtection.RequestOutcome"
-    enum="PasswordProtectionRequestOutcome" expires_after="2021-04-04">
+    enum="PasswordProtectionRequestOutcome" expires_after="2021-08-08">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -2457,8 +2526,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="PasswordProtection.RequestReferringAppSource"
+    enum="PasswordProtectionReferringAppSource" expires_after="2021-12-15">
+  <owner>xinghuilu@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    Records the referring app source of the password protection request,
+    indicating the source of the referring app name in the request. This metric
+    is only logged on Android.
+  </summary>
+</histogram>
+
 <histogram name="PasswordProtection.SampleReportSent" units="Boolean"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -2469,7 +2549,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PasswordProtection.Verdict" enum="PasswordProtectionVerdict"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/payment/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/payment/histograms.xml
index 510fc01db2a..20c65215e2e 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/payment/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/payment/histograms.xml
@@ -137,6 +137,35 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram
+    name="PaymentRequest.SecurePaymentConfirmation.Funnel.AuthenticationDialogResult"
+    enum="SecurePaymentConfirmationAuthenticationDialogResult"
+    expires_after="2021-08-01">
+  <owner>danyao@chromium.org</owner>
+  <owner>web-payments-team@google.com</owner>
+  <summary>
+    Records the action performed by the user on the Secure Payment confirmation
+    dialog. The result is Accepted if the affirmitive button is pressed,
+    Canceled if the dialog is canceled, or Closed if it is otherwise closed.
+    Logged when the user interacts with the dialog or the dialog is otherwise
+    closed.
+  </summary>
+</histogram>
+
+<histogram
+    name="PaymentRequest.SecurePaymentConfirmation.Funnel.SystemPromptResult"
+    enum="SecurePaymentConfirmationSystemPromptResult"
+    expires_after="2021-08-01">
+  <owner>danyao@chromium.org</owner>
+  <owner>web-payments-team@google.com</owner>
+  <summary>
+    Records the result of the FIDO system prompt, which is shown after the
+    Secure Payment Confirmation dialog is accepted. The result is Accepted if
+    the prompt is successful, or Canceled if the prompt is canceled. Logged when
+    the FIDO system prompt closes.
+  </summary>
+</histogram>
+
+<histogram
     name="PaymentRequest.SecurePaymentConfirmationCredentialIdSizeInBytes"
     units="bytes" expires_after="2021-08-01">
   <owner>danyao@chromium.org</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/permissions/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/permissions/histograms.xml
index 78d84ced83e..56e74993453 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/permissions/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/permissions/histograms.xml
@@ -34,7 +34,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.Action.WithDisposition" enum="PermissionAction"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -86,8 +86,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.BatteryLevel.Accepted.LocationSettingsDialog"
-    units="%" expires_after="M90">
-  <owner>timloh@chromium.org</owner>
+    units="%" expires_after="M96">
+  <owner>andypaicu@chromium.org</owner>
+  <owner>engedy@chromium.org</owner>
+  <owner>hkamila@chromium.org</owner>
+  <owner>ravjit@chromium.org</owner>
+  <owner>elklm@chromium.org</owner>
   <summary>
     Battery percentage when a location settings dialog was accepted.
   </summary>
@@ -120,7 +124,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.Chip.TimeToInteraction" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>bsep@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>olesiamarukhno@google.com</owner>
@@ -131,10 +135,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.CrowdDeny.DidHoldbackQuietUi" enum="Boolean"
-    expires_after="2021-01-31">
+    expires_after="M96">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
+  <owner>ravjit@chromium.org</owner>
+  <owner>elklm@chromium.org</owner>
   <summary>
     Whenever a notification permission prompt is to be displayed, crowd deny
     might trigger based on site reputation which will result in a quiet
@@ -146,8 +152,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Permissions.CrowdDeny.PreloadData.DelayedPushNotification"
+    units="ms" expires_after="2021-06-06">
+  <owner>elklm@chromium.org</owner>
+  <owner>src/components/permissions/PERMISSIONS_OWNERS</owner>
+  <summary>
+    Record, for each incoming push notification, a delay caused by loading Crowd
+    Deny component during abusive an origin verification. It's recorded only for
+    non-abusive origins and only if the Crowd Deny request was made while the
+    preload data is in the process of being loaded. Timing starts at requesting
+    CrowdDenyPreloadData::GetReputationDataForSiteAsync, and timing ends after
+    Crowd Deny returns result to
+    AbusiveOriginPermissionRevocationRequest::OnSiteReputationReady.
+  </summary>
+</histogram>
+
 <histogram name="Permissions.CrowdDeny.PreloadData.IsLoadedAtAbuseCheckTime"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-06-06">
+  <obsolete>
+    Removed in January 2021.
+  </obsolete>
   <owner>elklm@chromium.org</owner>
   <owner>src/components/permissions/PERMISSIONS_OWNERS</owner>
   <summary>
@@ -157,7 +181,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.CrowdDeny.PreloadData.NotificationUxQuality"
-    enum="CrowdDenyNotificationUxQuality" expires_after="2021-04-04">
+    enum="CrowdDenyNotificationUxQuality" expires_after="2021-08-09">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -168,7 +192,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.CrowdDeny.PreloadData.VersionAtAbuseCheckTime"
-    units="date" expires_after="2021-04-04">
+    units="date" expires_after="2021-08-08">
   <owner>elklm@chromium.org</owner>
   <owner>src/components/permissions/PERMISSIONS_OWNERS</owner>
   <summary>
@@ -178,7 +202,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.CrowdDeny.PreloadData.WarningOnly" enum="Boolean"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -190,7 +214,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.CrowdDeny.SafeBrowsing.RequestDuration" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -202,7 +226,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.CrowdDeny.SafeBrowsing.Verdict"
-    enum="CrowdDenySafeBrowsingVerdict" expires_after="2021-04-04">
+    enum="CrowdDenySafeBrowsingVerdict" expires_after="2021-08-09">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -214,7 +238,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.Engagement.Accepted" units="%"
-    expires_after="2021-06-19">
+    expires_after="2021-08-22">
   <owner>engedy@chromium.org</owner>
   <owner>src/components/permissions/PERMISSIONS_OWNERS</owner>
   <summary>
@@ -224,7 +248,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.Engagement.AcceptedOnce" units="%"
-    expires_after="2021-06-19">
+    expires_after="2021-08-22">
   <owner>engedy@chromium.org</owner>
   <owner>src/components/permissions/PERMISSIONS_OWNERS</owner>
   <summary>
@@ -235,7 +259,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.Engagement.Denied" units="%"
-    expires_after="2021-06-19">
+    expires_after="2021-08-22">
   <owner>engedy@chromium.org</owner>
   <owner>src/components/permissions/PERMISSIONS_OWNERS</owner>
   <summary>
@@ -245,7 +269,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.Engagement.Dismissed" units="%"
-    expires_after="2021-06-19">
+    expires_after="2021-08-22">
   <owner>engedy@chromium.org</owner>
   <owner>src/components/permissions/PERMISSIONS_OWNERS</owner>
   <summary>
@@ -255,7 +279,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.Engagement.Ignored" units="%"
-    expires_after="2021-06-19">
+    expires_after="2021-08-22">
   <owner>engedy@chromium.org</owner>
   <owner>src/components/permissions/PERMISSIONS_OWNERS</owner>
   <summary>
@@ -265,7 +289,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.MissingOSLevelPermission.Action"
-    enum="PermissionAction" expires_after="2021-04-04">
+    enum="PermissionAction" expires_after="2021-08-22">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -293,7 +317,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.Prompt.Accepted" enum="PermissionRequestType"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>dominickn@chromium.org</owner>
   <owner>kcarattini@chromium.org</owner>
   <summary>
@@ -367,7 +391,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.Prompt.Denied" enum="PermissionRequestType"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>dominickn@chromium.org</owner>
   <owner>kcarattini@chromium.org</owner>
   <summary>
@@ -466,7 +490,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.Prompt.Shown" enum="PermissionRequestType"
-    expires_after="2021-06-19">
+    expires_after="2021-08-22">
   <owner>engedy@chromium.org</owner>
   <owner>src/components/permissions/PERMISSIONS_OWNERS</owner>
   <summary>
@@ -475,7 +499,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.Prompt.TimeToDecision" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>bsep@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>olesiamarukhno@google.com</owner>
@@ -488,7 +512,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Permissions.QuietNotificationPrompts.DidEnableAdapativelyInPrefs"
-    enum="Boolean" expires_after="2021-04-04">
+    enum="Boolean" expires_after="2021-08-09">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -500,7 +524,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Permissions.QuietNotificationPrompts.EnabledStateInPrefsChangedTo"
-    enum="BooleanEnabled" expires_after="2021-04-04">
+    enum="BooleanEnabled" expires_after="2021-08-09">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -511,7 +535,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Permissions.QuietNotificationPrompts.IsEnabledInPrefs"
-    enum="BooleanEnabled" expires_after="2021-04-04">
+    enum="BooleanEnabled" expires_after="2021-08-09">
   <owner>andypaicu@chromium.org</owner>
   <owner>engedy@chromium.org</owner>
   <owner>hkamila@chromium.org</owner>
@@ -560,6 +584,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Permissions.WebHid.ChooserClosed" enum="WebHidChooserClosed"
+    expires_after="2022-01-20">
+  <owner>mattreynolds@chromium.org</owner>
+  <owner>deviceapi-team@google.com</owner>
+  <summary>
+    Records the reason why the WebHID device chooser was closed.
+  </summary>
+</histogram>
+
 </histograms>
 
 </histogram-configuration>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/phonehub/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/phonehub/histograms.xml
index a5a24c9cd8d..de6d5369fe8 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/phonehub/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/phonehub/histograms.xml
@@ -51,7 +51,29 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="PhoneHub.Connection.Duration" units="ms" expires_after="M99">
+  <owner>khorimoto@chromium.org</owner>
+  <owner>better-together-dev@google.com</owner>
+  <summary>
+    The duration of time the phone is in the connected state, and becomes
+    disconnected.
+  </summary>
+</histogram>
+
+<histogram name="PhoneHub.Connection.Result" enum="BooleanSuccess"
+    expires_after="2021-11-30">
+  <owner>khorimoto@chromium.org</owner>
+  <owner>better-together-dev@google.com</owner>
+  <summary>
+    Measures PhoneHub connection success rate, considering attempts where the
+    phone is not nearby as failures.
+  </summary>
+</histogram>
+
 <histogram name="PhoneHub.Connectivity.Duration" units="ms" expires_after="M98">
+  <obsolete>
+    Renamed to PhoneHub.Connection.Duration on 1/2021 in M89.
+  </obsolete>
   <owner>khorimoto@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -71,11 +93,46 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="PhoneHub.Connectivity.Success" enum="BooleanSuccess"
     expires_after="M98">
+  <obsolete>
+    Renamed to PhoneHub.Connection.Result on 11/2020 in M89.
+  </obsolete>
   <owner>khorimoto@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>The success rate of connecting to the Phone.</summary>
 </histogram>
 
+<histogram name="PhoneHub.InterstitialScreenEvent.{Screen}"
+    enum="PhoneHubInterstitialScreenEvent" expires_after="2021-10-31">
+  <owner>tengs@chromium.org</owner>
+  <owner>khorimoto@chromium.org</owner>
+  <summary>Events for the given PhoneHub interstitial screen.</summary>
+<!-- The entries below should be a subset of the PhoneHubScreen enum -->
+
+  <token key="Screen">
+    <variant name="BluetoothOrWifiDisabled"/>
+    <variant name="InitialConnecting">
+      <obsolete>
+        Combined into PhoneConnecting on Nov 2020.
+      </obsolete>
+    </variant>
+    <variant name="Onboarding.ExistingMultideviceUser"/>
+    <variant name="Onboarding.NewMultideviceUser"/>
+    <variant name="OnboardingDismissPrompt"/>
+    <variant name="PhoneConnecting"/>
+    <variant name="PhoneDisconnected"/>
+  </token>
+</histogram>
+
+<histogram name="PhoneHub.NotificationCount" units="notifications"
+    expires_after="2021-10-31">
+  <owner>tengs@chromium.org</owner>
+  <owner>khorimoto@chromium.org</owner>
+  <summary>
+    The number of PhoneHub notifications, logged each time a notification is
+    added or removed.
+  </summary>
+</histogram>
+
 <histogram name="PhoneHub.NotificationInteraction"
     enum="PhoneHubNotificationInteraction" expires_after="2021-11-20">
   <owner>meilinw@chromium.org</owner>
@@ -86,6 +143,23 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="PhoneHub.NotificationOptIn"
+    enum="PhoneHubInterstitialScreenEvent" expires_after="2021-10-31">
+  <obsolete>
+    Renamed to PhoneHub.NotificationOptInEvents on 1/2021 in M89.
+  </obsolete>
+  <owner>tengs@chromium.org</owner>
+  <owner>khorimoto@chromium.org</owner>
+  <summary>Events for the given notification opt-in prompt.</summary>
+</histogram>
+
+<histogram name="PhoneHub.NotificationOptInEvents"
+    enum="PhoneHubInterstitialScreenEvent" expires_after="2021-10-31">
+  <owner>tengs@chromium.org</owner>
+  <owner>khorimoto@chromium.org</owner>
+  <summary>Events for the given notification opt-in prompt.</summary>
+</histogram>
+
 <histogram name="PhoneHub.OptInEntryPoint" enum="PhoneHubOptInEntryPoint"
     expires_after="2021-11-25">
   <owner>meilinw@chromium.org</owner>
@@ -93,6 +167,61 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>Tracks the UI surface with which users enable Phone Hub.</summary>
 </histogram>
 
+<histogram name="PhoneHub.QuickActionClicked" enum="PhoneHubQuickAction"
+    expires_after="2021-10-31">
+  <owner>tengs@chromium.org</owner>
+  <owner>khorimoto@chromium.org</owner>
+  <summary>Event logged after the user clicks on a quick action.</summary>
+</histogram>
+
+<histogram name="PhoneHub.Screen.OnSettingsButtonClicked" enum="PhoneHubScreen"
+    expires_after="2021-10-31">
+  <obsolete>
+    Renamed to PhoneHub.ScreenOnSettingsButtonClicked on 1/2021 in M89.
+  </obsolete>
+  <owner>tengs@chromium.org</owner>
+  <owner>khorimoto@chromium.org</owner>
+  <summary>
+    Logs the current screen when the settings button is clicked in the tray
+    bubble.
+  </summary>
+</histogram>
+
+<histogram name="PhoneHub.ScreenOnSettingsButtonClicked" enum="PhoneHubScreen"
+    expires_after="2021-10-31">
+  <owner>tengs@chromium.org</owner>
+  <owner>khorimoto@chromium.org</owner>
+  <summary>
+    Logs the current screen when the settings button is clicked in the tray
+    bubble.
+  </summary>
+</histogram>
+
+<histogram name="PhoneHub.ScreenOn{BubbleEvent}" enum="PhoneHubScreen"
+    expires_after="2021-10-31">
+  <owner>tengs@chromium.org</owner>
+  <owner>khorimoto@chromium.org</owner>
+  <summary>
+    Logs the current screen for the PhoneHub tray given bubble event (i.e. on
+    bubble open or close).
+  </summary>
+  <token key="BubbleEvent">
+    <variant name="BubbleClose"/>
+    <variant name="BubbleOpen"/>
+  </token>
+</histogram>
+
+<histogram name="PhoneHub.TabContinuationChipClicked" units="tab index"
+    expires_after="2021-10-31">
+  <owner>tengs@chromium.org</owner>
+  <owner>khorimoto@chromium.org</owner>
+  <summary>
+    After a tab continuation chip is clicked, the index of the tab is logged.
+    Tab indices are ordered left-to-right, top-to-bottom in a standard LTR
+    locale.
+  </summary>
+</histogram>
+
 <histogram name="PhoneHub.TaskCompletion.TetherConnection.Result"
     enum="PhoneHubTetherConnectionResult" expires_after="2021-12-01">
   <owner>khorimoto@chromium.org</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/platform/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/platform/histograms.xml
index e141f411455..59d248ae448 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/platform/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/platform/histograms.xml
@@ -226,7 +226,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.CrOS.CrashSenderRemoveReason"
-    enum="CrosCrashSenderRemoveReason" expires_after="2021-04-04">
+    enum="CrosCrashSenderRemoveReason" expires_after="2021-08-09">
   <owner>iby@chromium.org</owner>
   <owner>mutexlox@chromium.org</owner>
   <owner>cros-telemetry@google.com</owner>
@@ -256,7 +256,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.Crouton.Started" enum="Platform.Crouton.Started"
-    expires_after="2021-06-02">
+    expires_after="2021-08-01">
   <owner>drinkcat@chromium.org</owner>
   <owner>dnschneid@chromium.org</owner>
   <summary>
@@ -287,12 +287,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Platform.DailyUseTime" units="seconds" expires_after="M90">
-<!-- TODO(mutexlox): See if this is still in use and find owners -->
+<histogram name="Platform.DailyUseTime" units="seconds" expires_after="never">
+<!-- expires-never: Used to assess Chrome OS platform stability. -->
 
   <owner>semenzato@chromium.org</owner>
   <owner>bsimonnet@chromium.org</owner>
   <owner>mutexlox@chromium.org</owner>
+  <owner>iby@chromium.org</owner>
   <owner>cros-telemetry@google.com</owner>
   <summary>
     Total use time (device ON and not asleep) in the previous day, or the most
@@ -301,7 +302,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.DetachableBase.ActivePercent" units="%"
-    expires_after="2021-06-02">
+    expires_after="2021-08-01">
   <owner>drinkcat@chromium.org</owner>
   <owner>fshao@chromium.org</owner>
   <owner>chromeos-kukui@google.com</owner>
@@ -313,7 +314,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.DetachableBase.AttachedOnBoot" enum="BooleanAttached"
-    expires_after="2021-06-02">
+    expires_after="2021-08-01">
   <owner>drinkcat@chromium.org</owner>
   <owner>fshao@chromium.org</owner>
   <owner>chromeos-kukui@google.com</owner>
@@ -324,7 +325,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.DetachableBase.PairResult"
-    enum="DetachableBasePairResult" expires_after="2021-06-02">
+    enum="DetachableBasePairResult" expires_after="2021-08-01">
   <owner>drinkcat@chromium.org</owner>
   <owner>fshao@chromium.org</owner>
   <owner>chromeos-kukui@google.com</owner>
@@ -332,7 +333,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.DetachableBase.PendingRWUpdate"
-    enum="DetachableBasePendingRWUpdate" expires_after="2021-06-02">
+    enum="DetachableBasePendingRWUpdate" expires_after="2021-08-01">
   <owner>drinkcat@chromium.org</owner>
   <owner>fshao@chromium.org</owner>
   <owner>chromeos-kukui@google.com</owner>
@@ -359,7 +360,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.DetachableBase.RWUpdateResult"
-    enum="DetachableBaseRWUpdateResult" expires_after="2021-06-02">
+    enum="DetachableBaseRWUpdateResult" expires_after="2021-08-09">
   <owner>drinkcat@chromium.org</owner>
   <owner>fshao@chromium.org</owner>
   <owner>chromeos-kukui@google.com</owner>
@@ -592,7 +593,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Platform.Memory.ARC" units="MiB" expires_after="2021-03-28">
+<histogram name="Platform.Memory.ARC" units="MiB" expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="ProcessMemoryType" -->
 
   <owner>sonnyrao@chromium.org</owner>
@@ -603,7 +604,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.Memory.Browser" units="MiB"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="ProcessMemoryType" -->
 
   <owner>sonnyrao@chromium.org</owner>
@@ -615,7 +616,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.Memory.Daemons" units="MiB"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="ProcessMemoryType" -->
 
   <owner>sonnyrao@chromium.org</owner>
@@ -625,7 +626,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Platform.Memory.Gpu" units="MiB" expires_after="2021-04-04">
+<histogram name="Platform.Memory.Gpu" units="MiB" expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="ProcessMemoryType" -->
 
   <owner>sonnyrao@chromium.org</owner>
@@ -636,7 +637,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.Memory.Renderers" units="MiB"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="ProcessMemoryType" -->
 
   <owner>sonnyrao@chromium.org</owner>
@@ -702,7 +703,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.MountEncrypted.EncryptionKeyStatus"
-    enum="MountEncryptedEncryptionKeyStatus" expires_after="M85">
+    enum="MountEncryptedEncryptionKeyStatus" expires_after="2021-12-21">
   <owner>apronin@chromium.org</owner>
   <owner>mnissler@chromium.org</owner>
   <owner>cros-hwsec+uma@chromium.org</owner>
@@ -714,7 +715,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.MountEncrypted.SystemKeyStatus"
-    enum="MountEncryptedSystemKeyStatus" expires_after="M85">
+    enum="MountEncryptedSystemKeyStatus" expires_after="2021-12-21">
   <owner>apronin@chromium.org</owner>
   <owner>mnissler@chromium.org</owner>
   <owner>cros-hwsec+uma@chromium.org</owner>
@@ -724,6 +725,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Platform.MountEncrypted.TimeToTakeTpmOwnership" units="ms"
+    expires_after="2021-12-31">
+  <owner>apronin@chromium.org</owner>
+  <owner>mnissler@chromium.org</owner>
+  <owner>cylai@google.com</owner>
+  <owner>cros-hwsec+uma@chromium.org</owner>
+  <summary>
+    The amount of time for Chrome OS mount-encrypted to take TPM ownership.
+  </summary>
+</histogram>
+
 <histogram name="Platform.PageFaultsLong" units="page faults/second"
     expires_after="2021-07-02">
   <owner>sonnyrao@chromium.org</owner>
@@ -831,7 +843,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.StatefulFreeSpace" units="MB"
-    expires_after="2021-04-01">
+    expires_after="2021-10-01">
   <owner>jamescook@chromium.org</owner>
   <owner>gwendal@chromium.org</owner>
   <summary>
@@ -840,7 +852,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.StatefulLifetimeWrites" units="GiB"
-    expires_after="2021-03-07">
+    expires_after="2021-08-22">
   <owner>asavery@chromium.org</owner>
   <owner>gwendal@chromium.org</owner>
   <summary>
@@ -890,7 +902,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.StatefulWritesDaily" units="KiB"
-    expires_after="2021-05-29">
+    expires_after="2021-08-01">
   <owner>asavery@chromium.org</owner>
   <owner>gwendal@chromium.org</owner>
   <summary>
@@ -933,7 +945,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Platform.SwapInDaily" units="pages" expires_after="2021-04-28">
+<histogram name="Platform.SwapInDaily" units="pages" expires_after="2021-08-09">
   <owner>asavery@chromium.org</owner>
   <owner>chromeos-storage@google.com</owner>
   <summary>Number of pages swapped IN over a day, sampled daily.</summary>
@@ -958,7 +970,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.SwapOutDaily" units="pages"
-    expires_after="2021-04-28">
+    expires_after="2021-07-27">
   <owner>asavery@chromium.org</owner>
   <owner>chromeos-storage@google.com</owner>
   <summary>Number of pages swapped OUT over a day, sampled daily.</summary>
@@ -983,7 +995,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.Temperature.Sensor00" units="Celsius"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>fletcherw@chromium.org</owner>
   <summary>
     Temperature reading from EC temperature sensor 0 (TSR0) taken every 30s.
@@ -1025,7 +1037,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.Temperature.Sensor02" units="Celsius"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>fletcherw@chromium.org</owner>
   <summary>
     Temperature reading from EC temperature sensor 2 (TSR2) taken every 30s.
@@ -1135,8 +1147,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.TPM.AuthErrorCode" enum="TPMResultCodeEnum"
-    expires_after="M85">
-  <owner>semenzato@chromium.org</owner>
+    expires_after="2021-12-21">
+  <owner>yich@google.com</owner>
+  <owner>cros-hwsec-userland-eng+uma@chromium.org</owner>
   <summary>
     Each sample is the result code of a TPM authorized command issued through
     tcsd. Success is 0. For the other error codes, see
@@ -1145,7 +1158,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.TPM.DictionaryAttackCounter" units="units"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>cylai@chromium.org</owner>
   <owner>cros-hwsec-userland-eng+uma@chromium.org</owner>
   <summary>
@@ -1155,7 +1168,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.TPM.DictionaryAttackResetStatus"
-    enum="CrosTPMDictionaryAttackResetStatusEnum" expires_after="2021-03-28">
+    enum="CrosTPMDictionaryAttackResetStatusEnum" expires_after="2021-08-01">
   <owner>cylai@chromium.org</owner>
   <owner>cros-hwsec-userland-eng+uma@chromium.org</owner>
   <summary>
@@ -1165,8 +1178,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Platform.TPM.ErrorCode" enum="TPMResultCodeEnum"
-    expires_after="M85">
-  <owner>semenzato@chromium.org</owner>
+    expires_after="2021-12-21">
+  <owner>yich@google.com</owner>
+  <owner>cros-hwsec-userland-eng+uma@chromium.org</owner>
   <summary>
     Each sample is the result code of a TPM command issued through tcsd. Success
     is 0. For the other error codes, see /usr/include/tss/tpm_error.h.
@@ -1209,6 +1223,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Platform.TPM.TpmManagerSecretStatus"
+    enum="TpmManagerSecretStatus" expires_after="2021-09-01">
+  <owner>cylai@chromium.org</owner>
+  <owner>cros-hwsec+uma@chromium.org</owner>
+  <summary>The status of the secrets that tpm manager holds.</summary>
+</histogram>
+
 <histogram name="Platform.TPM.VersionFingerprint" enum="TPMVersionFingerprint"
     expires_after="2021-07-01">
   <owner>mnissler@chromium.org</owner>
@@ -1219,20 +1240,63 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Platform.Trunks.FirstTimeoutReadingCommand"
+    enum="TPMCommandCode" expires_after="2022-01-14">
+  <owner>chingkang@chromium.org</owner>
+  <owner>cros-hwsec+uma@chromium.org</owner>
+  <summary>Command code of the first timeout reading TPM command</summary>
+</histogram>
+
+<histogram name="Platform.Trunks.FirstTimeoutReadingTime" units="seconds"
+    expires_after="2022-01-14">
+  <owner>chingkang@chromium.org</owner>
+  <owner>cros-hwsec+uma@chromium.org</owner>
+  <summary>System uptime when first timeout reading TPM command occurs</summary>
+</histogram>
+
+<histogram name="Platform.Trunks.FirstTimeoutWritingCommand"
+    enum="TPMCommandCode" expires_after="2022-01-14">
+  <owner>chingkang@chromium.org</owner>
+  <owner>cros-hwsec+uma@chromium.org</owner>
+  <summary>Command code of the first timeout writing TPM command</summary>
+</histogram>
+
+<histogram name="Platform.Trunks.FirstTimeoutWritingTime" units="seconds"
+    expires_after="2022-01-14">
+  <owner>chingkang@chromium.org</owner>
+  <owner>cros-hwsec+uma@chromium.org</owner>
+  <summary>System uptime when first timeout writing TPM command occurs</summary>
+</histogram>
+
 <histogram name="Platform.U2F.Command" enum="Cr50U2FCommands"
-    expires_after="2020-10-07">
+    expires_after="2021-12-21">
   <owner>cylai@chromium.org</owner>
   <owner>cros-hwsec-userland-eng+uma@chromium.org</owner>
   <summary>Records occurrences of U2F commands sent to cr50.</summary>
 </histogram>
 
 <histogram name="Platform.U2F.LegacyCommand" enum="Cr50U2FCommands"
-    expires_after="2020-10-07">
+    expires_after="2021-12-21">
   <owner>cylai@chromium.org</owner>
   <owner>cros-hwsec-userland-eng+uma@chromium.org</owner>
   <summary>Records occurrences of legacy U2F commands sent to cr50.</summary>
 </histogram>
 
+<histogram name="Platform.UnaggregatedUsageTime" units="seconds"
+    expires_after="2022-01-08">
+  <owner>mutexlox@chromium.org</owner>
+  <owner>iby@chromium.org</owner>
+  <owner>cros-telemetry@google.com</owner>
+  <summary>
+    Use time (device ON and not asleep) in a particular period (approximately
+    every five minutes). To compute usage time in a given period (e.g. a day),
+    sum up all reported values of this metric for that period (day). As with
+    other UMA metrics on CrOS, this will be uploaded roughly every half-hour.
+    This will eventually supercede Platform.DailyUseTime, which has significant
+    limitations (e.g. it may not report on the right day).
+  </summary>
+</histogram>
+
 <histogram name="Platform.UncleanShutdownsDaily" units="count per day"
     expires_after="never">
 <!-- expires-never: Used to assess Chrome OS platform stability. -->
@@ -1434,7 +1498,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PlatformThread.Mac.AttemptedRealtimePeriod"
-    units="microseconds" expires_after="2021-05-02">
+    units="microseconds" expires_after="2021-07-04">
   <owner>olka@chromium.org</owner>
   <owner>handellm@chromium.org</owner>
   <summary>
@@ -1444,7 +1508,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PlatformThread.Mac.SucceededRealtimePeriod"
-    units="microseconds" expires_after="2021-05-02">
+    units="microseconds" expires_after="2021-07-04">
   <owner>olka@chromium.org</owner>
   <owner>handellm@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/plugin/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/plugin/histograms.xml
index a58e0ca283e..9b8ec6bf6e8 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/plugin/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/plugin/histograms.xml
@@ -28,7 +28,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Plugin.FlashUsage" enum="FlashUsage"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>yzshen@chromium.org</owner>
   <owner>thestig@chromium.org</owner>
   <summary>Collects Flash usage data.</summary>
@@ -115,7 +115,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PluginVm.AppsInstalledAtLogin" units="apps"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>timloh@google.com</owner>
   <owner>joelhockey@google.com</owner>
   <summary>
@@ -124,15 +124,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="PluginVm.DlcUseResult" units="PluginVmDlcUseResult"
-    expires_after="2021-05-09">
+<histogram name="PluginVm.DlcUseResult" enum="PluginVmDlcUseResult"
+    expires_after="2021-07-11">
   <owner>kimjae@google.com</owner>
   <owner>timloh@google.com</owner>
   <summary>Recorded at each time PluginVM DLC is installed.</summary>
 </histogram>
 
 <histogram name="PluginVm.EngagementTime.Background" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-08-09">
   <owner>timloh@google.com</owner>
   <owner>joelhockey@google.com</owner>
   <summary>
@@ -143,7 +143,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PluginVm.EngagementTime.Foreground" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>timloh@google.com</owner>
   <owner>joelhockey@google.com</owner>
   <summary>
@@ -153,7 +153,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PluginVm.EngagementTime.PluginVmTotal" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>timloh@google.com</owner>
   <owner>joelhockey@google.com</owner>
   <summary>
@@ -164,7 +164,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PluginVm.EngagementTime.Total" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>timloh@google.com</owner>
   <owner>joelhockey@google.com</owner>
   <summary>
@@ -178,8 +178,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PluginVm.Image.DownloadedSize" units="MB"
-    expires_after="2020-12-31">
-  <owner>aoldemeier@chromium.org</owner>
+    expires_after="2021-05-16">
+  <owner>joelhockey@chromium.org</owner>
   <owner>okalitova@chromium.org</owner>
   <owner>timloh@chromium.org</owner>
   <summary>
@@ -189,8 +189,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PluginVm.LaunchResult" enum="PluginVmLaunchResult"
-    expires_after="2020-12-31">
-  <owner>aoldemeier@chromium.org</owner>
+    expires_after="2021-05-16">
+  <owner>joelhockey@chromium.org</owner>
   <owner>okalitova@chromium.org</owner>
   <owner>timloh@chromium.org</owner>
   <summary>
@@ -200,15 +200,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PluginVm.SetupFailureReason" enum="PluginVmSetupFailureReason"
-    expires_after="2021-03-15">
+    expires_after="2021-07-27">
   <owner>timloh@chromium.org</owner>
   <owner>chromeos-core-services@google.com</owner>
   <summary>Recorded when the Plugin VM installer fails.</summary>
 </histogram>
 
 <histogram name="PluginVm.SetupResult" enum="PluginVmSetupResult"
-    expires_after="2021-03-15">
-  <owner>aoldemeier@chromium.org</owner>
+    expires_after="2021-07-18">
+  <owner>joelhockey@chromium.org</owner>
   <owner>okalitova@chromium.org</owner>
   <owner>timloh@chromium.org</owner>
   <summary>
@@ -218,8 +218,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="PluginVm.SetupTime" units="ms" expires_after="2020-12-31">
-  <owner>aoldemeier@chromium.org</owner>
+<histogram name="PluginVm.SetupTime" units="ms" expires_after="2021-07-18">
+  <owner>joelhockey@chromium.org</owner>
   <owner>okalitova@chromium.org</owner>
   <owner>timloh@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/power/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/power/histograms.xml
index 627693b4729..3da95064303 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/power/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/power/histograms.xml
@@ -46,7 +46,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Power.BacklightLevelOnAC" units="%" expires_after="2021-04-25">
+<histogram name="Power.BacklightLevelOnAC" units="%" expires_after="2021-06-27">
   <owner>tbroch@chromium.org</owner>
   <summary>
     The level of the backlight as a percentage when the user is on AC. Sampled
@@ -55,7 +55,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.BacklightLevelOnBattery" units="%"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>tbroch@chromium.org</owner>
   <summary>
     The level of the backlight as a percentage when the user is on battery.
@@ -64,7 +64,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.BatteryChargeHealth" units="%"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>tbroch@chromium.org</owner>
   <summary>
     Chrome OS battery charge health percentage. Sampled once when device starts
@@ -72,8 +72,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Power.BatteryDischargeMode" enum="BatteryDischargeMode"
+    expires_after="2021-07-18">
+  <owner>etiennep@chromium.org</owner>
+  <owner>olivierli@chromium.org</owner>
+  <summary>
+    Battery discharge mode describing whether BatteryDischargeRate2 could be
+    reported or not, and why, reported everytime the battery charge level is
+    sampled. This is reported on Mac and Windows. See
+    go/chrome_power_use_per_scenario for more details.
+  </summary>
+</histogram>
+
 <histogram name="Power.BatteryDischargeRate" units="mW"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>tbroch@chromium.org</owner>
   <summary>
     Chrome OS battery discharge rate in mW sampled every 30 seconds while the
@@ -81,8 +93,23 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Power.BatteryDischargeRate2" units="hundredth of percent"
+    expires_after="2021-07-18">
+  <owner>etiennep@chromium.org</owner>
+  <owner>olivierli@chromium.org</owner>
+  <owner>lgrey@chromium.org</owner>
+  <summary>
+    Battery discharge rate per minute, with 1/10000 of full charge resolution,
+    example: - Battery capacity = 4000 mAh; - Battery charge at the beginning of
+    the interval: 3900 mAh; - Battery charge at the end of the interval: 3700
+    mAh; - Discharge proportion: (3900-3700) / 4000 = 0.05 - Reported value:
+    500. This metric is only recorded when on battery power. This is reported on
+    Mac and Windows. See go/chrome_power_use_per_scenario for more details.
+  </summary>
+</histogram>
+
 <histogram name="Power.BatteryDischargeRateWhileSuspended" units="mW"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>tbroch@chromium.org</owner>
   <summary>
     Chrome OS battery discharge rate in mW while the system was suspended,
@@ -102,7 +129,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Power.BatteryPercentDrop" units="%" expires_after="2021-04-04">
+<histogram name="Power.BatteryPercentDrop" units="%" expires_after="2021-08-09">
   <owner>ryansturm@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -127,7 +154,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.BatteryRemainingAtEndOfSessionOnBattery" units="%"
-    expires_after="2021-04-04">
+    expires_after="2021-08-22">
   <owner>tbroch@chromium.org</owner>
   <summary>
     Chrome OS remaining battery charge as percent of the maximum battery charge,
@@ -136,7 +163,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.BatteryRemainingAtStartOfSessionOnAC" units="%"
-    expires_after="2021-04-11">
+    expires_after="2021-08-22">
   <owner>tbroch@chromium.org</owner>
   <summary>
     Chrome OS remaining battery charge as percent of the maximum battery charge,
@@ -154,7 +181,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.BatteryRemainingWhenChargeStarts" units="%"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>tbroch@chromium.org</owner>
   <summary>
     Chrome OS remaining battery charge as percent of the maximum battery charge,
@@ -162,6 +189,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Power.BatterySamplingDelay" units="microseconds"
+    expires_after="2021-07-18">
+  <owner>etiennep@chromium.org</owner>
+  <owner>sebmarchand@chromium.org</owner>
+  <owner>fdoray@chromium.org</owner>
+  <summary>
+    The delay in microseconds between the time a battery charge level query was
+    schedule and the time the state is made available, reported everytime the
+    battery charge level is sampled. Reported for all users on Windows and Mac.
+  </summary>
+</histogram>
+
 <histogram name="Power.BitfixChunks" units="units" expires_after="M77">
   <owner>dianders@chromium.org</owner>
   <summary>
@@ -183,7 +222,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.ConnectedChargingPorts"
-    enum="PowerConnectedChargingPorts" expires_after="2021-04-04">
+    enum="PowerConnectedChargingPorts" expires_after="2021-08-15">
   <owner>bleung@chromium.org</owner>
   <owner>tbroch@chromium.org</owner>
   <summary>
@@ -227,7 +266,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.CpuTimeSecondsPerProcessType" enum="ProcessType2"
-    expires_after="2021-05-14">
+    expires_after="2021-07-18">
   <owner>eseckler@chromium.org</owner>
   <owner>skyostil@chromium.org</owner>
   <summary>
@@ -242,8 +281,30 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Power.CpuTimeSecondsPerProcessType.{Visibility}"
+    enum="ProcessType2" expires_after="2021-07-18">
+  <owner>eseckler@chromium.org</owner>
+  <owner>skyostil@chromium.org</owner>
+  <summary>
+    Total seconds of CPU time consumed by Chrome/WebView in the {Visibility}
+    state, split by process type. Currently only implemented in the browser
+    process on Android. For every second of CPU time consumed by one process, a
+    sample is recorded into the bucket for the process's type. The histogram
+    thus shows the total sum of CPU time seconds spent per process type across
+    all users.
+
+    For a histogram of daily per-user values, select &quot;Per-Client
+    Aggregation Mode&quot;.
+  </summary>
+  <token key="Visibility">
+    <variant name="Background" summary="backgrounded"/>
+    <variant name="Foreground" summary="foregrounded"/>
+    <variant name="Unattributed" summary="undetermined visibility"/>
+  </token>
+</histogram>
+
 <histogram name="Power.CpuTimeSecondsPerThreadType"
-    enum="CpuTimeMetricsThreadType" expires_after="2021-06-10">
+    enum="CpuTimeMetricsThreadType" expires_after="2021-08-09">
   <owner>eseckler@chromium.org</owner>
   <owner>skyostil@chromium.org</owner>
   <summary>
@@ -357,7 +418,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.ExternalDisplayOpenResult"
-    enum="ExternalDisplayOpenResult" expires_after="2021-03-28">
+    enum="ExternalDisplayOpenResult" expires_after="2021-08-01">
   <owner>tbroch@chromium.org</owner>
   <summary>
     The result of attempting to open an I2C device to control an external
@@ -367,7 +428,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.FirmwareResumeTimeOnAC" units="ms"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>tbroch@chromium.org</owner>
   <summary>
     The time that the firmware took to resume the Chrome OS device from
@@ -376,7 +437,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.FirmwareResumeTimeOnBattery" units="ms"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>tbroch@chromium.org</owner>
   <summary>
     The time that the firmware took to resume the Chrome OS device from
@@ -517,6 +578,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </token>
 </histogram>
 
+<histogram name="Power.ForegroundRadio.Wakeups.Cell.30Seconds"
+    enum="RadioSignalLevel" expires_after="2021-07-03">
+  <owner>eseckler@chromium.org</owner>
+  <owner>khokhlov@chromium.org</owner>
+  <owner>skyostil@chromium.org</owner>
+  <summary>
+    Counts the number of radio wakeups while Chrome is the foreground app, the
+    device is on battery power and connection type is cellular. Values are
+    distributed across buckets according to the radio signal quality.
+
+    Caveat: signal quality is measured at the end of 30-sec period, so it might
+    not reflect the quality during the entire period.
+
+    Only supported on Android. Disabled by default. Please supply the
+    ForegroundRadioStateCountWakeups feature flag to turn this metric on.
+  </summary>
+</histogram>
+
 <histogram name="Power.ForegroundRadio.{Direction}KiB.{NetworkType}.30Seconds"
     enum="RadioSignalLevel" expires_after="2021-07-03">
   <owner>eseckler@chromium.org</owner>
@@ -547,7 +626,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Power.IdleScreenDimCountDaily" units="count"
     expires_after="M100">
   <owner>tbroch@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <summary>
     Number of times that that the screen has been dimmed in response to user
     inactivity, reported daily. The count is accumulated through the day,
@@ -562,7 +641,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Power.IdleScreenOffCountDaily" units="count"
     expires_after="M100">
   <owner>tbroch@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <summary>
     Number of times that that the screen has been turned off in response to user
     inactivity, reported daily. The count is accumulated through the day,
@@ -575,9 +654,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.IdleSuspendCountDaily" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>tbroch@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <summary>
     Number of times that that the system has suspended in response to user
     inactivity, reported daily. The count is accumulated through the day,
@@ -591,7 +670,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Power.IdleTimeAfterDimOnAC" units="ms" expires_after="M100">
   <owner>tbroch@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <summary>
     Chrome OS user idle time since the screen dimmed sampled when the user
     becomes active again if the device runs on AC.
@@ -601,7 +680,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Power.IdleTimeAfterDimOnBattery" units="ms"
     expires_after="M100">
   <owner>tbroch@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <summary>
     Chrome OS user idle time since the screen dimmed sampled when the user
     becomes active again if the device runs on battery.
@@ -611,7 +690,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Power.IdleTimeAfterScreenOffOnAC" units="ms"
     expires_after="M100">
   <owner>tbroch@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <summary>
     Chrome OS user idle time since the screen turned off sampled when the user
     becomes active again if the device runs on AC.
@@ -621,7 +700,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Power.IdleTimeAfterScreenOffOnBattery" units="ms"
     expires_after="M100">
   <owner>tbroch@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <summary>
     Chrome OS user idle time since the screen turned off sampled when the user
     becomes active again if the device runs on battery.
@@ -630,16 +709,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Power.IdleTimeOnAC" units="ms" expires_after="M100">
   <owner>tbroch@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <summary>
     Chrome OS user idle time sampled when the user becomes active again if the
     device runs on AC.
   </summary>
 </histogram>
 
-<histogram name="Power.IdleTimeOnBattery" units="ms" expires_after="2021-04-11">
+<histogram name="Power.IdleTimeOnBattery" units="ms" expires_after="2021-08-15">
   <owner>tbroch@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <summary>
     Chrome OS user idle time sampled when the user becomes active again if the
     device runs on battery.
@@ -647,7 +726,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.KernelResumeTimeOnAC" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>tbroch@chromium.org</owner>
   <summary>
     The time that the kernel took to resume the Chrome OS device from
@@ -674,7 +753,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.KernelSuspendTimeOnBattery" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>tbroch@chromium.org</owner>
   <summary>
     The time that the kernel took to suspend-to-RAM the Chrome OS device when
@@ -692,7 +771,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.LengthOfSession" units="seconds"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>tbroch@chromium.org</owner>
   <summary>
     The length of time, in seconds, that a user spent in a single session.
@@ -702,7 +781,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.LidClosedSuspendCountDaily" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>tbroch@chromium.org</owner>
   <summary>
     Number of times that that the system has suspended in response to its lid
@@ -726,7 +805,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.Mac.AppleSMCOpened" enum="BooleanSuccess"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>lgrey@chromium.org</owner>
   <summary>
     When metrics collection started, records true if a handle to the System
@@ -738,7 +817,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.Mac.BatteryDischarge" units="hundredth of percent"
-    expires_after="2021-06-15">
+    expires_after="2021-08-15">
   <owner>olivierli@chromium.org</owner>
   <owner>lgrey@chromium.org</owner>
   <summary>
@@ -766,7 +845,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.Mac.IsOnBattery2" enum="BooleanOnBattery"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>avi@chromium.org</owner>
   <owner>lgrey@chromium.org</owner>
   <summary>
@@ -797,7 +876,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Power.NumberOfAlsAdjustmentsPerSession" units="units"
     expires_after="M100">
   <owner>tbroch@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <summary>
     The number of times that the Automatic Light Sensor (ALS) adjusted the
     brightness during a session. Values for this metric are clamped to 10k
@@ -807,7 +886,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.NumberOfSessionsPerCharge" units="units"
-    expires_after="2021-04-25">
+    expires_after="2021-08-01">
   <owner>tbroch@chromium.org</owner>
   <summary>
     The number of user sessions that occured since the last time that the device
@@ -835,14 +914,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.PowerButtonMenuAction" enum="PowerButtonMenuActionType"
-    expires_after="2021-04-04">
+    expires_after="2021-08-01">
   <owner>minch@chromium.org</owner>
   <owner>xdai@chromium.org</owner>
   <summary>Actions performed while the power button menu is open.</summary>
 </histogram>
 
 <histogram name="Power.PowerButtonPressInLaptopMode"
-    enum="PowerButtonPressType" expires_after="2021-04-18">
+    enum="PowerButtonPressType" expires_after="2021-08-22">
   <owner>minch@chromium.org</owner>
   <owner>xdai@chromium.org</owner>
   <summary>
@@ -853,7 +932,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.PowerButtonPressInTabletMode"
-    enum="PowerButtonPressType" expires_after="2021-04-04">
+    enum="PowerButtonPressType" expires_after="2021-08-09">
   <owner>minch@chromium.org</owner>
   <owner>xdai@chromium.org</owner>
   <summary>
@@ -864,7 +943,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.PowerSupplyMaxPower" units="W"
-    expires_after="2021-04-04">
+    expires_after="2021-06-27">
   <owner>bleung@chromium.org</owner>
   <owner>tbroch@chromium.org</owner>
   <summary>
@@ -885,7 +964,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.PowerSupplyType" enum="PowerSupplyType"
-    expires_after="2021-04-11">
+    expires_after="2021-06-27">
   <owner>bleung@chromium.org</owner>
   <owner>tbroch@chromium.org</owner>
   <summary>
@@ -905,14 +984,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.SmartCharging.Messages" enum="SmartChargingMessages"
-    expires_after="2020-12-31">
+    expires_after="2021-11-15">
   <owner>thanhdng@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <summary>Type of messages that are reported by smart charging.</summary>
 </histogram>
 
 <histogram name="Power.SuspendAttempt" enum="SuspendAttempt"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>tbroch@chromium.org</owner>
   <summary>
     The number of suspend attempts on Chrome OS. Samples are reported before
@@ -922,7 +1001,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.SuspendAttemptsBeforeCancel" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>tbroch@chromium.org</owner>
   <summary>
     The number of suspend attempts performed for a single suspend request (e.g.
@@ -933,7 +1012,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.SuspendAttemptsBeforeSuccess" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>tbroch@chromium.org</owner>
   <summary>
     The number of suspend attempts performed for a single suspend request (e.g.
@@ -943,7 +1022,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.SuspendResult" enum="SuspendResult"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>tbroch@chromium.org</owner>
   <summary>
     The results of suspend attempts on Chrome OS. Samples are reported after
@@ -971,7 +1050,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram name="Power.UserBrightnessAdjustmentsPerSessionOnAC" units="units"
     expires_after="M100">
   <owner>tbroch@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <summary>
     The number of times that the user adjusted the brightness during a session
     when on AC. Values for this metric are clamped to 10k count, so the last
@@ -980,9 +1059,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Power.UserBrightnessAdjustmentsPerSessionOnBattery"
-    units="units" expires_after="2021-04-18">
+    units="units" expires_after="2021-08-22">
   <owner>tbroch@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <summary>
     The number of times that the user adjusted the brightness during a session
     when on battery. Values for this metric are clamped to 10k count, so the
@@ -991,8 +1070,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PowerML.DimImminent.Action" enum="PowerMLDimImminentAction"
-    expires_after="2021-04-18">
-  <owner>jiameng@chromium.org</owner>
+    expires_after="2021-08-22">
+  <owner>napper@chromium.org</owner>
+  <owner>thanhdng@chromium.org</owner>
   <summary>
     What happens when UserActivityManager receives a screen dim imminent
     notification. Only applicable to Chrome OS.
@@ -1000,8 +1080,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PowerML.ModelDim.Result" enum="PowerMLFinalResult"
-    expires_after="2021-04-18">
-  <owner>jiameng@chromium.org</owner>
+    expires_after="2021-08-22">
+  <owner>napper@chromium.org</owner>
+  <owner>thanhdng@chromium.org</owner>
   <summary>
     What happens after screen is dimmed following model instruction. Only
     applicable to Chrome OS.
@@ -1009,8 +1090,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PowerML.ModelNoDim.Result" enum="PowerMLFinalResult"
-    expires_after="2021-04-18">
-  <owner>jiameng@chromium.org</owner>
+    expires_after="2021-08-22">
+  <owner>napper@chromium.org</owner>
+  <owner>thanhdng@chromium.org</owner>
   <summary>
     What happens after screen dim is deferred following model instruction. Only
     applicable to Chrome OS.
@@ -1018,8 +1100,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PowerML.NonModelDim.Result" enum="PowerMLFinalResult"
-    expires_after="2021-03-15">
-  <owner>jiameng@chromium.org</owner>
+    expires_after="2021-07-18">
+  <owner>napper@chromium.org</owner>
+  <owner>thanhdng@chromium.org</owner>
   <summary>
     What happens after screen is dimmed by powerd by ignoring the model
     instruction. Only applicable to Chrome OS.
@@ -1028,7 +1111,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="PowerML.PreviousEventLogging.Result"
     enum="PowerMLPreviousEventLoggingResult" expires_after="2020-12-13">
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
+  <owner>thanhdng@chromium.org</owner>
   <summary>
     Status of logging previous idle event after a screen dim imminent signal is
     received. Only applicable to Chrome OS.
@@ -1037,10 +1121,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="PowerML.SmartDimComponent.LoadComponentEvent"
     enum="PowerMLSmartDimComponentLoadComponentEvent"
-    expires_after="2021-04-25">
+    expires_after="2021-08-09">
   <owner>alanlxl@chromium.org</owner>
   <owner>amoylan@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <summary>
     Records the event (various failures or success) of loading smart dim
     component. Only applicable to Chrome OS.
@@ -1048,10 +1132,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PowerML.SmartDimComponent.VersionType"
-    enum="PowerMLSmartDimComponentVersionType" expires_after="2021-04-25">
+    enum="PowerMLSmartDimComponentVersionType" expires_after="2021-08-09">
   <owner>alanlxl@chromium.org</owner>
   <owner>amoylan@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <summary>
     Records the type of expected version (default, experimental or empty) used
     by smart dim component installer. Only applicable to Chrome OS.
@@ -1059,10 +1143,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PowerML.SmartDimComponent.WorkerType"
-    enum="PowerMLSmartDimComponentWorkerType" expires_after="2021-04-25">
+    enum="PowerMLSmartDimComponentWorkerType" expires_after="2021-08-09">
   <owner>alanlxl@chromium.org</owner>
   <owner>amoylan@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <summary>
     Records the worker type that is used by smart dim ml agent to make a
     decision. Only applicable to Chrome OS.
@@ -1070,9 +1154,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PowerML.SmartDimModel.RequestCanceledDuration" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>amoylan@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <owner>napper@chromium.org</owner>
   <owner>pmalani@chromium.org</owner>
   <summary>
@@ -1082,9 +1166,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PowerML.SmartDimModel.RequestCompleteDuration" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>amoylan@chromium.org</owner>
-  <owner>jiameng@chromium.org</owner>
+  <owner>napper@chromium.org</owner>
   <owner>napper@chromium.org</owner>
   <owner>pmalani@chromium.org</owner>
   <summary>
@@ -1094,8 +1178,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PowerML.SmartDimModel.Result"
-    enum="PowerMLSmartDimModelResult" expires_after="2021-04-11">
-  <owner>jiameng@chromium.org</owner>
+    enum="PowerMLSmartDimModelResult" expires_after="2021-08-15">
+  <owner>napper@chromium.org</owner>
+  <owner>thanhdng@chromium.org</owner>
   <summary>
     This is the status code returned by the model when calculating a user
     inactivity score. If it is any value other than 0 (success), then some issue
@@ -1106,8 +1191,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PowerML.SmartDimParameter.Result"
-    enum="PowerMLSmartDimParameterResult" expires_after="2021-04-18">
-  <owner>jiameng@chromium.org</owner>
+    enum="PowerMLSmartDimParameterResult" expires_after="2021-08-22">
+  <owner>napper@chromium.org</owner>
+  <owner>thanhdng@chromium.org</owner>
   <summary>
     The result of parsing the dim threshold parameter value. Only applicable to
     Chrome OS.
diff --git a/chromium/tools/metrics/histograms/histograms_xml/prefetch/DIR_METADATA b/chromium/tools/metrics/histograms/histograms_xml/prefetch/DIR_METADATA
new file mode 100644
index 00000000000..50d3d427d48
--- /dev/null
+++ b/chromium/tools/metrics/histograms/histograms_xml/prefetch/DIR_METADATA
@@ -0,0 +1,11 @@
+# Metadata information for this directory.
+#
+# For more information on DIR_METADATA files, see:
+#   https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/tools/dirmd/README.md
+#
+# For the schema of this file, see Metadata message:
+#   https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/tools/dirmd/proto/dir_metadata.proto
+
+monorail {
+  component: "Internals>Preload>PrefetchProxy"
+}
diff --git a/chromium/tools/metrics/histograms/histograms_xml/prefetch/OWNERS b/chromium/tools/metrics/histograms/histograms_xml/prefetch/OWNERS
new file mode 100644
index 00000000000..1e495bc9b8c
--- /dev/null
+++ b/chromium/tools/metrics/histograms/histograms_xml/prefetch/OWNERS
@@ -0,0 +1,4 @@
+# If these reviewers are unavailable, please send CLs to
+# <chromium-metrics-reviews@google.com>. See tools/metrics/histograms/OWNERS
+# for details.
+tbansal@chromium.org
diff --git a/chromium/tools/metrics/histograms/histograms_xml/prefetch/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/prefetch/histograms.xml
new file mode 100644
index 00000000000..bef989b96e3
--- /dev/null
+++ b/chromium/tools/metrics/histograms/histograms_xml/prefetch/histograms.xml
@@ -0,0 +1,444 @@
+<!--
+Copyright 2021 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<!--
+This file is used to generate a comprehensive list of Prefetch histograms
+along with a detailed description for each histogram.
+
+For best practices on writing histogram descriptions, see
+https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/metrics/histograms/README.md
+
+Please send CLs to chromium-metrics-reviews@google.com rather than to specific
+individuals. These CLs will be automatically reassigned to a reviewer within
+about 5 minutes. This approach helps the metrics team to load-balance incoming
+reviews. Googlers can read more about this at go/gwsq-gerrit.
+-->
+
+<histogram-configuration>
+
+<histograms>
+
+<histogram name="IsolatedPrerender.AfterClick.Mainframe.CookieWaitTime"
+    units="ms" expires_after="2021-06-20">
+  <obsolete>
+    Renamed to PrefetchProxy* in M90
+  </obsolete>
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the amount of time that the navigation to a previously prefetched
+    page was delayed because cookies had to be copied from the isolated cookie
+    jar.
+  </summary>
+</histogram>
+
+<histogram name="IsolatedPrerender.AfterClick.Subresources.UsedCache"
+    enum="BooleanCacheHit" expires_after="2021-06-20">
+  <obsolete>
+    Renamed to PrefetchProxy* in M90
+  </obsolete>
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records whether a previously prefetched subresource from an Isolated
+    Prerender was served from cache when its page was later navigated to.
+  </summary>
+</histogram>
+
+<histogram name="IsolatedPrerender.Prefetch.Mainframe.BodyLength" units="bytes"
+    expires_after="2021-06-20">
+  <obsolete>
+    Renamed to PrefetchProxy* in M90
+  </obsolete>
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the response body length as cached in memory encountered when
+    isolated prefetching a mainframe HTML resource from the Google Search Result
+    Page. Recorded for non-network error prefetches only.
+  </summary>
+</histogram>
+
+<histogram name="IsolatedPrerender.Prefetch.Mainframe.ConnectTime" units="ms"
+    expires_after="2021-06-20">
+  <obsolete>
+    Renamed to PrefetchProxy* in M90
+  </obsolete>
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the time taken to establish a socket connection when isolated
+    prefetching a mainframe HTML resource from the Google Search Result Page.
+    Recorded for non-network error prefetches only.
+  </summary>
+</histogram>
+
+<histogram name="IsolatedPrerender.Prefetch.Mainframe.CookiesToCopy"
+    units="count" expires_after="M90">
+  <obsolete>
+    Renamed to PrefetchProxy* in M90
+  </obsolete>
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the number of cookies that needed to be copied from the prefetch
+    navigation to the user's profile after a prefetched link is navigated to.
+  </summary>
+</histogram>
+
+<histogram name="IsolatedPrerender.Prefetch.Mainframe.NetError"
+    enum="NetErrorCodes" expires_after="2021-06-20">
+  <obsolete>
+    Renamed to PrefetchProxy* in M90
+  </obsolete>
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the Net Error encountered when isolated prefetching a mainframe HTML
+    resource from the Google Search Result Page. Recorded for every completed
+    prefetch.
+  </summary>
+</histogram>
+
+<histogram name="IsolatedPrerender.Prefetch.Mainframe.RespCode"
+    enum="HttpResponseCode" expires_after="M90">
+  <obsolete>
+    Renamed to PrefetchProxy* in M90
+  </obsolete>
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the HTTP response code encountered isolated prefetching a mainframe
+    HTML resource from the Google Search Result Page. Recorded for non-network
+    error prefetches only. Redirects are not included here.
+  </summary>
+</histogram>
+
+<histogram name="IsolatedPrerender.Prefetch.Mainframe.RetryAfter" units="ms"
+    expires_after="M90">
+  <obsolete>
+    Renamed to PrefetchProxy* in M90
+  </obsolete>
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the duration of a Retry-After header on a 503 response to a
+    mainframe prefetch request.
+  </summary>
+</histogram>
+
+<histogram name="IsolatedPrerender.Prefetch.Mainframe.TotalRedirects"
+    units="count" expires_after="M90">
+  <obsolete>
+    Renamed to PrefetchProxy* in M90
+  </obsolete>
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the total number of redirects encountered while doing all the
+    prefetches on an eligible Google Search Result page. Only recorded when at
+    least one prefetch was attempted.
+  </summary>
+</histogram>
+
+<histogram name="IsolatedPrerender.Prefetch.Mainframe.TotalTime" units="ms"
+    expires_after="M90">
+  <obsolete>
+    Renamed to PrefetchProxy* in M90
+  </obsolete>
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the total time taken when isolated prefetching a mainframe HTML
+    resource from the Google Search Result Page. Recorded for successful
+    non-network error prefetches only.
+  </summary>
+</histogram>
+
+<histogram name="IsolatedPrerender.Prefetch.Subresources.NetError"
+    enum="NetErrorCodes" expires_after="2021-06-20">
+  <obsolete>
+    Renamed to PrefetchProxy* in M90
+  </obsolete>
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the net error encountered when prefetching a single subresource
+    during Isolated Prerenders.
+  </summary>
+</histogram>
+
+<histogram name="IsolatedPrerender.Prefetch.Subresources.Quantity"
+    units="count" expires_after="2021-06-20">
+  <obsolete>
+    Renamed to PrefetchProxy* in M90
+  </obsolete>
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the number of subresources that were NoStatePrefetch'd during an
+    Isolated Prerender. Recorded once for each page that is NoStatePrefetch'd
+    during Isolated Prerenders.
+  </summary>
+</histogram>
+
+<histogram name="IsolatedPrerender.Prefetch.Subresources.RespCode"
+    enum="HttpResponseCode" expires_after="2021-07-18">
+  <obsolete>
+    Renamed to PrefetchProxy* in M90
+  </obsolete>
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the HTTP response code encountered when prefetching a single
+    subresource during Isolated Prerenders.
+  </summary>
+</histogram>
+
+<histogram name="IsolatedPrerender.Proxy.Fallback.NetError"
+    enum="NetErrorCodes" expires_after="M95">
+  <obsolete>
+    Renamed to PrefetchProxy* in M90
+  </obsolete>
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the Net Error encountered when Chrome did a fallback from the
+    prefetch proxy. Recorded only on fallbacks.
+  </summary>
+</histogram>
+
+<histogram name="IsolatedPrerender.Proxy.RespCode" enum="HttpResponseCode"
+    expires_after="M95">
+  <obsolete>
+    Renamed to PrefetchProxy* in M90
+  </obsolete>
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the HTTP response code encountered when connecting to the prefetch
+    proxy CONNECT tunnel. Recorded every time Chrome gets CONNECT tunnel
+    response headers.
+  </summary>
+</histogram>
+
+<histogram name="IsolatedPrerender.SpareRenderer.CountStartedOnSRP"
+    units="count" expires_after="2021-06-20">
+  <obsolete>
+    Renamed to PrefetchProxy* in M90
+  </obsolete>
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the number of spare renderers that were attempted to be started on
+    the SRP, when the feature param is enabled.
+  </summary>
+</histogram>
+
+<histogram name="PrefetchProxy.AfterClick.Mainframe.CookieWaitTime" units="ms"
+    expires_after="2021-08-22">
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the amount of time that the navigation to a previously prefetched
+    page was delayed because cookies had to be copied from the isolated cookie
+    jar.
+  </summary>
+</histogram>
+
+<histogram name="PrefetchProxy.AfterClick.Subresources.UsedCache"
+    enum="BooleanCacheHit" expires_after="2021-08-22">
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records whether a previously prefetched subresource from an Isolated
+    Prerender was served from cache when its page was later navigated to.
+  </summary>
+</histogram>
+
+<histogram name="PrefetchProxy.Prefetch.Mainframe.BodyLength" units="bytes"
+    expires_after="2021-08-22">
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the response body length as cached in memory encountered when
+    isolated prefetching a mainframe HTML resource from the Google Search Result
+    Page. Recorded for non-network error prefetches only.
+  </summary>
+</histogram>
+
+<histogram name="PrefetchProxy.Prefetch.Mainframe.ConnectTime" units="ms"
+    expires_after="2021-06-20">
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the time taken to establish a socket connection when isolated
+    prefetching a mainframe HTML resource from the Google Search Result Page.
+    Recorded for non-network error prefetches only.
+  </summary>
+</histogram>
+
+<histogram name="PrefetchProxy.Prefetch.Mainframe.CookiesToCopy" units="count"
+    expires_after="2021-08-22">
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the number of cookies that needed to be copied from the prefetch
+    navigation to the user's profile after a prefetched link is navigated to.
+  </summary>
+</histogram>
+
+<histogram name="PrefetchProxy.Prefetch.Mainframe.NetError"
+    enum="NetErrorCodes" expires_after="2021-06-20">
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the Net Error encountered when isolated prefetching a mainframe HTML
+    resource from the Google Search Result Page. Recorded for every completed
+    prefetch.
+  </summary>
+</histogram>
+
+<histogram name="PrefetchProxy.Prefetch.Mainframe.RespCode"
+    enum="HttpResponseCode" expires_after="2021-06-20">
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the HTTP response code encountered isolated prefetching a mainframe
+    HTML resource from the Google Search Result Page. Recorded for non-network
+    error prefetches only. Redirects are not included here.
+  </summary>
+</histogram>
+
+<histogram name="PrefetchProxy.Prefetch.Mainframe.RetryAfter" units="ms"
+    expires_after="2021-06-20">
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the duration of a Retry-After header on a 503 response to a
+    mainframe prefetch request.
+  </summary>
+</histogram>
+
+<histogram name="PrefetchProxy.Prefetch.Mainframe.TotalRedirects" units="count"
+    expires_after="2021-06-20">
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the total number of redirects encountered while doing all the
+    prefetches on an eligible Google Search Result page. Only recorded when at
+    least one prefetch was attempted.
+  </summary>
+</histogram>
+
+<histogram name="PrefetchProxy.Prefetch.Mainframe.TotalTime" units="ms"
+    expires_after="2021-08-22">
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the total time taken when isolated prefetching a mainframe HTML
+    resource from the Google Search Result Page. Recorded for successful
+    non-network error prefetches only.
+  </summary>
+</histogram>
+
+<histogram name="PrefetchProxy.Prefetch.Subresources.NetError"
+    enum="NetErrorCodes" expires_after="2021-08-22">
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the net error encountered when prefetching a single subresource
+    during Isolated Prerenders.
+  </summary>
+</histogram>
+
+<histogram name="PrefetchProxy.Prefetch.Subresources.Quantity" units="count"
+    expires_after="2021-06-20">
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the number of subresources that were NoStatePrefetch'd during an
+    Isolated Prerender. Recorded once for each page that is NoStatePrefetch'd
+    during Isolated Prerenders.
+  </summary>
+</histogram>
+
+<histogram name="PrefetchProxy.Prefetch.Subresources.RespCode"
+    enum="HttpResponseCode" expires_after="2021-06-20">
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the HTTP response code encountered when prefetching a single
+    subresource during Isolated Prerenders.
+  </summary>
+</histogram>
+
+<histogram name="PrefetchProxy.Proxy.Fallback.NetError" enum="NetErrorCodes"
+    expires_after="2021-06-20">
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the Net Error encountered when Chrome did a fallback from the
+    prefetch proxy. Recorded only on fallbacks.
+  </summary>
+</histogram>
+
+<histogram name="PrefetchProxy.Proxy.RespCode" enum="HttpResponseCode"
+    expires_after="2021-06-20">
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the HTTP response code encountered when connecting to the prefetch
+    proxy CONNECT tunnel. Recorded every time Chrome gets CONNECT tunnel
+    response headers.
+  </summary>
+</histogram>
+
+<histogram name="PrefetchProxy.SpareRenderer.CountStartedOnSRP" units="count"
+    expires_after="2021-06-20">
+  <owner>robertogden@chromium.org</owner>
+  <owner>ryansturm@chromium.org</owner>
+  <owner>tbansal@chromium.org</owner>
+  <summary>
+    Records the number of spare renderers that were attempted to be started on
+    the SRP, when the feature param is enabled.
+  </summary>
+</histogram>
+
+</histograms>
+
+</histogram-configuration>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/print/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/print/histograms.xml
index f34952a5582..f8ffcee6c58 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/print/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/print/histograms.xml
@@ -32,7 +32,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PrintPreview.InitialDisplayTime" units="ms"
-    expires_after="2021-05-10">
+    expires_after="2021-07-27">
   <owner>thestig@chromium.org</owner>
   <owner>dhoss@chromium.org</owner>
   <summary>
@@ -62,7 +62,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PrintPreview.NumberOfPrinters" units="units"
-    expires_after="2021-04-30">
+    expires_after="2021-07-04">
   <owner>thestig@chromium.org</owner>
   <owner>dhoss@chromium.org</owner>
   <summary>
@@ -89,8 +89,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PrintPreview.PrintDocumentType"
-    enum="PrintPreviewPrintDocumentTypeBuckets" expires_after="2021-03-21">
+    enum="PrintPreviewPrintDocumentTypeBuckets" expires_after="2021-07-11">
   <owner>rbpotter@chromium.org</owner>
+  <owner>awscreen@chromium.org</owner>
   <summary>
     Track type of documents printed (HTML vs PDF). Recorded immediately after a
     user requests that a document be printed.
@@ -128,8 +129,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PrintPreview.PrintSettings" enum="PrintSettings"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>thestig@chromium.org</owner>
+  <owner>awscreen@chromium.org</owner>
   <summary>
     Track the popularity of print settings. (Settings when printing to PDF are
     excluded from this statistic.)
@@ -200,7 +202,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PrintPreview.RendererError" enum="PrintPreviewFailureType"
-    expires_after="2021-05-10">
+    expires_after="2021-07-27">
   <owner>thestig@chromium.org</owner>
   <owner>dhoss@chromium.org</owner>
   <summary>
@@ -209,20 +211,23 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="PrintPreview.RenderPDFPageTime" units="ms"
-    expires_after="2021-02-21">
+    expires_after="2021-05-10">
   <owner>thestig@chromium.org</owner>
+  <owner>awscreen@chromium.org</owner>
   <summary>Time taken to render each PDF page for print preview.</summary>
 </histogram>
 
 <histogram name="PrintPreview.RenderToPDFTime" units="ms"
-    expires_after="2021-01-24">
+    expires_after="2021-07-27">
   <owner>thestig@chromium.org</owner>
+  <owner>awscreen@chromium.org</owner>
   <summary>Time taken to render to PDF for print preview.</summary>
 </histogram>
 
 <histogram name="PrintPreview.UserAction" enum="PrintPreviewUserActionType"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>thestig@chromium.org</owner>
+  <owner>awscreen@chromium.org</owner>
   <summary>
     Action taken by the user in the preview tab such as print, cancel, print to
     pdf and show advanced print settings dialog.
diff --git a/chromium/tools/metrics/histograms/histograms_xml/printing/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/printing/histograms.xml
index a9b51d485ca..eca6ddaf019 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/printing/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/printing/histograms.xml
@@ -92,8 +92,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Printing.CUPS.AddressResolutionResult" enum="BooleanSuccess"
-    expires_after="M85">
+    expires_after="M93">
   <owner>skau@chromium.org</owner>
+  <owner>cros-printing-dev@chromium.org</owner>
   <summary>
     Records whether resolution of a .local address via mDNS was successful. The
     metric is recorded during attempted setup of a printer discovered via mDNS.
@@ -101,7 +102,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Printing.CUPS.HighestIppVersion" enum="IppVersion"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>skau@chromium.org</owner>
   <owner>pawliczek@chromium.org</owner>
   <summary>
@@ -113,7 +114,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Printing.CUPS.IppAttributes" enum="IppAttribute"
-    expires_after="M82">
+    expires_after="M93">
   <owner>vkuzkokov@chromium.org</owner>
   <owner>skau@chromium.org</owner>
   <summary>
@@ -133,17 +134,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Printing.CUPS.IppAttributesSuccess" enum="BooleanSuccess"
-    expires_after="M85">
+    expires_after="M93">
   <owner>skau@chromium.org</owner>
+  <owner>cros-printing-dev@chromium.org</owner>
   <summary>
     Record if the request for IPP attributes was successful during printer
     setup. This only occurs for setup attempts of IPP and IPPS printers.
     Starting with M79, this is only recorded if the printer was reachable.
+
+    Recorded when printers are queried for attributes in ChromeOS settings.
   </summary>
 </histogram>
 
 <histogram name="Printing.CUPS.IppAttributesUsed" units="count"
-    expires_after="M82">
+    expires_after="M93">
   <owner>vkuzkokov@chromium.org</owner>
   <owner>skau@chromium.org</owner>
   <summary>
@@ -153,8 +157,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Printing.CUPS.IppDeviceReachable" enum="BooleanSuccess"
-    expires_after="M85">
+    expires_after="M93">
   <owner>skau@chromium.org</owner>
+  <owner>cros-printing-dev@chromium.org</owner>
   <summary>
     Record if the request for IPP attributes was successful in reaching the
     printer. Recorded during the attempt to setup IPP/IPPS printers.
@@ -172,7 +177,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Printing.CUPS.JobDuration.JobDone" units="ms"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>jschettler@chromium.org</owner>
   <owner>project-bolton@google.com</owner>
   <summary>
@@ -182,16 +187,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Printing.CUPS.JobResult" enum="PrintJobResult"
-    expires_after="M85">
+    expires_after="2021-12-01">
   <owner>skau@chromium.org</owner>
+  <owner>cros-printing-dev@chromium.org</owner>
   <summary>
     The final status of every print job that was succesfully queued. Only used
     on Chrome OS.
+
+    Recorded upon the completion of each print job by the CupsPrintJobManager.
   </summary>
 </histogram>
 
 <histogram name="Printing.CUPS.MigratedMakeAndModel" enum="BooleanMigrated"
-    expires_after="2021-01-24">
+    expires_after="2021-08-09">
   <owner>luum@chromium.org</owner>
   <owner>cros-printing-dev@chromium.org</owner>
   <summary>
@@ -202,7 +210,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Printing.CUPS.NearbyNetworkPrintersCount" units="printers"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>skau@chromium.org</owner>
   <owner>project-bolton@google.com</owner>
   <summary>
@@ -213,7 +221,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Printing.CUPS.PrintDocumentSize" units="KB"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>jschettler@chromium.org</owner>
   <owner>project-bolton@google.com</owner>
   <summary>
@@ -296,7 +304,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Printing.CUPS.PrintManagementAppEntryPoint"
-    enum="PrintManagementAppEntryPoint" expires_after="2021-06-22">
+    enum="PrintManagementAppEntryPoint" expires_after="2021-08-22">
   <owner>jimmyxgong@chromium.org</owner>
   <owner>cros-peripherals@google.com</owner>
   <summary>
@@ -306,8 +314,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Printing.CUPS.ProtocolUsed" enum="PrinterProtocol"
-    expires_after="M85">
+    expires_after="2021-12-01">
   <owner>skau@chromium.org</owner>
+  <owner>cros-printing-dev@chromium.org</owner>
   <summary>
     Records the protocol for a selected printer in Chrome OS. Used to track
     usage of the various printer protocols. Since a selection occurs when print
@@ -317,7 +326,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Printing.CUPS.TotalNetworkPrintersCount" units="printers"
-    expires_after="2021-03-15">
+    expires_after="2021-08-01">
   <owner>skau@chromium.org</owner>
   <owner>project-bolton@google.com</owner>
   <summary>
@@ -350,6 +359,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Printing.CUPS.ValidPpdReference" enum="BooleanSuccess"
     expires_after="2020-08-01">
+  <obsolete>
+    Data no longer needed. Bug is resolved. 2020-12.
+  </obsolete>
   <owner>skau@chromium.org</owner>
   <owner>luum@chromium.org</owner>
   <summary>
@@ -373,6 +385,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Printing.PrinterCapabilities" units="ms" expires_after="M80">
+  <obsolete>
+    New data no longer needed 2020-12
+  </obsolete>
   <owner>vkuzkokov@chromium.org</owner>
   <owner>skau@chromium.org</owner>
   <summary>
@@ -382,7 +397,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Printing.PrintServers.ServersToQuery" units="servers"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>pawliczek@chromium.org</owner>
   <owner>skau@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/profile/OWNERS b/chromium/tools/metrics/histograms/histograms_xml/profile/OWNERS
new file mode 100644
index 00000000000..4a43ae5e59b
--- /dev/null
+++ b/chromium/tools/metrics/histograms/histograms_xml/profile/OWNERS
@@ -0,0 +1,7 @@
+# Prefer chromium-metrics-reviews@google.com instead.
+# Use the following owners only if:
+#  - The reviewer is available for review.
+#  - You work in the same area as them.
+#  - They are already a good reviewer for the non-metrics part of the CL.
+# See tools/metrics/histograms/histograms_xml/OWNERS for details.
+alexilin@chromium.org
diff --git a/chromium/tools/metrics/histograms/histograms_xml/profile/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/profile/histograms.xml
index 2b0fd1818dd..9aa447e32e2 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/profile/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/profile/histograms.xml
@@ -22,13 +22,23 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="Profile.AddNewUser" enum="ProfileAddNewUser"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>rogerta@chromium.org</owner>
   <summary>The frequency of ways that new user profiles are added.</summary>
 </histogram>
 
+<histogram name="Profile.AddSignInFlowOutcome"
+    enum="ProfileAddSignInFlowOutcome" expires_after="2021-07-18">
+  <owner>jkrcal@chromium.org</owner>
+  <owner>droger@chromium.org</owner>
+  <summary>
+    Records the outcome of signed-in profile creation whenever it's started (by
+    user choosing to sign-in in the first screen of the profile creation flow).
+  </summary>
+</histogram>
+
 <histogram name="Profile.AllAccounts.Categories"
-    enum="ProfileAllAccountsCategories" expires_after="2021-03-11">
+    enum="ProfileAllAccountsCategories" expires_after="2021-07-27">
   <owner>jkrcal@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>
@@ -42,7 +52,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.AllAccounts.Names" enum="ProfileAllAccountsNames"
-    expires_after="2021-03-11">
+    expires_after="2021-08-09">
   <owner>jkrcal@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>
@@ -58,7 +68,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.AndroidAccountManagementMenu"
-    enum="ProfileAndroidAccountManagementMenu" expires_after="2021-04-26">
+    enum="ProfileAndroidAccountManagementMenu" expires_after="2021-06-27">
   <owner>bsazonov@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
   <summary>
@@ -73,7 +83,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.Avatar" enum="ProfileAvatar"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>jkrcal@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>The frequency of selection of each avatar.</summary>
@@ -85,7 +95,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.BrowserActive.PerProfile" enum="Profile"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>msarda@chromium.org</owner>
   <owner>tangltom@chromium.org</owner>
   <summary>
@@ -103,7 +113,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.ColorsUniqueness" enum="ProfileColorsUniqueness"
-    expires_after="2021-05-30">
+    expires_after="2021-08-01">
   <owner>jkrcal@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>
@@ -119,7 +129,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.CreateResult" enum="ProfileCreateResult"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
+  <obsolete>
+    Removed in M90.
+  </obsolete>
   <owner>treib@chromium.org</owner>
   <owner>rogerta@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
@@ -128,6 +141,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Profile.CreateTimeNoTimeout" units="ms"
     expires_after="2021-01-31">
+  <obsolete>
+    Removed in M90.
+  </obsolete>
   <owner>treib@chromium.org</owner>
   <owner>michaelpg@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
@@ -152,7 +168,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.DeleteProfileAction" enum="ProfileDeleteAction"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>msarda@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <owner>anthonyvd@chromium.org</owner>
@@ -197,6 +213,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Profile.EphemeralGuest.Signin" enum="BooleanProfileSignedIn"
+    expires_after="2022-02-02">
+  <owner>rhalavati@chromium.org</owner>
+  <owner>chrome-privacy-core@google.com</owner>
+  <summary>
+    This histogram records if user's sign-in state to a GAIA account in an
+    Ephemeral Guest profile is changed. This is recorded when user signs in and
+    when user signs out in an Ephemeral Guest profile.
+  </summary>
+</histogram>
+
 <histogram name="Profile.ExtensionSize" units="MB" expires_after="2018-08-30">
   <owner>Please list the metric's owners. Add more owner tags as needed.</owner>
   <summary>Size of the extension cookies database.</summary>
@@ -207,6 +234,36 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>Size of the favicons database.</summary>
 </histogram>
 
+<histogram name="Profile.Guest.ForcedByPolicy" enum="BooleanForced"
+    expires_after="2021-08-09">
+  <owner>rhalavati@chromium.org</owner>
+  <owner>chrome-privacy-core@google.com</owner>
+  <summary>
+    Records if a Guest session is started by user's request or is forced by a
+    policy. This is recorded when a Guest profile is created.
+  </summary>
+</histogram>
+
+<histogram name="Profile.Guest.{Type}.Lifetime" units="minutes"
+    expires_after="2021-06-01">
+  <owner>rhalavati@chromium.org</owner>
+  <owner>chrome-privacy-core@google.com</owner>
+  <summary>
+    This histogram records the lifetime duration of {Type}. It is recorded once
+    the profile for the Guest session is closed.
+  </summary>
+  <token key="Type">
+    <variant name="BlankState"
+        summary="a Guest profile where the session is initialized in blank
+                 state"/>
+    <variant name="Ephemeral" summary="an Ephemeral Guest profile"/>
+    <variant name="OTR" summary="an off-the-record Guest profile"/>
+    <variant name="SigninTransferred"
+        summary="a Guest profile to which a sign-in token has been
+                 transferred"/>
+  </token>
+</histogram>
+
 <histogram name="Profile.HistorySize" units="MB" expires_after="M82">
   <owner>hajimehoshi@chromium.org</owner>
   <owner>kouhei@chromium.org</owner>
@@ -214,7 +271,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.Incognito.Lifetime" units="minutes"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>rhalavati@chromium.org</owner>
   <owner>chrome-privacy-core@google.com</owner>
   <summary>
@@ -224,7 +281,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.Incognito.MainFrameNavigationsPerSession"
-    units="navigations" expires_after="2021-06-01">
+    units="navigations" expires_after="2021-08-01">
   <owner>rhalavati@chromium.org</owner>
   <owner>chrome-privacy-core@google.com</owner>
   <summary>
@@ -234,6 +291,40 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Profile.Incognito.MovedToBackgroundAfterDuration"
+    units="minutes" expires_after="2022-02-22">
+  <owner>rhalavati@chromium.org</owner>
+  <owner>chrome-incognito@google.com</owner>
+  <summary>
+    This histogram records the duration of an Incognito session on Android, when
+    it goes to background or is closed by the user. The session duration is
+    considered from when the Incognito profile is created.
+  </summary>
+</histogram>
+
+<histogram name="Profile.Incognito.ResumedAfterReportedDuration"
+    units="minutes" expires_after="2022-02-22">
+  <owner>rhalavati@chromium.org</owner>
+  <owner>chrome-incognito@google.com</owner>
+  <summary>
+    When Chrome comes back to foreground on Android and it already has an
+    Incognito session, this histogram records the last duration time reported by
+    'Profile.Incognito.MovedToBackgroundAfterDuration' metric. The subtraction
+    of these two histograms can give a histogram of Incognito session duration.
+  </summary>
+</histogram>
+
+<histogram name="Profile.KeepAliveLeakAtShutdown" enum="ProfileKeepAliveOrigin"
+    expires_after="2021-06-01">
+  <owner>nicolaso@chromium.org</owner>
+  <owner>cbe-eng@google.com</owner>
+  <summary>
+    Recorded during BrowserProcess teardown. Indicates that a Profile still has
+    ScopedProfileKeepAlive objects referencing it, of the given origin. This is
+    a sign of a bug, or incorrect usage of the ScopedProfileKeepAlive API.
+  </summary>
+</histogram>
+
 <histogram name="Profile.Menu.ClickedActionableItem"
     enum="ProfileMenuActionableItem" expires_after="2021-06-30">
   <owner>droger@chromium.org</owner>
@@ -246,7 +337,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.Menu.OpenedAfterAvatarAnimation" units="ms"
-    expires_after="2021-04-15">
+    expires_after="2021-08-09">
   <owner>droger@chromium.org</owner>
   <owner>jkrcal@chromium.org</owner>
   <summary>
@@ -268,7 +359,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.NetUserCount" enum="ProfileNetUserCount"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>rogerta@chromium.org</owner>
   <summary>
     Counts of users added and deleted. Percentages are not meaningful. Please
@@ -277,7 +368,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.NumberOfAccountsPerProfile" units="units"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>msarda@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>
@@ -288,7 +379,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.NumberOfActiveProfiles" units="profiles"
-    expires_after="2021-03-12">
+    expires_after="2021-07-18">
   <owner>droger@chromium.org</owner>
   <owner>feuunk@chromium.org</owner>
   <summary>
@@ -326,7 +417,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.NumberOfProfiles" units="profiles"
-    expires_after="2021-03-12">
+    expires_after="2021-07-18">
   <owner>droger@chromium.org</owner>
   <owner>jkrcal@chromium.org</owner>
   <summary>
@@ -339,7 +430,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.NumberOfProfilesAtProfileSwitch" units="profiles"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>jkrcal@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>
@@ -363,7 +454,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.NumberOfSignedInProfiles" units="profiles"
-    expires_after="2021-03-12">
+    expires_after="2021-07-18">
   <owner>droger@chromium.org</owner>
   <owner>jkrcal@chromium.org</owner>
   <summary>
@@ -389,7 +480,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.NumberOfUnusedProfiles" units="profiles"
-    expires_after="2021-03-12">
+    expires_after="2021-07-18">
   <owner>msarda@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>
@@ -399,7 +490,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.PercentageOfManagedProfiles" units="units"
-    expires_after="2021-01-24">
+    expires_after="2022-01-24">
   <owner>agawronska@chromium.org</owner>
   <owner>michaelpg@chromium.org</owner>
   <owner>cros-families@google.com</owner>
@@ -423,7 +514,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.SessionDuration.PerProfile" enum="Profile"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>msarda@chromium.org</owner>
   <owner>tangltom@chromium.org</owner>
   <summary>
@@ -445,7 +536,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Profile.State.Avatar" enum="ProfileAvatarState"
-    expires_after="2021-03-11">
+    expires_after="2021-07-18">
   <owner>jkrcal@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>
@@ -456,7 +547,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Profile.State.LastUsed" units="days"
-    expires_after="2021-03-11">
+    expires_after="2021-07-18">
   <owner>jkrcal@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>
@@ -466,7 +557,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Profile.State.Name" enum="ProfileNameState"
-    expires_after="2021-03-11">
+    expires_after="2021-07-18">
   <owner>jkrcal@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>
@@ -487,7 +578,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Profile.State.UnconsentedPrimaryAccountType"
-    enum="ProfileUnconsentedPrimaryAccountType" expires_after="2021-03-11">
+    enum="ProfileUnconsentedPrimaryAccountType" expires_after="2021-07-18">
   <owner>jkrcal@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>
@@ -506,8 +597,23 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Profile.SyncCustomizationBubbleDelay" units="ms"
+    expires_after="M93">
+  <owner>jkrcal@chromium.org</owner>
+  <owner>chrome-signin-team@google.com</owner>
+  <summary>
+    The histogram gets recorded for every signed-in profile creation flow where
+    the user enables sync right in the flow. In this case, Chrome needs to check
+    theme sync before showing a profile customization bubble. The recorded value
+    is the delay between the moment sync consent is given and the moment Chrome
+    decides whether to show the customization bubble (if the consent is given in
+    the profile creation flow, the start of the measured interval is actually
+    when a new browser window opens after the consent is given).
+  </summary>
+</histogram>
+
 <histogram name="Profile.SyncCustomize" enum="ProfileSyncCustomize"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>msalama@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
   <summary>
@@ -519,7 +625,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.TimeToOpenUserManagerUpTo1min" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-08-09">
   <owner>msarda@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>
@@ -564,7 +670,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Profile.UserAction.PerProfile" enum="Profile"
-    expires_after="2020-10-04">
+    expires_after="2022-10-04">
   <owner>msarda@chromium.org</owner>
   <owner>tangltom@chromium.org</owner>
   <summary>
@@ -576,6 +682,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     Each profile on a client is assigned a unique bucket, i.e. whenever a user
     action happens in a browser of profile x, an entry is recorded in bucket x.
 
+    This histogram is used in the profile dashboard, see go/profile-metrics and
+    go/profile-metrics-dashboard.
+
     Example: A user has 2 profiles and opens a browser window for each of them.
     When the user adds a new tab in each of the browsers, an entry is recorded
     in bucket 1 and 2, corresponding to the profiles. (Adding a new tab is a
@@ -588,6 +697,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Profile.ValidateMenuItemInvalidIndex.IsGuest" enum="Boolean"
     expires_after="M85">
+  <obsolete>
+    Removed in M90.
+  </obsolete>
   <owner>anthonyvd@chromium.org</owner>
   <summary>
     Whether the active profile is a guest profile when -validateMenuItem in the
@@ -597,6 +709,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Profile.ValidateMenuItemInvalidIndex.ProfileCount"
     units="units" expires_after="M85">
+  <obsolete>
+    Removed in M90.
+  </obsolete>
   <owner>anthonyvd@chromium.org</owner>
   <summary>
     The count of profiles in the avatar menu when -validateMenuItem in the
@@ -606,6 +721,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Profile.ValidateMenuItemInvalidIndex.Selector"
     enum="ValidateMenuItemSelectorType" expires_after="M85">
+  <obsolete>
+    Removed in M90.
+  </obsolete>
   <owner>anthonyvd@chromium.org</owner>
   <summary>
     The selector associated with the menu item when -validateMenuItem in the
@@ -625,7 +743,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ProfileChooser.HasProfilesShown" enum="BooleanShown"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>vasilii@chromium.org</owner>
   <owner>ewald@chromium.org</owner>
   <summary>
@@ -635,7 +753,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ProfilePicker.AskOnStartup" enum="BooleanEnabled"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>msalama@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
   <summary>
@@ -646,7 +764,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ProfilePicker.AskOnStartupChanged" enum="BooleanEnabled"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>msalama@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
   <summary>
@@ -668,7 +786,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ProfilePicker.NewProfileTheme" enum="ChromeColorsInfo"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>msalama@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
   <summary>
@@ -678,7 +796,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ProfilePicker.Shown" enum="ProfilePickerEntryPoint"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>msalama@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
   <summary>
@@ -688,7 +806,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ProfilePicker.StartupTime.BeforeCreation" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>msalama@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
   <summary>
@@ -699,7 +817,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ProfilePicker.StartupTime.FirstPaint" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>msalama@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
   <summary>
@@ -708,8 +826,22 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="ProfilePicker.StartupTime.FirstPaint.FromApplicationStart"
+    units="ms" expires_after="2021-08-22">
+  <owner>alexilin@chromium.org</owner>
+  <owner>chrome-signin-team@google.com</owner>
+  <summary>
+    Records the time from the application start to the first non-empty paint of
+    proflie picker's web contents. Only recorded when the profile picker is
+    shown at startup.
+
+    See Startup.FirstWebContents.NonEmptyPaint3 for a definition of application
+    start.
+  </summary>
+</histogram>
+
 <histogram name="ProfilePicker.StartupTime.MainViewInitialized" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>msalama@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
   <summary>
@@ -719,7 +851,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ProfilePicker.StartupTime.WebViewCreated" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>msalama@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
   <summary>
@@ -729,7 +861,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ProfilePicker.UiVisited" enum="ProfilePickerPages"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>msalama@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
   <summary>
@@ -739,7 +871,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ProfilePicker.UserAction" enum="ProfilePickerAction"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>msalama@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/quota/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/quota/histograms.xml
index 10929b9a1f2..8660f9f1bb3 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/quota/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/quota/histograms.xml
@@ -41,8 +41,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Quota.AvailableDiskSpace" units="MB"
-    expires_after="2021-01-31">
+    expires_after="2021-12-21">
   <owner>jarrydg@chromium.org</owner>
+  <owner>chrome-owp-storage@google.com</owner>
   <summary>
     Amount of free disk space for the storage directory. Logged at irregular
     intervals.
@@ -50,7 +51,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Quota.AvailableDiskSpace2" units="MB"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>jarrydg@chromium.org</owner>
   <owner>chrome-owp-storage@google.com</owner>
   <summary>
@@ -60,8 +61,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Quota.DaysBetweenRepeatedOriginEvictions" units="units"
-    expires_after="2020-11-29">
+    expires_after="2021-11-29">
   <owner>jarrydg@chromium.org</owner>
+  <owner>chrome-owp-storage@google.com</owner>
   <summary>
     The number of days since an origin was last chosen to be evicted from the
     storage, recorded each time the origin is evicted (except for the first
@@ -69,8 +71,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Quota.DiskspaceShortage" units="MB" expires_after="2021-02-14">
+<histogram name="Quota.DiskspaceShortage" units="MB" expires_after="2022-01-18">
   <owner>jarrydg@chromium.org</owner>
+  <owner>chrome-owp-storage@google.com</owner>
   <summary>
     Difference between acceptable lower limit of diskspace and actual free
     diskspace at beginning of an eviction round.
@@ -78,7 +81,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Quota.EvictedBytesPerRound" units="MB"
-    expires_after="2021-01-26">
+    expires_after="2021-12-14">
   <owner>jarrydg@chromium.org</owner>
   <owner>chrome-owp-storage@google.com</owner>
   <summary>
@@ -87,7 +90,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Quota.EvictedOriginAccessCount" units="units"
-    expires_after="2021-02-23">
+    expires_after="2021-07-18">
   <owner>jarrydg@chromium.org</owner>
   <owner>chrome-owp-storage@google.com</owner>
   <summary>
@@ -97,7 +100,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Quota.EvictedOriginDaysSinceAccess" units="units"
-    expires_after="2021-02-23">
+    expires_after="2021-07-18">
   <owner>jarrydg@chromium.org</owner>
   <owner>chrome-owp-storage@google.com</owner>
   <summary>
@@ -120,7 +123,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Quota.GlobalTemporaryPoolSize" units="MB"
-    expires_after="2021-02-23">
+    expires_after="2022-01-18">
   <owner>jarrydg@chromium.org</owner>
   <owner>chrome-owp-storage@google.com</owner>
   <summary>
@@ -130,13 +133,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Quota.GlobalUsageOfPersistentStorage" units="MB"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>jarrydg@chromium.org</owner>
   <summary>Global usage of persistent storage.</summary>
 </histogram>
 
 <histogram name="Quota.GlobalUsageOfTemporaryStorage" units="MB"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>jarrydg@chromium.org</owner>
   <summary>Global usage of temporary storage.</summary>
 </histogram>
@@ -161,8 +164,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Quota.PercentDiskAvailable" units="%"
-    expires_after="2021-01-31">
+    expires_after="2021-12-21">
   <owner>jarrydg@chromium.org</owner>
+  <owner>chrome-owp-storage@google.com</owner>
   <summary>
     Percentage of the storage device that is free. Logged at irregular
     intervals.
@@ -170,7 +174,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Quota.PercentDiskAvailable2" units="%"
-    expires_after="2021-02-10">
+    expires_after="2022-01-18">
   <owner>jarrydg@chromium.org</owner>
   <owner>chrome-owp-storage@google.com</owner>
   <summary>
@@ -180,7 +184,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Quota.PercentUsedByOrigin" units="%"
-    expires_after="2021-02-23">
+    expires_after="2022-01-18">
   <owner>jarrydg@chromium.org</owner>
   <owner>chrome-owp-storage@google.com</owner>
   <summary>
@@ -190,15 +194,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Quota.PercentUsedForTemporaryStorage2" units="%"
-    expires_after="2020-11-29">
+    expires_after="2021-11-29">
   <owner>jarrydg@chromium.org</owner>
+  <owner>chrome-owp-storage@google.com</owner>
   <summary>
     Percentage of the storage device that is being use for temporary storage.
     Logged when collecting usage information.
   </summary>
 </histogram>
 
-<histogram name="Quota.QuotaForOrigin" units="MB" expires_after="2021-02-23">
+<histogram name="Quota.QuotaForOrigin" units="MB" expires_after="2022-01-18">
   <owner>jarrydg@chromium.org</owner>
   <owner>chrome-owp-storage@google.com</owner>
   <summary>
@@ -241,7 +246,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>Time spent to an eviction round.</summary>
 </histogram>
 
-<histogram name="Quota.TotalDiskSpace" units="MB" expires_after="2021-04-04">
+<histogram name="Quota.TotalDiskSpace" units="MB" expires_after="2021-08-09">
   <owner>jarrydg@chromium.org</owner>
   <summary>
     Total disk space for the storage directory. Logged at irregular intervals.
diff --git a/chromium/tools/metrics/histograms/histograms_xml/renderer/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/renderer/histograms.xml
index 867be0d1b82..7d626fcfc4e 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/renderer/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/renderer/histograms.xml
@@ -23,6 +23,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Renderer.CompositedScrolling" enum="CompositedScrolling"
     expires_after="M85">
+  <obsolete>
+    Expired in M86.
+  </obsolete>
   <owner>hartmanng@chromium.org</owner>
   <summary>
     Total count of the number of RenderLayers which are scrollable areas, need
@@ -135,7 +138,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Renderer.PaintPreview.Capture.MainFrameBlinkCaptureDuration"
-    units="ms" expires_after="2021-03-28">
+    units="ms" expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -146,7 +149,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Renderer.PaintPreview.Capture.MainFrameSuccess"
-    enum="BooleanSuccess" expires_after="2021-04-18">
+    enum="BooleanSuccess" expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -156,7 +159,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Renderer.PaintPreview.Capture.SubframeBlinkCaptureDuration"
-    units="ms" expires_after="2021-03-08">
+    units="ms" expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -167,7 +170,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Renderer.PaintPreview.Capture.SubframeSuccess"
-    enum="BooleanSuccess" expires_after="2021-03-08">
+    enum="BooleanSuccess" expires_after="2021-06-27">
   <owner>ckitagawa@chromium.org</owner>
   <owner>mahmoudi@chromium.org</owner>
   <owner>fredmello@chromium.org</owner>
@@ -197,7 +200,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="RendererScheduler.QueueingDurationPerQueueType"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="RendererScheduler.QueueType" -->
 
   <owner>kdillon@chromium.org</owner>
@@ -211,7 +214,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="RendererScheduler.RendererMainThreadLoad5" units="%"
-    expires_after="M85">
+    expires_after="M95">
   <owner>altimin@chromium.org</owner>
   <summary>
     Renderer main thread load (percentage of time spent in tasks), reported in
@@ -372,7 +375,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="RendererScheduler.TaskDurationPerTaskType2"
-    enum="RendererSchedulerTaskType" expires_after="M85">
+    enum="RendererSchedulerTaskType" expires_after="M95">
   <owner>altimin@chromium.org</owner>
   <owner>hajimehoshi@chromium.org</owner>
   <summary>
@@ -482,9 +485,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="RendererScheduler.TaskTime2" units="microseconds"
-    expires_after="M85">
+    expires_after="never">
   <owner>sunyunjia@chromium.org</owner>
-  <owner>tdresser@chromium.org</owner>
+  <owner>altimin@chromium.org</owner>
   <summary>
     The duration of every task queued in the _renderer_ scheduler to see the
     distribution of the task duration.
diff --git a/chromium/tools/metrics/histograms/histograms_xml/renderer4/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/renderer4/histograms.xml
index 3dd95a7ae78..a7bf634d7b6 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/renderer4/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/renderer4/histograms.xml
@@ -36,7 +36,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Renderer4.Browser.RasterTaskTotalDuration"
-    units="microseconds" expires_after="2021-06-01">
+    units="microseconds" expires_after="2021-08-09">
   <owner>khushalsagar@chromium.org</owner>
   <owner>chrome-gpu@google.com</owner>
   <summary>
@@ -51,21 +51,27 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Renderer4.CompositorTouchScrollUpdateThread"
-    enum="ScrollThread" expires_after="M85">
-  <owner>tdresser@chromium.org</owner>
-  <summary>Whether the scroll from touch is executed on main thread.</summary>
+    enum="ScrollThread" expires_after="M97">
+  <owner>flackr@chromium.org</owner>
+  <owner>input-dev@chromium.org</owner>
+  <summary>
+    Whether the scroll from touch is executed on main thread. Recorded once for
+    each scroll. Contains incomplete data from M85 to M89 inclusively.
+  </summary>
 </histogram>
 
 <histogram name="Renderer4.CompositorWheelScrollUpdateThread"
-    enum="ScrollThread" expires_after="M85">
-  <owner>tdresser@chromium.org</owner>
+    enum="ScrollThread" expires_after="M97">
+  <owner>flackr@chromium.org</owner>
+  <owner>input-dev@chromium.org</owner>
   <summary>
-    Whether the scroll from mouse wheel is executed on main thread.
+    Whether the scroll from mouse wheel is executed on main thread. Recorded
+    once for each scroll. Contains incomplete data from M85 to M89 inclusively.
   </summary>
 </histogram>
 
 <histogram name="Renderer4.GpuImageDecodeState" enum="GpuImageUsageState"
-    expires_after="2021-06-06">
+    expires_after="2021-08-09">
   <owner>cblume@chromium.org</owner>
   <owner>vmpstr@chromium.org</owner>
   <summary>
@@ -75,7 +81,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Renderer4.GpuImageDecodeState.CachePeakUsagePercent"
-    units="units" expires_after="2021-04-04">
+    units="units" expires_after="2021-08-09">
   <owner>sashamcintosh@chromium.org</owner>
   <owner>ericrk@chromium.org</owner>
   <summary>
@@ -127,7 +133,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Renderer4.ImageDecodeTaskDurationUs"
-    units="microseconds" expires_after="2021-06-08">
+    units="microseconds" expires_after="2021-08-08">
 <!-- Name completed by histogram_suffixes name="DecodedImageType" -->
 
 <!-- Name completed by histogram_suffixes name="OutOfRaster" -->
@@ -152,7 +158,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Renderer4.ImageUploadTaskDurationUs"
-    units="microseconds" expires_after="2021-03-28">
+    units="microseconds" expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="DecodedImageType" -->
 
   <owner>sashamcintosh@chromium.org</owner>
@@ -173,28 +179,32 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Renderer4.MainThreadGestureScrollReason"
-    enum="MainThreadScrollingReason" expires_after="M88">
-  <owner>tdresser@chromium.org</owner>
+    enum="MainThreadScrollingReason" expires_after="M97">
+  <owner>flackr@chromium.org</owner>
   <owner>pdr@chromium.org</owner>
+  <owner>input-dev@chromium.org</owner>
   <summary>
     Ideally we'd always scroll on the impl thread, but there are a variety of
     situations where we need to scroll on main. We should try to drive these
     down. For every gesture, we record whether or not the scroll occurred on the
     main thread or it should scroll on the impl thread but is blocked on main
-    thread, and if it did, what the reason was.
+    thread, and if it did, what the reasons were. One report is made for each
+    reason preventing scrolling on the impl thread.
   </summary>
 </histogram>
 
 <histogram name="Renderer4.MainThreadWheelScrollReason"
-    enum="MainThreadScrollingReason" expires_after="M88">
-  <owner>tdresser@chromium.org</owner>
+    enum="MainThreadScrollingReason" expires_after="M97">
+  <owner>flackr@chromium.org</owner>
   <owner>pdr@chromium.org</owner>
+  <owner>input-dev@chromium.org</owner>
   <summary>
     Ideally we'd always scroll on the impl thread, but there are a variety of
     situations where we need to scroll on main. We should try to drive these
     down. For every wheel tick, we record whether or not the the scroll occurred
     on the main thread or it should scroll on the impl thread but is blocked on
-    main thread, and if it did, what the reason was.
+    main thread, and if it did, what the reasons were. One report is made for
+    each reason preventing scrolling on the impl thread.
   </summary>
 </histogram>
 
@@ -236,7 +246,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Renderer4.Renderer.RasterTaskTotalDuration"
-    units="microseconds" expires_after="2021-06-01">
+    units="microseconds" expires_after="2021-08-01">
   <owner>khushalsagar@chromium.org</owner>
   <owner>chrome-gpu@google.com</owner>
   <summary>
@@ -262,7 +272,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Renderer4.ScrollingThread" enum="ScrollingThreadStatus"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
 <!-- Name completed by histogram_suffixes name="ScrollSourceDevice" -->
 
   <owner>bokan@chromium.org</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/safe_browsing/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/safe_browsing/histograms.xml
index 703d0ad8e34..7c58c9a7a2d 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/safe_browsing/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/safe_browsing/histograms.xml
@@ -21,12 +21,31 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<variants name="MetricsCollectorBypassEventType">
+  <variant name="CsdInterstitialBypass"
+      summary="client-side detection interstitial bypass"/>
+  <variant name="DangerousDownloadBypass"
+      summary="dangerous download warning bypass"/>
+  <variant name="DatabaseInterstitialBypass"
+      summary="Safe Browsing database interstitial bypass"/>
+  <variant name="PasswordReuseModalBypass"
+      summary="password reuse modal warning bypass"/>
+  <variant name="RealTimeInterstitialBypass"
+      summary="real time URL check warning bypass"/>
+</variants>
+
+<variants name="MetricsCollectorUserState">
+  <variant name="EnhancedProtection" summary="enhanced protection"/>
+  <variant name="Managed" summary="Safe Browsing managed mode"/>
+  <variant name="StandardProtection" summary="standard protection"/>
+</variants>
+
 <histogram name="SafeBrowsing.AdvancedProtection.APTokenFetchStatus"
-    enum="GoogleServiceAuthError" expires_after="M90">
+    enum="GoogleServiceAuthError" expires_after="2021-07-18">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
-    For users known to be already enrolled in Advanced Proection, records the
+    For users known to be already enrolled in Advanced Protection, records the
     service error of refreshing OAuth2 access token during fetching the user's
     advanced protection status. Logged once a day and will retry on transient
     failures. This is a subset of
@@ -35,8 +54,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.AdvancedProtection.TokenFetchStatus"
-    enum="GoogleServiceAuthError" expires_after="M90">
-  <owner>drubey@chromium.org</owner>
+    enum="GoogleServiceAuthError" expires_after="2021-07-18">
+  <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     Records the service error of refreshing OAuth2 access token during fetching
@@ -57,6 +76,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.AndroidTelemetry.ApkDownload.IsMimeTypeApk"
+    enum="BooleanIsMimeTypeApk" expires_after="2022-02-05">
+  <owner>xinghuilu@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    Records whether the mime type of the download is apk. Logged each time an
+    apk download report is sent on Android.
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsing.AndroidTelemetry.ApkDownload.Outcome"
     enum="ApkDownloadTelemetryOutcome" expires_after="2021-07-01">
   <owner>xinghuilu@chromium.org</owner>
@@ -67,8 +96,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.BlockingPage.RequestDestination"
+    enum="RequestDestination" expires_after="2021-08-09">
+  <owner>xinghuilu@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    Logs the request destination that triggers the safe browsing blocking page.
+    Logged each time a safe browsing blocking page is created. This metric is
+    useful to show the priority of checking each request destination in real
+    time. Note that this metric may be bias towards kDocument, because the
+    default request destination is set to kDocument.
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsing.BlockingPage.ResourceType"
-    enum="ContentResourceType2" expires_after="2021-03-27">
+    enum="ContentResourceType2" expires_after="2021-08-01">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -77,6 +119,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     show the priority of checking each resource type in real time. Note that
     this metric may be bias towards mainframe, because the default resource type
     is set to mainframe.
+
+    Starting M89, this metric is derived from
+    network::mojom::RequestDestination. kPrefetch, kFavicon, kXhr, kPing,
+    kNavigationPreloadMainFrame, and kNavigationPreloadSubFrame are all mapped
+    to kSubResource.
   </summary>
 </histogram>
 
@@ -126,8 +173,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram
+    name="SafeBrowsing.Daily.BypassCountLast28Days.{UserState}.{EventType}"
+    units="events" expires_after="2022-02-12">
+  <owner>xinghuilu@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    Logs the total number of {EventType} in the last 28 days. Recorded for all
+    non-Incognito profiles that are under {UserState} every 24 hours and at
+    startup if the last recording was more than 24 hours ago.
+  </summary>
+  <token key="UserState" variants="MetricsCollectorUserState"/>
+  <token key="EventType" variants="MetricsCollectorBypassEventType">
+    <variant name="AllEvents" summary="any type of events"/>
+  </token>
+</histogram>
+
 <histogram name="SafeBrowsing.DeepScan.Download.BypassedByUser.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -139,7 +202,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Download.BytesPerSeconds" units="bytes"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -150,7 +213,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Download.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -160,7 +223,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Download.FailedToGetToken.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -171,7 +234,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Download.FailedToGetVerdict.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -182,7 +245,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Download.FileEncrypted.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>rogerta@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -193,7 +256,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Download.FileTooLarge.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -204,7 +267,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Download.Success.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -214,7 +277,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Download.Timeout.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -224,7 +287,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Download.Unknown.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -234,7 +297,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Download.UnsupportedFileType.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -245,7 +308,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.DragAndDrop.BytesPerSeconds"
-    units="bytes" expires_after="M90">
+    units="bytes" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -257,7 +320,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.DragAndDrop.CancelledByUser.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -269,7 +332,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.DragAndDrop.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -279,7 +342,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.DragAndDrop.FailedToGetToken.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -290,7 +353,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.DragAndDrop.FailedToGetVerdict.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -301,7 +364,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.DragAndDrop.FileEncrypted.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>rogerta@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -312,7 +375,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.DragAndDrop.FileTooLarge.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -323,7 +386,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.DragAndDrop.Success.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -334,7 +397,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.DragAndDrop.Timeout.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -345,7 +408,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.DragAndDrop.Unknown.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -357,7 +420,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="SafeBrowsing.DeepScan.DragAndDrop.UnsupportedFileType.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -368,7 +431,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Paste.BytesPerSeconds" units="bytes"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -379,7 +442,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Paste.CancelledByUser.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -390,7 +453,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Paste.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -400,7 +463,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Paste.FailedToGetToken.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -411,7 +474,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Paste.FailedToGetVerdict.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -422,7 +485,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Paste.FileTooLarge.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -433,7 +496,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Paste.Success.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -443,7 +506,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Paste.Timeout.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -453,7 +516,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Paste.Unknown.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -463,7 +526,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Paste.UnsupportedFileType.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -474,7 +537,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Upload.BytesPerSeconds" units="bytes"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -485,7 +548,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Upload.CancelledByUser.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -496,7 +559,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Upload.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -506,7 +569,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Upload.FailedToGetToken.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -517,7 +580,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Upload.FailedToGetVerdict.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -528,7 +591,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Upload.FileEncrypted.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>rogerta@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -539,7 +602,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Upload.FileTooLarge.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -550,7 +613,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Upload.Success.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -560,7 +623,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Upload.Timeout.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -570,7 +633,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Upload.Unknown.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -580,7 +643,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DeepScan.Upload.UnsupportedFileType.Duration"
-    units="ms" expires_after="M90">
+    units="ms" expires_after="2022-02-01">
   <owner>domfc@chromium.org</owner>
   <owner>webprotect-team@google.com</owner>
   <summary>
@@ -591,7 +654,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DelayedWarnings.Event"
-    enum="SafeBrowsingDelayedWarningEvent" expires_after="M89">
+    enum="SafeBrowsingDelayedWarningEvent" expires_after="2021-08-22">
   <owner>meacer@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -604,7 +667,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.DelayedWarnings.Event_UrlElisionDisabled"
-    enum="SafeBrowsingDelayedWarningEvent" expires_after="M89">
+    enum="SafeBrowsingDelayedWarningEvent" expires_after="M91">
   <owner>meacer@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -641,8 +704,46 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.EsbDisabled.BypassCountLast28Days.{EventType}"
+    units="events" expires_after="2022-02-22">
+  <owner>xinghuilu@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    Records the total number of {EventType} in the last 28 days. Logged each
+    time a user disables Enhanced Safe Browsing. Logged at most three times a
+    week. If ESB is disabled for more than three times a week, later records
+    will be dropped.
+  </summary>
+  <token key="EventType" variants="MetricsCollectorBypassEventType"/>
+</histogram>
+
+<histogram name="SafeBrowsing.EsbDisabled.LastBypassEventInterval.{EventType}"
+    units="ms" expires_after="2022-02-22">
+  <owner>xinghuilu@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    Records the time between the last bypass event and when the user disables
+    Enhanced Safe Browsing. Logged each time a user disables Enhanced Safe
+    Browsing and the {EventType} is the last bypass event type. Logged at most
+    three times a week. If ESB is disabled for more than three times a week,
+    later records will be dropped.
+  </summary>
+  <token key="EventType" variants="MetricsCollectorBypassEventType"/>
+</histogram>
+
+<histogram name="SafeBrowsing.EsbDisabled.LastBypassEventType"
+    enum="SBMetricsCollectorEventType" expires_after="2022-02-05">
+  <owner>xinghuilu@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    Records the last bypass event type before a user disables Enhanced Safe
+    Browsing. Logged each time a user disables Enhanced Safe Browsing. Logged at
+    most three times a week.
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsing.FileTypeUpdate.DynamicUpdateResult"
-    enum="SBFileTypeUpdateResult" expires_after="2021-04-13">
+    enum="SBFileTypeUpdateResult" expires_after="2021-08-15">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -656,7 +757,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.FileTypeUpdate.DynamicUpdateVersion"
-    units="FileTypePolicies Version" expires_after="2021-04-13">
+    units="FileTypePolicies Version" expires_after="2021-08-09">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -670,7 +771,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.FileTypeUpdate.ResourceBundleResult"
-    enum="SBFileTypeUpdateResult" expires_after="2021-04-13">
+    enum="SBFileTypeUpdateResult" expires_after="2021-08-15">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -683,7 +784,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.FileTypeUpdate.ResourceBundleVersion"
-    units="FileTypePolicies Version" expires_after="2021-04-13">
+    units="FileTypePolicies Version" expires_after="2021-08-15">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -705,8 +806,43 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.NavigationObserver.AppendRecentNavigationsTime"
+    units="ms" expires_after="2021-07-18">
+  <owner>xinghuilu@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    Logs the time it takes to append recent navigations. Logged each time the
+    function is called.
+  </summary>
+</histogram>
+
+<histogram
+    name="SafeBrowsing.NavigationObserver.IdentifyReferrerChainByEventURLTime"
+    units="ms" expires_after="2021-07-18">
+  <owner>xinghuilu@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    Logs the time it takes to identify referrer chain by event URL. Logged each
+    time the function is called.
+  </summary>
+</histogram>
+
+<histogram
+    name="SafeBrowsing.NavigationObserver.IdentifyReferrerChainByWebContentsTime"
+    units="ms" expires_after="2021-07-18">
+  <owner>xinghuilu@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    Logs the time it takes to identify referrer chain by web contents. Logged
+    each time the function is called.
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsing.NavigationObserver.NavigationEventCleanUpCount"
     units="NavigationEvents" expires_after="2021-01-27">
+  <obsolete>
+    Removed 01-29-2021 due to lack of use.
+  </obsolete>
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -715,6 +851,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.Policy.AllowlistDomainsTotalSize" units="bytes"
+    expires_after="2022-02-26">
+  <owner>xinghuilu@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    The size of the allowlist domains set by the enterprise policy in bytes.
+    Note that this is measuring the total bytes of the list rather than the
+    length of the list. These domains are copied to the Safe Browsing checker
+    delegate. Logged each time a Safe Browsing checker delegate is created for
+    the renderer and the allowlist policy is set.
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsing.Pref.Daily.Extended" enum="BooleanEnabled"
     expires_after="2021-11-04">
   <owner>xinghuilu@chromium.org</owner>
@@ -726,6 +875,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.Pref.Daily.SafeBrowsingModeManaged"
+    enum="BooleanManagedPref" expires_after="2022-01-26">
+  <owner>bhatiarohit@google.com</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    Whether the Safe Browsing mode is managed by the user's admin. Recorded for
+    all non-Incognito profiles every 24 hours and at startup if the last
+    recording was more than 24 hours ago.
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsing.Pref.Daily.SafeBrowsingState"
     enum="SafeBrowsingState" expires_after="2021-11-04">
   <owner>xinghuilu@chromium.org</owner>
@@ -738,7 +898,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.Pref.Enhanced" enum="BooleanEnabled"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -748,7 +908,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.Pref.Extended" enum="BooleanEnabled"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -758,7 +918,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.Pref.General" enum="BooleanEnabled"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -778,7 +938,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.ReferrerAttributionResult"
-    enum="SafeBrowsingAttributionResultTypes" expires_after="M90">
+    enum="SafeBrowsingAttributionResultTypes" expires_after="2021-06-27">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -789,7 +949,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.ReferrerHasInvalidTabID" enum="BooleanInvalid"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -800,7 +960,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.ReferrerURLChainSize" units="units"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -809,6 +969,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.RT.AllowlistSizeTooSmall"
+    enum="BooleanUnavailable" expires_after="2022-01-12">
+  <owner>xinghuilu@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    Logs whether the size of the high confidence allowlist is too small. It can
+    happen if it is misconfigured on the server-side, or the local file is
+    corrupted on the disk. If too small, the allowlist is considered as
+    unavailable. Logged each time a top frame URL navigation happens for users
+    who have the real time URL lookups enabled.
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsing.RT.AllStoresAvailable" enum="BooleanAvailable"
     expires_after="2021-08-17">
   <owner>xinghuilu@chromium.org</owner>
@@ -821,7 +994,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.RT.Backoff.State" enum="BooleanEnabled"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -842,7 +1015,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.RT.CacheManager.RealTimeVerdictCount"
-    units="entries" expires_after="2021-06-19">
+    units="entries" expires_after="2021-08-22">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -852,7 +1025,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.RT.CanCheckDatabase" enum="BooleanEnabled"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -861,8 +1034,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.RT.GetCache.FallbackThreatType"
+    enum="SBThreatType" expires_after="2021-12-16">
+  <owner>xinghuilu@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    Logs the threat type of cached verdicts. If the threat type is not safe, it
+    means the cache is a false positive. False positive verdicts are safe
+    verdicts in cache manager but turns out to be dangerous in the Safe Browsing
+    database. Logged each time a URL is checked by real time lookup and the
+    response is safe from the cache manager.
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsing.RT.GetCache.Time" units="ms"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -873,7 +1059,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.RT.GetCacheResult"
-    enum="SafeBrowsingRTLookupResponseVerdictType" expires_after="2021-04-25">
+    enum="SafeBrowsingRTLookupResponseVerdictType" expires_after="2021-06-27">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -885,7 +1071,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.RT.GetToken.Time" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -896,7 +1082,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.RT.HasTokenFromFetcher" enum="BooleanHasToken"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -907,7 +1093,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.RT.HasTokenInRequest" enum="BooleanHasToken"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -918,7 +1104,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.RT.HasValidCacheManager" enum="BooleanValid"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -929,7 +1115,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.RT.IsLookupServiceAvailable"
-    enum="BooleanAvailable" expires_after="2021-05-09">
+    enum="BooleanAvailable" expires_after="2021-07-11">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -941,7 +1127,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.RT.IsLookupSuccessful" enum="BooleanSuccess"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -983,8 +1169,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.RT.Request.Size" units="bytes"
+    expires_after="2022-01-08">
+  <owner>xinghuilu@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    The size of a real time URL check request in bytes. Logged on each resource
+    check for which a lookup request is sent to the server.
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsing.RT.Request.UserPopulation"
-    enum="SafeBrowsingUserPopulation" expires_after="2021-05-11">
+    enum="SafeBrowsingUserPopulation" expires_after="2021-07-11">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -994,6 +1190,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsing.RT.RequestDestinations.Checked"
+    enum="RequestDestination" expires_after="2021-08-05">
+  <owner>vakh@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    Logs the request destination that was checked by Safe Browsing real time URL
+    lookup. Logged on each resource check that is eligible for real time checks.
+  </summary>
+</histogram>
+
+<histogram name="SafeBrowsing.RT.RequestDestinations.Requested"
+    enum="RequestDestination" expires_after="2021-08-05">
+  <owner>vakh@chromium.org</owner>
+  <owner>chrome-safebrowsing-alerts@google.com</owner>
+  <summary>
+    Logs the request destination that was requested to be checked by Safe
+    Browsing real time URL lookup. Logged on each resource check.
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsing.RT.ResourceTypes.Checked"
     enum="ContentResourceType2" expires_after="2021-08-05">
   <owner>vakh@chromium.org</owner>
@@ -1001,6 +1217,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>
     Logs the resource type that was checked by Safe Browsing real time URL
     lookup. Logged on each resource check that is eligible for real time checks.
+
+    Starting M89, this metric is derived from
+    network::mojom::RequestDestination. kPrefetch, kFavicon, kXhr, kPing,
+    kNavigationPreloadMainFrame, and kNavigationPreloadSubFrame are all mapped
+    to kSubResource.
   </summary>
 </histogram>
 
@@ -1011,11 +1232,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>
     Logs the resource type that was requested to be checked by Safe Browsing
     real time URL lookup. Logged on each resource check.
+
+    Starting M89, this metric is derived from
+    network::mojom::RequestDestination. kPrefetch, kFavicon, kXhr, kPing,
+    kNavigationPreloadMainFrame, and kNavigationPreloadSubFrame are all mapped
+    to kSubResource.
   </summary>
 </histogram>
 
 <histogram name="SafeBrowsing.RT.ThreatInfoSize" units="verdicts"
-    expires_after="2021-03-20">
+    expires_after="2021-08-15">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1037,7 +1263,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.TokenFetcher.ErrorType"
-    enum="GoogleServiceAuthError" expires_after="2021-04-06">
+    enum="GoogleServiceAuthError" expires_after="2021-08-09">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1142,12 +1368,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SafeBrowsing.V4GetHash.CountOfPrefixes" units="prefixes"
-    expires_after="2020-12-03">
+    expires_after="2021-12-03">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
     The number of prefixes included in a full hash request sent to the Google
-    Safe Browsing servers.
+    Safe Browsing servers. This is recorded each time there's a match found in
+    the local database and requires sending a full hash request.
   </summary>
 </histogram>
 
@@ -1220,7 +1447,7 @@ Safe Browsing lookup mechanism is working as expected -->
 </histogram>
 
 <histogram name="SafeBrowsing.V4LocalDatabaseManager.ThreatInfoSize"
-    units="verdicts" expires_after="2021-03-20">
+    units="verdicts" expires_after="2021-07-27">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1231,7 +1458,7 @@ Safe Browsing lookup mechanism is working as expected -->
 
 <histogram
     name="SafeBrowsing.V4LocalDatabaseManager.TimeSinceLastUpdateResponse"
-    units="ms" expires_after="2021-05-09">
+    units="ms" expires_after="2021-08-09">
   <owner>ajuma@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1288,7 +1515,7 @@ and applied correctly. -->
 </histogram>
 
 <histogram name="SafeBrowsing.V4ProcessPartialUpdate.AdditionsHashesCount"
-    units="entries" expires_after="2021-04-29">
+    units="entries" expires_after="2021-07-04">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1341,7 +1568,7 @@ and applied correctly. -->
 </histogram>
 
 <histogram name="SafeBrowsing.V4ProcessPartialUpdate.RemovalsHashesCount"
-    units="entries" expires_after="2021-04-29">
+    units="entries" expires_after="2021-07-04">
   <owner>xinghuilu@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1495,6 +1722,10 @@ failing to fetch the updates which puts users' security at risk. -->
 
 <histogram name="SafeBrowsingBinaryUploadRequest.AdvancedProtectionScanVerdict"
     enum="SafeBrowsingMalwareDeepScanningVerdict" expires_after="2021-01-14">
+  <obsolete>
+    Marked obsolete 12-2020. Replaced by
+    SBClientDownload.MalwareDeepScanResult.AdvancedProtectionPrompt.
+  </obsolete>
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1506,7 +1737,7 @@ failing to fetch the updates which puts users' security at risk. -->
 </histogram>
 
 <histogram name="SafeBrowsingBinaryUploadRequest.DlpResult"
-    enum="BooleanSuccess" expires_after="M90">
+    enum="BooleanSuccess" expires_after="2021-07-18">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1517,7 +1748,7 @@ failing to fetch the updates which puts users' security at risk. -->
 </histogram>
 
 <histogram name="SafeBrowsingBinaryUploadRequest.Duration" units="ms"
-    expires_after="M90">
+    expires_after="2021-07-18">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1528,7 +1759,7 @@ failing to fetch the updates which puts users' security at risk. -->
 </histogram>
 
 <histogram name="SafeBrowsingBinaryUploadRequest.MalwareResult"
-    enum="BooleanSuccess" expires_after="M90">
+    enum="BooleanSuccess" expires_after="2021-07-18">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1540,6 +1771,9 @@ failing to fetch the updates which puts users' security at risk. -->
 
 <histogram name="SafeBrowsingBinaryUploadRequest.MalwareScanVerdict"
     enum="SafeBrowsingMalwareDeepScanningVerdict" expires_after="2021-01-14">
+  <obsolete>
+    Removed 12-2020. Replaced by SafeBrowsingBinaryUploadRequest.MalwareResult.
+  </obsolete>
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1551,7 +1785,7 @@ failing to fetch the updates which puts users' security at risk. -->
 </histogram>
 
 <histogram name="SafeBrowsingBinaryUploadRequest.Result"
-    enum="SafeBrowsingBinaryUploadResult" expires_after="M90">
+    enum="SafeBrowsingBinaryUploadResult" expires_after="2021-07-18">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1562,7 +1796,7 @@ failing to fetch the updates which puts users' security at risk. -->
 </histogram>
 
 <histogram name="SafeBrowsingBinaryUploadRequest.TimeToGetFCMToken" units="ms"
-    expires_after="M90">
+    expires_after="2021-07-18">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -1571,6 +1805,18 @@ failing to fetch the updates which puts users' security at risk. -->
   </summary>
 </histogram>
 
+<histogram name="SafeBrowsingBinaryUploadService.ActiveRequestsAtShutdown"
+    units="requests" expires_after="2022-01-31">
+  <owner>domfc@chromium.org</owner>
+  <owner>jgingras@chromium.org</owner>
+  <owner>webprotect-eng@google.com</owner>
+  <summary>
+    This records the number of active requests when a BinaryUploadService
+    instance is shutdown. This metric is only logged if the number of active
+    requests is not 0.
+  </summary>
+</histogram>
+
 <histogram name="SafeBrowsingFCMService.IncomingMessageHasKey" enum="Boolean"
     expires_after="M90">
   <owner>drubery@chromium.org</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/sb_client/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/sb_client/histograms.xml
index 5a90cdd97b6..42b69b67bfe 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/sb_client/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/sb_client/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="SBClientDownload.CheckDownloadStats"
-    enum="SBClientDownloadCheckDownloadStats" expires_after="2021-04-11">
+    enum="SBClientDownloadCheckDownloadStats" expires_after="2021-08-15">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <owner>mattm@chromium.org</owner>
@@ -48,7 +48,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientDownload.DeepScanTrigger" enum="SBDeepScanTriggers"
-    expires_after="2021-04-28">
+    expires_after="2021-07-18">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -68,7 +68,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientDownload.DownloadExtensions"
-    enum="SBClientDownloadExtensions" expires_after="2021-04-25">
+    enum="SBClientDownloadExtensions" expires_after="2021-06-27">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <owner>mattm@chromium.org</owner>
@@ -105,8 +105,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientDownload.DownloadRequestNetError" enum="NetErrorCodes"
-    expires_after="2021-01-10">
-  <owner>vakh@chromium.org</owner>
+    expires_after="2021-07-10">
+  <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <owner>mattm@chromium.org</owner>
   <summary>
@@ -147,7 +147,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientDownload.DownloadRequestResponseCode"
-    enum="HttpResponseCode" expires_after="2021-05-05">
+    enum="HttpResponseCode" expires_after="2021-07-04">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <owner>mattm@chromium.org</owner>
@@ -290,7 +290,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="SBClientPhishing.CancelClassificationReason"
     enum="SBClientPhishingCancelClassificationReason"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -300,7 +300,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientPhishing.ClassificationStart" enum="BooleanHit"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -312,7 +312,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientPhishing.Classifier.Event"
-    enum="SBPhishingClassifierEvent" expires_after="2021-03-28">
+    enum="SBPhishingClassifierEvent" expires_after="2021-08-01">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -322,7 +322,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientPhishing.ClassifierNotReadyReason"
-    enum="SBClientPhishingClientModelStatus" expires_after="2021-04-25">
+    enum="SBClientPhishingClientModelStatus" expires_after="2021-06-27">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -334,7 +334,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientPhishing.ClientModelDownloadResponseOrErrorCode"
-    enum="CombinedHttpResponseAndNetErrorCode" expires_after="M90">
+    enum="CombinedHttpResponseAndNetErrorCode" expires_after="M94">
   <owner>drubery@google.com</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -345,7 +345,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientPhishing.ClientModelStatus"
-    enum="SBClientPhishingClientModelStatus" expires_after="2021-03-28">
+    enum="SBClientPhishingClientModelStatus" expires_after="2021-08-01">
   <owner>vakh@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -374,6 +374,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="SBClientPhishing.DOMFeatureFrameRemoved" units="units"
     expires_after="M90">
+  <obsolete>
+    Removed 01-29-2021 due to lack of use.
+  </obsolete>
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@chromium.org</owner>
   <summary>
@@ -402,7 +405,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientPhishing.DOMFeatureTimeout" units="units"
-    expires_after="M90">
+    expires_after="M94">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -422,6 +425,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="SBClientPhishing.IllegalFeatureValue" units="units"
     expires_after="M90">
+  <obsolete>
+    Removed 01-29-2021 due to lack of use.
+  </obsolete>
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -443,6 +449,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="SBClientPhishing.PageCapturedMatchesBrowserURL"
     enum="BooleanMatched" expires_after="2021-01-27">
+  <obsolete>
+    Removed 01-29-2021 due to lack of use.
+  </obsolete>
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -453,7 +462,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientPhishing.PhishingDetectionDuration" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -462,7 +471,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientPhishing.PhishingDetectorResult"
-    enum="ClientSidePhishingResult" expires_after="2021-04-04">
+    enum="ClientSidePhishingResult" expires_after="2021-08-08">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>The result enum received from the renderer-side classifier</summary>
@@ -470,7 +479,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="SBClientPhishing.PreClassificationCheckResult"
     enum="SBClientDetectionPreClassificationCheckResult"
-    expires_after="2021-03-15">
+    expires_after="2021-07-27">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -481,6 +490,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="SBClientPhishing.ReportLimitSkipped" enum="BooleanHit"
     expires_after="2021-01-27">
+  <obsolete>
+    Removed 01-29-2021 due to lack of use.
+  </obsolete>
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -491,6 +503,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="SBClientPhishing.RequestNotSerialized" units="units"
     expires_after="M90">
+  <obsolete>
+    Removed 01-29-2021 due to lack of use.
+  </obsolete>
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -500,7 +515,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientPhishing.RequestSatisfiedFromCache" enum="BooleanHit"
-    expires_after="M90">
+    expires_after="M94">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -510,7 +525,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientPhishing.ScorerCreationStatus"
-    enum="SBClientPhishingScorerCreationStatus" expires_after="M90">
+    enum="SBClientPhishingScorerCreationStatus" expires_after="M94">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -532,6 +547,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="SBClientPhishing.TermFeatureBreakIterError" units="units"
     expires_after="M90">
+  <obsolete>
+    Removed 01-29-2021 due to lack of use.
+  </obsolete>
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -541,7 +559,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientPhishing.TermFeatureChunkTime" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -550,7 +568,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientPhishing.TermFeatureIterations" units="units"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -559,7 +577,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientPhishing.TermFeatureTimeout" units="units"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -569,7 +587,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientPhishing.TermFeatureTotalTime" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -580,6 +598,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="SBClientPhishing.TooManyFeatures" units="units"
     expires_after="2021-01-27">
+  <obsolete>
+    Removed 01-29-2021 due to lack of use.
+  </obsolete>
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -590,7 +611,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientPhishing.URLFeatureTime" units="ms"
-    expires_after="2021-01-27">
+    expires_after="M94">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -599,7 +620,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientPhishing.VisualComparisonTime" units="ms"
-    expires_after="2021-05-22">
+    expires_after="2021-07-27">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
@@ -609,7 +630,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SBClientPhishing.VisualFeatureTime" units="ms"
-    expires_after="2021-03-28">
+    expires_after="2021-08-09">
   <owner>drubery@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/scanning/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/scanning/histograms.xml
new file mode 100644
index 00000000000..e738b34d99b
--- /dev/null
+++ b/chromium/tools/metrics/histograms/histograms_xml/scanning/histograms.xml
@@ -0,0 +1,138 @@
+<!--
+Copyright 2020 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<!--
+This file is used to generate a comprehensive list of Scan app histograms
+along with a detailed description for each histogram.
+
+For best practices on writing histogram descriptions, see
+https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/metrics/histograms/README.md
+
+Please send CLs to chromium-metrics-reviews@google.com rather than to specific
+individuals. These CLs will be automatically reassigned to a reviewer within
+about 5 minutes. This approach helps the metrics team to load-balance incoming
+reviews. Googlers can read more about this at go/gwsq-gerrit.
+-->
+
+<histogram-configuration>
+
+<histograms>
+
+<histogram name="Scanning.NumDetectedScanners" units="scanners"
+    expires_after="2021-12-04">
+  <owner>gavinwill@chromium.org</owner>
+  <owner>jschettler@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>
+    Records the number of detected scanners. Recorded each time detected
+    scanners are received.
+  </summary>
+</histogram>
+
+<histogram name="Scanning.NumPagesScanned" units="pages"
+    expires_after="2021-12-04">
+  <owner>gavinwill@chromium.org</owner>
+  <owner>jschettler@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>Records the number of pages scanned in a successful scan.</summary>
+</histogram>
+
+<histogram name="Scanning.ReadyTime" units="ms" expires_after="2021-12-04">
+  <owner>gavinwill@chromium.org</owner>
+  <owner>jschettler@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>
+    Records the time between sending a request for scanners and receiving
+    capabilities for the selected scanner, which is essentially the time between
+    the user launching the Scan app and being able to interact with it to select
+    a scanner, change scan settings, or start a scan.
+  </summary>
+</histogram>
+
+<histogram name="Scanning.ScanAppEntryPoint" enum="ScanAppEntryPoint"
+    expires_after="2021-12-04">
+  <owner>gavinwill@chromium.org</owner>
+  <owner>jschettler@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>
+    Records the entry point of where the Scan App was launched from in Chrome
+    OS. Used to track the relative entry points of the app.
+  </summary>
+</histogram>
+
+<histogram name="Scanning.ScanJobFailureReason" enum="ScanJobFailureReason"
+    expires_after="2021-12-04">
+  <owner>gavinwill@chromium.org</owner>
+  <owner>jschettler@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>Records the reason a scan job failed.</summary>
+</histogram>
+
+<histogram name="Scanning.ScanJobSettings.ColorMode"
+    enum="ScanJobSettingsColorMode" expires_after="2021-12-04">
+  <owner>gavinwill@chromium.org</owner>
+  <owner>jschettler@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>
+    Records the selected Color Mode setting for a submitted scan job.
+  </summary>
+</histogram>
+
+<histogram name="Scanning.ScanJobSettings.FileType"
+    enum="ScanJobSettingsFileType" expires_after="2021-12-04">
+  <owner>gavinwill@chromium.org</owner>
+  <owner>jschettler@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>
+    Records the selected File Type setting for a submitted scan job.
+  </summary>
+</histogram>
+
+<histogram name="Scanning.ScanJobSettings.PageSize"
+    enum="ScanJobSettingsPageSize" expires_after="2021-12-04">
+  <owner>gavinwill@chromium.org</owner>
+  <owner>jschettler@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>
+    Records the selected Page Size setting for a submitted scan job.
+  </summary>
+</histogram>
+
+<histogram name="Scanning.ScanJobSettings.Resolution"
+    enum="ScanJobSettingsResolution" expires_after="2021-12-04">
+  <owner>gavinwill@chromium.org</owner>
+  <owner>jschettler@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>
+    Records the selected Resolution setting for a submitted scan job.
+  </summary>
+</histogram>
+
+<histogram name="Scanning.ScanJobSettings.Source" enum="ScanJobSettingsSource"
+    expires_after="2021-12-04">
+  <owner>gavinwill@chromium.org</owner>
+  <owner>jschettler@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>
+    Records the selected Source setting for a submitted scan job.
+  </summary>
+</histogram>
+
+<histogram name="Scanning.ScanJobSuccessful" enum="Boolean"
+    expires_after="2021-12-04">
+  <owner>gavinwill@chromium.org</owner>
+  <owner>jschettler@chromium.org</owner>
+  <owner>cros-peripherals@google.com</owner>
+  <summary>
+    Records true if the attempted scan job completed successfully and false if
+    the scan job failed for any reason. This metric will not include canceled
+    scan jobs.
+  </summary>
+</histogram>
+
+</histograms>
+
+</histogram-configuration>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/scheduler/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/scheduler/histograms.xml
index 070440b1359..335897baee3 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/scheduler/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/scheduler/histograms.xml
@@ -201,6 +201,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Scheduling.PrepareTilesDuration2" units="microseconds"
     expires_after="M85">
+  <obsolete>
+    Removed M90.
+  </obsolete>
   <owner>vmiura@chromium.org</owner>
   <owner>sadrul@chromium.org</owner>
   <summary>
@@ -258,7 +261,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Scheduling.Renderer.DrawIntervalWithCustomPropertyAnimations2"
-    units="microseconds" expires_after="2020-10-01">
+    units="microseconds" expires_after="2022-02-01">
   <owner>xidachen@chromium.org</owner>
   <owner>animations-dev@chromium.org</owner>
   <summary>
@@ -299,6 +302,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Scheduling.SwapToAckLatency2" units="microseconds"
     expires_after="M85">
+  <obsolete>
+    Removed M90.
+  </obsolete>
   <owner>vmiura@chromium.org</owner>
   <owner>sadrul@chromium.org</owner>
   <summary>
@@ -330,6 +336,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram base="true" name="ThreadPool.HeartbeatLatencyMicroseconds"
     units="microseconds" expires_after="M85">
+  <obsolete>
+    Removed 11/2020. Not actively used.
+  </obsolete>
   <owner>fdoray@chromium.org</owner>
   <owner>gab@chromium.org</owner>
   <owner>robliao@chromium.org</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/search/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/search/histograms.xml
index 0860b737222..2aa6853f3e9 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/search/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/search/histograms.xml
@@ -34,6 +34,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     Records whether the user opened the panel when it was shown. Recorded for
     all gestures for all users when the UX is hidden. Implemented for Android.
 
+    The user action Search.ContextualSearch.All.ResultsSeen.true is also logged
+    in the case that true is logged to this histogram.
+
     This histogram is of special interest to the chrome-analysis-team@. Do not
     change its semantics or retire it without talking to them first.
   </summary>
@@ -200,7 +203,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Search.ContextualSearch.ResolveReceived" enum="Boolean"
-    expires_after="M89">
+    expires_after="M91">
   <owner>donnd@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -211,7 +214,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Search.ContextualSearch.ResolveRequested"
-    enum="ContextualSearchGestureIsTap" expires_after="M89">
+    enum="ContextualSearchGestureIsTap" expires_after="2021-08-09">
   <owner>donnd@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -222,7 +225,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Search.ContextualSearch.SelectionExpanded"
-    enum="ContextualSearchGestureIsTap" expires_after="M92">
+    enum="ContextualSearchGestureIsTap" expires_after="2021-08-09">
   <owner>donnd@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -257,7 +260,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Search.ContextualSearch.TranslationNeeded"
-    enum="ContextualSearchGestureIsTap" expires_after="M89">
+    enum="ContextualSearchGestureIsTap" expires_after="2021-08-22">
   <owner>donnd@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -270,7 +273,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Search.ContextualSearch.TranslationsOptInIPHShown"
-    enum="BooleanPreviouslyShown" expires_after="M89">
+    enum="BooleanPreviouslyShown" expires_after="2021-08-22">
   <owner>donnd@chromium.org</owner>
   <owner>contextual-search-eng@google.com</owner>
   <summary>
@@ -281,7 +284,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Search.ContextualSearch.TranslationsOptInIPHWorked"
-    enum="BooleanOptedIn" expires_after="M89">
+    enum="BooleanOptedIn" expires_after="2021-08-22">
   <owner>donnd@chromium.org</owner>
   <owner>contextual-search-eng@google.com</owner>
   <summary>
@@ -788,7 +791,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Search.ContextualSearchQuickActions.Category"
-    enum="ContextualSearchQuickActionCategory" expires_after="2021-03-21">
+    enum="ContextualSearchQuickActionCategory" expires_after="2021-07-27">
   <owner>donnd@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -1216,7 +1219,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Search.iOS.SelectDefaultSearchEngine"
-    enum="OmniboxSearchEngineType" expires_after="2021-02-04">
+    enum="OmniboxSearchEngineType" expires_after="2022-02-04">
   <owner>sczs@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
@@ -1278,14 +1281,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Search.QueryTiles.FetcherHttpResponseCode"
-    enum="HttpResponseCode" expires_after="M91">
+    enum="HttpResponseCode" expires_after="2021-08-22">
   <owner>hesen@chromium.org</owner>
   <owner>chrome-upboarding-eng@google.com</owner>
   <summary>Records the HTTP response code get from TileFetcher.</summary>
 </histogram>
 
 <histogram name="Search.QueryTiles.FetcherNetErrorCode" enum="NetErrorCodes"
-    expires_after="M91">
+    expires_after="2021-08-09">
   <owner>hesen@chromium.org</owner>
   <owner>chrome-upboarding-eng@google.com</owner>
   <summary>Records the net error code get from TileFetcher.</summary>
@@ -1301,7 +1304,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Search.QueryTiles.GroupStatus" enum="QueryTilesGroupStatus"
-    expires_after="M91">
+    expires_after="2021-08-22">
   <owner>hesen@chromium.org</owner>
   <owner>chrome-upboarding-eng@google.com</owner>
   <summary>
@@ -1333,7 +1336,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Search.QueryTiles.NTP.Chip.SearchClicked" units="index"
-    expires_after="M91">
+    expires_after="2021-06-20">
   <owner>shaktisahu@chromium.org</owner>
   <owner>chrome-upboarding-eng@google.com</owner>
   <summary>
@@ -1414,7 +1417,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Search.RelatedSearches.AllUserPermissions"
-    enum="ContextualSearchPermissions" expires_after="M91">
+    enum="ContextualSearchPermissions" expires_after="2021-08-15">
   <owner>donnd@chromium.org</owner>
   <owner>related-searches-vteam@google.com</owner>
   <summary>
@@ -1428,7 +1431,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Search.RelatedSearches.QualifiedUsers" enum="Boolean"
-    expires_after="M92">
+    expires_after="2021-08-15">
   <owner>donnd@chromium.org</owner>
   <owner>related-searches-vteam@google.com</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/security/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/security/histograms.xml
index 0ad05c31698..ed2baa3ff5e 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/security/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/security/histograms.xml
@@ -52,7 +52,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.LegacyTLS.DownloadStarted" enum="Boolean"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -66,7 +66,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.LegacyTLS.FormSubmission" enum="Boolean"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -78,7 +78,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.LegacyTLS.OnCommit" enum="Boolean"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>cthomp@chromium.org</owner>
   <owner>estark@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
@@ -99,7 +99,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.MixedForm.InterstitialTriggerState"
-    enum="MixedFormInterstitialTriggeredState" expires_after="M92">
+    enum="MixedFormInterstitialTriggeredState" expires_after="2021-08-22">
   <owner>carlosil@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -110,7 +110,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Security.PageEndReason" enum="PageEndReason"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -185,7 +185,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.PageInfo.TimeOpen" units="units"
-    expires_after="2021-02-01">
+    expires_after="2021-08-01">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -195,7 +195,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.PageInfo.TimeOpen.Action" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -205,7 +205,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.PageInfo.TimeOpen.NoAction" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -215,7 +215,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.PasswordEntry.SiteEngagementLevel"
-    enum="SiteEngagementLevel" expires_after="2021-04-25">
+    enum="SiteEngagementLevel" expires_after="2021-06-27">
   <owner>meacer@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -237,7 +237,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SafetyTips.DownloadStarted" enum="SafetyTipStatus"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>jdeblasio@chromium.org</owner>
   <owner>estark@chromium.org</owner>
   <summary>
@@ -250,7 +250,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SafetyTips.FormSubmission" enum="SafetyTipStatus"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>jdeblasio@chromium.org</owner>
   <owner>estark@chromium.org</owner>
   <summary>
@@ -263,7 +263,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SafetyTips.Interaction" enum="SafetyTipInteraction"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>jdeblasio@chromium.org</owner>
   <owner>estark@chromium.org</owner>
   <summary>
@@ -275,7 +275,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SafetyTips.OpenTime.CloseTab" units="ms"
-    expires_after="M90">
+    expires_after="2021-06-20">
   <owner>jdeblasio@chromium.org</owner>
   <owner>estark@chromium.org</owner>
   <summary>
@@ -285,7 +285,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SafetyTips.OpenTime.Dismiss" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>jdeblasio@chromium.org</owner>
   <owner>estark@chromium.org</owner>
   <summary>
@@ -296,7 +296,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SafetyTips.OpenTime.DismissWithClose" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>jdeblasio@chromium.org</owner>
   <owner>estark@chromium.org</owner>
   <owner>livvielin@chromium.org</owner>
@@ -332,7 +332,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SafetyTips.OpenTime.LeaveSite" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>jdeblasio@chromium.org</owner>
   <owner>estark@chromium.org</owner>
   <summary>
@@ -342,7 +342,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SafetyTips.OpenTime.NoAction" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>jdeblasio@chromium.org</owner>
   <owner>estark@chromium.org</owner>
   <summary>
@@ -372,7 +372,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SafetyTips.PageInfo.Action"
-    enum="WebsiteSettingsAction" expires_after="M90">
+    enum="WebsiteSettingsAction" expires_after="2021-07-18">
   <owner>estark@chromium.org</owner>
   <owner>jdeblasio@chromium.org</owner>
   <summary>
@@ -382,7 +382,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Security.SafetyTips.ReputationCheckComplete"
-    enum="SafetyTipStatus" expires_after="M90">
+    enum="SafetyTipStatus" expires_after="2021-08-22">
   <owner>jdeblasio@chromium.org</owner>
   <owner>src/chrome/browser/reputation/OWNERS</owner>
   <summary>
@@ -393,7 +393,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SafetyTips.SafetyTipIgnoredPageLoad"
-    enum="SafetyTipStatus" expires_after="M90">
+    enum="SafetyTipStatus" expires_after="2021-08-22">
   <owner>jdeblasio@chromium.org</owner>
   <owner>livvielin@chromium.org</owner>
   <summary>
@@ -403,7 +403,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SafetyTips.SafetyTipShown" enum="SafetyTipStatus"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>jdeblasio@chromium.org</owner>
   <owner>livvielin@chromium.org</owner>
   <summary>
@@ -444,7 +444,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SCTAuditing.OptIn.CacheHWM" units="reports"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -456,7 +456,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SCTAuditing.OptIn.ReportDeduplicated" enum="Boolean"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -467,7 +467,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SCTAuditing.OptIn.ReportSampled" enum="Boolean"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -478,7 +478,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SCTAuditing.OptIn.ReportSize" units="bytes"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -488,7 +488,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SCTAuditing.OptIn.ReportSucceeded" enum="Boolean"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -518,7 +518,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SecurityLevel.DownloadStarted" enum="SecurityLevel"
-    expires_after="2021-02-01">
+    expires_after="2021-08-01">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -532,7 +532,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SecurityLevel.FormSubmission" enum="SecurityLevel"
-    expires_after="2021-02-01">
+    expires_after="2021-08-01">
   <owner>carlosil@chromium.org</owner>
   <owner>cthomp@chromium.org</owner>
   <summary>
@@ -544,7 +544,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SecurityLevel.InsecureMainFrameFormSubmission"
-    enum="SecurityLevel" expires_after="M89">
+    enum="SecurityLevel" expires_after="M94">
   <owner>estark@chromium.org</owner>
   <owner>livvielin@chromium.org</owner>
   <summary>
@@ -587,7 +587,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SecurityLevel.OnCommit" enum="SecurityLevel"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -599,7 +599,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Security.SecurityLevel.OnComplete" enum="SecurityLevel"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -612,7 +612,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Security.SiteEngagement" units="units"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -622,7 +622,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Security.SiteEngagementDelta" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
@@ -637,7 +637,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Security.TimeOnPage2" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>cthomp@chromium.org</owner>
   <owner>security-enamel@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/service/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/service/histograms.xml
index aafc7286ef4..99864d50d36 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/service/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/service/histograms.xml
@@ -44,7 +44,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.ActivateEventStatus"
-    enum="ServiceWorkerStatusCode" expires_after="2021-06-18">
+    enum="ServiceWorkerStatusCode" expires_after="2021-08-22">
   <owner>falken@chromium.org</owner>
   <owner>shimazu@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
@@ -203,7 +203,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.Database.DestroyDatabaseResult"
-    enum="ServiceWorkerDatabaseStatus" expires_after="2021-05-18">
+    enum="ServiceWorkerDatabaseStatus" expires_after="2021-07-18">
   <owner>bashi@chromium.org</owner>
   <owner>nhiroki@chromium.org</owner>
   <summary>
@@ -247,7 +247,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.DiskCache.ReadResponseResult"
-    enum="ServiceWorkerReadResponseResult" expires_after="2021-05-18">
+    enum="ServiceWorkerReadResponseResult" expires_after="2021-08-01">
   <owner>bashi@chromium.org</owner>
   <owner>nhiroki@chromium.org</owner>
   <summary>
@@ -256,7 +256,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.DiskCache.WriteResponseResult"
-    enum="ServiceWorkerWriteResponseResult" expires_after="2021-05-18">
+    enum="ServiceWorkerWriteResponseResult" expires_after="2021-08-01">
   <owner>bashi@chromium.org</owner>
   <owner>nhiroki@chromium.org</owner>
   <summary>
@@ -302,7 +302,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.FetchEvent.Fallback.Time" units="ms"
-    expires_after="2021-01-31">
+    expires_after="2021-08-01">
   <owner>falken@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
   <summary>
@@ -312,7 +312,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.FetchEvent.HasResponse.Time" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>falken@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
   <summary>
@@ -323,7 +323,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.FetchEvent.MainResource.Status"
-    enum="ServiceWorkerStatusCode" expires_after="2021-04-19">
+    enum="ServiceWorkerStatusCode" expires_after="2021-08-22">
   <owner>falken@chromium.org</owner>
   <owner>shimazu@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
@@ -334,7 +334,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.FetchEvent.QueuingTime" units="ms"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>asamidoi@chromium.org</owner>
   <owner>shimazu@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
@@ -347,7 +347,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.FetchEvent.Subresource.Status"
-    enum="ServiceWorkerStatusCode" expires_after="2021-04-19">
+    enum="ServiceWorkerStatusCode" expires_after="2021-08-22">
   <owner>falken@chromium.org</owner>
   <owner>shimazu@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
@@ -371,6 +371,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="ServiceWorker.GetAllOriginsInfoTime" units="ms"
     expires_after="2021-01-24">
+  <obsolete>
+    Removed 2021-01-12.
+  </obsolete>
   <owner>bashi@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
   <summary>
@@ -420,7 +423,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.InternalsPageAccessed"
-    enum="ServiceWorkerInternalsLinkQuery" expires_after="M90">
+    enum="ServiceWorkerInternalsLinkQuery" expires_after="M94">
   <owner>bashi@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
   <summary>
@@ -639,7 +642,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.MainFramePageLoad" enum="ServiceWorkerSite"
-    expires_after="2021-02-16">
+    expires_after="2021-08-15">
   <owner>falken@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
   <summary>
@@ -648,7 +651,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.NotificationClickEvent.Time" units="ms"
-    expires_after="M90">
+    expires_after="M96">
   <owner>peter@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
   <summary>
@@ -659,7 +662,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.NotificationCloseEvent.Time" units="ms"
-    expires_after="M90">
+    expires_after="M96">
   <owner>nsatragno@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -670,7 +673,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.PageLoad" enum="ServiceWorkerSite"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>falken@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
   <summary>Counts page loads controlled by a service worker.</summary>
@@ -699,8 +702,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="ServiceWorker.PushEvent.Time" units="ms" expires_after="M87">
+<histogram name="ServiceWorker.PushEvent.Time" units="ms" expires_after="M96">
   <owner>peter@chromium.org</owner>
+  <owner>knollr@chromium.org</owner>
   <summary>
     The time taken between dispatching a PushEvent to a Service Worker and
     receiving a message that it finished handling the event. Includes the time
@@ -743,7 +747,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.ScriptCachedMetadataSize" units="bytes"
-    expires_after="2021-05-18">
+    expires_after="2021-08-09">
   <owner>falken@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
   <summary>
@@ -1017,7 +1021,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.StartWorker.Status"
-    enum="ServiceWorkerStatusCode" expires_after="2021-04-04">
+    enum="ServiceWorkerStatusCode" expires_after="2021-08-08">
   <owner>falken@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
   <summary>
@@ -1028,7 +1032,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.StartWorker.StatusByPurpose"
-    enum="ServiceWorkerStatusCode" expires_after="2021-04-18">
+    enum="ServiceWorkerStatusCode" expires_after="2021-08-22">
   <owner>falken@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
   <summary>
@@ -1039,7 +1043,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.StartWorker.Time" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>falken@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
   <summary>
@@ -1077,7 +1081,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.Storage.DeleteAndStartOverResult"
-    enum="ServiceWorkerDeleteAndStartOverResult" expires_after="M90">
+    enum="ServiceWorkerDeleteAndStartOverResult" expires_after="M94">
   <owner>bashi@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
   <summary>
@@ -1100,7 +1104,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>chrome-worker@google.com</owner>
   <summary>
     The counts of retries to recover after a Storage Service crash. Logged after
-    a recovery, or the maximum number of retries is exceeded See
+    a recovery, or the maximum number of retries is exceeded. See
     ServiceWorkerRegistry::OnRemoteStorageDisconnected() for the maximum number
     of retries.
   </summary>
@@ -1118,7 +1122,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorker.WorkerStopped" enum="ServiceWorkerStoppedStatus"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>falken@chromium.org</owner>
   <owner>chrome-worker@google.com</owner>
   <summary>
@@ -1157,7 +1161,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorkerCache.Cache.Browser.Match.RelatedFetchEvent"
-    units="ms" expires_after="2021-03-28">
+    units="ms" expires_after="2021-08-01">
   <owner>wanderview@chromium.org</owner>
   <owner>chrome-owp-storage@google.com</owner>
   <summary>
@@ -1169,7 +1173,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorkerCache.CacheStorage" units="ms"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>dmurph@chromium.org</owner>
   <owner>wanderview@chromium.org</owner>
   <owner>chrome-owp-storage@google.com</owner>
@@ -1191,6 +1195,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="ServiceWorkerCache.DidGenerateCacheableMetadataMessageInCacheStorage.OriginAllowed"
     enum="Boolean" expires_after="2020-12-31">
+  <obsolete>
+    Removed 2021-01-01.
+  </obsolete>
   <owner>wanderview@chromium.org</owner>
   <owner>chrome-owp-storage@google.com</owner>
   <summary>
@@ -1202,7 +1209,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="ServiceWorkerCache.ErrorStorageType"
-    enum="CacheStorageErrorStorageType" expires_after="2021-03-21">
+    enum="CacheStorageErrorStorageType" expires_after="2021-08-22">
   <owner>wanderview@chromium.org</owner>
   <owner>chrome-owp-storage@google.com</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/session/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/session/histograms.xml
index d9b5296d17a..b1d048fad5e 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/session/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/session/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="Session.Background.TotalDuration" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-08-15">
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
@@ -36,7 +36,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Session.ClosedTabCounts" units="operations"
-    expires_after="2021-04-19">
+    expires_after="2021-07-18">
   <owner>rohitrao@chromium.org</owner>
   <owner>marq@chromium.org</owner>
   <summary>
@@ -60,7 +60,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Session.OpenedTabCounts" units="operations"
-    expires_after="2021-04-19">
+    expires_after="2021-07-18">
   <owner>rohitrao@chromium.org</owner>
   <owner>marq@chromium.org</owner>
   <summary>
@@ -135,26 +135,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     when Chrome leaves the screen. This is generally straightforward. Chrome
     leaves the screen when the screen goes blank or shows the lock screen, when
     Chrome clicks a link that opens in another app, or when the user switches to
-    the app switcher. Note that, unlike on desktop, even if Chrome is playing
-    media in the background, the session is still terminated when Chrome leaves
-    the screen.
-
-    iOS continued: These are some edge cases to be aware of: (i) OS overlays.
-    These can appear, for examples, when a link is clicked that could go to a
-    non-Google app that has not yet been set to default and the OS asks whether
-    to open the link in the app by default, or when a user has set the OS to
-    block certain sites or types of sites by default and require authentication
-    to access them. This authentication prompt is an OS overlay. At the time of
-    writing this description, we're not sure if displaying an overlay will end
-    the session. (ii) full-screen media playing. Because media is played through
-    iOS's technology stack, if the user takes media that's playing within Chrome
-    and displayed it full-screen, the session ends because no part of Chrome is
-    on the screen anymore. (iii) multi-window support. Not yet launched as of
-    M-85. Sessions end and immediately restart when a user switches from a
-    single-window to a multi-window view and vice versa, and also ends when
-    resizing the Chrome window. The end is because Chrome is considered no
-    longer active during the time the OS animates the windows to change their
-    sizes.
+    another app in the app switcher. Note that, unlike on desktop, even if
+    Chrome is playing media in the background or in picture-in-picture mode, the
+    session is still terminated when Chrome leaves the screen. Also note that if
+    Chrome starts in Safe Mode, the session will only start when the user quits
+    Safe Mode. When multiple windows are used, the session is considered ongoing
+    as long as there is at least one foreground Chrome window. This was revised
+    in M-89 to support multiple windows. In M-87 and M-88, nothing was logged
+    due to a bug. Before M-86, a similar metric was recorded, with some
+    differences in edge cases. See the old histogram description for more
+    details.
 
     This histogram is of special interest to the chrome-analysis-team@. Do not
     change its semantics or retire it without talking to them first.
@@ -313,7 +303,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Session.TotalDuration.TouchMode" units="times"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>collinbaker@chromium.org</owner>
   <owner>chrome-desktop-ui-sea@google.com</owner>
   <summary>
@@ -421,7 +411,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Session.WebStates.AllSerializedCertPolicyCachesSize"
     units="KB" expires_after="2021-06-10">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>djean@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
     The size of all cert policy caches for all open tabs. Recorded when
@@ -436,7 +426,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     Removed 10/2020.
   </obsolete>
   <owner>ajuma@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
     Number of forward navigation items when navigation was committed/finished.
@@ -453,7 +442,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     Removed 10/2020.
   </obsolete>
   <owner>ajuma@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
     True if navigation manager has forward navigation items when navigation was
@@ -466,8 +454,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Session.WebStates.NavigationItem" units="KB"
-    expires_after="2021-05-01">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-07-04">
+  <owner>djean@chromium.org</owner>
   <owner>sdefresne@chromium.org</owner>
   <summary>
     Recorded when CRWNavigationItemStorage encodes the data, which happens on
@@ -477,7 +465,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Session.WebStates.ReadFromFileTime" units="ms"
-    expires_after="2021-06-10">
+    expires_after="2021-08-09">
   <owner>justincohen@chromium.org</owner>
   <owner>rohitrao@chromium.org</owner>
   <summary>
@@ -488,7 +476,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Session.WebStates.SerializedCertPolicyCacheSize" units="KB"
     expires_after="2021-06-10">
-  <owner>eugenebut@chromium.org</owner>
+  <owner>djean@chromium.org</owner>
   <owner>gambard@chromium.org</owner>
   <summary>
     The size of a single cert policy cache for one tab. Recorded when
@@ -498,7 +486,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Session.WebStates.SerializedSize" units="KB"
-    expires_after="2021-06-10">
+    expires_after="2021-08-09">
   <owner>justincohen@chromium.org</owner>
   <owner>rohitrao@chromium.org</owner>
   <summary>
@@ -587,6 +575,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="SessionRestore.UnrecoverableWriteErrorCount"
+    units="operations" expires_after="M93">
+  <owner>sky@chromium.org</owner>
+  <owner>davidbienvenu@chromium.org</owner>
+  <summary>
+    Recorded when SessionService is shutdown (which generally corresponds to
+    when chrome is shutdown). The count is the number of times a write error
+    happened at a time when it could not immediately be handled.
+  </summary>
+</histogram>
+
 <histogram name="SessionStorageContext.CachePurgedInKB" units="KB"
     expires_after="M95">
   <owner>mek@chromium.org</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/settings/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/settings/histograms.xml
index ed836c085ac..85ef0fc52b2 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/settings/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/settings/histograms.xml
@@ -40,7 +40,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Settings.GivenShowHomeButton_HomePageIsNewTabPage"
-    enum="Boolean" expires_after="2021-05-02">
+    enum="Boolean" expires_after="2021-07-04">
   <owner>mpearson@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -60,7 +60,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Settings.Homepage.LocationType" enum="HomepageLocationType"
-    expires_after="2021-04-03">
+    expires_after="2021-08-09">
   <owner>bttk@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <owner>wenyufu@chromium.org</owner>
@@ -127,6 +127,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Settings.OpenSettingsFromMenu.PerProfileType"
+    enum="BrowserProfileType" expires_after="2021-12-31">
+  <owner>sideyilmaz@chromium.org</owner>
+  <owner>chrome-incognito@google.com</owner>
+  <summary>
+    Records the profile type for opening the Settings page from menu.
+  </summary>
+</histogram>
+
 <histogram name="Settings.PinnedTabEngineTypes" enum="OmniboxSearchEngineType"
     expires_after="2021-06-30">
   <owner>mpearson@chromium.org</owner>
@@ -151,7 +160,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Settings.PrivacyElementInteractions"
-    enum="SettingsPrivacyElementInteractions" expires_after="M90">
+    enum="SettingsPrivacyElementInteractions" expires_after="2021-08-22">
   <owner>harrisonsean@chromium.org</owner>
   <owner>msramek@chromium.org</owner>
   <owner>sauski@chromium.org</owner>
@@ -161,51 +170,75 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Settings.PrivacySandbox.Enabled"
+    enum="SettingsPrivacySandboxEnabled" expires_after="M95">
+  <owner>harrisonseean@chromium.org</owner>
+  <owner>msramek@chromium.org</owner>
+  <owner>chrome-friendly-settings@google.com</owner>
+  <summary>
+    Whether or not privacy sandbox apis are enabled, including the current state
+    of cookie settings, and if it is disabled by policy. Recorded on profile
+    startup.
+  </summary>
+</histogram>
+
+<histogram name="Settings.PrivacySandbox.PrivacySandboxReferrer"
+    enum="PrivacySandboxReferrer" expires_after="M95">
+  <owner>andzaytsev@google.com</owner>
+  <owner>harrisonseean@chromium.org</owner>
+  <owner>msramek@chromium.org</owner>
+  <owner>chrome-friendly-settings@google.com</owner>
+  <summary>
+    Referrer of a navigation to the Privacy Sandbox UI Settings view. Recorded
+    when the user enters the view.
+  </summary>
+</histogram>
+
 <histogram name="Settings.SafetyCheck.ChromeCleanerResult"
-    enum="SafetyCheckChromeCleanerStatus" expires_after="M90">
+    enum="SafetyCheckChromeCleanerStatus" expires_after="2021-08-09">
   <owner>rainhard@chromium.org</owner>
   <owner>msramek@chromium.org</owner>
   <summary>
-    Resulting state of the safety check Chrome cleaner check. Value 4-9 got
-    added with M88.
+    Resulting state of the safety check Chrome cleaner check. Recorded when a
+    safety check is run by the user. Value 4-9 got added with M88.
   </summary>
 </histogram>
 
 <histogram name="Settings.SafetyCheck.ExtensionsResult"
-    enum="SafetyCheckExtensionsStatus" expires_after="M90">
+    enum="SafetyCheckExtensionsStatus" expires_after="2021-06-20">
   <owner>andzaytsev@google.com</owner>
   <owner>msramek@chromium.org</owner>
   <summary>Resulting state of the safety check extensions check.</summary>
 </histogram>
 
 <histogram name="Settings.SafetyCheck.Interactions"
-    enum="SettingsSafetyCheckInteractions" expires_after="M90">
+    enum="SettingsSafetyCheckInteractions" expires_after="2021-08-22">
   <owner>rainhard@chromium.org</owner>
   <owner>msramek@chromium.org</owner>
   <owner>anaudrey@chromium.org</owner>
   <summary>
     Which user actions were taken in safety check. Recorded every time a user
     does an interaction in safety check. Value 5 and 6 got added with M86, 7-9
-    with M87, and 10 with M88.
+    with M87, 10 with M88, and 11 with M89.
   </summary>
 </histogram>
 
 <histogram name="Settings.SafetyCheck.PasswordsResult"
-    enum="SafetyCheckPasswordsStatus" expires_after="M90">
+    enum="SafetyCheckPasswordsStatus" expires_after="2021-08-22">
   <owner>andzaytsev@google.com</owner>
   <owner>msramek@chromium.org</owner>
   <summary>Resulting state of the safety check password check.</summary>
 </histogram>
 
 <histogram name="Settings.SafetyCheck.SafeBrowsingResult"
-    enum="SafetyCheckSafeBrowsingStatus" expires_after="M90">
+    enum="SafetyCheckSafeBrowsingStatus" expires_after="2021-08-22">
   <owner>andzaytsev@google.com</owner>
   <owner>msramek@chromium.org</owner>
   <summary>Resulting state of the safety check Safe Browsing check.</summary>
 </histogram>
 
 <histogram name="Settings.SafetyCheck.UpdatesResult"
-    enum="SafetyCheckUpdateStatus" expires_after="M90">
+    enum="SafetyCheckUpdateStatus" expires_after="2021-08-22">
   <owner>andzaytsev@google.com</owner>
   <owner>msramek@chromium.org</owner>
   <summary>Resulting state of the safety check updates check.</summary>
@@ -264,7 +297,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Settings.ShowHomeButton" enum="BooleanEnabled"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>mpearson@chromium.org</owner>
   <owner>twellington@chromium.org</owner>
   <summary>
@@ -343,7 +376,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Settings.StartupPageLoadSettings" enum="SessionStartupPref"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>mpearson@chromium.org</owner>
   <owner>ramyan@chromium.org</owner>
   <owner>tiborg@chromium.org</owner>
@@ -360,7 +393,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Settings.TimeUntilInteractive" units="ms" expires_after="M90">
+<histogram name="Settings.TimeUntilInteractive" units="ms"
+    expires_after="2021-08-22">
   <owner>dbeam@chromium.org</owner>
   <owner>dpapad@chromium.org</owner>
   <summary>
@@ -452,7 +486,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Settings.TrackedPreferenceUnchanged" enum="TrackedPreference"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>proberge@chromium.org</owner>
   <summary>
     The id of a tracked preference whose value has not changed since the last
diff --git a/chromium/tools/metrics/histograms/histograms_xml/sharing/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/sharing/histograms.xml
index 41029ab1bcf..913f78b692d 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/sharing/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/sharing/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="Sharing.ClickToCallAppsToShow" units="apps"
-    expires_after="M91">
+    expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="SharingClickToCallUi" -->
 
   <owner>mvanouwerkerk@chromium.org</owner>
@@ -34,7 +34,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sharing.ClickToCallDevicesToShow" units="devices"
-    expires_after="M91">
+    expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="SharingClickToCallUi" -->
 
   <owner>mvanouwerkerk@chromium.org</owner>
@@ -46,7 +46,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sharing.ClickToCallDialerPresent" enum="BooleanPresent"
-    expires_after="M91">
+    expires_after="2021-08-22">
   <owner>mvanouwerkerk@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
   <summary>
@@ -57,7 +57,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sharing.ClickToCallDialogShown" enum="SharingDialogType"
-    expires_after="M91">
+    expires_after="2021-08-22">
   <owner>mvanouwerkerk@chromium.org</owner>
   <owner>knollr@chromium.org</owner>
   <summary>
@@ -80,7 +80,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sharing.ClickToCallSelectedAppIndex" units="index"
-    expires_after="M91">
+    expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="SharingClickToCallUi" -->
 
   <owner>mvanouwerkerk@chromium.org</owner>
@@ -92,7 +92,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sharing.ClickToCallSelectedDeviceIndex" units="index"
-    expires_after="M91">
+    expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="SharingClickToCallUi" -->
 
   <owner>mvanouwerkerk@chromium.org</owner>
@@ -104,7 +104,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sharing.DefaultSharesheetAndroid.Opened" enum="ShareOrigin"
-    expires_after="M91">
+    expires_after="M97">
   <owner>sophey@chromium.org</owner>
   <owner>src/components/send_tab_to_self/OWNERS</owner>
   <summary>
@@ -115,6 +115,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Sharing.DeviceInfoAvailable" enum="BooleanAvailable"
     expires_after="M87">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
   <owner>knollr@chromium.org</owner>
   <owner>mvanouwerkerk@chromium.org</owner>
   <summary>
@@ -125,6 +128,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Sharing.DeviceLastUpdatedAge" units="hours"
     expires_after="M87">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
 <!-- Name completed by histogram_suffixes name="SharingMessage" -->
 
   <owner>mvanouwerkerk@chromium.org</owner>
@@ -138,6 +144,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Sharing.DeviceLastUpdatedAgeWithResult" units="hours"
     expires_after="M87">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
 <!-- Name completed by histogram_suffixes name="SharingSendMessageResult" -->
 
   <owner>mvanouwerkerk@chromium.org</owner>
@@ -171,6 +180,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Sharing.MajorVersionComparison"
     enum="SharingMajorVersionComparison" expires_after="M87">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
 <!-- Name completed by histogram_suffixes name="SharingMessage" -->
 
   <owner>mvanouwerkerk@chromium.org</owner>
@@ -206,7 +218,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sharing.MessageReceivedType" enum="SharingMessageType"
-    expires_after="M88">
+    expires_after="2021-08-09">
   <owner>mvanouwerkerk@chromium.org</owner>
   <owner>peter@chromium.org</owner>
   <summary>
@@ -330,17 +342,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sharing.Screenshot.Action" enum="SharingScreenshotAction"
-    expires_after="M92">
+    expires_after="M97">
   <owner>ramyan@chromium.org</owner>
   <owner>jeffreycohen@chromium.org</owner>
+  <owner>src/components/send_tab_to_self/OWNERS</owner>
   <summary>
     Logged when actions are taken in the sharing screenshot image editing
     feature.
   </summary>
 </histogram>
 
+<histogram name="Sharing.ScreenshotFallback.Action"
+    enum="SharingScreenshotFallbackAction" expires_after="M97">
+  <owner>ramyan@chromium.org</owner>
+  <owner>jeffreycohen@chromium.org</owner>
+  <owner>src/components/send_tab_to_self/OWNERS</owner>
+  <summary>
+    Logged when actions are taken in the sharing screenshot fallback feature.
+  </summary>
+</histogram>
+
 <histogram name="Sharing.ScreenshotsAndroid.IsEditorDismissedOnStart"
-    enum="Boolean" expires_after="M89">
+    enum="Boolean" expires_after="M97">
   <owner>jeffreycohen@chromium.org</owner>
   <owner>kristipark@chromium.org</owner>
   <owner>src/components/send_tab_to_self/OWNERS</owner>
@@ -398,6 +421,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Sharing.SharedClipboardRetries" units="retries"
     expires_after="M87">
+  <obsolete>
+    Removed in M89.
+  </obsolete>
 <!-- Name completed by histogram_suffixes name="SharingSendMessageResult" -->
 
   <owner>mvanouwerkerk@chromium.org</owner>
@@ -431,7 +457,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sharing.SharingHubAndroid.Opened" enum="ShareOrigin"
-    expires_after="M91">
+    expires_after="M97">
   <owner>sophey@chromium.org</owner>
   <owner>src/components/send_tab_to_self/OWNERS</owner>
   <summary>
@@ -440,8 +466,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram
+    name="Sharing.SharingHubAndroid.SharedHighlights.TimeToGetLinkToText"
+    units="ms" expires_after="2021-07-11">
+  <owner>gayane@chromium.org</owner>
+  <owner>chrome-shared-highlighting@google.com</owner>
+  <summary>
+    Records time it takes to fulfill a link-to-text request. Recorded even if
+    request fails. Corresponds to how long is Sharing Hub delayed because of
+    link-to-text.
+  </summary>
+</histogram>
+
 <histogram name="Sharing.SharingHubAndroid.ThirdPartyAppUsage"
-    enum="SharingHubBottomRowIndex" expires_after="M89">
+    enum="SharingHubBottomRowIndex" expires_after="M97">
   <owner>kmilka@chromium.org</owner>
   <owner>src/components/send_tab_to_self/OWNERS</owner>
   <summary>
@@ -451,7 +489,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sharing.SharingHubAndroid.TimeToShare" units="ms"
-    expires_after="M89">
+    expires_after="M97">
   <owner>kmilka@chromium.org</owner>
   <owner>src/components/send_tab_to_self/OWNERS</owner>
   <summary>
@@ -461,7 +499,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sharing.SharingHubAndroid.TimeToShowShareSheet" units="ms"
-    expires_after="M89">
+    expires_after="M97">
   <owner>kmilka@chromium.org</owner>
   <owner>src/components/send_tab_to_self/OWNERS</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/signin/OWNERS b/chromium/tools/metrics/histograms/histograms_xml/signin/OWNERS
new file mode 100644
index 00000000000..4a43ae5e59b
--- /dev/null
+++ b/chromium/tools/metrics/histograms/histograms_xml/signin/OWNERS
@@ -0,0 +1,7 @@
+# Prefer chromium-metrics-reviews@google.com instead.
+# Use the following owners only if:
+#  - The reviewer is available for review.
+#  - You work in the same area as them.
+#  - They are already a good reviewer for the non-metrics part of the CL.
+# See tools/metrics/histograms/histograms_xml/OWNERS for details.
+alexilin@chromium.org
diff --git a/chromium/tools/metrics/histograms/histograms_xml/signin/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/signin/histograms.xml
index ba3482b2bb3..fa400eec1c2 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/signin/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/signin/histograms.xml
@@ -61,6 +61,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Signin.AccountConsistencyPromoAfterDismissal"
+    enum="AccountConsistencyPromoAfterDismissal" expires_after="2021-08-31">
+  <owner>triploblastic@chromium.org</owner>
+  <owner>aliceywang@chromium.org</owner>
+  <summary>
+    This histogram records the first web signin event if any within 2 minutes
+    after dismissing the account picker bottom sheet. Only recorded on Android.
+  </summary>
+</histogram>
+
 <histogram name="Signin.AccountEquality" enum="SigninAccountEquality"
     expires_after="2021-03-06">
   <owner>droger@chromium.org</owner>
@@ -99,7 +109,7 @@ prefs when the profile is loaded.  -->
 </histogram>
 
 <histogram name="Signin.AccountTracker.GaiaIdMigrationState"
-    enum="OAuth2LoginAccountRevokedMigrationState" expires_after="2021-04-30">
+    enum="OAuth2LoginAccountRevokedMigrationState" expires_after="2021-07-04">
   <owner>msarda@chromium.org</owner>
   <owner>sdefresne@chromium.org</owner>
   <summary>
@@ -127,7 +137,7 @@ prefs when the profile is loaded.  -->
 </histogram>
 
 <histogram name="Signin.AndroidDeviceAccountsNumberWhenEnteringFRE"
-    units="count" expires_after="2021-06-01">
+    units="count" expires_after="2021-08-01">
   <owner>bsazonov@chromium.org</owner>
   <owner>aliceywang@chromium.org</owner>
   <summary>
@@ -173,6 +183,15 @@ prefs when the profile is loaded.  -->
   </summary>
 </histogram>
 
+<histogram name="Signin.AndroidNumberOfDeviceAccounts" units="accounts"
+    expires_after="2021-08-31">
+  <owner>triploblastic@chromium.org</owner>
+  <owner>aliceywang@chromium.org</owner>
+  <summary>
+    The number of Android accounts present on the device. Recorded on startup.
+  </summary>
+</histogram>
+
 <histogram name="Signin.AndroidPopulateAccountCacheWaitingTime" units="ms"
     expires_after="2021-08-16">
   <owner>bsazonov@chromium.org</owner>
@@ -184,6 +203,9 @@ prefs when the profile is loaded.  -->
 
 <histogram name="Signin.AuthenticatedLaunchUserEvent"
     enum="AuthenticatedLaunchUserEvent" expires_after="M95">
+  <obsolete>
+    Removed in M90.
+  </obsolete>
   <owner>zmin@chromium.org</owner>
   <owner>pastarmovj@chromium.org</owner>
   <summary>
@@ -194,7 +216,7 @@ prefs when the profile is loaded.  -->
 </histogram>
 
 <histogram name="Signin.AuthError" enum="GoogleServiceAuthError"
-    expires_after="2021-05-09">
+    expires_after="2021-08-09">
   <owner>msarda@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>
@@ -227,7 +249,7 @@ prefs when the profile is loaded.  -->
 </histogram>
 
 <histogram base="true" name="Signin.CookieJar.SignedInCountWithPrimary"
-    units="accounts" expires_after="2021-05-02">
+    units="accounts" expires_after="2021-07-04">
   <owner>jkrcal@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>
@@ -299,7 +321,7 @@ prefs when the profile is loaded.  -->
 </histogram>
 
 <histogram name="Signin.Extensions.GaiaRemoteConsentFlowResult"
-    enum="GaiaRemoteConsentFlowResult" expires_after="2021-03-28">
+    enum="GaiaRemoteConsentFlowResult" expires_after="2021-08-09">
   <owner>alexilin@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>
@@ -309,7 +331,7 @@ prefs when the profile is loaded.  -->
 </histogram>
 
 <histogram name="Signin.Extensions.GetAuthTokenResult"
-    enum="GetAuthTokenResult" expires_after="2021-03-28">
+    enum="GetAuthTokenResult" expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="GetAuthTokenType" -->
 
   <owner>alexilin@chromium.org</owner>
@@ -381,7 +403,7 @@ prefs when the profile is loaded.  -->
 </histogram>
 
 <histogram name="Signin.GetAccessTokenRetry" enum="GoogleServiceAuthError"
-    expires_after="2021-04-19">
+    expires_after="2021-07-18">
   <owner>droger@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
   <summary>
@@ -398,6 +420,16 @@ prefs when the profile is loaded.  -->
   </summary>
 </histogram>
 
+<histogram name="Signin.Intercept.Guest.Availability"
+    enum="SigninInterceptGuestAvailability" expires_after="2021-08-12">
+  <owner>rhalavati@chromium.org</owner>
+  <owner>droger@chromium.org</owner>
+  <summary>
+    Records whether Guest option was available prior to showing signin intercept
+    and if not, why.
+  </summary>
+</histogram>
+
 <histogram name="Signin.Intercept.HeuristicOutcome"
     enum="SigninInterceptHeuristicOutcome" expires_after="2021-08-12">
   <owner>droger@chromium.org</owner>
@@ -430,6 +462,10 @@ prefs when the profile is loaded.  -->
 
 <histogram name="Signin.Intercept.SessionStartupDuration" units="ms"
     expires_after="2021-08-12">
+  <obsolete>
+    Replaced in M89 by Signin.Intercept.SessionStartupDuration.Multilogin and
+    Signin.Intercept.SessionStartupDuration.Reconcilor.
+  </obsolete>
   <owner>alexilin@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>
@@ -438,6 +474,41 @@ prefs when the profile is loaded.  -->
   </summary>
 </histogram>
 
+<histogram name="Signin.Intercept.SessionStartupDuration.{Method}" units="ms"
+    expires_after="2021-08-12">
+  <owner>alexilin@chromium.org</owner>
+  <owner>droger@chromium.org</owner>
+  <summary>
+    Records the duration of session startup time after signin interception using
+    {Method}. This includes waiting for the account to be available on the web.
+  </summary>
+  <token key="Method">
+    <variant name="Multilogin"/>
+    <variant name="Reconcilor"/>
+  </token>
+</histogram>
+
+<histogram name="Signin.Intercept.SessionStartupReconcileError"
+    enum="BooleanPresent" expires_after="2021-08-12">
+  <owner>alexilin@chromium.org</owner>
+  <owner>droger@chromium.org</owner>
+  <summary>
+    Records whether a reconciliation errors happens while an account is moved to
+    another profile after signin interception, specifically when the cookie is
+    being generated by the account reconcilor.
+  </summary>
+</histogram>
+
+<histogram name="Signin.Intercept.SessionStartupResult"
+    enum="SigninInterceptSessionStartupResult" expires_after="2021-08-12">
+  <owner>alexilin@chromium.org</owner>
+  <owner>droger@chromium.org</owner>
+  <summary>
+    Records the result of session startup after signin interception, which adds
+    the account on the web.
+  </summary>
+</histogram>
+
 <histogram base="true" name="Signin.InterceptResult"
     enum="SigninInterceptResult" expires_after="2021-08-12">
 <!-- Name completed by histogram_suffixes name="SigninInterceptType" -->
@@ -463,12 +534,13 @@ prefs when the profile is loaded.  -->
 </histogram>
 
 <histogram name="Signin.InvestigatedScenario" enum="SigninInvestigatedScenario"
-    expires_after="M90">
+    expires_after="M95">
   <owner>treib@chromium.org</owner>
   <owner>mmoskvitin@google.com</owner>
   <summary>
-    Records the general type of signin that is occuring in relation to previous
-    signin and local data.
+    Recorded when Sync is turned on in a profile. Records whether this is the
+    first time Sync is turned on in this profile or, if not, whether Sync was
+    previously turned on for the same or for a different account.
   </summary>
 </histogram>
 
@@ -502,7 +574,7 @@ prefs when the profile is loaded.  -->
 </histogram>
 
 <histogram name="Signin.IOSLoginMethodAndSyncState"
-    enum="SigninIOSLoginMethodAndSyncState" expires_after="2021-04-30">
+    enum="SigninIOSLoginMethodAndSyncState" expires_after="2021-07-04">
   <owner>jebel@chromium.org</owner>
   <owner>fernandex@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
@@ -521,7 +593,7 @@ prefs when the profile is loaded.  -->
 </histogram>
 
 <histogram name="Signin.IOSNumberOfDeviceAccounts" units="accounts"
-    expires_after="2021-04-30">
+    expires_after="2021-07-04">
   <owner>fernandex@chromium.org</owner>
   <owner>jlebel@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
@@ -573,7 +645,7 @@ the browser and content area. -->
 </histogram>
 
 <histogram name="Signin.LoadedIdentities.Count" units="identities"
-    expires_after="2021-04-19">
+    expires_after="2021-08-22">
   <owner>jlebel@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
   <summary>
@@ -585,7 +657,7 @@ the browser and content area. -->
 </histogram>
 
 <histogram name="Signin.LoadedIdentities.Duration" units="ms"
-    expires_after="2021-04-19">
+    expires_after="2021-08-22">
   <owner>jlebel@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
   <summary>
@@ -597,7 +669,7 @@ the browser and content area. -->
 </histogram>
 
 <histogram name="Signin.LoadedIdentities.DurationPerIdentity" units="ms"
-    expires_after="2021-04-19">
+    expires_after="2021-08-22">
   <owner>jlebel@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
   <summary>
@@ -863,7 +935,7 @@ accounts .-->
 </histogram>
 
 <histogram name="Signin.SecondaryAccountConsentLog"
-    enum="SecondaryAccountConsentLoggerResult" expires_after="2021-04-01">
+    enum="SecondaryAccountConsentLoggerResult" expires_after="2021-08-09">
   <owner>anastasiian@chromium.org</owner>
   <owner>sinhak@chromium.org</owner>
   <summary>
@@ -886,7 +958,7 @@ OAuth Multilogin call. -->
 </histogram>
 
 <histogram name="Signin.SignedInAccountsViewImpression" enum="BooleanShown"
-    expires_after="2021-04-20">
+    expires_after="2021-08-22">
   <owner>fernandex@chromium.org</owner>
   <owner>jlebel@chromium.org</owner>
   <owner>msarda@chromium.org</owner>
@@ -967,7 +1039,7 @@ kept as long as profile signout is possible -->
 </histogram>
 
 <histogram name="Signin.SSOAuth.GetIdentities.ErrorCode"
-    enum="SigninSSOAuthGetIdentitiesErrorCode" expires_after="2021-04-19">
+    enum="SigninSSOAuthGetIdentitiesErrorCode" expires_after="2021-08-22">
   <owner>jlebel@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
   <summary>
@@ -977,7 +1049,7 @@ kept as long as profile signout is possible -->
 </histogram>
 
 <histogram base="true" name="Signin.SSOIdentityListRequest.CacheState"
-    enum="SigninSSOIdentityListRequestCacheState" expires_after="2021-04-19">
+    enum="SigninSSOIdentityListRequestCacheState" expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="SigninSSOIdentityListRequestCacheRequestState" -->
 
   <owner>jlebel@chromium.org</owner>
@@ -991,7 +1063,7 @@ kept as long as profile signout is possible -->
 </histogram>
 
 <histogram base="true" name="Signin.SSOIdentityListRequest.Duration" units="ms"
-    expires_after="2021-04-19">
+    expires_after="2021-08-22">
 <!-- Name completed by histogram_suffixes name="SigninSSOIdentityListRequestDurationCacheState" -->
 
   <owner>jlebel@chromium.org</owner>
@@ -1005,7 +1077,7 @@ kept as long as profile signout is possible -->
 
 <histogram
     name="Signin.SSOIdentityListRequest.FetchIdentitiesWithCallback.Duration"
-    units="ms" expires_after="2021-04-19">
+    units="ms" expires_after="2021-07-11">
   <owner>jlebel@chromium.org</owner>
   <owner>fernandex@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
@@ -1018,6 +1090,9 @@ kept as long as profile signout is possible -->
 <histogram
     name="Signin.SSOIdentityListRequest.RunAfterCacheIsPopulated.CacheState"
     enum="SigninSSOIdentityListRequestCacheState" expires_after="2021-04-19">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>jlebel@chromium.org</owner>
   <owner>fernandex@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
@@ -1031,6 +1106,9 @@ kept as long as profile signout is possible -->
 <histogram
     name="Signin.SSOIdentityListRequest.RunAfterCacheIsPopulated.Duration"
     units="ms" expires_after="2021-04-19">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>jlebel@chromium.org</owner>
   <owner>fernandex@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
@@ -1043,7 +1121,10 @@ kept as long as profile signout is possible -->
 
 <histogram
     name="Signin.SSOIdentityListRequest.WaitUntilCacheIsPopulated.CacheState"
-    enum="SigninSSOIdentityListRequestCacheState" expires_after="2021-04-19">
+    enum="SigninSSOIdentityListRequestCacheState" expires_after="2021-06-20">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>jlebel@chromium.org</owner>
   <owner>fernandex@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
@@ -1056,7 +1137,10 @@ kept as long as profile signout is possible -->
 
 <histogram
     name="Signin.SSOIdentityListRequest.WaitUntilCacheIsPopulated.Duration"
-    units="ms" expires_after="2021-04-19">
+    units="ms" expires_after="2021-06-20">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>jlebel@chromium.org</owner>
   <owner>fernandex@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
@@ -1068,7 +1152,7 @@ kept as long as profile signout is possible -->
 </histogram>
 
 <histogram name="Signin.SSOWKWebView.GetAllCookies.CookieCount" units="cookies"
-    expires_after="2021-04-19">
+    expires_after="2021-07-11">
   <owner>jlebel@chromium.org</owner>
   <owner>chrome-signin-team@google.com</owner>
   <summary>
@@ -1107,7 +1191,7 @@ kept as long as profile signout is possible -->
 </histogram>
 
 <histogram base="true" name="Signin.SyncErrorInfoBar"
-    enum="SyncErrorInfoBarAction" expires_after="M89">
+    enum="SyncErrorInfoBarAction" expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="SyncErrorInfoBarType" -->
 
   <owner>triploblastic@chromium.org</owner>
@@ -1119,7 +1203,7 @@ kept as long as profile signout is possible -->
 </histogram>
 
 <histogram name="Signin.SyncFirstSetupCompleteSource"
-    enum="SyncFirstSetupCompleteSource" expires_after="M89">
+    enum="SyncFirstSetupCompleteSource" expires_after="2021-08-09">
   <owner>triploblastic@chromium.org</owner>
   <owner>bsazonov@chromium.org</owner>
   <summary>Tracks where FirstSetupComplete bit is set from.</summary>
@@ -1151,7 +1235,7 @@ should be kept for as long as we store refresh tokens in an SQLite DB. -->
 
 <histogram
     name="Signin.TransactionalReauthGaiaNavigationDuration.FromConfirmClick"
-    units="ms" expires_after="2021-04-25">
+    units="ms" expires_after="2021-06-27">
   <owner>alexilin@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>
@@ -1162,7 +1246,7 @@ should be kept for as long as we store refresh tokens in an SQLite DB. -->
 
 <histogram
     name="Signin.TransactionalReauthGaiaNavigationDuration.FromReauthStart"
-    units="ms" expires_after="2021-04-25">
+    units="ms" expires_after="2021-06-27">
   <owner>alexilin@chromium.org</owner>
   <owner>droger@chromium.org</owner>
   <summary>
@@ -1172,7 +1256,7 @@ should be kept for as long as we store refresh tokens in an SQLite DB. -->
 </histogram>
 
 <histogram name="Signin.TransactionalReauthResult" enum="SigninReauthResult"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
 <!-- Name completed by histogram_suffixes
 name="TransactionalReauthEntryPoint" -->
 
@@ -1186,7 +1270,7 @@ name="TransactionalReauthEntryPoint" -->
 </histogram>
 
 <histogram name="Signin.TransactionalReauthUserAction"
-    enum="SigninReauthUserAction" expires_after="2021-04-25">
+    enum="SigninReauthUserAction" expires_after="2021-06-27">
 <!-- Name completed by histogram_suffixes
 name="TransactionalReauthEntryPoint" -->
 
@@ -1226,7 +1310,7 @@ Chrome adds accounts to the Gaia cookies. -->
 </histogram>
 
 <histogram name="Signin.UserRequestedWipeDataOnSignout" enum="BooleanRequested"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>triploblastic@google.com</owner>
   <owner>bsazonov@chromium.org</owner>
   <summary>User requested to wipe local device data on signout.</summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/smart/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/smart/histograms.xml
index a2725537ed4..4a5ae20583e 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/smart/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/smart/histograms.xml
@@ -22,14 +22,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="SmartLock.AuthMethodChoice.SignIn"
-    enum="SmartLockAuthMethodChoice" expires_after="2021-04-04">
+    enum="SmartLockAuthMethodChoice" expires_after="2022-02-01">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>Records the user's sign in method choice.</summary>
 </histogram>
 
 <histogram name="SmartLock.AuthMethodChoice.SignIn.PasswordState"
-    enum="SmartLockAuthEventPasswordState" expires_after="2021-02-02">
+    enum="SmartLockAuthEventPasswordState" expires_after="2022-02-01">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -39,14 +39,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SmartLock.AuthMethodChoice.Unlock"
-    enum="SmartLockAuthMethodChoice" expires_after="2021-04-04">
+    enum="SmartLockAuthMethodChoice" expires_after="2022-02-01">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>Records the user's unlock method choice.</summary>
 </histogram>
 
 <histogram name="SmartLock.AuthMethodChoice.Unlock.PasswordState"
-    enum="SmartLockAuthEventPasswordState" expires_after="2021-04-11">
+    enum="SmartLockAuthEventPasswordState" expires_after="2022-02-01">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -55,8 +55,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="SmartLock.AuthResult" enum="BooleanSuccess"
+    expires_after="2022-02-01">
+  <owner>hansberry@chromium.org</owner>
+  <owner>better-together-dev@google.com</owner>
+  <summary>
+    Count of successful and failed attempts to unlock or sign in the Chromebook,
+    after the user selects their profile photo.
+  </summary>
+</histogram>
+
 <histogram name="SmartLock.AuthResult.SignIn" enum="BooleanSuccess"
-    expires_after="2021-04-04">
+    expires_after="2022-02-01">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -66,7 +76,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SmartLock.AuthResult.SignIn.Failure"
-    enum="SmartLockAuthResultFailureReason" expires_after="2021-02-02">
+    enum="SmartLockAuthResultFailureReason" expires_after="2022-02-01">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -76,7 +86,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SmartLock.AuthResult.SignIn.Failure.UserControllerAuth"
-    enum="LoginFailureReason" expires_after="2021-02-02">
+    enum="LoginFailureReason" expires_after="2022-02-01">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -86,7 +96,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SmartLock.AuthResult.Unlock" enum="BooleanSuccess"
-    expires_after="2021-04-04">
+    expires_after="2022-02-01">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -96,7 +106,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SmartLock.AuthResult.Unlock.Failure"
-    enum="SmartLockAuthResultFailureReason" expires_after="2021-05-09">
+    enum="SmartLockAuthResultFailureReason" expires_after="2022-02-01">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -106,7 +116,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SmartLock.EligibleDevicesCount" units="devices"
-    expires_after="2021-02-02">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -118,7 +128,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SmartLock.EnabledDevicesCount" units="devices"
-    expires_after="2021-04-11">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -129,7 +139,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SmartLock.EnabledState" enum="SmartLockEnabledState"
-    expires_after="2021-02-02">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -142,7 +152,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SmartLock.FindAndConnectToHostResult.SignIn"
-    enum="SmartLockFindAndConnectToHostResult" expires_after="2021-02-02">
+    enum="SmartLockFindAndConnectToHostResult" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -152,7 +162,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SmartLock.FindAndConnectToHostResult.Unlock"
-    enum="SmartLockFindAndConnectToHostResult" expires_after="2021-04-04">
+    enum="SmartLockFindAndConnectToHostResult" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -162,7 +172,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SmartLock.GetRemoteStatus.SignIn" enum="BooleanSuccess"
-    expires_after="2021-04-11">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -173,7 +183,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="SmartLock.GetRemoteStatus.SignIn.Failure"
     enum="SmartLockGetRemoteStatusResultFailureReason"
-    expires_after="2021-02-02">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -183,7 +193,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SmartLock.GetRemoteStatus.Unlock" enum="BooleanSuccess"
-    expires_after="2021-04-04">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -194,7 +204,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="SmartLock.GetRemoteStatus.Unlock.Failure"
     enum="SmartLockGetRemoteStatusResultFailureReason"
-    expires_after="2021-04-11">
+    expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -204,7 +214,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SmartLock.MultiDeviceFeatureState"
-    enum="MultiDevice_FeatureState" expires_after="2021-02-02">
+    enum="MultiDevice_FeatureState" expires_after="2022-02-02">
   <owner>hansberry@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -216,7 +226,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="SmartLock.Performance.AuthenticationToReceiveFirstRemoteStatusDuration.Unlock"
-    units="ms" expires_after="2021-02-02">
+    units="ms" expires_after="2022-02-02">
 <!-- Name completed by histogram_suffixes name="SmartLockStatusTypes" -->
 
   <owner>hansberry@chromium.org</owner>
@@ -239,7 +249,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="SmartLock.Performance.ShowLockScreenToShowFirstStatusToUserDuration.Unlock"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2022-02-02">
 <!-- Name completed by histogram_suffixes name="SmartLockStatusTypes" -->
 
   <owner>hansberry@chromium.org</owner>
@@ -263,7 +273,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="SmartLock.Performance.StartScanToReceiveFirstRemoteStatusDuration.Unlock"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2022-02-02">
 <!-- Name completed by histogram_suffixes name="SmartLockStatusTypes" -->
 
   <owner>hansberry@chromium.org</owner>
@@ -291,7 +301,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SmartLock.ToggleFeature" enum="BooleanEnabled"
-    expires_after="2021-02-02">
+    expires_after="2022-02-02">
   <owner>jhawkins@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>
@@ -301,7 +311,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SmartLock.ToggleFeature.Disable.Result" enum="BooleanSuccess"
-    expires_after="2021-02-02">
+    expires_after="2022-02-02">
   <owner>jhawkins@chromium.org</owner>
   <owner>better-together-dev@google.com</owner>
   <summary>The result of the operation to disable SmartLock.</summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/software/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/software/histograms.xml
index 24e2f4b8f1d..62055f8a61b 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/software/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/software/histograms.xml
@@ -167,7 +167,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SoftwareReporter.ConfigurationErrors"
-    enum="SoftwareReporterConfigurationError" expires_after="2021-01-30">
+    enum="SoftwareReporterConfigurationError" expires_after="2021-07-30">
   <owner>bdea@chromium.org</owner>
   <owner>chrome-safebrowsing-alerts@google.com</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/stability/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/stability/histograms.xml
index 072ba312bf7..ecbf90a2938 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/stability/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/stability/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="Stability.Android.OomKillReverseRank" units="rank"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>boliu@chromium.org</owner>
   <owner>ssid@chromium.org</owner>
   <summary>
@@ -46,7 +46,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Stability.Android.ProcessedCrashCounts"
-    enum="AndroidProcessedCrashCounts" expires_after="2021-05-09">
+    enum="AndroidProcessedCrashCounts" expires_after="2021-07-11">
   <owner>boliu@chromium.org</owner>
   <summary>
     Individual enum counts specific conditions of child process terminations.
@@ -60,7 +60,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Stability.Android.ProcessedRealMinidumps"
-    enum="AndroidProcessedMinidumps" expires_after="2021-05-09">
+    enum="AndroidProcessedMinidumps" expires_after="2021-11-23">
   <owner>mheikal@chromium.org</owner>
   <owner>smaier@chromium.org</owner>
   <owner>wnwen@chromium.org</owner>
@@ -73,7 +73,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Stability.Android.ProcessedSimulatedMinidumps"
-    enum="AndroidProcessedMinidumps" expires_after="2021-01-06">
+    enum="AndroidProcessedMinidumps" expires_after="2021-11-23">
   <owner>mheikal@chromium.org</owner>
   <owner>smaier@chromium.org</owner>
   <owner>wnwen@chromium.org</owner>
@@ -86,7 +86,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Stability.Android.RendererCrash" enum="Boolean"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>wnwen@chromium.org</owner>
   <summary>
     Counts renderer crashes including OOMs. Android only. Mirrors old stability
@@ -96,7 +96,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Stability.Android.StrongBindingOomRemainingBindingState"
     enum="Android.ChildProcessBindingStateCombination"
-    expires_after="2021-04-25">
+    expires_after="2021-08-09">
   <owner>boliu@chromium.org</owner>
   <owner>ssid@chromium.org</owner>
   <summary>
@@ -120,7 +120,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Stability.BadMessageTerminated.Chrome"
-    enum="BadMessageReasonChrome" expires_after="2021-03-15">
+    enum="BadMessageReasonChrome" expires_after="2021-07-18">
   <owner>creis@chromium.org</owner>
   <owner>jamescook@chromium.org</owner>
   <summary>
@@ -131,7 +131,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Stability.BadMessageTerminated.Content"
-    enum="BadMessageReasonContent" expires_after="2021-05-09">
+    enum="BadMessageReasonContent" expires_after="2021-07-11">
   <owner>jam@chromium.org</owner>
   <owner>jamescook@chromium.org</owner>
   <summary>
@@ -239,6 +239,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Stability.Counts2" enum="StabilityEventType"
+    expires_after="never">
+<!--
+  expires-never: Critical stability metrics. go/chrome-browser-guardian-metrics
+  -->
+
+  <owner>rkaplow@chromium.org</owner>
+  <owner>chrome-metrics-team@google.com</owner>
+  <summary>
+    Collects various counters related to stability. The majority of them are
+    crash types.
+  </summary>
+</histogram>
+
 <histogram name="Stability.ExitFunnel" units="ms" expires_after="M85">
   <obsolete>
     Removed 10/2020 although this has been dead for many years.
@@ -250,8 +264,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Stability.Experimental.BrowserCrash" enum="Boolean"
+    expires_after="2021-06-15">
+  <owner>asvitkine@chromium.org</owner>
+  <owner>chrome-metrics-team@google.com</owner>
+  <summary>
+    Logged at the same time as the kBrowserCrash bucket of Stability.Counts2,
+    for debugging crbug.com/1176977.
+  </summary>
+</histogram>
+
 <histogram name="Stability.Experimental.Counts" enum="StabilityEventType"
     expires_after="2021-01-15">
+  <obsolete>
+    Removed 01/2021, replaced with Stability.Counts2.
+  </obsolete>
   <owner>rkaplow@chromium.org</owner>
   <owner>chrome-metrics-team@google.com</owner>
   <summary>
@@ -260,8 +287,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Stability.Experimental.Counts2" enum="StabilityEventType"
+    expires_after="2021-06-15">
+  <owner>asvitkine@chromium.org</owner>
+  <owner>chrome-metrics-team@google.com</owner>
+  <summary>
+    Like Stability.Counts2, but logged as a sparse histogram for debugging
+    crbug.com/1176977.
+  </summary>
+</histogram>
+
 <histogram name="Stability.Experimental.PageLoads" enum="StabilityPageLoadType"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>fdoray@chromium.org</owner>
   <owner>chrome-catan@google.com</owner>
   <summary>
@@ -273,6 +310,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Stability.Experimental.SessionId" units="session id"
+    expires_after="2021-06-15">
+  <owner>asvitkine@chromium.org</owner>
+  <owner>chrome-metrics-team@google.com</owner>
+  <summary>
+    Logs the UMA session id as a histogram, to help debug crbug.com/1176977.
+    Logged with MOD 1000 to limit the number of distinct values reported.
+  </summary>
+</histogram>
+
 <histogram name="Stability.Internals.DataDiscardCount" units="counts"
     expires_after="M77">
   <obsolete>
@@ -288,23 +335,23 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Stability.Internals.FileMetricsProvider.BrowserMetrics.UnsentFilesCount"
-    units="counts" expires_after="M87">
+    units="counts" expires_after="M89">
   <owner>michaelbai@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
-    The number of the unsent files at the time the stability recorded.
+    The number of unsent files. Emitted when the stability is recorded.
   </summary>
 </histogram>
 
 <histogram
     name="Stability.Internals.FileMetricsProvider.BrowserMetrics.UnsentSamplesCount"
-    units="samples" expires_after="M87">
+    units="samples" expires_after="M89">
   <owner>michaelbai@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
     The total number of samples that will be lost if ASSOCIATE_INTERNAL_PROFILE
-    isn't enabled since the previous stability recorded. This is different than
-    the previous browser run because one file was just uploaded before the
+    hasn't been enabled since the previous stability recorded. This is different
+    than the previous browser run because one file was just uploaded before the
     stability is recorded.
   </summary>
 </histogram>
@@ -345,10 +392,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Stability.IOS.Experimental.Counts"
+    enum="IOSStabilityUserVisibleTerminationType" expires_after="2021-06-15">
+  <owner>eugenebut@google.com</owner>
+  <owner>olivierrobin@chromium.org</owner>
+  <summary>
+    Recorded when iOS app has started after a crash caused by system signal or
+    hang. Not recorded when app has started after UTE / XTE or started after
+    Chrome update. See go/bling-stability-101 for information about signal
+    crashes, hangs, UTEs and XTEs. This metric intends to complement
+    Stability.Counts. Stability.Counts does include UTEs / XTEs and thus is a
+    noisy metric which significantly overcounts user-visible crashes.
+    Stability.IOS.Experimental.Counts is not recorded on OOM crashes, so it does
+    not represent all user-visible crashes, but OOMs are so rare in Chrome for
+    iOS that Stability.IOS.Experimental.Counts is still a good proxy for
+    user-visible crashes. IOS.MetricKit.ForegroundExitData includes OOM crashes
+    (iOS 14 and higher) and can be used in conjunction with this metric.
+  </summary>
+</histogram>
+
 <histogram name="Stability.iOS.TabCountBefore{Event}" units="tabs"
     expires_after="2021-05-05">
   <owner>djean@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     The number of tabs opened in the previous session when the app starts after
@@ -368,8 +433,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </token>
 </histogram>
 
+<histogram name="Stability.IOS.UTE.AppWillTerminateWasCalledInForeground"
+    enum="Boolean" expires_after="2021-06-06">
+  <owner>olivierrobin@chromium.org</owner>
+  <owner>eugenebut@google.com</owner>
+  <summary>
+    Recorded on iOS when applicationWillTerminate callback is called when app is
+    in the foreground. When this happens the app will not write clean exit
+    beacon and shutdown will not be clean.
+  </summary>
+</histogram>
+
 <histogram name="Stability.iOS.UTE.AvailableStorage" units="KB"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>michaeldo@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
@@ -382,7 +458,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Stability.iOS.UTE.BatteryCharge" units="%"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>michaeldo@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
@@ -395,7 +471,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Stability.iOS.UTE.DeviceThermalState"
-    enum="IOSDeviceThermalState" expires_after="2021-04-04">
+    enum="IOSDeviceThermalState" expires_after="2021-08-09">
   <owner>michaeldo@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
@@ -405,7 +481,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Stability.iOS.UTE.HasPossibleExplanation"
-    enum="BooleanHasPossibleExplanation" expires_after="2021-04-04">
+    enum="BooleanHasPossibleExplanation" expires_after="2021-08-09">
   <owner>michaeldo@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
@@ -416,7 +492,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Stability.iOS.UTE.LowPowerModeEnabled" enum="BooleanEnabled"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>michaeldo@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
@@ -426,8 +502,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Stability.iOS.UTE.MobileSessionAppState" enum="IOSAppState"
-    expires_after="2021-03-28">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-08-01">
+  <owner>justincohen@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     Recorded when app starts after Unexplained Termination Event (UTE) or
@@ -436,9 +512,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Stability.iOS.UTE.MobileSessionAppWillTerminateReceived"
-    enum="AppWillTerminateReceived" expires_after="2021-04-29">
-  <owner>eugenebut@chromium.org</owner>
+<histogram name="Stability.iOS.UTE.MobileSessionAppWillTerminateWasReceived"
+    enum="AppWillTerminateReceived" expires_after="2021-07-11">
+  <owner>eugenebut@google.com</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     Recorded when app starts after Unexplained Termination Event (UTE) or
@@ -451,7 +527,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Stability.iOS.UTE.MobileSessionOOMShutdownHint"
     enum="OOMShutdownHint" expires_after="2021-06-22">
-  <owner>eugenebut@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <owner>sdefresne@chromium.org</owner>
   <summary>
@@ -463,8 +538,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Stability.iOS.UTE.OSRestartedAfterPreviousSession"
-    enum="BooleanRebooted" expires_after="2021-04-04">
-  <owner>eugenebut@chromium.org</owner>
+    enum="BooleanRebooted" expires_after="2021-08-09">
+  <owner>olivierrobin@chromium.org</owner>
   <owner>michaeldo@chromium.org</owner>
   <summary>
     true if OS was restarted after the previous session. Logged on application
@@ -474,7 +549,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Stability.iOS.UTE.OSVersion" enum="VersionComparison"
-    expires_after="2020-12-01">
+    expires_after="2021-05-01">
   <owner>michaeldo@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
@@ -486,7 +561,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Stability.iOS.UTE.TimeBetweenUTEAndNextLaunch" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>michaeldo@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
@@ -497,8 +572,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Stability.MobileSessionShutdownType"
-    enum="MobileSessionShutdownType" expires_after="2021-04-04">
-  <owner>eugenebut@chromium.org</owner>
+    enum="MobileSessionShutdownType" expires_after="2021-08-22">
+  <owner>michaeldo@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     Type of the shutdown. This histogram is recorded at startup and logs a
@@ -515,6 +590,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Stability.RendererUnresponsiveBeforeTermination"
     enum="BooleanUnresponsive" expires_after="2020-04-26">
+  <obsolete>
+    Removed 12/2020.
+  </obsolete>
   <owner>dtapuska@chromium.org</owner>
   <summary>
     If the renderer is considered unresponsive from the browser's perspective
diff --git a/chromium/tools/metrics/histograms/histograms_xml/startup/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/startup/histograms.xml
index 2df2fc22a23..e112120f8f4 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/startup/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/startup/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="Startup.AfterStartupTaskCount" units="units"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>michaeln@chromium.org</owner>
   <summary>
     The number of after-startup tasks that were queued prior to startup
@@ -31,7 +31,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Startup.AfterStartupTaskDelayedUntilTime" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>michaeln@chromium.org</owner>
   <summary>
     Time from the process creation until deferred after-startup tasks began
@@ -40,7 +40,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Startup.Android.CachedFeedVisibilityConsistency"
-    enum="BooleanConsistent" expires_after="2021-06-10">
+    enum="BooleanConsistent" expires_after="2021-08-09">
   <owner>hanxi@chromium.org</owner>
   <owner>spdonghao@chromium.org</owner>
   <owner>wychen@chromium.org</owner>
@@ -56,7 +56,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Startup.Android.Cold.TimeToFirstContentfulPaint"
-    units="ms" expires_after="2021-05-09">
+    units="ms" expires_after="2021-07-11">
   <owner>pasko@chromium.org</owner>
   <owner>alexilin@chromium.org</owner>
   <summary>
@@ -69,7 +69,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Startup.Android.Cold.TimeToFirstNavigationCommit"
-    units="ms" expires_after="2021-05-09">
+    units="ms" expires_after="2021-07-11">
   <owner>pasko@chromium.org</owner>
   <owner>alexilin@chromium.org</owner>
   <summary>
@@ -82,8 +82,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Startup.Android.Cold.TimeToFirstVisibleContent" units="ms"
+    expires_after="2021-08-10">
+  <owner>yfriedman@chromium.org</owner>
+  <owner>yashard@chromium.org</owner>
+  <summary>
+    The time from the activity creation point to the moment Chrome appears
+    ready. The intent is to reflect Clank's perceived cold start performance
+    regardless of different launch paths. The recorded value is the minimum of
+    'Startup.Android.Cold.TimeToFirstNavigationCommit.Tabbed' and
+    'Browser.PaintPreview.TabbedPlayer.TimeToFirstBitmap' metric values.
+  </summary>
+</histogram>
+
 <histogram name="Startup.Android.Cold.TimeToVisibleContent" units="ms"
-    expires_after="2021-04-26">
+    expires_after="2021-06-27">
   <owner>yashard@chromium.org</owner>
   <owner>ckitagawa@chromium.org</owner>
   <summary>
@@ -112,7 +125,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Startup.Android.FeedsLoadingPlaceholderShown.Instant"
-    units="ms" expires_after="2021-06-10">
+    units="ms" expires_after="2021-08-09">
   <owner>hanxi@chromium.org</owner>
   <owner>spdonghao@chromium.org</owner>
   <owner>wychen@chromium.org</owner>
@@ -125,7 +138,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Startup.Android.FeedStreamCreatedTime" units="ms"
-    expires_after="2021-06-10">
+    expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="JavaStartMode" -->
 
   <owner>hanxi@chromium.org</owner>
@@ -139,7 +152,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Startup.Android.FirstDrawCompletedTime" units="ms"
-    expires_after="2021-06-10">
+    expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="JavaStartMode" -->
 
   <owner>hanxi@chromium.org</owner>
@@ -151,7 +164,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Startup.Android.GURLEnsureMainDexInitialized" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>mthiesse@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
   <summary>
@@ -161,7 +174,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Startup.Android.SingleTabTitleAvailableTime"
-    units="ms" expires_after="2021-06-10">
+    units="ms" expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="JavaStartMode" -->
 
   <owner>hanxi@chromium.org</owner>
@@ -176,7 +189,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Startup.Android.StartupTabPreloader.TabLoaded" units="Boolean"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>skyostil@chromium.org</owner>
   <summary>
     Android: Whether or not creation of a profile lead to the
@@ -211,7 +224,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Startup.Android.TimeToGTSFirstMeaningfulPaint" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>yusufo@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
   <summary>
@@ -224,7 +237,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Startup.Android.TimeToGTSFirstMeaningfulPaint.Cold" units="ms"
-    expires_after="2021-04-25">
+    expires_after="2021-07-27">
   <owner>yusufo@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
   <summary>
@@ -237,7 +250,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Startup.Android.TimeToGTSFirstMeaningfulPaint.Warm" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>yusufo@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
   <summary>
@@ -260,7 +273,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Startup.BringToForegroundReason"
-    enum="BooleanBringToForegroundReason" expires_after="2021-03-15">
+    enum="BooleanBringToForegroundReason" expires_after="2021-07-18">
   <owner>peter@chromium.org</owner>
   <summary>
     Records the cause, each time Chrome is brought to the foreground. Currently
@@ -270,7 +283,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Startup.BrowserMainRunnerImplInitializeLongTime" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-07-27">
   <owner>robliao@chromium.org</owner>
   <summary>
     The amount of time that elapsed during BrowserMainRunnerImpl::Initialize.
@@ -362,7 +375,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Startup.BrowserWindow.FirstPaint" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>sebmarchand@chromium.org</owner>
   <owner>mblsha@yandex-team.ru</owner>
   <summary>
@@ -377,6 +390,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Startup.BrowserWindow.FirstPaint.CompositingEnded" units="ms"
     expires_after="2020-04-26">
+  <obsolete>
+    Removed 02/2021.
+  </obsolete>
   <owner>sebmarchand@chromium.org</owner>
   <owner>mblsha@yandex-team.ru</owner>
   <summary>
@@ -407,9 +423,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Startup.ColdStartFromProcessCreationTime" units="ms"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>djean@chromium.org</owner>
-  <owner>eugenebut@chromium.org</owner>
+  <owner>olivierrobin@chromium.org</owner>
   <summary>
     The duration of all initializations from process creation time to UI ready.
     This includes code loading, static initializers and the execution time
@@ -551,8 +567,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Startup.MobileSessionStartAction"
-    enum="MobileSessionStartAction" expires_after="2021-05-02">
-  <owner>eugenebut@chromium.org</owner>
+    enum="MobileSessionStartAction" expires_after="2021-07-04">
+  <owner>thegreenfrog@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     The action requested on the application startup when called from another app
@@ -561,8 +577,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Startup.MobileSessionStartFromApps"
-    enum="MobileSessionCallerApp" expires_after="2021-05-02">
-  <owner>eugenebut@chromium.org</owner>
+    enum="MobileSessionCallerApp" expires_after="2021-07-04">
+  <owner>thegreenfrog@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>The calling application (if any).</summary>
 </histogram>
@@ -631,7 +647,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Startup.PreMainMessageLoopRunImplLongTime" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>rkaplow@chromium.org</owner>
   <summary>
     The amount of time that elapsed during
@@ -648,7 +664,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Startup.Temperature" enum="StartupTemperature"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
 <!-- expires-after: Diagnosis metric for changes in StartupTemperature suffix.
      Shouldn't truly expire but kColdStartHardFaultCountThreshold should be
      surveyed yearly. -->
diff --git a/chromium/tools/metrics/histograms/histograms_xml/subresource/OWNERS b/chromium/tools/metrics/histograms/histograms_xml/subresource/OWNERS
index 0ed37e863bb..75fb842e242 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/subresource/OWNERS
+++ b/chromium/tools/metrics/histograms/histograms_xml/subresource/OWNERS
@@ -4,4 +4,5 @@
 #  - You work in the same area as them.
 #  - They are already a good reviewer for the non-metrics part of the CL.
 # See tools/metrics/histograms/OWNERS for details.
+csharrison@chromium.org
 tbansal@chromium.org
diff --git a/chromium/tools/metrics/histograms/histograms_xml/subresource/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/subresource/histograms.xml
index f1d208dd968..0b49e6debc3 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/subresource/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/subresource/histograms.xml
@@ -22,9 +22,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="SubresourceFilter.Actions2" enum="SubresourceFilterActions2"
-    expires_after="2021-04-18">
-  <owner>ericrobinson@google.com</owner>
-  <owner>jkarlin@chromium.org</owner>
+    expires_after="2021-08-22">
+  <owner>alexmt@chromium.org</owner>
   <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     Counts of various UI and user action events related to the
@@ -33,6 +32,167 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="SubresourceFilter.CnameAlias.Browser.HadAliases"
+    units="BooleanHadAliases" expires_after="2021-06-18">
+  <owner>cammie@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
+  <summary>
+    Records whether or not a given NavigationRequest has a nonempty vector of
+    CNAME aliases. Only recorded if
+    features::kSendCnameAliasesToSubresourceFilterFromBrowser is enabled.
+    Recorded in a method called in the SubframeNavigationFilteringThrottle's
+    destructor.
+  </summary>
+</histogram>
+
+<histogram name="SubresourceFilter.CnameAlias.Browser.InvalidCount"
+    units="count" expires_after="2021-06-18">
+  <owner>cammie@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
+  <summary>
+    Counts the number of invalid CNAME aliases seen for a NavigationRequest by
+    the SubframeNavigationFilteringThrottle. Only recorded if
+    features::kSendCnameAliasesToSubresourceFilterFromBrowser is enabled and the
+    request has a nonempty vector of CNAME aliases. Recorded in a method called
+    in the SubframeNavigationFilteringThrottle's destructor.
+  </summary>
+</histogram>
+
+<histogram name="SubresourceFilter.CnameAlias.Browser.ListLength"
+    units="length" expires_after="2021-06-18">
+  <owner>cammie@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
+  <summary>
+    Records the lengths of each CNAME aliases vector passed to the
+    SubframeNavigationFilteringThrottle, not including empty alias vectors. Only
+    recorded if features::kSendCnameAliasesToSubresourceFilterFromBrowser is
+    enabled and the request has a nonempty vector of CNAME aliases. Recorded in
+    a method called in the SubframeNavigationFilteringThrottle's destructor.
+  </summary>
+</histogram>
+
+<histogram name="SubresourceFilter.CnameAlias.Browser.RedundantCount"
+    units="count" expires_after="2021-06-18">
+  <owner>cammie@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
+  <summary>
+    Counts the number of CNAME aliases seen by the
+    SubframeNavigationFilteringThrottle that match the host of the requested
+    URL. Only recorded if
+    features::kSendCnameAliasesToSubresourceFilterFromBrowser is enabled and the
+    request has a nonempty vector of CNAME aliases. Recorded in a method called
+    in the SubframeNavigationFilteringThrottle's destructor.
+  </summary>
+</histogram>
+
+<histogram
+    name="SubresourceFilter.CnameAlias.Browser.WasAdTaggedBasedOnAliasCount"
+    units="count" expires_after="2021-06-18">
+  <owner>cammie@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
+  <summary>
+    Counts the number of CNAME aliases seen for a given NavigationRequest for
+    which LoadPolicy::kWouldDisallow was returned due to an alias match. Only
+    recorded if features::kSendCnameAliasesToSubresourceFilterFromBrowser is
+    enabled and the request has a nonempty vector of CNAME aliases. Recorded in
+    a method called in the SubframeNavigationFilteringThrottle's destructor.
+  </summary>
+</histogram>
+
+<histogram
+    name="SubresourceFilter.CnameAlias.Browser.WasBlockedBasedOnAliasCount"
+    units="count" expires_after="2021-06-18">
+  <owner>cammie@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
+  <summary>
+    Counts the number of CNAME aliases seen for a given NavigationRequest for
+    which LoadPolicy::kDisallow was returned due to an alias match. Only
+    recorded if features::kSendCnameAliasesToSubresourceFilterFromBrowser is
+    enabled and the request has a nonempty vector of CNAME aliases. Recorded in
+    a method called in the SubframeNavigationFilteringThrottle's destructor.
+  </summary>
+</histogram>
+
+<histogram name="SubresourceFilter.CnameAlias.Renderer.HadAliases"
+    units="BooleanHadAliases" expires_after="2021-06-18">
+  <owner>cammie@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
+  <summary>
+    Records whether or not a given ResourceLoader's ResourceRequest has a
+    nonempty vector of CNAME aliases. Only recorded if
+    features::kSendCnameAliasesToSubresourceFilterFromRenderer is enabled.
+    Recorded in a method called by
+    blink::ResourceLoader::DidReceiveResponseInternal.
+  </summary>
+</histogram>
+
+<histogram name="SubresourceFilter.CnameAlias.Renderer.InvalidCount"
+    units="count" expires_after="2021-06-18">
+  <owner>cammie@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
+  <summary>
+    Counts the number of invalid CNAME aliases encountered by the
+    ResourceLoader, as these are not sent to the SubResourceFilter. Only
+    recorded if features::kSendCnameAliasesToSubresourceFilterFromRenderer is
+    enabled and the request has a nonempty vector of CNAME aliases. Recorded in
+    a method called by blink::ResourceLoader::DidReceiveResponseInternal.
+  </summary>
+</histogram>
+
+<histogram name="SubresourceFilter.CnameAlias.Renderer.ListLength"
+    units="length" expires_after="2021-06-18">
+  <owner>cammie@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
+  <summary>
+    Records the length of the CNAME aliases vector passed to the ResourceLoader,
+    not including empty alias vectors. Only recorded if
+    features::kSendCnameAliasesToSubresourceFilterFromRenderer is enabled and
+    the request has a nonempty vector of CNAME aliases. Recorded in a method
+    called by blink::ResourceLoader::DidReceiveResponseInternal.
+  </summary>
+</histogram>
+
+<histogram name="SubresourceFilter.CnameAlias.Renderer.RedundantCount"
+    units="count" expires_after="2021-06-18">
+  <owner>cammie@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
+  <summary>
+    Counts the number of CNAME aliases encountered by the ResourceLoader that
+    match the host of the requested URL (as well as the number of any that the
+    match the host of the original URL in the case of redirects), as these
+    aliases are not sent to the SubResourceFilter. Only recorded if
+    features::kSendCnameAliasesToSubresourceFilterFromRenderer is enabled and
+    the request has a nonempty vector of CNAME aliases. Recorded in a method
+    called by blink::ResourceLoader::DidReceiveResponseInternal.
+  </summary>
+</histogram>
+
+<histogram name="SubresourceFilter.CnameAlias.Renderer.WasAdTaggedBasedOnAlias"
+    units="BooleanTagged" expires_after="2021-06-18">
+  <owner>cammie@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
+  <summary>
+    Records whether or not a given ResourceLoader's ResourceRequest has CNAME
+    alias for which the returned LoadPolicy was LoadPolicy::kWouldDisallow. Only
+    recorded if features::kSendCnameAliasesToSubresourceFilterFromRenderer is
+    enabled and the request has a nonempty vector of CNAME aliases. Recorded in
+    a method called by blink::ResourceLoader::DidReceiveResponseInternal.
+  </summary>
+</histogram>
+
+<histogram name="SubresourceFilter.CnameAlias.Renderer.WasBlockedBasedOnAlias"
+    units="BooleanBlocked" expires_after="2021-06-18">
+  <owner>cammie@chromium.org</owner>
+  <owner>chrome-ads-histograms@google.com</owner>
+  <summary>
+    Records whether or not a given ResourceLoader's ResourceRequest has CNAME
+    alias for which the returned LoadPolicy was LoadPolicy::kDisallow. Only
+    recorded if features::kSendCnameAliasesToSubresourceFilterFromRenderer is
+    enabled and the request has a nonempty vector of CNAME aliases. Recorded in
+    a method called by the destructor of blink::ResourceLoader.
+  </summary>
+</histogram>
+
 <histogram name="SubresourceFilter.DocumentLoad.Activation.CPUDuration"
     units="microseconds" expires_after="M77">
   <owner>pkalinnikov@chromium.org</owner>
@@ -83,8 +243,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SubresourceFilter.DocumentLoad.SubframeFilteringDelay.Allowed"
-    units="microseconds" expires_after="M92">
-  <owner>ericrobinson@google.com</owner>
+    units="microseconds" expires_after="2021-08-09">
+  <owner>alexmt@chromium.org</owner>
   <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     Records the total time a subframe navigation was delayed while calculating
@@ -99,7 +259,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="SubresourceFilter.DocumentLoad.SubframeFilteringDelay.Disallowed2"
     units="microseconds" expires_after="M92">
-  <owner>ericrobinson@google.com</owner>
+  <owner>alexmt@chromium.org</owner>
   <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     Records the total time a subframe navigation was delayed while calculating
@@ -114,7 +274,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="SubresourceFilter.DocumentLoad.SubframeFilteringDelay.WouldDisallow"
     units="microseconds" expires_after="M92">
-  <owner>ericrobinson@google.com</owner>
+  <owner>alexmt@chromium.org</owner>
   <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     Records the total time a subframe navigation was delayed while calculating
@@ -151,8 +311,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SubresourceFilter.IndexRuleset.Verify.Status"
-    enum="SubresourceFilterVerifyStatus" expires_after="2021-04-04">
-  <owner>ericrobinson@chromium.org</owner>
+    enum="SubresourceFilterVerifyStatus" expires_after="2021-08-08">
+  <owner>alexmt@chromium.org</owner>
   <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     The result of the IndexRulesetMatcher Verify method. Either pass if both the
@@ -166,7 +326,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="SubresourceFilter.IndexRuleset.Verify2.WallDuration"
     units="ms" expires_after="M92">
-  <owner>ericrobinson@google.com</owner>
+  <owner>alexmt@chromium.org</owner>
   <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     The total time it took to verify the indexed ruleset in the browser process.
@@ -189,7 +349,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="SubresourceFilter.MainFrameLoad.RulesetIsAvailableAnyActivationLevel"
-    enum="BooleanAvailable" expires_after="2021-03-15">
+    enum="BooleanAvailable" expires_after="2021-08-09">
   <owner>alexmt@chromium.org</owner>
   <owner>jkarlin@chromium.org</owner>
   <summary>
@@ -250,7 +410,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SubresourceFilter.PageLoad.ActivationDecision"
-    enum="SubresourceFilterActivationDecision" expires_after="M90">
+    enum="SubresourceFilterActivationDecision" expires_after="2021-08-22">
   <owner>jkarlin@chromium.org</owner>
   <owner>chrome-ads-histograms@google.com</owner>
   <summary>
@@ -261,8 +421,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SubresourceFilter.PageLoad.ActivationList"
-    enum="ActivationList" expires_after="2021-05-09">
-  <owner>ericrobinson@google.com</owner>
+    enum="ActivationList" expires_after="2021-07-11">
+  <owner>alexmt@chromium.org</owner>
   <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     The ActivationList or NONE that the main frame navigation matched with.
@@ -271,8 +431,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SubresourceFilter.PageLoad.ActivationState"
-    enum="SubresourceFilterActivationState" expires_after="2021-05-09">
-  <owner>ericrobinson@google.com</owner>
+    enum="SubresourceFilterActivationState" expires_after="2021-07-11">
+  <owner>alexmt@chromium.org</owner>
   <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     Whenever a document load is committed in a main frame, records whether
@@ -304,7 +464,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SubresourceFilter.PageLoad.NumSubresourceLoads.Disallowed"
-    units="resource loads" expires_after="M92">
+    units="resource loads" expires_after="2021-08-09">
   <owner>jkarlin@chromium.org</owner>
   <owner>chrome-ads-histograms@google.com</owner>
   <summary>
@@ -328,7 +488,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SubresourceFilter.PageLoad.NumSubresourceLoads.MatchedRules"
-    units="resource loads" expires_after="M92">
+    units="resource loads" expires_after="2021-08-09">
   <owner>jkarlin@chromium.org</owner>
   <owner>chrome-ads-histograms@google.com</owner>
   <summary>
@@ -352,7 +512,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="SubresourceFilter.PageLoad.SafeBrowsingDelay" units="ms"
     expires_after="M92">
-  <owner>ericrobinson@google.com</owner>
+  <owner>alexmt@chromium.org</owner>
   <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     The navigation delay imposed by the subresource filter on a given navigation
@@ -419,8 +579,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SubresourceFilter.SafeBrowsing.TotalCheckTime" units="ms"
-    expires_after="M92">
-  <owner>ericrobinson@chromium.org</owner>
+    expires_after="2021-08-08">
+  <owner>alexmt@chromium.org</owner>
   <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     The time an individual Safe Browsing URL check took before finishing,
@@ -476,8 +636,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SubresourceFilter.WriteRuleset.Result"
-    enum="SubresourceFilterWriteRulesetResult" expires_after="M88">
-  <owner>ericrobinson@chromium.org</owner>
+    enum="SubresourceFilterWriteRulesetResult" expires_after="M92">
+  <owner>alexmt@chromium.org</owner>
   <owner>chrome-ads-histograms@google.com</owner>
   <summary>
     Whether indexing a version of the ruleset and writing it to disk succeeded,
@@ -486,8 +646,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="SubresourceRedirect.Blink.Ineligibility"
+    enum="BlinkSubresourceRedirectIneligibility" expires_after="2021-08-09">
+  <owner>rajendrant@chromium.org</owner>
+  <owner>mcrouse@chromium.org</owner>
+  <summary>
+    Records the different reasons subresource redirect was disabled by Blink.
+    Recorded for each subresource that was disabled by Blink.
+  </summary>
+</histogram>
+
 <histogram name="SubresourceRedirect.BypassDuration" units="ms"
-    expires_after="M90">
+    expires_after="M92">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -500,7 +670,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SubresourceRedirect.CompressionAttempt.ResponseCode"
-    enum="HttpResponseCode" expires_after="M90">
+    enum="HttpResponseCode" expires_after="2021-08-22">
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -512,7 +682,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SubresourceRedirect.CompressionAttempt.ServerResponded"
-    enum="Boolean" expires_after="M90">
+    enum="Boolean" expires_after="M92">
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -523,7 +693,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SubresourceRedirect.CompressionFetchTimeout" enum="Boolean"
-    expires_after="M90">
+    expires_after="M92">
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -533,7 +703,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SubresourceRedirect.DidCompress.BytesSaved" units="bytes"
-    expires_after="M90">
+    expires_after="2021-08-08">
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -543,7 +713,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SubresourceRedirect.DidCompress.CompressionPercent" units="%"
-    expires_after="M90">
+    expires_after="2021-08-08">
   <owner>robertogden@chromium.org</owner>
   <owner>tbansal@chromium.org</owner>
   <summary>
@@ -553,7 +723,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="SubresourceRedirect.ImageCompressionNotificationInfoBar"
-    enum="HttpsImageCompressionInfoBarAction" expires_after="2021-04-04">
+    enum="HttpsImageCompressionInfoBarAction" expires_after="2021-08-09">
   <owner>rajendrant@chromium.org</owner>
   <owner>src/components/data_reduction_proxy/OWNERS</owner>
   <summary>
@@ -562,8 +732,33 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="SubresourceRedirect.LitePagesService.BypassResult"
+    enum="Boolean" expires_after="M92">
+  <owner>rajendrant@chromium.org</owner>
+  <owner>mcrouse@chromium.org</owner>
+  <summary>
+    Records whether the LitePages service fetches were bypassed or not. Recorded
+    once per LitePages server accesss. Currently LitePages service is used for
+    fetching compressed images and robots.txt rules.
+  </summary>
+</histogram>
+
+<histogram name="SubresourceRedirect.LoginRobotsDeciderAgent.RedirectResult"
+    enum="SubresourceRedirectRedirectResult" expires_after="M92">
+  <owner>rajendrant@chromium.org</owner>
+  <owner>mcrouse@chromium.org</owner>
+  <summary>
+    Records the different results possible for subresource redirection, such as
+    redirectable or different reasons of ineligibility. Recorded once for each
+    image request.
+  </summary>
+</histogram>
+
 <histogram name="SubresourceRedirect.PageLoad.BypassResult" enum="Boolean"
-    expires_after="M90">
+    expires_after="M92">
+  <obsolete>
+    Replaced by SubresourceRedirect.LitePagesService.BypassResult on 11/2020
+  </obsolete>
   <owner>rajendrant@chromium.org</owner>
   <owner>mcrouse@chromium.org</owner>
   <summary>
@@ -606,6 +801,47 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="SubresourceRedirect.RobotsRules.Browser.InMemoryCacheHit"
+    units="BooleanCacheHit" expires_after="M92">
+  <owner>rajendrant@chromium.org</owner>
+  <owner>mcrouse@chromium.org</owner>
+  <summary>
+    Records how often the origin robots rules were found in the in-memory
+    browser cache. Recorded for every robots rules request from renderer that is
+    eligible to check the in-memory cache.
+  </summary>
+</histogram>
+
+<histogram name="SubresourceRedirect.RobotsRulesFetcher.CacheHit" units="ms"
+    expires_after="M92">
+  <owner>rajendrant@chromium.org</owner>
+  <owner>mcrouse@chromium.org</owner>
+  <summary>
+    Records whether LitePages robots rules was fetched from Chrome network
+    cache. Recorded for every fetch.
+  </summary>
+</histogram>
+
+<histogram name="SubresourceRedirect.RobotsRulesFetcher.NetErrorCode"
+    enum="NetErrorCodes" expires_after="M92">
+  <owner>rajendrant@chromium.org</owner>
+  <owner>mcrouse@chromium.org</owner>
+  <summary>
+    Net error codes for the LitePages robots rules fetcher. Recorded on every
+    fetch after completion or failure.
+  </summary>
+</histogram>
+
+<histogram name="SubresourceRedirect.RobotsRulesFetcher.ResponseCode"
+    units="HttpResponseCode" expires_after="M92">
+  <owner>rajendrant@chromium.org</owner>
+  <owner>mcrouse@chromium.org</owner>
+  <summary>
+    HTTP response code for the LitePages robots rules fetcher. Recorded on every
+    fetch after completion or failure.
+  </summary>
+</histogram>
+
 </histograms>
 
 </histogram-configuration>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/sync/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/sync/histograms.xml
index c3eaa0260f4..a694fcd3f2a 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/sync/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/sync/histograms.xml
@@ -59,8 +59,22 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Sync.BookmarkEntityReuploadNeeded.On{UpdateType}"
+    enum="Boolean" expires_after="M92">
+  <owner>mastiz@chromium.org</owner>
+  <owner>rushans@google.com</owner>
+  <summary>
+    Records if the entity is marked to be reuploaded. It is recorded on each
+    incoming bookmark update from the server during {UpdateType}.
+  </summary>
+  <token key="UpdateType">
+    <variant name="IncrementalUpdate" summary="incremental update"/>
+    <variant name="InitialMerge" summary="initial merge"/>
+  </token>
+</histogram>
+
 <histogram name="Sync.BookmarkGUIDSource2" enum="BookmarkGUIDSource"
-    expires_after="M89">
+    expires_after="2021-07-13">
   <owner>rushans@google.com</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -74,6 +88,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Sync.BookmarkModelMetadataClientTagState"
     enum="SyncBookmarkModelMetadataClientTagState" expires_after="M89">
+  <obsolete>
+    Deprecated 2021-02.
+  </obsolete>
   <owner>mamir@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -84,7 +101,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.BookmarksGUIDDuplicates" enum="BookmarksGUIDDuplicates"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>mastiz@chromium.org</owner>
   <owner>rushans@google.com</owner>
   <summary>
@@ -95,8 +112,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.BookmarksModelMetadataCorruptionReason"
-    enum="SyncBookmarkModelMetadataCorruptionReason" expires_after="M89">
-  <owner>mamir@chromium.org</owner>
+    enum="SyncBookmarkModelMetadataCorruptionReason" expires_after="2021-08-09">
+  <owner>rushans@google.com</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
     The reason why the persisted metadata for a bookmark model is considered
@@ -108,6 +125,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Sync.BookmarksWithoutFullTitle.OnInitialMerge"
     units="bookmarks" expires_after="M89">
+  <obsolete>
+    Removed as of M89.
+  </obsolete>
   <owner>rushans@google.com</owner>
   <owner>mastiz@chromiumg.org</owner>
   <summary>
@@ -118,6 +138,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Sync.BookmarksWithoutFullTitle.OnRemoteUpdate"
     units="bookmarks" expires_after="M89">
+  <obsolete>
+    Removed as of M89.
+  </obsolete>
   <owner>rushans@google.com</owner>
   <owner>mastiz@chromiumg.org</owner>
   <summary>
@@ -127,7 +150,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.CommitResponse" enum="SyncerErrorValues"
-    expires_after="2021-05-27">
+    expires_after="2021-07-27">
 <!-- Name completed by histogram_suffixes name="SyncModelType" -->
 
   <owner>rushans@google.com</owner>
@@ -140,7 +163,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.ConfigureDataTypeManagerOption"
-    enum="SyncFeatureOrTransport" expires_after="2021-05-09">
+    enum="SyncFeatureOrTransport" expires_after="2021-07-11">
   <owner>treib@chromium.org</owner>
   <summary>
     Whether the full Sync feature or only the Sync transport layer is being
@@ -152,7 +175,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.ConfigureDataTypes" enum="SyncModelTypes"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>mastiz@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -177,7 +200,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Sync.ConfigureTime_Initial" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>victorvianna@google.com</owner>
   <owner>jkrcal@chromium.org</owner>
   <summary>
@@ -187,7 +210,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Sync.ConfigureTime_Subsequent" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>victorvianna@google.com</owner>
   <owner>jkrcal@chromium.org</owner>
   <summary>
@@ -198,6 +221,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Sync.CookieJarEmptyOnMismatch" enum="BooleanEmpty"
     expires_after="M77">
+  <obsolete>
+    Expired in M77.
+  </obsolete>
   <owner>zea@chromium.org</owner>
   <summary>
     Whether the gaia cookie jar was empty. Recorded on every SESSIONS commit
@@ -208,6 +234,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Sync.CookieJarMatchOnNavigation" enum="BooleanMatched"
     expires_after="M77">
+  <obsolete>
+    Expired in M77.
+  </obsolete>
   <owner>zea@chromium.org</owner>
   <summary>
     Whether the gaia cookie jar included the signed in user (matched) or not.
@@ -218,7 +247,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="Sync.Crypto.CustomPassphraseKeyDerivationMethodOnNewPassphrase"
     enum="SyncCustomPassphraseKeyDerivationMethodState"
-    expires_after="2021-05-09">
+    expires_after="2021-08-09">
   <owner>vitaliii@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -232,7 +261,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histogram
     name="Sync.Crypto.CustomPassphraseKeyDerivationMethodOnSuccessfulDecryption"
     enum="SyncCustomPassphraseKeyDerivationMethodState"
-    expires_after="2021-05-09">
+    expires_after="2021-07-27">
   <owner>vitaliii@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -246,7 +275,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Sync.Crypto.CustomPassphraseKeyDerivationMethodStateOnStartup"
     enum="SyncCustomPassphraseKeyDerivationMethodState"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>vitaliii@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -256,7 +285,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Sync.Crypto.NigoriKeyDerivationDuration"
-    units="ms" expires_after="2021-04-04">
+    units="ms" expires_after="2021-08-09">
   <owner>vitaliii@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -267,7 +296,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.CryptographerPendingKeys"
-    enum="SyncCryptographerPendingKeysState" expires_after="2021-04-18">
+    enum="SyncCryptographerPendingKeysState" expires_after="2021-08-01">
   <owner>mastiz@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -286,7 +315,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.CustomEncryption" enum="SyncCustomEncryptionEvent"
-    expires_after="2021-01-03">
+    expires_after="2022-01-03">
   <owner>mastiz@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -296,7 +325,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Sync.CustomSync2" enum="SyncModelTypes" expires_after="M90">
+<histogram name="Sync.CustomSync2" enum="SyncModelTypes"
+    expires_after="2020-12-16">
+  <obsolete>
+    Replaced with Sync.CustomSync3 in 12/2020 (M89) due to crbug.com/1154396.
+  </obsolete>
   <owner>treib@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -307,8 +340,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Sync.CustomSync3" enum="SyncModelTypes"
+    expires_after="2021-12-16">
+  <owner>treib@chromium.org</owner>
+  <owner>mastiz@chromium.org</owner>
+  <summary>
+    For users who have *not* selected the &quot;Sync Everything&quot; option,
+    this records all the data types they have selected to sync. Samples are
+    taken every time the Sync data types are (re)configured, which typically
+    happens during startup and when the user changes any Sync settings.
+
+    NOTE: this may stop showing OS datatypes like WIFI_CONFIGURATIONS once the
+    SplitSettingsSync feature is enabled. New metrics will be added for those
+    (crbug.com/1105956).
+  </summary>
+</histogram>
+
 <histogram name="Sync.DataTypeRunFailures2" enum="SyncModelTypes"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>jkrcal@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -319,7 +368,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.DataTypeStartFailures2" enum="SyncModelTypes"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>jkrcal@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -332,9 +381,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Sync.DeviceCount2" units="units" expires_after="2021-05-02">
+<histogram name="Sync.DeviceCount2" units="devices" expires_after="never">
+<!-- expires-never: used internally for filtering -->
+
   <owner>mastiz@chromium.org</owner>
   <owner>jkrcal@chromium.org</owner>
+  <owner>chrome-metrics-team@google.com</owner>
   <summary>
     The largest number of active and concurrently syncing devices known to any
     profile. May be 0 when there are no signed in/syncing profiles open. Logged
@@ -343,7 +395,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.DuplicateBookmarkEntityOnRemoteUpdateCondition"
-    enum="DuplicateBookmarkEntityOnRemoteUpdateCondition" expires_after="M89">
+    enum="DuplicateBookmarkEntityOnRemoteUpdateCondition"
+    expires_after="2021-07-13">
   <owner>rushans@google.com</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -378,7 +431,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.InitialState" enum="SyncInitialState"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>treib@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -396,14 +449,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <!-- expires-never: For monitoring FCM based invalidations. -->
 
   <owner>melandory@chromium.org</owner>
+  <owner>treib@chromium.org</owner>
   <summary>
     Histogram tracks the number of invalidations received per sync data type.
   </summary>
 </histogram>
 
 <histogram name="Sync.InvalidBookmarkSpecifics"
-    enum="InvalidBookmarkSpecificsError" expires_after="2020-12-16">
-  <owner>mamir@chromium.org</owner>
+    enum="InvalidBookmarkSpecificsError" expires_after="2021-06-01">
   <owner>mastiz@chromium.org</owner>
   <owner>rushans@google.com</owner>
   <summary>
@@ -413,7 +466,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.KeystoreDecryptionFailed"
-    enum="SyncKeystoreDecryptionFailure" expires_after="2021-06-01">
+    enum="SyncKeystoreDecryptionFailure" expires_after="2021-08-15">
   <owner>mmoskvitin@google.com</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -422,7 +475,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.Local.Enabled" enum="BooleanEnabled"
-    expires_after="2021-05-31">
+    expires_after="2021-08-01">
   <owner>pastarmovj@chromium.org</owner>
   <summary>
     Tracks the number of times the local sync backend was enabled by the user.
@@ -437,6 +490,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Sync.Local.ReadPlatformFileError" enum="PlatformFileError"
+    expires_after="2021-05-31">
+  <owner>pastarmovj@chromium.org</owner>
+  <owner>igorruvinov@chromium.org</owner>
+  <summary>
+    Error code describing failure to read persisted sync state from local file.
+    Recorded when an error is encountered during opening or reading of the local
+    sync state file.
+  </summary>
+</histogram>
+
 <histogram name="Sync.Local.RequestTypeOnError" enum="SyncRequestType"
     expires_after="2021-05-31">
   <owner>pastarmovj@chromium.org</owner>
@@ -454,7 +518,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.LocalSyncTransportDataStartupState"
-    enum="LocalSyncTransportDataStartupState" expires_after="2021-01-17">
+    enum="LocalSyncTransportDataStartupState" expires_after="2021-07-13">
   <owner>rushans@google.com</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -479,8 +543,35 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Sync.ModelTypeBlockedDueToUndecryptableUpdate"
+    enum="SyncModelTypes" expires_after="2021-08-09">
+  <owner>victorvianna@google.com</owner>
+  <owner>mastiz@chromium.org</owner>
+  <summary>
+    Recorded on every GetUpdatesResponse if the data type is blocked because due
+    to the existence of undecryptable updates sent by the server. This is *not*
+    recorded for the cases where sync encryption is in a valid pending state,
+    e.g. user hasn't entered their passphrase yet.
+  </summary>
+</histogram>
+
+<histogram
+    name="Sync.ModelTypeBlockedDueToUndecryptableUpdate.SomeKeysAvailable"
+    enum="SyncModelTypes" expires_after="2021-08-18">
+  <owner>mastiz@chromium.org</owner>
+  <owner>mmoskvitin@google.com</owner>
+  <owner>victorvianna@google.com</owner>
+  <summary>
+    See Sync.ModelTypeBlockedDueToUndecryptableUpdate. This records the subset
+    of samples of that histogram where at least some of the blocking updates
+    could have been decrypted with keys known to the client. This happens if the
+    data type didn't try to decrypt the updates because it didn't expect to
+    receive encrypted ones.
+  </summary>
+</histogram>
+
 <histogram base="true" name="Sync.ModelTypeConfigurationTime.Ephemeral"
-    units="ms" expires_after="2021-04-25">
+    units="ms" expires_after="2021-06-27">
   <owner>jkrcal@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -493,7 +584,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Sync.ModelTypeConfigurationTime.Persistent"
-    units="ms" expires_after="2021-05-01">
+    units="ms" expires_after="2021-08-01">
   <owner>jkrcal@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -506,7 +597,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Sync.ModelTypeCount4" units="entries"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>jkrcal@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -519,7 +610,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Sync.ModelTypeEntityChange3"
-    enum="SyncEntityChange" expires_after="2021-04-11">
+    enum="SyncEntityChange" expires_after="2021-08-15">
   <owner>jkrcal@chromium.org</owner>
   <summary>
     Recorded once for every sync entity change (whenever it is commited to the
@@ -530,7 +621,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Sync.ModelTypeErrorSite"
-    enum="SyncModelTypeErrorSite" expires_after="2021-04-04">
+    enum="SyncModelTypeErrorSite" expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="SyncModelType" -->
 
   <owner>jkrcal@chromium.org</owner>
@@ -543,7 +634,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Sync.ModelTypeMemoryKB" units="KB"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>mastiz@chromium.org</owner>
   <owner>jkrcal@chromium.org</owner>
   <summary>
@@ -554,7 +645,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Sync.ModelTypeOrphanMetadata"
-    enum="SyncModelTypes" expires_after="2021-05-01">
+    enum="SyncModelTypes" expires_after="2021-07-04">
   <owner>jkrcal@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -564,7 +655,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Sync.ModelTypeStoreCommitWriteBatchOutcome"
-    enum="LevelDBStatus" expires_after="2021-04-04">
+    enum="LevelDBStatus" expires_after="2021-08-09">
 <!-- Name completed by histogram_suffixes name="SyncModelType" -->
 
   <owner>qjw@chromium.org</owner>
@@ -590,8 +681,56 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram base="true"
+    name="Sync.ModelTypeTimeUntilEncryptionKeyFound.Bookmarks"
+    units="GetUpdatesResponses" expires_after="2021-05-04">
+  <owner>victorvianna@google.com</owner>
+  <owner>mastiz@chromium.org</owner>
+  <summary>
+    See ModelTypeTimeUntilEncryptionKeyFound. This version serves only to
+    visualize M88 data, since the recording code for that version contains a
+    typo in the histogram suffix (cf. crbug.com/1173986).
+  </summary>
+</histogram>
+
+<histogram base="true"
+    name="Sync.ModelTypeTimeUntilEncryptionKeyFound.Passwords"
+    units="GetUpdatesResponses" expires_after="2021-05-04">
+  <owner>victorvianna@google.com</owner>
+  <owner>mastiz@chromium.org</owner>
+  <summary>
+    See ModelTypeTimeUntilEncryptionKeyFound. This version serves only to
+    visualize M88 data, since the recording code for that version contains a
+    typo in the histogram suffix (cf. crbug.com/1173986).
+  </summary>
+</histogram>
+
+<histogram base="true"
+    name="Sync.ModelTypeTimeUntilEncryptionKeyFound.Sessions"
+    units="GetUpdatesResponses" expires_after="2021-05-04">
+  <owner>victorvianna@google.com</owner>
+  <owner>mastiz@chromium.org</owner>
+  <summary>
+    See ModelTypeTimeUntilEncryptionKeyFound. This version serves only to
+    visualize M88 data, since the recording code for that version contains a
+    typo in the histogram suffix (cf. crbug.com/1173986).
+  </summary>
+</histogram>
+
+<histogram base="true" name="Sync.ModelTypeUndecryptablePendingUpdatesDropped"
+    units="SyncEntity" expires_after="2021-06-05">
+  <owner>victorvianna@google.com</owner>
+  <owner>mastiz@chromium.org</owner>
+  <summary>
+    Records the number of entities dropped when the data type decided that a
+    certain encryption key was lost and dropped all pending updates encrypted
+    with it. Future updates encrypted with such key will also be ignored by the
+    data type, but those are *not* counted in this metric.
+  </summary>
+</histogram>
+
 <histogram base="true" name="Sync.ModelTypeUpdateDrop" enum="SyncModelTypes"
-    expires_after="2021-05-01">
+    expires_after="2021-07-18">
 <!-- Name completed by histogram_suffixes name="SyncModelTypeUpdateDrop" -->
 
   <owner>jkrcal@chromium.org</owner>
@@ -603,7 +742,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.NonReflectionUpdateFreshnessPossiblySkewed2" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>mastiz@chromium.org</owner>
   <owner>melandory@chromium.org</owner>
   <summary>
@@ -616,7 +755,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.PassphraseType" enum="SyncPassphraseType"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>treib@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>The active sync passphrase type at sync startup.</summary>
@@ -706,7 +845,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.PostedClientToServerMessage"
-    enum="SyncClientToServerMessageContents" expires_after="2021-04-04">
+    enum="SyncClientToServerMessageContents" expires_after="2021-08-08">
   <owner>mastiz@chromium.org</owner>
   <summary>
     Number of network requests issued by sync to the sync server, grouped by
@@ -715,8 +854,27 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.PostedClientToServerMessageError" enum="SyncErrorType"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
+<!-- TODO(crbug.com/1004302): Deprecate once
+Sync.PostedClientToServerMessageError2 has reached Stable (so the two histograms
+can be compared for the same population). -->
+
   <owner>mastiz@chromium.org</owner>
+  <owner>treib@chromium.org</owner>
+  <summary>
+    WARNING: Some buckets in this histogram are not recorded due to a bug
+    (crbug.com/1004302), see Sync.PostedClientToServerMessageError2 instead.
+
+    A sync error code received from the sync server as a result of a
+    client-initiated request. Note that this excludes network errors (e.g.
+    client offline) and HTTP errors.
+  </summary>
+</histogram>
+
+<histogram name="Sync.PostedClientToServerMessageError2" enum="SyncErrorType"
+    expires_after="2021-12-14">
+  <owner>mastiz@chromium.org</owner>
+  <owner>treib@chromium.org</owner>
   <summary>
     A sync error code received from the sync server as a result of a
     client-initiated request. Note that this excludes network errors (e.g.
@@ -725,7 +883,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.PostedClientToServerMessageLatency" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>mastiz@chromium.org</owner>
   <summary>
     Time taken for a client-initiated request to be sent over the network and
@@ -734,7 +892,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.PostedDataTypeCommitRequest" enum="SyncModelTypes"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>mastiz@chromium.org</owner>
   <owner>jkrcal@chromium.org</owner>
   <summary>
@@ -747,7 +905,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.PostedDataTypeGetUpdatesRequest" enum="SyncModelTypes"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>mastiz@chromium.org</owner>
   <owner>jkrcal@chromium.org</owner>
   <summary>
@@ -760,7 +918,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.PostedGetUpdatesOrigin" enum="SyncGetUpdatesOrigin"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>mastiz@chromium.org</owner>
   <owner>jkrcal@chromium.org</owner>
   <summary>
@@ -770,7 +928,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.Preferences.ClearedLocalPrefOnTypeMismatch"
-    units="BooleanHit" expires_after="M88">
+    units="BooleanHit" expires_after="2020-12-16">
+  <obsolete>
+    Deprecated in 12/2020.
+  </obsolete>
   <owner>tschumann@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -781,7 +942,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.ProblematicServerSideBookmarks"
-    enum="RemoteBookmarkUpdateError" expires_after="M90">
+    enum="RemoteBookmarkUpdateError" expires_after="2021-08-22">
   <owner>mastiz@chromium.org</owner>
   <owner>rushans@google.com</owner>
   <summary>
@@ -791,7 +952,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.ProblematicServerSideBookmarksDuringMerge"
-    enum="RemoteBookmarkUpdateError" expires_after="M90">
+    enum="RemoteBookmarkUpdateError" expires_after="2021-08-22">
   <owner>mastiz@chromium.org</owner>
   <owner>rushans@google.com</owner>
   <summary>
@@ -800,16 +961,47 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Sync.RecordedUserEventType" enum="SyncUserEventType"
+    expires_after="2021-09-30">
+  <owner>mmoskvitin@chromium.org</owner>
+  <owner>treib@chromium.org</owner>
+  <summary>
+    For every user event that is recorded, this histogram records the type of
+    event (i.e. which of the &quot;oneof event&quot; entries in the
+    UserEventSpecifics proto was set).
+  </summary>
+</histogram>
+
 <histogram name="Sync.RedundantInvalidationPerModelType" enum="SyncModelTypes"
-    expires_after="2021-01-31">
+    expires_after="2020-12-16">
+  <obsolete>
+    Replaced with Sync.RedundantInvalidationPerModelType2 in M89 (12/2020).
+  </obsolete>
   <owner>melandory@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
-    The sync datatype of the recieved invalidation with not-fresh version.
+    WARNING: The recordings here are incorrect (crbug.com/1158476), see
+    Sync.RedundantInvalidationPerModelType2 instead.
+
+    The sync datatype of the received invalidation with not-fresh version.
+  </summary>
+</histogram>
+
+<histogram name="Sync.RedundantInvalidationPerModelType2" enum="SyncModelTypes"
+    expires_after="2021-12-16">
+  <owner>melandory@chromium.org</owner>
+  <owner>treib@chromium.org</owner>
+  <summary>
+    Recorded whenever Sync receives an invalidation with a non-fresh version,
+    i.e. a smaller version number than Sync already knew about. The recorded
+    value is the data type of the invalidation.
   </summary>
 </histogram>
 
 <histogram name="Sync.SessionTabs" units="tabs" expires_after="2021-01-31">
+  <obsolete>
+    Removed 2021-01.
+  </obsolete>
   <owner>mastiz@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -819,7 +1011,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.SharingMessage.CommitResult"
-    enum="SyncSharingMessageCommitErrorCode" expires_after="2021-04-04">
+    enum="SyncSharingMessageCommitErrorCode" expires_after="2021-08-09">
   <owner>rushans@google.com</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -828,7 +1020,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.Startup.DeferredInitTrigger"
-    enum="SyncDeferredInitTrigger" expires_after="2021-04-11">
+    enum="SyncDeferredInitTrigger" expires_after="2021-08-15">
   <owner>mastiz@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>The type of event that triggered sync initialization.</summary>
@@ -844,6 +1036,23 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.Startup.PolicyLoadTimeout" enum="Boolean"
+    expires_after="2021-02-01">
+  <obsolete>
+    Deprecated in 02/2021 for having wrong data. Use
+    Sync.Startup.PolicyLoadTimeout2.
+  </obsolete>
+  <owner>ydago@chromium.org</owner>
+  <owner>treib@chromium.org</owner>
+  <summary>
+    Use Sync.Startup.PolicyLoadTimeout2 to Records the sync engine timed out
+    while waiting for policy load before starting. In case of a timeout, the
+    sync engine attempts to start ignoring potential policy restrictions. This
+    histogram contains wrong data, please use Sync.Startup.PolicyLoadTimeout2
+    instead.
+  </summary>
+</histogram>
+
+<histogram name="Sync.Startup.PolicyLoadTimeout2" enum="Boolean"
     expires_after="2021-11-01">
   <owner>ydago@chromium.org</owner>
   <owner>treib@chromium.org</owner>
@@ -854,24 +1063,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Sync.Startup.TimeDeferred2" units="ms" expires_after="M88">
+<histogram name="Sync.Startup.TimeDeferred2" units="ms"
+    expires_after="2021-12-16">
   <owner>mastiz@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
-    Time spent after ProfileSyncService *creation* but before SyncEngine
-    initialization.
+    Recorded on browser startup if the SyncEngine initialization is deferred by
+    a fixed (configurable) delay due to performance reasons. In some cases, a
+    data type may force sync to start before the delay finishes, causing the
+    recorded time to be smaller. This histogram records the time spent after the
+    ProfileSyncService *creation* but before the SyncEngine initialization.
   </summary>
 </histogram>
 
 <histogram name="Sync.Startup.TypeTriggeringInit" enum="SyncModelTypes"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>mastiz@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>Data type that first requests sync initialization.</summary>
 </histogram>
 
 <histogram name="Sync.StopSource" enum="SyncStopSource"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>treib@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -919,7 +1132,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.SyncEverything2" enum="Boolean"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>treib@chromium.org</owner>
   <owner>mastiz@chromium.org</owner>
   <summary>
@@ -978,7 +1191,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram base="true" name="Sync.UndecryptedEntitiesOnDataTypeDisabled"
-    units="sync entities" expires_after="2021-04-04">
+    units="sync entities" expires_after="2021-08-09">
   <owner>victorvianna@google.com</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -988,7 +1201,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.URLFetchResponse"
-    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-05-02">
+    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-07-04">
   <owner>mastiz@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -997,7 +1210,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Sync.URLFetchTime" units="ms" expires_after="M88">
+<histogram name="Sync.URLFetchTime" units="ms" expires_after="2020-12-16">
+  <obsolete>
+    Deprecated in 12/2020.
+  </obsolete>
   <owner>mastiz@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
@@ -1006,79 +1222,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Sync.URLFetchTimedOut" enum="BooleanTimedOut"
-    expires_after="2021-01-31">
+    expires_after="2021-07-31">
   <owner>mastiz@chromium.org</owner>
   <owner>treib@chromium.org</owner>
   <summary>
-    Whether a url fetch timed out or not. Timing out implies the fetch was
-    stalled for an unknown reason.
-  </summary>
-</histogram>
-
-<histogram name="SyncFileSystem.ConflictResolutionPolicy"
-    enum="SyncFSConflictResolutionPolicy" expires_after="M85">
-  <owner>tzik@chromium.org</owner>
-  <summary>
-    Overridden conflict resolution policy of Sync FileSystem API. Recorded for
-    each API call to override the policy.
-  </summary>
-</histogram>
-
-<histogram name="SyncFileSystem.Database.Open" enum="LevelDBStatus"
-    expires_after="M77">
-  <owner>tzik@chromium.org</owner>
-  <summary>The result of opening the Sync FileSystem backend database.</summary>
-</histogram>
-
-<histogram name="SyncFileSystem.MetadataNumber" units="units"
-    expires_after="M85">
-  <owner>tzik@chromium.org</owner>
-  <summary>
-    The number of cached backing remote file metadata in the Sync FileSystem
-    database. Recorded at the initialization phase of Sync FileSystem.
-  </summary>
-</histogram>
-
-<histogram name="SyncFileSystem.RegisteredAppNumber" units="units"
-    expires_after="M85">
-  <owner>tzik@chromium.org</owner>
-  <summary>
-    The number of Chrome Apps that uses Sync FileSystem with V2 backend.
-    Recorded at the initialization phase of Sync FileSystem.
-  </summary>
-</histogram>
-
-<histogram name="SyncFileSystem.RegisterOriginResult"
-    enum="SyncFSRemoteServiceState" expires_after="2018-08-30">
-  <owner>tzik@chromium.org</owner>
-  <summary>
-    The result of the registration of Chrome App to Sync FileSystem.
-  </summary>
-</histogram>
-
-<histogram name="SyncFileSystem.RegisterOriginTime" units="ms"
-    expires_after="M77">
-  <owner>peria@chromium.org</owner>
-  <owner>tzik@chromium.org</owner>
-  <summary>
-    Time elapsed to register a Chrome App to SyncFilesystem. Recorded for each
-    registration request by apps.
-  </summary>
-</histogram>
-
-<histogram name="SyncFileSystem.TrackerDB.Open" enum="LevelDBStatus"
-    expires_after="2018-08-30">
-  <owner>tzik@chromium.org</owner>
-  <summary>The result of opening the Sync FileSystem tracker database.</summary>
-</histogram>
-
-<histogram name="SyncFileSystem.TrackerNumber" units="units"
-    expires_after="M85">
-  <owner>tzik@chromium.org</owner>
-  <summary>
-    The number of the directory tree node that maps backing files to local files
-    in the Sync FileSystem database. Recorded at the initialization phase of
-    SyncFileSystem.
+    Whether a URL fetch timed out or not. Timing out implies the fetch was
+    stalled for an unknown reason. Note that this records true on timeout and
+    false on success, but doesn't record anything if the fetch failed for any
+    other reason.
   </summary>
 </histogram>
 
diff --git a/chromium/tools/metrics/histograms/histograms_xml/tab/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/tab/histograms.xml
index bac5696b5a1..48b15f846d6 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/tab/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/tab/histograms.xml
@@ -21,6 +21,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<variants name="BatteryState">
+  <variant name="" summary="On battery or plugged-in"/>
+  <variant name=".OnBattery"/>
+  <variant name=".PluggedIn"/>
+</variants>
+
 <variants name="TabCreatedReason">
   <variant name=".FromExternalApp"
       summary="This bucket is for any tabs that are created because of custom
@@ -105,7 +111,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Tab.Count.Guest" units="units" expires_after="2021-06-01">
+<histogram name="Tab.Count.Guest" units="units" expires_after="2021-08-01">
   <owner>rhalavati@chromium.org</owner>
   <owner>chrome-privacy-core@google.com</owner>
   <summary>
@@ -118,7 +124,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Tab.Count.Incognito" units="units" expires_after="2021-06-01">
+<histogram name="Tab.Count.Incognito" units="units" expires_after="2021-08-01">
   <owner>rhalavati@chromium.org</owner>
   <owner>chrome-privacy-core@google.com</owner>
   <summary>
@@ -151,7 +157,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Tab.NewTab" enum="NewTabType" expires_after="2021-05-09">
+<histogram name="Tab.NewTab" enum="NewTabType" expires_after="2021-07-18">
   <owner>tbergquist@chromium.org</owner>
   <owner>bsep@chromium.org</owner>
   <summary>
@@ -244,7 +250,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tab.Preview.MemoryUsage.CompressedData.PerThumbnailKiB"
-    units="KB" expires_after="M92">
+    units="KB" expires_after="2021-08-09">
   <owner>dfried@chromium.org</owner>
   <owner>collinbaker@chromium.org</owner>
   <summary>
@@ -254,7 +260,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tab.Preview.MemoryUsage.CompressedData.TotalKiB" units="KB"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>dfried@chromium.org</owner>
   <owner>collinbaker@chromium.org</owner>
   <summary>
@@ -265,7 +271,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tab.Preview.TimeToFirstUsableFrameAfterStartCapture"
-    units="ms" expires_after="M92">
+    units="ms" expires_after="2021-08-08">
   <owner>dfried@chromium.org</owner>
   <owner>collinbaker@chromium.org</owner>
   <summary>
@@ -275,7 +281,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tab.Preview.TimeToNotifyObserversAfterCaptureReceived"
-    units="microseconds" expires_after="M92">
+    units="microseconds" expires_after="2021-08-08">
   <owner>dfried@chromium.org</owner>
   <owner>collinbaker@chromium.org</owner>
   <summary>
@@ -289,7 +295,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tab.Preview.TimeToStoreAfterFrameReceived"
-    units="microseconds" expires_after="M92">
+    units="microseconds" expires_after="2021-08-08">
   <owner>dfried@chromium.org</owner>
   <owner>collinbaker@chromium.org</owner>
   <summary>
@@ -301,7 +307,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tab.Preview.TimeToStoreAfterTabSwitch" units="ms"
-    expires_after="M92">
+    expires_after="2021-08-08">
   <owner>dfried@chromium.org</owner>
   <owner>collinbaker@chromium.org</owner>
   <summary>
@@ -312,7 +318,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tab.Preview.VideoCaptureDuration" units="ms"
-    expires_after="M92">
+    expires_after="2021-08-09">
   <owner>dfried@chromium.org</owner>
   <owner>collinbaker@chromium.org</owner>
   <summary>
@@ -455,8 +461,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tab.StateAtRendererTermination" enum="TabForegroundState"
-    expires_after="2021-05-02">
-  <owner>eugenebut@chromium.org</owner>
+    expires_after="2021-07-04">
+  <owner>gambard@chromium.org</owner>
   <owner>olivierrobin@chromium.org</owner>
   <summary>
     The state (foreground/background) of a tab when its renderer is terminated.
@@ -592,7 +598,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="TabGroups.CollapsedGroupCountPerLoad" units="groups"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>cyan@chromium.org</owner>
   <owner>chrome-desktop-ui-sea@google.com</owner>
   <summary>
@@ -602,7 +608,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="TabGroups.SessionsPerGroup" units="sessions"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>yusufo@chromium.org</owner>
   <owner>wychen@chromium.org</owner>
   <summary>
@@ -614,7 +620,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="TabGroups.TimeSpentCollapsed" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>cyan@chromium.org</owner>
   <owner>chrome-desktop-ui-sea@google.com</owner>
   <summary>
@@ -624,7 +630,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="TabGroups.TimeSpentExpanded" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>cyan@chromium.org</owner>
   <owner>chrome-desktop-ui-sea@google.com</owner>
   <summary>
@@ -634,7 +640,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="TabGroups.UserCustomizedGroupCountPerLoad" units="groups"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>connily@chromium.org</owner>
   <owner>cyan@chromium.org</owner>
   <owner>chrome-desktop-ui-sea@google.com</owner>
@@ -645,7 +651,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="TabGroups.UserGroupCount" units="groups"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>yusufo@chromium.org</owner>
   <owner>wychen@chromium.org</owner>
   <summary>
@@ -655,7 +661,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="TabGroups.UserGroupCountPerLoad" units="groups"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>connily@chromium.org</owner>
   <owner>cyan@chromium.org</owner>
   <owner>chrome-desktop-ui-sea@google.com</owner>
@@ -666,7 +672,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="TabGroups.UserNamedGroupCount" units="groups"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>yusufo@chromium.org</owner>
   <owner>wychen@chromium.org</owner>
   <summary>
@@ -1242,7 +1248,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Tabs.CountAtStartup" units="tabs" expires_after="M92">
+<histogram name="Tabs.CountAtStartup" units="tabs" expires_after="2021-08-09">
   <owner>marq@chromium.org</owner>
   <summary>[Android and iOS] The number of tabs open at cold launch.</summary>
 </histogram>
@@ -1328,7 +1334,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </details>
 </histogram>
 
-<histogram name="Tabs.MaxTabsInADay" units="tabs" expires_after="never">
+<histogram name="Tabs.MaxTabsInADay{BatteryState}" units="tabs"
+    expires_after="never">
 <!-- expires-never: https://crbug.com/966137 -->
 
   <owner>sebmarchand@chromium.org</owner>
@@ -1341,9 +1348,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     represents the previous day's observations (which can be from a different
     build).
   </summary>
+  <token key="BatteryState" variants="BatteryState"/>
 </histogram>
 
-<histogram name="Tabs.MaxTabsPerWindowInADay" units="tabs"
+<histogram name="Tabs.MaxTabsPerWindowInADay{BatteryState}" units="tabs"
     expires_after="never">
 <!-- expires-never: https://crbug.com/966137 -->
 
@@ -1357,9 +1365,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     represents the previous day's observations (which can be from a different
     build).
   </summary>
+  <token key="BatteryState" variants="BatteryState"/>
 </histogram>
 
-<histogram name="Tabs.MaxWindowsInADay" units="tabs" expires_after="never">
+<histogram name="Tabs.MaxWindowsInADay{BatteryState}" units="tabs"
+    expires_after="never">
 <!-- expires-never: https://crbug.com/966137 -->
 
   <owner>sebmarchand@chromium.org</owner>
@@ -1372,6 +1382,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     represents the previous day's observations (which can be from a different
     build).
   </summary>
+  <token key="BatteryState" variants="BatteryState"/>
 </histogram>
 
 <histogram name="Tabs.NTPCountAtResume" units="tabs" expires_after="M95">
@@ -1388,7 +1399,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>[iOS] The number of NTP tabs open at cold launch.</summary>
 </histogram>
 
-<histogram name="Tabs.NumberOfTabsOnResume" units="tabs" expires_after="never">
+<histogram name="Tabs.NumberOfTabsOnResume{BatteryState}" units="tabs"
+    expires_after="never">
 <!-- expires-never: https://crbug.com/966137 -->
 
   <owner>sebmarchand@chromium.org</owner>
@@ -1397,10 +1409,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     The number of tabs total at resume from sleep/hibernate. This is being
     logged on all desktop platforms.
   </summary>
+  <token key="BatteryState" variants="BatteryState"/>
 </histogram>
 
 <histogram name="Tabs.PersistedTabData.Deserialize.Critical"
-    enum="BooleanSuccess" expires_after="2021-03-25">
+    enum="BooleanSuccess" expires_after="2022-02-07">
   <owner>yusufo@chromium.org</owner>
   <owner>nyquist@chromium.org</owner>
   <owner>dtrainor@chromium.org</owner>
@@ -1413,7 +1426,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.PersistedTabData.Serialize.Critical"
-    enum="BooleanSuccess" expires_after="2021-03-25">
+    enum="BooleanSuccess" expires_after="2022-02-07">
   <owner>yusufo@chromium.org</owner>
   <owner>nyquist@chromium.org</owner>
   <owner>dtrainor@chromium.org</owner>
@@ -1426,7 +1439,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.PersistedTabData.Storage.Delete.File"
-    enum="BooleanSuccess" expires_after="2021-03-25">
+    enum="BooleanSuccess" expires_after="2022-02-07">
   <owner>yusufo@chromium.org</owner>
   <owner>nyquist@chromium.org</owner>
   <owner>dtrainor@chromium.org</owner>
@@ -1439,7 +1452,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.PersistedTabData.Storage.Exists.File"
-    enum="BooleanSuccess" expires_after="2021-03-25">
+    enum="BooleanSuccess" expires_after="2022-02-07">
   <owner>yusufo@chromium.org</owner>
   <owner>nyquist@chromium.org</owner>
   <owner>dtrainor@chromium.org</owner>
@@ -1451,8 +1464,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Tabs.PersistedTabData.Storage.LoadTime.File" units="ms"
+    expires_after="2022-01-13">
+  <owner>yusufo@chromium.org</owner>
+  <owner>nyquist@chromium.org</owner>
+  <owner>dtrainor@chromium.org</owner>
+  <owner>davidjm@chromium.org</owner>
+  <summary>
+    FilePersistedTabData storage stores serialized PersistedTabData (metadata
+    persisted across restarts) in a file. This metric records how long it took
+    to load the file in the event the file exists.
+  </summary>
+</histogram>
+
 <histogram name="Tabs.PersistedTabData.Storage.Restore.File"
-    enum="BooleanSuccess" expires_after="2021-03-25">
+    enum="BooleanSuccess" expires_after="2021-07-27">
   <owner>yusufo@chromium.org</owner>
   <owner>nyquist@chromium.org</owner>
   <owner>dtrainor@chromium.org</owner>
@@ -1465,7 +1491,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.PersistedTabData.Storage.Save.File" enum="BooleanSuccess"
-    expires_after="2021-03-25">
+    expires_after="2022-02-07">
   <owner>yusufo@chromium.org</owner>
   <owner>nyquist@chromium.org</owner>
   <owner>dtrainor@chromium.org</owner>
@@ -1477,8 +1503,35 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram
+    name="Tabs.PersistedTabData.Storage.Save.File.FirstStorageRequestType"
+    enum="FileStorageRequestType" expires_after="2022-03-01">
+  <owner>yusufo@chromium.org</owner>
+  <owner>nyquist@chromium.org</owner>
+  <owner>dtrainor@chromium.org</owner>
+  <owner>davidjm@chromium.org</owner>
+  <summary>
+    First storage request type in FilePersistedTabData. It would be expected
+    that the first storage request will be a restore (as restoring the active
+    tab) is pivotal for startup performance.
+  </summary>
+</histogram>
+
+<histogram name="Tabs.PersistedTabData.Storage.SaveTime.File" units="ms"
+    expires_after="2022-01-13">
+  <owner>yusufo@chromium.org</owner>
+  <owner>nyquist@chromium.org</owner>
+  <owner>dtrainor@chromium.org</owner>
+  <owner>davidjm@chromium.org</owner>
+  <summary>
+    FilePersistedTabData storage stores serialized PersistedTabData (metadata
+    persisted across restarts) in a file. This metric records how long it took
+    to save the file in the event of a successful save.
+  </summary>
+</histogram>
+
 <histogram name="Tabs.SadTab.CrashCreated" units="tabs"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>sonnyrao@chromium.org</owner>
   <owner>jamescook@chromium.org</owner>
   <summary>
@@ -1492,7 +1545,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.SadTab.CrashDisplayed" units="tabs"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>sonnyrao@chromium.org</owner>
   <owner>jamescook@chromium.org</owner>
   <summary>
@@ -1505,7 +1558,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.SadTab.Feedback.Event" enum="SadTabEvent"
-    expires_after="M85">
+    expires_after="2021-08-01">
   <owner>sonnyrao@chromium.org</owner>
   <owner>jamescook@chromium.org</owner>
   <summary>
@@ -1516,7 +1569,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.SadTab.KillCreated" units="tabs"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>sonnyrao@chromium.org</owner>
   <owner>jamescook@chromium.org</owner>
   <summary>
@@ -1532,7 +1585,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.SadTab.KillCreated.OOM" units="tabs"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>sonnyrao@chromium.org</owner>
   <owner>jamescook@chromium.org</owner>
   <summary>
@@ -1547,7 +1600,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.SadTab.KillDisplayed" units="tabs"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>sonnyrao@chromium.org</owner>
   <owner>jamescook@chromium.org</owner>
   <summary>
@@ -1599,7 +1652,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.SadTab.Reload.Event" enum="SadTabEvent"
-    expires_after="M85">
+    expires_after="2021-08-01">
   <owner>sonnyrao@chromium.org</owner>
   <owner>jamescook@chromium.org</owner>
   <summary>
@@ -1667,7 +1720,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Tabs.ScrubDistance" units="tabs" expires_after="M90">
+<histogram name="Tabs.ScrubDistance" units="tabs" expires_after="2021-08-22">
   <owner>afakhry@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <summary>
@@ -1676,7 +1729,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Tabs.ScrubDuration" units="ms" expires_after="M90">
+<histogram name="Tabs.ScrubDuration" units="ms" expires_after="2022-01-12">
   <owner>afakhry@chromium.org</owner>
   <owner>tclaiborne@chromium.org</owner>
   <summary>
@@ -1826,17 +1879,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </token>
 </histogram>
 
-<histogram name="Tabs.TabCount" units="tabs" expires_after="never">
-<!-- expires-never: https://crbug.com/966137 -->
-
-  <owner>sebmarchand@chromium.org</owner>
-  <owner>catan-team@chromium.org</owner>
-  <summary>
-    Counts the number of tabs across all windows, reported every 5 minutes.
-    Desktop only.
-  </summary>
-</histogram>
-
 <histogram name="Tabs.TabCountActiveWindow" units="tabs" expires_after="never">
 <!-- expires-never: usage drives tab optimization and analysis. -->
 
@@ -1847,7 +1889,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.TabCountInGroupPerLoad" units="groups"
-    expires_after="2021-05-09">
+    expires_after="2021-07-18">
   <owner>connily@chromium.org</owner>
   <owner>cyan@chromium.org</owner>
   <owner>chrome-desktop-ui-sea@google.com</owner>
@@ -1943,6 +1985,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </details>
 </histogram>
 
+<histogram name="Tabs.TabCount{BatteryState}" units="tabs"
+    expires_after="never">
+<!-- expires-never: https://crbug.com/966137 -->
+
+  <owner>sebmarchand@chromium.org</owner>
+  <owner>catan-team@chromium.org</owner>
+  <summary>
+    Counts the number of tabs across all windows, reported every 5 minutes.
+    Desktop only.
+  </summary>
+  <token key="BatteryState" variants="BatteryState"/>
+</histogram>
+
 <histogram name="Tabs.TabOffsetOfSwitch{TabOffsetOfSwitchComponentList}"
     units="units" expires_after="M85">
   <owner>yusufo@chromium.org</owner>
@@ -1977,7 +2032,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.TabSearch.CloseAction" enum="TabSearchCloseActions"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>tluk@chromium.org</owner>
   <owner>robliao@chromium.org</owner>
   <summary>
@@ -1993,7 +2048,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.TabSearch.NumTabsClosedPerInstance" units="tabs"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>tluk@chromium.org</owner>
   <owner>robliao@chromium.org</owner>
   <summary>
@@ -2005,7 +2060,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="Tabs.TabSearch.NumTabsOnOpen" units="tabs" expires_after="M90">
+<histogram name="Tabs.TabSearch.NumTabsOnOpen" units="tabs"
+    expires_after="2021-08-22">
   <owner>tluk@chromium.org</owner>
   <owner>robliao@chromium.org</owner>
   <summary>
@@ -2043,7 +2099,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.TabSearch.PageHandlerConstructionDelay" units="ms"
-    expires_after="M90">
+    expires_after="2021-07-18">
   <owner>tluk@chromium.org</owner>
   <owner>robliao@chromium.org</owner>
   <owner>yuhengh@chromium.org</owner>
@@ -2085,7 +2141,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.TabSearch.WebUI.InitialTabsRenderTime" units="ms"
-    expires_after="M90">
+    expires_after="2021-06-20">
+  <obsolete>
+    Deprecated as of 2021/02. Metric is no longer needed.
+  </obsolete>
   <owner>tluk@chromium.org</owner>
   <owner>robliao@chromium.org</owner>
   <summary>
@@ -2096,7 +2155,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.TabSearch.WebUI.LoadCompletedTime" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>tluk@chromium.org</owner>
   <owner>robliao@chromium.org</owner>
   <summary>
@@ -2107,7 +2166,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.TabSearch.WebUI.LoadDocumentTime" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>tluk@chromium.org</owner>
   <owner>robliao@chromium.org</owner>
   <summary>
@@ -2117,7 +2176,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.TabSearch.WebUI.TabListDataReceived" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>tluk@chromium.org</owner>
   <owner>robliao@chromium.org</owner>
   <owner>yuhengh@chromium.org</owner>
@@ -2167,7 +2226,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.TabSearch.WindowDisplayedDuration3" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>tluk@chromium.org</owner>
   <owner>robliao@chromium.org</owner>
   <summary>
@@ -2190,7 +2249,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.TabSearch.WindowTimeToShowCachedWebView" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>tluk@chromium.org</owner>
   <owner>robliao@chromium.org</owner>
   <owner>yuhengh@chromium.org</owner>
@@ -2209,7 +2268,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Tabs.TabSearch.WindowTimeToShowUncachedWebView" units="ms"
-    expires_after="M90">
+    expires_after="2021-08-22">
   <owner>tluk@chromium.org</owner>
   <owner>robliao@chromium.org</owner>
   <owner>yuhengh@chromium.org</owner>
@@ -2234,6 +2293,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Tabs.TabState.LoadTime" units="ms" expires_after="2022-01-13">
+  <owner>yusufo@chromium.org</owner>
+  <owner>nyquist@chromium.org</owner>
+  <owner>dtrainor@chromium.org</owner>
+  <owner>davidjm@chromium.org</owner>
+  <summary>
+    Time taken to load a TabState file in the event that it exists.
+  </summary>
+</histogram>
+
+<histogram name="Tabs.TabState.SaveTime" units="ms" expires_after="2022-01-13">
+  <owner>yusufo@chromium.org</owner>
+  <owner>nyquist@chromium.org</owner>
+  <owner>dtrainor@chromium.org</owner>
+  <owner>davidjm@chromium.org</owner>
+  <summary>
+    Time taken to save a TabState file in the event of a successful save.
+  </summary>
+</histogram>
+
 <histogram name="Tabs.Tasks.AverageTabGroupSize" units="tabs"
     expires_after="M85">
   <owner>yusufo@chromium.org</owner>
@@ -2484,7 +2563,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </token>
 </histogram>
 
-<histogram name="Tabs.WindowCount" units="tabs" expires_after="never">
+<histogram name="Tabs.WindowCount{BatteryState}" units="tabs"
+    expires_after="never">
 <!-- expires-never: https://crbug.com/966137 -->
 
   <owner>sebmarchand@chromium.org</owner>
@@ -2492,9 +2572,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>
     Counts the number of Chrome windows, reported every 5 minutes. Desktop only.
   </summary>
+  <token key="BatteryState" variants="BatteryState"/>
 </histogram>
 
-<histogram name="Tabs.WindowWidth" units="DIPs" expires_after="M91">
+<histogram name="Tabs.WindowWidth" units="DIPs" expires_after="2021-08-22">
   <owner>collinbaker@chromium.org</owner>
   <owner>chrome-desktop-ui-sea@google.com</owner>
   <summary>
@@ -2541,7 +2622,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="TabStrip.TabCountOnPageLoad" units="tabs"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>yusufo@chromium.org</owner>
   <owner>wychen@chromium.org</owner>
   <summary>
@@ -2552,7 +2633,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="TabStrip.TimeToSwitch" units="ms" expires_after="2021-05-09">
+<histogram name="TabStrip.TimeToSwitch" units="ms" expires_after="2021-07-11">
   <owner>connily@chromium.org</owner>
   <owner>cyan@chromium.org</owner>
   <owner>chrome-desktop-ui-sea@google.com</owner>
@@ -2569,7 +2650,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="TabStrip.UserStatus" enum="TabStripUserStatus"
-    expires_after="2021-04-04">
+    expires_after="2021-07-27">
   <owner>yusufo@chromium.org</owner>
   <owner>wychen@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/translate/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/translate/histograms.xml
index 820c3769104..b05d9c4a0bd 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/translate/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/translate/histograms.xml
@@ -32,7 +32,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.AlwaysTranslateLang" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-15">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -42,13 +42,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.BubbleUiEvent" enum="TranslateBubbleUiEvent"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>groby@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>Tracks UI events related to the translate bubble.</summary>
 </histogram>
 
-<histogram name="Translate.CaptureText" units="ms" expires_after="M88">
+<histogram name="Translate.CaptureText" units="ms" expires_after="M99">
   <owner>sclittle@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -61,7 +61,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.CLD3.LanguageDetected" enum="CLD3LanguageCode"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>frechette@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -71,7 +71,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.CLD3.LanguagePercentage" units="%"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>frechette@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -82,7 +82,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.CLD3.TopLanguageEvaluationDuration" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>mcrouse@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -92,14 +92,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.CompactInfobar.Event" enum="TranslateCompactUIEvent"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>anthonyvd@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>Various user actions performed in the translate infobar.</summary>
 </histogram>
 
 <histogram name="Translate.CompactInfobar.Language.AlwaysTranslate"
-    enum="CLD3LanguageCode" expires_after="2021-04-04">
+    enum="CLD3LanguageCode" expires_after="2021-08-09">
   <owner>anthonyvd@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -109,7 +109,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.CompactInfobar.Language.MoreLanguages"
-    enum="CLD3LanguageCode" expires_after="2021-04-04">
+    enum="CLD3LanguageCode" expires_after="2021-08-09">
   <owner>anthonyvd@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -118,7 +118,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.CompactInfobar.Language.NeverTranslate"
-    enum="CLD3LanguageCode" expires_after="2021-04-04">
+    enum="CLD3LanguageCode" expires_after="2021-08-09">
   <owner>anthonyvd@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -128,7 +128,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.CompactInfobar.Language.PageNotIn"
-    enum="CLD3LanguageCode" expires_after="2021-04-04">
+    enum="CLD3LanguageCode" expires_after="2021-08-09">
   <owner>anthonyvd@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -147,7 +147,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.CompactInfobar.TranslationsPerPage"
-    units="translations" expires_after="2021-04-04">
+    units="translations" expires_after="2021-08-09">
   <owner>anthonyvd@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -168,7 +168,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.ContentLanguage" enum="TranslateLanguage"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -178,7 +178,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.DeclineTranslate" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -188,7 +188,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.DeclineTranslateCloseInfobar" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -212,7 +212,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.ExplicitLanguageAsk.Event"
-    enum="TranslateExplicitAskPromptEventType" expires_after="2021-04-04">
+    enum="TranslateExplicitAskPromptEventType" expires_after="2021-08-09">
   <owner>yyushkina@google.com</owner>
   <owner>anthonyvd@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -223,7 +223,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.ExplicitLanguageAsk.LanguageAdded"
-    enum="CLD3LanguageCode" expires_after="2021-04-04">
+    enum="CLD3LanguageCode" expires_after="2021-08-09">
   <owner>yyushkina@google.com</owner>
   <owner>anthonyvd@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -234,7 +234,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.ExplicitLanguageAsk.LanguageRemoved"
-    enum="CLD3LanguageCode" expires_after="2021-04-04">
+    enum="CLD3LanguageCode" expires_after="2021-08-09">
   <owner>yyushkina@google.com</owner>
   <owner>anthonyvd@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -260,7 +260,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.HrefHint.Status" enum="HrefTranslateStatus"
-    expires_after="2021-04-18">
+    expires_after="2021-06-27">
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -293,7 +293,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.InitiationStatus.v2"
-    enum="TranslateInitiationStatus" expires_after="2021-04-04">
+    enum="TranslateInitiationStatus" expires_after="2021-08-08">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -304,7 +304,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.LanguageDetection.ContentLength" units="characters"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>sclittle@chromium.org</owner>
   <owner>megjablon@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
@@ -326,7 +326,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.LanguageDeterminedDuration" units="ms"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>sclittle@chromium.org</owner>
   <owner>megjablon@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
@@ -339,7 +339,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.LanguageSettingsIsShown" enum="BooleanShown"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
+  <obsolete>
+    Removed Feb 2021. Replaced with Main bucket of
+    LanguageSettings.PageImpression.
+  </obsolete>
   <owner>frechette@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -382,7 +386,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.MenuTranslation.IsAvailable" enum="BooleanAvailable"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>cuianthony@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -392,7 +396,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.MenuTranslation.UnavailableReasons"
-    enum="MenuTranslationUnavailableReason" expires_after="2021-05-02">
+    enum="MenuTranslationUnavailableReason" expires_after="2021-07-04">
   <owner>cuianthony@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -419,7 +423,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.ModifyOriginalLang" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -429,7 +433,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.ModifyTargetLang" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -439,7 +443,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.NeverTranslateLang" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -449,7 +453,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.NeverTranslateSite" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -459,7 +463,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.PageLoad.AutofillAssistantDeferredTriggerDecision"
-    enum="BooleanDeferred" expires_after="2021-04-04">
+    enum="BooleanDeferred" expires_after="2021-08-09">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -471,8 +475,22 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Translate.PageLoad.FinalSourceLanguage"
+    enum="CLD3LanguageCode" expires_after="2021-08-09">
+  <owner>curranmax@google.com</owner>
+  <owner>megjablon@google.com</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    Records the hashcode of the source language at the end of the page load.
+    This may differ from the initial source language determined by Chrome,
+    because the user can manually change the source language. This value is
+    logged once the page load is completed or the first time Chrome is
+    backgrounded during the course of the page load, whichever comes first.
+  </summary>
+</histogram>
+
 <histogram name="Translate.PageLoad.FinalState" enum="TranslateState"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -485,8 +503,49 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Translate.PageLoad.FinalTargetLanguage"
+    enum="CLD3LanguageCode" expires_after="2021-08-09">
+  <owner>curranmax@google.com</owner>
+  <owner>megjablon@google.com</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    Records the hashcode of the target language at the end of the page load.
+    This may differ from the initial target language determined by Chrome,
+    because the user can manually change the target language. This value is
+    logged once the page load is completed or the first time Chrome is
+    backgrounded during the course of the page load, whichever comes first.
+  </summary>
+</histogram>
+
+<histogram name="Translate.PageLoad.HrefHint.TriggerDecision"
+    enum="TranslateTriggerDecision" expires_after="2021-08-09">
+  <owner>curranmax@google.com</owner>
+  <owner>megjablon@google.com</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    Logs the highest priority reason for the initial state of Translate for the
+    page load. Only logs for navigations from Google with an href translate
+    attribute. This value is logged at the end of the page load or the first
+    time Chrome is backgrounded during the page load, whichever comes first.
+  </summary>
+</histogram>
+
+<histogram name="Translate.PageLoad.InitialSourceLanguage"
+    enum="CLD3LanguageCode" expires_after="2021-08-09">
+  <owner>curranmax@google.com</owner>
+  <owner>megjablon@google.com</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    Records the hashcode of the source language at the beginning of the page
+    load. The initial source language is automatically determined by Chrome.
+    This value is logged once the page load is completed or the first time
+    Chrome is backgrounded during the course of the page load, whichever comes
+    first.
+  </summary>
+</histogram>
+
 <histogram name="Translate.PageLoad.InitialState" enum="TranslateState"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -499,8 +558,38 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Translate.PageLoad.InitialTargetLanguage"
+    enum="CLD3LanguageCode" expires_after="2021-08-15">
+  <owner>curranmax@google.com</owner>
+  <owner>megjablon@google.com</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    Records the hashcode of the target language at the beginning of the page
+    load. The initial target language is automatically determined by Chrome.
+    This value is logged once the page load is completed or the first time
+    Chrome is backgrounded during the course of the page load, whichever comes
+    first.
+  </summary>
+</histogram>
+
+<histogram
+    name="Translate.PageLoad.IsInitialSourceLanguageInUsersContentLanguages"
+    enum="Boolean" expires_after="2021-06-27">
+  <owner>curranmax@google.com</owner>
+  <owner>megjablon@google.com</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    Whether or not the initial source language of this page load is in the
+    user's content language. The user's content languages loosely match the
+    languages that the user has translated to before or blocked for translation.
+    This value is logged once the page load is completed or the first time
+    Chrome is backgrounded during the course of the page load, whichever comes
+    first.
+  </summary>
+</histogram>
+
 <histogram name="Translate.PageLoad.NumReversions" units="reversions"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -512,8 +601,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Translate.PageLoad.NumTargetLanguageChanges"
+    units="target language changes" expires_after="2021-08-09">
+  <owner>curranmax@google.com</owner>
+  <owner>megjablon@google.com</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    The number of times the user changed the target language over the course of
+    the page load. This value is logged once the page load is completed or the
+    first time Chrome is backgrounded during the course of the page load,
+    whichever comes first.
+  </summary>
+</histogram>
+
 <histogram name="Translate.PageLoad.NumTranslations" units="translations"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -525,7 +627,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.PageLoad.Ranker.Decision"
-    enum="TranslateRankerDecision" expires_after="2021-04-04">
+    enum="TranslateRankerDecision" expires_after="2021-08-09">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -538,7 +640,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.PageLoad.Ranker.Version" units="version"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -550,7 +652,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.PageLoad.TriggerDecision"
-    enum="TranslateTriggerDecision" expires_after="2021-04-04">
+    enum="TranslateTriggerDecision" expires_after="2021-08-09">
   <owner>curranmax@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -569,7 +671,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.Ranker.Model.Status" enum="RankerModelStatus"
-    expires_after="2021-04-04">
+    expires_after="2021-08-15">
   <owner>rogerm@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -669,7 +771,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.RevertTranslation" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -679,7 +781,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.ShowErrorUI" enum="TranslateError"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -704,7 +806,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.SourceLanguage" enum="CLD3LanguageCode"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>yyushkina@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -714,7 +816,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.TargetLanguage" enum="CLD3LanguageCode"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>yyushkina@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -724,7 +826,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.TargetLanguage.Origin"
-    enum="TranslateTargetLanguageOrigin" expires_after="2021-04-04">
+    enum="TranslateTargetLanguageOrigin" expires_after="2021-08-09">
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -735,6 +837,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.TimeToBeReady" units="ms" expires_after="M77">
+  <obsolete>
+    Removed M90. Replaced with Translate.Translation.TimeToBeReady.
+  </obsolete>
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -744,6 +849,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.TimeToLoad" units="ms" expires_after="M77">
+  <obsolete>
+    Removed M90. Replaced with Translate.Translation.TimeToLoad.
+  </obsolete>
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -753,13 +861,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.TimeToTranslate" units="ms" expires_after="M77">
+  <obsolete>
+    Removed M90. Replaced with Translate.Translation.TimeToTranslate.
+  </obsolete>
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>The time from starting translation to the completion.</summary>
 </histogram>
 
 <histogram name="Translate.Translate" enum="BooleanTranslate"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -769,7 +880,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.Translate.AMPCacheURL" enum="BooleanTranslate"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>sclittle@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -780,7 +891,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.TranslateAssistContentResult"
-    enum="TranslateAssistContentResult" expires_after="M90">
+    enum="TranslateAssistContentResult" expires_after="2021-08-22">
   <owner>jds@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -814,7 +925,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.TranslateSubframe.SuccessPercentage" units="%"
-    expires_after="2021-04-04">
+    expires_after="2021-08-01">
   <owner>sclittle@google.com</owner>
   <owner>megjablon@google.com</owner>
   <owner>chrome-language@google.com</owner>
@@ -826,17 +937,121 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.TranslateTabIntentResult"
-    enum="TranslateTabIntentResult" expires_after="M89">
+    enum="TranslateTabIntentResult" expires_after="M91">
   <owner>jds@chromium.org</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
     Android: Records the result of processing a TRANSLATE_TAB intent. See
     TranslateTabIntentResult in enums.xml for possible values.
+
+    This is recorded once for each TRANSLATE_TAB intent received.
+  </summary>
+</histogram>
+
+<histogram name="Translate.Translation.SourceLanguage" enum="CLD3LanguageCode"
+    expires_after="2021-08-01">
+  <owner>curranmax@google.com</owner>
+  <owner>megjablon@google.com</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    Records the source language used for a translation. This is the language
+    being translated from.
+
+    This is recorded when a translation (both manual and automatic) is started.
+  </summary>
+</histogram>
+
+<histogram name="Translate.Translation.Status" enum="TranslationStatus"
+    expires_after="2021-08-01">
+  <owner>curranmax@google.com</owner>
+  <owner>megjablon@google.com</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    Records the final status of a translation. We count a translation as
+    successful if the user keeps the translation until the end of the page load.
+    Otherwise we record what followed the translation (for example the user
+    reverted the translation, or the user requested a different translation).
+
+    For each translation one sample is recorded once the status of the
+    translation is determined. This includes when the page load is finished, the
+    user reverts the translation, a new translation is requested, or the
+    translation fails. Note that we consider the user backgrounding Chrome as
+    the page load finishing because we can lose any stored metrics if the user
+    kills Chrome while it is backgrounded.
+  </summary>
+</histogram>
+
+<histogram name="Translate.Translation.TargetLanguage" enum="CLD3LanguageCode"
+    expires_after="2021-08-01">
+  <owner>curranmax@google.com</owner>
+  <owner>megjablon@google.com</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    Records the target language used for a translation. This is the langauge
+    being translated to.
+
+    This is recorded when a translation (both manual and automatic) is started.
+  </summary>
+</histogram>
+
+<histogram name="Translate.Translation.TimeToBeReady" units="ms"
+    expires_after="M94">
+  <owner>curranmax@google.com</owner>
+  <owner>megjablon@google.com</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    Records the time from injecting the translation scripts to being ready to
+    perform translation.
+
+    This is recorded when a translation (both manual and automatic) is started.
+  </summary>
+</histogram>
+
+<histogram name="Translate.Translation.TimeToLoad" units="ms"
+    expires_after="M94">
+  <owner>curranmax@google.com</owner>
+  <owner>megjablon@google.com</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    Records the time from injecting the translation scripts to finish loading
+    all dependent libraries.
+
+    This is recorded when a translation (both manual and automatic) is started.
+  </summary>
+</histogram>
+
+<histogram name="Translate.Translation.TimeToTranslate" units="ms"
+    expires_after="M94">
+  <owner>curranmax@google.com</owner>
+  <owner>megjablon@google.com</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    Records the time from when the translation script beings translating to when
+    it finishes.
+
+    This is recorded when a translation (both manual and automatic) is started.
+  </summary>
+</histogram>
+
+<histogram name="Translate.Translation.Type" enum="TranslationType"
+    expires_after="2021-08-01">
+  <owner>curranmax@google.com</owner>
+  <owner>megjablon@google.com</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    Records the type of translation being performed, either manual or automatic.
+    We additionally breakdown automatic translations by the reason why an
+    automatic translation was performed.
+
+    This is recorded when a translation (both manual and automatic) is started.
   </summary>
 </histogram>
 
 <histogram name="Translate.UndisplayableLanguage" enum="LanguageCode"
     expires_after="M81">
+  <obsolete>
+    Removed 01/09/2021. Not used anymore.
+  </obsolete>
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -861,7 +1076,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Translate.UserActionDuration" units="ms"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>kenjibaheux@google.com</owner>
   <owner>chrome-language@google.com</owner>
   <summary>
@@ -870,6 +1085,30 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram
+    name="TranslateModelService.LanguageDetectionModel.PendingRequestCallbacks"
+    units="requests" expires_after="M94">
+  <owner>mcrouse@chromium.org</owner>
+  <owner>chrome-language@chromium.org</owner>
+  <summary>
+    Records the number of requests that were pending when the language detection
+    model was provided and ready to be returned to requesters. Recorded once per
+    model update by the OptimizationGuide.
+  </summary>
+</histogram>
+
+<histogram name="TranslateModelService.LanguageDetectionModel.WasLoaded"
+    enum="BooleanLoaded" expires_after="M94">
+  <owner>mcrouse@chromium.org</owner>
+  <owner>chrome-language@chromium.org</owner>
+  <summary>
+    Records whether the language detection model file provided by the
+    OptimizationGuide was valid and was successfully loaded by the
+    TranslateModelService. Recorded once per model update by the
+    OptimizationGuide.
+  </summary>
+</histogram>
+
 </histograms>
 
 </histogram-configuration>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/ukm/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/ukm/histograms.xml
index 5916c50348a..5913443fef3 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/ukm/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/ukm/histograms.xml
@@ -70,7 +70,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UKM.Entries.Dropped" enum="UkmDataDroppedReason"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>rkaplow@chromium.org</owner>
   <owner>ukm-team@google.com</owner>
   <summary>
@@ -80,7 +80,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UKM.Entries.Dropped.ByEntryHash" enum="UkmEventNameHash"
-    expires_after="2021-04-18">
+    expires_after="2021-07-04">
   <owner>jwd@chromium.org</owner>
   <owner>ukm-team@google.com</owner>
   <summary>
@@ -92,7 +92,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UKM.Entries.Recorded.ByEntryHash" enum="UkmEventNameHash"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>yrsun@chromium.org</owner>
   <owner>ukm-team@google.com</owner>
   <summary>
@@ -104,7 +104,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UKM.Entries.SerializedCount2" units="entries"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>rkaplow@chromium.org</owner>
   <owner>ukm-team@google.com</owner>
   <summary>Number of serialized UKM entries when storing a UKM log.</summary>
@@ -134,7 +134,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="UKM.LogSize.OnSuccess" units="KB" expires_after="2021-04-11">
+<histogram name="UKM.IOSLog.OnSuccess" units="records"
+    expires_after="2021-07-11">
+  <owner>rkaplow@chromium.org</owner>
+  <summary>
+    Number of times when UKM.LogSize.OnSuccess was recorded on iOS. Recorded
+    when the app transitions to the foreground. This histogram should help to
+    figure out the root cause of crbug.com/1154678 (Data loss on UMA in iOS). If
+    total count of UKM.IOSLog.OnSuccess is greater than number of
+    UKM.LogSize.OnSuccess records, then data loss is caused by failure to write
+    the histogram to the disk on background thread. Otherwise (if total sum of
+    UKM.IOSLog.OnSuccess is equal to total count of UKM.LogSize.OnSuccess
+    records) then there is actually no data loss and app simply gets terminated
+    in a short window between UKM reached the server and the API call which
+    records the data.
+  </summary>
+</histogram>
+
+<histogram name="UKM.LogSize.OnSuccess" units="KB" expires_after="2021-08-15">
   <owner>rkaplow@chromium.org</owner>
   <owner>ukm-team@google.com</owner>
   <summary>
@@ -157,7 +174,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UKM.LogUpload.ResponseOrErrorCode"
-    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-04-18">
+    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-08-22">
   <owner>rkaplow@chromium.org</owner>
   <owner>ukm-team@google.com</owner>
   <summary>
@@ -186,7 +203,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UKM.ProtoCompressionRatio" units="%"
-    expires_after="2021-02-07">
+    expires_after="2021-07-01">
   <owner>rkaplow@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
@@ -218,7 +235,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UKM.Sources.Dropped" enum="UkmDataDroppedReason"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>rkaplow@chromium.org</owner>
   <owner>ukm-team@google.com</owner>
   <summary>
@@ -228,7 +245,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UKM.Sources.KeptSourcesCount" units="sources"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>rkaplow@chromium.org</owner>
   <owner>ukm-team@google.com</owner>
   <summary>
@@ -238,7 +255,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UKM.Sources.SerializedCount2{UkmSourceIdTypes}"
-    units="sources" expires_after="2021-02-14">
+    units="sources" expires_after="2021-07-01">
   <owner>rkaplow@chromium.org</owner>
   <owner>ukm-team@google.com</owner>
   <summary>
@@ -267,7 +284,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UKM.Sources.UnsentSourcesCount" units="sources"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>rkaplow@chromium.org</owner>
   <owner>ukm-team@google.com</owner>
   <summary>
@@ -277,7 +294,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UKM.UnsentLogs.DroppedSize" units="bytes"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>rkaplow@chromium.org</owner>
   <owner>ukm-team@google.com</owner>
   <summary>
@@ -287,7 +304,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UKM.UnsentLogs.NumDropped" units="units"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>rkaplow@chromium.org</owner>
   <owner>ukm-team@google.com</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/uma/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/uma/histograms.xml
index 1cdef095ef2..1fc2b82e7a2 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/uma/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/uma/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="UMA.ActualLogUploadInterval" units="minutes"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
@@ -43,17 +43,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.CleanExitBeaconConsistency" enum="UmaCleanExitConsistency"
-    expires_after="M85">
+    expires_after="2021-07-22">
   <owner>asvitkine@chromium.org</owner>
+  <owner>justincohen@chromium.org</owner>
+  <owner>olivierrobin@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
     Reports the combined state of distinct clean exit beacons stored in Local
-    State and the Windows registry. They are normally expected to be identical.
+    State and the Windows registry (or NSUserDefaults on iOS). They are normally
+    expected to be identical.
   </summary>
 </histogram>
 
 <histogram name="UMA.ClientIdBackupRecoveredWithAge" units="hours"
-    expires_after="2021-02-25">
+    expires_after="2021-07-18">
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
@@ -65,10 +68,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.EnrollmentStatus" enum="EnrollmentStatus"
-    expires_after="2021-04-15">
+    expires_after="never">
+<!-- expires-never: used internally for filtering -->
+
   <owner>asvitkine@chromium.org</owner>
   <owner>kaznacheev@chromium.org</owner>
-  <owner>src/base/metrics/OWNERS</owner>
+  <owner>chrome-metrics-team@google.com</owner>
   <summary>
     Logs the device enrollment status for Chrome OS device. Logged with every
     UMA upload.
@@ -76,7 +81,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.EntropySourceType" enum="UmaEntropySourceType"
-    expires_after="2021-04-15">
+    expires_after="2021-08-09">
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
@@ -118,8 +123,22 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="UMA.FileMetricsProvider.MergeHistogram.{Type}"
+    enum="HistogramNameHash" expires_after="2021-06-20">
+  <owner>asvitkine@chromium.org</owner>
+  <owner>chrome-metrics-team@google.com</owner>
+  <summary>
+    Records which histograms were merged into the current log from external
+    sources. {Type}
+  </summary>
+  <token key="Type">
+    <variant name="NotReadOnly" summary="From non-read-only sources."/>
+    <variant name="ReadOnly" summary="From read-only sources."/>
+  </token>
+</histogram>
+
 <histogram name="UMA.InitSequence" enum="UmaInitSequence"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
@@ -132,7 +151,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.IsClonedInstall" enum="BooleanCloned"
-    expires_after="2021-04-15">
+    expires_after="2021-07-11">
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
@@ -212,7 +231,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="UMA.LogSize.OnSuccess" units="KB" expires_after="2021-04-15">
+<histogram name="UMA.LogSize.OnSuccess" units="KB" expires_after="2021-08-22">
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
@@ -225,7 +244,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.LogUpload.Canceled.CellularConstraint"
-    enum="BooleanCanceled" expires_after="2021-05-09">
+    enum="BooleanCanceled" expires_after="2021-07-11">
   <owner>holte@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -236,7 +255,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.LogUpload.ResponseOrErrorCode"
-    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-04-15">
+    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-08-22">
   <owner>holte@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -258,7 +277,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.LowEntropySource3Value" units="units"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>asvitkine@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -270,7 +289,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.LowEntropySourceValue" units="units"
-    expires_after="2021-04-15">
+    expires_after="2021-08-09">
   <owner>asvitkine@chromium.org</owner>
   <owner>mpearson@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -283,7 +302,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.MachineIdState" enum="UmaMachineIdState"
-    expires_after="M77">
+    expires_after="2021-12-06">
   <owner>jwd@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
@@ -295,12 +314,18 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.MetricsIDsReset" enum="BooleanHit"
-    expires_after="2020-12-06">
+    expires_after="2021-12-06">
   <owner>jwd@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
-    A count of the number of times the metrics ids (client id and low entropy
-    source) have been reset due to a cloned install being detected.
+    Records when the metrics IDs (client id and low entry source) are reset due
+    to a cloned install detection. This is done during startup when
+    MetricsStateManager is created.
+
+    A cloned install is detected when the current machine ID (24-bit hash of
+    machine characteristics) is different than the one stored in local state. A
+    pref is then written to local state to indicate a clone. The metrics IDs are
+    reset on the next startup assuming the cloned install pref is still set.
   </summary>
 </histogram>
 
@@ -315,7 +340,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.MetricsService.Initialize" enum="Boolean"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>rkaplow@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
@@ -324,8 +349,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="UMA.MetricsService.Initialize.Time" units="ms"
+    expires_after="2021-06-13">
+  <owner>asvitkine@chromium.org</owner>
+  <owner>src/base/metrics/OWNERS</owner>
+  <summary>Time taken by MetricsService::InitializeMetricsState().</summary>
+</histogram>
+
 <histogram name="UMA.NegativeSamples.Histogram" enum="HistogramNameHash"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>asvitkine@chromium.org</owner>
   <owner>bcwhite@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -427,7 +459,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.PersistentHistograms.InitResult"
-    enum="PersistentHistogramsInitResult" expires_after="2021-04-25">
+    enum="PersistentHistogramsInitResult" expires_after="2021-06-27">
   <owner>bcwhite@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
@@ -437,7 +469,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.PrimaryUserType" enum="UserType"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>michaelpg@chromium.org</owner>
   <owner>yilkal@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -462,7 +494,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.ProtoCompressionRatio" units="%"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
@@ -473,7 +505,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.SamplingRatePerMille" units="samples per mille"
-    expires_after="2021-04-15">
+    expires_after="2021-06-27">
   <owner>jwd@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
@@ -501,7 +533,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.StructuredMetrics.EventRecordingState"
-    enum="StructuredMetricsEventRecordingState" expires_after="2021-04-04">
+    enum="StructuredMetricsEventRecordingState" expires_after="2021-12-01">
   <owner>tby@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -513,7 +545,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.StructuredMetrics.InternalError"
-    enum="StructuredMetricsInternalError" expires_after="2021-02-01">
+    enum="StructuredMetricsInternalError" expires_after="2021-12-01">
   <owner>tby@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -524,7 +556,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.StructuredMetrics.KeyValidationState"
-    enum="StructuredMetricsKeyValidationState" expires_after="2021-04-04">
+    enum="StructuredMetricsKeyValidationState" expires_after="2021-12-01">
   <owner>tby@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -536,7 +568,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.StructuredMetrics.NumEventsInUpload" units="count"
-    expires_after="2021-04-04">
+    expires_after="2021-12-01">
   <owner>tby@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -547,7 +579,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.StructuredMetrics.PrefReadError"
-    enum="PrefServiceReadError" expires_after="2021-04-04">
+    enum="PrefServiceReadError" expires_after="2021-12-01">
   <owner>tby@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
@@ -571,7 +603,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.TruncatedEvents.UserAction" units="events"
-    expires_after="2021-05-09">
+    expires_after="2021-08-22">
   <owner>rkaplow@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
@@ -584,13 +616,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     expires_after="2021-08-30">
   <owner>holte@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
-  <owner>mpearson@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
-    The number of UMA unsent logs removed from persistent storage.
-
-    Useful in comparison with UMA.UnsentLogs.IntendingToSend (that counts hte
-    number of UMA unsent logs that are intended to be sent, i.e., not dropped).
+    Counter for number of UMA unsent logs removed from persistent storage.
   </summary>
 </histogram>
 
@@ -608,22 +636,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="UMA.UnsentLogs.IntendingToSend" units="logs"
-    expires_after="2021-04-01">
-  <owner>mpearson@chromium.org</owner>
-  <owner>src/base/metrics/OWNERS</owner>
-  <summary>
-    The number of UMA unsent logs from persistent storage that will be staged /
-    are intended to be sent. These logs are not dropped from persistent storage.
-
-    Useful in comparison with UMA.UnsentLogs.Dropped (to see how many persistent
-    logs are intended to be sent versus are not intended to be sent) and with
-    UMA.UnsentLogs.IntendingToSend (to see how many are actually sent).
-  </summary>
-</histogram>
-
 <histogram name="UMA.UnsentLogs.PersistedSizeInKB" units="KB"
-    expires_after="2021-05-30">
+    expires_after="2021-08-01">
   <owner>michaelbai@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -634,19 +648,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="UMA.UnsentLogs.Sent" enum="Boolean" expires_after="2021-04-01">
-  <owner>mpearson@chromium.org</owner>
-  <owner>src/base/metrics/OWNERS</owner>
-  <summary>
-    Emitted when a UMA unsent log is marked as sent.
-
-    Useful in comparison with UMA.UnsentLogs.Dropped and
-    UMA.UnsentLogs.IntendingToSend.
-  </summary>
-</histogram>
-
 <histogram name="UMA.UnsentLogs.SentCount" units="samples"
-    expires_after="2021-05-30">
+    expires_after="2021-08-01">
   <owner>michaelbai@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -657,7 +660,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.UnsentLogs.UnsentCount" units="samples"
-    expires_after="2021-05-30">
+    expires_after="2021-08-01">
   <owner>michaelbai@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -668,7 +671,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.UnsentLogs.UnsentPercentage" units="%"
-    expires_after="2021-05-30">
+    expires_after="2021-08-01">
   <owner>michaelbai@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -679,7 +682,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UMA.UserActionsCount" enum="Boolean"
-    expires_after="2021-04-01">
+    expires_after="2021-09-01">
   <owner>mpearson@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
@@ -698,8 +701,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="UMA.UserDemographics.IsNoisedAgeOver21Under85"
+    enum="BooleanNoisedAgeOver21Under85" expires_after="2021-11-04">
+  <owner>tobyhuang@chromium.org</owner>
+  <owner>cros-families-eng@google.com</owner>
+  <summary>
+    True indicates that the current user is over the age of 21 and under the age
+    of 85 inclusive, and unknown otherwise. Specifically, this histogram can't
+    identify users under 21 and over 85. The user's age includes a random offset
+    for privacy. This metric is logged periodically through
+    ProvideCurrentSessionData().
+  </summary>
+</histogram>
+
 <histogram name="UMA.UserDemographics.Status" enum="UserDemographicsStatus"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>vincb@google.com</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/update_engine/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/update_engine/histograms.xml
index 096f136aaf9..56d35e68cb5 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/update_engine/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/update_engine/histograms.xml
@@ -298,7 +298,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UpdateEngine.Check.RollbackTargetVersion"
-    enum="UpdateEngineChromeOsVersionPrefix" expires_after="2021-03-15">
+    enum="UpdateEngineChromeOsVersionPrefix" expires_after="2021-08-09">
   <owner>mpolzer@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -318,7 +318,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UpdateEngine.Check.TargetVersion"
-    enum="UpdateEngineChromeOsVersionPrefix" expires_after="2021-03-15">
+    enum="UpdateEngineChromeOsVersionPrefix" expires_after="2021-07-18">
   <owner>mpolzer@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -377,7 +377,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UpdateEngine.EnterpriseRollback.Failure"
-    enum="UpdateEngineChromeOsVersionPrefix" expires_after="2021-01-01">
+    enum="UpdateEngineChromeOsVersionPrefix" expires_after="2021-06-01">
   <owner>mpolzer@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -395,7 +395,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="UpdateEngine.EnterpriseRollback.Success"
-    enum="UpdateEngineChromeOsVersionPrefix" expires_after="2021-01-01">
+    enum="UpdateEngineChromeOsVersionPrefix" expires_after="2021-06-01">
   <owner>mpolzer@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
@@ -597,8 +597,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="UpdateEngine.SuccessfulUpdate.DurationFromSeenDays.NoTimeRestriction"
-    units="days" expires_after="2021-05-09">
-  <owner>mpolzer@google.com</owner>
+    units="days" expires_after="2021-07-11">
+  <owner>snijhara@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
     The total number of days from when an update is first seen to when an update
@@ -612,8 +612,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="UpdateEngine.SuccessfulUpdate.DurationFromSeenDays.TimeRestricted"
-    units="days" expires_after="2021-01-01">
-  <owner>mpolzer@google.com</owner>
+    units="days" expires_after="2021-05-09">
+  <owner>snijhara@google.com</owner>
   <owner>managed-platforms@google.com</owner>
   <summary>
     The total number of days from when an update is first seen to when an update
diff --git a/chromium/tools/metrics/histograms/histograms_xml/v8/OWNERS b/chromium/tools/metrics/histograms/histograms_xml/v8/OWNERS
new file mode 100644
index 00000000000..27b651c1cae
--- /dev/null
+++ b/chromium/tools/metrics/histograms/histograms_xml/v8/OWNERS
@@ -0,0 +1 @@
+mlippautz@chromium.org
\ No newline at end of file
diff --git a/chromium/tools/metrics/histograms/histograms_xml/v8/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/v8/histograms.xml
index 15e169641c2..6e7094144ec 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/v8/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/v8/histograms.xml
@@ -46,7 +46,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="V8.CodeCacheSizeRatio" units="%" expires_after="2021-04-18">
+<histogram name="V8.CodeCacheSizeRatio" units="%" expires_after="2021-07-27">
   <owner>yangguo@chromium.org</owner>
   <summary>Cache size to source size ratio when caching compiled code.</summary>
 </histogram>
@@ -80,7 +80,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.CompileDeserializeMicroSeconds" units="microseconds"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>vogelheim@chromium.org</owner>
   <summary>
     Time spent deseriailzing code, used by V8 code caching.
@@ -108,7 +108,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.CompileLazyMicroSeconds" units="microseconds"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>hablich@chromium.org</owner>
   <summary>
     Aggregated time spent compiling functions lazily during a single script
@@ -123,7 +123,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.CompileMicroSeconds" units="microseconds"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>yangguo@chromium.org</owner>
   <summary>
     Time spent in V8 compiler (full codegen) excluding parser.
@@ -137,7 +137,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.CompileScript.CacheBehaviour" enum="V8CacheBehaviour"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>
@@ -148,7 +148,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.CompileScriptMicroSeconds" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>
@@ -163,7 +163,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.CompileScriptMicroSeconds.BackgroundThread"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-08-09">
   <owner>leszeks@chromium.org</owner>
   <owner>rmcilroy@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
@@ -180,7 +180,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.CompileScriptMicroSeconds.ConsumeCache"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-08-09">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>
@@ -228,7 +228,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.CompileScriptMicroSeconds.NoCache.CacheTooCold"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-08-09">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>
@@ -276,7 +276,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.CompileScriptMicroSeconds.NoCache.ScriptTooSmall"
-    units="microseconds" expires_after="2021-02-01">
+    units="microseconds" expires_after="2021-08-15">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>
@@ -292,7 +292,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.CompileScriptMicroSeconds.ProduceCache"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-08-08">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>
@@ -308,7 +308,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.CompileScriptMicroSeconds.StreamingFinalization"
-    units="microseconds" expires_after="2021-04-04">
+    units="microseconds" expires_after="2021-08-08">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>
@@ -337,8 +337,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.DebugFeatureUsage" enum="V8DebugFeature"
-    expires_after="2021-01-10">
+    expires_after="2022-01-10">
   <owner>yangguo@chromium.org</owner>
+  <owner>bmeurer@chromium.org</owner>
   <summary>
     Debugger feature used at least once per isolate, recorded on first use.
   </summary>
@@ -354,7 +355,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="V8.Execute" units="ms" expires_after="2021-05-09">
+<histogram name="V8.Execute" units="ms" expires_after="2021-07-11">
   <owner>rmcilroy@chromium.org</owner>
   <summary>
     Time spent in JavaScript Execution, including runtime calls, callbacks, and
@@ -362,7 +363,40 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="V8.GCBackgroundMarking" units="ms" expires_after="2021-04-01">
+<histogram name="V8.GC.TimeToCollectionOnBackground" units="microseconds"
+    expires_after="2021-10-01">
+  <owner>dinfuehr@chromium.org</owner>
+  <owner>ulan@chromium.org</owner>
+  <summary>
+    Time between requesting GC from background thread and actually starting
+    collection on main thread. This is reported each time a background thread
+    requests a GC.
+
+    Warning: This metric may include reports from clients with low-resolution
+    clocks (i.e. on Windows, ref. |TimeTicks::IsHighResolution()|). Such reports
+    will cause this metric to have an abnormal distribution. When considering
+    revising this histogram, see UMA_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES for the
+    solution.
+  </summary>
+</histogram>
+
+<histogram name="V8.GC.TimeToSafepoint" units="microseconds"
+    expires_after="2021-10-01">
+  <owner>dinfuehr@chromium.org</owner>
+  <owner>ulan@chromium.org</owner>
+  <summary>
+    Time spent in stopping other threads to reach a safepoint. This is reported
+    each time a safepoint is reached.
+
+    Warning: This metric may include reports from clients with low-resolution
+    clocks (i.e. on Windows, ref. |TimeTicks::IsHighResolution()|). Such reports
+    will cause this metric to have an abnormal distribution. When considering
+    revising this histogram, see UMA_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES for the
+    solution.
+  </summary>
+</histogram>
+
+<histogram name="V8.GCBackgroundMarking" units="ms" expires_after="2021-08-09">
   <owner>ulan@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>
@@ -372,7 +406,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.GCBackgroundScavenger" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-08-15">
   <owner>ulan@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>
@@ -390,7 +424,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="V8.GCCompactor" units="ms" expires_after="2021-04-01">
+<histogram name="V8.GCCompactor" units="ms" expires_after="2021-08-09">
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>Time spent in mark-sweep phase of GC.</summary>
@@ -406,7 +440,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.GCCompactorForeground" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>
@@ -414,7 +448,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="V8.GCFinalizeMC" units="ms" expires_after="2021-04-01">
+<histogram name="V8.GCFinalizeMC" units="ms" expires_after="2021-08-09">
   <owner>ulan@chromium.org</owner>
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
@@ -445,7 +479,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.GCFinalizeMC.Evacuate" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-07-27">
   <owner>ulan@chromium.org</owner>
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
@@ -455,7 +489,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="V8.GCFinalizeMC.Finish" units="ms" expires_after="2021-04-01">
+<histogram name="V8.GCFinalizeMC.Finish" units="ms" expires_after="2021-08-09">
   <owner>ulan@chromium.org</owner>
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
@@ -465,7 +499,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="V8.GCFinalizeMC.Mark" units="ms" expires_after="2021-04-01">
+<histogram name="V8.GCFinalizeMC.Mark" units="ms" expires_after="2021-08-09">
   <owner>ulan@chromium.org</owner>
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
@@ -518,7 +552,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.GCFinalizeMCReduceMemory" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>ulan@chromium.org</owner>
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
@@ -550,7 +584,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="V8.GCIncrementalMarking" units="ms" expires_after="2021-04-01">
+<histogram name="V8.GCIncrementalMarking" units="ms" expires_after="2021-08-09">
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>Time spent doing incremental marking steps during GC.</summary>
@@ -564,21 +598,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.GCIncrementalMarkingReason" enum="GarbageCollectionReason"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>ulan@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>Reason an incremental marking was started in V8.</summary>
 </histogram>
 
 <histogram name="V8.GCIncrementalMarkingStart" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>Time spent in starting incremental marking.</summary>
 </histogram>
 
 <histogram name="V8.GCIncrementalMarkingSum" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>ulan@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>
@@ -588,7 +622,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.GCMainThreadMarkingThroughput" units="MB/s"
-    expires_after="2021-04-01">
+    expires_after="2021-07-27">
   <owner>mlippautz@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>
@@ -600,7 +634,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="V8.GCMarkCompactor" units="ms" expires_after="2021-04-01">
+<histogram name="V8.GCMarkCompactor" units="ms" expires_after="2021-06-27">
   <owner>mlippautz@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>
@@ -610,13 +644,13 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.GCMarkCompactReason" enum="GarbageCollectionReason"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>ulan@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>Reason a mark-compact garbage collection was started in V8.</summary>
 </histogram>
 
-<histogram name="V8.GCMarkingSum" units="ms" expires_after="2021-04-01">
+<histogram name="V8.GCMarkingSum" units="ms" expires_after="2021-08-08">
   <owner>mlippautz@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>
@@ -626,14 +660,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="V8.GCScavenger" units="ms" expires_after="2021-04-01">
+<histogram name="V8.GCScavenger" units="ms" expires_after="2021-08-09">
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>Time spent in scavenging phase of GC.</summary>
 </histogram>
 
 <histogram name="V8.GCScavenger.ScavengeMain" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>mlippautz@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>
@@ -643,14 +677,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.GCScavenger.ScavengeRoots" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-07-11">
   <owner>mlippautz@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>Time spent in scavenging the roots during a V8 scavenge.</summary>
 </histogram>
 
 <histogram name="V8.GCScavengerBackground" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-08-15">
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>
@@ -666,7 +700,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.GCScavengerForeground" units="ms"
-    expires_after="2021-04-01">
+    expires_after="2021-08-09">
   <owner>hpayer@chromium.org</owner>
   <owner>v8-memory-sheriffs@google.com</owner>
   <summary>
@@ -687,7 +721,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.LiftoffBailoutReasons" enum="LiftoffBailoutReason"
-    expires_after="2021-02-07">
+    expires_after="2021-08-15">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>clemensb@chromium.org</owner>
@@ -765,7 +799,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.MemoryHeapSampleTotalCommitted" units="KB"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>hpayer@chromium.org</owner>
   <summary>
     The total size of committed memory used by V8 after each GC in KB.
@@ -773,7 +807,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.MemoryHeapSampleTotalUsed" units="KB"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>hpayer@chromium.org</owner>
   <summary>
     The total size of live memory used by V8 after each GC in KB.
@@ -781,7 +815,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.RegExpBacktracks" units="backtracks"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>jgruber@chromium.org</owner>
   <owner>mvstanton@chromium.org</owner>
   <summary>
@@ -799,12 +833,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.StopTheWorld" units="ms" expires_after="2021-10-01">
+  <obsolete>
+    Removed 02/2021. Renamed to V8.GC.TimeToSafepoint due to switch to
+    microseconds.
+  </obsolete>
   <owner>dinfuehr@chromium.org</owner>
   <owner>ulan@chromium.org</owner>
   <summary>Time spent in stopping other threads before performing GC.</summary>
 </histogram>
 
 <histogram name="V8.TimeToCollection" units="ms" expires_after="2021-10-01">
+  <obsolete>
+    Removed 02/2021. Renamed to V8.GC.TimeToCollectionBackground due to switch
+    to microseconds.
+  </obsolete>
   <owner>dinfuehr@chromium.org</owner>
   <owner>ulan@chromium.org</owner>
   <summary>
@@ -828,7 +870,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.TurboFanOptimizeConcurrentTotalTime" units="microseconds"
-    expires_after="2021-03-15">
+    expires_after="2021-08-01">
   <owner>bmeurer@chromium.org</owner>
   <owner>mslekova@chromium.org</owner>
   <summary>
@@ -840,7 +882,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.TurboFanOptimizeExecute" units="microseconds"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>neis@chromium.org</owner>
   <owner>mvstanton@chromium.org</owner>
   <summary>
@@ -852,7 +894,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.TurboFanOptimizeFinalize" units="microseconds"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>neis@chromium.org</owner>
   <owner>mvstanton@chromium.org</owner>
   <summary>
@@ -864,7 +906,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.TurboFanOptimizeForOnStackReplacementExecute"
-    units="microseconds" expires_after="2021-05-09">
+    units="microseconds" expires_after="2021-07-11">
   <owner>neis@chromium.org</owner>
   <owner>mvstanton@chromium.org</owner>
   <summary>
@@ -877,7 +919,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.TurboFanOptimizeForOnStackReplacementFinalize"
-    units="microseconds" expires_after="2021-05-09">
+    units="microseconds" expires_after="2021-07-11">
   <owner>neis@chromium.org</owner>
   <owner>mvstanton@chromium.org</owner>
   <summary>
@@ -890,7 +932,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.TurboFanOptimizeForOnStackReplacementPrepare"
-    units="microseconds" expires_after="2021-05-09">
+    units="microseconds" expires_after="2021-07-11">
   <owner>neis@chromium.org</owner>
   <owner>mvstanton@chromium.org</owner>
   <summary>
@@ -903,7 +945,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.TurboFanOptimizeForOnStackReplacementTotalTime"
-    units="microseconds" expires_after="2021-05-09">
+    units="microseconds" expires_after="2021-07-11">
   <owner>neis@chromium.org</owner>
   <owner>mvstanton@chromium.org</owner>
   <summary>
@@ -916,8 +958,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.TurboFanOptimizeNonConcurrentTotalTime"
-    units="microseconds" expires_after="2020-12-31">
-  <owner>bmeurer@chromium.org</owner>
+    units="microseconds" expires_after="2021-05-09">
+  <owner>neis@chromium.org</owner>
+  <owner>mvstanton@chromium.org</owner>
   <owner>mslekova@chromium.org</owner>
   <summary>
     Total time from starting optimizing to installing the code object. Recorded
@@ -928,7 +971,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.TurboFanOptimizePrepare" units="microseconds"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>neis@chromium.org</owner>
   <owner>mvstanton@chromium.org</owner>
   <summary>
@@ -940,7 +983,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.TurboFanOptimizeTotalBackground" units="microseconds"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>neis@chromium.org</owner>
   <owner>mvstanton@chromium.org</owner>
   <summary>
@@ -952,7 +995,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.TurboFanOptimizeTotalForeground" units="microseconds"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>neis@chromium.org</owner>
   <owner>mvstanton@chromium.org</owner>
   <summary>
@@ -964,7 +1007,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.TurboFanOptimizeTotalTime" units="microseconds"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>neis@chromium.org</owner>
   <owner>mvstanton@chromium.org</owner>
   <summary>
@@ -976,7 +1019,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmAddressSpaceUsageMiB" units="MB"
-    expires_after="2021-03-31">
+    expires_after="2022-02-15">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>ahaas@chromium.org</owner>
@@ -987,8 +1030,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="V8.WasmCatchCount" units="count" expires_after="2021-11-24">
+  <owner>thibaudm@chromium.org</owner>
+  <owner>ecmziegler@chromium.org</owner>
+  <summary>
+    Number of exceptions caught so far in an isolate, recorded on each caught
+    exception.
+  </summary>
+</histogram>
+
 <histogram name="V8.WasmCompileFunctionMicroSeconds" units="microseconds"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>clemensb@chromium.org</owner>
@@ -1005,7 +1057,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmCompileFunctionPeakMemoryBytes" units="bytes"
-    expires_after="2021-03-31">
+    expires_after="2022-02-15">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>clemensb@chromium.org</owner>
@@ -1016,7 +1068,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmCompileModuleAsyncMicroSeconds" units="microseconds"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>clemensb@chromium.org</owner>
@@ -1028,7 +1080,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmCompileModuleMicroSeconds" units="microseconds"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>clemensb@chromium.org</owner>
@@ -1045,7 +1097,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmCompileModuleStreamingMicroSeconds"
-    units="microseconds" expires_after="2021-03-31">
+    units="microseconds" expires_after="2021-08-01">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>clemensb@chromium.org</owner>
@@ -1059,7 +1111,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmFinishModuleStreamingMicroSeconds" units="microseconds"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>bbudge@chromium.org</owner>
   <owner>clemensb@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
@@ -1074,7 +1126,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmFunctionSizeBytes" units="bytes"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>clemensb@chromium.org</owner>
@@ -1085,7 +1137,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmFunctionsPerModule" units="functions"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>clemensb@chromium.org</owner>
@@ -1096,7 +1148,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmInstantiateModuleMicroSeconds" units="microseconds"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>clemensb@chromium.org</owner>
@@ -1113,7 +1165,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmMaxMemPagesCount" units="pages"
-    expires_after="2021-03-31">
+    expires_after="2022-02-15">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>ahaas@chromium.org</owner>
@@ -1124,7 +1176,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmMemoryAllocationResult" enum="WasmAllocationResult"
-    expires_after="2021-03-31">
+    expires_after="2021-08-09">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>ahaas@chromium.org</owner>
@@ -1135,7 +1187,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmMinMemPagesCount" units="pages"
-    expires_after="2021-03-31">
+    expires_after="2022-02-15">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>ahaas@chromium.org</owner>
@@ -1146,7 +1198,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmModuleCodeSizeBaselineMiB" units="MB"
-    expires_after="2021-03-31">
+    expires_after="2022-02-15">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>clemensb@chromium.org</owner>
@@ -1157,7 +1209,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmModuleCodeSizeMiB" units="MB"
-    expires_after="2021-03-31">
+    expires_after="2022-02-15">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>clemensb@chromium.org</owner>
@@ -1168,7 +1220,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmModuleCodeSizePercentFreed" units="%"
-    expires_after="2021-03-31">
+    expires_after="2022-02-15">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>clemensb@chromium.org</owner>
@@ -1180,7 +1232,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmModuleCodeSizeTopTierMiB" units="MB"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>clemensb@chromium.org</owner>
@@ -1191,7 +1243,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmModuleNumberOfCodeGCsTriggered" units="gcs"
-    expires_after="2021-03-31">
+    expires_after="2021-08-09">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>clemensb@chromium.org</owner>
@@ -1202,7 +1254,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmModuleNumberOfCodeSpaces" units="spaces"
-    expires_after="2021-03-31">
+    expires_after="2022-02-15">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>clemensb@chromium.org</owner>
@@ -1213,7 +1265,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmModuleSizeBytes" units="bytes"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>ahaas@chromium.org</owner>
@@ -1225,7 +1277,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmModulesPerEngine" units="count"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>clemensb@chromium.org</owner>
   <owner>ecmziegler@chromium.org</owner>
   <summary>
@@ -1235,7 +1287,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="V8.WasmModulesPerIsolate" units="count"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>clemensb@chromium.org</owner>
   <owner>ecmziegler@chromium.org</owner>
   <summary>
@@ -1244,8 +1296,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="V8.WasmReThrowCount" units="count" expires_after="2021-11-24">
+  <owner>thibaudm@chromium.org</owner>
+  <owner>ecmziegler@chromium.org</owner>
+  <summary>
+    Number of exceptions rethrown so far in an isolate, recorded on each
+    rethrown exception.
+  </summary>
+</histogram>
+
+<histogram name="V8.WasmThrowCount" units="count" expires_after="2021-11-24">
+  <owner>thibaudm@chromium.org</owner>
+  <owner>ecmziegler@chromium.org</owner>
+  <summary>
+    Number of exceptions thrown so far in an isolate, recorded on each thrown
+    exception.
+  </summary>
+</histogram>
+
 <histogram name="V8.WasmTierUpModuleMicroSeconds" units="microseconds"
-    expires_after="2021-03-31">
+    expires_after="2021-08-01">
   <owner>ecmziegler@chromium.org</owner>
   <owner>adamk@chromium.org</owner>
   <owner>clemensb@chromium.org</owner>
@@ -1257,6 +1327,36 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="V8.WasmTimeBetweenCatchMilliseconds" units="ms"
+    expires_after="2021-11-24">
+  <owner>thibaudm@chromium.org</owner>
+  <owner>ecmziegler@chromium.org</owner>
+  <summary>
+    Time since the last time an exception was caught in WebAssembly, recorded
+    when the next exception is caught (per isolate).
+  </summary>
+</histogram>
+
+<histogram name="V8.WasmTimeBetweenRethrowsMilliseconds" units="ms"
+    expires_after="2021-11-24">
+  <owner>thibaudm@chromium.org</owner>
+  <owner>ecmziegler@chromium.org</owner>
+  <summary>
+    Time since the last time an exception was rethrown in WebAssembly, recorded
+    when the next exception is rethrown (per isolate).
+  </summary>
+</histogram>
+
+<histogram name="V8.WasmTimeBetweenThrowsMilliseconds" units="ms"
+    expires_after="2021-11-24">
+  <owner>thibaudm@chromium.org</owner>
+  <owner>ecmziegler@chromium.org</owner>
+  <summary>
+    Time since the last time an exception was thrown in WebAssembly, recorded
+    when the next exception is thrown (per isolate).
+  </summary>
+</histogram>
+
 </histograms>
 
 </histogram-configuration>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/variations/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/variations/histograms.xml
index ac7b0ee12f1..acd2355e634 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/variations/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/variations/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="Variations.AppSeedFreshness" units="minutes"
-    expires_after="2021-03-28">
+    expires_after="2021-08-01">
   <owner>rmcelrath@chromium.org</owner>
   <owner>ntfschr@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
@@ -52,7 +52,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.CreateTrials.SeedExpiry"
-    enum="VariationsSeedExpiry" expires_after="2021-04-15">
+    enum="VariationsSeedExpiry" expires_after="2021-08-22">
   <owner>asvitkine@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -88,7 +88,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.FirstRun.SeedFetchTime" units="ms"
-    expires_after="2021-04-15">
+    expires_after="2021-08-09">
   <owner>asvitkine@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -99,7 +99,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.FirstRunPrefsDebug"
-    enum="VariationsFirstRunPrefEvents" expires_after="2021-04-25">
+    enum="VariationsFirstRunPrefEvents" expires_after="2021-06-27">
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
@@ -109,7 +109,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.FirstRunResult" enum="VariationsFirstRunResult"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>asvitkine@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -136,7 +136,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.Headers.ExperimentCount" units="units"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>asvitkine@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -162,7 +162,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="Variations.Headers.URLValidationResult{VariationsHeadersURLValidationResult}"
-    enum="VariationsHeadersURLValidationResult" expires_after="2020-12-15">
+    enum="VariationsHeadersURLValidationResult" expires_after="2021-03-15">
   <owner>asvitkine@chromium.org</owner>
   <owner>jwd@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -212,7 +212,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.PolicyRestriction"
-    enum="VariationsRestrictionPolicyValues" expires_after="2020-12-31">
+    enum="VariationsRestrictionPolicyValues" expires_after="2021-05-31">
   <owner>pastarmovj@chromium.org</owner>
   <owner>ydago@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -236,7 +236,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.ResourceRequestsAllowed"
-    enum="VariationsResourceRequestsAllowedState" expires_after="2021-04-15">
+    enum="VariationsResourceRequestsAllowedState" expires_after="2021-08-22">
   <owner>asvitkine@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -248,7 +248,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.SafeMode.FellBackToSafeMode2"
-    enum="BooleanSafeMode" expires_after="2021-04-15">
+    enum="BooleanSafeMode" expires_after="2021-08-22">
   <owner>isherman@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -307,7 +307,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.SafeMode.Streak.Crashes" units="crashes"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>isherman@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -319,7 +319,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.SafeMode.Streak.FetchFailures" units="failures"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>isherman@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -331,7 +331,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.SeedDateChange" enum="VariationsSeedDateChange"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>jwd@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -345,7 +345,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.SeedFetchResponseOrErrorCode"
-    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-04-15">
+    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-08-22">
   <owner>asvitkine@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -357,7 +357,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.SeedFetchResponseOrErrorCode.HTTP"
-    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-04-15">
+    enum="CombinedHttpResponseAndNetErrorCode" expires_after="2021-08-22">
   <owner>asvitkine@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -369,7 +369,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.SeedFreshness" units="minutes"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>asvitkine@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -381,7 +381,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.SeedLoadBlockingTime" units="ms"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>changwan@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
   <summary>
@@ -396,7 +396,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.SeedLoadResult" enum="VariationsSeedLoadResult"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>asvitkine@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -408,7 +408,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.SeedProcessingTime" units="ms"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>isherman@chromium.org</owner>
   <owner>asvitkine@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -419,7 +419,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.SeedStoreResult" enum="VariationsSeedStoreResult"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>asvitkine@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -484,7 +484,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.StoreSeed.DataSize" units="KiB"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>asvitkine@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -529,7 +529,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.UserChannel" enum="UserChannels"
-    expires_after="2021-04-15">
+    expires_after="2021-08-22">
   <owner>asvitkine@chromium.org</owner>
   <owner>rkaplow@chromium.org</owner>
   <owner>src/base/metrics/OWNERS</owner>
@@ -541,6 +541,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Variations.WebViewDownloadJobFetchResult"
     enum="VariationsSeedFetchResult" expires_after="2021-01-31">
+  <obsolete>
+    Removed from code January 2021.
+  </obsolete>
   <owner>rmcelrath@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -551,6 +554,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="Variations.WebViewDownloadJobFetchTime2" units="ms"
     expires_after="2021-01-31">
+  <obsolete>
+    Removed from code January 2021.
+  </obsolete>
   <owner>rmcelrath@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
@@ -560,8 +566,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.WebViewDownloadJobInterval" units="minutes"
-    expires_after="2021-01-31">
-  <owner>rmcelrath@chromium.org</owner>
+    expires_after="2022-01-20">
+  <owner>ntfschr@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
     The time between the start of two consecutive WebView seed downloads by
@@ -571,8 +577,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Variations.WebViewDownloadJobQueueTime" units="minutes"
-    expires_after="2021-01-31">
-  <owner>rmcelrath@chromium.org</owner>
+    expires_after="2022-01-20">
+  <owner>ntfschr@chromium.org</owner>
   <owner>src/android_webview/OWNERS</owner>
   <summary>
     The delay between when a WebView seed download was scheduled by the service
diff --git a/chromium/tools/metrics/histograms/histograms_xml/video_tutorials/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/video_tutorials/histograms.xml
index b9283d42d1f..83e8a2ee23b 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/video_tutorials/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/video_tutorials/histograms.xml
@@ -53,7 +53,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="VideoTutorials.Player.LoadTimeLatency" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>shaktisahu@chromium.org</owner>
   <owner>chrome-upboarding-eng@google.com</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/web_apk/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/web_apk/histograms.xml
index abc0e2ce989..d4f540b83a7 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/web_apk/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/web_apk/histograms.xml
@@ -21,8 +21,14 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<variants name="WebApkDistributorType">
+  <variant name=".Browser" summary="Installed by Chrome"/>
+  <variant name=".DevicePolicy" summary="Installed by device policy"/>
+  <variant name=".Other" summary="Installed by other sources"/>
+</variants>
+
 <histogram name="WebApk.Install.AvailableSpace.Fail" units="MB"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
@@ -37,7 +43,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebApk.Install.AvailableSpaceAfterFreeUpCache.Fail" units="MB"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
@@ -52,7 +58,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebApk.Install.GooglePlayErrorCode"
-    enum="WebApkInstallGooglePlayErrorCode" expires_after="2021-02-01">
+    enum="WebApkInstallGooglePlayErrorCode" expires_after="2022-02-01">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
@@ -64,7 +70,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebApk.Install.GooglePlayInstallResult"
-    enum="WebApkGooglePlayInstallResult" expires_after="2021-05-09">
+    enum="WebApkGooglePlayInstallResult" expires_after="2021-07-11">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
@@ -76,7 +82,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebApk.Install.InstallDuration" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
@@ -89,7 +95,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebApk.Install.InstallEvent" enum="WebApkInstallEvent"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
@@ -102,7 +108,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebApk.Install.RequestTokenDuration" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>hartmanng@chromium.org</owner>
   <owner>rayankans@chromium.org</owner>
   <owner>
@@ -118,7 +124,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebApk.Install.RequestTokenDurationV2" units="ms"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>hartmanng@chromium.org</owner>
   <owner>rayankans@chromium.org</owner>
   <owner>
@@ -131,7 +137,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebApk.Launch.NetworkError" enum="NetErrorCodes"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
@@ -142,7 +148,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebApk.Navigation.InScope" enum="Boolean"
-    expires_after="2021-02-01">
+    expires_after="2021-07-18">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
@@ -155,7 +161,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebApk.Notification.Permission.Status"
-    enum="BooleanWebApkNotificationPermission" expires_after="2021-04-25">
+    enum="BooleanWebApkNotificationPermission" expires_after="2021-08-01">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
@@ -166,20 +172,23 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebApk.Session.TotalDuration2" units="ms"
-    expires_after="2021-03-15">
+<histogram name="WebApk.Session.TotalDuration2{WebApkDistributorType}"
+    units="ms" expires_after="2021-05-16">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
   </owner>
   <summary>
     The length of a WebAPK session (launch/foregrounding to backgrounding) in
-    milliseconds.
+    milliseconds. {WebApkDistributorType}
   </summary>
+  <token key="WebApkDistributorType" variants="WebApkDistributorType">
+    <variant name=""/>
+  </token>
 </histogram>
 
-<histogram base="true" name="WebApk.ShellApkVersion2" units="units"
-    expires_after="2021-04-04">
+<histogram name="WebApk.ShellApkVersion2{WebApkDistributorType}" units="units"
+    expires_after="2021-06-06">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
@@ -187,7 +196,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <summary>
     Records WebAPK &quot;Shell APK version&quot; when the WebAPK is launched.
     The &quot;Shell APK version&quot; is documented in shell_apk_version.gni
+    {WebApkDistributorType}
   </summary>
+  <token key="WebApkDistributorType" variants="WebApkDistributorType">
+    <variant name="">
+      <obsolete>
+        Base histogram. Use suffixes of this histogram instead.
+      </obsolete>
+    </variant>
+  </token>
 </histogram>
 
 <histogram name="WebApk.Startup.Cold.NewStyle.ShellLaunchToSplashscreenVisible"
@@ -225,7 +242,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebApk.Startup.Cold.ShellLaunchToSplashscreenVisible"
-    units="ms" expires_after="2021-04-11">
+    units="ms" expires_after="2021-08-22">
   <owner>mheikal@chromium.org</owner>
   <owner>yfriedman@chromium.org</owner>
   <summary>
@@ -240,17 +257,26 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram base="true" name="WebApk.Uninstall" enum="BooleanHit"
+<histogram name="WebApk.Uninstall{WebApkDistributorType}" enum="BooleanHit"
     expires_after="2021-06-06">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
   </owner>
-  <summary>Records that a WebAPK was uninstalled.</summary>
+  <summary>
+    Records that a WebAPK was uninstalled. {WebApkDistributorType}
+  </summary>
+  <token key="WebApkDistributorType" variants="WebApkDistributorType">
+    <variant name="">
+      <obsolete>
+        Base histogram. Use suffixes of this histogram instead.
+      </obsolete>
+    </variant>
+  </token>
 </histogram>
 
 <histogram name="WebApk.Update.GooglePlayUpdateResult"
-    enum="WebApkGooglePlayInstallResult" expires_after="2021-04-04">
+    enum="WebApkGooglePlayInstallResult" expires_after="2021-08-08">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
@@ -262,7 +288,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebApk.Update.NumStaleUpdateRequestFiles" units="files"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
@@ -275,7 +301,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebApk.Update.RequestQueued" enum="WebApkUpdateRequestQueued"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
@@ -287,7 +313,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebApk.Update.RequestSent" enum="WebApkUpdateRequestSent"
-    expires_after="2021-02-01">
+    expires_after="2022-02-01">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
@@ -299,7 +325,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebApk.WebApkService.BindSuccess" enum="BooleanSuccess"
-    expires_after="2021-02-01">
+    expires_after="2021-07-18">
   <owner>hartmanng@chromium.org</owner>
   <owner>
     src/chrome/android/java/src/org/chromium/chrome/browser/webapps/OWNERS
diff --git a/chromium/tools/metrics/histograms/histograms_xml/web_audio/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/web_audio/histograms.xml
index e3a11315ec5..66c96a06168 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/web_audio/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/web_audio/histograms.xml
@@ -22,7 +22,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 <histograms>
 
 <histogram name="WebAudio.AudioBuffer.Length" units="frames"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -32,7 +32,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.AudioBuffer.NumberOfChannels" units="units"
-    expires_after="2021-01-06">
+    expires_after="2021-07-06">
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -42,7 +42,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.AudioBuffer.SampleRate384kHz" units="Hz"
-    expires_after="2021-04-18">
+    expires_after="2021-08-22">
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -52,7 +52,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.AudioBuffer.SampleRateRatio384kHz" units="units"
-    expires_after="2021-01-06">
+    expires_after="2021-07-06">
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -63,7 +63,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.AudioContext.HardwareSampleRate" units="Hz"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -72,8 +72,32 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="WebAudio.AudioContext.latencyHintCategory" units="units"
+    expires_after="2021-06-30">
+  <owner>rtoy@chromium.org</owner>
+  <owner>hongchan@chromium.org</owner>
+  <summary>
+    If provided, the latencyHint option category of &quot;interactive&quot;,
+    &quot;balanced&quot;, &quot;playback&quot;, or &quot;exact&quot;, in that
+    order where &quot;exact&quot; means an explicit floating point value was
+    provided. Recorded for every AudioContext that is constructed with a
+    latencyHint.
+  </summary>
+</histogram>
+
+<histogram name="WebAudio.AudioContext.latencyHintMilliSeconds" units="ms"
+    expires_after="2021-06-30">
+  <owner>rtoy@chromium.org</owner>
+  <owner>hongchan@chromium.org</owner>
+  <summary>
+    If the latencyHint is provided and is a floating-point number, the value in
+    milliseconds is recorded. This is recorded for every AudioContext that is
+    constructed with a floating-point latencyHint value.
+  </summary>
+</histogram>
+
 <histogram name="WebAudio.AudioContext.MaxChannelsAvailable" units="units"
-    expires_after="2021-01-06">
+    expires_after="2021-07-06">
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -84,7 +108,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.AudioContextOptions.sampleRate" units="Hz"
-    expires_after="2021-04-18">
+    expires_after="2021-08-09">
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -95,7 +119,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.AudioContextOptions.sampleRateRatio" units="units"
-    expires_after="2021-04-18">
+    expires_after="2021-08-09">
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -106,7 +130,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.AudioDestination.CallbackBufferSize" units="units"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -118,7 +142,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.AudioDestination.HardwareBufferSize" units="units"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -128,7 +152,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.Autoplay" enum="WebAudioAutoplayStatus"
-    expires_after="2021-06-01">
+    expires_after="2021-08-09">
   <owner>mlamouri@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <owner>rtoy@chromium.org</owner>
@@ -141,7 +165,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.Autoplay.CrossOrigin" enum="WebAudioAutoplayStatus"
-    expires_after="2021-06-01">
+    expires_after="2021-08-01">
   <owner>mlamouri@google.com</owner>
   <owner>media-dev@chromium.org</owner>
   <owner>rtoy@chromium.org</owner>
@@ -165,7 +189,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.BiquadFilter.Type" enum="BiquadFilterType"
-    expires_after="2021-01-06">
+    expires_after="2021-07-06">
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -177,7 +201,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.ConvolverNode.ImpulseResponseLength" units="ms"
-    expires_after="2021-02-18">
+    expires_after="2021-08-18">
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -187,7 +211,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.IIRFilterNode.Order" units="units"
-    expires_after="2021-01-06">
+    expires_after="2021-07-06">
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -198,7 +222,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.OfflineAudioContext.ChannelCount" units="units"
-    expires_after="2021-01-06">
+    expires_after="2021-07-06">
+  <obsolete>
+    Removed 2021-01-12. See crbug.com/1165240.
+  </obsolete>
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -209,7 +236,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.OfflineAudioContext.Length" units="frames"
-    expires_after="2021-03-21">
+    expires_after="2021-05-23">
+  <obsolete>
+    Removed 2021-01-12. See crbug.com/1165240.
+  </obsolete>
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -221,6 +251,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="WebAudio.OfflineAudioContext.SampleRate384kHz" units="Hz"
     expires_after="2021-02-18">
+  <obsolete>
+    Removed 2021-01-12. See crbug.com/1165240.
+  </obsolete>
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -231,7 +264,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.PannerNode.PanningModel" enum="PanningModelType"
-    expires_after="2021-01-06">
+    expires_after="2021-07-06">
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -244,7 +277,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.PushPullFIFO.UnderflowGlitches" enum="Boolean"
-    expires_after="2021-01-06">
+    expires_after="2021-07-06">
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
@@ -255,7 +288,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebAudio.PushPullFIFO.UnderflowPercentage" units="%"
-    expires_after="2021-01-06">
+    expires_after="2021-07-06">
   <owner>rtoy@chromium.org</owner>
   <owner>hongchan@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/web_core/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/web_core/histograms.xml
index a6bfbdec916..2eaffd61c55 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/web_core/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/web_core/histograms.xml
@@ -21,8 +21,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<variants name="FindInPageRequestEndState">
+  <variant name=".Aborted"
+      summary="The request got aborted before it went through every text in
+               the document."/>
+  <variant name=".Finished"
+      summary="The request finished going through every text in the document."/>
+</variants>
+
 <histogram name="WebCore.DistillabilityUs" units="microseconds"
-    expires_after="2021-04-04">
+    expires_after="2021-08-08">
   <owner>wychen@chromium.org</owner>
   <owner>gilmanmh@google.com</owner>
   <summary>
@@ -39,8 +47,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebCore.Document.execCommand" enum="MappedEditingCommands"
-    expires_after="2021-04-25">
-  <owner>yoichio@chromium.org</owner>
+    expires_after="2021-12-31">
+  <owner>yosin@chromium.org</owner>
+  <owner>kojii@chromium.org</owner>
   <summary>
     Counts the number of times each document.execCommand is executed. This
     doesn't count commands not supported by Blink.
@@ -48,39 +57,55 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebCore.Editing.Commands" enum="MappedEditingCommands"
-    expires_after="2020-12-31">
-  <owner>yoichio@chromium.org</owner>
+    expires_after="2021-12-31">
+  <owner>yosin@chromium.org</owner>
+  <owner>kojii@chromium.org</owner>
   <summary>
     Counts the number of times each Editor::Command::execute is called. This
     doesn't count commands not supported by Blink.
   </summary>
 </histogram>
 
-<histogram base="true" name="WebCore.FindInPage.NumberOfTasksPerRequest"
+<histogram
+    name="WebCore.FindInPage.NumberOfTasksPerRequest{FindInPageRequestEndState}"
     units="tasks" expires_after="2021-04-04">
   <owner>rakina@chromium.org</owner>
   <owner>altimin@chromium.org</owner>
   <summary>
     Records the number of find-in-page tasks executed for a find-in-page
     request. Emitted when a find-in-page request is finished (it went through
-    the whole document) or when it got aborted.
+    the whole document) or when it got aborted. {FindInPageRequestEndState}
   </summary>
+  <token key="FindInPageRequestEndState" variants="FindInPageRequestEndState">
+    <variant name="">
+      <obsolete>
+        Base histogram. Use suffixes of this histogram instead.
+      </obsolete>
+    </variant>
+  </token>
 </histogram>
 
-<histogram base="true" name="WebCore.FindInPage.RequestDuration" units="ms"
-    expires_after="2021-04-04">
+<histogram name="WebCore.FindInPage.RequestDuration{FindInPageRequestEndState}"
+    units="ms" expires_after="2021-04-04">
   <owner>rakina@chromium.org</owner>
   <owner>altimin@chromium.org</owner>
   <summary>
     Records how long one find-in-page request (consisting multiple tasks) took
     from the request start until the last find-in-page task for the request
     finished. Emitted when a find-in-page request is finished (it went through
-    the whole document) or when it got aborted.
+    the whole document) or when it got aborted. {FindInPageRequestEndState}
   </summary>
+  <token key="FindInPageRequestEndState" variants="FindInPageRequestEndState">
+    <variant name="">
+      <obsolete>
+        Base histogram. Use suffixes of this histogram instead.
+      </obsolete>
+    </variant>
+  </token>
 </histogram>
 
 <histogram name="WebCore.FindInPage.TaskDuration" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>rakina@chromium.org</owner>
   <owner>altimin@chromium.org</owner>
   <summary>
@@ -89,8 +114,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram base="true" name="WebCore.FindInPage.TotalTaskDuration" units="ms"
-    expires_after="2021-04-04">
+<histogram
+    name="WebCore.FindInPage.TotalTaskDuration{FindInPageRequestEndState}"
+    units="ms" expires_after="2021-04-04">
   <owner>rakina@chromium.org</owner>
   <owner>altimin@chromium.org</owner>
   <summary>
@@ -98,7 +124,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     find-in-page request. Nothe that this does not include the time spent in
     between tasks. Emitted when a find-in-page request is finished (it went
     through the whole document) or when it got aborted.
+    {FindInPageRequestEndState}
   </summary>
+  <token key="FindInPageRequestEndState" variants="FindInPageRequestEndState">
+    <variant name="">
+      <obsolete>
+        Base histogram. Use suffixes of this histogram instead.
+      </obsolete>
+    </variant>
+  </token>
 </histogram>
 
 <histogram name="WebCore.Framebust.ClickThroughPosition"
@@ -766,35 +800,35 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebCore.Scripts.Async.NotStreamingReason"
-    enum="NotStreamingReason" expires_after="2021-04-04">
+    enum="NotStreamingReason" expires_after="2021-08-09">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>Reason for not streaming an async script.</summary>
 </histogram>
 
 <histogram name="WebCore.Scripts.Async.StartedStreaming" enum="BooleanStreamed"
-    expires_after="2021-04-04">
+    expires_after="2021-08-09">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>Whether an async script was streamed or not.</summary>
 </histogram>
 
 <histogram name="WebCore.Scripts.Deferred.NotStreamingReason"
-    enum="NotStreamingReason" expires_after="2021-04-04">
+    enum="NotStreamingReason" expires_after="2021-08-09">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>Reason for not streaming a deferred script.</summary>
 </histogram>
 
 <histogram name="WebCore.Scripts.Deferred.StartedStreaming"
-    enum="BooleanStreamed" expires_after="2021-04-04">
+    enum="BooleanStreamed" expires_after="2021-08-09">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>Whether a deferred script was streamed or not.</summary>
 </histogram>
 
 <histogram name="WebCore.Scripts.Other.NotStreamingReason"
-    enum="NotStreamingReason" expires_after="2021-04-04">
+    enum="NotStreamingReason" expires_after="2021-08-09">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>
@@ -814,21 +848,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebCore.Scripts.ParsingBlocking.NotStreamingReason"
-    enum="NotStreamingReason" expires_after="2021-04-04">
+    enum="NotStreamingReason" expires_after="2021-08-09">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>Reason for not streaming a parsing blocking script.</summary>
 </histogram>
 
 <histogram name="WebCore.Scripts.ParsingBlocking.StartedStreaming"
-    enum="BooleanStreamed" expires_after="2021-04-04">
+    enum="BooleanStreamed" expires_after="2021-08-09">
   <owner>leszeks@chromium.org</owner>
   <owner>v8-runtime@google.com</owner>
   <summary>Whether a parsing blocking script was streamed or not.</summary>
 </histogram>
 
 <histogram name="WebCore.WebSocket.SendType" enum="WebSocketSendType"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>yhirano@chromium.org</owner>
   <owner>ricea@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/web_rtc/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/web_rtc/histograms.xml
index 06a7d87ec87..e6844d2617b 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/web_rtc/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/web_rtc/histograms.xml
@@ -21,6 +21,82 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<variants name="IPProtocolType">
+  <variant name="_TCP" summary=""/>
+  <variant name="_UDP" summary=""/>
+</variants>
+
+<variants name="NatType">
+  <variant name=".NoNAT" summary=""/>
+  <variant name=".NonSymNAT" summary=""/>
+  <variant name=".SymNAT" summary=""/>
+  <variant name=".UnknownNAT" summary=""/>
+</variants>
+
+<variants name="ScreenshareLayerStats">
+  <variant name=".FrameRate"
+      summary="Frames per second sent, in fps. The value is reported when a
+               stream is removed and is calculated as the total number of
+               frames in this layer, divided by the duration of the call."/>
+  <variant name=".Qp"
+      summary="Average quantizer (qp) of frames sent. The value is reported
+               when a stream is removed and is calculated, for this layer, as
+               the sum of all qp values divided the number of frames."/>
+  <variant name=".TargetBitrate"
+      summary="Average target bitrate in kbps. The value is reported when a
+               stream is removed and is calculated as the sum of all target
+               bitrates for this layer (sampled after frame has been encoded)
+               divided by the total number of frames for this layer."/>
+</variants>
+
+<variants name="WebRTCEchoCancellerEstimate">
+  <variant name=".Max" summary="The maximum over the time interval"/>
+  <variant name=".Min" summary="The minimum over the time interval"/>
+  <variant name=".Value"
+      summary="The last estimated value of the time interval"/>
+</variants>
+
+<variants name="WebRTCMediaType">
+  <variant name=".Audio" summary="Audio"/>
+  <variant name=".Data" summary="Data"/>
+  <variant name=".Video" summary="Video"/>
+</variants>
+
+<variants name="WebRTCVideoExperimentGroupId">
+  <variant name=".ExperimentGroup0" summary="">
+    <owner>ilnik@chromium.org</owner>
+    <owner>webrtc-video@google.com</owner>
+  </variant>
+  <variant name=".ExperimentGroup1" summary="">
+    <owner>ilnik@chromium.org</owner>
+    <owner>webrtc-video@google.com</owner>
+  </variant>
+  <variant name=".ExperimentGroup2" summary="">
+    <owner>ilnik@chromium.org</owner>
+    <owner>webrtc-video@google.com</owner>
+  </variant>
+  <variant name=".ExperimentGroup3" summary="">
+    <owner>ilnik@chromium.org</owner>
+    <owner>webrtc-video@google.com</owner>
+  </variant>
+  <variant name=".ExperimentGroup4" summary="">
+    <owner>ilnik@chromium.org</owner>
+    <owner>webrtc-video@google.com</owner>
+  </variant>
+  <variant name=".S0" summary="">
+    <owner>ilnik@chromium.org</owner>
+    <owner>webrtc-video@google.com</owner>
+  </variant>
+  <variant name=".S1" summary="">
+    <owner>ilnik@chromium.org</owner>
+    <owner>webrtc-video@google.com</owner>
+  </variant>
+  <variant name=".S2" summary="">
+    <owner>ilnik@chromium.org</owner>
+    <owner>webrtc-video@google.com</owner>
+  </variant>
+</variants>
+
 <histogram name="WebRTC.AecFilterHasDivergence" units="%" expires_after="M85">
   <owner>grunell@chromium.org</owner>
   <owner>minyue@chromium.org</owner>
@@ -227,7 +303,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.Audio.AudioInterruptionMs" units="ms"
-    expires_after="2021-01-03">
+    expires_after="2021-11-23">
   <owner>hlundin@chromium.org</owner>
   <owner>ivoc@chromium.org</owner>
   <summary>
@@ -318,7 +394,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.Audio.AverageExcessBufferDelayMs" units="ms"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>hlundin@chromium.org</owner>
   <summary>
     Measures the average waiting time in the buffer for each packet. The waiting
@@ -330,7 +406,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.Audio.DelayedPacketOutageEventMs" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>hlundin@chromium.org</owner>
   <summary>
     Measures the duration of each packet loss concealment (a.k.a. expand) event
@@ -342,7 +418,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.Audio.DelayedPacketOutageEventsPerMinute"
-    units="events/minute" expires_after="2021-04-25">
+    units="events/minute" expires_after="2021-06-27">
   <owner>hlundin@chromium.org</owner>
   <summary>
     Counts the number of delayed packet outage events per minute. The range is
@@ -423,17 +499,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.Audio.EchoCanceller.Erl" units="dB (shifted)"
-    expires_after="2021-10-19">
-  <owner>gustaf@chromium.org</owner>
-  <owner>peah@chromium.org</owner>
-  <summary>
-    This histogram logs the echo return loss achieved by the WebRTC echo
-    canceller as described in ITU G.168. When the echo canceller is being used,
-    one value is logged every 10 seconds per ongoing WebRTC call.
-  </summary>
-</histogram>
-
 <histogram name="WebRTC.Audio.EchoCanceller.ErlBand0" units="dB (shifted)"
     expires_after="2020-12-01">
   <obsolete>
@@ -462,17 +527,6 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.Audio.EchoCanceller.Erle" units="dB"
-    expires_after="2021-10-19">
-  <owner>gustaf@chromium.org</owner>
-  <owner>peah@chromium.org</owner>
-  <summary>
-    This histogram logs the echo return loss enhancement achieved by the WebRTC
-    echo canceller as described in ITU G.168. When the echo canceller is being
-    used, one value is logged every 10 seconds per ongoing WebRTC call.
-  </summary>
-</histogram>
-
 <histogram name="WebRTC.Audio.EchoCanceller.ErleBand0" units="dB (shifted)"
     expires_after="2020-12-01">
   <obsolete>
@@ -501,6 +555,38 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="WebRTC.Audio.EchoCanceller.Erle{WebRTCEchoCancellerEstimate}"
+    units="dB" expires_after="2021-10-19">
+  <owner>gustaf@chromium.org</owner>
+  <owner>peah@chromium.org</owner>
+  <summary>
+    This histogram logs the echo return loss enhancement achieved by the WebRTC
+    echo canceller as described in ITU G.168. When the echo canceller is being
+    used, one value is logged every 10 seconds per ongoing WebRTC call.
+    {WebRTCEchoCancellerEstimate}
+  </summary>
+  <token key="WebRTCEchoCancellerEstimate"
+      variants="WebRTCEchoCancellerEstimate">
+    <variant name=""/>
+  </token>
+</histogram>
+
+<histogram name="WebRTC.Audio.EchoCanceller.Erl{WebRTCEchoCancellerEstimate}"
+    units="dB (shifted)" expires_after="2021-10-19">
+  <owner>gustaf@chromium.org</owner>
+  <owner>peah@chromium.org</owner>
+  <summary>
+    This histogram logs the echo return loss achieved by the WebRTC echo
+    canceller as described in ITU G.168. When the echo canceller is being used,
+    one value is logged every 10 seconds per ongoing WebRTC call.
+    {WebRTCEchoCancellerEstimate}
+  </summary>
+  <token key="WebRTCEchoCancellerEstimate"
+      variants="WebRTCEchoCancellerEstimate">
+    <variant name=""/>
+  </token>
+</histogram>
+
 <histogram name="WebRTC.Audio.EchoCanceller.FilterDelay" units="Blocks"
     expires_after="2021-10-19">
   <owner>peah@chromium.org</owner>
@@ -635,7 +721,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.Audio.Encoder.CodecType" enum="WebRtcAudioCodecs"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>aleloi@chromium.org</owner>
   <summary>
     Histogram of audio codec usage. Every sample corresponds to 5 seconds of
@@ -644,7 +730,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.Audio.ExpandRatePercent" units="%"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>hlundin@chromium.org</owner>
   <summary>
     Measures the expand rate for an incoming WebRTC audio stream. The expand
@@ -667,7 +753,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.Audio.ReceiverDeviceDelayMs" units="ms"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>hlundin@chromium.org</owner>
   <summary>
     The sound card's buffering delay for the receiving side. Sampled once every
@@ -676,7 +762,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.Audio.ReceiverJitterBufferDelayMs" units="ms"
-    expires_after="2021-04-25">
+    expires_after="2021-06-27">
   <owner>hlundin@chromium.org</owner>
   <summary>
     The jitter buffer delay for the receiving side. Sampled once every 10 ms
@@ -686,6 +772,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram name="WebRTC.Audio.ResidualEchoDetector.EchoLikelihood" units="%"
     expires_after="2021-05-09">
+  <obsolete>
+    No longer reported. Removed in M84.
+  </obsolete>
   <owner>hlundin@chromium.org</owner>
   <owner>ivoc@chromium.org</owner>
   <summary>
@@ -698,7 +787,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.Audio.SpeechExpandRatePercent" units="%"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>hlundin@chromium.org</owner>
   <summary>
     Measures the audible expand rate for an incoming WebRTC audio stream. The
@@ -710,7 +799,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.Audio.TargetBitrateInKbps" units="kbps"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>hlundin@chromium.org</owner>
   <summary>
     The target bitrate in kbps that the audio codec should try to produce on
@@ -750,7 +839,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.AudioOutputSampleRate" enum="AudioSampleRate"
-    expires_after="2021-04-30">
+    expires_after="2021-07-04">
   <owner>henrika@chromium.org</owner>
   <owner>webrtc-audio@google.com</owner>
   <summary>Audio output sample rate for WebRTC (in Hz).</summary>
@@ -766,20 +855,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.BWE.InitialBandwidthEstimate" units="kbps"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>holmer@chromium.org</owner>
   <summary>The bandwidth estimate 2 seconds into a WebRTC call.</summary>
 </histogram>
 
 <histogram name="WebRTC.BWE.InitiallyLostPackets" units="packets"
-    expires_after="2021-04-11">
+    expires_after="2021-08-15">
   <owner>holmer@chromium.org</owner>
   <summary>
     The number of video packets lost durig the first 2 seconds in a WebRTC call.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.BWE.InitialRtt" units="ms" expires_after="2021-04-11">
+<histogram name="WebRTC.BWE.InitialRtt" units="ms" expires_after="2021-08-15">
   <owner>holmer@chromium.org</owner>
   <summary>
     The round-trip time as measured 2 seconds into a WebRTC call.
@@ -825,7 +914,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.BWE.Probing.ProbeClusterSizeInBytes" units="bytes"
-    expires_after="2021-03-07">
+    expires_after="2021-07-18">
   <owner>jonasolsson@chromium.org</owner>
   <owner>crodbro@chromium.org</owner>
   <summary>
@@ -835,7 +924,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.BWE.Probing.ProbesPerCluster" units="units"
-    expires_after="2021-03-07">
+    expires_after="2021-07-18">
   <owner>jonasolsson@chromium.org</owner>
   <owner>crodbro@chromium.org</owner>
   <summary>
@@ -845,7 +934,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.BWE.Probing.TimePerProbeCluster" units="ms"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>jonasolsson@chromium.org</owner>
   <owner>crodbro@chromium.org</owner>
   <summary>
@@ -865,7 +954,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.BWE.Probing.TotalProbeClustersRequested" units="units"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>jonasolsson@chromium.org</owner>
   <owner>crodbro@chromium.org</owner>
   <summary>
@@ -970,7 +1059,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.Call.TimeReceivingAudioRtpPacketsInSeconds" units="s"
-    expires_after="2021-05-09">
+    expires_after="2021-08-01">
   <owner>saza@chromium.org</owner>
   <summary>
     The amount of time between the arrival of the first and last audio RTP
@@ -982,7 +1071,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.Call.TimeReceivingVideoRtpPacketsInSeconds" units="s"
-    expires_after="2021-05-02">
+    expires_after="2021-08-09">
   <owner>saza@chromium.org</owner>
   <summary>
     The amount of time between the arrival of the first and last video RTP
@@ -1032,10 +1121,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.DesktopCaptureCounters" enum="DesktopCaptureCounters"
-    expires_after="2020-12-31">
+    expires_after="2021-12-31">
   <owner>guidou@chromium.org</owner>
-  <owner>marinaciocea@chromium.org</owner>
-  <owner>armax@chromium.org</owner>
+  <owner>webrtc-dev@chromium.org</owner>
   <summary>
     Counters on creation of DesktopCaptureDevice and the first capture call.
   </summary>
@@ -1060,10 +1148,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.MediaStreamDevices.HasPanTiltZoomCamera"
-    enum="BooleanAvailable" expires_after="M88">
-  <obsolete>
-    Removed in M88.
-  </obsolete>
+    enum="BooleanAvailable" expires_after="M100">
   <owner>reillyg@chromium.org</owner>
   <owner>device-dev@chromium.org</owner>
   <summary>
@@ -1093,7 +1178,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.AddIceCandidate"
-    enum="AddIceCandidateResult" expires_after="2021-05-09">
+    enum="AddIceCandidateResult" expires_after="2021-08-09">
   <owner>hta@chromium.org</owner>
   <owner>webrtc-dev@chromium.org</owner>
   <summary>
@@ -1102,18 +1187,43 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.PeerConnection.CandidatePairType"
+<histogram name="WebRTC.PeerConnection.BundlePolicy"
+    enum="PeerConnectionBundlePolicy" expires_after="2022-01-01">
+  <owner>hta@chromium.org</owner>
+  <owner>webrtc-dev@chromium.org</owner>
+  <summary>
+    Determines whether BUNDLE is configured. Recorded during DTLS connection
+    establishment which usually happens only once per connection. Values are
+    specified in https://w3c.github.io/webrtc-pc/#dom-rtcbundlepolicy
+  </summary>
+</histogram>
+
+<histogram name="WebRTC.PeerConnection.BundleUsage"
+    enum="PeerConnectionBundleUsage" expires_after="2022-01-01">
+  <owner>hta@chromium.org</owner>
+  <owner>webrtc-dev@chromium.org</owner>
+  <summary>
+    Determines whether BUNDLE is used in remote offers or answers. Recorded
+    during setRemoteDescription calls. Distinguishes between simple, complex,
+    datachannel-only and legacy plan-b usage.
+  </summary>
+</histogram>
+
+<histogram name="WebRTC.PeerConnection.CandidatePairType{IPProtocolType}"
     enum="IceCandidatePairTypes" expires_after="2020-04-05">
   <owner>qingsi@google.com</owner>
   <owner>jeroendb@google.com</owner>
   <summary>
     Counters of various ICE Endpoint types. These values are logged for the
-    first selected candidate pair of a PeerConnection.
+    first selected candidate pair of a PeerConnection. {IPProtocolType}
   </summary>
+  <token key="IPProtocolType" variants="IPProtocolType">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.ConnectionState"
-    enum="IceConnectionStates" expires_after="2021-04-04">
+    enum="IceConnectionStates" expires_after="2021-08-09">
   <owner>qingsi@google.com</owner>
   <owner>jeroendb@google.com</owner>
   <summary>
@@ -1209,20 +1319,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.KeyProtocol"
-    enum="PeerConnectionKeyProtocol" expires_after="M82">
+    enum="PeerConnectionKeyProtocol" expires_after="2021-07-01">
   <owner>hta@chromium.org</owner>
+  <owner>webrtc-dev@chromium.org</owner>
   <summary>
     What key exchange protocol (DTLS or SDES) is used to establish the crypto
-    keys for a PeerConnection's RTP transport.
+    keys for a PeerConnection's RTP transport. Note: This histogram was expired
+    after M82, and resurrected in M89.
   </summary>
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.KeyProtocolByMedia"
-    enum="PeerConnectionKeyProtocolByMedia" expires_after="M82">
+    enum="PeerConnectionKeyProtocolByMedia" expires_after="2021-07-01">
   <owner>hta@chromium.org</owner>
+  <owner>webrtc-dev@chromium.org</owner>
   <summary>
     What key exchange protocol (DTLS or SDES) is used to establish the crypto
-    keys for a PeerConnection's RTP transport, specified per media type.
+    keys for a PeerConnection's RTP transport, specified per media type. Note:
+    This histogram was expired after M82, and resurrected in M89.
   </summary>
 </histogram>
 
@@ -1248,8 +1362,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.SdpComplexUsage.CreateAnswer"
-    enum="PeerConnectionSdpUsageCategory" expires_after="2020-12-31">
+    enum="PeerConnectionSdpUsageCategory" expires_after="2021-07-01">
   <owner>hbos@chromium.org</owner>
+  <owner>webrtc-dev@chromium.org</owner>
   <summary>
     The SDP usage category (&quot;safe&quot;, &quot;unsafe&quot; or
     &quot;unknown&quot;) of createAnswer(). Using complex SDP without explicitly
@@ -1259,8 +1374,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.SdpComplexUsage.CreateOffer"
-    enum="PeerConnectionSdpUsageCategory" expires_after="2020-12-31">
+    enum="PeerConnectionSdpUsageCategory" expires_after="2021-07-01">
   <owner>hbos@chromium.org</owner>
+  <owner>webrtc-dev@chromium.org</owner>
   <summary>
     The SDP usage category (&quot;safe&quot;, &quot;unsafe&quot; or
     &quot;unknown&quot;) of createOffer(). Using complex SDP without explicitly
@@ -1270,8 +1386,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.SdpComplexUsage.SetLocalAnswer"
-    enum="PeerConnectionSdpUsageCategory" expires_after="2020-12-31">
+    enum="PeerConnectionSdpUsageCategory" expires_after="2021-07-01">
   <owner>hbos@chromium.org</owner>
+  <owner>webrtc-dev@chromium.org</owner>
   <summary>
     The SDP usage category (&quot;safe&quot;, &quot;unsafe&quot; or
     &quot;unknown&quot;) of setLocalDescription(answer). Using complex SDP
@@ -1282,8 +1399,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.SdpComplexUsage.SetLocalOffer"
-    enum="PeerConnectionSdpUsageCategory" expires_after="2020-12-31">
+    enum="PeerConnectionSdpUsageCategory" expires_after="2021-07-01">
   <owner>hbos@chromium.org</owner>
+  <owner>webrtc-dev@chromium.org</owner>
   <summary>
     The SDP usage category (&quot;safe&quot;, &quot;unsafe&quot; or
     &quot;unknown&quot;) of setLocalDescription(offer). Using complex SDP
@@ -1294,8 +1412,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.SdpComplexUsage.SetRemoteAnswer"
-    enum="PeerConnectionSdpUsageCategory" expires_after="2020-12-31">
+    enum="PeerConnectionSdpUsageCategory" expires_after="2021-07-01">
   <owner>hbos@chromium.org</owner>
+  <owner>webrtc-dev@chromium.org</owner>
   <summary>
     The SDP usage category (&quot;safe&quot;, &quot;unsafe&quot; or
     &quot;unknown&quot;) of setRemoteDescription(answer). Using complex SDP
@@ -1306,8 +1425,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.SdpComplexUsage.SetRemoteOffer"
-    enum="PeerConnectionSdpUsageCategory" expires_after="2020-12-31">
+    enum="PeerConnectionSdpUsageCategory" expires_after="2021-07-01">
   <owner>hbos@chromium.org</owner>
+  <owner>webrtc-dev@chromium.org</owner>
   <summary>
     The SDP usage category (&quot;safe&quot;, &quot;unsafe&quot; or
     &quot;unknown&quot;) of setRemoteDescription(offer). Using complex SDP
@@ -1318,9 +1438,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.SdpFormatReceived"
-    enum="PeerConnectionSdpFormatReceived" expires_after="2021-04-04">
+    enum="PeerConnectionSdpFormatReceived" expires_after="2021-08-09">
   <owner>steveanton@chromium.org</owner>
   <owner>hta@chromium.org</owner>
+  <owner>webrtc-dev@chromium.org</owner>
   <summary>
     What SDP format is received in the remote offer. The value &quot;no
     tracks&quot; means that no audio or video tracks were received. The value
@@ -1334,9 +1455,10 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.SdpFormatReceivedAnswer"
-    enum="PeerConnectionSdpFormatReceived" expires_after="2021-04-04">
+    enum="PeerConnectionSdpFormatReceived" expires_after="2021-08-09">
   <owner>steveanton@chromium.org</owner>
   <owner>hta@chromium.org</owner>
+  <owner>webrtc-dev@chromium.org</owner>
   <summary>
     What SDP format is received in the remote answer. See
     WebRTC.PeerConnection.SdpFormatReceived for the description of the values.
@@ -1345,8 +1467,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.SdpSemanticNegotiated"
-    enum="PeerConnectionSdpSemanticNegotiated" expires_after="2020-12-31">
+    enum="PeerConnectionSdpSemanticNegotiated" expires_after="2021-07-01">
   <owner>hta@chromium.org</owner>
+  <owner>webrtc-dev@chromium.org</owner>
   <summary>
     What SDP semantic (Unified Plan or Plan B) was detected when completing
     negotiation of a PeerConnection. This is recorded when accepting an SDP
@@ -1357,8 +1480,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.SdpSemanticRequested"
-    enum="PeerConnectionSdpSemanticRequested" expires_after="2021-03-15">
+    enum="PeerConnectionSdpSemanticRequested" expires_after="2021-07-27">
   <owner>hta@chromium.org</owner>
+  <owner>webrtc-dev@chromium.org</owner>
   <summary>
     What SDP semantic (Unified Plan, Plan B or &quot;use default&quot;) has been
     asked for by the creator of a PeerConnection.
@@ -1410,14 +1534,17 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.PeerConnection.SrtpCryptoSuite"
+<histogram name="WebRTC.PeerConnection.SrtpCryptoSuite{WebRTCMediaType}"
     enum="DTLS_SRTPCryptoSuite" expires_after="M81">
   <owner>qingsi@google.com</owner>
   <owner>jeroendb@google.com</owner>
   <summary>
     Counters on the type of SRTP crypto suites used by WebRTC. This is collected
-    whenever the transport signals the OnCompleted event.
+    whenever the transport signals the OnCompleted event. {WebRTCMediaType}
   </summary>
+  <token key="WebRTCMediaType" variants="WebRTCMediaType">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.SrtpUnprotectError" enum="SrtpErrorCode"
@@ -1431,18 +1558,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.PeerConnection.SslCipherSuite" enum="SSLCipherSuite"
-    expires_after="M81">
+<histogram name="WebRTC.PeerConnection.SslCipherSuite{WebRTCMediaType}"
+    enum="SSLCipherSuite" expires_after="M81">
   <owner>qingsi@google.com</owner>
   <owner>jeroendb@google.com</owner>
   <summary>
     Counters on the type of SSL cipher suites used by WebRTC. This is collected
-    whenever the transport signals the OnCompleted event.
+    whenever the transport signals the OnCompleted event. {WebRTCMediaType}
   </summary>
+  <token key="WebRTCMediaType" variants="WebRTCMediaType">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.ThermalState" enum="ThermalState"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>eshr@google.com</owner>
   <owner>hbos@chromium.org</owner>
   <summary>
@@ -1471,7 +1601,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.PeerConnection.UsagePattern"
-    enum="WebRtcPeerConnectionUsagePattern" expires_after="2021-06-01">
+    enum="WebRtcPeerConnectionUsagePattern" expires_after="2021-08-01">
   <owner>hta@chromium.org</owner>
   <owner>webrtc-dev@chromium.org</owner>
   <summary>
@@ -1482,7 +1612,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.ReceivedAudioTrackDuration" units="ms"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>perkj@chromium.org</owner>
   <summary>
     Durations of audio tracks received over a PeerConnection. The stopwatch
@@ -1492,7 +1622,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.ReceivedVideoTrackDuration" units="ms"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>perkj@chromium.org</owner>
   <summary>
     Durations of video tracks received over a PeerConnection. The stopwatch
@@ -1502,7 +1632,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.ReliableDataChannelMessageSize" units="bytes"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>perkj@chromium.org</owner>
   <summary>
     Sizes of messages sent over reliable data channels. The size of an
@@ -1518,7 +1648,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.SentAudioTrackDuration" units="ms"
-    expires_after="2021-03-21">
+    expires_after="2021-07-27">
   <owner>perkj@chromium.org</owner>
   <summary>
     Durations of audio tracks sent over a PeerConnection. The stopwatch starts
@@ -1528,7 +1658,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.SentVideoTrackDuration" units="ms"
-    expires_after="2021-05-02">
+    expires_after="2021-07-04">
   <owner>perkj@chromium.org</owner>
   <summary>
     Durations of video tracks sent over a PeerConnection. The stopwatch starts
@@ -1537,7 +1667,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.Stun.BatchSuccessPercent" units="%" expires_after="M85">
+<histogram name="WebRTC.Stun.BatchSuccessPercent{NatType}" units="%"
+    expires_after="M85">
   <owner>qingsi@google.com</owner>
   <owner>jeroendb@google.com</owner>
   <summary>
@@ -1546,54 +1677,72 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     various intervals between requests. Only the first instance of renderers
     will conduct the trial and log this result. The STUN binding requests are
     grouped into multiple batches and the success rate is calculated for an
-    individual batch.
+    individual batch. {NatType}
   </summary>
+  <token key="NatType" variants="NatType">
+    <variant name=""/>
+  </token>
 </histogram>
 
-<histogram name="WebRTC.Stun.ResponseLatency" units="ms" expires_after="M85">
+<histogram name="WebRTC.Stun.ResponseLatency{NatType}" units="ms"
+    expires_after="M85">
   <owner>qingsi@google.com</owner>
   <owner>jeroendb@google.com</owner>
   <summary>
     For clients using a shared source port per STUN binding request, average RTT
     for requests which received a response with various intervals between
     requests. Only the first instance of renderers will conduct the trial and
-    log this result.
+    log this result. {NatType}
   </summary>
+  <token key="NatType" variants="NatType">
+    <variant name=""/>
+  </token>
 </histogram>
 
-<histogram name="WebRTC.Stun.SuccessPercent" units="%" expires_after="M85">
+<histogram name="WebRTC.Stun.SuccessPercent{NatType}" units="%"
+    expires_after="M85">
   <owner>qingsi@google.com</owner>
   <owner>jeroendb@google.com</owner>
   <summary>
     For clients using a shared source port per STUN binding request, success
     rate for requests which received a response with various intervals between
     requests. Only the first instance of renderers will conduct the trial and
-    log this result.
+    log this result. {NatType}
   </summary>
+  <token key="NatType" variants="NatType">
+    <variant name=""/>
+  </token>
 </histogram>
 
-<histogram name="WebRTC.SystemMaxConsecutiveBytesDelayed" units="units"
-    expires_after="M81">
+<histogram name="WebRTC.SystemMaxConsecutiveBytesDelayed{IPProtocolType}"
+    units="units" expires_after="M81">
   <owner>qingsi@google.com</owner>
   <owner>jeroendb@google.com</owner>
   <summary>
     The maximum of consecutive delayed bytes caused by EWOULDBLOCKs from system.
     This happens when system can't send any packet synchronously at that moment.
+    {IPProtocolType}
   </summary>
+  <token key="IPProtocolType" variants="IPProtocolType">
+    <variant name=""/>
+  </token>
 </histogram>
 
-<histogram name="WebRTC.SystemPercentPacketsDelayed" units="%"
+<histogram name="WebRTC.SystemPercentPacketsDelayed{IPProtocolType}" units="%"
     expires_after="M81">
   <owner>qingsi@google.com</owner>
   <owner>jeroendb@google.com</owner>
   <summary>
     The percentage of packets delayed due to ERR_IO_PENDING from system in a
     WebRTC socket. This happens when system can't send any packet synchronously
-    at that moment.
+    at that moment. {IPProtocolType}
   </summary>
+  <token key="IPProtocolType" variants="IPProtocolType">
+    <variant name=""/>
+  </token>
 </histogram>
 
-<histogram name="WebRTC.SystemSendPacketDuration" units="ms"
+<histogram name="WebRTC.SystemSendPacketDuration{IPProtocolType}" units="ms"
     expires_after="M81">
   <owner>qingsi@google.com</owner>
   <owner>jeroendb@google.com</owner>
@@ -1603,11 +1752,15 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     EWOULDBLOCK from system) as well as the time system takes to finish the
     asynchronous send. For UDP, it's the time from P2PSocketHostUdp::Send to
     P2PSocketHostUdp::HandleSendResult. Tcp part is to be implemented.
+    {IPProtocolType}
   </summary>
+  <token key="IPProtocolType" variants="IPProtocolType">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.UnreliableDataChannelMessageSize" units="bytes"
-    expires_after="2021-03-15">
+    expires_after="2021-07-18">
   <owner>perkj@chromium.org</owner>
   <summary>
     Sizes of messages sent over unreliable data channels. The size of an
@@ -1631,8 +1784,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.UserMediaRequest.Result2"
-    enum="MediaStreamRequestResult2" expires_after="2021-02-07">
-  <owner>grunell@chromium.org</owner>
+    enum="MediaStreamRequestResult2" expires_after="2022-02-07">
+  <owner>guidou@chromium.org</owner>
+  <owner>agpalak@chromium.org</owner>
   <summary>
     Counters for UserMediaRequests results such as failure reasons. The standard
     specification error names are in parenthesis.
@@ -1750,15 +1904,19 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.Video.Decoded.Vp8.Qp" units="qp value"
-    expires_after="never">
+<histogram name="WebRTC.Video.Decoded.Vp8.Qp{WebRTCVideoExperimentGroupId}"
+    units="qp value" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
   <owner>asapersson@chromium.org</owner>
   <summary>
     The average QP (quantizer value) per frame for a received VP8 video stream.
-    Recorded when a stream is removed.
+    Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.Video.DecodedFramesPerSecond" units="fps"
@@ -1784,8 +1942,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.Video.DecodeTimePerFrameInMs{CodecInfo}" units="ms"
-    expires_after="2021-02-28">
+    expires_after="2022-02-23">
   <owner>kron@chromium.org</owner>
+  <owner>webrtc-video@google.com</owner>
   <summary>
     The decode time per frame for a received video stream. Continously updated
     after each frame has been decoded. {CodecInfo}
@@ -1944,27 +2103,36 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.Video.EndToEndDelayInMs" units="ms"
-    expires_after="never">
+<histogram name="WebRTC.Video.EndToEndDelayInMs{WebRTCVideoExperimentGroupId}"
+    units="ms" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
   <owner>asapersson@chromium.org</owner>
   <summary>
     The average end-to-end delay per frame for a received video stream. Recorded
-    when a stream is removed.
+    when a stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
-<histogram name="WebRTC.Video.EndToEndDelayMaxInMs" units="ms"
-    expires_after="never">
+<histogram
+    name="WebRTC.Video.EndToEndDelayMaxInMs{WebRTCVideoExperimentGroupId}"
+    units="ms" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
   <owner>ilnik@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
     The maximum end-to-end delay per frame for a received video stream. Recorded
-    when a stream is removed.
+    when a stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.Video.FecBitrateReceivedInKbps" units="kbps"
@@ -2047,7 +2215,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histogram
     name="WebRTC.Video.HardwareDecodedFramesBetweenSoftwareFallbacks{WebRtcCodecs}"
-    units="frames" expires_after="2021-03-16">
+    units="frames" expires_after="2022-02-23">
   <owner>kron@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
@@ -2103,38 +2271,53 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.Video.InterframeDelay95PercentileInMs" units="ms"
-    expires_after="never">
+<histogram
+    name="WebRTC.Video.InterframeDelay95PercentileInMs{WebRTCVideoExperimentGroupId}"
+    units="ms" expires_after="never">
   <owner>ilnik@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
     The 95th percentile of interframe delay for a received video stream.
-    Recorded when a stream is removed.
+    Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
-<histogram name="WebRTC.Video.InterframeDelayInMs" units="ms"
-    expires_after="never">
+<histogram
+    name="WebRTC.Video.InterframeDelayInMs{WebRTCVideoExperimentGroupId}"
+    units="ms" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
   <owner>ilnik@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
     The average interframe delay for a received video stream. Recorded when a
-    stream is removed.
+    stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
-<histogram name="WebRTC.Video.InterframeDelayMaxInMs" units="ms"
-    expires_after="never">
+<histogram
+    name="WebRTC.Video.InterframeDelayMaxInMs{WebRTCVideoExperimentGroupId}"
+    units="ms" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
   <owner>ilnik@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
     The maximum interframe delay for a received video stream. Recorded when a
-    stream is removed.
+    stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.Video.JitterBufferDelayInMs" units="ms"
@@ -2148,15 +2331,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.Video.KeyFramesReceivedInPermille" units="permille"
-    expires_after="never">
+<histogram
+    name="WebRTC.Video.KeyFramesReceivedInPermille{WebRTCVideoExperimentGroupId}"
+    units="permille" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
   <owner>asapersson@chromium.org</owner>
   <summary>
     Permille of frames that are key frames for a received video stream. Recorded
-    when a stream is removed.
+    when a stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.Video.KeyFramesSentInPermille" units="permille"
@@ -2194,16 +2382,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.Video.MediaBitrateReceivedInKbps" units="kbps"
-    expires_after="never">
+<histogram
+    name="WebRTC.Video.MediaBitrateReceivedInKbps{WebRTCVideoExperimentGroupId}"
+    units="kbps" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
   <owner>asapersson@chromium.org</owner>
   <summary>
     The number of received media payload bits per second for a received video
     stream. Recorded when a stream is removed. The total number of bytes is
-    divided by the time the video stream exists.
+    divided by the time the video stream exists. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.Video.MediaBitrateSentInKbps" units="kbps"
@@ -2379,15 +2572,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.Video.ReceivedHeightInPixels" units="pixels"
-    expires_after="never">
+<histogram
+    name="WebRTC.Video.ReceivedHeightInPixels{WebRTCVideoExperimentGroupId}"
+    units="pixels" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
   <owner>asapersson@chromium.org</owner>
   <summary>
     The average received height per frame for a received video stream. Recorded
-    when a stream is removed.
+    when a stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.Video.ReceivedPacketsLostInPercent" units="%"
@@ -2401,15 +2599,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.Video.ReceivedWidthInPixels" units="pixels"
-    expires_after="never">
+<histogram
+    name="WebRTC.Video.ReceivedWidthInPixels{WebRTCVideoExperimentGroupId}"
+    units="pixels" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
   <owner>asapersson@chromium.org</owner>
   <summary>
     The average received width per frame for a received video stream. Recorded
-    when a stream is removed.
+    when a stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.Video.ReceiveStreamLifetimeInSeconds" units="seconds"
@@ -2555,16 +2758,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.Video.Screenshare.Decoded.Vp8.Qp" units="qp value"
-    expires_after="never">
+<histogram
+    name="WebRTC.Video.Screenshare.Decoded.Vp8.Qp{WebRTCVideoExperimentGroupId}"
+    units="qp value" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
   <owner>ilnik@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
     The average QP (quantizer value) per frame for a received VP8 screenshare
-    stream. Recorded when a stream is removed.
+    stream. Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.Video.Screenshare.DroppedFrames.Capturer"
@@ -2626,28 +2834,38 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.Video.Screenshare.EndToEndDelayInMs" units="ms"
-    expires_after="never">
+<histogram
+    name="WebRTC.Video.Screenshare.EndToEndDelayInMs{WebRTCVideoExperimentGroupId}"
+    units="ms" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
   <owner>ilnik@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
     The average end-to-end delay per frame for a received screenshare stream.
-    Recorded when a stream is removed.
+    Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
-<histogram name="WebRTC.Video.Screenshare.EndToEndDelayMaxInMs" units="ms"
-    expires_after="never">
+<histogram
+    name="WebRTC.Video.Screenshare.EndToEndDelayMaxInMs{WebRTCVideoExperimentGroupId}"
+    units="ms" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
   <owner>ilnik@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
     The maximum end-to-end delay per frame for a received screenshare stream.
-    Recorded when a stream is removed.
+    Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.Video.Screenshare.FecBitrateSentInKbps" units="kbps"
@@ -2732,7 +2950,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.Video.Screenshare.InterframeDelay95PercentileInMs"
+<histogram
+    name="WebRTC.Video.Screenshare.InterframeDelay95PercentileInMs{WebRTCVideoExperimentGroupId}"
     units="ms" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
@@ -2740,35 +2959,50 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>webrtc-video@google.com</owner>
   <summary>
     The 95th percentile of interframe delay for a received screenshare stream.
-    Recorded when a stream is removed.
+    Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
-<histogram name="WebRTC.Video.Screenshare.InterframeDelayInMs" units="ms"
-    expires_after="never">
+<histogram
+    name="WebRTC.Video.Screenshare.InterframeDelayInMs{WebRTCVideoExperimentGroupId}"
+    units="ms" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
   <owner>ilnik@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
     The average interframe delay for a received screenshare stream. Recorded
-    when a stream is removed.
+    when a stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
-<histogram name="WebRTC.Video.Screenshare.InterframeDelayMaxInMs" units="ms"
-    expires_after="never">
+<histogram
+    name="WebRTC.Video.Screenshare.InterframeDelayMaxInMs{WebRTCVideoExperimentGroupId}"
+    units="ms" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
   <owner>ilnik@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
     The maximum interframe delay for a received screenshare stream. Recorded
-    when a stream is removed.
+    when a stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
-<histogram name="WebRTC.Video.Screenshare.KeyFramesReceivedInPermille"
+<histogram
+    name="WebRTC.Video.Screenshare.KeyFramesReceivedInPermille{WebRTCVideoExperimentGroupId}"
     units="permille" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
@@ -2776,8 +3010,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>webrtc-video@google.com</owner>
   <summary>
     Permille of frames that are key frames for a received screenshare stream.
-    Recorded when a stream is removed.
+    Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.Video.Screenshare.KeyFramesSentInPermille"
@@ -2791,24 +3029,32 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.Video.Screenshare.Layer0" units="units"
-    expires_after="never">
+<histogram name="WebRTC.Video.Screenshare.Layer0{ScreenshareLayerStats}"
+    units="units" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
   <owner>sprang@chromium.org</owner>
   <summary>
     Stats for the lower layer (TL0) of a screenshare stream in conference mode.
+    {ScreenshareLayerStats}
   </summary>
+  <token key="ScreenshareLayerStats" variants="ScreenshareLayerStats">
+    <variant name=""/>
+  </token>
 </histogram>
 
-<histogram name="WebRTC.Video.Screenshare.Layer1" units="units"
-    expires_after="never">
+<histogram name="WebRTC.Video.Screenshare.Layer1{ScreenshareLayerStats}"
+    units="units" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
   <owner>sprang@chromium.org</owner>
   <summary>
     Stats for the higher layer (TL1) of a screenshare stream in conference mode.
+    {ScreenshareLayerStats}
   </summary>
+  <token key="ScreenshareLayerStats" variants="ScreenshareLayerStats">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.Video.Screenshare.MeanFreezeDurationMs" units="ms"
@@ -2835,7 +3081,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.Video.Screenshare.MediaBitrateReceivedInKbps"
+<histogram
+    name="WebRTC.Video.Screenshare.MediaBitrateReceivedInKbps{WebRTCVideoExperimentGroupId}"
     units="kbps" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
@@ -2845,7 +3092,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
     The number of received media payload bits per second for a received
     screenshare stream. Recorded when a stream is removed. The total number of
     bytes is divided by the time the video stream exists.
+    {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.Video.Screenshare.MediaBitrateSentInKbps" units="kbps"
@@ -2931,7 +3183,8 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.Video.Screenshare.ReceivedHeightInPixels"
+<histogram
+    name="WebRTC.Video.Screenshare.ReceivedHeightInPixels{WebRTCVideoExperimentGroupId}"
     units="pixels" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
@@ -2939,8 +3192,12 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   <owner>webrtc-video@google.com</owner>
   <summary>
     The average received height per frame for a received screenshare stream.
-    Recorded when a stream is removed.
+    Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.Video.Screenshare.ReceivedPacketsLostInPercent"
@@ -2955,16 +3212,21 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram name="WebRTC.Video.Screenshare.ReceivedWidthInPixels" units="pixels"
-    expires_after="never">
+<histogram
+    name="WebRTC.Video.Screenshare.ReceivedWidthInPixels{WebRTCVideoExperimentGroupId}"
+    units="pixels" expires_after="never">
 <!-- expires-never: WebRTC health metric. -->
 
   <owner>ilnik@chromium.org</owner>
   <owner>webrtc-video@google.com</owner>
   <summary>
     The average received width per frame for a received screenshare stream.
-    Recorded when a stream is removed.
+    Recorded when a stream is removed. {WebRTCVideoExperimentGroupId}
   </summary>
+  <token key="WebRTCVideoExperimentGroupId"
+      variants="WebRTCVideoExperimentGroupId">
+    <variant name=""/>
+  </token>
 </histogram>
 
 <histogram name="WebRTC.Video.Screenshare.ReceiveStreamLifetimeInSeconds"
@@ -3305,7 +3567,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRTC.webkitApiCount" enum="RTCAPIName"
-    expires_after="2021-05-09">
+    expires_after="2021-07-11">
   <owner>guidou@chromium.org</owner>
   <owner>hbos@chromium.org</owner>
   <owner>mcasas@chromium.org</owner>
@@ -3377,7 +3639,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="WebRtcTextLogging.UploadFailureReason"
-    enum="WebRtcLoggingUploadFailureReason" expires_after="2021-06-01">
+    enum="WebRtcLoggingUploadFailureReason" expires_after="2021-08-09">
   <owner>guidou@chromium.org</owner>
   <owner>webrtc-dev@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/webauthn/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/webauthn/histograms.xml
new file mode 100644
index 00000000000..a6397c5cb10
--- /dev/null
+++ b/chromium/tools/metrics/histograms/histograms_xml/webauthn/histograms.xml
@@ -0,0 +1,264 @@
+<!--
+Copyright 2021 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+
+<!--
+This file is used to generate a comprehensive list of WebAuthn histograms
+along with a detailed description for each histogram.
+
+For best practices on writing histogram descriptions, see
+https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/metrics/histograms/README.md
+
+Please send CLs to chromium-metrics-reviews@google.com rather than to specific
+individuals. These CLs will be automatically reassigned to a reviewer within
+about 5 minutes. This approach helps the metrics team to load-balance incoming
+reviews. Googlers can read more about this at go/gwsq-gerrit.
+-->
+
+<histogram-configuration>
+
+<histograms>
+
+<histogram name="WebAuthentication.AttestationPromptResult"
+    enum="WebAuthenticationAttestationPromptResult" expires_after="2020-11-29">
+  <obsolete>
+    Removed 12/2020.
+  </obsolete>
+  <owner>agl@chromium.org</owner>
+  <summary>
+    Tracks events related to prompting users for permission to pass WebAuthn
+    attestation information back to origins. &quot;Queried&quot; means that the
+    embedder was queried for a decision. (Since such decisions can be resolved
+    by enterprise policy, that doesn't imply that a user saw a permissions
+    prompt in every case.) Then one of four things can happen: a timeout, a
+    positive or negative resolution, or the request is abandoned. The latter
+    case occurs when, for example, the tab is closed or the user navigates away.
+  </summary>
+</histogram>
+
+<histogram name="WebAuthentication.CableV1DiscoveryEvent"
+    enum="WebAuthenticationCableV1DiscoveryEvent" expires_after="2021-08-09">
+  <owner>agl@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>
+    Records events that occur during caBLE v1 authenticator discovery so that
+    potential discovery failures can be identified.
+  </summary>
+</histogram>
+
+<histogram name="WebAuthentication.CableV2.AOADiscoveryEvent"
+    enum="WebAuthenticationAOADiscoveryEvent" expires_after="2021-11-19">
+  <owner>agl@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>
+    Records events that happen during the discovery of USB-connected phones.
+  </summary>
+</histogram>
+
+<histogram name="WebAuthentication.CableV2.DiscoveryEvent"
+    enum="WebAuthenticationCableV2DiscoveryEvent" expires_after="2021-11-19">
+  <owner>agl@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>
+    Records events that happen when listening for a caBLEv2 device.
+  </summary>
+</histogram>
+
+<histogram name="WebAuthentication.CableV2.MobileEvent"
+    enum="WebAuthenticationCableV2MobileEvent" expires_after="2021-11-19">
+  <owner>agl@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>
+    Records events that occur during a caBLE v2 transaction from the mobile
+    side.
+  </summary>
+</histogram>
+
+<histogram name="WebAuthentication.CableV2.MobileResult"
+    enum="WebAuthenticationCableV2MobileResult" expires_after="2021-11-19">
+  <owner>agl@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>Records the outcome of caBLEv2 transactions.</summary>
+</histogram>
+
+<histogram name="WebAuthentication.CableV2.RendezvousTime" units="ms"
+    expires_after="2021-11-19">
+  <owner>agl@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>
+    The time between the phone connecting to the tunnel server (and thus
+    starting its BLE broadcast) to the point where it receives the handshake
+    message from the desktop.
+  </summary>
+</histogram>
+
+<histogram name="WebAuthentication.CableV2.TunnelEvent"
+    enum="WebAuthenticationCableV2TunnelEvent" expires_after="2021-11-19">
+  <owner>agl@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>
+    Records events that occur during the creation of a caBLEv2 tunnel.
+  </summary>
+</histogram>
+
+<histogram name="WebAuthentication.ChromeOS.GetAssertionStatus"
+    enum="WebAuthenticationChromeOSGetAssertionResult"
+    expires_after="2021-11-19">
+  <owner>yichengli@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>Records the outcome of GetAssertion on Chrome OS.</summary>
+</histogram>
+
+<histogram name="WebAuthentication.ChromeOS.MakeCredentialStatus"
+    enum="WebAuthenticationChromeOSMakeCredentialResult"
+    expires_after="2021-11-19">
+  <owner>yichengli@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>Records the outcome of MakeCredential on Chrome OS.</summary>
+</histogram>
+
+<histogram name="WebAuthentication.ChromeOS.StartupRecordCount" units="records"
+    expires_after="2021-11-19">
+  <owner>yichengli@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>
+    Records the number of records of the user's WebAuthn credentials created on
+    Chrome OS.
+  </summary>
+</histogram>
+
+<histogram name="WebAuthentication.ChromeOS.UserVerificationRequired"
+    enum="Boolean" expires_after="2021-11-19">
+  <owner>yichengli@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>
+    Records whether the Chrome OS platform authenticator should try to verify
+    the user (instead of requiring power button press). Note that a
+    presence-only request may get upgraded to user-verification. Also note that
+    &quot;true&quot; does not mean the user is actually verified.
+  </summary>
+</histogram>
+
+<histogram name="WebAuthentication.CredentialRequestAllowCredentialsCount"
+    units="credentials" expires_after="2021-05-16">
+  <obsolete>
+    Removed 12/2020.
+  </obsolete>
+  <owner>kenrb@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>
+    When a relying party is attempting to authenticate a user using the
+    WebAuthentication API, this metric reports the number of valid credentials
+    that the RP has registered for the user.
+  </summary>
+</histogram>
+
+<histogram name="WebAuthentication.GetAssertionRequestTransport"
+    enum="WebAuthenticationFidoTransport" expires_after="2021-12-01">
+  <owner>kenrb@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>
+    Records the transport used for all WebAuthentication GetAssertion requests
+    sent to authenticators. This does not necessarily mean that there was a
+    success response from any given authenticator.
+  </summary>
+</histogram>
+
+<histogram name="WebAuthentication.GetAssertionResponseTransport"
+    enum="WebAuthenticationFidoTransport" expires_after="2021-12-01">
+  <owner>kenrb@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>
+    Records the transport used when an authenticator responds with success to a
+    WebAuthentication GetAssertion request.
+  </summary>
+</histogram>
+
+<histogram name="WebAuthentication.IsUVPlatformAuthenticatorAvailable"
+    enum="Boolean" expires_after="2021-12-01">
+  <owner>kenrb@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>
+    Record at startup whether the current system has a platform authenticator
+    available; i.e. whether IsUVPAA JS call would return true or false. This
+    metric is downsampled by factor 10,000 on macOS.
+  </summary>
+</histogram>
+
+<histogram name="WebAuthentication.MakeCredentialExcludeCredentialsCount"
+    units="credentials" expires_after="2021-05-16">
+  <obsolete>
+    Removed 12/2020.
+  </obsolete>
+  <owner>kenrb@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>
+    When a relying party is attempting to register a credential for a new user
+    using the WebAuthentication API, this metric reports the number of existing
+    credentials already registered in order to prevent re-registration.
+  </summary>
+</histogram>
+
+<histogram name="WebAuthentication.MakeCredentialRequestTransport"
+    enum="WebAuthenticationFidoTransport" expires_after="2021-12-01">
+  <owner>kenrb@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>
+    Records the transport used for all WebAuthentication MakeCredential requests
+    sent to authenticators. This does not necessarily mean that there was a
+    success response from any given authenticator.
+  </summary>
+</histogram>
+
+<histogram name="WebAuthentication.MakeCredentialResponseTransport"
+    enum="WebAuthenticationFidoTransport" expires_after="2021-12-01">
+  <owner>kenrb@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>
+    Records the transport used when an authenticator responds with success to a
+    WebAuthentication MakeCredential request.
+  </summary>
+</histogram>
+
+<histogram name="WebAuthentication.RelyingPartySecurityCheckFailure"
+    enum="WebAuthenticationRelyingPartySecurityCheckFailure"
+    expires_after="2020-12-31">
+  <obsolete>
+    Removed 12/2020.
+  </obsolete>
+  <owner>kenrb@chromium.org</owner>
+  <owner>martinkr@google.com</owner>
+  <summary>
+    Records failures associated with verifying the relying party origin when
+    that relying party is attempting to make a credential or get an assertion
+    using the WebAuthentication API. Failures include when the relying party's
+    origin is opaque or non-secure, or when the caller-provided relying party ID
+    or app ID is not valid for this origin.
+  </summary>
+</histogram>
+
+<histogram name="WebAuthentication.U2FAttestationPromptResult"
+    enum="WebAuthenticationU2FAttestationPromptResult"
+    expires_after="2021-06-06">
+  <obsolete>
+    Removed 12/2020.
+  </obsolete>
+  <owner>agl@chromium.org</owner>
+  <summary>
+    Tracks events related to prompting users for permission to pass U2F
+    attestation information back to origins. &quot;Queried&quot; means that the
+    embedder was queried for a decision. (Since such decisions can be resolved
+    by enterprise policy, that doesn't imply that a user saw a permissions
+    prompt in every case.) Then either a positive or negative result can happen.
+    However, note some complications: a negative will be recorded when the tab
+    is closed or the user navigates away, and a positive result will be recorded
+    when the user accepts the permission prompt but the request has already
+    timed out.
+  </summary>
+</histogram>
+
+</histograms>
+
+</histogram-configuration>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/weblayer/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/weblayer/histograms.xml
index 42bb929efd7..15dc99e6e36 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/weblayer/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/weblayer/histograms.xml
@@ -21,6 +21,16 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<histogram name="WebLayer.MainFrameNavigationStart.ConsentDetermined"
+    enum="Boolean" expires_after="M94">
+  <owner>sky@chromium.org</owner>
+  <owner>src/weblayer/OWNERS</owner>
+  <summary>
+    Tracks whether user consent to metrics reporting has been determined when a
+    navigation starts.
+  </summary>
+</histogram>
+
 <histogram name="WebLayer.Startup.ClassLoaderCreationTime" units="ms"
     expires_after="M98">
   <owner>cduvall@chromium.org</owner>
diff --git a/chromium/tools/metrics/histograms/histograms_xml/windows/histograms.xml b/chromium/tools/metrics/histograms/histograms_xml/windows/histograms.xml
index b9901488bb9..79666ef4c87 100644
--- a/chromium/tools/metrics/histograms/histograms_xml/windows/histograms.xml
+++ b/chromium/tools/metrics/histograms/histograms_xml/windows/histograms.xml
@@ -21,6 +21,11 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 
 <histograms>
 
+<variants name="FileOperations">
+  <variant name=".DeleteFile.NonRecursive" summary=""/>
+  <variant name=".DeleteFile.Recursive" summary=""/>
+</variants>
+
 <histogram name="Windows.ApplockerRunning" enum="Boolean" expires_after="M83">
   <owner>forshaw@chromium.org</owner>
   <owner>wfh@chromium.org</owner>
@@ -31,6 +36,28 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Windows.CetAvailable" enum="BooleanAvailable"
+    expires_after="2021-12-01">
+  <owner>ajgo@chromium.org</owner>
+  <owner>wfh@chromium.org</owner>
+  <summary>
+    Records if CET (Control-flow Enforcement Technology / Hardware Enforced
+    Shadow Stack) is available, based on IsUserCetAvailableInEnvironment().
+    Reported once per browser session, on startup.
+  </summary>
+</histogram>
+
+<histogram name="Windows.CetEnabled" enum="BooleanEnabled"
+    expires_after="2021-12-01">
+  <owner>ajgo@chromium.org</owner>
+  <owner>wfh@chromium.org</owner>
+  <summary>
+    Records if CET (Control-flow Enforcement Technology / Hardware Enforced
+    Shadow Stack) is enabled or if it has been disabled by IFEO. Reported only
+    if CetAvailable is true, once per browser session, on startup.
+  </summary>
+</histogram>
+
 <histogram name="Windows.ChromeDllPrefetchResult" enum="FilePrefetchResult"
     expires_after="2021-07-01">
   <owner>brucedawson@chromium.org</owner>
@@ -53,13 +80,20 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram base="true" name="Windows.FilesystemError" enum="WinGetLastError"
-    expires_after="M81">
+<histogram name="Windows.FilesystemError{FileOperations}"
+    enum="WinGetLastError" expires_after="M81">
   <owner>grt@chromium.org</owner>
   <summary>
     The Windows error code relating to a failed attempt to operate on a file or
-    a directory.
+    a directory. {FileOperations}
   </summary>
+  <token key="FileOperations" variants="FileOperations">
+    <variant name="">
+      <obsolete>
+        Base histogram. Use suffixes of this histogram instead.
+      </obsolete>
+    </variant>
+  </token>
 </histogram>
 
 <histogram name="Windows.GetVersionExVersion" enum="WindowsVersion"
@@ -79,7 +113,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Windows.HasHighResolutionTimeTicks" enum="Boolean"
-    expires_after="2021-03-30">
+    expires_after="2021-08-15">
   <owner>brucedawson@chromium.org</owner>
   <owner>gab@chromium.org</owner>
   <summary>
@@ -89,8 +123,9 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Windows.HighResolutionTimerUsage" units="%"
-    expires_after="M81">
-  <owner>stanisc@chromium.org</owner>
+    expires_after="2022-02-12">
+  <owner>olivierli@chromium.org</owner>
+  <owner>chrome-catan@google.com</owner>
   <summary>
     Percentage of elapsed time the high resolution timer is activated. The usage
     is reported by each of Chrome processes individually (without aggregation)
@@ -99,7 +134,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Windows.HypervPresent" enum="BooleanEnabled"
-    expires_after="2021-05-02">
+    expires_after="2021-08-01">
   <owner>rkc@chromium.org</owner>
   <owner>rockot@chromium.org</owner>
   <summary>
@@ -270,16 +305,24 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
-<histogram base="true" name="Windows.PostOperationState"
+<histogram name="Windows.PostOperationState{FileOperations}"
     enum="PostOperationState" expires_after="M81">
   <owner>grt@chromium.org</owner>
   <summary>
     The state of an item in the filesystem following an operation on it.
+    {FileOperations}
   </summary>
+  <token key="FileOperations" variants="FileOperations">
+    <variant name="">
+      <obsolete>
+        Base histogram. Use suffixes of this histogram instead.
+      </obsolete>
+    </variant>
+  </token>
 </histogram>
 
 <histogram name="Windows.ProcessorFamily" enum="ProcessorFamily"
-    expires_after="2021-05-02">
+    expires_after="2021-07-27">
   <owner>rkc@chromium.org</owner>
   <owner>rockot@chromium.org</owner>
   <summary>
@@ -291,7 +334,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Windows.ProcessorVirtualizationFirmwareEnabled"
-    enum="BooleanEnabled" expires_after="2021-05-02">
+    enum="BooleanEnabled" expires_after="2021-07-27">
   <owner>rkc@chromium.org</owner>
   <owner>rockot@chromium.org</owner>
   <summary>
@@ -300,13 +343,25 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
   </summary>
 </histogram>
 
+<histogram name="Windows.ServiceStatus.SSP" units="WindowsServiceStatus"
+    expires_after="2021-08-01">
+  <owner>wfh@chromium.org</owner>
+  <owner>ajgo@chromium.org</owner>
+  <summary>
+    This records whether any SSP/AD providers are registered on the system. If
+    there are any then this typically means the network sandbox cannot
+    successfully engage. Recorded each time the browser attempts to start the
+    network service process. This metric is only recorded on Windows 10+.
+  </summary>
+</histogram>
+
 <histogram name="Windows.Tablet" enum="BooleanTablet" expires_after="M77">
   <owner>zturner@chromium.org</owner>
   <summary>Count of browser launches from a Windows tablet pc.</summary>
 </histogram>
 
 <histogram name="Windows.TmpFileDeleter.FailCount" units="files"
-    expires_after="2021-05-02">
+    expires_after="2021-08-09">
   <owner>grt@chromium.org</owner>
   <owner>etiennep@chromium.org</owner>
   <summary>
@@ -320,7 +375,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Windows.TmpFileDeleter.SuccessCount" units="files"
-    expires_after="2021-05-02">
+    expires_after="2021-08-09">
   <owner>grt@chromium.org</owner>
   <owner>etiennep@chromium.org</owner>
   <summary>
@@ -333,7 +388,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit.
 </histogram>
 
 <histogram name="Windows.TouchDrag.Success" units="BooleanSuccess"
-    expires_after="2021-03-01">
+    expires_after="2021-08-01">
   <owner>davidbienvenu@chromium.org</owner>
   <owner>dfried@chromium.org</owner>
   <summary>
diff --git a/chromium/tools/metrics/metrics_python_tests.py b/chromium/tools/metrics/metrics_python_tests.py
index 5c9cafae267..ddd3eb63ab1 100755
--- a/chromium/tools/metrics/metrics_python_tests.py
+++ b/chromium/tools/metrics/metrics_python_tests.py
@@ -23,12 +23,10 @@ def resolve(*paths):
 sys.exit(
     typ.main(tests=resolve(
         'actions/extract_actions_test.py',
-        # TODO(crbug/1126653): Turn back on once tests can pass again.
-        # 'histograms/expand_owners_unittest.py',
+        'histograms/expand_owners_unittest.py',
         'histograms/extract_histograms_test.py',
         'histograms/generate_expired_histograms_array_unittest.py',
         'histograms/pretty_print_test.py',
-        'rappor/rappor_model_test.py',
         'ukm/codegen_test.py',
         'ukm/gen_builders_test.py',
         'ukm/ukm_model_test.py',
diff --git a/chromium/tools/metrics/rappor/OWNERS b/chromium/tools/metrics/rappor/OWNERS
deleted file mode 100644
index b96832d0e58..00000000000
--- a/chromium/tools/metrics/rappor/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-# Metrics changes should always be reviewed by owners.
-per-file rappor.xml=file://base/metrics/OWNERS
-per-file rappor.xml=set noparent
diff --git a/chromium/tools/metrics/rappor/PRESUBMIT.py b/chromium/tools/metrics/rappor/PRESUBMIT.py
deleted file mode 100644
index 4c6e9bf4c55..00000000000
--- a/chromium/tools/metrics/rappor/PRESUBMIT.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-"""Presubmit script for rappor.xml.
-
-See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
-for more details on the presubmit API built into gcl.
-"""
-
-
-def CheckChange(input_api, output_api):
-  """Checks that rappor.xml is pretty-printed and well-formatted."""
-  for f in input_api.AffectedTextFiles():
-    p = f.AbsoluteLocalPath()
-    if (input_api.basename(p) == 'rappor.xml'
-        and input_api.os_path.dirname(p) == input_api.PresubmitLocalPath()):
-      cwd = input_api.os_path.dirname(p)
-      exit_code = input_api.subprocess.call(
-          [input_api.python_executable, 'pretty_print.py', '--presubmit'],
-          cwd=cwd)
-      if exit_code != 0:
-        return [
-            output_api.PresubmitError(
-                'rappor.xml is not formatted correctly; run git cl format '
-                'to fix.')
-        ]
-  return []
-
-
-def CheckChangeOnUpload(input_api, output_api):
-  return CheckChange(input_api, output_api)
-
-
-def CheckChangeOnCommit(input_api, output_api):
-  return CheckChange(input_api, output_api)
diff --git a/chromium/tools/metrics/rappor/README.md b/chromium/tools/metrics/rappor/README.md
deleted file mode 100644
index 859584b133b..00000000000
--- a/chromium/tools/metrics/rappor/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Rappor (Randomized Aggregatable Privacy Preserving Ordinal Responses)
-
-RAPPOR reports consist of randomly generated data that is biased based on data
-collected from the user. Data from many users can be aggregated to learn
-information about the population, but little or nothing can be concluded about
-individual users from their reports.
-
-Documentation:
-http://www.chromium.org/developers/design-documents/rappor
diff --git a/chromium/tools/metrics/rappor/pretty_print.py b/chromium/tools/metrics/rappor/pretty_print.py
deleted file mode 100755
index 388803c72c8..00000000000
--- a/chromium/tools/metrics/rappor/pretty_print.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import logging
-import os
-import sys
-
-import rappor_model
-sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'common'))
-import presubmit_util
-
-def main(argv):
-  presubmit_util.DoPresubmitMain(argv, 'rappor.xml', 'rappor.old.xml',
-                                 rappor_model.UpdateXML)
-
-
-if '__main__' == __name__:
-  sys.exit(main(sys.argv))
diff --git a/chromium/tools/metrics/rappor/rappor.xml b/chromium/tools/metrics/rappor/rappor.xml
deleted file mode 100644
index 27502895680..00000000000
--- a/chromium/tools/metrics/rappor/rappor.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<!--
-Copyright 2015 The Chromium Authors. All rights reserved.
-Use of this source code is governed by a BSD-style license that can be
-found in the LICENSE file.
--->
-
-<!--
-This file is used to generate a comprehensive list of Chrome rappor metrics
-along with a detailed description for each histogram. See the design doc at
-http://www.chromium.org/developers/design-documents/rappor
-for a description of rappor metrics.
--->
-
-<rappor-configuration>
-<!--
-Noise levels that rappor metrics can be collected with.  This list should be
-kept in sync with NoiseLevel definitions in
-components/rappor/rappor_parameters.h.
--->
-
-<noise-levels>
-<noise-level name="NO_NOISE">
-  <summary>
-    Adds no noise at all. Only use this for non-sensitive fields, and only for
-    metrics from UMA enabled users.
-  </summary>
-  <noise-values fake-prob="0.0" fake-one-prob="0.0" one-coin-prob="1.0"
-      zero-coin-prob="0.0"/>
-</noise-level>
-
-<noise-level name="NORMAL_NOISE">
-  <summary>
-    The most common amount of noise, suitable for most fields.
-  </summary>
-  <noise-values fake-prob="0.5" fake-one-prob="0.5" one-coin-prob="0.75"
-      zero-coin-prob="0.25"/>
-</noise-level>
-
-<noise-level name="SPARSE_NOISE">
-  <summary>
-    Reduced noise, suitable for metrics which receive limited reports (less than
-    500,000 per day) or expect a highly skewed/sparse distribution over a wide
-    set of domains. Approval from the Chrome Privacy and Rappor teams is
-    required to implement a metric using this noise level.
-  </summary>
-  <noise-values fake-prob="0.25" fake-one-prob="0.5" one-coin-prob="0.75"
-      zero-coin-prob="0.25"/>
-</noise-level>
-
-</noise-levels>
-
-<!--
-Parameters that rappor metrics can be collected with.  This list should be
-kept in sync with parameter type definitions in
-components/rappor/rappor_parameters.h.
--->
-
-<rappor-parameter-types>
-<rappor-parameters name="ETLD_PLUS_ONE">
-  <summary>
-    Deprecated parameters for collecting the domain and registry of a URL from
-    UMA enabled users. Should use UMA_RAPPOR_TYPE instead.
-  </summary>
-  <parameters num-cohorts="128" bytes="16" hash-functions="2"
-      reporting-level="FINE" noise-level="NORMAL_NOISE"/>
-</rappor-parameters>
-
-<rappor-parameters name="LOW_FREQUENCY_ETLD_PLUS_ONE">
-  <summary>
-    Parameters for collecting the domain and registry of a URL from UMA enabled
-    users, using SPARSE_NOISE. Intended for sparse/skewed metrics, or low
-    frequency metrics (less than 500,000 reports per day). Explicit approval
-    from the Chrome Privacy and Rappor teams is required to use this type. New
-    metrics should also consider LOW_FREQUENCY_UMA_RAPPOR_TYPE instead.
-  </summary>
-  <parameters num-cohorts="128" bytes="16" hash-functions="2"
-      reporting-level="FINE" noise-level="SPARSE_NOISE"/>
-</rappor-parameters>
-
-<rappor-parameters name="LOW_FREQUENCY_UMA_RAPPOR_TYPE">
-  <summary>
-    Parameters suitable for metrics from UMA enabled users, using SPARSE_NOISE.
-    Intended for sparse/skewed metrics, or low frequency metrics (less than
-    500,000 reports per day). Explicit approval from the Chrome Privacy and
-    Rappor teams is required to use this type.
-  </summary>
-  <parameters num-cohorts="128" bytes="4" hash-functions="2"
-      reporting-level="FINE" noise-level="SPARSE_NOISE"/>
-</rappor-parameters>
-
-<rappor-parameters name="UMA_RAPPOR_TYPE">
-  <summary>
-    Parameters suitable for metrics from UMA enabled users.
-  </summary>
-  <parameters num-cohorts="128" bytes="4" hash-functions="2"
-      reporting-level="FINE" noise-level="NORMAL_NOISE"/>
-</rappor-parameters>
-
-</rappor-parameter-types>
-
-<!-- Rappor metric definitions -->
-
-<rappor-metrics>
-<rappor-metric name="CustomTabs.ServiceClient.PackageName"
-    type="UMA_RAPPOR_TYPE">
-  <owner>yusufo@chromium.org</owner>
-  <summary>
-    The package name for a client that has connected through the custom tabs
-    service.
-  </summary>
-</rappor-metric>
-
-<rappor-metric name="CustomTabs.ServiceClient.PackageNameThirdParty"
-    type="UMA_RAPPOR_TYPE">
-  <owner>yusufo@chromium.org</owner>
-  <summary>
-    The package name for a client that has connected through the custom tabs
-    service excluding Google Search App.
-  </summary>
-</rappor-metric>
-
-</rappor-metrics>
-
-</rappor-configuration>
diff --git a/chromium/tools/metrics/rappor/rappor_model.py b/chromium/tools/metrics/rappor/rappor_model.py
deleted file mode 100644
index 757cc076424..00000000000
--- a/chromium/tools/metrics/rappor/rappor_model.py
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-# """Model objects for rappor.xml contents."""
-
-import logging
-import operator
-import os
-import re
-import sys
-
-sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'common'))
-import models
-
-# Model definitions for rappor.xml content
-_OBSOLETE_TYPE = models.TextNodeType('obsolete')
-_OWNER_TYPE = models.TextNodeType('owner', single_line=True)
-_SUMMARY_TYPE = models.TextNodeType('summary')
-
-_NOISE_VALUES_TYPE = models.ObjectNodeType(
-    'noise-values',
-    attributes=[
-        ('fake-prob', float, None),
-        ('fake-one-prob', float, None),
-        ('one-coin-prob', float, None),
-        ('zero-coin-prob', float, None),
-    ])
-
-_NOISE_LEVEL_TYPE = models.ObjectNodeType(
-    'noise-level',
-    extra_newlines=(1, 1, 1),
-    attributes=[('name', str, None)],
-    children=[
-        models.ChildType('summary', _SUMMARY_TYPE, False),
-        models.ChildType('values', _NOISE_VALUES_TYPE, False),
-    ])
-
-_NOISE_LEVELS_TYPE = models.ObjectNodeType(
-    'noise-levels',
-    extra_newlines=(1, 1, 1),
-    indent=False,
-    children=[
-        models.ChildType('levels', _NOISE_LEVEL_TYPE, True),
-    ])
-
-_PARAMETERS_TYPE = models.ObjectNodeType(
-    'parameters',
-    attributes=[
-        ('num-cohorts', int, None),
-        ('bytes', int, None),
-        ('hash-functions', int, None),
-        ('reporting-level', str, None),
-        ('noise-level', str, None),
-    ])
-
-_RAPPOR_PARAMETERS_TYPE = models.ObjectNodeType(
-    'rappor-parameters',
-    extra_newlines=(1, 1, 1),
-    attributes=[('name', str, None)],
-    children=[
-        models.ChildType('summary', _SUMMARY_TYPE, False),
-        models.ChildType('parameters', _PARAMETERS_TYPE, False),
-    ])
-
-_RAPPOR_PARAMETERS_TYPES_TYPE = models.ObjectNodeType(
-    'rappor-parameter-types',
-    extra_newlines=(1, 1, 1),
-    indent=False,
-    children=[
-        models.ChildType('types', _RAPPOR_PARAMETERS_TYPE, True),
-    ])
-
-_STRING_FIELD_TYPE = models.ObjectNodeType(
-    'string-field',
-    extra_newlines=(1, 1, 0),
-    attributes=[('name', str, None)],
-    children=[
-        models.ChildType('summary', _SUMMARY_TYPE, False),
-    ])
-
-_FLAG_TYPE = models.ObjectNodeType(
-    'flag',
-    attributes=[('bit', int, None), ('label', str, None)],
-    text_attribute='summary',
-    single_line=True)
-
-_FLAGS_FIELD_TYPE = models.ObjectNodeType(
-    'flags-field',
-    extra_newlines=(1, 1, 0),
-    attributes=[('name', str, None), ('noise-level', str, None)],
-    children=[
-        models.ChildType('flags', _FLAG_TYPE, True),
-        models.ChildType('summary', _SUMMARY_TYPE, False),
-    ])
-
-_UINT64_FIELD_TYPE = models.ObjectNodeType(
-    'uint64-field',
-    extra_newlines=(1, 1, 0),
-    attributes=[('name', str, None), ('noise-level', str, None)],
-    children=[
-        models.ChildType('summary', _SUMMARY_TYPE, False),
-    ])
-
-_RAPPOR_METRIC_TYPE = models.ObjectNodeType(
-    'rappor-metric',
-    extra_newlines=(1, 1, 1),
-    attributes=[('name', str, None), ('type', str, None)],
-    children=[
-        models.ChildType('obsolete', _OBSOLETE_TYPE, False),
-        models.ChildType('owners', _OWNER_TYPE, True),
-        models.ChildType('summary', _SUMMARY_TYPE, False),
-        models.ChildType('strings', _STRING_FIELD_TYPE, True),
-        models.ChildType('flags', _FLAGS_FIELD_TYPE, True),
-        models.ChildType('uint64', _UINT64_FIELD_TYPE, True),
-    ])
-
-_RAPPOR_METRICS_TYPE = models.ObjectNodeType(
-    'rappor-metrics',
-    extra_newlines=(1, 1, 1),
-    indent=False,
-    children=[
-        models.ChildType('metrics', _RAPPOR_METRIC_TYPE, True),
-    ])
-
-_RAPPOR_CONFIGURATION_TYPE = models.ObjectNodeType(
-    'rappor-configuration',
-    extra_newlines=(1, 1, 1),
-    indent=False,
-    children=[
-        models.ChildType('noiseLevels', _NOISE_LEVELS_TYPE, False),
-        models.ChildType(
-            'parameterTypes', _RAPPOR_PARAMETERS_TYPES_TYPE, False),
-        models.ChildType('metrics', _RAPPOR_METRICS_TYPE, False),
-    ])
-
-RAPPOR_XML_TYPE = models.DocumentType(_RAPPOR_CONFIGURATION_TYPE)
-
-
-METRIC_DIMENSION_TYPES = [
-    'strings',
-    'flags',
-    'uint64',
-]
-
-
-def _CheckRequired(obj, label, attributes):
-  """Check that an JSON object has all required attributes.
-
-  Args:
-    obj: The JSON object.
-    label: The name of the object, to use in error messages.
-    attributes: The attributes to check for.
-  Returns:
-    True iff the object contains all of the attributes.
-  """
-  for attr in attributes:
-    if attr not in obj:
-      logging.error('Missing %s for %s', attr, label)
-      return False
-  return True
-
-
-def _CheckAllAttributes(obj, label, node_type):
-  """Check that an JSON object has all attributes of some node_type.
-
-  Args:
-    obj: The JSON object.
-    label: The name of the object, to use in error messages.
-    node_type: The NodeType with the attributes to check for.
-  Returns:
-    True iff the object contains all of the attributes.
-  """
-  return _CheckRequired(obj, label,
-                        (attr for attr, _, _ in node_type.attributes))
-
-
-def _IsValidNoiseLevel(noise_level):
-  """Check if a noise-level is validly defined.
-
-  Args:
-    noise_level: The JSON noise-level to validate.
-  Returns:
-    True iff noise-level is valid.
-  """
-  if 'name' not in noise_level:
-    logging.error('Missing name for noise-level')
-    return False
-  label = 'noise-level "%s"' % noise_level['name']
-  return (_CheckRequired(noise_level, label, ['summary', 'values']) and
-          _CheckAllAttributes(noise_level['values'], label, _NOISE_VALUES_TYPE))
-
-
-def _GetNoiseLevelNames(config):
-  return set(p['name'] for p in config['noiseLevels']['levels'])
-
-
-def _IsValidRapporType(rappor_type, noise_level_names):
-  """Check if a rappor-type is validly defined.
-
-  Args:
-    rappor_type: The JSON rappor-type to validate.
-    noise_level_names: The set of valid noise_level names.
-  Returns:
-    True iff rappor-type is valid.
-  """
-  if 'name' not in rappor_type:
-    logging.error('Missing name for rappor-type')
-    return False
-  label = 'rappor-type "%s"' % rappor_type['name']
-  if not _CheckRequired(rappor_type, label, ['summary', 'parameters']):
-    return False
-  params = rappor_type['parameters']
-  if not _CheckAllAttributes(params, label, _PARAMETERS_TYPE):
-    return False
-  if params['noise-level'] not in noise_level_names:
-    logging.error('Invalid noise-level "%s" for %s',
-                  params['noise-level'], label)
-    return False
-  return True
-
-
-def _GetTypeNames(config):
-  return set(p['name'] for p in config['parameterTypes']['types'])
-
-
-# Old flag definitions look like: 'Bit 0: DID_PROCEED'.  The regex ignores
-# whitespace differences.
-BIT_DEF_RE = re.compile(r'Bit\s+(\d+)\s*:\s*(\S+)', re.IGNORECASE)
-
-
-def _FixAndValidateFlagsField(field, parent_label):
-  """Update old style flags, and validates them.
-
-  Args:
-    field: A flags-field JSON object.
-    parent_label: The name of the parent object, to use in error messages.
-  Returns:
-    True if the field is valid.
-  """
-  if 'name' not in field:
-    logging.error('Missing |name| for field in %s', parent_label)
-    return False
-  label = 'field "%s" of %s' % (field['name'], parent_label)
-  for i, flag in enumerate(field['flags']):
-    if 'bit' in flag:
-      if 'label' not in flag:
-        logging.error('Missing |label| for bit %s of %s', flag['bit'], label)
-        return False
-      continue
-    # Try to upgrade from old format
-    if 'summary' not in flag:
-      # Missing both bit and summary, but we prefer 'bit' over summary.
-      logging.error('Missing bit number in %s', label)
-      return False
-    match = BIT_DEF_RE.search(flag['summary'])
-    if match:
-      flag['bit'] = int(match.group(1))
-      flag['label'] = match.group(2)
-    else:
-      # Bit not labeled, infer bit number from position.
-      flag['bit'] = i
-      flag['label'] = flag['summary']
-    del flag['summary']
-  field['flags'].sort(key=operator.itemgetter('bit'))
-  for i, flag in enumerate(field['flags']):
-    if flag['bit'] != i:
-      logging.error('Missing bit %s for %s', i, label)
-      return False
-  return True
-
-
-def _IsValidMetric(metric, type_names):
-  """Check if a rappor-metric is validly defined.
-
-  Args:
-    metric: The JSON rappor-metric to validate.
-    type_names: The set of valid type names.
-  Returns:
-    True iff rappor-metric is valid.
-  """
-  if 'name' not in metric:
-    logging.error('Missing name for rappor-metric')
-    return False
-  label = 'rappor-metric "%s"' % metric['name']
-  if not _CheckRequired(metric, label, ['summary', 'type']):
-    return False
-  if not metric['owners']:
-    logging.error('Missing owners for %s', label)
-    return False
-  if metric['type'] not in type_names:
-    logging.error('Invalid type "%s" for %s', metric['type'], label)
-    return False
-  for field in metric['flags']:
-    if not _FixAndValidateFlagsField(field, label):
-      return False
-  return True
-
-
-def IsSimpleStringMetric(metric):
-  """Checks if the given metric is a simple string metric.
-
-  Args:
-    metric: A metric object, as extracted from _RAPPOR_METRIC_TYPE
-  Returns:
-    True iff the metric is a simple string metric.
-  """
-  return all(not metric[dim_type] for dim_type in METRIC_DIMENSION_TYPES)
-
-
-def _HasErrors(config):
-  """Checks that rappor.xml passes some basic validation checks.
-
-  Args:
-    config: The parsed rappor.xml contents.
-
-  Returns:
-    True iff there are validation errors.
-  """
-  for noise_level in config['noiseLevels']['levels']:
-    if not _IsValidNoiseLevel(noise_level):
-      return True
-  noise_level_names = _GetNoiseLevelNames(config)
-  for rappor_type in config['parameterTypes']['types']:
-    if not _IsValidRapporType(rappor_type, noise_level_names):
-      return True
-  rappor_type_names = _GetTypeNames(config)
-  for metric in config['metrics']['metrics']:
-    if not _IsValidMetric(metric, rappor_type_names):
-      return True
-  return False
-
-
-def _Cleanup(config):
-  """Performs cleanup on description contents, such as sorting metrics.
-
-  Args:
-    config: The parsed rappor.xml contents.
-  """
-  config['parameterTypes']['types'].sort(key=operator.itemgetter('name'))
-  config['metrics']['metrics'].sort(key=operator.itemgetter('name'))
-
-
-def UpdateXML(original_xml):
-  """Parses the original xml and return a pretty printed version.
-
-  Args:
-    original_xml: A string containing the original xml file contents.
-
-  Returns:
-    A pretty-printed xml string, or None if the config contains errors.
-  """
-  config = RAPPOR_XML_TYPE.Parse(original_xml)
-
-  if _HasErrors(config):
-    return None
-
-  _Cleanup(config)
-
-  return RAPPOR_XML_TYPE.PrettyPrint(config)
diff --git a/chromium/tools/metrics/rappor/rappor_model_test.py b/chromium/tools/metrics/rappor/rappor_model_test.py
deleted file mode 100755
index e764e705a39..00000000000
--- a/chromium/tools/metrics/rappor/rappor_model_test.py
+++ /dev/null
@@ -1,384 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2015 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-from __future__ import unicode_literals
-
-import copy
-import unittest
-
-import rappor_model
-
-PUBLIC_XML_SNIPPET = """
-<rappor-configuration>
-
-<noise-levels>
-<noise-level name="NO_NOISE">
-  <summary>
-    NO_NOISE description.
-  </summary>
-  <noise-values fake-prob="0.0" fake-one-prob="0.0" one-coin-prob="1.0"
-      zero-coin-prob="0.0"/>
-</noise-level>
-
-<noise-level name="NORMAL_NOISE">
-  <summary>
-    NORMAL_NOISE description.
-  </summary>
-  <noise-values fake-prob="0.5" fake-one-prob="0.5" one-coin-prob="0.75"
-      zero-coin-prob="0.25"/>
-</noise-level>
-</noise-levels>
-
-<rappor-parameter-types>
-<rappor-parameters name="ETLD_PLUS_ONE">
-  <summary>
-    ETLD+1 parameters.
-  </summary>
-  <parameters num-cohorts="128"
-              bytes="16"
-              hash-functions="2"
-              reporting-level="FINE"
-              noise-level="NORMAL_NOISE"/>
-</rappor-parameters>
-<rappor-parameters name="SAFEBROWSING_RAPPOR_TYPE">
-  <summary>
-    SAFEBROWSING parameters.
-  </summary>
-  <parameters num-cohorts="128"
-              bytes="1"
-              hash-functions="2"
-              reporting-level="COARSE"
-              noise-level="NORMAL_NOISE"/>
-</rappor-parameters>
-</rappor-parameter-types>
-
-<rappor-metrics>
-
-<rappor-metric name="MultiD.TestMetric" type="SAFEBROWSING_RAPPOR_TYPE">
-  <owner>holte@chromium.org</owner>
-  <summary>
-    Metric Summary.
-  </summary>
-  <string-field name="domain">
-    <summary>
-      Domain Summary.
-    </summary>
-  </string-field>
-  <flags-field name="flags">
-    <flag>Bit 0</flag>
-    <flag label="MyBit" bit="1">What it means</flag>
-    <summary>
-      Flags Summary.
-    </summary>
-  </flags-field>
-</rappor-metric>
-
-<rappor-metric name="Search.DefaultSearchProvider" type="ETLD_PLUS_ONE">
-  <owner>
-    holte@chromium.org
-  </owner>
-  <summary>
-
-    BLAH BLAH  BLAH
-  </summary>
-</rappor-metric>
-</rappor-metrics>
-</rappor-configuration>
-"""
-
-PARSED_XML = {
-    rappor_model.models.COMMENT_KEY: [],
-    'noiseLevels': {
-        rappor_model.models.COMMENT_KEY: [],
-        'levels': [
-            {
-                rappor_model.models.COMMENT_KEY: [],
-                'name': 'NO_NOISE',
-                'summary': {
-                    rappor_model.models.COMMENT_KEY: [],
-                    'text': 'NO_NOISE description.',
-                },
-                'values': {
-                    rappor_model.models.COMMENT_KEY: [],
-                    'fake-prob': 0.0,
-                    'fake-one-prob': 0.0,
-                    'one-coin-prob': 1.0,
-                    'zero-coin-prob': 0.0,
-                },
-            },
-            {
-                rappor_model.models.COMMENT_KEY: [],
-                'name': 'NORMAL_NOISE',
-                'summary': {
-                    rappor_model.models.COMMENT_KEY: [],
-                    'text': 'NORMAL_NOISE description.',
-                },
-                'values': {
-                    rappor_model.models.COMMENT_KEY: [],
-                    'fake-prob': 0.5,
-                    'fake-one-prob': 0.5,
-                    'one-coin-prob': 0.75,
-                    'zero-coin-prob': 0.25,
-                },
-            },
-        ]
-    },
-    'parameterTypes': {
-        rappor_model.models.COMMENT_KEY: [],
-        'types': [
-            {
-                rappor_model.models.COMMENT_KEY: [],
-                'name': 'ETLD_PLUS_ONE',
-                'summary': {
-                    rappor_model.models.COMMENT_KEY: [],
-                    'text': 'ETLD+1 parameters.',
-                },
-                'parameters': {
-                    rappor_model.models.COMMENT_KEY: [],
-                    'num-cohorts': 128,
-                    'bytes': 16,
-                    'hash-functions': 2,
-                    'reporting-level': 'FINE',
-                    'noise-level': 'NORMAL_NOISE',
-                },
-            },
-            {
-                rappor_model.models.COMMENT_KEY: [],
-                'name': 'SAFEBROWSING_RAPPOR_TYPE',
-                'summary': {
-                    rappor_model.models.COMMENT_KEY: [],
-                    'text': 'SAFEBROWSING parameters.',
-                },
-                'parameters': {
-                    rappor_model.models.COMMENT_KEY: [],
-                    'num-cohorts': 128,
-                    'bytes': 1,
-                    'hash-functions': 2,
-                    'reporting-level': 'COARSE',
-                    'noise-level': 'NORMAL_NOISE',
-                },
-            },
-        ]
-    },
-    'metrics': {
-        rappor_model.models.COMMENT_KEY: [],
-        'metrics': [{
-            rappor_model.models.COMMENT_KEY: [],
-            'name':
-                'MultiD.TestMetric',
-            'flags': [{
-                rappor_model.models.COMMENT_KEY: [],
-                'name':
-                    'flags',
-                'summary': {
-                    rappor_model.models.COMMENT_KEY: [],
-                    'text': 'Flags Summary.',
-                },
-                'flags': [
-                    {
-                        rappor_model.models.COMMENT_KEY: [],
-                        'summary': 'Bit 0'
-                    },
-                    {
-                        rappor_model.models.COMMENT_KEY: [],
-                        'summary': 'What it means',
-                        'label': 'MyBit',
-                        'bit': 1,
-                    },
-                ],
-            }],
-            'owners': [{
-                rappor_model.models.COMMENT_KEY: [],
-                'text': 'holte@chromium.org',
-            }],
-            'strings': [{
-                rappor_model.models.COMMENT_KEY: [],
-                'name': 'domain',
-                'summary': {
-                    rappor_model.models.COMMENT_KEY: [],
-                    'text': 'Domain Summary.',
-                },
-            }],
-            'summary': {
-                rappor_model.models.COMMENT_KEY: [],
-                'text': 'Metric Summary.',
-            },
-            'type':
-                'SAFEBROWSING_RAPPOR_TYPE',
-            'uint64': [],
-        }, {
-            rappor_model.models.COMMENT_KEY: [],
-            'name': 'Search.DefaultSearchProvider',
-            'flags': [],
-            'owners': [{
-                rappor_model.models.COMMENT_KEY: [],
-                'text': 'holte@chromium.org',
-            }],
-            'strings': [],
-            'summary': {
-                rappor_model.models.COMMENT_KEY: [],
-                'text': 'BLAH BLAH BLAH',
-            },
-            'type': 'ETLD_PLUS_ONE',
-            'uint64': [],
-        }]
-    }
-}
-
-PRETTY_PRINTED_XML = """<rappor-configuration>
-<noise-levels>
-<noise-level name="NO_NOISE">
-  <summary>
-    NO_NOISE description.
-  </summary>
-  <noise-values fake-prob="0.0" fake-one-prob="0.0" one-coin-prob="1.0"
-      zero-coin-prob="0.0"/>
-</noise-level>
-
-<noise-level name="NORMAL_NOISE">
-  <summary>
-    NORMAL_NOISE description.
-  </summary>
-  <noise-values fake-prob="0.5" fake-one-prob="0.5" one-coin-prob="0.75"
-      zero-coin-prob="0.25"/>
-</noise-level>
-
-</noise-levels>
-
-<rappor-parameter-types>
-<rappor-parameters name="ETLD_PLUS_ONE">
-  <summary>
-    ETLD+1 parameters.
-  </summary>
-  <parameters num-cohorts="128" bytes="16" hash-functions="2"
-      reporting-level="FINE" noise-level="NORMAL_NOISE"/>
-</rappor-parameters>
-
-<rappor-parameters name="SAFEBROWSING_RAPPOR_TYPE">
-  <summary>
-    SAFEBROWSING parameters.
-  </summary>
-  <parameters num-cohorts="128" bytes="1" hash-functions="2"
-      reporting-level="COARSE" noise-level="NORMAL_NOISE"/>
-</rappor-parameters>
-
-</rappor-parameter-types>
-
-<rappor-metrics>
-<rappor-metric name="MultiD.TestMetric" type="SAFEBROWSING_RAPPOR_TYPE">
-  <owner>holte@chromium.org</owner>
-  <summary>
-    Metric Summary.
-  </summary>
-  <string-field name="domain">
-    <summary>
-      Domain Summary.
-    </summary>
-  </string-field>
-  <flags-field name="flags">
-    <flag bit="0" label="Bit 0"/>
-    <flag bit="1" label="MyBit">What it means</flag>
-    <summary>
-      Flags Summary.
-    </summary>
-  </flags-field>
-</rappor-metric>
-
-<rappor-metric name="Search.DefaultSearchProvider" type="ETLD_PLUS_ONE">
-  <owner>holte@chromium.org</owner>
-  <summary>
-    BLAH BLAH BLAH
-  </summary>
-</rappor-metric>
-
-</rappor-metrics>
-
-</rappor-configuration>
-"""
-
-
-class RapporModelTest(unittest.TestCase):
-
-  def testParse(self):
-    self.maxDiff = None
-    parsed = rappor_model.RAPPOR_XML_TYPE.Parse(PUBLIC_XML_SNIPPET)
-    self.assertDictEqual(PARSED_XML, parsed)
-
-  def testUpdate(self):
-    updated = rappor_model.UpdateXML(PUBLIC_XML_SNIPPET)
-    # Compare list of lines for nicer diff on errors.
-    self.assertMultiLineEqual(PRETTY_PRINTED_XML, updated)
-    reprinted = rappor_model.UpdateXML(updated)
-    self.assertMultiLineEqual(PRETTY_PRINTED_XML, reprinted)
-
-  def testIsValidNoise(self):
-    valid_noise_level = {
-        'name': 'A',
-        'summary': 'B',
-        'values': {
-            'fake-prob': 0.5,
-            'fake-one-prob': 0.5,
-            'one-coin-prob': 0.75,
-            'zero-coin-prob': 0.25,
-        },
-    }
-    self.assertTrue(rappor_model._IsValidNoiseLevel(valid_noise_level))
-    invalid_noise_level = copy.copy(valid_noise_level)
-    del invalid_noise_level['name']
-    self.assertFalse(rappor_model._IsValidNoiseLevel(invalid_noise_level))
-    invalid_noise_level = copy.copy(valid_noise_level)
-    del invalid_noise_level['summary']
-    self.assertFalse(rappor_model._IsValidNoiseLevel(invalid_noise_level))
-    invalid_noise_level = copy.copy(valid_noise_level)
-    del invalid_noise_level['values']
-    self.assertFalse(rappor_model._IsValidNoiseLevel(invalid_noise_level))
-    invalid_noise_level = copy.deepcopy(valid_noise_level)
-    del invalid_noise_level['values']['fake-prob']
-    self.assertFalse(rappor_model._IsValidNoiseLevel(invalid_noise_level))
-
-  def testIsValidRapporType(self):
-    noise_level_names = {'NORMAL_NOISE'}
-    valid_type = {
-        'name': 'ETLD_PLUS_ONE',
-        'summary': 'ETLD+1 parameters.',
-        'parameters': {
-            'num-cohorts': 128,
-            'bytes': 16,
-            'hash-functions': 2,
-            'reporting-level': 'FINE',
-            'noise-level': 'NORMAL_NOISE',
-        },
-    }
-    self.assertTrue(rappor_model._IsValidRapporType(valid_type,
-                                                    noise_level_names))
-
-  def testIsValidRapporMetric(self):
-    type_names = {'ETLD_PLUS_ONE'}
-    valid_metric = {
-        'name': 'Search.DefaultSearchProvider',
-        'flags': [],
-        'owners': ['holte@chromium.org'],
-        'strings': [],
-        'summary': 'BLAH BLAH BLAH',
-        'type': 'ETLD_PLUS_ONE',
-        'uint64': [],
-    }
-    self.assertTrue(rappor_model._IsValidMetric(valid_metric, type_names))
-    invalid_metric = copy.copy(valid_metric)
-    del invalid_metric['name']
-    self.assertFalse(rappor_model._IsValidMetric(invalid_metric, type_names))
-    invalid_metric = copy.copy(valid_metric)
-    del invalid_metric['summary']
-    self.assertFalse(rappor_model._IsValidMetric(invalid_metric, type_names))
-    invalid_metric = copy.copy(valid_metric)
-    invalid_metric['type'] = 'FOO'
-    self.assertFalse(rappor_model._IsValidMetric(invalid_metric, type_names))
-    invalid_metric = copy.copy(valid_metric)
-    invalid_metric['owners'] = []
-    self.assertFalse(rappor_model._IsValidMetric(invalid_metric, type_names))
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/chromium/tools/metrics/structured/PRESUBMIT.py b/chromium/tools/metrics/structured/PRESUBMIT.py
index d53f74bf05a..43aa17c815d 100644
--- a/chromium/tools/metrics/structured/PRESUBMIT.py
+++ b/chromium/tools/metrics/structured/PRESUBMIT.py
@@ -9,37 +9,37 @@ for more details on the presubmit API built into gcl.
 """
 
 STRUCTURED_XML = 'structured.xml'
+STRUCTURED_OLD_XML = 'structured.old.xml'
+
 
 def CheckChange(input_api, output_api):
   """ Checks that structured.xml is pretty-printed and well-formatted. """
-  for f in input_api.AffectedTextFiles():
-    p = f.AbsoluteLocalPath()
-    if (input_api.basename(p) == STRUCTURED_XML
-        and input_api.os_path.dirname(p) == input_api.PresubmitLocalPath()):
-      cwd = input_api.os_path.dirname(p)
+  errors = []
+
+  for file in input_api.AffectedTextFiles():
+    path = file.AbsoluteLocalPath()
+    basename = input_api.basename(path)
+    if input_api.os_path.dirname(path) != input_api.PresubmitLocalPath():
+      continue
 
+    if basename == STRUCTURED_XML:
+      cwd = input_api.os_path.dirname(path)
       exit_code = input_api.subprocess.call(
           [input_api.python_executable, 'pretty_print.py', '--presubmit'],
           cwd=cwd)
       if exit_code != 0:
-        return [
+        errors.append(
             output_api.PresubmitError(
-                '%s is not prettified; run git cl format to fix.' %
-                STRUCTURED_XML),
-        ]
+                STRUCTURED_XML +
+                ' is not prettified; run git cl format to fix.'))
+    elif basename == STRUCTURED_OLD_XML:
+      errors.append(
+          output_api.PresubmitError(
+              STRUCTURED_OLD_XML +
+              ' exists after formatting; please remove before upload.'))
 
-      exit_code = input_api.subprocess.call(
-          [input_api.python_executable, 'validate_format.py', '--presubmit'],
-          cwd=cwd)
-      if exit_code != 0:
-        return [
-            output_api.PresubmitError(
-                '%s does not pass format validation; run %s/validate_format.py '
-                'and fix the reported error(s) or warning(s).' %
-                (STRUCTURED_XML, input_api.PresubmitLocalPath())),
-        ]
+  return errors
 
-  return []
 
 def CheckChangeOnUpload(input_api, output_api):
   return CheckChange(input_api, output_api)
diff --git a/chromium/tools/metrics/structured/codegen.py b/chromium/tools/metrics/structured/codegen.py
index f5a483c3916..74047cd1b5b 100644
--- a/chromium/tools/metrics/structured/codegen.py
+++ b/chromium/tools/metrics/structured/codegen.py
@@ -1,4 +1,5 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# -*- coding: utf-8 -*-
+# Copyright 2021 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -8,125 +9,159 @@ import hashlib
 import os
 import re
 import struct
-from model import _EVENT_TYPE, _EVENTS_TYPE
-from model import _PROJECT_TYPE, _PROJECTS_TYPE
-from model import _METRIC_TYPE
 
 
-def sanitize_name(name):
-  s = re.sub('[^0-9a-zA-Z_]', '_', name)
-  return s
+class Util:
+  """Helpers for generating C++."""
 
+  @staticmethod
+  def sanitize_name(name):
+    return re.sub('[^0-9a-zA-Z_]', '_', name)
 
-def HashName(name):
-  # This must match the hash function in base/metrics/metric_hashes.cc
-  # >Q: 8 bytes, big endian.
-  return struct.unpack('>Q', hashlib.md5(name).digest()[:8])[0]
+  @staticmethod
+  def camel_to_snake(name):
+    pat = '((?<=[a-z0-9])[A-Z]|(?!^)[A-Z](?=[a-z]))'
+    return re.sub(pat, r'_\1', name).lower()
 
+  @staticmethod
+  def hash_name(name):
+    # This must match the hash function in chromium's
+    # //base/metrics/metric_hashes.cc. >Q means 8 bytes, big endian.
+    name = name.encode('utf-8')
+    md5 = hashlib.md5(name)
+    return struct.unpack('>Q', md5.digest()[:8])[0]
 
-class FileInfo(object):
-  def __init__(self, relpath, basename):
-    self.dir_path = relpath
-    self.guard_path = sanitize_name(os.path.join(relpath, basename)).upper()
+  @staticmethod
+  def event_name_hash(project_name, event_name):
+    """Make the name hash for an event.
 
+    This gets uploaded in the StructuredEventProto.event_name_hash field. It is
+    the sole means of recording which event from structured.xml a
+    StructuredEventProto instance represents.
 
-class EventInfo(object):
-  def __init__(self, event_obj, project_obj):
-    self.raw_name = event_obj['name']
-    self.name = sanitize_name(event_obj['name'])
-    self.name_hash = HashName(event_obj['name'])
+    To avoid naming collisions, it must contain three pieces of information:
+     - the name of the event itself
+     - the name of the event's project, to avoid collisions with events of the
+       same name in other projects
+     - an identifier that this comes from chromium, to avoid collisions with
+       events and projects of the same name defined in cros's structured.xml
+
+    This must use sanitized names for the project and event.
+    """
+    event_name = Util.sanitize_name(event_name)
+    project_name = Util.sanitize_name(project_name)
+    # TODO(crbug.com/1148168): Once the minimum python version is 3.6+, rewrite
+    # this .format and others using f-strings.
+    return Util.hash_name('chrome::{}::{}'.format(project_name, event_name))
+
+
+class FileInfo:
+  """Codegen-related info about a file."""
+
+  def __init__(self, dirname, basename):
+    self.dirname = dirname
+    self.basename = basename
+    self.filepath = os.path.join(dirname, basename)
+
+    # This takes the last three components of the filepath for use in the
+    # header guard, ie. METRICS_STRUCTURED_STRUCTURED_EVENTS_H_
+    relative_path = os.sep.join(self.filepath.split(os.sep)[-3:])
+    self.guard_path = Util.sanitize_name(relative_path).upper()
+
+
+class ProjectInfo:
+  """Codegen-related info about a project."""
+
+  def __init__(self, project):
+    self.name = Util.sanitize_name(project.name)
+    self.namespace = Util.camel_to_snake(self.name)
+    self.name_hash = Util.hash_name(self.name)
+
+    if project.id == 'uma':
+      self.id_type = 'kUmaId'
+    elif project.id == 'per-project':
+      self.id_type = 'kProjectId'
+    elif project.id == 'none':
+      self.id_type = 'kUnidentified'
 
-    # If a project is associated with this event, project_obj will be non-None
-    # and we should use the project's name as the key name hash. Otherwise, use
-    # the event's name as the key name hash.
-    if project_obj:
-      project_name = sanitize_name(project_obj['name'])
-    else:
-      project_name = sanitize_name(event_obj['name'])
-    self.project_name_hash = HashName(project_name)
 
+class EventInfo:
+  """Codegen-related info about an event."""
 
-class MetricInfo(object):
-  def __init__(self, json_obj):
-    self.raw_name = json_obj['name']
-    self.name = sanitize_name(json_obj['name'])
-    self.hash = HashName(json_obj['name'])
-    if json_obj['kind'] == 'hashed-string':
+  def __init__(self, event, project_info):
+    self.name = Util.sanitize_name(event.name)
+    self.name_hash = Util.event_name_hash(project_info.name, self.name)
+
+
+class MetricInfo:
+  """Codegen-related info about a metric."""
+
+  def __init__(self, metric):
+    self.name = Util.sanitize_name(metric.name)
+    self.hash = Util.hash_name(metric.name)
+
+    if metric.type == 'hmac-string':
       self.type = 'std::string&'
       self.setter = 'AddStringMetric'
-    elif json_obj['kind'] == 'int':
+    elif metric.type == 'int':
       self.type = 'int'
       self.setter = 'AddIntMetric'
     else:
-      raise Exception("Unexpected metric kind: " + json_obj['kind'])
+      raise ValueError('Invalid metric type.')
+
 
-class Template(object):
+class Template:
   """Template for producing code from structured.xml."""
 
-  def __init__(self, basename, file_template, event_template, metric_template):
+  def __init__(self, model, dirname, basename, file_template, project_template,
+               event_template, metric_template):
+    self.model = model
+    self.dirname = dirname
     self.basename = basename
     self.file_template = file_template
+    self.project_template = project_template
     self.event_template = event_template
     self.metric_template = metric_template
 
-  def _StampMetricCode(self, file_info, event_info, metric):
-    """Stamp a metric by creating name hash constant based on the metric name,
-    and a setter method."""
-    return self.metric_template.format(
-        file=file_info,
-        event=event_info,
-        metric=MetricInfo(metric))
-
-  def _StampEventCode(self, file_info, event, project):
-    """Stamp an event class by creating a skeleton of the class based on the
-    event name, and then stamping code for each metric within it."""
-    event_info = EventInfo(event, project)
-    metric_code = ''.join(
-        self._StampMetricCode(file_info, event_info, metric)
-        for metric in event[_METRIC_TYPE.tag])
-    return self.event_template.format(
-        file=file_info,
-        event=event_info,
-        metric_code=metric_code)
-
-  def _StampFileCode(self, relpath, data):
-    """Stamp a file by creating a class for each event, and a list of all event
-    name hashes."""
-    file_info = FileInfo(relpath, self.basename)
-    event_code = []
-
-    project_name_hashes = set()
-    defined_projects = {
-        project['name']: project
-        for project in data[_PROJECTS_TYPE.tag][_PROJECT_TYPE.tag]
-    }
-    for event in data[_EVENTS_TYPE.tag][_EVENT_TYPE.tag]:
-      defined_project = defined_projects.get(event.get('project'))
-      event_code.append(self._StampEventCode(file_info, event, defined_project))
-      project_name_hashes.add(
-          defined_project['name'] if defined_project else event['name'])
-
-    event_code = ''.join(event_code)
-
-    project_name_hashes = [
-        'UINT64_C(%s)' % HashName(name)
-        for name in sorted(list(project_name_hashes))
-    ]
-    project_name_hashes = '{' + ', '.join(project_name_hashes) + '}'
-
-    return self.file_template.format(
-        file=file_info,
-        event_code=event_code,
-        project_name_hashes=project_name_hashes)
+  def write_file(self):
+    file_info = FileInfo(self.dirname, self.basename)
+    with open(file_info.filepath, 'w') as f:
+      f.write(self._stamp_file(file_info))
 
-  def WriteFile(self, outdir, relpath, data):
-    """Generates code and writes it to a file.
+  def _stamp_file(self, file_info):
+    project_code = ''.join(
+        self._stamp_project(file_info, p) for p in self.model.projects)
 
-    Args:
-      relpath: The path to the file in the source tree.
-      rootdir: The root of the path the file should be written to.
-      data: The parsed structured.xml data.
-    """
-    output = open(os.path.join(outdir, self.basename), 'w')
-    output.write(self._StampFileCode(relpath, data))
-    output.close()
+    project_names = sorted([p.name for p in self.model.projects])
+    project_hashes_list = [
+        'UINT64_C({})'.format(Util.hash_name(n)) for n in project_names
+    ]
+    project_hashes_literal = '{' + ', '.join(project_hashes_list) + '}'
+
+    return self.file_template.format(file=file_info,
+                                     project_code=project_code,
+                                     project_hashes=project_hashes_literal)
+
+  def _stamp_project(self, file_info, project):
+    project_info = ProjectInfo(project)
+    event_code = ''.join(
+        self._stamp_event(file_info, project_info, event)
+        for event in project.events)
+    return self.project_template.format(file=file_info,
+                                        project=project_info,
+                                        event_code=event_code)
+
+  def _stamp_event(self, file_info, project_info, event):
+    event_info = EventInfo(event, project_info)
+    metric_code = ''.join(
+        self._stamp_metric(file_info, event_info, metric)
+        for metric in event.metrics)
+    return self.event_template.format(file=file_info,
+                                      project=project_info,
+                                      event=event_info,
+                                      metric_code=metric_code)
+
+  def _stamp_metric(self, file_info, event_info, metric):
+    return self.metric_template.format(file=file_info,
+                                       event=event_info,
+                                       metric=MetricInfo(metric))
diff --git a/chromium/tools/metrics/structured/codegen_unittest.py b/chromium/tools/metrics/structured/codegen_unittest.py
new file mode 100755
index 00000000000..c1954801439
--- /dev/null
+++ b/chromium/tools/metrics/structured/codegen_unittest.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""Tests for codegen.py.
+"""
+
+# TODO(crbug.com/1148168): Set up these tests to run on the tryjobs.
+
+import unittest
+from codegen import Util
+
+
+class CodegenTest(unittest.TestCase):
+  """Tests for codegen.py"""
+
+  def test_sanitize_name(self):
+    self.assertEqual(Util.sanitize_name('My Metric.Or::Event/Or/Project_name'),
+                     'My_Metric_Or__Event_Or_Project_name')
+
+  def test_camel_to_snake(self):
+    def check(camel, expected_snake):
+      self.assertEqual(Util.camel_to_snake(camel), expected_snake)
+
+    check('already_snake_case', 'already_snake_case')
+    check('ConvertFromCamelCase', 'convert_from_camel_case')
+    check('HTTPAcronymAtStart', 'http_acronym_at_start')
+    check('AcronymInHTTPMiddle', 'acronym_in_http_middle')
+    check('AcronymAtEndHTTP', 'acronym_at_end_http')
+
+  def test_hash_name(self):
+    # This was generated using the function in Chromium's
+    # //base/metrics/metrics_hashes.cc.
+    known_good_hash = 11096769389970233700
+    self.assertEqual(Util.hash_name('known good hash'), known_good_hash)
+
+  def test_event_name_hash(self):
+    # This was generated using the function in Chromium's
+    # //base/metrics/metrics_hashes.cc for the string
+    # cros::TestProjectOne::TestEventOne
+    event_name_hash = 16542188217976373364
+    project_name = 'TestProjectOne'
+    event_name = 'TestEventOne'
+    self.assertEqual(Util.event_name_hash(project_name, event_name),
+                     event_name_hash)
+
+
+if __name__ == '__main__':
+  unittest.main()
diff --git a/chromium/tools/metrics/structured/compile_time_validation.py b/chromium/tools/metrics/structured/compile_time_validation.py
deleted file mode 100644
index 7f7b9318d3a..00000000000
--- a/chromium/tools/metrics/structured/compile_time_validation.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2020 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""Verifies that structured.xml is well-structured."""
-
-from collections import Counter
-from model import _METRIC_TYPE
-from model import _EVENT_TYPE, _EVENTS_TYPE
-from model import _PROJECT_TYPE, _PROJECTS_TYPE
-
-
-def eventsReferenceValidProjects(data):
-  """Check that any project referenced by an event exists."""
-  projects = {
-      project['name']: project
-      for project in data[_PROJECTS_TYPE.tag][_PROJECT_TYPE.tag]
-  }
-  for event in data[_EVENTS_TYPE.tag][_EVENT_TYPE.tag]:
-    project_name = event.get('project')
-    project = projects.get(project_name)
-    if project is None and project_name is not None:
-      raise Exception(("Structured metrics event '{}' references "
-                       "nonexistent project '{}'.").format(
-                           event['name'], project_name))
-
-
-def projectAndEventNamesDontCollide(data):
-  """Check that there are no events with the same name as a project."""
-  projects = {
-      project['name']
-      for project in data[_PROJECTS_TYPE.tag][_PROJECT_TYPE.tag]
-  }
-  for event in data[_EVENTS_TYPE.tag][_EVENT_TYPE.tag]:
-    if event['name'] in projects:
-      raise Exception(("Structured metrics event and project have the same "
-                       "name: '{}'.").format(event['name']))
-
-
-def eventNamesUnique(data):
-  """Check that no two events have the same name."""
-  name_counts = Counter(
-      event['name'] for event in data[_EVENTS_TYPE.tag][_EVENT_TYPE.tag])
-  for name, count in name_counts.items():
-    if count != 1:
-      raise Exception(
-          "Structured metrics events have duplicate name '{}'.".format(name))
-
-
-def projectNamesUnique(data):
-  """Check that no two projects have the same name."""
-  name_counts = Counter(
-      project['name']
-      for project in data[_PROJECTS_TYPE.tag][_PROJECT_TYPE.tag])
-  for name, count in name_counts.items():
-    if count != 1:
-      raise Exception(
-          "Structured metrics projects have duplicate name '{}'.".format(name))
-
-
-def metricNamesUniqueWithinEvent(data):
-  """Check that no two metrics within an event have the same name."""
-  for event in data[_EVENTS_TYPE.tag][_EVENT_TYPE.tag]:
-    name_counts = Counter(metric['name'] for metric in event[_METRIC_TYPE.tag])
-    for name, count in name_counts.items():
-      if count != 1:
-        raise Exception(("Structured metrics event '{}' has duplicated metric "
-                         "name '{}'.").format(event['name'], name))
-
-
-def validate(data):
-  eventsReferenceValidProjects(data)
-  projectAndEventNamesDontCollide(data)
-  eventNamesUnique(data)
-  projectNamesUnique(data)
-  metricNamesUniqueWithinEvent(data)
diff --git a/chromium/tools/metrics/structured/gen_events.py b/chromium/tools/metrics/structured/gen_events.py
index 8d8e67852d8..f0200ecabf2 100755
--- a/chromium/tools/metrics/structured/gen_events.py
+++ b/chromium/tools/metrics/structured/gen_events.py
@@ -1,35 +1,50 @@
-#!/usr/bin/env python
-# Copyright 2019 The Chromium Authors. All rights reserved.
+#!/usr/bin/env python3
+# Copyright 2021 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A utility for generating classes for structured metrics events.
 
-It takes as input a structured.xml file describing all events and produces a
-c++ header and implementation file exposing builders for those events.
+Takes as input a structured.xml file describing all events and produces a C++
+header and implementation file exposing builders for those events.
 """
 
 import argparse
 import sys
 
+import codegen
 import model
-import events_template
-import compile_time_validation
+import templates
 
 parser = argparse.ArgumentParser(
   description='Generate structured metrics events')
 parser.add_argument('--input', help='Path to structured.xml')
 parser.add_argument('--output', help='Path to generated files.')
 
-def main(argv):
-  args = parser.parse_args()
 
-  data = model.XML_TYPE.Parse(open(args.input).read())
-  relpath = 'components/metrics/structured'
-  compile_time_validation.validate(data)
-  events_template.WriteFiles(args.output, relpath, data)
+def main():
+  args = parser.parse_args()
+  data = model.Model(open(args.input).read())
+
+  codegen.Template(
+      data,
+      args.output,
+      'structured_events.h',
+      file_template=templates.HEADER_FILE_TEMPLATE,
+      project_template=templates.HEADER_PROJECT_TEMPLATE,
+      event_template=templates.HEADER_EVENT_TEMPLATE,
+      metric_template=templates.HEADER_METRIC_TEMPLATE).write_file()
+
+  codegen.Template(data,
+      args.output,
+      'structured_events.cc',
+      file_template=templates.IMPL_FILE_TEMPLATE,
+      project_template=templates.IMPL_PROJECT_TEMPLATE,
+      event_template=templates.IMPL_EVENT_TEMPLATE,
+      metric_template=templates.IMPL_METRIC_TEMPLATE).write_file()
 
   return 0
 
-if '__main__' == __name__:
-  sys.exit(main(sys.argv))
+
+if __name__ == '__main__':
+  sys.exit(main())
diff --git a/chromium/tools/metrics/structured/model.py b/chromium/tools/metrics/structured/model.py
index 2d90bf20c67..1b32dcb0a4d 100644
--- a/chromium/tools/metrics/structured/model.py
+++ b/chromium/tools/metrics/structured/model.py
@@ -1,121 +1,222 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# -*- coding: utf-8 -*-
+# Copyright 2021 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import os
-import sys
-
-sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'common'))
-import models
-
-# Helpers
-
-# A key for sorting XML nodes by the value of |attribute|.
-_LOWERCASE_FN = lambda attribute: (lambda node: node.get(attribute).lower())
-# A constant function as the sorting key for nodes whose orderings should be
-# kept as given in the XML file within their parent node.
-_KEEP_ORDER = lambda node: 1
-
-# Model definitions
-
-_OBSOLETE_TYPE = models.TextNodeType('obsolete')
-_OWNER_TYPE = models.TextNodeType('owner', single_line=True)
-_SUMMARY_TYPE = models.TextNodeType('summary')
-
-_METRIC_TYPE =  models.ObjectNodeType(
-    'metric',
-    attributes=[
-      ('name', unicode, r'^[A-Za-z0-9_.]+$'),
-      ('kind', unicode, r'^(?i)(|hashed-string|int)$'),
-    ],
-    alphabetization=[
-        (_OBSOLETE_TYPE.tag, lambda _: 1),
-        (_SUMMARY_TYPE.tag, lambda _: 2),
-    ],
-    children=[
-        models.ChildType(_OBSOLETE_TYPE.tag, _OBSOLETE_TYPE, multiple=False),
-        models.ChildType(_OWNER_TYPE.tag, _OWNER_TYPE, multiple=True),
-        models.ChildType(_SUMMARY_TYPE.tag, _SUMMARY_TYPE, multiple=False),
-    ])
-
-_EVENT_TYPE = models.ObjectNodeType(
-    'event',
-    attributes=[
-        ('name', unicode, r'^[A-Z][A-Za-z0-9.]*$'),
-        ('project', unicode, r'^([A-Z][A-Za-z0-9.]*)?$'),
-    ],
-    alphabetization=[
-        (_OBSOLETE_TYPE.tag, lambda _: 1),
-        (_OWNER_TYPE.tag, lambda _: 2),
-        (_SUMMARY_TYPE.tag, lambda _: 3),
-        (_METRIC_TYPE.tag, _LOWERCASE_FN('name')),
-    ],
-    extra_newlines=(1, 1, 1),
-    children=[
-        models.ChildType(_OBSOLETE_TYPE.tag, _OBSOLETE_TYPE, multiple=False),
-        models.ChildType(_OWNER_TYPE.tag, _OWNER_TYPE, multiple=True),
-        models.ChildType(_SUMMARY_TYPE.tag, _SUMMARY_TYPE, multiple=False),
-        models.ChildType(_METRIC_TYPE.tag, _METRIC_TYPE, multiple=True),
-    ])
-
-_EVENTS_TYPE = models.ObjectNodeType(
-    'events',
-    alphabetization=[(_EVENT_TYPE.tag, _LOWERCASE_FN('name'))],
-    extra_newlines=(2, 1, 1),
-    indent=False,
-    children=[
-        models.ChildType(_EVENT_TYPE.tag, _EVENT_TYPE, multiple=True),
-    ])
-
-_PROJECT_TYPE = models.ObjectNodeType(
-    'project',
-    attributes=[
-        ('name', unicode, r'^[A-Z][A-Za-z0-9.]*$'),
-    ],
-    alphabetization=[
-        (_OBSOLETE_TYPE.tag, lambda _: 1),
-        (_OWNER_TYPE.tag, lambda _: 2),
-        (_SUMMARY_TYPE.tag, lambda _: 3),
-    ],
-    extra_newlines=(1, 1, 1),
-    children=[
-        models.ChildType(_OBSOLETE_TYPE.tag, _OBSOLETE_TYPE, multiple=False),
-        models.ChildType(_OWNER_TYPE.tag, _OWNER_TYPE, multiple=True),
-        models.ChildType(_SUMMARY_TYPE.tag, _SUMMARY_TYPE, multiple=False),
-    ])
-
-_PROJECTS_TYPE = models.ObjectNodeType(
-    'projects',
-    alphabetization=[(_PROJECT_TYPE.tag, _LOWERCASE_FN('name'))],
-    extra_newlines=(2, 1, 1),
-    indent=False,
-    children=[
-        models.ChildType(_PROJECT_TYPE.tag, _PROJECT_TYPE, multiple=True),
-    ])
-
-CONFIGURATION_TYPE = models.ObjectNodeType(
-    'structured-metrics',
-    alphabetization=[
-        (_EVENTS_TYPE.tag, lambda _: 1),
-        (_PROJECTS_TYPE.tag, lambda _: 2),
-    ],
-    extra_newlines=(2, 1, 1),
-    indent=False,
-    children=[
-        models.ChildType(_EVENTS_TYPE.tag, _EVENTS_TYPE, multiple=False),
-        models.ChildType(_PROJECTS_TYPE.tag, _PROJECTS_TYPE, multiple=False),
-    ])
-
-XML_TYPE = models.DocumentType(CONFIGURATION_TYPE)
-
-def PrettifyXML(original_xml):
-  """Parses the original xml and return a pretty printed version.
-
-  Args:
-    original_xml: A string containing the original xml file contents.
-
-  Returns:
-    A pretty-printed xml string, or None if the config contains errors.
+"""Model of a structured metrics description xml file.
+
+This marshals an XML string into a Model, and validates that the XML is
+semantically correct. The model can also be used to create a canonically
+formatted version XML.
+"""
+
+import xml.etree.ElementTree as ET
+import textwrap as tw
+import model_util as util
+
+
+def wrap(text, indent):
+  wrapper = tw.TextWrapper(width=80,
+                           initial_indent=indent,
+                           subsequent_indent=indent)
+  return wrapper.fill(tw.dedent(text))
+
+
+# TODO(crbug.com/1148168): This can be removed and replaced with textwrap.indent
+# once this is run under python3.
+def indent(text, prefix):
+  return '\n'.join(prefix + line if line else '' for line in text.split('\n'))
+
+
+class Model:
+  """Represents all projects in the structured.xml file.
+
+  A Model is initialized with an XML string representing the top-level of
+  the structured.xml file. This file is built from three building blocks:
+  metrics, events, and projects. These have the following attributes.
+
+    METRIC
+    - summary
+    - data type
+
+    EVENT
+    - summary
+    - one or more metrics
+
+    PROJECT
+    - summary
+    - id specifier
+    - one or more owners
+    - one or more events
+
+  The following is an example input XML.
+
+    <structured-metrics>
+    <project name="MyProject">
+      <owner>owner@chromium.org</owner>
+      <id>none</id>
+      <summary> My project. </summary>
+
+      <event name="MyEvent">
+        <summary> My event. </summary>
+        <metric name="MyMetric" type="int">
+          <summary> My metric. </summary>
+        </metric>
+      </event>
+    </project>
+    </structured-metrics>
+
+  Calling str(model) will return a canonically formatted XML string.
   """
-  config = XML_TYPE.Parse(original_xml)
-  return XML_TYPE.PrettyPrint(config)
+
+  OWNER_REGEX = r'^.+@(chromium\.org|google\.com)$'
+  NAME_REGEX = r'^[A-Za-z0-9_.]+$'
+  TYPE_REGEX = r'^(hmac-string|int)$'
+  ID_REGEX = r'^(none|per-project|uma)$'
+
+  def __init__(self, xml_string):
+    elem = ET.fromstring(xml_string)
+    util.check_attributes(elem, set())
+    util.check_children(elem, {'project'})
+    util.check_child_names_unique(elem, 'project')
+
+    projects = util.get_compound_children(elem, 'project')
+    self.projects = [Project(p) for p in projects]
+
+  def __repr__(self):
+    projects = '\n\n'.join(str(p) for p in self.projects)
+
+    result = tw.dedent("""\
+               <structured-metrics>
+
+               {projects}
+
+               </structured-metrics>""")
+    return result.format(projects=projects)
+
+
+class Project:
+  """Represents a single structured metrics project.
+
+  A Project is initialized with an XML node representing one project, eg:
+
+    <project name="MyProject">
+      <owner>owner@chromium.org</owner>
+      <id>none</id>
+      <summary> My project. </summary>
+
+      <event name="MyEvent">
+        <summary> My event. </summary>
+        <metric name="MyMetric" type="int">
+          <summary> My metric. </summary>
+        </metric>
+      </event>
+    </project>
+
+  Calling str(project) will return a canonically formatted XML string.
+  """
+
+  def __init__(self, elem):
+    util.check_attributes(elem, {'name'})
+    util.check_children(elem, {'id', 'summary', 'owner', 'event'})
+    util.check_child_names_unique(elem, 'event')
+
+    self.name = util.get_attr(elem, 'name', Model.NAME_REGEX)
+    self.id = util.get_text_child(elem, 'id', Model.ID_REGEX)
+    self.summary = util.get_text_child(elem, 'summary')
+    self.owners = util.get_text_children(elem, 'owner', Model.OWNER_REGEX)
+
+    self.events = [Event(e) for e in util.get_compound_children(elem, 'event')]
+
+  def __repr__(self):
+    events = '\n\n'.join(str(e) for e in self.events)
+    events = indent(events, '  ')
+    summary = wrap(self.summary, indent='    ')
+    owners = '\n'.join('  <owner>{}</owner>'.format(o) for o in self.owners)
+
+    result = tw.dedent("""\
+               <project name="{name}">
+               {owners}
+                 <id>{id}</id>
+                 <summary>
+               {summary}
+                 </summary>
+
+               {events}
+               </project>""")
+    return result.format(name=self.name,
+                         owners=owners,
+                         id=self.id,
+                         summary=summary,
+                         events=events)
+
+
+class Event:
+  """Represents a single structured metrics event.
+
+  An Event is initialized with an XML node representing one event, eg:
+
+    <event name="MyEvent">
+      <summary> My event. </summary>
+      <metric name="MyMetric" type="int">
+        <summary> My metric. </summary>
+      </metric>
+    </event>
+
+  Calling str(event) will return a canonically formatted XML string.
+  """
+
+  def __init__(self, elem):
+    util.check_attributes(elem, {'name'})
+    util.check_children(elem, {'summary', 'metric'})
+    util.check_child_names_unique(elem, 'metric')
+
+    self.name = util.get_attr(elem, 'name', Model.NAME_REGEX)
+    self.summary = util.get_text_child(elem, 'summary')
+    self.metrics = [
+        Metric(m) for m in util.get_compound_children(elem, 'metric')
+    ]
+
+  def __repr__(self):
+    metrics = '\n'.join(str(m) for m in self.metrics)
+    metrics = indent(metrics, '  ')
+    summary = wrap(self.summary, indent='    ')
+    result = tw.dedent("""\
+               <event name="{name}">
+                 <summary>
+               {summary}
+                 </summary>
+               {metrics}
+               </event>""")
+    return result.format(name=self.name, summary=summary, metrics=metrics)
+
+
+class Metric:
+  """Represents a single metric.
+
+  A Metric is initialized with an XML node representing one metric, eg:
+
+    <metric name="MyMetric" type="int">
+      <summary> My metric. </summary>
+    </metric>
+
+  Calling str(metric) will return a canonically formatted XML string.
+  """
+
+  def __init__(self, elem):
+    util.check_attributes(elem, {'name', 'type'})
+    util.check_children(elem, {'summary'})
+
+    self.name = util.get_attr(elem, 'name', Model.NAME_REGEX)
+    self.type = util.get_attr(elem, 'type', Model.TYPE_REGEX)
+    self.summary = util.get_text_child(elem, 'summary')
+
+  def __repr__(self):
+    summary = wrap(self.summary, indent='    ')
+    result = tw.dedent("""\
+               <metric name="{name}" type="{type}">
+                 <summary>
+               {summary}
+                 </summary>
+               </metric>""")
+    return result.format(name=self.name, type=self.type, summary=summary)
diff --git a/chromium/tools/metrics/structured/model_unittest.py b/chromium/tools/metrics/structured/model_unittest.py
new file mode 100755
index 00000000000..aac8a10b456
--- /dev/null
+++ b/chromium/tools/metrics/structured/model_unittest.py
@@ -0,0 +1,299 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""Tests for model.py.
+"""
+
+# TODO(crbug.com/1148168): Set up these tests to run on the tryjobs.
+
+import unittest
+from model import Model
+
+
+class ModelTest(unittest.TestCase):
+  """Tests for model.py"""
+
+  def assert_project(self, project, name, id_, summary, owners):
+    self.assertEqual(project.name, name)
+    self.assertEqual(project.id, id_)
+    self.assertEqual(project.summary.strip(), summary)
+    self.assertEqual(len(project.owners), len(owners))
+    for actual, expected in zip(project.owners, owners):
+      self.assertEqual(actual, expected)
+
+  def assert_event(self, event, name, summary):
+    self.assertEqual(event.name, name)
+    self.assertEqual(event.summary.strip(), summary)
+
+  def assert_metric(self, metric, name, type_, summary):
+    self.assertEqual(metric.name, name)
+    self.assertEqual(metric.type, type_)
+    self.assertEqual(metric.summary.strip(), summary)
+
+  def assert_model_raises(self, xml):
+    raised = False
+    try:
+      Model(xml)
+    except ValueError:
+      raised = True
+    self.assertTrue(raised)
+
+  def test_valid_xml(self):
+    xml = """\
+          <structured-metrics>
+          <project name="ProjectOne">
+            <owner>test1@chromium.org</owner>
+            <owner>test2@chromium.org</owner>
+            <id>none</id>
+            <summary> Test project. </summary>
+
+            <event name="EventOne">
+              <summary> Test event. </summary>
+              <metric name="MetricOne" type="int">
+                <summary> Test metric. </summary>
+              </metric>
+              <metric name="MetricTwo" type="hmac-string">
+                <summary> Test metric. </summary>
+              </metric>
+            </event>
+
+            <event name="EventTwo">
+              <summary> Test event. </summary>
+              <metric name="MetricThree" type="int">
+                <summary> Test metric. </summary>
+              </metric>
+            </event>
+          </project>
+
+          <project name="ProjectTwo">
+            <owner>test@chromium.org</owner>
+            <id>uma</id>
+            <summary> Test project. </summary>
+
+            <event name="EventThree">
+              <summary> Test event. </summary>
+              <metric name="MetricFour" type="int">
+                <summary> Test metric. </summary>
+              </metric>
+            </event>
+          </project>
+          </structured-metrics>"""
+
+    data = Model(xml)
+
+    self.assertEqual(len(data.projects), 2)
+    project_one, project_two = data.projects
+    self.assert_project(project_one, 'ProjectOne', 'none', 'Test project.',
+                        ('test1@chromium.org', 'test2@chromium.org'))
+    self.assert_project(project_two, 'ProjectTwo', 'uma', 'Test project.',
+                        ('test@chromium.org', ))
+
+    self.assertEqual(len(project_one.events), 2)
+    self.assertEqual(len(project_two.events), 1)
+    event_one, event_two = project_one.events
+    event_three, = project_two.events
+    self.assert_event(event_one, 'EventOne', 'Test event.')
+    self.assert_event(event_two, 'EventTwo', 'Test event.')
+    self.assert_event(event_three, 'EventThree', 'Test event.')
+
+    self.assertEqual(len(event_one.metrics), 2)
+    self.assertEqual(len(event_two.metrics), 1)
+    self.assertEqual(len(event_three.metrics), 1)
+    metric_one, metric_two = event_one.metrics
+    metric_three, = event_two.metrics
+    metric_four, = event_three.metrics
+    self.assert_metric(metric_one, 'MetricOne', 'int', 'Test metric.')
+    self.assert_metric(metric_two, 'MetricTwo', 'hmac-string', 'Test metric.')
+    self.assert_metric(metric_three, 'MetricThree', 'int', 'Test metric.')
+    self.assert_metric(metric_four, 'MetricFour', 'int', 'Test metric.')
+
+  def test_owners_validation(self):
+    # No owner for project.
+    self.assert_model_raises("""\
+        <structured-metrics>
+        <project name="project">
+        <id>uma</id>
+        <summary> Test project. </summary>
+        <event name="EventThree">
+          <summary> Test event. </summary>
+          <metric name="MetricFour" type="int">
+            <summary> Test metric. </summary>
+          </metric>
+        </event>
+        </project>
+        </structured-metrics>""")
+
+    # Owner is username not email.
+    self.assert_model_raises("""\
+        <structured-metrics>
+        <project name="project">
+          <owner>test@</owner>
+          <id>uma</id>
+          <summary> Test project. </summary>
+          <event name="EventThree">
+            <summary> Test event. </summary>
+            <metric name="MetricFour" type="int">
+              <summary> Test metric. </summary>
+            </metric>
+          </event>
+        </project>
+        </structured-metrics>""")
+
+  def test_id_validation(self):
+    # Missing ID
+    self.assert_model_raises("""\
+        <structured-metrics>
+        <project name="MyProject">
+          <owner>test@chromium.org</owner>
+          <summary> Test project. </summary>
+          <event name="MyEvent">
+            <summary> Test event. </summary>
+            <metric name="MyMetric" type="int">
+              <summary> Test metric. </summary>
+            </metric>
+          </event>
+        </project>
+        </structured-metrics>""")
+
+    # Invalid ID
+    self.assert_model_raises("""\
+        <structured-metrics>
+        <project name="MyProject">
+          <owner>test@chromium.org</owner>
+          <id>invalid value</id>
+          <summary> Test project. </summary>
+          <event name="MyEvent">
+            <summary> Test event. </summary>
+            <metric name="MyMetric" type="int">
+              <summary> Test metric. </summary>
+            </metric>
+          </event>
+        </project>
+        </structured-metrics>""")
+
+  def test_type_validation(self):
+    # Missing type
+    self.assert_model_raises("""\
+        <structured-metrics>
+        <project name="MyProject">
+          <owner>test@chromium.org</owner>
+          <id>none</id>
+          <summary> Test project. </summary>
+          <event name="MyEvent">
+            <summary> Test event. </summary>
+            <metric name="MyMetric">
+              <summary> Test metric. </summary>
+            </metric>
+          </event>
+        </project>
+        </structured-metrics>""")
+
+    # Invalid type
+    self.assert_model_raises("""\
+        <structured-metrics>
+        <project name="MyProject">
+          <owner>test@chromium.org</owner>
+          <id>none</id>
+          <summary> Test project. </summary>
+          <event name="MyEvent">
+            <summary> Test event. </summary>
+            <metric name="MyMetric" type="invalid value">
+              <summary> Test metric. </summary>
+            </metric>
+          </event>
+        </project>
+        </structured-metrics>""")
+
+  def test_duplicate_summaries(self):
+    self.assert_model_raises("""\
+        <structured-metrics>
+        <project name="MyProject">
+          <owner>test@chromium.org</owner>
+          <id>none</id>
+          <summary> Test project. </summary>
+          <summary> Test project. </summary>
+          <event name="MyEvent">
+            <summary> Test event. </summary>
+            <metric name="MyMetric" type="int">
+              <summary> Test metric. </summary>
+            </metric>
+          </event>
+        </project>
+        </structured-metrics>""")
+
+  def test_duplicate_project_names(self):
+    # Two projects with name "Duplicate"
+    self.assert_model_raises("""\
+        <structured-metrics>
+        <project name="Duplicate">
+          <owner>test@</owner>
+          <id>uma</id>
+          <summary> Test project. </summary>
+          <event name="MyEvent">
+            <summary> Test event. </summary>
+            <metric name="MyMetric" type="int">
+              <summary> Test metric. </summary>
+            </metric>
+          </event>
+        </project>
+        <project name="Duplicate">
+          <owner>test@</owner>
+          <id>uma</id>
+          <summary> Test project. </summary>
+          <event name="MyEvent">
+            <summary> Test event. </summary>
+            <metric name="MyMetric" type="int">
+              <summary> Test metric. </summary>
+            </metric>
+          </event>
+        </project>
+        </structured-metrics>""")
+
+  def test_duplicate_event_names(self):
+    # Two events with name "Duplicate"
+    self.assert_model_raises("""\
+        <structured-metrics>
+        <project name="MyProject">
+          <owner>test@</owner>
+          <id>uma</id>
+          <summary> Test project. </summary>
+          <event name="Duplicate">
+            <summary> Test event. </summary>
+            <metric name="MyMetric" type="int">
+              <summary> Test metric. </summary>
+            </metric>
+          </event>
+          <event name="Duplicate">
+            <summary> Test event. </summary>
+            <metric name="MyMetric" type="int">
+              <summary> Test metric. </summary>
+            </metric>
+          </event>
+        </project>
+        </structured-metrics>""")
+
+  def test_duplicate_metric_names(self):
+    # Two metrics with name "Duplicate"
+    self.assert_model_raises("""\
+        <structured-metrics>
+        <project name="MyProject">
+          <owner>test@</owner>
+          <id>uma</id>
+          <summary> Test project. </summary>
+          <event name="MyEvent">
+            <summary> Test event. </summary>
+            <metric name="Duplicate" type="int">
+              <summary> Test metric. </summary>
+            </metric>
+            <metric name="Duplicate" type="int">
+              <summary> Test metric. </summary>
+            </metric>
+          </event>
+        </project>
+        </structured-metrics>""")
+
+
+if __name__ == '__main__':
+  unittest.main()
diff --git a/chromium/tools/metrics/structured/model_util.py b/chromium/tools/metrics/structured/model_util.py
new file mode 100644
index 00000000000..af1afc41449
--- /dev/null
+++ b/chromium/tools/metrics/structured/model_util.py
@@ -0,0 +1,127 @@
+# -*- coding: utf-8 -*-
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""Utilities for parsing structured.xml.
+
+Functions in this module raise an error if constraints on the format of the
+structured.xml file are not met.
+
+Functions use the concept of 'compound' and 'text' XML nodes.
+ - compound nodes can have attributes and child nodes, but no text
+ - text nodes can have text, but no attributes or child nodes
+"""
+
+import collections
+import re
+
+
+def error(elem, msg):
+  """Raise a nicely formatted error with some context."""
+  name = elem.attrib.get('name', None)
+  name = name + ' ' if name else ''
+  msg = 'Structured metrics error, {} node {}{}.'.format(elem.tag, name, msg)
+  raise ValueError(msg)
+
+
+def get_attr(elem, tag, regex=None):
+  """Get an attribute.
+
+  Error if it is missing, optionally error if it doesn't match the provided
+  regex.
+  """
+  attr = elem.attrib.get(tag, None)
+  if not attr:
+    error(elem, "missing attribute '{}'".format(tag))
+  if regex and not re.match(regex, attr):
+    error(elem, ("has '{}' attribute '{}' which does "
+                 "not match regex '{}'").format(tag, attr, regex))
+  return attr
+
+
+def get_compound_children(elem, tag):
+  """Get all child nodes of `elem` with tag `tag`.
+
+  Error if none exist, or a child is not a compound node.
+  """
+  children = elem.findall(tag)
+  if not children:
+    error(elem, "missing node '{}'".format(tag))
+  for child in children:
+    if child.text and child.text.strip():
+      error(child, "contains text, but shouldn't")
+  return children
+
+
+def get_compound_child(elem, tag):
+  """Get the child of `elem` with tag `tag`.
+
+  Error if there isn't exactly one matching child, or it isn't compound.
+  """
+  children = elem.findall(tag)
+  if len(children) != 1:
+    error(elem, "needs exactly one '{}' node".format(tag))
+  return children[0]
+
+
+def get_text_children(elem, tag, regex=None):
+  """Get the text of all child nodes of `elem` with tag `tag`.
+
+  Error if none exist, or a child is not a text node. Optionally ensure the
+  text matches `regex`.
+  """
+  children = elem.findall(tag)
+  if not children:
+    error(elem, "missing node '{}'".format(tag))
+
+  result = []
+  for child in children:
+    check_attributes(child, set())
+    check_children(child, set())
+    text = child.text.strip()
+    if not text:
+      error(elem, "missing text in '{}'".format(tag))
+    if regex and not re.match(regex, text):
+      error(elem, ("has '{}' node '{}' which does "
+                   "not match regex '{}'").format(tag, text, regex))
+    result.append(text)
+  return result
+
+
+def get_text_child(elem, tag, regex=None):
+  """Get the text of the child of `elem` with tag `tag`.
+
+  Error if there isn't exactly one matching child, or it isn't a text node.
+  Optionally ensure the text matches `regex`.
+  """
+  result = get_text_children(elem, tag, regex)
+  if len(result) != 1:
+    error(elem, "needs exactly one '{}' node".format(tag))
+  return result[0]
+
+
+def check_attributes(elem, expected_attrs):
+  """Ensure `elem` has no attributes except those in `expected_attrs`."""
+  actual_attrs = set(elem.attrib.keys())
+  unexpected_attrs = actual_attrs - set(expected_attrs)
+  if unexpected_attrs:
+    attrs = ' '.join(unexpected_attrs)
+    error(elem, 'has unexpected attributes: ' + attrs)
+
+
+def check_children(elem, expected_children):
+  """Ensure `elem` has no children without tags in `expected_children`."""
+  actual_children = {child.tag for child in elem}
+  unexpected_children = actual_children - set(expected_children)
+  if unexpected_children:
+    children = ' '.join(unexpected_children)
+    error(elem, 'has unexpected nodes: ' + children)
+
+
+def check_child_names_unique(elem, tag):
+  """Ensure uniqueness of the 'name' of all children of `elem` with `tag`."""
+  names = [child.attrib.get('name', None) for child in elem if child.tag == tag]
+  name_counts = collections.Counter(names)
+  has_duplicates = any(c > 1 for c in name_counts.values())
+  if has_duplicates:
+    error(elem, 'has {} nodes with duplicate names'.format(tag))
diff --git a/chromium/tools/metrics/structured/pretty_print.py b/chromium/tools/metrics/structured/pretty_print.py
index 105f6f2f9fb..749695f98dd 100755
--- a/chromium/tools/metrics/structured/pretty_print.py
+++ b/chromium/tools/metrics/structured/pretty_print.py
@@ -12,8 +12,11 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'common'))
 import presubmit_util
 
 def main(argv):
-  presubmit_util.DoPresubmitMain(argv, 'structured.xml', 'structured.old.xml',
-                                 model.PrettifyXML)
+  dirname = os.path.dirname(os.path.realpath(__file__))
+  xml = dirname + '/structured.xml'
+  old_xml = dirname + '/structured.old.xml'
+  presubmit_util.DoPresubmitMain(argv, xml,
+                                 old_xml, lambda x: repr(model.Model(x)))
 
 
 if '__main__' == __name__:
diff --git a/chromium/tools/metrics/structured/structured.xml b/chromium/tools/metrics/structured/structured.xml
index 92d5d5cd961..7b228f42684 100644
--- a/chromium/tools/metrics/structured/structured.xml
+++ b/chromium/tools/metrics/structured/structured.xml
@@ -1,300 +1,309 @@
-<!-- Structured metrics is under development and isn't available for use yet. -->
-
 <structured-metrics>
 
-<events>
-
-<event name="CrOSActionEvent.FileOpened" project="Hindsight">
+<project name="Hindsight">
   <owner>charleszhao@chromium.org</owner>
+  <owner>tby@chromium.org</owner>
+  <id>per-project</id>
   <summary>
-    Records whenever a file is opened in the File App on ChromeOS.
+    Project for recording CrOSActions.
   </summary>
-  <metric name="Filename" kind="hashed-string">
-    <summary>
-      The absolute path of the file.
-    </summary>
-  </metric>
-  <metric name="OpenType" kind="int">
-    <summary>
-      The kind of file open, defined in FileTaskObserver::OpenType.
-    </summary>
-  </metric>
-  <metric name="SequenceId" kind="int">
-    <summary>
-      Sequence of this action across all CrOSActionEvent.
-    </summary>
-  </metric>
-  <metric name="TimeSinceLastAction" kind="int">
-    <summary>
-      Time in milliseconds since last CrOSActionLogging.
-    </summary>
-  </metric>
-</event>
 
-<event name="CrOSActionEvent.SearchResultLaunched" project="Hindsight">
-  <owner>charleszhao@chromium.org</owner>
-  <summary>
-    Records information about the launch of an item from ChromeOS launcher.
-  </summary>
-  <metric name="Query" kind="hashed-string">
-    <summary>
-      The search query associated with this launch.
-    </summary>
-  </metric>
-  <metric name="ResultType" kind="int">
-    <summary>
-      Which kind of search provider the launched result was created by.
-    </summary>
-  </metric>
-  <metric name="SearchResultId" kind="hashed-string">
-    <summary>
-      The ID of the launched result result. For example, the app ID for app
-      results, or the URL for omnibox results.
-    </summary>
-  </metric>
-  <metric name="SequenceId" kind="int">
-    <summary>
-      Sequence of this action across all CrOSActionEvent.
-    </summary>
-  </metric>
-  <metric name="TimeSinceLastAction" kind="int"/>
-</event>
+  <event name="CrOSActionEvent.FileOpened">
+    <summary>
+      Records whenever a file is opened in the File App on ChromeOS.
+    </summary>
+    <metric name="Filename" type="hmac-string">
+      <summary>
+        The absolute path of the file.
+      </summary>
+    </metric>
+    <metric name="OpenType" type="int">
+      <summary>
+        The type of file open, defined in FileTaskObserver::OpenType.
+      </summary>
+    </metric>
+    <metric name="SequenceId" type="int">
+      <summary>
+        Sequence of this action across all CrOSActionEvent.
+      </summary>
+    </metric>
+    <metric name="TimeSinceLastAction" type="int">
+      <summary>
+        Time in milliseconds since last CrOSActionLogging.
+      </summary>
+    </metric>
+  </event>
 
-<event name="CrOSActionEvent.SettingChanged" project="Hindsight">
-  <owner>charleszhao@chromium.org</owner>
-  <summary>
-    Records when a setting is changed; only records quick settings for now.
-  </summary>
-  <metric name="CurrentValue" kind="int">
-    <summary>
-      Value of the setting after the change.
-    </summary>
-  </metric>
-  <metric name="PreviousValue" kind="int">
-    <summary>
-      Value of the setting before the change.
-    </summary>
-  </metric>
-  <metric name="SequenceId" kind="int">
-    <summary>
-      Sequence of this action across all CrOSActionEvent.
-    </summary>
-  </metric>
-  <metric name="SettingId" kind="int">
-    <summary>
-      The setting id (in ash::ml::UserSettingsEvent::Event::SettingId) that
-      represents the type of the changed setting.
-    </summary>
-  </metric>
-  <metric name="SettingType" kind="int">
-    <summary>
-      Enum that represents where the settings event originated from (in
-      ash::ml::UserSettingsEvent::Event::SettingType).
-    </summary>
-  </metric>
-  <metric name="TimeSinceLastAction" kind="int">
-    <summary>
-      Time in milliseconds since last CrOSActionLogging.
-    </summary>
-  </metric>
-</event>
+  <event name="CrOSActionEvent.SearchResultLaunched">
+    <summary>
+      Records information about the launch of an item from ChromeOS launcher.
+    </summary>
+    <metric name="Query" type="hmac-string">
+      <summary>
+        The search query associated with this launch.
+      </summary>
+    </metric>
+    <metric name="ResultType" type="int">
+      <summary>
+        Which type of search provider the launched result was created by.
+      </summary>
+    </metric>
+    <metric name="SearchResultId" type="hmac-string">
+      <summary>
+        The ID of the launched result result. For example, the app ID for app
+        results, or the URL for omnibox results.
+      </summary>
+    </metric>
+    <metric name="SequenceId" type="int">
+      <summary>
+        Sequence of this action across all CrOSActionEvent.
+      </summary>
+    </metric>
+    <metric name="TimeSinceLastAction" type="int">
+      <summary>
+        Time in milliseconds since last CrOSActionLogging.
+      </summary>
+    </metric>
+  </event>
 
-<event name="CrOSActionEvent.TabEvent.TabNavigated" project="Hindsight">
-  <owner>charleszhao@chromium.org</owner>
-  <summary>
-    Records a tab activity of navigating to a new url.
-  </summary>
-  <metric name="PageTransition" kind="int">
-    <summary>
-      The types of transition between pages. See more on ui::PageTransition.
-    </summary>
-  </metric>
-  <metric name="SequenceId" kind="int">
-    <summary>
-      Sequence of this action across all CrOSActionEvent.
-    </summary>
-  </metric>
-  <metric name="TimeSinceLastAction" kind="int">
-    <summary>
-      Time in milliseconds since last CrOSActionLogging.
-    </summary>
-  </metric>
-  <metric name="URL" kind="hashed-string">
-    <summary>
-      The URL of the current event.
-    </summary>
-  </metric>
-  <metric name="Visibility" kind="int">
-    <summary>
-      The visibility of this url, see more on content::Visibility.
-    </summary>
-  </metric>
-</event>
+  <event name="CrOSActionEvent.SettingChanged">
+    <summary>
+      Records when a setting is changed; only records quick settings for now.
+    </summary>
+    <metric name="CurrentValue" type="int">
+      <summary>
+        Value of the setting after the change.
+      </summary>
+    </metric>
+    <metric name="PreviousValue" type="int">
+      <summary>
+        Value of the setting before the change.
+      </summary>
+    </metric>
+    <metric name="SequenceId" type="int">
+      <summary>
+        Sequence of this action across all CrOSActionEvent.
+      </summary>
+    </metric>
+    <metric name="SettingId" type="int">
+      <summary>
+        The setting id (in ash::ml::UserSettingsEvent::Event::SettingId) that
+        represents the type of the changed setting.
+      </summary>
+    </metric>
+    <metric name="SettingType" type="int">
+      <summary>
+        Enum that represents where the settings event originated from (in
+        ash::ml::UserSettingsEvent::Event::SettingType).
+      </summary>
+    </metric>
+    <metric name="TimeSinceLastAction" type="int">
+      <summary>
+        Time in milliseconds since last CrOSActionLogging.
+      </summary>
+    </metric>
+  </event>
 
-<event name="CrOSActionEvent.TabEvent.TabOpened" project="Hindsight">
-  <owner>charleszhao@chromium.org</owner>
-  <summary>
-    Records a tab activity of opening a new url with ctrl+click.
-  </summary>
-  <metric name="SequenceId" kind="int">
-    <summary>
-      Sequence of this action across all CrOSActionEvent.
-    </summary>
-  </metric>
-  <metric name="TimeSinceLastAction" kind="int">
-    <summary>
-      Time in milliseconds since last CrOSActionLogging.
-    </summary>
-  </metric>
-  <metric name="URL" kind="hashed-string">
-    <summary>
-      The URL of the current event.
-    </summary>
-  </metric>
-  <metric name="URLOpened" kind="hashed-string">
-    <summary>
-      The URL that is opened from the current url.
-    </summary>
-  </metric>
-  <metric name="WindowOpenDisposition" kind="int">
-    <summary>
-      Enum that indicates where the new tab is opened, see more on
-      WindowOpenDisposition.
-    </summary>
-  </metric>
-</event>
+  <event name="CrOSActionEvent.TabEvent.TabNavigated">
+    <summary>
+      Records a tab activity of navigating to a new url.
+    </summary>
+    <metric name="PageTransition" type="int">
+      <summary>
+        The types of transition between pages. See more on ui::PageTransition.
+      </summary>
+    </metric>
+    <metric name="SequenceId" type="int">
+      <summary>
+        Sequence of this action across all CrOSActionEvent.
+      </summary>
+    </metric>
+    <metric name="TimeSinceLastAction" type="int">
+      <summary>
+        Time in milliseconds since last CrOSActionLogging.
+      </summary>
+    </metric>
+    <metric name="URL" type="hmac-string">
+      <summary>
+        The URL of the current event.
+      </summary>
+    </metric>
+    <metric name="Visibility" type="int">
+      <summary>
+        The visibility of this url, see more on content::Visibility.
+      </summary>
+    </metric>
+  </event>
 
-<event name="CrOSActionEvent.TabEvent.TabReactivated" project="Hindsight">
-  <owner>charleszhao@chromium.org</owner>
-  <summary>
-    Records a tab activity of reactivating an existing tab.
-  </summary>
-  <metric name="SequenceId" kind="int">
-    <summary>
-      Sequence of this action across all CrOSActionEvent.
-    </summary>
-  </metric>
-  <metric name="TimeSinceLastAction" kind="int">
-    <summary>
-      Time in milliseconds since last CrOSActionLogging.
-    </summary>
-  </metric>
-  <metric name="URL" kind="hashed-string">
-    <summary>
-      The URL of the current event.
-    </summary>
-  </metric>
-</event>
+  <event name="CrOSActionEvent.TabEvent.TabOpened">
+    <summary>
+      Records a tab activity of opening a new url with ctrl+click.
+    </summary>
+    <metric name="SequenceId" type="int">
+      <summary>
+        Sequence of this action across all CrOSActionEvent.
+      </summary>
+    </metric>
+    <metric name="TimeSinceLastAction" type="int">
+      <summary>
+        Time in milliseconds since last CrOSActionLogging.
+      </summary>
+    </metric>
+    <metric name="URL" type="hmac-string">
+      <summary>
+        The URL of the current event.
+      </summary>
+    </metric>
+    <metric name="URLOpened" type="hmac-string">
+      <summary>
+        The URL that is opened from the current url.
+      </summary>
+    </metric>
+    <metric name="WindowOpenDisposition" type="int">
+      <summary>
+        Enum that indicates where the new tab is opened, see more on
+        WindowOpenDisposition.
+      </summary>
+    </metric>
+  </event>
 
-<event name="LauncherUsage">
-  <owner>tby@chromium.org</owner>
-  <summary>
-    Records information about the launch of an item (such as an app or a file)
-    from the ChromeOS launcher. One event is recorded for every launch
-    originating from any launcher UI component, and this is the only
-    circumstance that records events.
-  </summary>
-  <metric name="App" kind="hashed-string">
-    <summary>
-      App ID of the most-recently-opened app when this launch occured. This can
-      be an app ID of a Chrome app, Arc++ app, or PWA.
-    </summary>
-  </metric>
-  <metric name="Domain" kind="hashed-string">
-    <summary>
-      The most-recently-visited domain when this launch ocurred.
-    </summary>
-  </metric>
-  <metric name="Hour" kind="int">
-    <summary>
-      The hour of launch. This is the user's local time rounded to the nearest
-      hour, 0 to 23 inclusive.
-    </summary>
-  </metric>
-  <metric name="ProviderType" kind="int">
-    <summary>
-      Which kind of search provider the launched result was created by. This
-      comes from the RankingItemType enum.
-    </summary>
-  </metric>
-  <metric name="SearchQuery" kind="hashed-string">
-    <summary>
-      The search query associated with this launch. Before hashing, the query is
-      the empty string if there was no search query.
-    </summary>
-  </metric>
-  <metric name="SearchQueryLength" kind="int">
-    <summary>
-      String length of the search query associated with this launch. If there
-      was no query, this is zero.
-    </summary>
-  </metric>
-  <metric name="Target" kind="hashed-string">
-    <summary>
-      The target item of this launch, eg. an app ID, filepath, or omnibox URL.
-    </summary>
-  </metric>
-</event>
+  <event name="CrOSActionEvent.TabEvent.TabReactivated">
+    <summary>
+      Records a tab activity of reactivating an existing tab.
+    </summary>
+    <metric name="SequenceId" type="int">
+      <summary>
+        Sequence of this action across all CrOSActionEvent.
+      </summary>
+    </metric>
+    <metric name="TimeSinceLastAction" type="int">
+      <summary>
+        Time in milliseconds since last CrOSActionLogging.
+      </summary>
+    </metric>
+    <metric name="URL" type="hmac-string">
+      <summary>
+        The URL of the current event.
+      </summary>
+    </metric>
+  </event>
+</project>
 
-<event name="TestEventOne">
+<project name="LauncherUsage">
   <owner>tby@chromium.org</owner>
+  <id>per-project</id>
   <summary>
-    Event for unit testing, do not use.
+    See event summary.
   </summary>
-  <metric name="TestMetricOne" kind="hashed-string">
-    <summary>
-      A per-user keyed hashed value.
-    </summary>
-  </metric>
-  <metric name="TestMetricTwo" kind="int">
-    <summary>
-      An unhashed value, recorded as-is.
-    </summary>
-  </metric>
-</event>
 
-<event name="TestEventThree" project="TestProject">
-  <owner>tby@chromium.org</owner>
-  <summary>
-    Event for unit testing, do not use.
-  </summary>
-  <metric name="TestMetricFour" kind="hashed-string">
-    <summary>
-      A per-user keyed hashed value.
-    </summary>
-  </metric>
-</event>
+  <event name="LauncherUsage">
+    <summary>
+      Records information about the launch of an item (such as an app or a file)
+      from the ChromeOS launcher. One event is recorded for every launch
+      originating from any launcher UI component, and this is the only
+      circumstance that records events.
+    </summary>
+    <metric name="App" type="hmac-string">
+      <summary>
+        App ID of the most-recently-opened app when this launch occured. This can be
+        an app ID of a Chrome app, Arc++ app, or PWA.
+      </summary>
+    </metric>
+    <metric name="Domain" type="hmac-string">
+      <summary>
+        The most-recently-visited domain when this launch ocurred.
+      </summary>
+    </metric>
+    <metric name="Hour" type="int">
+      <summary>
+        The hour of launch. This is the user's local time rounded to the nearest
+        hour, 0 to 23 inclusive.
+      </summary>
+    </metric>
+    <metric name="ProviderType" type="int">
+      <summary>
+        Which type of search provider the launched result was created by. This comes
+        from the RankingItemType enum.
+      </summary>
+    </metric>
+    <metric name="Score" type="int">
+      <summary>
+        The relevance score of the launched result. This is a double multiplied by
+        1000 and cast to an int64. Results that don't have a score report 0.
+      </summary>
+    </metric>
+    <metric name="SearchQuery" type="hmac-string">
+      <summary>
+        The search query associated with this launch. Before hashing, the query is
+        the empty string if there was no search query.
+      </summary>
+    </metric>
+    <metric name="SearchQueryLength" type="int">
+      <summary>
+        String length of the search query associated with this launch. If there was
+        no query, this is zero.
+      </summary>
+    </metric>
+    <metric name="Target" type="hmac-string">
+      <summary>
+        The target item of this launch, eg. an app ID, filepath, or omnibox URL.
+      </summary>
+    </metric>
+  </event>
+</project>
 
-<event name="TestEventTwo" project="TestProject">
+<project name="TestProjectOne">
   <owner>tby@chromium.org</owner>
+  <id>none</id>
   <summary>
-    Event for unit testing, do not use.
+    Project for unit testing, do not use.
   </summary>
-  <metric name="TestMetricThree" kind="hashed-string">
-    <summary>
-      A per-user keyed hashed value.
-    </summary>
-  </metric>
-</event>
 
-</events>
-
-<projects>
-
-<project name="Hindsight">
-  <owner>charleszhao@chromium.org</owner>
-  <summary>
-    Project for recording CrOSActions.
-  </summary>
+  <event name="TestEventOne">
+    <summary>
+      Event for unit testing, do not use.
+    </summary>
+    <metric name="TestMetricOne" type="hmac-string">
+      <summary>
+        A per-user keyed hashed value.
+      </summary>
+    </metric>
+    <metric name="TestMetricTwo" type="int">
+      <summary>
+        An unhashed value, recorded as-is.
+      </summary>
+    </metric>
+  </event>
 </project>
 
-<project name="TestProject">
+<project name="TestProjectTwo">
   <owner>tby@chromium.org</owner>
+  <id>none</id>
   <summary>
     Project for unit testing, do not use.
   </summary>
-</project>
 
-</projects>
+  <event name="TestEventThree">
+    <summary>
+      Event for unit testing, do not use.
+    </summary>
+    <metric name="TestMetricFour" type="hmac-string">
+      <summary>
+        A per-user keyed hashed value.
+      </summary>
+    </metric>
+  </event>
+
+  <event name="TestEventTwo">
+    <summary>
+      Event for unit testing, do not use.
+    </summary>
+    <metric name="TestMetricThree" type="hmac-string">
+      <summary>
+        A per-user keyed hashed value.
+      </summary>
+    </metric>
+  </event>
+</project>
 
-</structured-metrics>
+</structured-metrics>
\ No newline at end of file
diff --git a/chromium/tools/metrics/structured/events_template.py b/chromium/tools/metrics/structured/templates.py
index 4ead3094891..0b18e35de7f 100644
--- a/chromium/tools/metrics/structured/events_template.py
+++ b/chromium/tools/metrics/structured/templates.py
@@ -1,15 +1,9 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
+# -*- coding: utf-8 -*-
+# Copyright 2020 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-
 """Templates for generating event classes for structured metrics."""
 
-import codegen
-
-########
-# HEADER
-########
-
 HEADER_FILE_TEMPLATE = """\
 // Generated from gen_events.py. DO NOT EDIT!
 // source: structured.xml
@@ -26,8 +20,9 @@ namespace metrics {{
 namespace structured {{
 namespace events {{
 
-constexpr uint64_t kProjectNameHashes[] = {project_name_hashes};\
-{event_code}
+constexpr uint64_t kProjectNameHashes[] = {project_hashes};
+
+{project_code}
 
 }}  // namespace events
 }}  // namespace structured
@@ -36,73 +31,70 @@ constexpr uint64_t kProjectNameHashes[] = {project_name_hashes};\
 #endif  // {file.guard_path}\
 """
 
-HEADER_EVENT_TEMPLATE = """
+HEADER_PROJECT_TEMPLATE = """\
+namespace {project.namespace} {{
+
+{event_code}\
+}}  // namespace {project.namespace}
 
+"""
+
+HEADER_EVENT_TEMPLATE = """\
 class {event.name} final : public ::metrics::structured::EventBase {{
  public:
   {event.name}();
   ~{event.name}() override;
 
   static constexpr uint64_t kEventNameHash = UINT64_C({event.name_hash});
-  static constexpr uint64_t kProjectNameHash = UINT64_C({event.project_name_hash});\
-{metric_code}
-}};\
-"""
+  static constexpr uint64_t kProjectNameHash = UINT64_C({project.name_hash});
+  static constexpr IdentifierType kIdType = IdentifierType::{project.id_type};
 
-HEADER_METRIC_TEMPLATE = """
+{metric_code}\
+}};
 
-  static constexpr uint64_t k{metric.name}NameHash = UINT64_C({metric.hash});
-  {event.name}& Set{metric.name}(const {metric.type} value);\
 """
 
-HEADER = codegen.Template(
-  basename="structured_events.h",
-  file_template=HEADER_FILE_TEMPLATE,
-  event_template=HEADER_EVENT_TEMPLATE,
-  metric_template=HEADER_METRIC_TEMPLATE)
+HEADER_METRIC_TEMPLATE = """\
+  static constexpr uint64_t k{metric.name}NameHash = UINT64_C({metric.hash});
+  {event.name}& Set{metric.name}(const {metric.type} value);
 
-######
-# IMPL
-######
+"""
 
 IMPL_FILE_TEMPLATE = """\
 // Generated from gen_events.py. DO NOT EDIT!
 // source: structured.xml
 
-#include "{file.dir_path}/structured_events.h"
+// #include "{file.dirname}/structured_events.h"
+#include "components/metrics/structured/structured_events.h"
 
 namespace metrics {{
 namespace structured {{
-namespace events {{\
-{event_code}
-
+namespace events {{
+{project_code}
 }}  // namespace events
 }}  // namespace structured
 }}  // namespace metrics\
 """
 
-IMPL_EVENT_TEMPLATE = """
+IMPL_PROJECT_TEMPLATE = """\
+namespace {project.namespace} {{
+
+{event_code}\
+}}  // namespace {project.namespace}
+
+"""
 
+IMPL_EVENT_TEMPLATE = """\
 {event.name}::{event.name}() :
   ::metrics::structured::EventBase(kEventNameHash, kProjectNameHash) {{}}
-{event.name}::~{event.name}() = default;\
+{event.name}::~{event.name}() = default;
 {metric_code}\
 """
 
-IMPL_METRIC_TEMPLATE = """
-
+IMPL_METRIC_TEMPLATE = """\
 {event.name}& {event.name}::Set{metric.name}(const {metric.type} value) {{
   {metric.setter}(k{metric.name}NameHash, value);
   return *this;
-}}\
-"""
+}}
 
-IMPL = codegen.Template(
-  basename="structured_events.cc",
-  file_template=IMPL_FILE_TEMPLATE,
-  event_template=IMPL_EVENT_TEMPLATE,
-  metric_template=IMPL_METRIC_TEMPLATE)
-
-def WriteFiles(outdir, relpath, data):
-  HEADER.WriteFile(outdir, relpath, data)
-  IMPL.WriteFile(outdir, relpath, data)
+"""
diff --git a/chromium/tools/metrics/structured/validate_format.py b/chromium/tools/metrics/structured/validate_format.py
deleted file mode 100755
index 79715f01a43..00000000000
--- a/chromium/tools/metrics/structured/validate_format.py
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-"""Verifies that the structured.xml file is well-formatted."""
-
-import os
-import re
-import sys
-from xml.dom import minidom
-
-sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'common'))
-import path_util
-
-STRUCTURED_XML = path_util.GetInputFile(('tools/metrics/structured/'
-                                         'structured.xml'))
-
-
-def checkElementOwners(config, element_tag):
-  """Check that every element in the config has at least one owner."""
-  errors = []
-
-  for node in config.getElementsByTagName(element_tag):
-    name = node.getAttribute('name')
-    owner_nodes = node.getElementsByTagName('owner')
-
-    # Check <owner> tag is present for each element.
-    if not owner_nodes:
-      errors.append(
-          "<owner> tag is required for %s '%s'." % (element_tag, name))
-      continue
-
-    for owner_node in owner_nodes:
-      # Check <owner> tag actually has some content.
-      if not owner_node.childNodes:
-        errors.append("<owner> tag for '%s' should not be empty." % name)
-      for email in owner_node.childNodes:
-        # Check <owner> tag's content is an email address, not a username.
-        if not re.match('^.+@(chromium\.org|google\.com)$', email.data):
-          errors.append("<owner> tag for %s '%s' expects a Chromium or "
-                        "Google email address, instead found '%s'." %
-                        (element_tag, name, email.data.strip()))
-
-  return errors
-
-
-def checkElementsNotDuplicated(config, element_tag):
-  errors = []
-  elements = set()
-
-  for node in config.getElementsByTagName(element_tag):
-    name = node.getAttribute('name')
-    # Check for duplicate names.
-    if name in elements:
-      errors.append("duplicate %s name '%s'" % (element_tag, name))
-    elements.add(name)
-
-  return errors
-
-
-def checkMetricNamesWithinEventNotDuplicated(events):
-  errors = []
-
-  for node in events.getElementsByTagName('event'):
-    name = node.getAttribute('name')
-    metrics = set()
-    for metric_node in node.getElementsByTagName('metric'):
-      metric_name = metric_node.getAttribute('name')
-      if metric_name in metrics:
-        errors.append(
-            "duplicate metric name '%s' for event '%s'" % (metric_name, name))
-      metrics.add(metric_name)
-
-  return errors
-
-
-def checkEventsReferenceValidProjects(events, projects):
-  errors = []
-
-  projects = {
-      project.getAttribute('name')
-      for project in projects.getElementsByTagName('project')
-  }
-
-  for node in events.getElementsByTagName('event'):
-    name = node.getAttribute('name')
-    project = node.getAttribute('project')
-
-    # An event's project can either be empty (not specified), or must be a
-    # project listed in the projects section.
-    if project and project not in projects:
-      errors.append(
-          "event '%s' references nonexistent project '%s'" % (name, project))
-
-  return errors
-
-
-def main():
-  with open(STRUCTURED_XML, 'r') as config_file:
-    document = minidom.parse(config_file)
-    [config] = document.getElementsByTagName('structured-metrics')
-    [events] = config.getElementsByTagName('events')
-    [projects] = config.getElementsByTagName('projects')
-
-    errors = []
-    errors.extend(checkElementOwners(events, 'event'))
-    errors.extend(checkElementOwners(projects, 'project'))
-    errors.extend(checkElementsNotDuplicated(events, 'event'))
-    errors.extend(checkElementsNotDuplicated(projects, 'project'))
-    errors.extend(checkMetricNamesWithinEventNotDuplicated(events))
-    errors.extend(checkEventsReferenceValidProjects(events, projects))
-
-    if errors:
-      return 'ERRORS:' + ''.join('\n  ' + e for e in errors)
-
-if __name__ == '__main__':
-  sys.exit(main())
diff --git a/chromium/tools/metrics/ukm/gen_builders.py b/chromium/tools/metrics/ukm/gen_builders.py
index f9f61d90a56..44e46fae8cc 100755
--- a/chromium/tools/metrics/ukm/gen_builders.py
+++ b/chromium/tools/metrics/ukm/gen_builders.py
@@ -48,9 +48,10 @@ def ReadFilteredData(path):
     data = ukm_model.UKM_XML_TYPE.Parse(ukm_file.read())
     event_tag = ukm_model._EVENT_TYPE.tag
     metric_tag = ukm_model._METRIC_TYPE.tag
-    data[event_tag] = filter(ukm_model.IsNotObsolete, data[event_tag])
+    data[event_tag] = list(filter(ukm_model.IsNotObsolete, data[event_tag]))
     for event in data[event_tag]:
-      event[metric_tag] = filter(ukm_model.IsNotObsolete, event[metric_tag])
+      event[metric_tag] = list(
+          filter(ukm_model.IsNotObsolete, event[metric_tag]))
     return data
 
 
diff --git a/chromium/tools/metrics/ukm/ukm.xml b/chromium/tools/metrics/ukm/ukm.xml
index e9f3706eb2e..ff9c32b18dd 100644
--- a/chromium/tools/metrics/ukm/ukm.xml
+++ b/chromium/tools/metrics/ukm/ukm.xml
@@ -426,6 +426,16 @@ be describing additional metrics about the same event.
       https://goo.gl/tr1oTZ for a detailed explanation. In milliseconds.
     </summary>
   </metric>
+  <metric
+      name="SubFrame.LayoutInstability.AverageCumulativeShiftScore.SessionWindow.Gap5000ms">
+    <summary>
+      Measures the average cumulative layout shift (bit.ly/cls-explainer) that
+      has occurred in a session window, in the AMP subframe. The gap between two
+      consecutive shifts in a window is not bigger than 5000ms. This metric's
+      integral value is 100x the fractional cumulative layout shift score
+      described in the explainer.
+    </summary>
+  </metric>
   <metric name="SubFrame.LayoutInstability.CumulativeShiftScore">
     <summary>
       Measures the cumulative layout shift (bit.ly/lsm-explainer) that has
@@ -443,6 +453,55 @@ be describing additional metrics about the same event.
       shift score described in the explainer.
     </summary>
   </metric>
+  <metric
+      name="SubFrame.LayoutInstability.MaxCumulativeShiftScore.SessionWindow.Gap1000ms">
+    <summary>
+      Measures the maximum cumulative layout shift (bit.ly/cls-explainer) that
+      has occurred in a session window, in the AMP subframe. The gap between two
+      consecutive shifts in a window is not bigger than 1000ms. This metric's
+      integral value is 100x the fractional cumulative layout shift score
+      described in the explainer.
+    </summary>
+  </metric>
+  <metric
+      name="SubFrame.LayoutInstability.MaxCumulativeShiftScore.SessionWindow.Gap1000ms.Max5000ms">
+    <summary>
+      Measures the maximum cumulative layout shift (bit.ly/cls-explainer) that
+      has occurred in a session window, in the AMP subframe. The gap between two
+      consecutive shifts in a window is not bigger than 1000ms and the maximum
+      window size is 5000ms. This metric's integral value is 100x the fractional
+      cumulative layout shift score described in the explainer.
+    </summary>
+  </metric>
+  <metric
+      name="SubFrame.LayoutInstability.MaxCumulativeShiftScore.SessionWindowByInputs.Gap1000ms.Max5000ms">
+    <summary>
+      Measures the maximum cumulative layout shift (bit.ly/cls-explainer) that
+      has occurred in a session window, in the AMP subframe. The gap between two
+      consecutive shifts in a window is not bigger than 1000ms and the maximum
+      window size is 5000ms. We start a new window whenever there's a user
+      input. This metric's integral value is 100x the fractional cumulative
+      layout shift score described in the explainer.
+    </summary>
+  </metric>
+  <metric
+      name="SubFrame.LayoutInstability.MaxCumulativeShiftScore.SlidingWindow.Duration1000ms">
+    <summary>
+      Measures the maximum cumulative layout shift (bit.ly/cls-explainer) that
+      has occurred in a 1000ms sliding window, in the AMP subframe. This
+      metric's integral value is 100x the fractional cumulative layout shift
+      score described in the explainer.
+    </summary>
+  </metric>
+  <metric
+      name="SubFrame.LayoutInstability.MaxCumulativeShiftScore.SlidingWindow.Duration300ms">
+    <summary>
+      Measures the maximum cumulative layout shift (bit.ly/cls-explainer) that
+      has occurred in a 300ms sliding window, in the AMP subframe. This metric's
+      integral value is 100x the fractional cumulative layout shift score
+      described in the explainer.
+    </summary>
+  </metric>
   <metric name="SubFrame.LayoutStability.JankScore">
     <obsolete>
       Removed July 2019 in favor of
@@ -533,6 +592,87 @@ be describing additional metrics about the same event.
   </metric>
 </event>
 
+<event name="Android.MultiWindowChangeActivity">
+  <owner>gangwu@chromium.org</owner>
+  <owner>fgorski@chromium.org</owner>
+  <summary>
+    Records when the activity enter or exit Android N+ multi-window mode.
+  </summary>
+  <metric name="ActivityType" enum="AndroidMultiWindowActivityType">
+    <summary>
+      Enter or exit the multi-window mode.
+    </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <enumeration/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+</event>
+
+<event name="Android.MultiWindowState">
+  <owner>gangwu@chromium.org</owner>
+  <owner>fgorski@chromium.org</owner>
+  <summary>
+    Records the multi window state when the activity is shown.
+  </summary>
+  <metric name="WindowState" enum="AndroidMultiWindowState">
+    <summary>
+      The state of the multi-window mode, single or multi-window.
+    </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <enumeration/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+</event>
+
+<event name="Android.ScreenRotation">
+  <owner>gangwu@chromium.org</owner>
+  <owner>fgorski@chromium.org</owner>
+  <summary>
+    Records when a user rotates the device triggering a screen orientation
+    change.
+  </summary>
+  <metric name="TargetDeviceOrientation" enum="DeviceOrientation2">
+    <summary>
+      The orientation of the device rotated to.
+    </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <enumeration/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+</event>
+
+<event name="Android.UserRequestedUserAgentChange">
+  <owner>gangwu@chromium.org</owner>
+  <owner>fgorski@chromium.org</owner>
+  <summary>
+    Records when a user pressed 'Request Desktop Site' in the app menu.
+  </summary>
+  <metric name="UserAgentType" enum="UserAgentRequestType">
+    <summary>
+      An enum that records the type of user agent.
+    </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <enumeration/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+</event>
+
 <event name="AppListAppClickData">
   <owner>pdyson@chromium.org</owner>
   <summary>
@@ -1265,6 +1405,20 @@ be describing additional metrics about the same event.
   </metric>
 </event>
 
+<event name="Autofill.FormFillSuccessIOS">
+  <owner>kazinova@chromium.org</owner>
+  <summary>
+    Records whether the the form was successfully filled by Autofill on iOS. The
+    metric is used to measure silent renderer fails when the filling request is
+    executed successfully but the results reported in a callback are empty.
+  </summary>
+  <metric name="FormFillSuccess" enum="Boolean">
+    <summary>
+      A boolean indicating success or failure.
+    </summary>
+  </metric>
+</event>
+
 <event name="Autofill.FormSubmitted">
   <owner>jiahuiguo@google.com</owner>
   <summary>
@@ -1626,6 +1780,19 @@ be describing additional metrics about the same event.
     </summary>
     <aggregation>
       <history>
+        <index fields="metrics.TriggerUIType"/>
+        <statistics>
+          <enumeration/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="TriggerUIType" enum="AutofillAssistantTriggerUIType">
+    <summary>
+      A enum that captures the type of trigger and its intent.
+    </summary>
+    <aggregation>
+      <history>
         <statistics>
           <enumeration/>
         </statistics>
@@ -1651,6 +1818,19 @@ be describing additional metrics about the same event.
     </summary>
     <aggregation>
       <history>
+        <index fields="metrics.TriggerUIType"/>
+        <statistics>
+          <enumeration/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="TriggerUIType" enum="AutofillAssistantTriggerUIType">
+    <summary>
+      A enum that captures the type of trigger and its intent.
+    </summary>
+    <aggregation>
+      <history>
         <statistics>
           <enumeration/>
         </statistics>
@@ -1675,6 +1855,19 @@ be describing additional metrics about the same event.
     </summary>
     <aggregation>
       <history>
+        <index fields="metrics.TriggerUIType"/>
+        <statistics>
+          <enumeration/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="TriggerUIType" enum="AutofillAssistantTriggerUIType">
+    <summary>
+      A enum that captures the type of trigger and its intent.
+    </summary>
+    <aggregation>
+      <history>
         <statistics>
           <enumeration/>
         </statistics>
@@ -1698,6 +1891,19 @@ be describing additional metrics about the same event.
     </summary>
     <aggregation>
       <history>
+        <index fields="metrics.TriggerUIType"/>
+        <statistics>
+          <enumeration/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="TriggerUIType" enum="AutofillAssistantTriggerUIType">
+    <summary>
+      A enum that captures the type of trigger and its intent.
+    </summary>
+    <aggregation>
+      <history>
         <statistics>
           <enumeration/>
         </statistics>
@@ -1860,6 +2066,22 @@ be describing additional metrics about the same event.
   </metric>
 </event>
 
+<event name="Blink.ContextMenu.ImageSelection">
+  <owner>benwgold@google.com</owner>
+  <owner>flackr@chromium.org</owner>
+  <summary>
+    Sent when a user long presses or right clicks a document (and that an image
+    is found). Requires that the `EnablePenetratingImageSelection` feature is
+    enabled together with a `logUkm` specific finch param.
+  </summary>
+  <metric name="Outcome" enum="ImageSelectionOutcome">
+    <summary>
+      Emits an integer id for a selection corresponding to the
+      ImageSelectionOutcome enum defined in Blink's context_menu_controller.h.
+    </summary>
+  </metric>
+</event>
+
 <event name="Blink.FindInPage" singular="True">
   <owner>vmpstr@chromium.org</owner>
   <owner>chrishtr@chromium.org</owner>
@@ -2001,6 +2223,13 @@ be describing additional metrics about the same event.
       First Contentful Paint, in microseconds.
     </summary>
   </metric>
+  <metric name="ContentDocumentUpdate">
+    <summary>
+      The time spent doing forced document updates due to update sub-document
+      content, between navigation and First Contentful Paint, in microseconds.
+      Includes SVG, Canvas and Plugins.
+    </summary>
+  </metric>
   <metric name="DisplayLockIntersectionObserver">
     <summary>
       Time spent computing IntersectionObservations for
@@ -2038,6 +2267,15 @@ be describing additional metrics about the same event.
       and First Contentful Paint, in microseconds.
     </summary>
   </metric>
+  <metric name="JavascriptDocumentUpdate">
+    <summary>
+      The time spent doing forced document updates due to generic Javascript API
+      requests, between navigation and First Contentful Paint, in microseconds.
+      Note this primarily captures Javascript that explicitly requires Style and
+      Layout, but not implicit requests such as through setting focus or scroll
+      position.
+    </summary>
+  </metric>
   <metric name="JavascriptIntersectionObserver">
     <summary>
       Time spent computing IntersectionObservations for javascript observers, in
@@ -2090,6 +2328,13 @@ be describing additional metrics about the same event.
       between navigation and First Contentful Paint, in microseconds.
     </summary>
   </metric>
+  <metric name="ScrollDocumentUpdate">
+    <summary>
+      The time spent doing forced document updates due to update scroll-related
+      data, between navigation and First Contentful Paint, in microseconds.
+      Includes actions like scroll-to-fragment.
+    </summary>
+  </metric>
   <metric name="ScrollingCoordinator">
     <obsolete>
       Merged into CompositingCommit in http://crrev.com/815947 in M88.
@@ -2099,6 +2344,13 @@ be describing additional metrics about the same event.
       Contentful Paint, in microseconds.
     </summary>
   </metric>
+  <metric name="ServiceDocumentUpdate">
+    <summary>
+      The time spent doing forced document updates due to browser requested
+      actions, such as accessibility, intersection observer or spell checking,
+      between navigation and First Contentful Paint, in microseconds.
+    </summary>
+  </metric>
   <metric name="Style">
     <summary>
       The time spent in style document lifecycle work, between navigation and
@@ -2121,6 +2373,19 @@ be describing additional metrics about the same event.
       First Contentful Paint, in microseconds.
     </summary>
   </metric>
+  <metric name="UpdateViewportIntersection">
+    <summary>
+      Time spent computing internal geometry information about iframes, between
+      navigation and First Contentful Paint, in microseconds.
+    </summary>
+  </metric>
+  <metric name="UserDrivenDocumentUpdate">
+    <summary>
+      The time spent doing forced document updates due to a user action such as
+      input, find-in-page or printing, between navigation and First Contentful
+      Paint, in microseconds.
+    </summary>
+  </metric>
   <metric name="WaitForCommit">
     <summary>
       The time spent waiting for the compositor thread to begin processing a
@@ -2450,6 +2715,20 @@ be describing additional metrics about the same event.
       int in the range [0,100].
     </summary>
   </metric>
+  <metric name="ContentDocumentUpdate">
+    <summary>
+      The time spent doing forced document updates due to update sub-document
+      content, during a sampled frame, in microseconds. Includes SVG, Canvas and
+      Plugins.
+    </summary>
+  </metric>
+  <metric name="ContentDocumentUpdateBeginMainFrame">
+    <summary>
+      The time spent doing forced document updates due to update sub-document
+      content, during the BeginMainFrame block of a sampled frame, in
+      microseconds. Includes SVG, Canvas and Plugins.
+    </summary>
+  </metric>
   <metric name="DisplayLockIntersectionObserver">
     <summary>
       Time spent computing IntersectionObservations for
@@ -2764,6 +3043,23 @@ be describing additional metrics about the same event.
       observer state. An int in the range [0,100].
     </summary>
   </metric>
+  <metric name="JavascriptDocumentUpdate">
+    <summary>
+      The time spent doing forced document updates due to generic Javascript API
+      requests, during a sampled frame, in microseconds. Note this primarily
+      captures Javascript that explicitly requires Style and Layout, but not
+      implicit requests such as through setting focus or scroll position.
+    </summary>
+  </metric>
+  <metric name="JavascriptDocumentUpdateBeginMainFrame">
+    <summary>
+      The time spent doing forced document updates due to generic Javascript API
+      requests, during the BeginMainFrame block of a sampled frame, in
+      microseconds. Note this primarily captures Javascript that explicitly
+      requires Style and Layout, but not implicit requests such as through
+      setting focus or scroll position.
+    </summary>
+  </metric>
   <metric name="JavascriptIntersectionObserver">
     <summary>
       Time spent computing IntersectionObservations for javascript observers, in
@@ -3081,6 +3377,18 @@ be describing additional metrics about the same event.
       An int in the range [0,100].
     </summary>
   </metric>
+  <metric name="ScrollDocumentUpdate">
+    <summary>
+      The time spent doing forced document updates due to update scroll-related
+      data, during a sampled frame, in microseconds.
+    </summary>
+  </metric>
+  <metric name="ScrollDocumentUpdateBeginMainFrame">
+    <summary>
+      The time spent doing forced document updates due to update scroll-related
+      data, during the BeginMainFrame block of a sampled frame, in microseconds.
+    </summary>
+  </metric>
   <metric name="ScrollingCoordinator">
     <obsolete>
       Merged into Blink.MainFrame.CompositingCommitRatio in
@@ -3155,6 +3463,20 @@ be describing additional metrics about the same event.
       int in the range [0,100].
     </summary>
   </metric>
+  <metric name="ServiceDocumentUpdate">
+    <summary>
+      The time spent doing forced document updates due to browser requested
+      actions, such as accessibility, intersection observer or spell checking,
+      during a sampled frame, in microseconds.
+    </summary>
+  </metric>
+  <metric name="ServiceDocumentUpdateBeginMainFrame">
+    <summary>
+      The time spent doing forced document updates due to browser requested
+      actions, such as accessibility, intersection observer or spell checking,
+      during the BeginMainFrame block of a sampled frame, in microseconds.
+    </summary>
+  </metric>
   <metric name="Style">
     <summary>
       The time taken for style update for the main frame in microseconds during
@@ -3281,6 +3603,39 @@ be describing additional metrics about the same event.
       An int in the range [0,100].
     </summary>
   </metric>
+  <metric name="UpdateViewportIntersection">
+    <summary>
+      Time spent computing internal geometry information about iframes, in
+      microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="UpdateViewportIntersectionBeginMainFrame">
+    <summary>
+      The total main frame time used to compute internal geometry information
+      about iframes, in microseconds.
+    </summary>
+  </metric>
+  <metric name="UserDrivenDocumentUpdate">
+    <summary>
+      The time spent doing forced document updates due to a user action such as
+      input, find-in-page or printing, during a sampled frame, in microseconds.
+    </summary>
+  </metric>
+  <metric name="UserDrivenDocumentUpdateBeginMainFrame">
+    <summary>
+      The time spent doing forced document updates due to a user action such as
+      input, find-in-page or printing, during the BeginMainFrame block of a
+      sampled frame, in microseconds.
+    </summary>
+  </metric>
   <metric name="WaitForCommit">
     <summary>
       The time spent waiting for the compositor thread to begin processing a
@@ -3409,7 +3764,22 @@ be describing additional metrics about the same event.
   </summary>
   <metric name="Canvas.RenderingContext" enum="CanvasRenderingAPI">
     <summary>
-      Type of rendering context created for HTMLCanvasElement.
+      Type of rendering contexts created for HTMLCanvasElement.
+    </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <enumeration/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="Canvas.RenderingContextDrawnTo" enum="CanvasRenderingAPI">
+    <summary>
+      Type of rendering contexts created for HTMLCanvasElement that something
+      has actually been drawn to. For WebGL 1 and 2 context this means there is
+      at least one draw call issued. For other context types we leave the
+      implementation blank at this moment.
     </summary>
     <aggregation>
       <history>
@@ -3426,7 +3796,23 @@ be describing additional metrics about the same event.
   </metric>
   <metric name="OffscreenCanvas.RenderingContext" enum="CanvasRenderingAPI">
     <summary>
-      Type of rendering context created for OffscreenCanvas.
+      Type of rendering contexts created for OffscreenCanvas.
+    </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <enumeration/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="OffscreenCanvas.RenderingContextDrawnTo"
+      enum="CanvasRenderingAPI">
+    <summary>
+      Type of rendering contexts created for OffscreenCanvas that something has
+      actually been drawn to. For WebGL 1 and 2 context this means there is at
+      least one draw call issued. For other context types we leave the
+      implementation blank at this moment.
     </summary>
     <aggregation>
       <history>
@@ -3584,8 +3970,14 @@ be describing additional metrics about the same event.
   </metric>
   <metric name="ShopWithGoogleLensChip" enum="Boolean">
     <summary>
-      Recorded when the context menu is constructed and logged if the Lens chip
-      was displayed.
+      Recorded when the context menu is constructed and logged if the Lens
+      shopping chip was displayed.
+    </summary>
+  </metric>
+  <metric name="TranslateWithGoogleLensChip" enum="Boolean">
+    <summary>
+      Recorded when the context menu is constructed and logged if the Lens
+      translate chip was displayed.
     </summary>
   </metric>
 </event>
@@ -4030,6 +4422,9 @@ be describing additional metrics about the same event.
 </event>
 
 <event name="Document.OutliveTimeAfterShutdown">
+  <obsolete>
+    Removed January 2021
+  </obsolete>
   <owner>hajimehoshi@chromium.org</owner>
   <owner>keishi@chromium.org</owner>
   <summary>
@@ -4060,6 +4455,12 @@ be describing additional metrics about the same event.
       1.
     </summary>
   </metric>
+  <metric name="IsCrossSiteFrame">
+    <summary>
+      Whether the document was in a cross site iframe. This can either be 0 or
+      1.
+    </summary>
+  </metric>
   <metric name="IsMainFrame">
     <summary>
       Whether the document was in the main frame. This is can either be 0 or 1.
@@ -4452,6 +4853,24 @@ be describing additional metrics about the same event.
   </metric>
 </event>
 
+<event name="FlocPageLoad" singular="True">
+  <owner>yaoxia@chromium.org</owner>
+  <owner>jkarlin@chromium.org</owner>
+  <summary>
+    Whenever the floc is computed, this event will be recorded at the commit
+    time of the next page load. Caveat: if the browser is closed before the next
+    page load occurs (in a new session), the event won't be recorded.
+  </summary>
+  <metric name="FlocId">
+    <summary>
+      The user's floc id. This ignores any general or per-context access
+      permissions, and records the internal int64_t number directly. This metric
+      may still be skipped if the floc was not calculated or has been
+      invalidated.
+    </summary>
+  </metric>
+</event>
+
 <event name="FontMatchAttempts">
   <owner>caraitto@chromium.org</owner>
   <owner>pauljensen@chromium.org</owner>
@@ -4494,6 +4913,20 @@ be describing additional metrics about the same event.
       </history>
     </aggregation>
   </metric>
+  <metric name="LocalFontTotal">
+    <summary>
+      The count of total attempts (failed + succeeded) to match @font-face
+      src:local rules.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
   <metric name="SystemFontFamilyFailures">
     <summary>
       The count of system font family match attempts that failed.
@@ -4520,6 +4953,19 @@ be describing additional metrics about the same event.
       </history>
     </aggregation>
   </metric>
+  <metric name="SystemFontFamilyTotal">
+    <summary>
+      Total count of system font family match attempts (succeeded + failed).
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
   <metric name="WebFontFamilyFailures">
     <summary>
       The count of web font family match attempts that failed.
@@ -4546,6 +4992,19 @@ be describing additional metrics about the same event.
       </history>
     </aggregation>
   </metric>
+  <metric name="WebFontFamilyTotal">
+    <summary>
+      Total count of web font family match attempts (succeeded + failed).
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
 </event>
 
 <event name="GeneratedNavigation" singular="True">
@@ -4620,7 +5079,7 @@ be describing additional metrics about the same event.
   </summary>
   <metric name="Activation">
     <summary>
-      The duration of the activation stage.
+      The duration of the activation stage, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4634,7 +5093,7 @@ be describing additional metrics about the same event.
   <metric name="BeginImplFrameToSendBeginMainFrame">
     <summary>
       The time from when the Impl frame is started to when BeginMainFrame is
-      sent.
+      sent, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4646,9 +5105,17 @@ be describing additional metrics about the same event.
     </aggregation>
   </metric>
   <metric name="BrowserToRendererCompositor">
+    <obsolete>
+      Deprecated as of 01/2021. Replaced with event dispatch breakdown metrics.
+    </obsolete>
     <summary>
       The time from when the event is created in the browser until the first
-      compositor stage after the event arrives in the renderer.
+      compositor stage after the event arrives in the renderer, in microseconds.
+    </summary>
+  </metric>
+  <metric name="Commit">
+    <summary>
+      The duration of the commit stage, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4659,9 +5126,10 @@ be describing additional metrics about the same event.
       </history>
     </aggregation>
   </metric>
-  <metric name="Commit">
+  <metric name="EndActivateToSubmitCompositorFrame">
     <summary>
-      The duration of the commit stage.
+      The time from when an activation is complete to the next
+      SubmitCompositorFrame, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4672,10 +5140,10 @@ be describing additional metrics about the same event.
       </history>
     </aggregation>
   </metric>
-  <metric name="EndActivateToSubmitCompositorFrame">
+  <metric name="EndCommitToActivation">
     <summary>
-      The time from when an activation is complete to the next
-      SubmitCompositorFrame.
+      The time from when a commit is complete to the beginning of the next
+      activation, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4686,9 +5154,39 @@ be describing additional metrics about the same event.
       </history>
     </aggregation>
   </metric>
-  <metric name="EndCommitToActivation">
+  <metric name="EventType" enum="EventLatencyEventType">
     <summary>
-      The time from when a commit is complete to the beginning of the next
+      Type of the input event.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <enumeration/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="GenerationToRendererCompositor">
+    <summary>
+      The time from when the event is created until it arrives in the renderer
+      compositor, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="RendererCompositorFinishedToActivation">
+    <summary>
+      The time from when the event processing is finished on the renderer
+      compositor until the beginning of the activation, in microseconds. This
+      metric is only reported if the event is handled on the renderer compositor
+      and the first compositor step after that is the beginning of the
       activation.
     </summary>
     <aggregation>
@@ -4700,15 +5198,275 @@ be describing additional metrics about the same event.
       </history>
     </aggregation>
   </metric>
-  <metric name="EventType" enum="EventLatencyEventType">
+  <metric name="RendererCompositorFinishedToBeginImplFrame">
     <summary>
-      Type of the input event.
+      The time from when the event processing is finished on the renderer
+      compositor until the compositor frame is started, in microseconds. This
+      metric is only reported if the event is handled on the renderer compositor
+      and compositor frame is started after that.
     </summary>
     <aggregation>
       <history>
         <index fields="profile.country"/>
         <statistics>
-          <enumeration/>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="RendererCompositorFinishedToCommit">
+    <summary>
+      The time from when the event processing is finished on the renderer
+      compositor until the beginning of the commit, in microseconds. This metric
+      is only reported if the event is handled on the renderer compositor and
+      the first compositor step after that is the beginning of the commit.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="RendererCompositorFinishedToEndActivate">
+    <summary>
+      The time from when the event processing is finished on the renderer
+      compositor until the end of the activation, in microseconds. This metric
+      is only reported if the event is handled on the renderer compositor and
+      the first compositor step after that is the end of the activation.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="RendererCompositorFinishedToEndCommit">
+    <summary>
+      The time from when the event processing is finished on the renderer
+      compositor until the end of the commit, in microseconds. This metric is
+      only reported if the event is handled on the renderer compositor and the
+      first compositor step after that is the end of the commit.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="RendererCompositorFinishedToSendBeginMainFrame">
+    <summary>
+      The time from when the event processing is finished on the renderer
+      compositor until BeginMainFrame is sent, in microseconds. This metric is
+      only reported if the event is handled on the renderer compositor and the
+      first compositor step after that is SendBeginMainFrame.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="RendererCompositorFinishedToSubmitCompositorFrame">
+    <summary>
+      The time from when the event processing is finished on the renderer
+      compositor until the compositor frame is submitted, in microseconds. This
+      metric is only reported if the event is handled on the renderer compositor
+      and the first compositor step after that is the submission of the
+      compositor frame.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="RendererCompositorProcessing">
+    <summary>
+      The time spent in the renderer compositor to process the event, in
+      microseconds. This metric won't be reported if the renderer compositor
+      does not have a dedicated thread.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="RendererCompositorQueueingDelay">
+    <summary>
+      The time from when the event arrives in the renderer compositor until the
+      compositor starts processing it, in microseconds. This metric won't be
+      reported if the renderer compositor does not have a dedicated thread.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="RendererCompositorToMain">
+    <summary>
+      The time from when the processing of the event on the renderer compositor
+      is finished until the main thread starts processing the event, in
+      microseconds. If the renderer compositor does not have a dedicated thread,
+      the processing of the event on the renderer compositor is considered
+      finished as soon as the event arrives in the renderer compositor. This
+      metric won't be reported if the event is handled on the renderer
+      compositor.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="RendererMainFinishedToActivation">
+    <summary>
+      The time from when the event processing is finished on the renderer main
+      until the beginning of the activation, in microseconds. This metric is
+      only reported if the event is handled on the renderer main and the first
+      compositor step after that is the beginning of the activation.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="RendererMainFinishedToBeginImplFrame">
+    <summary>
+      The time from when the event processing is finished on the renderer main
+      until the compositor frame is started, in microseconds. This metric is
+      only reported if the event is handled on the renderer main and compositor
+      frame is started after that.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="RendererMainFinishedToCommit">
+    <summary>
+      The time from when the event processing is finished on the renderer main
+      until the beginning of the commit, in microseconds. This metric is only
+      reported if the event is handled on the renderer main and the first
+      compositor step after that is the beginning of the commit.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="RendererMainFinishedToEndActivate">
+    <summary>
+      The time from when the event processing is finished on the renderer main
+      until the end of the activation, in microseconds. This metric is only
+      reported if the event is handled on the renderer main and the first
+      compositor step after that is the end of the activation.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="RendererMainFinishedToEndCommit">
+    <summary>
+      The time from when the event processing is finished on the renderer main
+      until the end of the commit, in microseconds. This metric is only reported
+      if the event is handled on the renderer main and the first compositor step
+      after that is the end of the commit.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="RendererMainFinishedToSendBeginMainFrame">
+    <summary>
+      The time from when the event processing is finished on the renderer main
+      until BeginMainFrame is sent, in microseconds. This metric is only
+      reported if the event is handled on the renderer main and the first
+      compositor step after that is SendBeginMainFrame.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="RendererMainFinishedToSubmitCompositorFrame">
+    <summary>
+      The time from when the event processing is finished on the renderer main
+      until the compositor frame is submitted, in microseconds. This metric is
+      only reported if the event is handled on the renderer main and the first
+      compositor step after that is the submission of the compositor frame.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="RendererMainProcessing">
+    <summary>
+      The time spent in the main thread to process the event, in microseconds.
+      This metric won't be reported if the renderer compositor handles the
+      event.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
         </statistics>
       </history>
     </aggregation>
@@ -4728,7 +5486,161 @@ be describing additional metrics about the same event.
   <metric name="SendBeginMainFrameToCommit">
     <summary>
       The time from when the BeginMainFrame is sent to the beginning of the
-      commit.
+      commit, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.Animate">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on animations, in
+      microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.BeginMainSentToStarted">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent before starting main
+      thread work, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.CompositeCommit">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on composite commit,
+      in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.CompositingAssignments">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on updating
+      compositing assignments, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.CompositingInputs">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on updating
+      compositing inputs, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.HandleInputEvents">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on handling input
+      events, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.LayoutUpdate">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on layout update, in
+      microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.Paint">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on paint, in
+      microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.Prepaint">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on prepaint, in
+      microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.StyleUpdate">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on style update, in
+      microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.UpdateLayers">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on updating layers,
+      in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4742,7 +5654,162 @@ be describing additional metrics about the same event.
   <metric name="SubmitCompositorFrameToPresentationCompositorFrame">
     <summary>
       The time from when a compositor frame is submitted to the display
-      compositor to when it is presented.
+      compositor to when it is presented, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric
+      name="SubmitCompositorFrameToPresentationCompositorFrame.BufferAvailableToBufferReady">
+    <summary>
+      The time from when the target framebuffer is available to when the GPU has
+      finished drawing to it, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric
+      name="SubmitCompositorFrameToPresentationCompositorFrame.BufferReadyToLatch">
+    <summary>
+      The time from when the target framebuffer is ready to be displayed to when
+      the buffer is latched on for presentation, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric
+      name="SubmitCompositorFrameToPresentationCompositorFrame.LatchToSwapEnd">
+    <summary>
+      The time from when the target framebuffer is latched on to when the swap
+      ends, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric
+      name="SubmitCompositorFrameToPresentationCompositorFrame.ReceivedCompositorFrameToStartDraw">
+    <summary>
+      The time from when a compositor frame is received to when it starts to
+      draw, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric
+      name="SubmitCompositorFrameToPresentationCompositorFrame.StartDrawToSwapEnd">
+    <obsolete>
+      Deprecated 02/2020. Split into
+      SubmitCompositorFrameToPresentationCompositorFrame.StartDrawToSwapStart
+      and SubmitCompositorFrameToPresentationCompositorFrame.SwapStartToSwapEnd.
+    </obsolete>
+    <summary>
+      The time from when the a compositor frame is started to draw to when it
+      ends swap, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric
+      name="SubmitCompositorFrameToPresentationCompositorFrame.StartDrawToSwapStart">
+    <summary>
+      The time from when a compositor frame is started to draw to when it starts
+      swap, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric
+      name="SubmitCompositorFrameToPresentationCompositorFrame.SubmitToReceiveCompositorFrame">
+    <summary>
+      The time from when a compositor frame is submitted to when it is received,
+      in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric
+      name="SubmitCompositorFrameToPresentationCompositorFrame.SwapEndToPresentationCompositorFrame">
+    <summary>
+      The time from when a compositor frame ends swap to when it is presented,
+      in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric
+      name="SubmitCompositorFrameToPresentationCompositorFrame.SwapStartToBufferAvailable">
+    <summary>
+      The time from when the compositor frame starts to swap to when the target
+      framebuffer becomes available, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric
+      name="SubmitCompositorFrameToPresentationCompositorFrame.SwapStartToSwapEnd">
+    <summary>
+      The time from when a compositor frame starts swap to when it ends swap, in
+      microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4756,7 +5823,7 @@ be describing additional metrics about the same event.
   <metric name="TotalLatency">
     <summary>
       The total time from when the event is created in the browser to when the
-      frame is presented.
+      frame is presented, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4770,7 +5837,7 @@ be describing additional metrics about the same event.
   <metric name="TotalLatencyToSwapBegin">
     <summary>
       The time from when the event is created in the browser to when the
-      gpu-swap is started, for scroll events.
+      gpu-swap is started, for scroll events, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4788,7 +5855,7 @@ be describing additional metrics about the same event.
     </obsolete>
     <summary>
       The time from when the event is created in the browser to when the
-      gpu-swap is completed, for scroll events.
+      gpu-swap is completed, for scroll events, in microseconds.
     </summary>
   </metric>
 </event>
@@ -4803,7 +5870,7 @@ be describing additional metrics about the same event.
   </summary>
   <metric name="Activation">
     <summary>
-      The duration of the activation stage.
+      The duration of the activation stage, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4817,7 +5884,7 @@ be describing additional metrics about the same event.
   <metric name="BeginImplFrameToSendBeginMainFrame">
     <summary>
       The time from when the Impl frame is started to when BeginMainFrame is
-      sent.
+      sent, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4835,7 +5902,7 @@ be describing additional metrics about the same event.
   </metric>
   <metric name="Commit">
     <summary>
-      The duration of the commit stage.&quot;
+      The duration of the commit stage, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4854,7 +5921,7 @@ be describing additional metrics about the same event.
   <metric name="EndActivateToSubmitCompositorFrame">
     <summary>
       The time from when an activation is complete to the next
-      SubmitCompositorFrame.
+      SubmitCompositorFrame, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4868,7 +5935,7 @@ be describing additional metrics about the same event.
   <metric name="EndCommitToActivation">
     <summary>
       The time from when a commit is complete to the beginning of the next
-      activation.
+      activation, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4919,7 +5986,161 @@ be describing additional metrics about the same event.
   <metric name="SendBeginMainFrameToCommit">
     <summary>
       The time from when the BeginMainFrame is sent to the beginning of the
-      commit.
+      commit, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.Animate">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on animations, in
+      microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.BeginMainSentToStarted">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent before starting main
+      thread work, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.CompositeCommit">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on composite commit,
+      in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.CompositingAssignments">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on updating
+      compositing assignments, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.CompositingInputs">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on updating
+      compositing inputs, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.HandleInputEvents">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on handling input
+      events, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.LayoutUpdate">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on layout update, in
+      microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.Paint">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on paint, in
+      microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.Prepaint">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on prepaint, in
+      microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.StyleUpdate">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on style update, in
+      microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="SendBeginMainFrameToCommit.UpdateLayers">
+    <summary>
+      The time portion of SendBeginMainFrameToCommit spent on updating layers,
+      in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4933,7 +6154,52 @@ be describing additional metrics about the same event.
   <metric name="SubmitCompositorFrameToPresentationCompositorFrame">
     <summary>
       The time from when the a compositor frame is submitted to the display
-      compositor to when it is presented.
+      compositor to when it is presented, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric
+      name="SubmitCompositorFrameToPresentationCompositorFrame.BufferAvailableToBufferReady">
+    <summary>
+      The time from when the target framebuffer is available to when the GPU has
+      finished drawing to it, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric
+      name="SubmitCompositorFrameToPresentationCompositorFrame.BufferReadyToLatch">
+    <summary>
+      The time from when the target framebuffer is ready to be displayed to when
+      the buffer is latched on for presentation, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric
+      name="SubmitCompositorFrameToPresentationCompositorFrame.LatchToSwapEnd">
+    <summary>
+      The time from when the target framebuffer is latched on to when the swap
+      ends, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4948,7 +6214,7 @@ be describing additional metrics about the same event.
       name="SubmitCompositorFrameToPresentationCompositorFrame.ReceivedCompositorFrameToStartDraw">
     <summary>
       The time from when a compositor frame is received to when it starts to
-      draw.
+      draw, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4968,7 +6234,7 @@ be describing additional metrics about the same event.
     </obsolete>
     <summary>
       The time from when the a compositor frame is started to draw to when it
-      ends swap.
+      ends swap, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4983,7 +6249,7 @@ be describing additional metrics about the same event.
       name="SubmitCompositorFrameToPresentationCompositorFrame.StartDrawToSwapStart">
     <summary>
       The time from when a compositor frame is started to draw to when it starts
-      swap.
+      swap, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -4997,8 +6263,8 @@ be describing additional metrics about the same event.
   <metric
       name="SubmitCompositorFrameToPresentationCompositorFrame.SubmitToReceiveCompositorFrame">
     <summary>
-      The time from when the a compositor frame is submitted to when it is
-      received.
+      The time from when a compositor frame is submitted to when it is received,
+      in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -5013,7 +6279,22 @@ be describing additional metrics about the same event.
       name="SubmitCompositorFrameToPresentationCompositorFrame.SwapEndToPresentationCompositorFrame">
     <summary>
       The time from when the a compositor frame ends swap to when it is
-      presented.
+      presented, in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.country"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric
+      name="SubmitCompositorFrameToPresentationCompositorFrame.SwapStartToBufferAvailable">
+    <summary>
+      The time from when the compositor frame starts to swap to when the target
+      framebuffer becomes available, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -5027,7 +6308,8 @@ be describing additional metrics about the same event.
   <metric
       name="SubmitCompositorFrameToPresentationCompositorFrame.SwapStartToSwapEnd">
     <summary>
-      The time from when a compositor frame starts swap to when it ends swap.
+      The time from when a compositor frame starts swap to when it ends swap, in
+      microseconds.
     </summary>
     <aggregation>
       <history>
@@ -5043,7 +6325,7 @@ be describing additional metrics about the same event.
       The total time starting from BeginImplFrame to when
       CompositorFramePresentation is done with updates from the MainThread (i.e.
       the time it takes for BeginImplFrame, BeginMainFrame, Commit, Activate,
-      SubmitCompositorFrame and PresentCompositorFrame).
+      SubmitCompositorFrame and PresentCompositorFrame), in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -5061,7 +6343,7 @@ be describing additional metrics about the same event.
   </metric>
   <metric name="Unknown">
     <summary>
-      The time within a stage not attributed to any system.
+      The time within a stage not attributed to any system, in microseconds.
     </summary>
     <aggregation>
       <history>
@@ -5140,6 +6422,18 @@ be describing additional metrics about the same event.
       </history>
     </aggregation>
   </metric>
+  <metric name="TimingSinceFCPWorstCase">
+    <summary>
+      The Time From FCP when the worst case happened
+    </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
   <metric name="WorstCase">
     <summary>
       The maximum number of dropped frames (as a percentage) within a
@@ -5677,6 +6971,16 @@ be describing additional metrics about the same event.
     metrics are recorded for history navigations, but not for same-document
     navigations.
   </summary>
+  <metric
+      name="AverageCumulativeShiftScoreAfterBackForwardCacheRestore.SessionWindow.Gap5000ms">
+    <summary>
+      Measures the average cumulative layout shift (bit.ly/cls-explainer) that
+      has occurred in a session window, after the page is restored from the
+      back-forward. The gap between two consecutive shifts in a window is not
+      bigger than 5000ms. This metric's integral value is 100x the fractional
+      cumulative layout shift score described in the explainer.
+    </summary>
+  </metric>
   <metric name="BackForwardCache.BlocklistedFeatures"
       enum="WebSchedulerTrackedFeature">
     <summary>
@@ -5753,6 +7057,57 @@ be describing additional metrics about the same event.
       features.
     </summary>
   </metric>
+  <metric
+      name="MaxCumulativeShiftScoreAfterBackForwardCacheRestore.SessionWindow.Gap1000ms">
+    <summary>
+      Measures the maximum cumulative layout shift (bit.ly/cls-explainer) that
+      has occurred in a session window, after the page is restored from the
+      back-forward. The gap between two consecutive shifts in a window is not
+      bigger than 1000ms. This metric's integral value is 100x the fractional
+      cumulative layout shift score described in the explainer.
+    </summary>
+  </metric>
+  <metric
+      name="MaxCumulativeShiftScoreAfterBackForwardCacheRestore.SessionWindow.Gap1000ms.Max5000ms">
+    <summary>
+      Measures the maximum cumulative layout shift (bit.ly/cls-explainer) that
+      has occurred in a session window, after the page is restored from the
+      back-forward. The gap between two consecutive shifts in a window is not
+      bigger than 1000ms and the maximum window size is 5000ms. This metric's
+      integral value is 100x the fractional cumulative layout shift score
+      described in the explainer.
+    </summary>
+  </metric>
+  <metric
+      name="MaxCumulativeShiftScoreAfterBackForwardCacheRestore.SessionWindowByInputs.Gap1000ms.Max5000ms">
+    <summary>
+      Measures the maximum cumulative layout shift (bit.ly/cls-explainer) that
+      has occurred in a session window, after the page is restored from the
+      back-forward. The gap between two consecutive shifts in a window is not
+      bigger than 1000ms and the maximum window size is 5000ms. We start a new
+      window whenever there's a new user input. This metric's integral value is
+      100x the fractional cumulative layout shift score described in the
+      explainer.
+    </summary>
+  </metric>
+  <metric
+      name="MaxCumulativeShiftScoreAfterBackForwardCacheRestore.SlidingWindow.Duration1000ms">
+    <summary>
+      Measures the maximum cumulative layout shift (bit.ly/cls-explainer) that
+      has occurred in a 1000ms sliding window, after the page is restored from
+      the back-forward. This metric's integral value is 100x the fractional
+      cumulative layout shift score described in the explainer.
+    </summary>
+  </metric>
+  <metric
+      name="MaxCumulativeShiftScoreAfterBackForwardCacheRestore.SlidingWindow.Duration300ms">
+    <summary>
+      Measures the maximum cumulative layout shift (bit.ly/cls-explainer) that
+      has occurred in a 300ms sliding window, after the page is restored from
+      the back-forward. This metric's integral value is 100x the fractional
+      cumulative layout shift score described in the explainer.
+    </summary>
+  </metric>
   <metric name="NavigatedToTheMostRecentEntryForDocument">
     <summary>
       Boolean for whether we navigated to the same navigation entry as the one
@@ -5849,6 +7204,20 @@ be describing additional metrics about the same event.
     Consumers of this event's metrics should be aware of this when making
     comparisons between InputEvent metrics and PageLoad metrics.
   </summary>
+  <metric name="EventType" enum="InputEventTypeForResponsivenessMetric">
+    <summary>
+      The Event Type of the input event.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.is_dominant_version"/>
+        <index fields="profile.is_latest_version"/>
+        <statistics>
+          <enumeration/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
   <metric name="InteractiveTiming.InputDelay">
     <summary>
       Measures Input Delay, the duration between the hardware timestamp and the
@@ -5865,6 +7234,22 @@ be describing additional metrics about the same event.
       </history>
     </aggregation>
   </metric>
+  <metric name="InteractiveTiming.ProcessingFinishedToNextPaint">
+    <summary>
+      Measures the time in ms from when the event handlers finish processing the
+      input event to the time when the next paint caused by the input event is
+      performed.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.is_dominant_version"/>
+        <index fields="profile.is_latest_version"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
   <metric name="InteractiveTiming.ProcessingTime">
     <summary>
       Measures Input Event processing time, the duration of event handlers
@@ -5882,6 +7267,19 @@ be describing additional metrics about the same event.
   </metric>
 </event>
 
+<event name="InstalledRelatedApps">
+  <owner>rayankans@chromium.org</owner>
+  <owner>peter@chromium.org</owner>
+  <summary>
+    Recorded before resolving a call to navigator.getInstalledRelatedApps().
+  </summary>
+  <metric name="Called">
+    <summary>
+      Always true.
+    </summary>
+  </metric>
+</event>
+
 <event name="Intervention.DocumentWrite.ScriptBlock" singular="True">
   <owner>bmcquade@chromium.org</owner>
   <summary>
@@ -6001,8 +7399,8 @@ be describing additional metrics about the same event.
 </event>
 
 <event name="IOS.URLMismatchInLegacyAndSlimNavigationManager">
-  <owner>eugenebut@chromium.org</owner>
-  <owner>danyao@chromium.org</owner>
+  <owner>ajuma@chromium.org</owner>
+  <owner>gambard@chromium.org</owner>
   <summary>
     Logged when LegacyNavigationManager and KWKBasedNavigationManager have
     different last committed URLs. This means that either old or new navigation
@@ -6519,8 +7917,9 @@ be describing additional metrics about the same event.
   </metric>
   <metric name="AudioDecoderName">
     <summary>
-      Enumeration of audio decoder names, zero if none or unknown (Cast, HLS,
-      etc). See WatchTimeRecorder::AudioDecoderName enum for expected values.
+      Enumeration of audio decoder implementations, zero if none or unknown
+      (Cast, HLS, etc). See AudioDecoderType (media/base/decoder.h) for expected
+      values.
     </summary>
   </metric>
   <metric name="AudioEncryptionScheme">
@@ -6607,6 +8006,12 @@ be describing additional metrics about the same event.
       the number of rebuffering events.
     </summary>
   </metric>
+  <metric name="MediaStreamType" enum="MediaStreamType">
+    <summary>
+      Enum value indicating the type of MediaStream if the playback is from a
+      MediaStream, or kNonMediaStream otherwise.
+    </summary>
+  </metric>
   <metric name="PlayerID">
     <summary>
       ID which corresponds to a given WebMediaPlayerImpl instance. May be linked
@@ -6632,8 +8037,9 @@ be describing additional metrics about the same event.
   </metric>
   <metric name="VideoDecoderName">
     <summary>
-      Enumeration of video decoder names, zero if none or unknown (Cast, HLS,
-      etc). See WatchTimeRecorder::VideoDecoderName enum for expected values.
+      Enumeration of video decoder implementations, zero if none or unknown
+      (Cast, HLS, etc). See VideoDecoderType (media/base/decoder.h) for expected
+      values.
     </summary>
   </metric>
   <metric name="VideoEncryptionScheme">
@@ -7912,6 +9318,11 @@ be describing additional metrics about the same event.
       Measure of memory consumed by global handles in V8.
     </summary>
   </metric>
+  <metric name="V8.Main.GlobalHandles.AllocatedObjects">
+    <summary>
+      Measure of memory consumed by used global handles in V8.
+    </summary>
+  </metric>
   <metric name="V8.Main.Heap">
     <summary>
       Measure of memory consumed by the main heap of V8.
@@ -8198,12 +9609,17 @@ be describing additional metrics about the same event.
 </event>
 
 <event name="MobileFriendliness">
-  <owner>kumagi@chromium.org</owner>
+  <owner>kumagi@google.com</owner>
   <metric name="AllowUserZoom" enum="Boolean">
     <summary>
       Whether the page allows the user to zoom in/out.
     </summary>
   </metric>
+  <metric name="SmallTextRatio">
+    <summary>
+      Percentage of small font text area in total text area.
+    </summary>
+  </metric>
   <metric name="ViewportDeviceWidth" enum="Boolean">
     <summary>
       Whether the width of the viewport specified as device-width or not.
@@ -9436,6 +10852,44 @@ be describing additional metrics about the same event.
       different renderer process than the current document or not.
     </summary>
   </metric>
+  <metric name="IsExistingBookmark" enum="Boolean">
+    <summary>
+      Marked true if the page was already bookmarked when the navigation
+      committed.
+    </summary>
+  </metric>
+  <metric name="IsExistingPartOfTabGroup" enum="Boolean">
+    <summary>
+      Marked true if the page was already part of a tab group when the
+      navigation committed.
+    </summary>
+  </metric>
+  <metric name="IsNewBookmark" enum="Boolean">
+    <summary>
+      Roughly: measures if the page was newly bookmarked. Specifically: this is
+      marked true if the page was not bookmarked when the navigation committed,
+      and is bookmarked at the end of the page lifetime.
+
+      Note, this means this boolean is mutually exclusive with
+      IsExistingBookmark.
+
+      Also note, this means that a page that is bookmarked, and then
+      sebsequently un-bookmarked is counted as false.
+    </summary>
+  </metric>
+  <metric name="IsPlacedInTabGroup" enum="Boolean">
+    <summary>
+      Roughly: measures if the page was added to a tab group. Specifically: this
+      is marked true if the page was not part of a tab group when the navigation
+      committed, and is part of a tab group at the end of the page lifetime.
+
+      Note, this means this boolean is mutually exclusive with
+      IsExistingPartOfTabGroup.
+
+      Also note, this means that a page that is added, and then sebsequently
+      removed from a tab group is counted as false.
+    </summary>
+  </metric>
   <metric name="IsSignedExchangeInnerResponse">
     <obsolete>
       Migrated to the PageLoad.SignedExchange event. The presence of that event
@@ -9524,6 +10978,16 @@ be describing additional metrics about the same event.
     </summary>
   </metric>
   <metric
+      name="LayoutInstability.MaxCumulativeShiftScore.SessionWindowByInputs.Gap1000ms.Max5000ms">
+    <summary>
+      Measures the maximum cumulative layout shift (bit.ly/cls-explainer) that
+      has occurred in a session window. The gap between two consecutive shifts
+      in a window is not bigger than 1000ms or segmented by a user input. The
+      maximum window size is 5000ms. This metric's integral value is 100x the
+      fractional cumulative layout shift score described in the explainer.
+    </summary>
+  </metric>
+  <metric
       name="LayoutInstability.MaxCumulativeShiftScore.SlidingWindow.Duration1000ms">
     <summary>
       Measures the maximum cumulative layout shift (bit.ly/cls-explainer) that
@@ -9659,6 +11123,9 @@ be describing additional metrics about the same event.
     </summary>
   </metric>
   <metric name="Navigation.PageEndReason2" enum="PageEndReason">
+    <obsolete>
+      Deprecated Jan 2021 in favor of Navigation.PageEndReason3.
+    </obsolete>
     <summary>
       The |page_load_metrics::PageEndReason| for the main frame navigation of
       this page load. Replaced Navigation.PageEndReason at the end of May 2020
@@ -9667,6 +11134,14 @@ be describing additional metrics about the same event.
       metric is recorded after the page became hidden.
     </summary>
   </metric>
+  <metric name="Navigation.PageEndReason3" enum="PageEndReason">
+    <summary>
+      The |page_load_metrics::PageEndReason| for the main frame navigation of
+      this page load. Replaced Navigation.PageEndReason2 on January 2021 to get
+      rid of END_HIDDEN and use END_APP_BACKGROUND on cases where the metrics
+      are flushed and the app enters the background.
+    </summary>
+  </metric>
   <metric name="Navigation.PageTransition">
     <summary>
       The |ui::PageTransition| for the main frame navigation of this page load.
@@ -9802,6 +11277,12 @@ be describing additional metrics about the same event.
       navigation for this page load was initiated.
     </summary>
   </metric>
+  <metric name="OmniboxUrlCopied" enum="Boolean">
+    <summary>
+      Marked true if the user copied the page's URL from the omnibox at any time
+      for this page load.
+    </summary>
+  </metric>
   <metric name="PageTiming.ForegroundDuration">
     <summary>
       For page loads that start in the foreground, measures the duration of time
@@ -10792,6 +12273,13 @@ be describing additional metrics about the same event.
       An enum of type PermissionSourceUI. The UI surface for this action.
     </summary>
   </metric>
+  <metric name="TimeToDecision">
+    <summary>
+      Time (in milliseconds) taken by the user to make a decision on a
+      permission prompt after it was displayed, if at all. Ignoring a prompt
+      doesnt count as a decision.
+    </summary>
+  </metric>
 </event>
 
 <event name="Plugins.FlashInstance">
@@ -10908,6 +12396,203 @@ be describing additional metrics about the same event.
   </metric>
 </event>
 
+<event name="PostMessage.Incoming.Frame">
+  <owner>chlily@chromium.org</owner>
+  <owner>miketaylr@chromium.org</owner>
+  <summary>
+    The frame received an incoming postMessage event. This is recorded only for
+    postMessage events sent between frames in the same renderer process.
+  </summary>
+  <metric name="SourceFrameSourceId">
+    <summary>
+      The UKM source ID of the postMessage event's source frame, as an integer.
+    </summary>
+  </metric>
+</event>
+
+<event name="PostMessage.Incoming.Page">
+  <owner>chlily@chromium.org</owner>
+  <owner>miketaylr@chromium.org</owner>
+  <summary>
+    A frame on the page received an incoming postMessage event. This is recorded
+    only for postMessage events sent between frames in different renderer
+    processes.
+  </summary>
+  <metric name="SourcePageSourceId">
+    <summary>
+      The UKM source ID of the postMessage event's source page, as an integer.
+    </summary>
+  </metric>
+</event>
+
+<event name="PowerUsageScenariosIntervalData">
+  <owner>fdoray@chromium.org</owner>
+  <owner>sebmarchand@chromium.org</owner>
+  <owner>chrome-catan@google.com</owner>
+  <summary>
+    Metrics to measure power consumption in key usage scenarios, as well as the
+    time spent in each scenario. These metrics are reported for a fixed interval
+    of time, the duration of this interval is recorded in the
+    IntervalDurationSeconds metric.
+
+    The events aren't tied to a specific URL, a timer independant of any load
+    event runs in Chrome and report these events at regular intervals. All the
+    metrics associated to this event are for the last interval. The URL attached
+    to the event is the one that has been visible for the longest time during
+    the interval, the exact visibility duration for this URL during the interval
+    is reported in the URLVisibilityTimeSeconds metric.
+
+    e.g., at T-0 an interval ends and this event is emitted, a new interval then
+    starts. During the interval the users spends 75% of his time watching a
+    fullscreen video on https://foo.com with 10 tabs opened in background. Just
+    before the end of the interval the user closes all the tabs but one. An
+    event will be emitted for https://foo.com at T+X with the following metrics:
+    IntervalDurationSeconds: X in seconds; URLVisibilityTimeSeconds: 0.75 * X in
+    seconds; FullscreenVideoSingleMonitorSeconds: 0.75 * X in seconds;
+    MaxTabCount: 10; TabClosed: 9; ... (not all metrics are listed here because
+    it'd be too long, but in practice all the metrics are reported for each
+    interval).
+
+    This is reported on Mac and Windows. See go/chrome_power_use_per_scenario
+    for more details.
+  </summary>
+  <metric name="BatteryDischargeMode" enum="BatteryDischargeMode">
+    <summary>
+      Battery discharge mode describing whether BatteryDischargeRate could be
+      reported or not, and why. Recorded as enum BatteryDischargeMode in
+      //tools/metrics/histograms/enums.xml.
+    </summary>
+  </metric>
+  <metric name="BatteryDischargeRate">
+    <summary>
+      Battery discharge rate per minute, with 1/10000 of full charge resolution,
+      example: - Battery capacity = 4000 mAh; - Battery charge at the beginning
+      of the interval: 3900 mAh; - Battery charge at the end of the interval:
+      3700 mAh; - Discharge proportion: (3900-3700) / 4000 = 0.05 - Reported
+      value: 500.
+    </summary>
+  </metric>
+  <metric name="BrowserShuttingDown" enum="Boolean">
+    <summary>
+      Indicates if the browser is shutting down when this event is reported.
+    </summary>
+  </metric>
+  <metric name="CPUTimeMs">
+    <summary>
+      The CPU time spent executing code, across all Chrome processes in the
+      interval. This can exceed 100% in multi-thread processes running on
+      multi-core systems.
+    </summary>
+  </metric>
+  <metric name="EnergyImpactScore">
+    <summary>
+      Sum of the energy impact score for all Chrome processes (Mac-only).
+    </summary>
+  </metric>
+  <metric name="FullscreenVideoSingleMonitorSeconds">
+    <summary>
+      Time spent playing video in fullscreen, single-monitor. In seconds. This
+      includes video for any tabs during the interval.
+    </summary>
+  </metric>
+  <metric name="IdleWakeUps">
+    <summary>
+      Sum of idle-wakeups for all Chrome processes (Mac-only).
+    </summary>
+  </metric>
+  <metric name="IntervalDurationSeconds">
+    <summary>
+      The interval duration, in seconds.
+    </summary>
+  </metric>
+  <metric name="MaxTabCount">
+    <summary>
+      The maximum number of tabs that existed at the same time during the
+      interval.
+    </summary>
+  </metric>
+  <metric name="MaxVisibleWindowCount">
+    <summary>
+      The maximum number of windows that have been visible at the same time.
+    </summary>
+  </metric>
+  <metric name="OriginVisibilityTimeSeconds">
+    <summary>
+      The visibility time for the origin of the URL associated with this event,
+      in seconds. This can differ from URLVisibilityTimeSeconds if there's
+      multiple tabs loaded with the same URL that are visible during the
+      interval. E.g. if there's one tab loaded with foo.com/a visible for 1
+      second during the interval and one loaded with foo.com/b visible for 2
+      seconds the report will have URLVisibilityTimeSeconds = 2 seconds and
+      OriginVisibilityTimeSeconds = 3 seconds. This can also exceed the interval
+      duration (e.g. 2 visibles tab with loaded the same origin during the
+      entire interval).
+    </summary>
+  </metric>
+  <metric name="PackageExits">
+    <summary>
+      Sum of package exits from all Chrome processes (Mac-only).
+    </summary>
+  </metric>
+  <metric name="PlayingAudioSeconds">
+    <summary>
+      The time spent playing audio in at least one tab, in seconds.
+    </summary>
+  </metric>
+  <metric name="TabClosed">
+    <summary>
+      The number of tabs that have been closed during the interval.
+    </summary>
+  </metric>
+  <metric name="TimePlayingVideoInVisibleTab">
+    <summary>
+      The time spent playing video in at least one visible tab, in seconds.
+    </summary>
+  </metric>
+  <metric name="TimeSinceInteractionWithBrowserSeconds">
+    <summary>
+      The time since the last interaction with the browser when this event gets
+      recorded, in seconds.
+    </summary>
+  </metric>
+  <metric name="TimeSinceInteractionWithSystemSeconds">
+    <summary>
+      The time since the last interaction with the system when this event gets
+      recorded, in seconds.
+    </summary>
+  </metric>
+  <metric name="TimeWithOpenWebRTCConnectionSeconds">
+    <summary>
+      The time spent with at least one opened WebRTC connection, in seconds.
+    </summary>
+  </metric>
+  <metric name="TopLevelNavigationEvents">
+    <summary>
+      Number of main frame different-document navigations.
+    </summary>
+  </metric>
+  <metric name="UptimeSeconds">
+    <summary>
+      Elapsed time since Chrome has started, in seconds.
+    </summary>
+  </metric>
+  <metric name="URLVisibilityTimeSeconds">
+    <summary>
+      The visibility time for the URL associated with this event, in seconds.
+    </summary>
+  </metric>
+  <metric name="UserInteractionCount">
+    <summary>
+      Number of user interaction (scroll, click or typing) during the interval.
+    </summary>
+  </metric>
+  <metric name="VideoCaptureSeconds">
+    <summary>
+      The time spent capturing video in at least one tab, in seconds.
+    </summary>
+  </metric>
+</event>
+
 <event name="PrefetchProxy" singular="True">
   <owner>robertogden@chromium.org</owner>
   <owner>ryansturm@chromium.org</owner>
@@ -11161,11 +12846,17 @@ be describing additional metrics about the same event.
     </summary>
   </metric>
   <metric name="noscript">
+    <obsolete>
+      Deprecated December 2020.
+    </obsolete>
     <summary>
       Set to 1 when a user is shown a NoScript preview on a page load.
     </summary>
   </metric>
   <metric name="noscript_eligibility_reason">
+    <obsolete>
+      Deprecated December 2020.
+    </obsolete>
     <summary>
       Set to the value of the last known reason a NoScript preview was not
       eligible on this page load. The value of this metric corresponds to the
@@ -11174,6 +12865,9 @@ be describing additional metrics about the same event.
     </summary>
   </metric>
   <metric name="offline_eligibility_reason">
+    <obsolete>
+      Deprecated December 2020.
+    </obsolete>
     <summary>
       Set to the value of the last known reason an Offline preview was not
       eligible on this page load. The value of this metric corresponds to the
@@ -11182,6 +12876,9 @@ be describing additional metrics about the same event.
     </summary>
   </metric>
   <metric name="offline_preview">
+    <obsolete>
+      Deprecated December 2020.
+    </obsolete>
     <summary>
       Set to 1 when a user is shown an offline preview page in page load.
     </summary>
@@ -11219,12 +12916,18 @@ be describing additional metrics about the same event.
     </summary>
   </metric>
   <metric name="resource_loading_hints">
+    <obsolete>
+      Deprecated December 2020.
+    </obsolete>
     <summary>
       Set to 1 when a user is shown a resource loading hints based preview on a
       page load.
     </summary>
   </metric>
   <metric name="resource_loading_hints_eligibility_reason">
+    <obsolete>
+      Deprecated December 2020.
+    </obsolete>
     <summary>
       Set to the value of the last known reason a Resource Loading Hints preview
       was not eligible on this page load. The value of this metric corresponds
@@ -11394,6 +13097,60 @@ be describing additional metrics about the same event.
   </metric>
 </event>
 
+<event name="PublicImageCompressionImageLoad">
+  <owner>rajendrant@chromium.org</owner>
+  <owner>mcrouse@chromium.org</owner>
+  <summary>
+    Records image loading and network data use metrics for https image
+    compression. Recorded when an image request completes with successful
+    compression or fails and fetches original image. The bytes are rounded down
+    to the exponential bucket with factor of 1.3.
+  </summary>
+  <metric name="CompressionPercentage">
+    <summary>
+      The compression percent of this image recorded if the image has been
+      compressed: (1-compressed_bytes/original_bytes)*100%
+    </summary>
+  </metric>
+  <metric name="NavigationToRequestSent">
+    <summary>
+      The duration in milliseconds from time of navigation start to the time the
+      image request was sent to the origin or compression server.
+    </summary>
+  </metric>
+  <metric name="NavigationToRequestStart">
+    <summary>
+      The duration in milliseconds from time of navigation start to the time the
+      image request started.
+    </summary>
+  </metric>
+  <metric name="NavigationToResponseReceived">
+    <summary>
+      The duration in milliseconds from time of navigation start to the time the
+      image response headers were received.
+    </summary>
+  </metric>
+  <metric name="OriginalBytes">
+    <summary>
+      The original size of the image before compression. For compressed images
+      this is the original size retrieved from response headers. For
+      non-compressed images this is the network bytes.
+    </summary>
+  </metric>
+  <metric name="RedirectResult" enum="SubresourceRedirectRedirectResult">
+    <summary>
+      Enumerates the different results possible for subresource redirection,
+      such as redirectable or different reasons of ineligibility.
+    </summary>
+  </metric>
+  <metric name="RobotsRulesFetchLatency">
+    <summary>
+      The duration in milliseconds to fetch the robots rules. Recorded for each
+      image that goes through the robots rules check.
+    </summary>
+  </metric>
+</event>
+
 <event name="PWA.Visit" singular="True">
   <owner>yfriedman@chromium.org</owner>
   <owner>hartmanng@chromium.org</owner>
@@ -12195,6 +13952,11 @@ be describing additional metrics about the same event.
   <summary>
     Records performance metrics for SMSReceiver API.
   </summary>
+  <metric name="IsCrossOriginFrame" enum="Boolean">
+    <summary>
+      Flag indicating whether the report comes from a cross-origin frame or not.
+    </summary>
+  </metric>
   <metric name="Outcome" enum="WebOTPServiceOutcome">
     <summary>
       Records the result of a call to the SmsReceiver API.
@@ -13230,6 +14992,185 @@ be describing additional metrics about the same event.
   <metric name="TargetLanguage" semantic_type="ST_DEMOGRAPHIC_INFO"/>
 </event>
 
+<event name="TranslatePageLoad">
+  <owner>curranmax@chromium.org</owner>
+  <owner>megjablon@chromium.org</owner>
+  <owner>chrome-language@google.com</owner>
+  <summary>
+    Summary of the user's interaction with Translate from the beginning of the
+    page load to when the event is recorded. This event is recorded when a page
+    load is completed and every time that Chrome is backgrounded during the
+    course of the page load. This means we can record multiple events for a
+    single page load, but it guarentees that we will still record data in
+    instances where the user backgrounds then kills Chrome.
+  </summary>
+  <metric name="FinalSourceLanguage" semantic_type="ST_DEMOGRAPHIC_INFO"
+      enum="CLD3LanguageCode">
+    <summary>
+      The source language at the time the event is recorded. In most cases this
+      will match the intial source language, but the user can change the source
+      language manually if they want. Note that the semantic_type attribute is
+      included in order to remain consistent with the previous Translate UKM
+      proto.
+    </summary>
+  </metric>
+  <metric name="FinalState" enum="TranslateState">
+    <summary>
+      At the time this event is recorded, the state of Translate. This includes
+      whether the page is translated or not and if no UI is shown, just the
+      omnibox icon is shown, or the full translate UI is shown.
+    </summary>
+  </metric>
+  <metric name="FinalTargetLanguage" semantic_type="ST_DEMOGRAPHIC_INFO"
+      enum="CLD3LanguageCode">
+    <summary>
+      The target language at the time the event is recorded. In most cases this
+      will match the initial target language, but the user can change the target
+      language manually if they want. Note that the semantic_type attribute is
+      included in order to remain consistent with the previous Translate UKM
+      proto.
+    </summary>
+  </metric>
+  <metric name="FirstTranslateError" enum="TranslateError">
+    <summary>
+      The first error to occur within Translate for this page load.
+    </summary>
+  </metric>
+  <metric name="FirstUIInteraction" enum="TranslateUIInteraction">
+    <summary>
+      The user's first interaction with the Translate UI.
+    </summary>
+  </metric>
+  <metric name="HTMLContentLanguage" semantic_type="ST_DEMOGRAPHIC_INFO"
+      enum="CLD3LanguageCode">
+    <summary>
+      The HTML language content attribute specified by the document. Note that
+      the semantic_type attribute is included in order to remain consistent with
+      the previous Translate UKM proto.
+    </summary>
+  </metric>
+  <metric name="HTMLDocumentLanguage" semantic_type="ST_DEMOGRAPHIC_INFO"
+      enum="CLD3LanguageCode">
+    <summary>
+      The HTML language attribute specified by the document. Note that the
+      semantic_type attribute is included in order to remain consistent with the
+      previous Translate UKM proto.
+    </summary>
+  </metric>
+  <metric name="InitialSourceLanguage" semantic_type="ST_DEMOGRAPHIC_INFO"
+      enum="CLD3LanguageCode">
+    <summary>
+      The initial source language that Translate determines for the page. Note
+      that the semantic_type attribute is included in order to remain consistent
+      with the previous Translate UKM proto.
+    </summary>
+  </metric>
+  <metric name="InitialSourceLanguageInContentLanguages" enum="Boolean">
+    <summary>
+      Signals whether the initial source language is in the list of the user's
+      content languages. The user's content languages loosely match with the
+      languages the user has translated to before or has blocked for
+      translation.
+    </summary>
+  </metric>
+  <metric name="InitialState" enum="TranslateState">
+    <summary>
+      At the beginning of the page load, the state of Translate. This includes
+      whether the page is translated or not and if no UI is shown, just the
+      omnibox icon is shown, or the full translate UI is shown.
+    </summary>
+  </metric>
+  <metric name="InitialTargetLanguage" semantic_type="ST_DEMOGRAPHIC_INFO"
+      enum="CLD3LanguageCode">
+    <summary>
+      The initial target language that Translate thinks it should translate to.
+      Note that the semantic_type attribute is included in order to remain
+      consistent with the previous Translate UKM proto.
+    </summary>
+  </metric>
+  <metric name="MaxTimeToTranslate">
+    <summary>
+      Across all translations during this page load, the maximum amount of time
+      (in milliseconds) it took to translate the page.
+    </summary>
+  </metric>
+  <metric name="ModelDetectedLanguage" semantic_type="ST_DEMOGRAPHIC_INFO"
+      enum="CLD3LanguageCode">
+    <summary>
+      The language that was estimated by the language model based on the page's
+      content. Note that the semantic_type attribute is included in order to
+      remain consistent with the previous Translate UKM proto.
+    </summary>
+  </metric>
+  <metric name="ModelDetectionReliabilityScore">
+    <summary>
+      The score, or confidence, of the language detection model's prediction
+      about the language of the page content. The score is between 0 and 100,
+      higher means more confident.
+    </summary>
+  </metric>
+  <metric name="NumReversions">
+    <summary>
+      The number of times a translation was reverted.
+    </summary>
+  </metric>
+  <metric name="NumTargetLanguageChanges">
+    <summary>
+      The number of times that the target language was changed by the user over
+      the course of this page load.
+    </summary>
+  </metric>
+  <metric name="NumTranslateErrors">
+    <summary>
+      The number of errors to occur within Translate for this page load.
+    </summary>
+  </metric>
+  <metric name="NumTranslations">
+    <summary>
+      The number of times the page was translated.
+    </summary>
+  </metric>
+  <metric name="NumUIInteractions">
+    <summary>
+      The number of times that the user interacts with the Translate UI.
+    </summary>
+  </metric>
+  <metric name="RankerDecision" enum="TranslateRankerDecision">
+    <summary>
+      Decision of the Ranker whether to show the UI or not.
+    </summary>
+  </metric>
+  <metric name="RankerVersion">
+    <summary>
+      Version of Ranker used for this page load.
+    </summary>
+  </metric>
+  <metric name="SequenceNumber">
+    <summary>
+      In case multiple events are logged for one page load, we track the
+      sequence in the order each event is logged.
+    </summary>
+  </metric>
+  <metric name="TotalTimeNotTranslated">
+    <summary>
+      The amount of time (in seconds) this page was in the foreground and not
+      translated.
+    </summary>
+  </metric>
+  <metric name="TotalTimeTranslated">
+    <summary>
+      The amount of time (in seconds) this page was in the foreground and
+      translated.
+    </summary>
+  </metric>
+  <metric name="TriggerDecision" enum="TranslateTriggerDecision">
+    <summary>
+      The highest priority trigger that determined the initial state of
+      Translate for this page load.
+    </summary>
+  </metric>
+</event>
+
 <event name="TrustedWebActivity.Open" singular="True">
   <owner>peconn@chromium.org</owner>
   <summary>
@@ -13307,6 +15248,70 @@ be describing additional metrics about the same event.
       </history>
     </aggregation>
   </metric>
+  <metric name="BeforeUnloadToCommit.CrossProcess">
+    <summary>
+      Measures the time in milliseconds from when the browser sends the request
+      to dispatch before unload handlers (for browser-intitated navigations) or
+      from when the renderer started running before unload handlers (for
+      renderer-initiated navigations) to when the commit navigation was sent to
+      the renderer process. For cross-process navigations this represents the
+      total amount of time the navigation is blocked since it was initiated.
+    </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="BeforeUnloadToCommit.SameProcess">
+    <summary>
+      Measures the time in milliseconds from when the browser sends the request
+      to dispatch before unload handlers (for browser-intitated navigations) or
+      from when the renderer started running before unload handlers (for
+      renderer-initiated navigations) to when the navigation was committed. For
+      same-process navigations this represents the total amount of time the
+      navigation is blocked since it was initiated.
+    </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="UnloadDuration">
+    <summary>
+      Measures the time in milliseconds to run the unload handlers in the old
+      document where the navigation was committed. Only records for same-process
+      navigations since there are no unload handlers to be run in the new
+      process during a cross-process navigation.
+    </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
+  <metric name="UnloadQueueingDuration">
+    <summary>
+      Measures the time in miliseconds from when the browser sends the commit
+      navigation request to the renderer to when the renderer dispatches unload
+      events. Only records for same-process navigations since unload handlers
+      are run in a different process for cross-process navigations.
+    </summary>
+    <aggregation>
+      <history>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
 </event>
 
 <event name="UserActivity">
@@ -13833,7 +15838,23 @@ be describing additional metrics about the same event.
       </history>
     </aggregation>
   </metric>
+  <metric name="WallClockDuration">
+    <summary>
+      The total time the compilation took in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.form_factor"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
   <metric name="WallClockTime">
+    <obsolete>
+      Removed 11/2020
+    </obsolete>
     <summary>
       The total time the compilation took in microseconds.
     </summary>
@@ -13906,7 +15927,7 @@ be describing additional metrics about the same event.
       </history>
     </aggregation>
   </metric>
-  <metric name="WallClockTime">
+  <metric name="WallClockDuration">
     <summary>
       The total time the decoding took in microseconds.
     </summary>
@@ -13919,6 +15940,22 @@ be describing additional metrics about the same event.
       </history>
     </aggregation>
   </metric>
+  <metric name="WallClockTime">
+    <obsolete>
+      Removed 11/2020
+    </obsolete>
+    <summary>
+      The total time the compilation took in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.form_factor"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
 </event>
 
 <event name="V8.Wasm.ModuleInstantiated">
@@ -13954,7 +15991,7 @@ be describing additional metrics about the same event.
       </history>
     </aggregation>
   </metric>
-  <metric name="WallClockTime">
+  <metric name="WallClockDuration">
     <summary>
       The total time the instantiation took in microseconds.
     </summary>
@@ -13967,6 +16004,22 @@ be describing additional metrics about the same event.
       </history>
     </aggregation>
   </metric>
+  <metric name="WallClockTime">
+    <obsolete>
+      Removed 11/2020
+    </obsolete>
+    <summary>
+      The total time the compilation took in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.form_factor"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
 </event>
 
 <event name="V8.Wasm.ModuleTieredUp">
@@ -14003,7 +16056,23 @@ be describing additional metrics about the same event.
       </history>
     </aggregation>
   </metric>
+  <metric name="WallClockDuration">
+    <summary>
+      The total time the compilation took in microseconds.
+    </summary>
+    <aggregation>
+      <history>
+        <index fields="profile.form_factor"/>
+        <statistics>
+          <quantiles type="std-percentiles"/>
+        </statistics>
+      </history>
+    </aggregation>
+  </metric>
   <metric name="WallClockTime">
+    <obsolete>
+      Removed 11/2020
+    </obsolete>
     <summary>
       The total time the compilation took in microseconds.
     </summary>
diff --git a/chromium/tools/perf/chrome_telemetry_build/BUILD.gn b/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
index 4725b3aa6cd..82f745109a9 100644
--- a/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
+++ b/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
@@ -2,13 +2,32 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/chromeos/ui_mode.gni")
 import("//build/config/compiler/compiler.gni")
 if (is_android) {
   # Pull in enable_chrome_android_internal and public_android_sdk
   import("//build/config/android/config.gni")
 }
-if (is_chromeos) {
+
+if (is_chromeos_device) {
   import("//build/config/chromeos/rules.gni")
+
+  generate_runner_script("cros_update_wrapper") {
+    generated_script = "$root_build_dir/bin/cros_update_wrapper"
+    deploy_chrome = true
+  }
+
+  if (cros_boards != "") {
+    foreach(_board, string_split(cros_boards, ":")) {
+      _board_underscore = string_replace(_board, "-", "_")
+      generate_runner_script("cros_update_wrapper_${_board_underscore}") {
+        generated_script =
+            "$root_build_dir/bin/cros_update_wrapper_${_board_underscore}"
+        deploy_chrome = true
+        override_board = _board
+      }
+    }
+  }
 }
 
 group("telemetry_chrome_test") {
@@ -64,7 +83,17 @@ group("telemetry_chrome_test") {
     ]
   }
 
-  if (is_chromeos && is_chromeos_device) {
+  if (is_chromeos_device) {
+    data_deps += [ ":cros_update_wrapper" ]
+    if (cros_boards != "") {
+      foreach(_board, string_split(cros_boards, ":")) {
+        _board_underscore = string_replace(_board, "-", "_")
+        data_deps += [ ":cros_update_wrapper_${_board_underscore}" ]
+      }
+    }
+  }
+
+  if (is_chromeos_ash && is_chromeos_device) {
     data_deps += [
       "//:chromiumos_preflight",
       "//chromeos:cros_chrome_deploy",
@@ -100,6 +129,7 @@ group("telemetry_chrome_test_without_chrome") {
   testonly = true
 
   data = [
+    "//build/android/pylib/",  # chromium_config.py uses pylib to look for Java
     "//components/crash/content/tools/generate_breakpad_symbols.py",
     "//testing/scripts/common.py",
     "//testing/xvfb.py",
diff --git a/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn b/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn
index 7fe48cba143..d7289e158c6 100644
--- a/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn
+++ b/chromium/tools/perf/core/perfetto_binary_roller/BUILD.gn
@@ -13,6 +13,7 @@ generate_wrapper("upload_trace_processor") {
   data = [
     "//tools/perf/core/",
     "//DEPS",
+    "//.vpython",
   ]
 
   if (is_win) {
diff --git a/chromium/tools/polymer/polymer.py b/chromium/tools/polymer/polymer.py
index 793ee7f8569..61a7b248303 100644
--- a/chromium/tools/polymer/polymer.py
+++ b/chromium/tools/polymer/polymer.py
@@ -418,10 +418,9 @@ def _process_dom_module(js_file, html_file):
         line = '\n'.join(js_imports) + '\n\n'
         cr_define_found = True
         imports_added = True
-      elif line.startswith('Polymer({\n'):
+      elif 'Polymer({\n' in line:
         # Place the JS imports right before the opening "Polymer({" line.
-        line = line.replace(
-            r'Polymer({', '%s\n\nPolymer({' % '\n'.join(js_imports))
+        line = '\n'.join(js_imports) + '\n\n' + line
         imports_added = True
 
     # Place the HTML content right after the opening "Polymer({" line.
diff --git a/chromium/tools/polymer/polymer_test.py b/chromium/tools/polymer/polymer_test.py
index e2204026f78..7df0970499c 100755
--- a/chromium/tools/polymer/polymer_test.py
+++ b/chromium/tools/polymer/polymer_test.py
@@ -46,7 +46,7 @@ class PolymerModulizerTest(unittest.TestCase):
     actual_js = self._read_out_file(js_out_file)
     expected_js = open(os.path.join(
         _HERE_DIR, 'tests', js_file_expected), 'rb').read()
-    self.assertEquals(expected_js, actual_js)
+    self.assertEquals(expected_js.split('\n'), actual_js.split('\n'))
 
   # Test case where HTML is extracted from a Polymer2 <dom-module>.
   def testDomModule(self):
@@ -54,6 +54,17 @@ class PolymerModulizerTest(unittest.TestCase):
         'dom-module', 'dom_module.html', 'dom_module.js',
         'dom_module.m.js', 'dom_module_expected.js')
 
+  # Test case where a commented out HTML import exists in the original HTML
+  # file. It is purposefully picked up and converted to a JS module, to address
+  # a unique use case of the FilesApp where an HTML import does not actually
+  # exist in the Polymer2 code.
+  # TODO(crbug.com/1133186): Remove after FilesApp Polymer3 migration is
+  # completed.
+  def testDomModuleWithCommentedOutImport(self):
+    self._run_test('dom-module', 'dom_module_with_commented_out_import.html',
+                   'dom_module.js', 'dom_module.m.js',
+                   'dom_module_with_commented_out_import_expected.js')
+
   # Test case where HTML is extracted from a Polymer2 <dom-module> that is
   # wrapped in an IIFE function.
   def testDomModuleIife(self):
@@ -68,6 +79,14 @@ class PolymerModulizerTest(unittest.TestCase):
         'dom-module', 'dom_module.html', 'dom_module_iife_arrow.js',
         'dom_module_iife_arrow.m.js', 'dom_module_iife_expected.js')
 
+  # Test case where HTML is extracted from a Polymer2 <dom-module> that is
+  # assigned to a variable.
+  def testDomModuleIifeAndAssigned(self):
+    self._run_test(
+        'dom-module', 'dom_module.html', 'dom_module_with_assignment.js',
+        'dom_module_with_assignment.m.js',
+        'dom_module_with_assignment_expected.js')
+
   # Test case where HTML is extracted from a Polymer2 <dom-module> that also
   # has a 'cr.define()' in its JS file.
   def testDomModuleWithDefine(self):
diff --git a/chromium/tools/privacy_budget/DIR_METADATA b/chromium/tools/privacy_budget/DIR_METADATA
new file mode 100644
index 00000000000..fe6ef770ce6
--- /dev/null
+++ b/chromium/tools/privacy_budget/DIR_METADATA
@@ -0,0 +1,4 @@
+monorail: {
+  component: "Privacy>Fingerprinting"
+}
+team_email: "privacy-sandbox-dev@chromium.org"
diff --git a/chromium/tools/privacy_budget/OWNERS b/chromium/tools/privacy_budget/OWNERS
index cfc756a1170..dc548692bc4 100644
--- a/chromium/tools/privacy_budget/OWNERS
+++ b/chromium/tools/privacy_budget/OWNERS
@@ -1,4 +1 @@
 file://third_party/blink/public/common/privacy_budget/OWNERS
-
-# TEAM: privacy-sandbox-dev@chromium.org
-# COMPONENT: Privacy>Fingerprinting
diff --git a/chromium/tools/privacy_budget/blink_apis/BUILD.gn b/chromium/tools/privacy_budget/blink_apis/BUILD.gn
index cc727700bad..5fba75b0f80 100644
--- a/chromium/tools/privacy_budget/blink_apis/BUILD.gn
+++ b/chromium/tools/privacy_budget/blink_apis/BUILD.gn
@@ -15,11 +15,13 @@ proto_library("protos") {
 
 action("blink_apis") {
   testonly = true
-  script = "generate_blink_api_db.py"
+  script = "generate_blink_api_db_entrypoint.py"
 
   inputs = [
     web_idl_database_filepath,
     "blink_api_proto.py",
+    "generate_blink_api_db.py",
+    "web_feature.py",
   ]
   output_data_file = "${root_build_dir}/blink_apis.textpb"
   outputs = [ output_data_file ]
@@ -29,6 +31,10 @@ action("blink_apis") {
     rebase_path(web_idl_database_filepath, root_build_dir),
     "--output",
     rebase_path(output_data_file, root_build_dir),
+    "--web_feature_mojom",
+    rebase_path(
+        "//third_party/blink/public/mojom/web_feature/web_feature.mojom",
+        root_build_dir),
     "--path",
     string_join(":",
                 [
diff --git a/chromium/tools/privacy_budget/blink_apis/blink_api_proto.py b/chromium/tools/privacy_budget/blink_apis/blink_api_proto.py
index f45e5e4614f..e3ed7060835 100644
--- a/chromium/tools/privacy_budget/blink_apis/blink_api_proto.py
+++ b/chromium/tools/privacy_budget/blink_apis/blink_api_proto.py
@@ -15,10 +15,12 @@ class BlinkApiProto(object):
     a identifiability.blink_apis.Snapshot proto defined in
     proto/blink_apis.proto"""
 
-    def __init__(self, web_idl_pickle, proto_out_file, chromium_revision):
+    def __init__(self, web_idl_pickle, proto_out_file, chromium_revision,
+                 web_features):
         self.web_idl_database = web_idl.Database.read_from_file(web_idl_pickle)
         self.proto_out_file = proto_out_file
         self.snapshot = pb.Snapshot()
+        self.web_features = web_features
         if chromium_revision:
             self.snapshot.chromium_revision = chromium_revision
 
@@ -42,7 +44,7 @@ class BlinkApiProto(object):
 
         for function in self.web_idl_database.callback_functions:
             self._ConvertIdlOperation(self.snapshot.callback_functions.add(),
-                                      function)
+                                      function, None)
 
         for interface in self.web_idl_database.callback_interfaces:
             self._ConvertIdlInterfaceLike(
@@ -65,22 +67,43 @@ class BlinkApiProto(object):
             return pb.HIGH_ENTROPY_DIRECT
         assert False, "Unknown HighEntropy value {}".format(val)
 
-    def _GetUseCounter(self, parent, measure, measure_as):
-        if measure_as:
-            return measure_as.value
-        if measure:
-            use_counter = capitalize(parent.identifier)
-            if not isinstance(parent, web_idl.Interface):
-                use_counter = (capitalize(parent.owner.identifier) + '_' +
-                               use_counter)
-            return use_counter
-        return None
+    def _GetUseCounter(self, member, parent, ext_attrs):
+        assert isinstance(ext_attrs, web_idl.ExtendedAttributes)
+        assert parent is None or hasattr(parent, 'identifier')
+
+        if 'MeasureAs' in ext_attrs:
+            return ext_attrs.value_of('MeasureAs')
+
+        if 'Measure' not in ext_attrs:
+            return None
+
+        if parent is not None:
+            prefix = '%s_%s' % (capitalize(
+                parent.identifier), capitalize(member.identifier))
+        else:
+            prefix = capitalize(member.identifier)
+
+        suffix = ""
+        if isinstance(member, web_idl.FunctionLike):
+            if len(member.arguments) == 0 and member.is_getter:
+                suffix = "AttributeGetter"
+            elif len(member.arguments) == 1 and member.is_setter:
+                suffix = "AttributeSetter"
+            else:
+                suffix = "Method"
+        elif isinstance(member, web_idl.Attribute):
+            suffix = "AttributeGetter"
+        else:
+            assert False, repr(member)
+
+        return "V8" + prefix + "_" + suffix
 
     def _ConvertIdlType(self, dest, idl_type):
         assert isinstance(idl_type, web_idl.IdlType)
 
         dest.idl_type_string = idl_type.type_name_without_extended_attributes
-        self._ConvertExtendedAttributes(dest.extended_attributes, idl_type)
+        self._ConvertExtendedAttributes(dest.extended_attributes, idl_type,
+                                        None)
 
         # Only look at named definitions. Simple, primitive types don't define
         # named identifiers.
@@ -97,8 +120,8 @@ class BlinkApiProto(object):
         depends_on.remove(idl_type.type_name_without_extended_attributes)
         dest.depends_on[:] = list(depends_on)
 
-    def _ConvertExtendedAttributes(self, dest, parent):
-        attr = parent.extended_attributes
+    def _ConvertExtendedAttributes(self, dest, member, interface):
+        attr = member.extended_attributes
         assert isinstance(attr, web_idl.ExtendedAttributes)
         dest.cross_origin_isolated = ('CrossOriginIsolated' in attr)
         if 'Exposed' in attr:
@@ -112,26 +135,29 @@ class BlinkApiProto(object):
                 for v in exposed.values:
                     e = dest.exposed.add()
                     e.interface = v
-                    e.member = parent.identifier
+                    e.member = member.identifier
 
         setattr(dest, 'global', ('Global' in attr))
         dest.same_object = ('SameObject' in attr)
         dest.secure_context = ('SecureContext' in attr)
         dest.high_entropy = self._GetHighEntropyType(attr.get('HighEntropy'))
         if 'Measure' in attr or 'MeasureAs' in attr:
-            dest.use_counter = self._GetUseCounter(parent, attr.get('Measure'),
-                                                   attr.get('MeasureAs'))
+            dest.use_counter = self._GetUseCounter(member, interface, attr)
+            dest.use_counter_feature_value = self.web_features[
+                dest.use_counter]
         if 'RuntimeEnabled' in attr:
             dest.runtime_enabled = attr.value_of('RuntimeEnabled')
         if 'ImplementedAs' in attr:
             dest.implemented_as = attr.value_of('ImplementedAs')
 
-    def _ConvertIdlAttribute(self, dest, attr):
+    def _ConvertIdlAttribute(self, dest, attr, interface):
         dest.name = attr.identifier
         dest.is_static = attr.is_static
         dest.is_readonly = attr.is_readonly
-        self._ConvertExtendedAttributes(dest.extended_attributes, attr)
+        self._ConvertExtendedAttributes(dest.extended_attributes, attr,
+                                        interface)
         self._ConvertIdlType(dest.idl_type, attr.idl_type)
+        self._ConvertSourceLocation(dest.source_location, attr.debug_info)
 
     def _GetSpecialOperationType(self, op):
         if not isinstance(op, web_idl.Operation):
@@ -144,51 +170,82 @@ class BlinkApiProto(object):
             return pb.SPECIAL_OP_STRINGIFIER
         return pb.SPECIAL_OP_UNSPECIFIED
 
-    def _ConvertIdlOperation(self, dest, op):
+    def _ConvertIdlOperation(self, dest, op, parent):
         dest.name = op.identifier
         dest.static = op.is_static
         dest.special_op_type = self._GetSpecialOperationType(op)
         self._ConvertIdlType(dest.return_type, op.return_type)
+        self._ConvertSourceLocation(dest.source_location, op.debug_info)
+        self._ConvertExtendedAttributes(dest.extended_attributes, op, parent)
         for arg in op.arguments:
             self._ConvertIdlType(dest.arguments.add(), arg.idl_type)
 
     def _ConvertIdlEnumeration(self, dest, enumer):
         dest.name = enumer.identifier
         dest.values[:] = enumer.values
+        self._ConvertSourceLocation(dest.source_location, enumer.debug_info)
 
-    def _ConvertIdlConstant(self, dest, constant):
+    def _ConvertIdlConstant(self, dest, constant, parent):
         dest.name = constant.identifier
         dest.value = constant.value.literal
-        self._ConvertExtendedAttributes(dest.extended_attributes, constant)
+        self._ConvertExtendedAttributes(dest.extended_attributes, constant,
+                                        parent)
         self._ConvertIdlType(dest.idl_type, constant.idl_type)
-
-    def _ConvertIdlInterfaceLike(self, dest, interface):
-        dest.name = interface.identifier
-        if hasattr(interface, 'inherited') and interface.inherited:
-            dest.inherits_from = interface.inherited.identifier
-        self._ConvertExtendedAttributes(dest.extended_attributes, interface)
-        for attr in interface.attributes:
-            self._ConvertIdlAttribute(dest.attributes.add(), attr)
-        for op in interface.operations:
-            self._ConvertIdlOperation(dest.operations.add(), op)
-        for constant in interface.constants:
-            self._ConvertIdlConstant(dest.constants.add(), constant)
-
-    def _ConvertDictionaryMember(self, dest, member):
+        self._ConvertSourceLocation(dest.source_location, constant.debug_info)
+
+    def _ConvertIdlInterfaceLike(self, dest, parent):
+        dest.name = parent.identifier
+        if hasattr(parent, 'inherited') and parent.inherited:
+            dest.inherits_from = parent.inherited.identifier
+        self._ConvertExtendedAttributes(dest.extended_attributes, parent, None)
+        self._ConvertSourceLocation(dest.source_location, parent.debug_info)
+        for attr in parent.attributes:
+            self._ConvertIdlAttribute(dest.attributes.add(), attr, parent)
+        for op in parent.operations:
+            self._ConvertIdlOperation(dest.operations.add(), op, parent)
+        for constant in parent.constants:
+            self._ConvertIdlConstant(dest.constants.add(), constant, parent)
+
+    def _ConvertDictionaryMember(self, dest, member, interface):
         assert isinstance(member, web_idl.DictionaryMember)
         dest.name = member.identifier
-        self._ConvertExtendedAttributes(dest.extended_attributes, member)
+        self._ConvertExtendedAttributes(dest.extended_attributes, member,
+                                        interface)
         self._ConvertIdlType(dest.idl_type, member.idl_type)
+        self._ConvertSourceLocation(dest.source_location, member.debug_info)
 
     def _ConvertIdlDictionary(self, dest, dictionary):
         assert isinstance(dictionary, web_idl.Dictionary)
         dest.name = dictionary.identifier
+        self._ConvertSourceLocation(dest.source_location,
+                                    dictionary.debug_info)
         if dictionary.inherited:
             dest.inherits_from = dictionary.inherited.identifier
         for member in dictionary.members:
-            self._ConvertDictionaryMember(dest.members.add(), member)
+            self._ConvertDictionaryMember(dest.members.add(), member,
+                                          dictionary)
 
     def _ConvertIdlTypedef(self, dest, typedef):
         assert isinstance(typedef, web_idl.Typedef)
         dest.name = typedef.identifier
         self._ConvertIdlType(dest.idl_type, typedef.idl_type)
+
+    def _ConvertSourceLocation(self, dest, debug_info):
+        source_file = None
+        line_no = 0
+
+        if not debug_info or not hasattr(debug_info, 'all_locations'):
+            return
+
+        for loc in list(debug_info.all_locations):
+            if loc.filepath and loc.line_number:
+                source_file = loc.filepath
+                line_no = loc.line_number
+                break
+            if loc.filepath:
+                source_file = loc.filepath
+
+        if source_file:
+            dest.filename = source_file
+
+            dest.line = line_no
diff --git a/chromium/tools/privacy_budget/blink_apis/generate_blink_api_db.py b/chromium/tools/privacy_budget/blink_apis/generate_blink_api_db.py
index 3a44a4f721d..98a25a59eca 100755
--- a/chromium/tools/privacy_budget/blink_apis/generate_blink_api_db.py
+++ b/chromium/tools/privacy_budget/blink_apis/generate_blink_api_db.py
@@ -1,8 +1,22 @@
-#!/usr/bin/env python3
+#!/usr/bin/env vpython
 
 # Copyright 2020 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
+
+# [VPYTHON:BEGIN]
+# python_version: "2.7"
+# wheel: <
+#   name: "infra/python/wheels/protobuf-py2_py3"
+#   version: "version:3.13.0"
+# >
+#
+# wheel: <
+#   name: "infra/python/wheels/six-py2_py3"
+#   version: "version:1.11.0"
+# >
+#
+# [VPYTHON:END]
 """
 Generate a database of Blink APIs.
 
@@ -40,6 +54,9 @@ def parse_options():
     parser.add_argument("--web_idl_database",
                         type=str,
                         help="filepath of the input database")
+    parser.add_argument("--web_feature_mojom",
+                        type=str,
+                        help="path of web_feature.mojom")
     parser.add_argument("--output", type=str, help="filepath of output file")
     parser.add_argument("--path", type=str, help="Additions to sys.path")
     parser.add_argument(
@@ -48,7 +65,7 @@ def parse_options():
         help="Chromium revision (git hash) for the source of Blink WebIDL DB")
     args = parser.parse_args()
 
-    required_option_names = ("web_idl_database", "output")
+    required_option_names = ("web_idl_database", "output", "web_feature_mojom")
     for opt_name in required_option_names:
         if getattr(args, opt_name) is None:
             parser.error("--{} is a required option.".format(opt_name))
@@ -64,8 +81,10 @@ def main():
     args = parse_options()
 
     from blink_api_proto import BlinkApiProto
+    from web_feature import WebFeature
+    w = WebFeature(args.web_feature_mojom)
     p = BlinkApiProto(args.web_idl_database, args.output,
-                      args.chromium_revision)
+                      args.chromium_revision, w)
     p.Parse()
     p.WriteTo(args.output)
 
diff --git a/chromium/tools/privacy_budget/blink_apis/generate_blink_api_db_entrypoint.py b/chromium/tools/privacy_budget/blink_apis/generate_blink_api_db_entrypoint.py
new file mode 100755
index 00000000000..7e62f3aed27
--- /dev/null
+++ b/chromium/tools/privacy_budget/blink_apis/generate_blink_api_db_entrypoint.py
@@ -0,0 +1,15 @@
+#!/usr/bin/env python3
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+import subprocess
+import sys
+import os
+
+if __name__ == "__main__":
+  shell = (os.name == 'nt')
+  subprocess.call([
+      "vpython",
+      os.path.join(os.path.dirname(os.path.realpath(__file__)),
+                   "generate_blink_api_db.py")
+  ] + sys.argv[1:], shell=shell)
diff --git a/chromium/tools/privacy_budget/blink_apis/proto/blink_apis.proto b/chromium/tools/privacy_budget/blink_apis/proto/blink_apis.proto
index eda0404d881..cba0a516a64 100644
--- a/chromium/tools/privacy_budget/blink_apis/proto/blink_apis.proto
+++ b/chromium/tools/privacy_budget/blink_apis/proto/blink_apis.proto
@@ -40,6 +40,7 @@ enum HighEntropyType {
 //
 // The latter are described in:
 // https://chromium.googlesource.com/chromium/src/+/master/third_party/blink/renderer/bindings/IDLExtendedAttributes.md
+// Next ID: 13
 message ExtendedAttributes {
   // https://heycam.github.io/webidl/#CrossOriginIsolated
   bool cross_origin_isolated = 1;
@@ -50,8 +51,8 @@ message ExtendedAttributes {
   }
 
   // https://heycam.github.io/webidl/#Exposed
-  repeated Exposed exposed =
-      2;  // One value for each interface/partial interface/etc..
+  // One value for each interface/partial interface/etc..
+  repeated Exposed exposed = 2;
 
   // https://heycam.github.io/webidl/#Global
   bool global = 3;
@@ -74,6 +75,9 @@ message ExtendedAttributes {
   // https://chromium.googlesource.com/chromium/src/+/master/third_party/blink/renderer/bindings/IDLExtendedAttributes.md#measure_i_m_a_c
   string use_counter = 7;
 
+  // The numeric value of the Use Counter feature constant.
+  int64 use_counter_feature_value = 12;
+
   // Value of [RuntimeEnabled]
   // https://chromium.googlesource.com/chromium/src/+/master/third_party/blink/renderer/bindings/IDLExtendedAttributes.md#runtimeenabled_i_m_a_c
   // Empty or undefined string is equivalent to there not being
@@ -119,6 +123,8 @@ message InterfaceLike {
   repeated Attribute attributes = 4;
   repeated Operation operations = 5;
   repeated Constant constants = 6;
+
+  SourceLocation source_location = 30;
 }
 
 message IDLType {
@@ -162,9 +168,12 @@ message Dictionary {
     string name = 1;
     ExtendedAttributes extended_attributes = 2;
     IDLType idl_type = 3;
+    SourceLocation source_location = 30;
   }
 
   repeated Member members = 7;
+
+  SourceLocation source_location = 30;
 }
 
 // Special operation types.
@@ -193,6 +202,8 @@ message Operation {
   // The following fields are only applicable to special operations.
   // https://heycam.github.io/webidl/#dfn-special-operation
   SpecialOperationType special_op_type = 5;
+
+  SourceLocation source_location = 30;
 }
 
 // An interface member or a namespace member declaring a data field.
@@ -203,6 +214,8 @@ message Attribute {
   IDLType idl_type = 3;
   bool is_static = 4;
   bool is_readonly = 5;
+
+  SourceLocation source_location = 30;
 }
 
 // A declaration binding a value to a name.
@@ -216,6 +229,8 @@ message Constant {
   // `type`. There should be no expectation that this representation is
   // unambiguously parsable. It's intended solely for human consumption.
   string value = 4;
+
+  SourceLocation source_location = 30;
 }
 
 // Defines a type who's valid values are a set of strings.
@@ -225,6 +240,8 @@ message Enumeration {
 
   // Enum values are strings.
   repeated string values = 2;
+
+  SourceLocation source_location = 30;
 }
 
 // Declares a new name for a type.
@@ -233,4 +250,15 @@ message Enumeration {
 message Typedef {
   string name = 1;
   IDLType idl_type = 2;
+
+  SourceLocation source_location = 30;
+}
+
+message SourceLocation {
+  // Relative to the root of the Chromium source tree. So pretty much all
+  // strings start with 'third_party/blink/...'
+  string filename = 1;
+
+  // 1-based line number. 0 means there's no line-number information.
+  int32 line = 2;
 }
diff --git a/chromium/tools/privacy_budget/blink_apis/web_feature.py b/chromium/tools/privacy_budget/blink_apis/web_feature.py
new file mode 100644
index 00000000000..249a5ec6659
--- /dev/null
+++ b/chromium/tools/privacy_budget/blink_apis/web_feature.py
@@ -0,0 +1,29 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import os
+import re
+
+
+class WebFeature(object):
+    def __init__(self, web_feature_path):
+        assert os.path.isfile(
+            web_feature_path), "%s not found" % (web_feature_path)
+
+        const_def = re.compile(r'\s*k(\w*)\s*=\s*(\d*)\s*,.*')
+
+        self.features = {}
+
+        with open(web_feature_path, 'r') as f:
+            for line in f.readlines():
+                match = const_def.match(line)
+                if match:
+                    self.features[match.group(1)] = int(match.group(2))
+
+    def __contains__(self, val):
+        return val in self.features
+
+    def __getitem__(self, val):
+        assert val in self, "%s not in mojom" % (val)
+        return self.features[val]
diff --git a/chromium/tools/privacy_budget/font_indexer/font_indexer.cc b/chromium/tools/privacy_budget/font_indexer/font_indexer.cc
index e1f983b9c9f..0d23f2d75b6 100644
--- a/chromium/tools/privacy_budget/font_indexer/font_indexer.cc
+++ b/chromium/tools/privacy_budget/font_indexer/font_indexer.cc
@@ -11,8 +11,10 @@
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "content/public/browser/font_list_async.h"
+#include "third_party/blink/public/common/privacy_budget/identifiable_token_builder.h"
 #include "third_party/blink/renderer/platform/fonts/font_global_context.h"
 #include "third_party/blink/renderer/platform/fonts/simple_font_data.h"
+#include "third_party/blink/renderer/platform/privacy_budget/identifiability_digest_helpers.h"
 #include "third_party/blink/renderer/platform/wtf/hash_set.h"
 
 namespace privacy_budget {
@@ -80,8 +82,9 @@ const std::pair<blink::FontSelectionValue, std::string>
 };
 
 const char kOutputHeader[] =
-    "Family name\tPostScript name\tweight\twidth\tslope\tdigest "
-    "(int64_t)\tdigest (uint64_t)";
+    "Family name\tPostScript name\tweight\twidth\tslope\ttypeface "
+    "digest\tdefault family name lookup digest\tdefault PostScript name lookup "
+    "digest\tPostScript name string digest";
 const char kOutputSeparator[] = "\t";
 
 FontIndexer::FontIndexer() : font_cache_(blink::FontCache::GetFontCache()) {}
@@ -234,18 +237,52 @@ void FontIndexer::PrintAllFontsWithName(WTF::AtomicString name) {
 
         if (scoped_refptr<blink::SimpleFontData> font_data =
                 font_cache_->GetFontData(font_description, name)) {
-          int64_t digest =
+          uint64_t typeface_digest =
               blink::FontGlobalContext::Get()
                   ->GetOrComputeTypefaceDigest(font_data->PlatformData())
                   .ToUkmMetricValue();
-          if (set_of_digests.insert(digest).is_new_entry) {
+          if (set_of_digests.insert(typeface_digest).is_new_entry) {
+            WTF::String postscript_name =
+                font_data->PlatformData().GetPostScriptName();
+
+            // Matches behavior in FontMatchingMetrics for lookups using the
+            // family name and the PostScript name, respectively, with default
+            // FontSelectionRequests.
+            uint64_t default_family_name_lookup_digest;
+            {
+              blink::IdentifiableTokenBuilder builder;
+              builder.AddValue(
+                  blink::FontDescription().GetFontSelectionRequest().GetHash());
+              builder.AddToken(
+                  blink::IdentifiabilityBenignCaseFoldingStringToken(name));
+              default_family_name_lookup_digest =
+                  builder.GetToken().ToUkmMetricValue();
+            }
+            uint64_t default_postscript_name_lookup_digest;
+            {
+              blink::IdentifiableTokenBuilder builder;
+              builder.AddValue(
+                  blink::FontDescription().GetFontSelectionRequest().GetHash());
+              builder.AddToken(
+                  blink::IdentifiabilityBenignCaseFoldingStringToken(
+                      postscript_name));
+              default_postscript_name_lookup_digest =
+                  builder.GetToken().ToUkmMetricValue();
+            }
+            uint64_t postscript_name_string_digest =
+                blink::IdentifiabilityBenignStringToken(postscript_name)
+                    .ToUkmMetricValue();
+
             std::cout << name.Ascii() << kOutputSeparator
-                      << font_data->PlatformData().GetPostScriptName().Ascii()
-                      << kOutputSeparator << weight_pair.second
-                      << kOutputSeparator << width_pair.second
-                      << kOutputSeparator << slope_pair.second
-                      << kOutputSeparator << digest << kOutputSeparator
-                      << static_cast<uint64_t>(digest) << std::endl;
+                      << postscript_name.Ascii() << kOutputSeparator
+                      << weight_pair.second << kOutputSeparator
+                      << width_pair.second << kOutputSeparator
+                      << slope_pair.second << kOutputSeparator
+                      << typeface_digest << kOutputSeparator
+                      << default_family_name_lookup_digest << kOutputSeparator
+                      << default_postscript_name_lookup_digest
+                      << kOutputSeparator << postscript_name_string_digest
+                      << std::endl;
           }
         }
       }
diff --git a/chromium/tools/protoc_wrapper/protoc_wrapper.py b/chromium/tools/protoc_wrapper/protoc_wrapper.py
index 27fe2caed4f..f7f18a826f7 100755
--- a/chromium/tools/protoc_wrapper/protoc_wrapper.py
+++ b/chromium/tools/protoc_wrapper/protoc_wrapper.py
@@ -108,6 +108,14 @@ def main(argv):
   parser.add_argument(
       "--descriptor-set-dependency-file",
       help="Path to write the dependency file for descriptor set.")
+  # The meaning of this flag is flipped compared to the corresponding protoc
+  # flag due to this script previously passing --include_imports. Removing the
+  # --include_imports is likely to have unintended consequences.
+  parser.add_argument(
+      "--exclude-imports",
+      help="Do not include imported files into generated descriptor.",
+      action="store_true",
+      default=False)
   parser.add_argument("protos", nargs="+",
                       help="Input protobuf definition file(s).")
 
@@ -164,15 +172,16 @@ def main(argv):
 
   if options.descriptor_set_out:
     protoc_cmd += ["--descriptor_set_out", options.descriptor_set_out]
-    protoc_cmd += ["--include_imports"]
+    if not options.exclude_imports:
+      protoc_cmd += ["--include_imports"]
 
   dependency_file_data = None
   if options.descriptor_set_out and options.descriptor_set_dependency_file:
-      protoc_cmd += ['--dependency_out', options.descriptor_set_dependency_file]
-      ret = subprocess.call(protoc_cmd)
+    protoc_cmd += ['--dependency_out', options.descriptor_set_dependency_file]
+    ret = subprocess.call(protoc_cmd)
 
-      with open(options.descriptor_set_dependency_file, 'r') as f:
-        dependency_file_data = f.read().decode('utf-8')
+    with open(options.descriptor_set_dependency_file, 'r') as f:
+      dependency_file_data = f.read().decode('utf-8')
 
   ret = subprocess.call(protoc_cmd)
   if ret != 0:
diff --git a/chromium/tools/python/google/path_utils.py b/chromium/tools/python/google/path_utils.py
index 6ab43120434..293505160ef 100644
--- a/chromium/tools/python/google/path_utils.py
+++ b/chromium/tools/python/google/path_utils.py
@@ -78,7 +78,7 @@ def MaybeMakeDirectory(*path):
   file_path = os.path.join(*path)
   try:
     os.makedirs(file_path)
-  except OSError, e:
+  except OSError as e:
     # errno.EEXIST is "File exists".  If we see another error, re-raise.
     if e.errno != errno.EEXIST:
       raise
diff --git a/chromium/tools/resources/generate_resource_allowlist.py b/chromium/tools/resources/generate_resource_allowlist.py
index 7747beea560..bafa4a0a8ba 100755
--- a/chromium/tools/resources/generate_resource_allowlist.py
+++ b/chromium/tools/resources/generate_resource_allowlist.py
@@ -28,29 +28,26 @@ llvm_bindir = os.path.join(os.path.dirname(sys.argv[0]), '..', '..',
                            'bin')
 
 
+def ExtractAllowlistFromFile(path, resource_ids):
+  with open(path, 'rb') as f:
+    data = f.read()
+  prefix = b'AllowlistedResource<'
+  start_idx = 0
+  while start_idx != -1:
+    start_idx = data.find(prefix, start_idx)
+    if start_idx != -1:
+      end_idx = data.find(b'>', start_idx)
+      resource_ids.add(int(data[start_idx + len(prefix):end_idx]))
+      start_idx = end_idx
+
+
 def GetResourceAllowlistELF(path):
   # Produce a resource allowlist by searching for debug info referring to
-  # AllowlistedResource. It's sufficient to look for strings in .debug_str
-  # rather than trying to parse all of the debug info.
-  readelf = subprocess.Popen(['readelf', '-p', '.debug_str', path],
-                             stdout=subprocess.PIPE)
+  # AllowlistedResource.
+  # This used to use "readelf -p .debug_str", but it doesn't seem to work with
+  # use_debug_fission=true. Reading the raw file is faster anyways.
   resource_ids = set()
-  for line in readelf.stdout:
-    # Read a line of the form "  [   123]  AllowlistedResource<456>". We're
-    # only interested in the string, not the offset. We're also not interested
-    # in header lines.
-    split = line.split(']', 1)
-    if len(split) < 2:
-      continue
-    s = split[1][2:]
-    if s.startswith('AllowlistedResource<'):
-      try:
-        resource_ids.add(int(s[len('AllowlistedResource<'):-len('>') - 1]))
-      except ValueError:
-        continue
-  exit_code = readelf.wait()
-  if exit_code != 0:
-    raise Exception('readelf exited with exit code %d' % exit_code)
+  ExtractAllowlistFromFile(path, resource_ids)
   return resource_ids
 
 
@@ -111,17 +108,8 @@ def GetResourceAllowlistFileList(file_list_path):
   paths = ar.ExpandThinArchives(paths)
 
   resource_ids = set()
-  prefix = 'AllowlistedResource<'
   for p in paths:
-    with open(p) as f:
-      data = f.read()
-    start_idx = 0
-    while start_idx != -1:
-      start_idx = data.find(prefix, start_idx)
-      if start_idx != -1:
-        end_idx = data.find('>', start_idx)
-        resource_ids.add(int(data[start_idx + len(prefix):end_idx]))
-        start_idx = end_idx
+    ExtractAllowlistFromFile(p, resource_ids)
   return resource_ids
 
 
diff --git a/chromium/tools/resultdb/DIR_METADATA b/chromium/tools/resultdb/DIR_METADATA
new file mode 100644
index 00000000000..cbad6f6b22d
--- /dev/null
+++ b/chromium/tools/resultdb/DIR_METADATA
@@ -0,0 +1,11 @@
+# Metadata information for this directory.
+#
+# For more information on DIR_METADATA files, see:
+#   https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/tools/dirmd/README.md
+#
+# For the schema of this file, see Metadata message:
+#   https://source.chromium.org/chromium/infra/infra/+/master:go/src/infra/tools/dirmd/proto/dir_metadata.proto
+
+monorail {
+  component: "Infra>Test>Results"
+}
diff --git a/chromium/tools/resultdb/OWNERS b/chromium/tools/resultdb/OWNERS
new file mode 100644
index 00000000000..e5677cc141e
--- /dev/null
+++ b/chromium/tools/resultdb/OWNERS
@@ -0,0 +1,3 @@
+chanli@chromium.org
+ddoman@chromium.org
+robertocn@chromium.org
diff --git a/chromium/tools/resultdb/README.md b/chromium/tools/resultdb/README.md
new file mode 100644
index 00000000000..a4e7885b104
--- /dev/null
+++ b/chromium/tools/resultdb/README.md
@@ -0,0 +1,3 @@
+# resultdb
+
+Contains executable for streaming TestResults via go/result-sink
diff --git a/chromium/tools/run-swarmed.py b/chromium/tools/run-swarmed.py
index adabefbf1d7..371f3684e9e 100755
--- a/chromium/tools/run-swarmed.py
+++ b/chromium/tools/run-swarmed.py
@@ -41,26 +41,24 @@ def _Spawn(args):
   """Triggers a swarming job. The arguments passed are:
   - The index of the job;
   - The command line arguments object;
-  - The hash of the isolate job used to trigger.
+  - The digest of test files.
 
   The return value is passed to a collect-style map() and consists of:
   - The index of the job;
   - The json file created by triggering and used to collect results;
   - The command line arguments object.
   """
-  index, args, isolated_hash, swarming_command = args
+  index, args, cas_digest, swarming_command = args
   json_file = os.path.join(args.results, '%d.json' % index)
   trigger_args = [
       'tools/luci-go/swarming',
       'trigger',
       '-S',
       'https://chromium-swarm.appspot.com',
-      '-I',
-      'https://isolateserver.appspot.com',
       '-d',
       'pool=' + args.pool,
-      '-s',
-      isolated_hash,
+      '-digest',
+      cas_digest,
       '-dump-json',
       json_file,
       '-d',
@@ -110,7 +108,7 @@ def _Spawn(args):
     if os.path.isfile(filter_file):
       runner_args.append('--test-launcher-filter-file=../../' + filter_file)
 
-  trigger_args.extend(['--relative-cwd', args.out_dir, '--raw-cmd', '--'])
+  trigger_args.extend(['--relative-cwd', args.out_dir, '--'])
   trigger_args.extend(swarming_command)
   trigger_args.extend(runner_args)
 
@@ -157,10 +155,14 @@ def main():
   parser.add_argument('--target-os', default='detect', help='gn target_os')
   parser.add_argument('--arch', '-a', default='detect',
                       help='CPU architecture of the test binary.')
-  parser.add_argument('--build', dest='build', action='store_true',
-                      help='Build before isolating (default).')
-  parser.add_argument( '--no-build', dest='build', action='store_false',
-                      help='Do not build, just isolate.')
+  parser.add_argument('--build',
+                      dest='build',
+                      action='store_true',
+                      help='Build before isolating.')
+  parser.add_argument('--no-build',
+                      dest='build',
+                      action='store_false',
+                      help='Do not build, just isolate (default).')
   parser.add_argument('--isolate-map-file', '-i',
                       help='path to isolate map file if not using default')
   parser.add_argument('--copies', '-n', type=int, default=1,
@@ -240,14 +242,14 @@ def main():
   )
 
   print('Uploading to isolate server, this can take a while...')
-  isolated = os.path.join(args.out_dir, args.target_name + '.isolated')
+  isolate = os.path.join(args.out_dir, args.target_name + '.isolate')
+  archive_json = os.path.join(args.out_dir, args.target_name + '.archive.json')
   subprocess.check_output([
-      'tools/luci-go/isolate', 'archive', '-I',
-      'https://isolateserver.appspot.com', '-i',
-      os.path.join(args.out_dir, args.target_name + '.isolate'), '-s', isolated
+      'tools/luci-go/isolate', 'archive', '-cas-instance', 'chromium-swarm',
+      '-isolate', isolate, '-dump-json', archive_json
   ])
-  with open(isolated) as f:
-    isolated_hash = hashlib.sha1(f.read()).hexdigest()
+  with open(archive_json) as f:
+    cas_digest = json.load(f).get(args.target_name)
 
   mb_cmd = [
       sys.executable, 'tools/mb/mb.py', 'get-swarming-command', '--as-list'
@@ -268,7 +270,7 @@ def main():
     # Use dummy since threadpools give better exception messages
     # than process pools do, and threads work fine for what we're doing.
     pool = multiprocessing.dummy.Pool()
-    spawn_args = map(lambda i: (i, args, isolated_hash, swarming_cmd),
+    spawn_args = map(lambda i: (i, args, cas_digest, swarming_cmd),
                      range(args.copies))
     spawn_results = pool.imap_unordered(_Spawn, spawn_args)
 
diff --git a/chromium/tools/style_variable_generator/PRESUBMIT.py b/chromium/tools/style_variable_generator/PRESUBMIT.py
index 15ae508583e..1b0d0ba5549 100644
--- a/chromium/tools/style_variable_generator/PRESUBMIT.py
+++ b/chromium/tools/style_variable_generator/PRESUBMIT.py
@@ -7,7 +7,7 @@ See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
 for more details about the presubmit API built into depot_tools.
 """
 
-TEST_ALLOWLIST = [r'.+_test.py$']
+TEST_PATTERNS = [r'.+_test.py$']
 STYLE_VAR_GEN_INPUTS = [
     r'^tools[\\\/]style_variable_generator[\\\/].+\.json5$'
 ]
@@ -15,7 +15,7 @@ STYLE_VAR_GEN_INPUTS = [
 
 def _CommonChecks(input_api, output_api):
     results = input_api.canned_checks.RunUnitTestsInDirectory(
-        input_api, output_api, '.', allowlist=TEST_ALLOWLIST)
+        input_api, output_api, '.', files_to_check=TEST_PATTERNS)
     try:
         import sys
         old_sys_path = sys.path[:]
diff --git a/chromium/tools/style_variable_generator/additional_colors_test.json5 b/chromium/tools/style_variable_generator/additional_colors_test.json5
new file mode 100644
index 00000000000..54341cdbcac
--- /dev/null
+++ b/chromium/tools/style_variable_generator/additional_colors_test.json5
@@ -0,0 +1,17 @@
+{
+  options: {
+    CSS: {
+      prefix: 'cros',
+    },
+    proto: {
+      field_name: 'test_colors',
+      field_id: 2,
+    },
+  },
+  colors: {
+    text_color: {
+      light: '$black',
+      dark: '$white',
+    },
+  },
+}
diff --git a/chromium/tools/style_variable_generator/base_generator.py b/chromium/tools/style_variable_generator/base_generator.py
index 8631beae8e1..d4375ccdc3c 100644
--- a/chromium/tools/style_variable_generator/base_generator.py
+++ b/chromium/tools/style_variable_generator/base_generator.py
@@ -9,6 +9,7 @@ import re
 import textwrap
 import path_overrides
 from color import Color
+import copy
 
 _FILE_PATH = os.path.dirname(os.path.realpath(__file__))
 
@@ -33,29 +34,53 @@ class VariableType:
     OPACITY = 'opacity'
 
 
-class ModeVariables:
-    '''A dictionary of variable names to their values in each mode.
-       e.g mode_variables['blue'][Modes.LIGHT] = Color(...)
+class ColorModel:
+    '''A dictionary of color names to their values in each mode.
+       e.g ColorModel['blue'][Modes.LIGHT] = Color(...)
     '''
 
-    def __init__(self, default_mode):
+    def __init__(self, default_mode, opacity_model):
         self.variables = collections.OrderedDict()
         self._default_mode = default_mode
+        self.opacity_model = opacity_model
 
     def Add(self, mode, name, value):
         if name not in self.variables:
             self.variables[name] = {}
         self.variables[name][mode] = value
 
-    # Returns the value that |name| will have in |mode|. Resolves to the default
-    # mode's value if the a value for |mode| isn't specified. Always returns a
-    # value.
+    # Returns the Color that |name| will have in |mode|. Resolves to the default
+    # mode's Color if the a Color for |mode| isn't specified. Always returns a
+    # Color.
     def Resolve(self, name, mode):
         if mode in self.variables[name]:
             return self.variables[name][mode]
 
         return self.variables[name][self._default_mode]
 
+    # Returns a value from 0-1 representing the final opacity of |color|.
+    def ResolveOpacity(self, color):
+        if color.a != -1:
+            return color.a
+
+        assert (color.opacity_var)
+        return self.opacity_model[color.opacity_var]
+
+    # Returns a Color that is the final RGBA value for |name| in |mode|.
+    def ResolveToRGBA(self, name, mode):
+        c = self.Resolve(name, mode)
+        if c.var:
+            return self.ResolveToRGBA(c.var, mode)
+        result = Color()
+        result.a = self.ResolveOpacity(c)
+
+        rgb = c
+        if c.rgb_var:
+            rgb = self.ResolveToRGBA(c.RGBVarToVar(), mode)
+
+        (result.r, result.g, result.b) = (rgb.r, rgb.g, rgb.b)
+        return result
+
     def keys(self):
         return self.variables.keys()
 
@@ -90,12 +115,14 @@ class BaseGenerator:
         # not specified in the default mode.
         self._default_mode = Modes.LIGHT
 
-        # A dictionary of |VariableType| to dictionaries of variable names to
-        # values. May point to a ModeVariables instance which further adds a
-        # layer making the structure name -> mode -> value.
+        opacity_model = collections.OrderedDict()
+        color_model = ColorModel(self._default_mode, opacity_model)
+
+        # A dictionary of |VariableType| to models containing mappings of
+        # variable names to values.
         self.model = {
-            VariableType.COLOR: ModeVariables(self._default_mode),
-            VariableType.OPACITY: ModeVariables(self._default_mode),
+            VariableType.COLOR: color_model,
+            VariableType.OPACITY: opacity_model,
         }
 
         # A dictionary of variable names to objects containing information about
@@ -109,6 +136,9 @@ class BaseGenerator:
             raise ValueError('Variable name "%s" is reused' % name)
         self.context_map[name] = context or {}
 
+    def GetContextKey(self):
+        return self.GetName()
+
     def AddColor(self, name, value_obj, context=None):
         self._SetVariableContext(name, context)
         try:
@@ -126,6 +156,13 @@ class BaseGenerator:
         except ValueError as err:
             raise ValueError('Error parsing color "%s": %s' % (value_obj, err))
 
+    def AddOpacity(self, name, value_obj, context=None):
+        self._SetVariableContext(name, context)
+        if not isinstance(value_obj, float) and value_obj.startswith('$'):
+            raise ValueError('Opacities cannot point to other opacities. '
+                             'File a bug if this would be useful for you.')
+        self.model[VariableType.OPACITY][name] = float(value_obj)
+
     def AddJSONFileToModel(self, path):
         try:
             with open(path, 'r') as f:
@@ -146,10 +183,11 @@ class BaseGenerator:
                            object_pairs_hook=collections.OrderedDict)
         # Use the generator's name to get the generator-specific context from
         # the input.
-        generator_context = data.get('options', {}).get(self.GetName(), None)
+        generator_context = data.get('options',
+                                     {}).get(self.GetContextKey(), None)
         self.in_file_to_context[in_file] = generator_context
 
-        for name, value in data['colors'].items():
+        for name, value in data.get('colors', {}).items():
             if not re.match('^[a-z0-9_]+$', name):
                 raise ValueError(
                     '%s is not a valid variable name (lower case, 0-9, _)' %
@@ -157,6 +195,14 @@ class BaseGenerator:
 
             self.AddColor(name, value, generator_context)
 
+        for name, value in data.get('opacities', {}).items():
+            if not re.match('^[a-z0-9_]+_opacity$', name):
+                raise ValueError(
+                    name + ' is not a valid opacity name ' +
+                    '(lower case, 0-9, _, must end with _opacity)')
+
+            self.AddOpacity(name, value, generator_context)
+
         return generator_context
 
     def ApplyTemplate(self, style_generator, path_to_template, params):
@@ -172,6 +218,7 @@ class BaseGenerator:
 
     def Validate(self):
         colors = self.model[VariableType.COLOR]
+        opacities = self.model[VariableType.OPACITY]
 
         def CheckColorInDefaultMode(name):
             if (name not in colors.variables
@@ -188,6 +235,9 @@ class BaseGenerator:
                     CheckColorInDefaultMode(value.var)
                 if value.rgb_var:
                     CheckColorInDefaultMode(value.RGBVarToVar())
+                if value.opacity_var and value.opacity_var not in opacities:
+                    raise ValueError("Opacity '%s' not defined" %
+                                 value.opacity_var)
 
         # TODO(calamity): Check for circular references.
 
diff --git a/chromium/tools/style_variable_generator/base_generator_test.py b/chromium/tools/style_variable_generator/base_generator_test.py
index 693b3932dde..3e1ddfa86a8 100644
--- a/chromium/tools/style_variable_generator/base_generator_test.py
+++ b/chromium/tools/style_variable_generator/base_generator_test.py
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from base_generator import BaseGenerator
+from base_generator import BaseGenerator, VariableType, Modes
 import unittest
 
 
@@ -10,6 +10,10 @@ class BaseGeneratorTest(unittest.TestCase):
     def setUp(self):
         self.generator = BaseGenerator()
 
+    def ResolveRGBA(self, name, mode=Modes.LIGHT):
+        return repr(
+            self.generator.model[VariableType.COLOR].ResolveToRGBA(name, mode))
+
     def testMissingColor(self):
         # google_grey_900 is missing.
         self.generator.AddJSONToModel('''
@@ -66,6 +70,79 @@ class BaseGeneratorTest(unittest.TestCase):
 }
         ''')
 
+    def testBadNames(self):
+        # Add a bad color name.
+        self.assertRaises(
+            ValueError, self.generator.AddJSONToModel, '''
+{
+  colors: {
+    Google+grey: { dark: "rgb(255, 255, 255)", }
+  }
+}
+        ''')
+        # Add a bad opacity name.
+        self.assertRaises(
+            ValueError, self.generator.AddJSONToModel, '''
+{
+  opacities: {
+    disabled_things: 0.4,
+  }
+}
+        ''')
+
+    def testSimpleOpacity(self):
+        # Reference a missing opacity.
+        self.generator.AddJSONToModel('''
+{
+  colors: {
+    google_grey_900: "rgba(255, 255, 255, $disabled_opacity)",
+  },
+  opacities: {
+    disabled_opacity: 0.5,
+  },
+}
+        ''')
+
+        self.assertEqual(self.ResolveRGBA('google_grey_900'),
+                         'rgba(255, 255, 255, 0.5)')
+
+        self.generator.Validate()
+
+    def testReferenceOpacity(self):
+        # Add a reference opacity.
+        self.assertRaises(
+            ValueError, self.generator.AddJSONToModel, '''
+{
+  opacities: {
+    disabled_opacity: "$another_opacity",
+    another_opacity: 0.5,
+  },
+}
+        ''')
+
+    def testMissingOpacity(self):
+        # Reference a missing opacity.
+        self.generator.AddJSONToModel('''
+{
+  colors: {
+    google_grey_900: "rgba(255, 255, 255, $missing_opacity)",
+  },
+  opacities: {
+    disabled_opacity: 0.5,
+  },
+}
+        ''')
+        self.assertRaises(ValueError, self.generator.Validate)
+
+        self.generator.AddJSONToModel('''
+{
+  opacities: {
+    missing_opacity: 0.5,
+  },
+}
+        ''')
+        self.generator.Validate()
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/chromium/tools/style_variable_generator/color.py b/chromium/tools/style_variable_generator/color.py
index 0414482b5c6..b5f7930ce7f 100644
--- a/chromium/tools/style_variable_generator/color.py
+++ b/chromium/tools/style_variable_generator/color.py
@@ -13,23 +13,28 @@ class Color:
     - #RRGGBB
     - rgb(r, g, b)
     - rgba(r, g, b, a)
+    - rgba(r, g, b, $named_opacity)
     - $other_color
     - rgb($other_color_rgb)
     - rgba($other_color_rgb, a)
+    - rgba($other_color_rgb, $named_opacity)
 
     NB: The color components that refer to other colors' RGB values must end
     with '_rgb'.
     '''
 
-    def __init__(self, value_str):
-        # TODO(calamity): Add opacity-only values
+    def __init__(self, value_str=None):
         self.var = None
         self.rgb_var = None
-        self.r = 0
-        self.g = 0
-        self.b = 0
-        self.a = 1
-        self.Parse(value_str)
+        self.opacity_var = None
+        self.r = -1
+        self.g = -1
+        self.b = -1
+        self.a = -1
+        if value_str is not None:
+            self.Parse(value_str)
+            if not self.var and not self.opacity_var and self.a == -1:
+                raise ValueError(repr(self))
 
     def _AssignRGB(self, rgb):
         for v in rgb:
@@ -38,14 +43,34 @@ class Color:
 
         (self.r, self.g, self.b) = rgb
 
+    # Attempts to parse special variables, returns True if successful.
+    def _ParseWhiteBlack(self, var):
+        if var == 'white':
+            self._AssignRGB([255, 255, 255])
+            return True
+
+        if var == 'black':
+            self._AssignRGB([0, 0, 0])
+            return True
+
+        return False
+
     def _ParseRGBRef(self, rgb_ref):
-        match = re.match('^\$([a-z0-9_]+_rgb)$', rgb_ref)
+        match = re.match('^\$([a-z0-9_]+)_rgb$', rgb_ref)
         if not match:
             raise ValueError('Expected a reference to an RGB variable')
 
-        self.rgb_var = match.group(1)
+        rgb_var = match.group(1)
+
+        if not self._ParseWhiteBlack(rgb_var):
+            self.rgb_var = rgb_var + '_rgb'
 
     def _ParseAlpha(self, alpha_value):
+        match = re.match('^\$([a-z0-9_]+_opacity)$', alpha_value)
+        if match:
+            self.opacity_var = match.group(1)
+            return
+
         self.a = float(alpha_value)
         if not (0 <= self.a <= 1):
             raise ValueError('Alpha expected to be between 0 and 1')
@@ -65,6 +90,7 @@ class Color:
                 raise ValueError('Expected #RRGGBB')
 
             self._AssignRGB([int(x, 16) for x in textwrap.wrap(value, 2)])
+            self.a = 1
 
             return True
 
@@ -73,6 +99,8 @@ class Color:
             if not match:
                 return False
 
+            self.a = 1
+
             values = match.group(1).split(',')
             if len(values) == 1:
                 self._ParseRGBRef(values[0])
@@ -90,7 +118,7 @@ class Color:
             if not match:
                 return False
 
-            values = match.group(1).split(',')
+            values = [x.strip() for x in match.group(1).split(',')]
             if len(values) == 2:
                 self._ParseRGBRef(values[0])
                 self._ParseAlpha(values[1])
@@ -105,15 +133,21 @@ class Color:
                              '1 reference + alpha, or 3 ints + alpha')
 
         def ParseVariableReference(value):
-            match = re.match('^\$(.*)$', value)
+            match = re.match('^\$([\w\d_]+)$', value)
             if not match:
                 return False
 
+            var = match.group(1)
+
+            if self._ParseWhiteBlack(var):
+                self.a = 1
+                return True
+
             if value.endswith('_rgb'):
                 raise ValueError(
                     'color reference cannot resolve to an rgb reference')
 
-            self.var = match.group(1)
+            self.var = var
             return True
 
         parsers = [
@@ -133,10 +167,12 @@ class Color:
             raise ValueError('Malformed color value')
 
     def __repr__(self):
+        a = self.opacity_var if self.opacity_var else '%g' % self.a
+
         if self.var:
             return 'var(--%s)' % self.var
 
         if self.rgb_var:
-            return 'rgba(var(--%s), %g)' % (self.rgb_var, self.a)
+            return 'rgba(var(--%s), %s)' % (self.rgb_var, a)
 
-        return 'rgba(%d, %d, %d, %g)' % (self.r, self.g, self.b, self.a)
+        return 'rgba(%d, %d, %d, %s)' % (self.r, self.g, self.b, a)
diff --git a/chromium/tools/style_variable_generator/color_test.py b/chromium/tools/style_variable_generator/color_test.py
index 6860079ccb5..0300b1a7ddc 100644
--- a/chromium/tools/style_variable_generator/color_test.py
+++ b/chromium/tools/style_variable_generator/color_test.py
@@ -40,6 +40,19 @@ class ColorTest(unittest.TestCase):
         c = Color('$some_color')
         self.assertEqual(c.var, 'some_color')
 
+    def testWhiteBlackColor(self):
+        c = Color('$white')
+        self.assertEqual((c.r, c.g, c.b, c.a), (255, 255, 255, 1))
+
+        c = Color('rgba($white_rgb, 0.5)')
+        self.assertEqual((c.r, c.g, c.b, c.a), (255, 255, 255, 0.5))
+
+        c = Color('$black')
+        self.assertEqual((c.r, c.g, c.b, c.a), (0, 0, 0, 1))
+
+        c = Color('rgba($black_rgb, 0.5)')
+        self.assertEqual((c.r, c.g, c.b, c.a), (0, 0, 0, 0.5))
+
     def testMalformedColors(self):
         with self.assertRaises(ValueError):
             # #RRGGBBAA not supported.
@@ -75,6 +88,14 @@ class ColorTest(unittest.TestCase):
             # Color reference points to rgb reference.
             Color('$some_color_rgb')
 
+        with self.assertRaises(ValueError):
+            # Variable reference with accidental space.
+            print(Color('$some_color_rgb '))
+
+        with self.assertRaises(ValueError):
+            # Variable reference with accidental space.
+            Color('rgba($non_ rgb_var, 0.4)')
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/chromium/tools/style_variable_generator/colors_test.json5 b/chromium/tools/style_variable_generator/colors_test.json5
index 948ac1ed50f..a78e009242d 100644
--- a/chromium/tools/style_variable_generator/colors_test.json5
+++ b/chromium/tools/style_variable_generator/colors_test.json5
@@ -2,15 +2,23 @@
   options: {
     CSS: {
       prefix: 'cros'
-    }
+    },
+    proto: {
+      field_name: 'test_colors',
+      field_id: 2,
+    },
   },
   colors: {
     text_color_primary: {
       light: "$google_grey_900",
-      dark: "rgb(255, 255, 255)",
+      dark: "$white",
     },
     toggle_color: {
-      light: "rgba($text_color_primary_rgb, 0.1)"
+      light: "rgba($text_color_primary_rgb, 0.1)",
+      dark: "rgba($text_color_primary_rgb, $disabled_opacity)",
     }
   },
+  opacities: {
+    disabled_opacity: 0.38,
+  },
 }
diff --git a/chromium/tools/style_variable_generator/colors_test_expected.css b/chromium/tools/style_variable_generator/colors_test_expected.css
index bf4867af364..0e1d10d1364 100644
--- a/chromium/tools/style_variable_generator/colors_test_expected.css
+++ b/chromium/tools/style_variable_generator/colors_test_expected.css
@@ -17,6 +17,7 @@ html:not(body) {
   --cros-toggle-color-rgb: var(--cros-text-color-primary-rgb);
   --cros-toggle-color: rgba(var(--cros-toggle-color-rgb), 0.1);
 
+  --cros-disabled-opacity: 0.38;
 }
 
 @media (prefers-color-scheme: dark) {
@@ -24,5 +25,8 @@ html:not(body) {
     --cros-text-color-primary-rgb: 255, 255, 255;
     --cros-text-color-primary: rgb(var(--cros-text-color-primary-rgb));
 
+    --cros-toggle-color-rgb: var(--cros-text-color-primary-rgb);
+    --cros-toggle-color: rgba(var(--cros-toggle-color-rgb), var(--cros-disabled-opacity));
+
   }
 }
diff --git a/chromium/tools/style_variable_generator/colors_test_expected.h b/chromium/tools/style_variable_generator/colors_test_expected.h
index d55489a85ea..0d8b8c6bcf8 100644
--- a/chromium/tools/style_variable_generator/colors_test_expected.h
+++ b/chromium/tools/style_variable_generator/colors_test_expected.h
@@ -17,6 +17,17 @@ enum class ColorName {
   kToggleColor,
 };
 
+enum class OpacityName {
+  kDisabledOpacity,
+};
+
+constexpr SkAlpha GetOpacity(OpacityName opacity_name) {
+  switch (opacity_name) {
+    case OpacityName::kDisabledOpacity:
+      return 0x60;
+  }
+}
+
 constexpr SkColor ResolveColor(ColorName color_name, bool is_dark_mode) {
   switch (color_name) {
     case ColorName::kGoogleGrey900:
@@ -28,7 +39,11 @@ constexpr SkColor ResolveColor(ColorName color_name, bool is_dark_mode) {
         return ResolveColor(ColorName::kGoogleGrey900, is_dark_mode);
       }
     case ColorName::kToggleColor:
-      return SkColorSetA(ResolveColor(ColorName::kTextColorPrimary, is_dark_mode), 0x19);
+      if (is_dark_mode) {
+        return SkColorSetA(ResolveColor(ColorName::kTextColorPrimary, is_dark_mode), GetOpacity(OpacityName::kDisabledOpacity));
+      } else {
+        return SkColorSetA(ResolveColor(ColorName::kTextColorPrimary, is_dark_mode), 0x19);
+      }
   }
 }
 
diff --git a/chromium/tools/style_variable_generator/colors_test_expected.proto b/chromium/tools/style_variable_generator/colors_test_expected.proto
new file mode 100644
index 00000000000..714ec91a4ec
--- /dev/null
+++ b/chromium/tools/style_variable_generator/colors_test_expected.proto
@@ -0,0 +1,21 @@
+/* This file is generated from:
+ *  colors_test_palette.json5
+ *  colors_test.json5
+ */
+
+syntax = "proto3";
+
+package chromeos;
+
+// Non-premultiplied 8-bit ARGB values.
+message Color {
+  // Color value to use in light mode.
+  uint32 light_value = 1;
+  // Color value to use in dark mode.
+  uint32 dark_value = 2;
+}
+
+message Colors {
+  map<string, Color> palette_colors = 1;
+  map<string, Color> test_colors = 2;
+}
diff --git a/chromium/tools/style_variable_generator/colors_test_expected.protojson b/chromium/tools/style_variable_generator/colors_test_expected.protojson
new file mode 100644
index 00000000000..fc0f5369748
--- /dev/null
+++ b/chromium/tools/style_variable_generator/colors_test_expected.protojson
@@ -0,0 +1,36 @@
+# This file is generated from:
+#   additional_colors_test.json5
+#   colors_test_palette.json5
+#   colors_test.json5
+palette_colors: [
+  {
+    key: "google_grey_900",
+    value: {
+      light_value: 0xFF202124,
+      dark_value: 0xFF202124
+    }
+  }
+]
+test_colors: [
+  {
+    key: "text_color_primary",
+    value: {
+      light_value: 0xFF202124,
+      dark_value: 0xFFFFFFFF
+    }
+  },
+  {
+    key: "toggle_color",
+    value: {
+      light_value: 0x19202124,
+      dark_value: 0x60FFFFFF
+    }
+  },
+  {
+    key: "text_color",
+    value: {
+      light_value: 0xFF000000,
+      dark_value: 0xFFFFFFFF
+    }
+  }
+]
diff --git a/chromium/tools/style_variable_generator/colors_test_palette.json5 b/chromium/tools/style_variable_generator/colors_test_palette.json5
index 797efe87216..b63b8db5418 100644
--- a/chromium/tools/style_variable_generator/colors_test_palette.json5
+++ b/chromium/tools/style_variable_generator/colors_test_palette.json5
@@ -1,5 +1,11 @@
 {
-  // No CSS prefix for this test palette.
+  options: {
+    // No CSS prefix for the google palette.
+    proto: {
+      field_name: 'palette_colors',
+      field_id: 1,
+    },
+  },
   colors: {
     google_grey_900: "#202124",
   },
diff --git a/chromium/tools/style_variable_generator/css_generator.py b/chromium/tools/style_variable_generator/css_generator.py
index 587f4caaed9..a7b9a792995 100644
--- a/chromium/tools/style_variable_generator/css_generator.py
+++ b/chromium/tools/style_variable_generator/css_generator.py
@@ -33,28 +33,33 @@ class CSSStyleGenerator(BaseGenerator):
                         colors[name] = mode_values[mode]
             return colors
 
+        parameters = None
+
         if self.generate_single_mode:
-            return {
+            parameters = {
                 'light_colors':
                 BuildColorsForMode(self.generate_single_mode,
                                    resolve_missing=True)
             }
+        else:
+            parameters = {
+                'light_colors': BuildColorsForMode(Modes.LIGHT),
+                'dark_colors': BuildColorsForMode(Modes.DARK),
+            }
 
-        return {
-            'light_colors': BuildColorsForMode(Modes.LIGHT),
-            'dark_colors': BuildColorsForMode(Modes.DARK),
-        }
+        parameters['opacities'] = self.model[VariableType.OPACITY]
+        return parameters
 
     def GetFilters(self):
         return {
             'to_css_var_name': self._ToCSSVarName,
-            'css_color': self._CssColor,
-            'css_color_rgb': self._CssColorRGB,
+            'css_color': self._CSSColor,
+            'css_color_rgb': self._CSSColorRGB,
         }
 
     def GetGlobals(self):
         return {
-            'css_color_from_rgb_var': self._CssColorFromRGBVar,
+            'css_color_from_rgb_var': self._CSSColorFromRGBVar,
             'in_files': self.in_file_to_context.keys(),
         }
 
@@ -74,7 +79,13 @@ class CSSStyleGenerator(BaseGenerator):
         return '--%s%s' % (self._GetCSSVarPrefix(model_name),
                            model_name.replace('_', '-'))
 
-    def _CssColor(self, c):
+    def _CSSOpacity(self, c):
+        if c.opacity_var:
+            return 'var(%s)' % self._ToCSSVarName(c.opacity_var)
+
+        return ('%f' % c.a).rstrip('0').rstrip('.')
+
+    def _CSSColor(self, c):
         '''Returns the CSS color representation of |c|'''
         assert (isinstance(c, Color))
         if c.var:
@@ -83,16 +94,17 @@ class CSSStyleGenerator(BaseGenerator):
         if c.rgb_var:
             if c.a != 1:
                 return 'rgba(var(%s-rgb), %g)' % (self._ToCSSVarName(
-                    c.RGBVarToVar()), c.a)
+                    c.RGBVarToVar()), self._CSSOpacity(c))
             else:
                 return 'rgb(var(%s-rgb))' % self._ToCSSVarName(c.RGBVarToVar())
 
-        if c.a != 1:
-            return 'rgba(%d, %d, %d, %g)' % (c.r, c.g, c.b, c.a)
+        elif c.a != 1:
+            return 'rgba(%d, %d, %d, %g)' % (c.r, c.g, c.b,
+                                             self._CSSOpacity(c))
         else:
             return 'rgb(%d, %d, %d)' % (c.r, c.g, c.b)
 
-    def _CssColorRGB(self, c):
+    def _CSSColorRGB(self, c):
         '''Returns the CSS rgb representation of |c|'''
         if c.var:
             return 'var(%s-rgb)' % self._ToCSSVarName(c.var)
@@ -102,10 +114,10 @@ class CSSStyleGenerator(BaseGenerator):
 
         return '%d, %d, %d' % (c.r, c.g, c.b)
 
-    def _CssColorFromRGBVar(self, model_name, alpha):
-        '''Returns the CSS color representation given a color name and alpha'''
-        if alpha != 1:
-            return 'rgba(var(%s-rgb), %g)' % (self._ToCSSVarName(model_name),
-                                              alpha)
+    def _CSSColorFromRGBVar(self, model_name, color):
+        '''Returns the CSS color representation given a color name and color'''
+        if color.a != 1 and (color.a != -1 or color.opacity_var):
+            return 'rgba(var(%s-rgb), %s)' % (self._ToCSSVarName(model_name),
+                                              self._CSSOpacity(color))
         else:
             return 'rgb(var(%s-rgb))' % self._ToCSSVarName(model_name)
diff --git a/chromium/tools/style_variable_generator/css_generator.tmpl b/chromium/tools/style_variable_generator/css_generator.tmpl
index 708d78bd452..e82f7e039c9 100644
--- a/chromium/tools/style_variable_generator/css_generator.tmpl
+++ b/chromium/tools/style_variable_generator/css_generator.tmpl
@@ -17,8 +17,12 @@ Chrome OS pages.
 html:not(body) {
 {%- for model_name, color in light_colors.items() %}
   {{model_name | to_css_var_name}}-rgb: {{color | css_color_rgb}};
-  {{model_name | to_css_var_name}}: {{css_color_from_rgb_var(model_name, color.a)}};
+  {{model_name | to_css_var_name}}: {{css_color_from_rgb_var(model_name, color)}};
 {%  endfor %}
+
+{%- for name, value in opacities.items() %}
+  {{name | to_css_var_name}}: {{value}};
+{%  endfor -%}
 }
 {%- if dark_colors %}
 
@@ -32,7 +36,7 @@ Chrome OS pages.
   html:not(body) {
 {%- for model_name, color in dark_colors.items() %}
     {{model_name | to_css_var_name}}-rgb: {{color | css_color_rgb}};
-    {{model_name | to_css_var_name}}: {{css_color_from_rgb_var(model_name, color.a)}};
+    {{model_name | to_css_var_name}}: {{css_color_from_rgb_var(model_name, color)}};
 {%  endfor %}
   }
 }
diff --git a/chromium/tools/style_variable_generator/css_generator_test.py b/chromium/tools/style_variable_generator/css_generator_test.py
deleted file mode 100644
index 0eca46dd736..00000000000
--- a/chromium/tools/style_variable_generator/css_generator_test.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-from css_generator import CSSStyleGenerator
-from base_generator import Modes
-import unittest
-
-
-class CSSStyleGeneratorTest(unittest.TestCase):
-    def setUp(self):
-        self.generator = CSSStyleGenerator()
-        self.generator.AddJSONFileToModel('colors_test_palette.json5')
-        self.generator.AddJSONFileToModel('colors_test.json5')
-
-    def assertEqualToFile(self, value, filename):
-        with open(filename) as f:
-            contents = f.read()
-            self.assertEqual(
-                value, contents,
-                '\n>>>>>\n%s<<<<<\n\ndoes not match\n\n>>>>>\n%s<<<<<' %
-                (value, contents))
-
-    def testColorTestJSON(self):
-        self.assertEqualToFile(self.generator.Render(),
-                               'colors_test_expected.css')
-
-    def testColorTestJSONDarkOnly(self):
-        self.generator.generate_single_mode = Modes.DARK
-        self.assertEqualToFile(self.generator.Render(),
-                               'colors_test_dark_only_expected.css')
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/chromium/tools/style_variable_generator/presubmit_support.py b/chromium/tools/style_variable_generator/presubmit_support.py
index fd3f7ee7011..adabd794098 100644
--- a/chromium/tools/style_variable_generator/presubmit_support.py
+++ b/chromium/tools/style_variable_generator/presubmit_support.py
@@ -32,7 +32,10 @@ def FindDeletedCSSVariables(input_api, output_api, input_file_filter):
     def get_css_var_names_for_contents(contents_function):
         style_generator = CSSStyleGenerator()
         for f in files:
-            style_generator.AddJSONToModel('\n'.join(contents_function(f)),
+            file_contents = contents_function(f)
+            if len(file_contents) == 0:
+                continue
+            style_generator.AddJSONToModel('\n'.join(file_contents),
                                            in_file=f.LocalPath())
         return style_generator.GetCSSVarNames()
 
diff --git a/chromium/tools/style_variable_generator/proto_generator.py b/chromium/tools/style_variable_generator/proto_generator.py
new file mode 100644
index 00000000000..cb100f0397f
--- /dev/null
+++ b/chromium/tools/style_variable_generator/proto_generator.py
@@ -0,0 +1,97 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import os
+import collections
+from base_generator import Color, Modes, BaseGenerator, VariableType
+
+
+class BaseProtoStyleGenerator(BaseGenerator):
+    '''Base Generator for Protobuf formats'''
+
+    def GetParameters(self):
+        return {
+            'fields': self._CreateFieldList(),
+        }
+
+    def GetFilters(self):
+        return {
+            'proto_color': self._ProtoColor,
+        }
+
+    def GetGlobals(self):
+        return {
+            'Modes': Modes,
+            'in_files': self.in_file_to_context.keys(),
+        }
+
+    def _CreateFieldList(self):
+        field_value_map = dict()
+        field_id_map = dict()
+        field_list = []
+        for ctx in self.in_file_to_context.values():
+            field_name = ctx['field_name']
+            field_id = ctx['field_id']
+            if field_name in field_id_map and field_id_map.get(
+                    field_name) != field_id:
+                raise Exception(
+                    'Proto field "%s" declared > 1 times with differing ids' %
+                    field_name)
+            field_id_map[field_name] = field_id
+            field = {'name': field_name, 'id': field_id, 'values': []}
+            if field_name not in field_value_map:
+                field_list.append(field)
+                field_value_map[field_name] = field['values']
+
+        # Order fields by key
+        field_list.sort(key=lambda x: x['id'])
+
+        # Populate each field with its corresponding colors.
+        color_model = self.model[VariableType.COLOR]
+        for name, mode_values in color_model.items():
+            color_item = {
+                'name': name,
+                'mode_values': {
+                    Modes.LIGHT: color_model.ResolveToRGBA(name, Modes.LIGHT),
+                    Modes.DARK: color_model.ResolveToRGBA(name, Modes.DARK),
+                }
+            }
+            field_value_map[self.context_map[name]['field_name']].append(
+                color_item)
+
+        return field_list
+
+    def _ProtoColor(self, c):
+        '''Returns the proto color representation of |c|'''
+        assert (isinstance(c, Color))
+
+        def AlphaToInt(alpha):
+            return int(alpha * 255)
+
+        return '0x%X%02X%02X%02X' % (AlphaToInt(c.a), c.r, c.g, c.b)
+
+
+class ProtoStyleGenerator(BaseProtoStyleGenerator):
+    @staticmethod
+    def GetName():
+        return 'proto'
+
+    def Render(self):
+        self.Validate()
+        return self.ApplyTemplate(self, 'proto_generator.tmpl',
+                                  self.GetParameters())
+
+
+class ProtoJSONStyleGenerator(BaseProtoStyleGenerator):
+    @staticmethod
+    def GetName():
+        return 'protojson'
+
+    def GetContextKey(self):
+        return ProtoStyleGenerator.GetName()
+
+    def Render(self):
+        self.Validate()
+        return self.ApplyTemplate(self, 'proto_json_generator.tmpl',
+                                  self.GetParameters())
diff --git a/chromium/tools/style_variable_generator/proto_generator.tmpl b/chromium/tools/style_variable_generator/proto_generator.tmpl
new file mode 100644
index 00000000000..bdc28d661a6
--- /dev/null
+++ b/chromium/tools/style_variable_generator/proto_generator.tmpl
@@ -0,0 +1,23 @@
+/* This file is generated from:
+{%- for path in in_files %}
+ *  {{path}}
+{%-  endfor %}
+ */
+
+syntax = "proto3";
+
+package chromeos;
+
+// Non-premultiplied 8-bit ARGB values.
+message Color {
+  // Color value to use in light mode.
+  uint32 light_value = 1;
+  // Color value to use in dark mode.
+  uint32 dark_value = 2;
+}
+
+message Colors {
+{%- for field in fields %}
+  map<string, Color> {{field.name}} = {{field.id}};
+{%-  endfor %}
+}
diff --git a/chromium/tools/style_variable_generator/proto_json_generator.tmpl b/chromium/tools/style_variable_generator/proto_json_generator.tmpl
new file mode 100644
index 00000000000..784f6b8c17f
--- /dev/null
+++ b/chromium/tools/style_variable_generator/proto_json_generator.tmpl
@@ -0,0 +1,17 @@
+# This file is generated from:
+{%- for path in in_files %}
+#   {{path}}
+{%-  endfor %}
+{% for field in fields -%}
+{{field.name}}: [
+  {%-   for obj in field['values'] %}
+  {
+    key: "{{obj.name}}",
+    value: {
+      light_value: {{obj.mode_values[Modes.LIGHT] | proto_color}},
+      dark_value: {{obj.mode_values[Modes.DARK] | proto_color}}
+    }
+  }{{ "," if not loop.last }}
+  {%-    endfor %}
+]
+{%  endfor -%}
diff --git a/chromium/tools/style_variable_generator/style_variable_generator.gni b/chromium/tools/style_variable_generator/style_variable_generator.gni
index 2b443e91c83..a5d12c458c1 100644
--- a/chromium/tools/style_variable_generator/style_variable_generator.gni
+++ b/chromium/tools/style_variable_generator/style_variable_generator.gni
@@ -15,7 +15,17 @@
 #
 #    foo_css
 #      CSS Variables
+#
+#    foo_views
+#      Views generation for use with AshColorProvider
+#
+#    foo_proto
+#      Protobuf message schema generation
+#
+#    foo_protojson
+#      Protobuf JSON value format, contains actual color information
 template("style_variable_generator") {
+  script_file = "//tools/style_variable_generator/style_variable_generator.py"
   original_target_name = target_name
   common_inputs = [
     "//tools/style_variable_generator/base_generator.py",
@@ -23,8 +33,7 @@ template("style_variable_generator") {
   ]
 
   action("${target_name}_css") {
-    script = "//tools/style_variable_generator/style_variable_generator.py"
-
+    script = script_file
     forward_variables_from(invoker,
                            [
                              "deps",
@@ -46,8 +55,7 @@ template("style_variable_generator") {
   }
 
   action("${target_name}_views_generator") {
-    script = "//tools/style_variable_generator/style_variable_generator.py"
-
+    script = script_file
     forward_variables_from(invoker,
                            [
                              "deps",
@@ -71,4 +79,48 @@ template("style_variable_generator") {
     sources = [ "$target_gen_dir/${original_target_name}.h" ]
     deps = [ ":${original_target_name}_views_generator" ]
   }
+
+  action("${target_name}_proto") {
+    script = script_file
+    forward_variables_from(invoker,
+                           [
+                             "deps",
+                             "sources",
+                           ])
+
+    inputs = common_inputs + [
+               "//tools/style_variable_generator/proto_generator.py",
+               "//tools/style_variable_generator/proto_generator.tmpl",
+             ]
+    out_file = "$target_gen_dir/${original_target_name}.proto"
+    outputs = [ out_file ]
+
+    args = [
+             "--generator=proto",
+             "--out-file",
+             rebase_path("$out_file", root_build_dir),
+           ] + rebase_path(sources, root_build_dir)
+  }
+
+  action("${target_name}_protojson") {
+    script = script_file
+    forward_variables_from(invoker,
+                           [
+                             "deps",
+                             "sources",
+                           ])
+
+    inputs = common_inputs + [
+               "//tools/style_variable_generator/proto_generator.py",
+               "//tools/style_variable_generator/proto_json_generator.tmpl",
+             ]
+    out_file = "$target_gen_dir/${original_target_name}.protojson"
+    outputs = [ out_file ]
+
+    args = [
+             "--generator=proto",
+             "--out-file",
+             rebase_path("$out_file", root_build_dir),
+           ] + rebase_path(sources, root_build_dir)
+  }
 }
diff --git a/chromium/tools/style_variable_generator/style_variable_generator.py b/chromium/tools/style_variable_generator/style_variable_generator.py
index 3b004561675..f7c306305f7 100644
--- a/chromium/tools/style_variable_generator/style_variable_generator.py
+++ b/chromium/tools/style_variable_generator/style_variable_generator.py
@@ -5,6 +5,7 @@
 import argparse
 import sys
 from css_generator import CSSStyleGenerator
+from proto_generator import ProtoStyleGenerator, ProtoJSONStyleGenerator
 from views_generator import ViewsStyleGenerator
 from base_generator import Modes
 
@@ -13,7 +14,10 @@ def main():
     parser = argparse.ArgumentParser(
         description='Generate style variables from JSON5 color file.')
 
-    generators = [CSSStyleGenerator, ViewsStyleGenerator]
+    generators = [
+        CSSStyleGenerator, ViewsStyleGenerator, ProtoStyleGenerator,
+        ProtoJSONStyleGenerator
+    ]
 
     parser.add_argument('--generator',
                         choices=[g.GetName() for g in generators],
diff --git a/chromium/tools/style_variable_generator/style_variable_generator_test.py b/chromium/tools/style_variable_generator/style_variable_generator_test.py
new file mode 100644
index 00000000000..a0f645abf5e
--- /dev/null
+++ b/chromium/tools/style_variable_generator/style_variable_generator_test.py
@@ -0,0 +1,63 @@
+# Copyright 2020 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+from css_generator import CSSStyleGenerator
+from proto_generator import ProtoStyleGenerator, ProtoJSONStyleGenerator
+from views_generator import ViewsStyleGenerator
+import unittest
+
+
+class BaseStyleGeneratorTest:
+    def assertEqualToFile(self, value, filename):
+        with open(filename) as f:
+            contents = f.read()
+            self.assertEqual(
+                value, contents,
+                '\n>>>>>\n%s<<<<<\n\ndoes not match\n\n>>>>>\n%s<<<<<' %
+                (value, contents))
+
+    def testColorTestJSON(self):
+        self.generator.out_file_path = (
+            'tools/style_variable_generator/colors_test_expected.h')
+        self.assertEqualToFile(self.generator.Render(),
+                               self.expected_output_file)
+
+
+class ViewsStyleGeneratorTest(unittest.TestCase, BaseStyleGeneratorTest):
+    def setUp(self):
+        self.generator = ViewsStyleGenerator()
+        self.generator.AddJSONFileToModel('colors_test_palette.json5')
+        self.generator.AddJSONFileToModel('colors_test.json5')
+        self.expected_output_file = 'colors_test_expected.h'
+
+
+class CSSStyleGeneratorTest(unittest.TestCase, BaseStyleGeneratorTest):
+    def setUp(self):
+        self.generator = CSSStyleGenerator()
+        self.generator.AddJSONFileToModel('colors_test_palette.json5')
+        self.generator.AddJSONFileToModel('colors_test.json5')
+        self.expected_output_file = 'colors_test_expected.css'
+
+
+class ProtoStyleGeneratorTest(unittest.TestCase, BaseStyleGeneratorTest):
+    def setUp(self):
+        self.generator = ProtoStyleGenerator()
+        self.generator.AddJSONFileToModel('colors_test_palette.json5')
+        self.generator.AddJSONFileToModel('colors_test.json5')
+        self.expected_output_file = 'colors_test_expected.proto'
+
+
+class ProtoJSONStyleGeneratorTest(unittest.TestCase, BaseStyleGeneratorTest):
+    def setUp(self):
+        self.generator = ProtoJSONStyleGenerator()
+        self.generator.AddJSONFileToModel('colors_test_palette.json5')
+        self.generator.AddJSONFileToModel('colors_test.json5')
+        # Add in a separate file which adds more colors to test_colors so we can
+        # confirm we do not generate duplicate fields.
+        self.generator.AddJSONFileToModel('additional_colors_test.json5')
+        self.expected_output_file = 'colors_test_expected.protojson'
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/chromium/tools/style_variable_generator/views_generator.py b/chromium/tools/style_variable_generator/views_generator.py
index 454a70d4107..fcdd3ba97b1 100644
--- a/chromium/tools/style_variable_generator/views_generator.py
+++ b/chromium/tools/style_variable_generator/views_generator.py
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import os
+import math
 from base_generator import Color, Modes, BaseGenerator, VariableType
 
 
@@ -21,12 +22,14 @@ class ViewsStyleGenerator(BaseGenerator):
     def GetParameters(self):
         return {
             'colors': self._CreateColorList(),
+            'opacities': self.model[VariableType.OPACITY],
         }
 
     def GetFilters(self):
         return {
             'to_const_name': self._ToConstName,
             'cpp_color': self._CppColor,
+            'alpha_to_hex': self._AlphaToHex,
         }
 
     def GetGlobals(self):
@@ -52,12 +55,20 @@ class ViewsStyleGenerator(BaseGenerator):
     def _ToConstName(self, var_name):
         return 'k%s' % var_name.title().replace('_', '')
 
+    def _AlphaToHex(self, a):
+        return '0x%X' % math.floor(a * 255)
+
     def _CppColor(self, c):
         '''Returns the C++ color representation of |c|'''
         assert (isinstance(c, Color))
 
-        def AlphaToInt(alpha):
-            return int(alpha * 255)
+        def CppOpacity(color):
+            if c.a != -1:
+                return self._AlphaToHex(c.a)
+            elif c.opacity_var:
+                return 'GetOpacity(OpacityName::%s)' % self._ToConstName(
+                    c.opacity_var)
+            raise ValueError('Color with invalid opacity: ' + repr(color))
 
         if c.var:
             return ('ResolveColor(ColorName::%s, is_dark_mode)' %
@@ -65,11 +76,11 @@ class ViewsStyleGenerator(BaseGenerator):
 
         if c.rgb_var:
             return (
-                'SkColorSetA(ResolveColor(ColorName::%s, is_dark_mode), 0x%X)'
-                % (self._ToConstName(c.RGBVarToVar()), AlphaToInt(c.a)))
+                'SkColorSetA(ResolveColor(ColorName::%s, is_dark_mode), %s)' %
+                (self._ToConstName(c.RGBVarToVar()), CppOpacity(c)))
 
         if c.a != 1:
-            return 'SkColorSetARGB(0x%X, 0x%X, 0x%X, 0x%X)' % (AlphaToInt(c.a),
-                                                               c.r, c.g, c.b)
+            return 'SkColorSetARGB(%s, 0x%X, 0x%X, 0x%X)' % (CppOpacity(c),
+                                                             c.r, c.g, c.b)
         else:
             return 'SkColorSetRGB(0x%X, 0x%X, 0x%X)' % (c.r, c.g, c.b)
diff --git a/chromium/tools/style_variable_generator/views_generator_h.tmpl b/chromium/tools/style_variable_generator/views_generator_h.tmpl
index 58b6a0ff8fb..d765443c1e6 100644
--- a/chromium/tools/style_variable_generator/views_generator_h.tmpl
+++ b/chromium/tools/style_variable_generator/views_generator_h.tmpl
@@ -22,6 +22,24 @@ enum class ColorName {
 {%-  endfor %}
 };
 
+{%- if opacities %}
+
+enum class OpacityName {
+{%-   for name in opacities %}
+  {{name | to_const_name}},
+{%-   endfor %}
+};
+
+constexpr SkAlpha GetOpacity(OpacityName opacity_name) {
+  switch (opacity_name) {
+{%-   for name, value in opacities.items() %}
+    case OpacityName::{{name | to_const_name}}:
+      return {{value | alpha_to_hex}};
+{%-   endfor %}
+  }
+}
+{%- endif %}
+
 constexpr SkColor ResolveColor(ColorName color_name, bool is_dark_mode) {
   switch (color_name) {
 {%- for obj in colors %}
diff --git a/chromium/tools/style_variable_generator/views_generator_test.py b/chromium/tools/style_variable_generator/views_generator_test.py
deleted file mode 100644
index df43f56c966..00000000000
--- a/chromium/tools/style_variable_generator/views_generator_test.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2020 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-from views_generator import ViewsStyleGenerator
-import unittest
-
-
-class ViewsStyleGeneratorTest(unittest.TestCase):
-    def setUp(self):
-        self.generator = ViewsStyleGenerator()
-        self.generator.AddJSONFileToModel('colors_test_palette.json5')
-        self.generator.AddJSONFileToModel('colors_test.json5')
-
-    def assertEqualToFile(self, value, filename):
-        with open(filename) as f:
-            contents = f.read()
-            self.assertEqual(
-                value, contents,
-                '\n>>>>>\n%s<<<<<\n\ndoes not match\n\n>>>>>\n%s<<<<<' %
-                (value, contents))
-
-    def testColorTestJSON(self):
-        self.generator.out_file_path = (
-            'tools/style_variable_generator/colors_test_expected.h')
-        self.assertEqualToFile(self.generator.Render(),
-                               'colors_test_expected.h')
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/chromium/tools/symsrc/source_index.py b/chromium/tools/symsrc/source_index.py
index b63561f0a96..f6079b09ac0 100755
--- a/chromium/tools/symsrc/source_index.py
+++ b/chromium/tools/symsrc/source_index.py
@@ -129,7 +129,11 @@ def FindSrcSrvFile(filename, toolchain_dir):
   If |toolchain_dir| is null then this will assume that the file is in this
   script's directory.
   """
-  bin_dir = os.path.join(toolchain_dir, 'win_sdk', 'Debuggers', 'x64', 'srcsrv')
+  bin_dir = os.path.join(toolchain_dir, 'Windows Kits', '10', 'Debuggers',
+                         'x64', 'srcsrv')
+  if not os.path.exists(bin_dir):
+    bin_dir = os.path.join(toolchain_dir, 'win_sdk', 'Debuggers', 'x64',
+                           'srcsrv')
   assert(os.path.exists(bin_dir))
   return os.path.abspath(os.path.join(bin_dir, filename))
 
diff --git a/chromium/tools/traffic_annotation/auditor/BUILD.gn b/chromium/tools/traffic_annotation/auditor/BUILD.gn
index 4d8e036fa01..79e68ceefcd 100644
--- a/chromium/tools/traffic_annotation/auditor/BUILD.gn
+++ b/chromium/tools/traffic_annotation/auditor/BUILD.gn
@@ -72,6 +72,8 @@ source_set("auditor_sources") {
     "//third_party/protobuf:protobuf_full",
     "//third_party/re2",
   ]
+
+  deps = [ "//build:chromeos_buildflags" ]
 }
 
 executable("traffic_annotation_auditor") {
diff --git a/chromium/tools/traffic_annotation/auditor/instance.cc b/chromium/tools/traffic_annotation/auditor/instance.cc
index dd75eccff12..730d67074e5 100644
--- a/chromium/tools/traffic_annotation/auditor/instance.cc
+++ b/chromium/tools/traffic_annotation/auditor/instance.cc
@@ -4,8 +4,8 @@
 
 #include "tools/traffic_annotation/auditor/instance.h"
 
+#include "base/containers/contains.h"
 #include "base/memory/ptr_util.h"
-#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
diff --git a/chromium/tools/traffic_annotation/auditor/traffic_annotation_auditor.cc b/chromium/tools/traffic_annotation/auditor/traffic_annotation_auditor.cc
index 4d33c2a00ea..801612989a5 100644
--- a/chromium/tools/traffic_annotation/auditor/traffic_annotation_auditor.cc
+++ b/chromium/tools/traffic_annotation/auditor/traffic_annotation_auditor.cc
@@ -6,12 +6,12 @@
 
 #include <stdio.h>
 
+#include "base/containers/contains.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/process/launch.h"
-#include "base/stl_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ -218,7 +218,7 @@ bool TrafficAnnotationAuditor::RunExtractor(
   base::CommandLine cmdline(
       base::MakeAbsoluteFilePath(source_path_.Append(kExtractorScript)));
 #if defined(OS_WIN)
-  cmdline.PrependWrapper(L"python");
+  cmdline.PrependWrapper(L"python.bat");
 #endif
   cmdline.AppendArg(base::StringPrintf(
       "--options-file=%s", options_filepath.MaybeAsASCII().c_str()));
diff --git a/chromium/tools/traffic_annotation/auditor/traffic_annotation_auditor_unittest.cc b/chromium/tools/traffic_annotation/auditor/traffic_annotation_auditor_unittest.cc
index d5bb68b7138..9d4a3927e75 100644
--- a/chromium/tools/traffic_annotation/auditor/traffic_annotation_auditor_unittest.cc
+++ b/chromium/tools/traffic_annotation/auditor/traffic_annotation_auditor_unittest.cc
@@ -4,12 +4,12 @@
 
 #include "tools/traffic_annotation/auditor/traffic_annotation_auditor.h"
 
+#include "base/containers/contains.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/path_service.h"
-#include "base/stl_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
diff --git a/chromium/tools/traffic_annotation/auditor/traffic_annotation_exporter.h b/chromium/tools/traffic_annotation/auditor/traffic_annotation_exporter.h
index 339cd14569b..355e0e481ac 100644
--- a/chromium/tools/traffic_annotation/auditor/traffic_annotation_exporter.h
+++ b/chromium/tools/traffic_annotation/auditor/traffic_annotation_exporter.h
@@ -9,8 +9,8 @@
 #include <set>
 #include <vector>
 
+#include "base/containers/contains.h"
 #include "base/files/file_path.h"
-#include "base/stl_util.h"
 #include "tools/traffic_annotation/auditor/instance.h"
 
 class TrafficAnnotationExporter {
diff --git a/chromium/tools/traffic_annotation/auditor/traffic_annotation_id_checker.cc b/chromium/tools/traffic_annotation/auditor/traffic_annotation_id_checker.cc
index 3d9c63a897f..c3b88804f0a 100644
--- a/chromium/tools/traffic_annotation/auditor/traffic_annotation_id_checker.cc
+++ b/chromium/tools/traffic_annotation/auditor/traffic_annotation_id_checker.cc
@@ -4,7 +4,7 @@
 
 #include "tools/traffic_annotation/auditor/traffic_annotation_id_checker.h"
 
-#include "base/stl_util.h"
+#include "base/containers/contains.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 
diff --git a/chromium/tools/traffic_annotation/bin/README.md b/chromium/tools/traffic_annotation/bin/README.md
index 11912b93471..0f6188b192f 100644
--- a/chromium/tools/traffic_annotation/bin/README.md
+++ b/chromium/tools/traffic_annotation/bin/README.md
@@ -59,4 +59,4 @@ and land the resulting CL.
 The following line will be updated by the above script, and the modified
 README should be committed along with the updated .sha1 checksums.
 
-LASTCHANGE=867d00314f887c1ea046d068ef7d9029a3f44fbf-refs/heads/master@{#807115}
+LASTCHANGE=29828294b2aec6ace08ea0136cb7fcf164d5e166-refs/heads/master@{#854268}
diff --git a/chromium/tools/traffic_annotation/bin/win32/traffic_annotation_auditor.exe.sha1 b/chromium/tools/traffic_annotation/bin/win32/traffic_annotation_auditor.exe.sha1
index fd1a49dcc7f..b5e88f4b580 100644
--- a/chromium/tools/traffic_annotation/bin/win32/traffic_annotation_auditor.exe.sha1
+++ b/chromium/tools/traffic_annotation/bin/win32/traffic_annotation_auditor.exe.sha1
@@ -1 +1 @@
-78398902112510645b07a808000221ecaf69a409
\ No newline at end of file
+fe7bb9064cce90227aa3ab81469d714406eaff21
\ No newline at end of file
diff --git a/chromium/tools/traffic_annotation/summary/annotations.xml b/chromium/tools/traffic_annotation/summary/annotations.xml
index 5b2b1144ed3..571ba1c08d9 100644
--- a/chromium/tools/traffic_annotation/summary/annotations.xml
+++ b/chromium/tools/traffic_annotation/summary/annotations.xml
@@ -24,11 +24,12 @@ Refer to README.md for content description and update process.
  <item id="background_fetch_context" added_in_milestone="62" hash_code="16469669" type="0" content_hash_code="52235434" os_list="linux,windows" file_path="content/browser/background_fetch/background_fetch_delegate_proxy.cc"/>
  <item id="background_performance_tracer" added_in_milestone="62" hash_code="84575287" type="0" content_hash_code="120154250" os_list="linux,windows" file_path="chrome/browser/tracing/crash_service_uploader.cc"/>
  <item id="bidirectional_stream" added_in_milestone="67" hash_code="108665132" type="0" content_hash_code="130038340" os_list="linux,windows" file_path="net/http/bidirectional_stream.cc"/>
- <item id="blink_extension_resource_loader" added_in_milestone="63" hash_code="84165821" type="0" content_hash_code="63536185" os_list="linux,windows" file_path="content/renderer/loader/web_url_loader_impl.cc"/>
- <item id="blink_resource_loader" added_in_milestone="62" hash_code="101845102" type="0" content_hash_code="75331172" os_list="linux,windows" file_path="content/renderer/loader/web_url_loader_impl.cc"/>
+ <item id="blink_extension_resource_loader" added_in_milestone="63" hash_code="84165821" type="0" content_hash_code="63536185" os_list="linux,windows" file_path="third_party/blink/renderer/platform/loader/fetch/url_loader/web_url_loader.cc"/>
+ <item id="blink_resource_loader" added_in_milestone="62" hash_code="101845102" type="0" content_hash_code="75331172" os_list="linux,windows" file_path="third_party/blink/renderer/platform/loader/fetch/url_loader/web_url_loader.cc"/>
  <item id="blob_read" added_in_milestone="62" hash_code="112303907" type="0" deprecated="2019-08-09" content_hash_code="135449692" file_path=""/>
  <item id="blob_reader" added_in_milestone="62" hash_code="5154306" type="0" deprecated="2018-06-14" content_hash_code="39702178" file_path=""/>
  <item id="bluetooth_socket" added_in_milestone="65" hash_code="94099818" type="0" content_hash_code="30932349" os_list="linux,windows" file_path="device/bluetooth/bluetooth_socket_net.cc"/>
+ <item id="box_access_token_fetcher" added_in_milestone="89" hash_code="90263263" type="0" content_hash_code="120150044" os_list="linux,windows" file_path="chrome/browser/enterprise/connectors/file_system/access_token_fetcher.cc"/>
  <item id="brandcode_config" added_in_milestone="62" hash_code="109679553" type="0" content_hash_code="128843792" os_list="linux,windows" file_path="chrome/browser/profile_resetter/brandcode_config_fetcher.cc"/>
  <item id="browser_switcher_ieem_sitelist" added_in_milestone="72" hash_code="97159948" type="0" content_hash_code="129062966" os_list="linux,windows" file_path="chrome/browser/browser_switcher/browser_switcher_service.cc"/>
  <item id="cablev2_websocket_from_authenticator" added_in_milestone="87" hash_code="28613769" type="0" content_hash_code="119863612" os_list="linux,windows" file_path="device/fido/cable/v2_authenticator.cc"/>
@@ -42,13 +43,13 @@ Refer to README.md for content description and update process.
  <item id="cast_udp_transport" added_in_milestone="65" hash_code="5576536" type="0" content_hash_code="107643273" os_list="linux,windows" file_path="media/cast/net/udp_transport_impl.cc"/>
  <item id="certificate_verifier_url_loader" added_in_milestone="80" hash_code="80134684" type="0" content_hash_code="92630208" os_list="linux,windows" file_path="services/cert_verifier/cert_net_url_loader/cert_net_fetcher_url_loader.cc"/>
  <item id="certificate_verifier_url_request" added_in_milestone="80" hash_code="85988208" type="0" content_hash_code="59262468" os_list="linux,windows" file_path="net/cert_net/cert_net_fetcher_url_request.cc"/>
- <item id="chrome_HaTS_service" added_in_milestone="83" hash_code="136028241" type="0" content_hash_code="68990360" os_list="linux,windows" file_path="chrome/browser/ui/hats/hats_survey_status_checker.cc"/>
+ <item id="chrome_HaTS_service" added_in_milestone="83" hash_code="136028241" type="0" deprecated="2021-02-03" content_hash_code="68990360" file_path=""/>
  <item id="chrome_apps_socket_api" added_in_milestone="65" hash_code="8591273" type="0" content_hash_code="130709397" os_list="linux,windows" file_path="extensions/browser/api/socket/socket.cc"/>
  <item id="chrome_cleaner" added_in_milestone="63" hash_code="27071967" type="0" content_hash_code="111240292" os_list="windows" file_path="chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win.cc"/>
  <item id="chrome_cleanup_report" added_in_milestone="70" hash_code="71102679" type="0" content_hash_code="130565656" os_list="windows" file_path="chrome/chrome_cleaner/logging/cleaner_logging_service.cc"/>
  <item id="chrome_feedback_report_app" added_in_milestone="62" hash_code="134729048" type="0" content_hash_code="73916972" os_list="linux,windows" file_path="components/feedback/feedback_uploader.cc"/>
- <item id="chrome_variations_service" added_in_milestone="62" hash_code="115188287" type="0" content_hash_code="32485683" os_list="linux,windows" file_path="components/variations/service/variations_service.cc"/>
- <item id="client_download_request" added_in_milestone="62" hash_code="125522256" type="0" content_hash_code="23897505" os_list="linux,windows" file_path="chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc"/>
+ <item id="chrome_variations_service" added_in_milestone="62" hash_code="115188287" type="0" content_hash_code="16094337" os_list="linux,windows" file_path="components/variations/service/variations_service.cc"/>
+ <item id="client_download_request" added_in_milestone="62" hash_code="125522256" type="0" content_hash_code="79464901" os_list="linux,windows" file_path="chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc"/>
  <item id="cloud_print" added_in_milestone="65" hash_code="111712433" type="2" content_hash_code="60926140" os_list="linux,windows" semantics_fields="1,5" policy_fields="-1,3,4" file_path="chrome/service/cloud_print/cloud_print_url_fetcher.cc"/>
  <item id="cloud_print_backend" added_in_milestone="62" hash_code="71578042" type="1" second_id="111712433" content_hash_code="85425333" os_list="linux,windows" semantics_fields="2,3,4" file_path="chrome/service/cloud_print/cloud_print_proxy_backend.cc"/>
  <item id="cloud_print_credential_update" added_in_milestone="66" hash_code="137420486" type="0" content_hash_code="1179808" os_list="linux,windows" file_path="chrome/service/cloud_print/cloud_print_proxy_backend.cc"/>
@@ -69,7 +70,7 @@ Refer to README.md for content description and update process.
  <item id="cryptauth_find_eligible_unlock_devices" added_in_milestone="62" hash_code="120000562" type="1" second_id="29188932" deprecated="2018-04-04" content_hash_code="46773475" file_path=""/>
  <item id="cryptauth_get_my_devices" added_in_milestone="62" hash_code="136498680" type="1" second_id="29188932" deprecated="2018-04-04" content_hash_code="73842435" file_path=""/>
  <item id="cryptauth_toggle_easyunlock" added_in_milestone="62" hash_code="25204343" type="1" second_id="29188932" deprecated="2018-04-04" content_hash_code="13570943" file_path=""/>
- <item id="data_reduction_proxy_config" added_in_milestone="62" hash_code="485305" type="0" content_hash_code="134075813" os_list="linux,windows" file_path="components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client.cc"/>
+ <item id="data_reduction_proxy_config" added_in_milestone="62" hash_code="485305" type="0" deprecated="2021-01-25" content_hash_code="134075813" file_path=""/>
  <item id="data_reduction_proxy_pingback" added_in_milestone="62" hash_code="68561428" type="0" deprecated="2019-09-17" content_hash_code="78407792" file_path=""/>
  <item id="data_reduction_proxy_secure_proxy_check" added_in_milestone="62" hash_code="131236802" type="0" deprecated="2020-03-13" content_hash_code="122297136" file_path=""/>
  <item id="data_reduction_proxy_warmup" added_in_milestone="62" hash_code="8250451" type="0" deprecated="2020-03-13" content_hash_code="6321249" file_path=""/>
@@ -87,6 +88,7 @@ Refer to README.md for content description and update process.
  <item id="dial_get_app_info" added_in_milestone="65" hash_code="15952025" type="0" deprecated="2018-02-27" content_hash_code="90542080" file_path=""/>
  <item id="dial_get_device_description" added_in_milestone="62" hash_code="50422598" type="0" deprecated="2018-02-27" content_hash_code="129827780" file_path=""/>
  <item id="dial_url_fetcher" added_in_milestone="67" hash_code="41424546" type="0" content_hash_code="129828432" os_list="linux,windows" file_path="chrome/browser/media/router/discovery/dial/dial_url_fetcher.cc"/>
+ <item id="digital_asset_links" added_in_milestone="90" hash_code="134272131" type="0" content_hash_code="13554846" os_list="linux,windows" file_path="chrome/browser/installable/digital_asset_links/digital_asset_links_handler.cc"/>
  <item id="direct_sockets" added_in_milestone="88" hash_code="32472991" type="0" content_hash_code="64752301" os_list="linux,windows" file_path="third_party/blink/renderer/modules/direct_sockets/navigator_socket.cc"/>
  <item id="dns_over_https" added_in_milestone="66" hash_code="79895226" type="0" content_hash_code="45123510" os_list="linux,windows" file_path="net/dns/dns_transaction.cc"/>
  <item id="dns_transaction" added_in_milestone="65" hash_code="79227717" type="0" content_hash_code="132206495" os_list="linux,windows" file_path="net/dns/dns_transaction.cc"/>
@@ -102,6 +104,7 @@ Refer to README.md for content description and update process.
  <item id="downloads_api_run_async" added_in_milestone="62" hash_code="121068967" type="0" content_hash_code="9280914" os_list="linux,windows" file_path="chrome/browser/extensions/api/downloads/downloads_api.cc"/>
  <item id="downloads_dom_handler" added_in_milestone="73" hash_code="95951029" type="0" content_hash_code="137150731" os_list="linux,windows" file_path="chrome/browser/ui/webui/downloads/downloads_dom_handler.cc"/>
  <item id="drag_download_file" added_in_milestone="62" hash_code="95910019" type="0" content_hash_code="126492858" os_list="linux,windows" file_path="content/browser/download/drag_download_file.cc"/>
+ <item id="drive_service" added_in_milestone="90" hash_code="56074781" type="0" content_hash_code="94248995" os_list="linux,windows" file_path="chrome/browser/search/drive/drive_service.cc"/>
  <item id="enterprise_safe_browsing_realtime_url_lookup" added_in_milestone="86" hash_code="22262963" type="0" content_hash_code="14052810" os_list="linux,windows" file_path="chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.cc"/>
  <item id="expect_ct_reporter" added_in_milestone="69" hash_code="57276415" type="0" deprecated="2018-06-20" content_hash_code="130492494" file_path="services/network/expect_ct_reporter.cc"/>
  <item id="extension_blacklist" added_in_milestone="62" hash_code="59592717" type="0" content_hash_code="116742516" os_list="linux,windows" file_path="chrome/browser/extensions/blocklist_state_fetcher.cc"/>
@@ -110,9 +113,11 @@ Refer to README.md for content description and update process.
  <item id="extension_manifest_fetcher" added_in_milestone="62" hash_code="5151071" type="0" content_hash_code="93862569" os_list="linux,windows" file_path="extensions/browser/updater/extension_downloader.cc"/>
  <item id="external_policy_fetcher" added_in_milestone="62" hash_code="9459438" type="0" content_hash_code="64260484" os_list="linux,windows" file_path="components/policy/core/common/cloud/external_policy_data_fetcher.cc"/>
  <item id="family_info" added_in_milestone="62" hash_code="30913825" type="0" deprecated="2019-07-30" content_hash_code="25369370" file_path=""/>
- <item id="favicon_loader" added_in_milestone="63" hash_code="112189210" type="0" content_hash_code="70773116" os_list="linux,windows" file_path="content/renderer/loader/web_url_loader_impl.cc"/>
+ <item id="favicon_loader" added_in_milestone="63" hash_code="112189210" type="0" content_hash_code="70773116" os_list="linux,windows" file_path="third_party/blink/renderer/platform/loader/fetch/url_loader/web_url_loader.cc"/>
  <item id="feed_image_fetcher" added_in_milestone="68" hash_code="87439531" type="0" deprecated="2019-01-04" content_hash_code="26756208" file_path=""/>
- <item id="floc_id_provider_impl" added_in_milestone="85" hash_code="103052331" type="1" second_id="13704791" content_hash_code="41421380" os_list="linux,windows" semantics_fields="2,3,4" policy_fields="3" file_path="chrome/browser/federated_learning/floc_id_provider_impl.cc"/>
+ <item id="file_system_connector_to_box" added_in_milestone="89" hash_code="29061438" type="1" second_id="29188932" content_hash_code="39353559" os_list="linux,windows" semantics_fields="1,2,3,4,5" policy_fields="-1,3,4" file_path="chrome/browser/enterprise/connectors/file_system/box_api_call_flow.cc"/>
+ <item id="floc_event_logger" added_in_milestone="89" hash_code="86015226" type="1" second_id="13704791" content_hash_code="68024778" os_list="linux,windows" semantics_fields="2,3,4" policy_fields="3" file_path="chrome/browser/federated_learning/floc_event_logger.cc"/>
+ <item id="floc_id_provider_impl" added_in_milestone="85" hash_code="103052331" type="1" second_id="13704791" deprecated="2021-01-05" content_hash_code="41421380" file_path=""/>
  <item id="floc_remote_permission_service" added_in_milestone="85" hash_code="13704791" type="2" content_hash_code="86293622" os_list="linux,windows" semantics_fields="1,5" policy_fields="1,2,4" file_path="chrome/browser/federated_learning/floc_remote_permission_service.cc"/>
  <item id="ftl_messaging_client_ack_messages" added_in_milestone="86" hash_code="55663676" type="0" content_hash_code="20913627" os_list="linux,windows" file_path="remoting/signaling/ftl_messaging_client.cc"/>
  <item id="ftl_messaging_client_receive_messages" added_in_milestone="86" hash_code="136248372" type="0" content_hash_code="36609143" os_list="linux,windows" file_path="remoting/signaling/ftl_messaging_client.cc"/>
@@ -147,7 +152,7 @@ Refer to README.md for content description and update process.
  <item id="gstatic_change_password_override_urls" added_in_milestone="86" hash_code="135799714" type="0" content_hash_code="133151871" os_list="linux,windows" file_path="components/password_manager/core/browser/change_password_url_service_impl.cc"/>
  <item id="headless_url_request" added_in_milestone="62" hash_code="29865866" type="0" deprecated="2018-07-10" content_hash_code="76700151" file_path=""/>
  <item id="heartbeat_sender" added_in_milestone="86" hash_code="4883150" type="0" content_hash_code="131927805" os_list="linux,windows" file_path="remoting/host/heartbeat_sender.cc"/>
- <item id="hintsfetcher_gethintsrequest" added_in_milestone="75" hash_code="34557599" type="0" content_hash_code="57003380" os_list="linux,windows" file_path="components/optimization_guide/hints_fetcher.cc"/>
+ <item id="hintsfetcher_gethintsrequest" added_in_milestone="75" hash_code="34557599" type="0" content_hash_code="57003380" os_list="linux,windows" file_path="components/optimization_guide/core/hints_fetcher.cc"/>
  <item id="history_notice_utils_notice" added_in_milestone="62" hash_code="102595701" type="1" second_id="110307337" content_hash_code="130829410" os_list="linux,windows" semantics_fields="2,3,4" policy_fields="4" file_path="components/browsing_data/core/history_notice_utils.cc"/>
  <item id="history_notice_utils_popup" added_in_milestone="62" hash_code="80832574" type="1" second_id="110307337" content_hash_code="30618510" os_list="linux,windows" semantics_fields="2,3,4" policy_fields="4" file_path="components/browsing_data/core/history_notice_utils.cc"/>
  <item id="history_ui_favicon_request_handler_get_favicon" added_in_milestone="77" hash_code="17562717" type="0" content_hash_code="64054629" os_list="linux,windows" file_path="components/favicon/core/history_ui_favicon_request_handler_impl.cc"/>
@@ -158,19 +163,19 @@ Refer to README.md for content description and update process.
  <item id="icon_catcher_get_large_icon" added_in_milestone="62" hash_code="44494884" type="0" content_hash_code="98262037" os_list="linux,windows" file_path="components/ntp_tiles/icon_cacher_impl.cc"/>
  <item id="image_annotation" added_in_milestone="73" hash_code="107881858" type="0" content_hash_code="76229990" os_list="linux,windows" file_path="services/image_annotation/annotator.cc"/>
  <item id="indexed_db_internals_handler" added_in_milestone="62" hash_code="131180348" type="0" content_hash_code="59026406" os_list="linux,windows" file_path="content/browser/indexed_db/indexed_db_internals_ui.cc"/>
- <item id="interest_feed_send" added_in_milestone="67" hash_code="76717919" type="0" content_hash_code="6240898" os_list="linux,windows" file_path="components/feed/core/feed_networking_host.cc"/>
  <item id="interest_feedv2_image_send" added_in_milestone="86" hash_code="92245202" type="0" content_hash_code="107508312" os_list="linux,windows" file_path="components/feed/core/v2/image_fetcher.cc"/>
  <item id="interest_feedv2_send" added_in_milestone="83" hash_code="85742023" type="0" content_hash_code="49706671" os_list="linux,windows" file_path="components/feed/core/v2/feed_network_impl.cc"/>
  <item id="intranet_redirect_detector" added_in_milestone="62" hash_code="21785164" type="0" content_hash_code="62025595" os_list="linux,windows" file_path="chrome/browser/intranet_redirect_detector.cc"/>
  <item id="invalidation_service" added_in_milestone="62" hash_code="72354423" type="0" deprecated="2020-01-23" content_hash_code="78425687" file_path=""/>
- <item id="javascript_report_error" added_in_milestone="87" hash_code="109607776" type="0" content_hash_code="7229012" os_list="linux" file_path="chrome/browser/error_reporting/chrome_js_error_report_processor.cc"/>
- <item id="kaleidoscope_service" added_in_milestone="87" hash_code="49759694" type="0" content_hash_code="14307563" os_list="linux,windows" file_path="chrome/browser/media/kaleidoscope/kaleidoscope_service.cc"/>
+ <item id="javascript_report_error" added_in_milestone="87" hash_code="109607776" type="0" content_hash_code="7229012" os_list="linux" file_path="chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc"/>
  <item id="kids_chrome_management_client_classify_url" added_in_milestone="77" hash_code="109987793" type="0" deprecated="2019-07-30" content_hash_code="112740597" file_path=""/>
  <item id="lib_address_input" added_in_milestone="62" hash_code="50816767" type="0" content_hash_code="57977576" os_list="linux,windows" file_path="third_party/libaddressinput/chromium/chrome_metadata_source.cc"/>
+ <item id="litepages_robots_rules" added_in_milestone="89" hash_code="50910588" type="0" content_hash_code="72567080" os_list="linux,windows" file_path="chrome/browser/subresource_redirect/origin_robots_rules.cc"/>
  <item id="load_autofill_gstatic_data" added_in_milestone="78" hash_code="119416099" type="0" content_hash_code="8433621" os_list="linux,windows" file_path="chrome/browser/autofill/autofill_gstatic_reader.cc"/>
  <item id="logo_service" added_in_milestone="73" hash_code="35473769" type="0" content_hash_code="20271299" os_list="linux,windows" file_path="components/search_provider_logos/logo_service_impl.cc"/>
  <item id="logo_tracker" added_in_milestone="62" hash_code="36859107" type="0" deprecated="2018-12-07" content_hash_code="67588075" file_path=""/>
  <item id="lookup_single_password_leak" added_in_milestone="78" hash_code="16927377" type="0" content_hash_code="12158296" os_list="linux,windows" file_path="components/password_manager/core/browser/leak_detection/leak_detection_request.cc"/>
+ <item id="managed_configuration_loader" added_in_milestone="89" hash_code="77734467" type="0" content_hash_code="101566873" os_list="linux,windows" file_path="chrome/browser/device_api/managed_configuration_api.cc"/>
  <item id="media_feeds" added_in_milestone="83" hash_code="116778918" type="0" content_hash_code="48909601" os_list="linux,windows" file_path="chrome/browser/media/feeds/media_feeds_fetcher.cc"/>
  <item id="media_feeds_checker" added_in_milestone="84" hash_code="107707089" type="0" content_hash_code="125348528" os_list="linux,windows" file_path="chrome/browser/media/feeds/media_feeds_service.cc"/>
  <item id="media_router_global_media_controls_image" added_in_milestone="81" hash_code="95983790" type="0" content_hash_code="48851217" os_list="linux,windows" file_path="chrome/browser/ui/global_media_controls/cast_media_notification_item.cc"/>
@@ -197,7 +202,7 @@ Refer to README.md for content description and update process.
  <item id="ntp_icon_source" added_in_milestone="69" hash_code="29197139" type="0" content_hash_code="16399294" os_list="linux,windows" file_path="chrome/browser/search/ntp_icon_source.cc"/>
  <item id="ntp_snippets_fetch" added_in_milestone="62" hash_code="15418154" type="0" content_hash_code="10078959" os_list="linux,windows" file_path="components/ntp_snippets/remote/json_request.cc"/>
  <item id="nux_ntp_background_preview" added_in_milestone="74" hash_code="124847649" type="0" content_hash_code="31404656" os_list="linux,windows" file_path="chrome/browser/ui/webui/welcome/ntp_background_fetcher.cc"/>
- <item id="oauth2_access_token_fetcher" added_in_milestone="62" hash_code="27915688" type="0" content_hash_code="33501872" os_list="linux,windows" file_path="google_apis/gaia/oauth2_access_token_fetcher_impl.cc"/>
+ <item id="oauth2_access_token_fetcher" added_in_milestone="62" hash_code="27915688" type="0" content_hash_code="33501872" os_list="linux,windows" file_path="google_apis/gaia/gaia_access_token_fetcher.cc"/>
  <item id="oauth2_api_call_flow" added_in_milestone="65" hash_code="29188932" type="2" content_hash_code="108831236" os_list="linux,windows" policy_fields="-1" file_path="google_apis/gaia/oauth2_api_call_flow.cc"/>
  <item id="oauth2_mint_token_flow" added_in_milestone="62" hash_code="1112842" type="1" second_id="29188932" content_hash_code="91581432" os_list="linux,windows" semantics_fields="1,2,3,4,5" policy_fields="3,4" file_path="google_apis/gaia/oauth2_mint_token_flow.cc"/>
  <item id="ocsp_start_url_loader" added_in_milestone="81" hash_code="3646641" type="0" deprecated="2020-04-28" content_hash_code="106270072" file_path=""/>
@@ -215,10 +220,11 @@ Refer to README.md for content description and update process.
  <item id="open_search" added_in_milestone="62" hash_code="107267424" type="0" content_hash_code="83025542" os_list="linux,windows" file_path="components/search_engines/template_url_fetcher.cc"/>
  <item id="openscreen_message" added_in_milestone="83" hash_code="23036184" type="0" content_hash_code="124395439" os_list="linux,windows" file_path="components/openscreen_platform/udp_socket.cc"/>
  <item id="openscreen_tls_message" added_in_milestone="83" hash_code="40127335" type="0" content_hash_code="15991338" os_list="linux,windows" file_path="components/openscreen_platform/tls_connection_factory.cc"/>
- <item id="optimization_guide_model" added_in_milestone="79" hash_code="106373593" type="0" content_hash_code="32403047" os_list="linux,windows" file_path="chrome/browser/optimization_guide/prediction/prediction_model_fetcher.cc"/>
+ <item id="optimization_guide_model" added_in_milestone="79" hash_code="106373593" type="0" content_hash_code="32403047" os_list="linux,windows" file_path="components/optimization_guide/core/prediction_model_fetcher.cc"/>
+ <item id="optimization_guide_model_download" added_in_milestone="88" hash_code="100143055" type="0" content_hash_code="97983899" os_list="linux,windows" file_path="chrome/browser/optimization_guide/prediction/prediction_model_download_manager.cc"/>
  <item id="origin_policy_loader" added_in_milestone="69" hash_code="6483617" type="0" content_hash_code="134028975" os_list="linux,windows" file_path="services/network/origin_policy/origin_policy_fetcher.cc"/>
  <item id="parallel_download_job" added_in_milestone="62" hash_code="135118587" type="0" content_hash_code="105330419" os_list="linux,windows" file_path="components/download/internal/common/parallel_download_job.cc"/>
- <item id="password_protection_request" added_in_milestone="62" hash_code="66322287" type="0" content_hash_code="25596947" os_list="linux,windows" file_path="components/safe_browsing/content/password_protection/password_protection_request.cc"/>
+ <item id="password_protection_request" added_in_milestone="62" hash_code="66322287" type="0" content_hash_code="25596947" os_list="linux,windows" file_path="components/safe_browsing/core/password_protection/password_protection_request.cc"/>
  <item id="password_requirements_spec_fetch" added_in_milestone="69" hash_code="69585116" type="0" content_hash_code="5591260" os_list="linux,windows" file_path="components/password_manager/core/browser/generation/password_requirements_spec_fetcher_impl.cc"/>
  <item id="payment_instrument_icon_fetcher" added_in_milestone="62" hash_code="73309970" type="0" deprecated="2017-09-16" content_hash_code="84709873" file_path=""/>
  <item id="payment_manifest_downloader" added_in_milestone="62" hash_code="84045030" type="0" content_hash_code="19293316" os_list="linux,windows" file_path="components/payments/core/payment_manifest_downloader.cc"/>
@@ -227,18 +233,18 @@ Refer to README.md for content description and update process.
  <item id="pepper_tcp_socket" added_in_milestone="65" hash_code="120623198" type="0" content_hash_code="27489892" os_list="linux,windows" file_path="content/browser/renderer_host/pepper/pepper_socket_utils.cc"/>
  <item id="pepper_udp_socket" added_in_milestone="70" hash_code="53512439" type="0" content_hash_code="7268418" os_list="linux,windows" file_path="content/browser/renderer_host/pepper/pepper_socket_utils.cc"/>
  <item id="per_user_topic_registration_request" added_in_milestone="68" hash_code="10498172" type="0" content_hash_code="57098847" os_list="linux,windows" file_path="components/invalidation/impl/per_user_topic_subscription_request.cc"/>
- <item id="permission_predictions" added_in_milestone="88" hash_code="119808259" type="0" content_hash_code="806663" os_list="linux,windows" file_path="components/permissions/prediction_service/prediction_service.cc"/>
+ <item id="permission_predictions" added_in_milestone="88" hash_code="89492280" type="0" content_hash_code="806663" os_list="linux,windows" file_path="components/permissions/prediction_service/prediction_service.cc"/>
  <item id="permission_reporting" added_in_milestone="62" hash_code="131741641" type="0" deprecated="2018-03-06" content_hash_code="7213535" file_path=""/>
  <item id="permission_request_creator" added_in_milestone="62" hash_code="43206794" type="0" deprecated="2019-07-30" content_hash_code="73571699" file_path=""/>
  <item id="persist_blob_to_indexed_db" added_in_milestone="62" hash_code="32030464" type="0" deprecated="2018-08-13" content_hash_code="35410079" file_path=""/>
  <item id="plugins_resource_service" added_in_milestone="62" hash_code="49601082" type="0" content_hash_code="6877335" os_list="linux,windows" file_path="chrome/browser/plugins/plugins_resource_service.cc"/>
  <item id="popular_sites_fetch" added_in_milestone="62" hash_code="50755044" type="0" content_hash_code="6910083" os_list="linux,windows" file_path="components/ntp_tiles/popular_sites_impl.cc"/>
  <item id="port_forwarding_controller_socket" added_in_milestone="65" hash_code="95075845" type="0" content_hash_code="122163428" os_list="linux,windows" file_path="chrome/browser/devtools/device/port_forwarding_controller.cc"/>
- <item id="ppapi_download_request" added_in_milestone="62" hash_code="135967426" type="0" content_hash_code="110461402" os_list="linux,windows" file_path="chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc"/>
+ <item id="ppapi_download_request" added_in_milestone="62" hash_code="135967426" type="0" content_hash_code="131391591" os_list="linux,windows" file_path="chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc"/>
  <item id="predictive_prefetch" added_in_milestone="85" hash_code="72157052" type="0" content_hash_code="28097398" os_list="linux,windows" file_path="chrome/browser/predictors/prefetch_manager.cc"/>
  <item id="prefetch_download" added_in_milestone="62" hash_code="44583172" type="0" content_hash_code="21424542" os_list="linux,windows" file_path="components/offline_pages/core/prefetch/prefetch_downloader_impl.cc"/>
  <item id="prefetch_proxy_canary_check" added_in_milestone="88" hash_code="9229948" type="0" content_hash_code="53040767" os_list="linux,windows" file_path="chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_origin_prober.cc"/>
- <item id="prefetch_proxy_loader" added_in_milestone="88" hash_code="119210936" type="0" content_hash_code="18878601" os_list="linux,windows" file_path="chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_url_loader.cc"/>
+ <item id="prefetch_proxy_loader" added_in_milestone="88" hash_code="119210936" type="0" deprecated="2021-02-17" content_hash_code="18878601" file_path=""/>
  <item id="prefetch_proxy_probe" added_in_milestone="88" hash_code="123387409" type="0" content_hash_code="1909853" os_list="linux,windows" file_path="chrome/browser/prefetch/prefetch_proxy/prefetch_proxy_origin_prober.cc"/>
  <item id="prefetch_visuals" added_in_milestone="75" hash_code="91068704" type="0" content_hash_code="90439946" os_list="linux,windows" file_path="components/offline_pages/core/prefetch/visuals_fetch_by_url.cc"/>
  <item id="previews_litepage_origin_prober" added_in_milestone="78" hash_code="33703614" type="0" deprecated="2020-04-23" content_hash_code="116235355" file_path="chrome/browser/previews/previews_lite_page_redirect_url_loader.cc"/>
@@ -263,7 +269,6 @@ Refer to README.md for content description and update process.
  <item id="quic_chromium_incoming_session" added_in_milestone="66" hash_code="87635401" type="0" content_hash_code="78573093" os_list="linux,windows" file_path="net/quic/quic_chromium_client_session.cc"/>
  <item id="quic_chromium_packet_writer" added_in_milestone="66" hash_code="20153177" type="0" content_hash_code="29657765" os_list="linux,windows" file_path="net/quic/quic_chromium_packet_writer.cc"/>
  <item id="ranker_url_fetcher" added_in_milestone="62" hash_code="95682324" type="0" content_hash_code="45958626" os_list="linux,windows" file_path="components/assist_ranker/ranker_url_fetcher.cc"/>
- <item id="rappor_report" added_in_milestone="62" hash_code="44606780" type="0" content_hash_code="111287826" os_list="linux,windows" file_path="components/rappor/log_uploader.cc"/>
  <item id="receive_messages_express" added_in_milestone="85" hash_code="29506140" type="0" deprecated="2020-09-21" content_hash_code="38581365" file_path=""/>
  <item id="refresh_token_annotation_request" added_in_milestone="62" hash_code="7433837" type="1" second_id="29188932" deprecated="2018-01-17" content_hash_code="137103383" file_path=""/>
  <item id="remote_copy_message_handler" added_in_milestone="80" hash_code="80255301" type="0" content_hash_code="117673331" os_list="linux,windows" file_path="chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.cc"/>
@@ -286,17 +291,17 @@ Refer to README.md for content description and update process.
  <item id="safe_browsing_backup_request" added_in_milestone="62" hash_code="106980485" type="0" deprecated="2018-08-14" content_hash_code="101760679" file_path=""/>
  <item id="safe_browsing_binary_upload" added_in_milestone="78" hash_code="71663319" type="0" deprecated="2020-09-16" content_hash_code="105913171" file_path=""/>
  <item id="safe_browsing_binary_upload_app" added_in_milestone="87" hash_code="4306022" type="0" content_hash_code="64626873" os_list="linux,windows" file_path="chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc"/>
- <item id="safe_browsing_binary_upload_connector" added_in_milestone="87" hash_code="59568147" type="0" content_hash_code="69870179" os_list="linux,windows" file_path="chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc"/>
+ <item id="safe_browsing_binary_upload_connector" added_in_milestone="87" hash_code="59568147" type="0" content_hash_code="52138007" os_list="linux,windows" file_path="chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc"/>
  <item id="safe_browsing_cache_collector" added_in_milestone="62" hash_code="115907811" type="0" content_hash_code="62296373" os_list="linux,windows" file_path="components/safe_browsing/content/browser/threat_details_cache.cc"/>
  <item id="safe_browsing_certificate_error_reporting" added_in_milestone="62" hash_code="66590631" type="0" content_hash_code="26108454" os_list="linux,windows" file_path="chrome/browser/ssl/certificate_error_reporter.cc"/>
  <item id="safe_browsing_chunk_backup_request" added_in_milestone="62" hash_code="79957943" type="0" deprecated="2018-08-14" content_hash_code="133850277" file_path=""/>
  <item id="safe_browsing_client_side_malware_detector" added_in_milestone="62" hash_code="102935425" type="0" deprecated="2019-12-07" content_hash_code="79591279" file_path=""/>
- <item id="safe_browsing_client_side_phishing_detector" added_in_milestone="62" hash_code="1313982" type="0" content_hash_code="50199143" os_list="linux,windows" file_path="chrome/browser/safe_browsing/client_side_detection_service.cc"/>
+ <item id="safe_browsing_client_side_phishing_detector" added_in_milestone="62" hash_code="1313982" type="0" content_hash_code="50199143" os_list="linux,windows" file_path="components/safe_browsing/content/browser/client_side_detection_service.cc"/>
  <item id="safe_browsing_extended_reporting" added_in_milestone="62" hash_code="42848942" type="0" content_hash_code="81193513" os_list="linux,windows" file_path="components/safe_browsing/core/ping_manager.cc"/>
  <item id="safe_browsing_feedback" added_in_milestone="62" hash_code="44583821" type="0" content_hash_code="27116846" os_list="linux,windows" file_path="chrome/browser/safe_browsing/download_protection/download_feedback.cc"/>
  <item id="safe_browsing_get_full_hash" added_in_milestone="62" hash_code="68745894" type="0" deprecated="2018-08-14" content_hash_code="21739198" file_path=""/>
  <item id="safe_browsing_incident" added_in_milestone="62" hash_code="124950347" type="0" content_hash_code="7306531" os_list="linux,windows" file_path="chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc"/>
- <item id="safe_browsing_module_loader" added_in_milestone="62" hash_code="6019475" type="0" content_hash_code="49511650" os_list="linux,windows" file_path="chrome/browser/safe_browsing/client_side_model_loader.cc"/>
+ <item id="safe_browsing_module_loader" added_in_milestone="62" hash_code="6019475" type="0" content_hash_code="49511650" os_list="linux,windows" file_path="components/safe_browsing/content/browser/client_side_model_loader.cc"/>
  <item id="safe_browsing_realtime_url_lookup" added_in_milestone="78" hash_code="119324658" type="0" content_hash_code="71236226" os_list="linux,windows" file_path="components/safe_browsing/core/realtime/url_lookup_service.cc"/>
  <item id="safe_browsing_v4_get_hash" added_in_milestone="62" hash_code="8561691" type="0" content_hash_code="132435617" os_list="linux,windows" file_path="components/safe_browsing/core/db/v4_get_hash_protocol_manager.cc"/>
  <item id="safe_browsing_v4_update" added_in_milestone="70" hash_code="82509217" type="0" content_hash_code="5247849" os_list="linux,windows" file_path="components/safe_browsing/core/db/v4_update_protocol_manager.cc"/>
@@ -306,12 +311,13 @@ Refer to README.md for content description and update process.
  <item id="save_file_manager" added_in_milestone="62" hash_code="56275203" type="0" content_hash_code="56692339" os_list="linux,windows" file_path="content/browser/download/save_file_manager.cc"/>
  <item id="sct_auditing" added_in_milestone="87" hash_code="48603483" type="0" content_hash_code="43567503" os_list="linux,windows" file_path="chrome/browser/ssl/sct_reporting_service.cc"/>
  <item id="sdch_dictionary_fetch" added_in_milestone="62" hash_code="47152935" type="0" deprecated="2017-09-16" content_hash_code="16764294" file_path=""/>
- <item id="search_prefetch_service" added_in_milestone="88" hash_code="108986091" type="0" content_hash_code="125257414" os_list="linux,windows" file_path="chrome/browser/prefetch/search_prefetch/search_prefetch_service.cc"/>
+ <item id="search_prefetch_service" added_in_milestone="88" hash_code="108986091" type="0" content_hash_code="125257414" os_list="windows,linux" file_path="chrome/browser/prefetch/search_prefetch/base_search_prefetch_request.cc"/>
  <item id="search_suggest_service" added_in_milestone="73" hash_code="57785193" type="0" content_hash_code="132247652" os_list="linux,windows" file_path="chrome/browser/search/search_suggest/search_suggest_loader_impl.cc"/>
  <item id="security_key_socket" added_in_milestone="66" hash_code="31074955" type="0" content_hash_code="13741232" os_list="linux,windows" file_path="remoting/host/security_key/security_key_socket.cc"/>
  <item id="send_message_express" added_in_milestone="85" hash_code="23527666" type="0" deprecated="2020-09-21" content_hash_code="96850228" file_path=""/>
  <item id="service_worker_navigation_preload" added_in_milestone="63" hash_code="129872904" type="0" content_hash_code="79473248" os_list="linux,windows" file_path="content/browser/service_worker/service_worker_fetch_dispatcher.cc"/>
- <item id="service_worker_update_checker" added_in_milestone="71" hash_code="130931413" type="0" content_hash_code="46608086" os_list="linux,windows" file_path="content/browser/service_worker/service_worker_single_script_update_checker.cc"/>
+ <item id="service_worker_script_load" added_in_milestone="90" hash_code="21498113" type="0" content_hash_code="56275791" os_list="linux,windows" file_path="content/browser/service_worker/service_worker_new_script_fetcher.cc"/>
+ <item id="service_worker_update_checker" added_in_milestone="71" hash_code="130931413" type="0" content_hash_code="32441998" os_list="linux,windows" file_path="content/browser/service_worker/service_worker_single_script_update_checker.cc"/>
  <item id="services_http_server_error_response" added_in_milestone="68" hash_code="59302801" type="0" content_hash_code="127774041" os_list="linux,windows" file_path="services/network/public/cpp/server/http_server.cc"/>
  <item id="sigined_exchange_cert_fetcher" added_in_milestone="66" hash_code="79442849" type="0" content_hash_code="8138156" os_list="linux,windows" file_path="content/browser/web_package/signed_exchange_cert_fetcher.cc"/>
  <item id="sigined_exchange_validity_pinger" added_in_milestone="75" hash_code="57114284" type="0" content_hash_code="119482488" os_list="linux,windows" file_path="content/browser/web_package/signed_exchange_validity_pinger.cc"/>
@@ -353,6 +359,7 @@ Refer to README.md for content description and update process.
  <item id="user_info_fetcher" added_in_milestone="62" hash_code="22265491" type="0" content_hash_code="72016232" os_list="linux,windows" file_path="components/policy/core/common/cloud/user_info_fetcher.cc"/>
  <item id="video_tutorial_fetcher" added_in_milestone="87" hash_code="69879956" type="0" content_hash_code="121911479" os_list="linux,windows" file_path="chrome/browser/video_tutorials/internal/tutorial_fetcher.cc"/>
  <item id="viz_devtools_server" added_in_milestone="72" hash_code="16292315" type="0" content_hash_code="70061664" os_list="linux,windows" file_path="components/ui_devtools/devtools_server.cc"/>
+ <item id="web_app_origin_association_download" added_in_milestone="90" hash_code="128608592" type="0" content_hash_code="55648317" os_list="linux,windows" file_path="components/webapps/services/web_app_origin_association/web_app_origin_association_fetcher.cc"/>
  <item id="web_bundle_loader" added_in_milestone="84" hash_code="114615359" type="0" content_hash_code="57390734" os_list="linux,windows" file_path="content/browser/web_package/web_bundle_utils.cc"/>
  <item id="web_history_counter" added_in_milestone="62" hash_code="137457845" type="1" second_id="110307337" content_hash_code="49663381" os_list="linux,windows" semantics_fields="2,3,4" policy_fields="4" file_path="components/browsing_data/core/counters/history_counter.cc"/>
  <item id="web_history_delete_url" added_in_milestone="74" hash_code="41749213" type="1" second_id="110307337" content_hash_code="25943026" os_list="linux,windows" semantics_fields="2,3,4" policy_fields="4" file_path="components/history/core/browser/history_service.cc"/>
@@ -361,6 +368,7 @@ Refer to README.md for content description and update process.
  <item id="web_history_query" added_in_milestone="62" hash_code="17400350" type="1" second_id="110307337" content_hash_code="36075147" os_list="linux,windows" semantics_fields="2,3,4" policy_fields="4" file_path="components/history/core/browser/browsing_history_service.cc"/>
  <item id="web_history_service" added_in_milestone="65" hash_code="110307337" type="2" content_hash_code="16140045" os_list="linux,windows" semantics_fields="1,5" policy_fields="-1,3" file_path="components/history/core/browser/web_history_service.cc"/>
  <item id="web_push_message" added_in_milestone="77" hash_code="39886742" type="0" content_hash_code="110064650" os_list="linux,windows" file_path="chrome/browser/sharing/web_push/web_push_sender.cc"/>
+ <item id="webid" added_in_milestone="88" hash_code="113005423" type="0" content_hash_code="121729163" os_list="linux,windows" file_path="content/browser/webid/idp_network_request_manager.cc"/>
  <item id="webrtc_event_log_uploader" added_in_milestone="67" hash_code="24186190" type="0" content_hash_code="11005245" os_list="linux,windows" file_path="chrome/browser/media/webrtc/webrtc_event_log_uploader.cc"/>
  <item id="webrtc_log_upload" added_in_milestone="62" hash_code="62443804" type="0" content_hash_code="33661169" os_list="linux,windows" file_path="chrome/browser/media/webrtc/webrtc_log_uploader.cc"/>
  <item id="webrtc_peer_connection" added_in_milestone="66" hash_code="63497370" type="0" content_hash_code="60553259" os_list="linux,windows" file_path="third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory.cc"/>
diff --git a/chromium/tools/traffic_annotation/summary/grouping.xml b/chromium/tools/traffic_annotation/summary/grouping.xml
index 0953d5f1f4e..adad35509ea 100644
--- a/chromium/tools/traffic_annotation/summary/grouping.xml
+++ b/chromium/tools/traffic_annotation/summary/grouping.xml
@@ -49,7 +49,6 @@ hidden="true" so that these annotations don't show up in the document.
       <traffic_annotation unique_id="prefetch_proxy_probe"/>
       <traffic_annotation unique_id="enterprise_safe_browsing_realtime_url_lookup"/>
       <traffic_annotation unique_id="remote_copy_message_handler"/>
-      <traffic_annotation unique_id="chrome_HaTS_service"/>
       <traffic_annotation unique_id="port_forwarding_controller_socket"/>
       <traffic_annotation unique_id="media_feeds"/>
       <traffic_annotation unique_id="receive_messages_express"/>
@@ -74,6 +73,7 @@ hidden="true" so that these annotations don't show up in the document.
       <traffic_annotation unique_id="cast_socket"/>
       <traffic_annotation unique_id="dom_distiller"/>
       <traffic_annotation unique_id="download_manager_resume"/>
+      <traffic_annotation unique_id="file_system_connector_to_box"/>
       <traffic_annotation unique_id="parallel_download_job"/>
       <traffic_annotation unique_id="interest_feedv2_send"/>
       <traffic_annotation unique_id="mirroring_get_setup_info"/>
@@ -112,6 +112,7 @@ hidden="true" so that these annotations don't show up in the document.
       <traffic_annotation unique_id="pepper_udp_socket"/>
       <traffic_annotation unique_id="service_worker_navigation_preload"/>
       <traffic_annotation unique_id="service_worker_update_checker"/>
+      <traffic_annotation unique_id="service_worker_script_load"/>
       <traffic_annotation unique_id="download_web_contents_frame"/>
       <traffic_annotation unique_id="sigined_exchange_cert_fetcher"/>
       <traffic_annotation unique_id="sigined_exchange_validity_pinger"/>
@@ -153,11 +154,16 @@ hidden="true" so that these annotations don't show up in the document.
       <traffic_annotation unique_id="services_http_server_error_response"/>
       <traffic_annotation unique_id="webrtc_peer_connection"/>
       <traffic_annotation unique_id="direct_sockets"/>
-      <traffic_annotation unique_id="floc_id_provider_impl"/>
+      <traffic_annotation unique_id="floc_event_logger"/>
       <traffic_annotation unique_id="gstatic_change_password_override_urls"/>
       <traffic_annotation unique_id="interest_feedv2_image_send"/>
       <traffic_annotation unique_id="sanitized_image_source"/>
       <traffic_annotation unique_id="kaleidoscope_service"/>
+      <traffic_annotation unique_id="webid"/>
+      <traffic_annotation unique_id="managed_configuration_loader"/>
+      <traffic_annotation unique_id="box_access_token_fetcher"/>
+      <traffic_annotation unique_id="web_app_origin_association_download"/>
+      <traffic_annotation unique_id="digital_asset_links"/>
     </sender>
   </group>
   <group name="Admin Features">
@@ -295,7 +301,9 @@ hidden="true" so that these annotations don't show up in the document.
       <traffic_annotation unique_id="data_reduction_proxy_warmup"/>
       <traffic_annotation unique_id="hintsfetcher_gethintsrequest"/>
       <traffic_annotation unique_id="optimization_guide_model"/>
+      <traffic_annotation unique_id="optimization_guide_model_download"/>
       <traffic_annotation unique_id="previews_litepage_prober"/>
+      <traffic_annotation unique_id="litepages_robots_rules"/>
     </sender>
     <sender name="Network">
       <traffic_annotation unique_id="network_time_component"/>
@@ -346,7 +354,6 @@ hidden="true" so that these annotations don't show up in the document.
       <traffic_annotation unique_id="chrome_feedback_report_app"/>
       <traffic_annotation unique_id="metrics_report_ukm"/>
       <traffic_annotation unique_id="metrics_report_uma"/>
-      <traffic_annotation unique_id="rappor_report"/>
     </sender>
     <sender name="WebRTC">
       <traffic_annotation unique_id="webrtc_event_log_uploader"/>
@@ -387,6 +394,7 @@ hidden="true" so that these annotations don't show up in the document.
       <traffic_annotation unique_id="backdrop_collection_images_download"/>
       <traffic_annotation unique_id="backdrop_collection_names_download"/>
       <traffic_annotation unique_id="backdrop_next_image_download"/>
+      <traffic_annotation unique_id="drive_service"/>
       <traffic_annotation unique_id="ntp_snippets_fetch"/>
       <traffic_annotation unique_id="ntp_custom_background"/>
       <traffic_annotation unique_id="ntp_icon_source"/>
diff --git a/chromium/tools/translation/helper/grd_helper.py b/chromium/tools/translation/helper/grd_helper.py
index 80670246ccd..651d99230f1 100644
--- a/chromium/tools/translation/helper/grd_helper.py
+++ b/chromium/tools/translation/helper/grd_helper.py
@@ -71,7 +71,7 @@ def GetGrdpMessagesFromString(grdp_string):
   replaced_string = grdp_string.replace(
       '<grit-part>',
       """<grit base_dir="." latest_public_release="1" current_release="1">
-            <release seq="1" allow_pseudo="false">
+            <release seq="1">
               <messages fallback_to_english="true">
         """)
   replaced_string = replaced_string.replace(
diff --git a/chromium/tools/ubsan/vptr_blacklist.txt b/chromium/tools/ubsan/vptr_blacklist.txt
index 5904c9fffbd..32d70aac940 100644
--- a/chromium/tools/ubsan/vptr_blacklist.txt
+++ b/chromium/tools/ubsan/vptr_blacklist.txt
@@ -124,9 +124,3 @@ type:*StartPageService*
 # Remove once function attribute level blacklisting is implemented.
 # See crbug.com/476063.
 fun:*forbidGCDuringConstruction*
-
-#############################################################################
-# UBsan goes into an infinite recursion when __dynamic_cast instrumented with
-# "vptr". See crbug.com/609786.
-
-src:*/third_party/libc\+\+abi/trunk/src/private_typeinfo.cpp
diff --git a/chromium/tools/v8_context_snapshot/BUILD.gn b/chromium/tools/v8_context_snapshot/BUILD.gn
index c238e7e3837..6e86a543558 100644
--- a/chromium/tools/v8_context_snapshot/BUILD.gn
+++ b/chromium/tools/v8_context_snapshot/BUILD.gn
@@ -87,8 +87,9 @@ if (use_v8_context_snapshot) {
     outputs = [ output_file ]
   }
 
-  # This config disables a link time optimization "ICF", which may merge different
-  # functions into one if the function signature and body of them are identical.
+  # This config disables a link time optimization "ICF", which may merge
+  # different functions into one if the function signature and body of them are
+  # identical.
   #
   # ICF breaks 1:1 mappings of the external references for V8 snapshot, so we
   # disable it while taking a V8 snapshot.
@@ -96,6 +97,8 @@ if (use_v8_context_snapshot) {
     visibility = [ ":*" ]  # Only targets in this file can depend on this.
     if (is_win) {
       ldflags = [ "/OPT:NOICF" ]  # link.exe, but also lld-link.exe.
+    } else if (is_apple) {
+      ldflags = [ "-Wl,-no_deduplicate" ]  # ld64, and ld64.lld.
     } else if (use_gold || use_lld) {
       ldflags = [ "-Wl,--icf=none" ]
     }
diff --git a/chromium/tools/v8_context_snapshot/v8_context_snapshot.gni b/chromium/tools/v8_context_snapshot/v8_context_snapshot.gni
index 895010badd0..5a2b53f7b5c 100644
--- a/chromium/tools/v8_context_snapshot/v8_context_snapshot.gni
+++ b/chromium/tools/v8_context_snapshot/v8_context_snapshot.gni
@@ -8,6 +8,7 @@
 # to speedup creating a V8 context and setting up around it.
 
 import("//build/config/chromecast_build.gni")
+import("//build/config/chromeos/ui_mode.gni")
 import("//build/config/v8_target_cpu.gni")
 import("//v8/gni/v8.gni")
 
@@ -15,7 +16,7 @@ declare_args() {
   # TODO(crbug.com/764576): Enable the feature on more environments.
   # Disable in mac and win cross builds since building Blink twice is slow.
   use_v8_context_snapshot =
-      !is_chromeos && !is_android && !is_chromecast && !is_fuchsia &&
+      !is_chromeos_ash && !is_android && !is_chromecast && !is_fuchsia &&
       !(host_os == "mac" && current_cpu == "x86") &&
       (v8_target_cpu == target_cpu || is_msan) &&
       !(is_win && host_os != "win") && !(is_mac && host_os != "mac")
diff --git a/chromium/tools/variations/cleanup_stale_fieldtrial_configs.py b/chromium/tools/variations/cleanup_stale_fieldtrial_configs.py
new file mode 100644
index 00000000000..3e9201b5960
--- /dev/null
+++ b/chromium/tools/variations/cleanup_stale_fieldtrial_configs.py
@@ -0,0 +1,142 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+"""Simple script for cleaning up stale configs from fieldtrial_testing_config.
+
+Methodology:
+  Scan for all study names that appear in fieldtrial config file,
+  and removes ones that don't appear anywhere in the codebase.
+  The script ignores WebRTC entries as those often lead to false positives.
+
+Usage:
+  vpython tools/variations/cleanup_stale_fieldtrial_configs.py
+
+Run with --help to get a complete list of options this script runs with.
+
+If this script removes features that appear to be used in the codebase,
+double-check the study or feature name for typos or case differences.
+"""
+
+from __future__ import print_function
+
+import json
+import optparse
+import os
+import subprocess
+import sys
+import threading
+
+CONFIG_PATH = 'testing/variations/fieldtrial_testing_config.json'
+PRESUBMIT_SCRIPT = 'testing/variations/PRESUBMIT.py'
+THREAD_COUNT = 16
+
+_LITERAL_CACHE = {}
+
+
+def is_literal_used(literal):
+  """Check if a given string literal is used in the codebase."""
+  if literal in _LITERAL_CACHE:
+    return _LITERAL_CACHE[literal]
+
+  git_grep_cmd = ('git', 'grep', '--threads', '2', '-l', '\"%s\"' % literal)
+  git_grep_proc = subprocess.Popen(git_grep_cmd, stdout=subprocess.PIPE)
+  # Check for >1 since fieldtrial_testing_config.json will always be a result.
+  if len(git_grep_proc.stdout.read().splitlines()) > 1:
+    _LITERAL_CACHE[literal] = True
+    return True
+
+  bash_find_cmd = ('bash', '-c', 'find', '.', '-type', 'f', '|', 'grep', '-E',
+                   '\"\\.(h|cc)$\"', '|', 'grep', '-E',
+                   '\"(/out/|/build/|/gen/)\"', '|', 'xargs', 'grep', '-l',
+                   '\\\"%s\\\"' % literal)
+  bash_find_proc = subprocess.Popen(bash_find_cmd, stdout=subprocess.PIPE)
+  used = len(bash_find_proc.stdout.read().splitlines()) > 0
+  _LITERAL_CACHE[literal] = used
+  if not used:
+    print('Did not find', repr(literal))
+
+  return used
+
+
+def is_study_used(study_name, configs):
+  """Checks if a given study is used in the codebase."""
+  if study_name.startswith('WebRTC-'):
+    return True  # Skip webrtc studies which give false positives.
+
+  if is_literal_used(study_name):
+    return True
+  for config in configs:
+    for experiment in config.get('experiments', []):
+      for feature in experiment.get('enable_features', []):
+        if is_literal_used(feature):
+          return True
+      for feature in experiment.get('disable_features', []):
+        if is_literal_used(feature):
+          return True
+  return False
+
+
+def thread_func(thread_limiter, studies_map, study_name, configs):
+  """Runs a limited number of tasks and updates the map with the results.
+
+  Args:
+    thread_limited: A lock used to limit the number of active threads.
+    studies_map: The map where confirmed studies are added to.
+    study_name: The name of the study to check.
+    configs: The configs for the given study.
+
+  Side-effect:
+    This function adds the study to |studies_map| if it used.
+  """
+  thread_limiter.acquire()
+  try:
+    if is_study_used(study_name, configs):
+      studies_map[study_name] = configs
+  finally:
+    thread_limiter.release()
+
+
+def main():
+  parser = optparse.OptionParser()
+  parser.add_option('--input_path',
+                    help='Path to the fieldtrial config file to clean.')
+  parser.add_option('--output_path',
+                    help='Path to write cleaned up fieldtrial config file.')
+  parser.add_option('--thread_count',
+                    type='int',
+                    help='The number of threads to use for scanning.')
+
+  opts, _ = parser.parse_args()
+  input_path = os.path.expanduser(opts.input_path or CONFIG_PATH)
+  output_path = os.path.expanduser(opts.output_path or CONFIG_PATH)
+  thread_limiter = threading.BoundedSemaphore(opts.thread_count or THREAD_COUNT)
+
+  with open(input_path) as fin:
+    studies = json.load(fin)
+  print('Loaded config from', input_path)
+
+  threads = []
+  clean_studies = {}
+  for study_name, configs in studies.items():
+    args = (thread_limiter, clean_studies, study_name, configs)
+    threads.append(threading.Thread(target=thread_func, args=args))
+
+  # Start all threads, then join all threads.
+  for t in threads:
+    t.start()
+  for t in threads:
+    t.join()
+
+  with open(output_path, 'wt') as fout:
+    json.dump(clean_studies, fout)
+  print('Wrote cleaned config to', output_path)
+
+  # Run presubmit script to format config file.
+  retcode = subprocess.call(['vpython', PRESUBMIT_SCRIPT, output_path])
+  if retcode != 0:
+    print('Failed to format output, manually run:')
+    print('vpython', PRESUBMIT_SCRIPT, output_path)
+
+
+if __name__ == '__main__':
+  sys.exit(main())
diff --git a/chromium/tools/variations/fieldtrial_to_struct.py b/chromium/tools/variations/fieldtrial_to_struct.py
index a5fb64d3026..9ecf3897479 100755
--- a/chromium/tools/variations/fieldtrial_to_struct.py
+++ b/chromium/tools/variations/fieldtrial_to_struct.py
@@ -35,6 +35,7 @@ _platforms = [
     'android_weblayer',
     'android_webview',
     'chromeos',
+    'chromeos_lacros',
     'fuchsia',
     'ios',
     'linux',
diff --git a/chromium/tools/vscode/settings.json5 b/chromium/tools/vscode/settings.json5
index 30de30dab36..cc9ba783cf8 100644
--- a/chromium/tools/vscode/settings.json5
+++ b/chromium/tools/vscode/settings.json5
@@ -24,6 +24,8 @@
     "*.grd" : "xml",
     // Optional: .gn and .gni are not JavaScript, but at least it gives some
     // approximate syntax highlighting. Ignore the linter warnings!
+    // There's an extension for these files, excluding the linter headaches.
+    // https://marketplace.visualstudio.com/items?itemName=npclaudiu.vscode-gn
     "*.gni" : "javascript",
     "*.gn" : "javascript"
   },
@@ -48,16 +50,12 @@
   // https://marketplace.visualstudio.com/items?itemName=ryu1kn.annotator
   "annotator.annotationColumnWidth": "24em",
 
-  // C++ clang format settings. |workspaceFolder| is assumed to be chromium/src.
+  // C++ clang format settings. |workspaceFolder| is assumed to be Chromium's
+  // src/ directory.
   "C_Cpp.clang_format_path": "${workspaceFolder}/third_party/depot_tools/clang-format",
   "C_Cpp.clang_format_sortIncludes": true,
   "editor.formatOnSave": true,
 
-  // YouCompleteMe settings. |workspaceFolder| is assumed to be chromium/src.
-  "ycmd.path": "<full_path_to_your_home>/.ycmd", // Please replace this path
-  "ycmd.global_extra_config": "${workspaceFolder}/tools/vim/chromium.ycm_extra_conf.py",
-  "ycmd.confirm_extra_conf": false,
-
   // Optional: Only format modified lines instead of the whole file.
   // "editor.formatOnSaveMode": "modifications",
   // Optional: Highlight current line at the left of the editor.
diff --git a/chromium/tools/win/DebugVisualizers/blink.natvis b/chromium/tools/win/DebugVisualizers/blink.natvis
index 6fd480d742d..bd489dbfd26 100644
--- a/chromium/tools/win/DebugVisualizers/blink.natvis
+++ b/chromium/tools/win/DebugVisualizers/blink.natvis
@@ -138,22 +138,6 @@
   <Type Name="blink::PhysicalSize">
     <DisplayString>({width} x {height})</DisplayString>
   </Type>
-  <Type Name="blink::WebRect">
-    <AlternativeType Name="blink::WebFloatRect"/>
-    <DisplayString>({x}, {y}) x ({width}, {height})</DisplayString>
-    <Expand>
-      <Item Name="x">x</Item>
-      <Item Name="y">y</Item>
-      <Item Name="width">width</Item>
-      <Item Name="height">height</Item>
-      <Synthetic Name="right">
-        <DisplayString>{x + width}</DisplayString>
-      </Synthetic>
-      <Synthetic Name="bottom">
-        <DisplayString>{y + height}</DisplayString>
-      </Synthetic>
-    </Expand>
-  </Type>
   <!-- Component build version -->
   <Type Name="blink::WebString">
     <DisplayString>{(wtf.dll!WTF::StringImpl*)(impl_.ptr_)}</DisplayString>
@@ -290,7 +274,11 @@
     <Expand>
       <Item Name="Type">(blink::NGFragmentItem::ItemType)type_</Item>
       <Item Name="TextType" Condition="type_ == 0">(blink::NGTextType)sub_type_</Item>
+      <Item Name="Text" Condition="type_ == 0">text_</Item>
+      <Item Name="GeneratedText" Condition="type_ == 1">generated_text_</Item>
       <Item Name="LineBoxType" Condition="type_ == 2">(NGPhysicalLineBoxFragment::NGLineBoxType)sub_type_</Item>
+      <Item Name="Line" Condition="type_ == 2">line_</Item>
+      <Item Name="Box" Condition="type_ == 3">box_</Item>
       <Item Name="layout_object_">layout_object_</Item>
       <Item Name="rect_">rect_</Item>
       <Item Name="ink_overflow_type_">(NGInkOverflow::Type)ink_overflow_type_</Item>
diff --git a/chromium/tools/win/chromeexts/BUILD.gn b/chromium/tools/win/chromeexts/BUILD.gn
index 2e5819b574f..453594dc8bc 100644
--- a/chromium/tools/win/chromeexts/BUILD.gn
+++ b/chromium/tools/win/chromeexts/BUILD.gn
@@ -10,7 +10,12 @@ shared_library("chromeexts") {
     "chromeexts.def",
     "commands/hwnd_command.cc",
     "commands/hwnd_command.h",
+    "commands/view_command.cc",
+    "commands/view_command.h",
   ]
 
-  deps = [ "//base" ]
+  deps = [
+    "//base",
+    "//ui/views/debug:views_debug",
+  ]
 }
diff --git a/chromium/tools/win/chromeexts/DEPS b/chromium/tools/win/chromeexts/DEPS
new file mode 100644
index 00000000000..1ac9c26f011
--- /dev/null
+++ b/chromium/tools/win/chromeexts/DEPS
@@ -0,0 +1,5 @@
+include_rules = [
+  # Views debug code should avoid relying on //ui/views code to ensure debugger
+  # extensions are resillient to version structure changes within the codebase.
+  "+ui/views/debug",
+]
diff --git a/chromium/tools/win/chromeexts/chrome_exts_command.cc b/chromium/tools/win/chromeexts/chrome_exts_command.cc
index 047cc1719b8..128586d8437 100644
--- a/chromium/tools/win/chromeexts/chrome_exts_command.cc
+++ b/chromium/tools/win/chromeexts/chrome_exts_command.cc
@@ -4,7 +4,10 @@
 
 #include "tools/win/chromeexts/chrome_exts_command.h"
 
+#include <string>
+
 #include "base/check.h"
+#include "base/strings/utf_string_conversions.h"
 
 namespace tools {
 namespace win {
@@ -18,12 +21,18 @@ HRESULT ChromeExtsCommand::Initialize(IDebugClient* debug_client,
                                       const char* args) {
   DCHECK(debug_client);
   DCHECK(args);
-  args_ = args;
+
   debug_client_ = debug_client;
-  HRESULT hr = debug_client_->QueryInterface(IID_PPV_ARGS(&debug_control_));
-  if (FAILED(hr)) {
-    return hr;
+  debug_control_ = GetDebugClientAs<IDebugControl>();
+  if (!debug_control_) {
+    return E_FAIL;
   }
+
+  // base::CommandLine assumes the first token to be the command itself. The
+  // windbg args do not include this and must be included manually.
+  command_line_.ParseFromString(std::wstring(L"cmd ") +
+                                base::ASCIIToWide(args));
+
   return S_OK;
 }
 
diff --git a/chromium/tools/win/chromeexts/chrome_exts_command.h b/chromium/tools/win/chromeexts/chrome_exts_command.h
index 2192c22b4d7..0c484eb0950 100644
--- a/chromium/tools/win/chromeexts/chrome_exts_command.h
+++ b/chromium/tools/win/chromeexts/chrome_exts_command.h
@@ -12,6 +12,7 @@
 #include <memory>
 #include <string>
 
+#include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 
@@ -57,12 +58,18 @@ class ChromeExtsCommand {
   HRESULT PrintErrorf(const char* format, ...);
   HRESULT PrintErrorV(const char* format, va_list ap);
 
-  const std::string& args() const { return args_; }
-  IDebugClient* debug_client() { return debug_client_.Get(); }
-  IDebugControl* debug_control() { return debug_control_.Get(); }
+  const base::CommandLine& command_line() const { return command_line_; }
+
+  // Returns the Debug Client as T, null ComPtr<T> otherwise.
+  template <typename T>
+  ComPtr<T> GetDebugClientAs() {
+    ComPtr<T> target_interface;
+    debug_client_.As(&target_interface);
+    return target_interface;
+  }
 
  private:
-  std::string args_;
+  base::CommandLine command_line_{base::CommandLine::NO_PROGRAM};
   ComPtr<IDebugClient> debug_client_;
   ComPtr<IDebugControl> debug_control_;
 
diff --git a/chromium/tools/win/chromeexts/chromeexts.cc b/chromium/tools/win/chromeexts/chromeexts.cc
index 2b050d98160..db521b7b545 100644
--- a/chromium/tools/win/chromeexts/chromeexts.cc
+++ b/chromium/tools/win/chromeexts/chromeexts.cc
@@ -7,6 +7,7 @@
 
 #include "tools/win/chromeexts/chrome_exts_command.h"
 #include "tools/win/chromeexts/commands/hwnd_command.h"
+#include "tools/win/chromeexts/commands/view_command.h"
 
 namespace {
 using Microsoft::WRL::ComPtr;
@@ -38,3 +39,8 @@ HRESULT CALLBACK RunHwndCommand(IDebugClient* client, PCSTR args) {
   return tools::win::chromeexts::ChromeExtsCommand::Run<
       tools::win::chromeexts::HwndCommand>(client, args);
 }
+
+HRESULT CALLBACK RunViewCommand(IDebugClient* client, PCSTR args) {
+  return tools::win::chromeexts::ChromeExtsCommand::Run<
+      tools::win::chromeexts::ViewCommand>(client, args);
+}
diff --git a/chromium/tools/win/chromeexts/chromeexts.def b/chromium/tools/win/chromeexts/chromeexts.def
index 621f4fc7c60..65bb14f7ba8 100644
--- a/chromium/tools/win/chromeexts/chromeexts.def
+++ b/chromium/tools/win/chromeexts/chromeexts.def
@@ -9,3 +9,4 @@ EXPORTS
   DebugExtensionUninitialize
   help
   hwnd = RunHwndCommand
+  view = RunViewCommand
diff --git a/chromium/tools/win/chromeexts/commands/hwnd_command.cc b/chromium/tools/win/chromeexts/commands/hwnd_command.cc
index 7fb914171a6..e0c7b3ac235 100644
--- a/chromium/tools/win/chromeexts/commands/hwnd_command.cc
+++ b/chromium/tools/win/chromeexts/commands/hwnd_command.cc
@@ -7,6 +7,8 @@
 #include <dbgeng.h>
 #include <windows.h>
 
+#include "base/strings/utf_string_conversions.h"
+
 namespace tools {
 namespace win {
 namespace chromeexts {
@@ -20,21 +22,30 @@ HwndCommand::HwndCommand() = default;
 HwndCommand::~HwndCommand() = default;
 
 HRESULT HwndCommand::Execute() {
+  auto remaining_arguments = command_line().GetArgs();
+  if (remaining_arguments.size() != 1) {
+    Printf("Only expected 1 argument. Got %d instead.\n",
+           remaining_arguments.size());
+    return E_FAIL;
+  }
+
+  std::string hwnd_expression = base::WideToASCII(remaining_arguments[0]);
+
   // While sizeof(HWND) can change between 32-bit and 64-bit platforms, Windows
   // only cares about the lower 32-bits. We evaluate as 64-bit as a convenience
   // and truncate the displayed hwnds to 32-bit below.
   // See https://msdn.microsoft.com/en-us/library/aa384203.aspx
   DEBUG_VALUE value;
-  HRESULT hr = debug_control()->Evaluate(args().c_str(), DEBUG_VALUE_INT64,
-                                         &value, nullptr);
+  HRESULT hr = GetDebugClientAs<IDebugControl>()->Evaluate(
+      hwnd_expression.c_str(), DEBUG_VALUE_INT64, &value, nullptr);
   if (FAILED(hr)) {
-    PrintErrorf("Unable to evaluate %s\n", args().c_str());
+    PrintErrorf("Unable to evaluate %s\n", hwnd_expression.c_str());
     return hr;
   }
 
   HWND hwnd = reinterpret_cast<HWND>(value.I64);
   if (!IsWindow(hwnd)) {
-    PrintErrorf("Not a window: %s\n", args().c_str());
+    PrintErrorf("Not a window: %s\n", hwnd_expression.c_str());
     return E_FAIL;
   }
 
diff --git a/chromium/tools/win/chromeexts/commands/view_command.cc b/chromium/tools/win/chromeexts/commands/view_command.cc
new file mode 100644
index 00000000000..ee02886545b
--- /dev/null
+++ b/chromium/tools/win/chromeexts/commands/view_command.cc
@@ -0,0 +1,278 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "tools/win/chromeexts/commands/view_command.h"
+
+#include <dbgeng.h>
+#include <windows.h>
+#include <wrl/client.h>
+
+#include <ostream>
+#include <streambuf>
+#include <string>
+#include <vector>
+
+#include "base/strings/utf_string_conversions.h"
+#include "ui/views/debug/debugger_utils.h"
+
+namespace tools {
+namespace win {
+namespace chromeexts {
+
+namespace {
+
+using Microsoft::WRL::ComPtr;
+
+class DebugOutputBuffer : public std::basic_streambuf<char> {
+ public:
+  DebugOutputBuffer(IDebugControl* debug_control)
+      : debug_control_(debug_control) {}
+  DebugOutputBuffer(const DebugOutputBuffer&) = delete;
+  DebugOutputBuffer& operator=(const DebugOutputBuffer&) = delete;
+  ~DebugOutputBuffer() override = default;
+
+  std::streamsize xsputn(const char* s, std::streamsize count) override {
+    std::string str(s, count);
+    debug_control_->Output(DEBUG_OUTPUT_NORMAL, str.c_str());
+    return count;
+  }
+
+ private:
+  ComPtr<IDebugControl> debug_control_;
+};
+
+class VirtualMemoryBlock {
+ public:
+  VirtualMemoryBlock(IDebugClient* debug_client,
+                     const std::string symbol,
+                     uint64_t address)
+      : address_(address) {
+    unsigned long type_size;
+    if (FAILED(debug_client->QueryInterface(IID_PPV_ARGS(&symbols_))) ||
+        FAILED(
+            symbols_->GetSymbolTypeId(symbol.c_str(), &type_id_, &module_)) ||
+        FAILED(symbols_->GetTypeSize(module_, type_id_, &type_size))) {
+      return;
+    }
+
+    ComPtr<IDebugDataSpaces> data;
+    if (FAILED(symbols_.As(&data))) {
+      return;
+    }
+
+    storage_.resize(type_size);
+    data->ReadVirtual(address_, storage_.data(), type_size, nullptr);
+  }
+
+  ~VirtualMemoryBlock() = default;
+
+  uint64_t address() const { return address_; }
+
+  template <typename T>
+  const T& As() const {
+    return *reinterpret_cast<const T*>(storage_.data());
+  }
+
+  template <typename T>
+  T GetFieldValue(std::string field_name) const {
+    unsigned long field_type_id;
+    unsigned long field_offset;
+    unsigned long field_size;
+    if (FAILED(symbols_->GetFieldTypeAndOffset(
+            module_, type_id_, field_name.c_str(), &field_type_id,
+            &field_offset)) ||
+        FAILED(symbols_->GetTypeSize(module_, field_type_id, &field_size))) {
+      return T();
+    }
+
+    return *reinterpret_cast<const T*>(storage_.data() + field_offset);
+  }
+
+  template <typename T>
+  T GetValueFromOffset(size_t offset) const {
+    return *reinterpret_cast<const T*>(storage_.data() + offset);
+  }
+
+  VirtualMemoryBlock GetFieldMemoryBlock(std::string field_name) const {
+    unsigned long field_type_id;
+    unsigned long field_offset;
+    unsigned long field_size;
+    if (FAILED(symbols_->GetFieldTypeAndOffset(
+            module_, type_id_, field_name.c_str(), &field_type_id,
+            &field_offset)) ||
+        FAILED(symbols_->GetTypeSize(module_, field_type_id, &field_size))) {
+      return VirtualMemoryBlock();
+    }
+    VirtualMemoryBlock field;
+    field.symbols_ = symbols_;
+    auto start = storage_.cbegin() + field_offset;
+    auto end = start + field_size;
+    field.storage_ = std::vector<char>(start, end);
+    field.module_ = module_;
+    field.type_id_ = field_type_id;
+    return field;
+  }
+
+ private:
+  VirtualMemoryBlock() = default;
+
+  uint64_t address_;
+  ComPtr<IDebugSymbols3> symbols_;
+  std::vector<char> storage_;
+  uint64_t module_ = 0;
+  unsigned long type_id_ = 0;
+};
+
+template <typename T>
+std::vector<T> ReadVirtualVector(IDebugDataSpaces* data,
+                                 const std::vector<T>& vector) {
+  size_t size = vector.size();
+  std::vector<T> values(size);
+  values.reserve(vector.capacity());
+  data->ReadVirtual(reinterpret_cast<uint64_t>(vector.data()), values.data(),
+                    sizeof(T) * size, nullptr);
+  return values;
+}
+
+class VirtualViewDebugWrapper : public views::debug::ViewDebugWrapper {
+ public:
+  VirtualViewDebugWrapper(VirtualMemoryBlock view_block,
+                          IDebugClient* debug_client)
+      : view_block_(view_block), debug_client_(debug_client) {}
+  VirtualViewDebugWrapper(const VirtualViewDebugWrapper&) = delete;
+  VirtualViewDebugWrapper& operator=(const VirtualViewDebugWrapper&) = delete;
+  ~VirtualViewDebugWrapper() override = default;
+
+  std::string GetViewClassName() override {
+    unsigned long vtable = view_block_.GetValueFromOffset<unsigned long>(0);
+
+    ComPtr<IDebugSymbols3> symbols;
+    debug_client_.As(&symbols);
+    // TODO: Handle cross-DLL references.
+    char buffer[255];
+    buffer[0] = '\0';
+    symbols->GetNameByOffset(vtable, buffer, ARRAYSIZE(buffer), nullptr,
+                             nullptr);
+    return buffer;
+  }
+
+  base::Optional<intptr_t> GetAddress() override {
+    return view_block_.address();
+  }
+
+  int GetID() override { return view_block_.GetFieldValue<int>("id_"); }
+  BoundsTuple GetBounds() override {
+    VirtualMemoryBlock bounds_block =
+        view_block_.GetFieldMemoryBlock("bounds_");
+    VirtualMemoryBlock origin_block =
+        bounds_block.GetFieldMemoryBlock("origin_");
+    VirtualMemoryBlock size_block = bounds_block.GetFieldMemoryBlock("size_");
+    return BoundsTuple(origin_block.GetFieldValue<int>("x_"),
+                       origin_block.GetFieldValue<int>("y_"),
+                       size_block.GetFieldValue<int>("height_"),
+                       size_block.GetFieldValue<int>("width_"));
+  }
+  bool GetVisible() override {
+    return view_block_.GetFieldValue<bool>("visible_");
+  }
+  bool GetNeedsLayout() override {
+    return view_block_.GetFieldValue<bool>("needs_layout_");
+  }
+  bool GetEnabled() override {
+    return view_block_.GetFieldValue<bool>("enabled_");
+  }
+  std::vector<ViewDebugWrapper*> GetChildren() override {
+    if (children_.empty()) {
+      auto children_block = view_block_.GetFieldMemoryBlock("children_");
+      auto& children = children_block.As<std::vector<intptr_t>>();
+      children_.reserve(children.size());
+
+      ComPtr<IDebugDataSpaces> debug_data_spaces;
+      debug_client_.As(&debug_data_spaces);
+      std::vector<intptr_t> virtual_children_ptrs =
+          ReadVirtualVector(debug_data_spaces.Get(), children);
+      for (intptr_t virtual_child_ptr : virtual_children_ptrs) {
+        VirtualMemoryBlock child_memory_block(
+            debug_client_.Get(), "views!views::View", virtual_child_ptr);
+        children_.push_back(std::make_unique<VirtualViewDebugWrapper>(
+            child_memory_block, debug_client_.Get()));
+      }
+    }
+
+    std::vector<ViewDebugWrapper*> child_ptrs;
+    child_ptrs.reserve(children_.size());
+    for (auto& child : children_) {
+      child_ptrs.push_back(child.get());
+    }
+    return child_ptrs;
+  }
+
+ private:
+  VirtualMemoryBlock view_block_;
+  ComPtr<IDebugClient> debug_client_;
+  std::vector<std::unique_ptr<VirtualViewDebugWrapper>> children_;
+};
+
+}  // namespace
+
+ViewCommand::ViewCommand() = default;
+
+ViewCommand::~ViewCommand() = default;
+
+HRESULT ViewCommand::Execute() {
+  auto remaining_arguments = command_line().GetArgs();
+  if (remaining_arguments.size() > 1) {
+    Printf("Unexpected number of arguments %d\n", remaining_arguments.size());
+  }
+
+  DEBUG_VALUE address_debug_value{};
+  if (FAILED(GetDebugClientAs<IDebugControl>()->Evaluate(
+          base::WideToASCII(remaining_arguments[0]).c_str(), DEBUG_VALUE_INT64,
+          &address_debug_value, nullptr))) {
+    Printf("Unevaluatable Expression %ws", remaining_arguments[0].c_str());
+  }
+
+  uint64_t address = reinterpret_cast<uint64_t>(address_debug_value.I64);
+
+  VirtualMemoryBlock view_block(GetDebugClientAs<IDebugClient>().Get(),
+                                "views!views::View", address);
+
+  if (command_line().HasSwitch("children")) {
+    auto children_block = view_block.GetFieldMemoryBlock("children_");
+    auto& children = children_block.As<std::vector<intptr_t>>();
+
+    Printf("Child Count: %d\n", children.size());
+    std::vector<intptr_t> children_ptrs =
+        ReadVirtualVector(GetDebugClientAs<IDebugDataSpaces>().Get(), children);
+
+    if (command_line().HasSwitch("r")) {
+      DebugOutputBuffer buffer(GetDebugClientAs<IDebugControl>().Get());
+      std::ostream out(&buffer);
+      VirtualViewDebugWrapper root(view_block,
+                                   GetDebugClientAs<IDebugClient>().Get());
+      PrintViewHierarchy(&out, &root);
+    } else {
+      for (auto val : children_ptrs) {
+        Printf("%x ", val);
+      }
+      Printf("\n");
+    }
+  } else {
+    VirtualMemoryBlock bounds_block = view_block.GetFieldMemoryBlock("bounds_");
+    VirtualMemoryBlock origin_block =
+        bounds_block.GetFieldMemoryBlock("origin_");
+    VirtualMemoryBlock size_block = bounds_block.GetFieldMemoryBlock("size_");
+    Printf("Bounds: %d,%d (%dx%d)\n", origin_block.GetFieldValue<int>("x_"),
+           origin_block.GetFieldValue<int>("y_"),
+           size_block.GetFieldValue<int>("width_"),
+           size_block.GetFieldValue<int>("height_"));
+    Printf("Parent: 0x%08x\n", view_block.GetFieldValue<intptr_t>("parent_"));
+  }
+
+  return S_OK;
+}
+
+}  // namespace chromeexts
+}  // namespace win
+}  // namespace tools
diff --git a/chromium/tools/win/chromeexts/commands/view_command.h b/chromium/tools/win/chromeexts/commands/view_command.h
new file mode 100644
index 00000000000..3da13c71ffc
--- /dev/null
+++ b/chromium/tools/win/chromeexts/commands/view_command.h
@@ -0,0 +1,29 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef TOOLS_WIN_CHROMEEXTS_COMMANDS_VIEW_COMMAND_H_
+#define TOOLS_WIN_CHROMEEXTS_COMMANDS_VIEW_COMMAND_H_
+
+#include "tools/win/chromeexts/chrome_exts_command.h"
+
+namespace tools {
+namespace win {
+namespace chromeexts {
+
+class ViewCommand : public ChromeExtsCommand {
+ public:
+  ViewCommand();
+  ViewCommand(const ViewCommand&) = delete;
+  ViewCommand& operator=(const ViewCommand&) = delete;
+  ~ViewCommand() override;
+
+ protected:
+  HRESULT Execute() override;
+};
+
+}  // namespace chromeexts
+}  // namespace win
+}  // namespace tools
+
+#endif  // TOOLS_WIN_CHROMEEXTS_COMMANDS_VIEW_COMMAND_H_