[pull] main from chromium:main

DEPS

@@ -239,15 +239,15 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and whatever else without interference from each other.
-  'skia_revision': 'e17fd4fea551ea554b67af7c044b5fbc1e90ce00',
+  'skia_revision': 'dc60ca197e0280fb2fe82e42321498a0443b408f',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
   'v8_revision': 'ceb9223e1ab1df795d5f3e69f9fae92bb8328e92',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling ANGLE
   # and whatever else without interference from each other.
-  'angle_revision': '8419f4fcd1ec05ffac0ac51a1ac73f343dab00f4',
+  'angle_revision': 'feb599ad894ba42e14c89a0c61f34bad8d575eeb',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling SwiftShader
   # and whatever else without interference from each other.
@@ -270,7 +270,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling googletest
   # and whatever else without interference from each other.
-  'googletest_revision': '054a986a8513149e8374fc669a5fe40117ca6b41',
+  'googletest_revision': '97a467571a0f615a4d96e79e4399c43221ca1232',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling lighttpd
   # and whatever else without interference from each other.
@@ -306,7 +306,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling catapult
   # and whatever else without interference from each other.
-  'catapult_revision': 'b759738dea9abafcbd0dc69553fd049a86e7b56b',
+  'catapult_revision': '58f3a92099a02ccc517ce7bce93b75da0766b451',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libFuzzer
   # and whatever else without interference from each other.
@@ -354,7 +354,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
-  'dawn_revision': '5397f9f9d0fa2d4adb03553f60d3fc4d4db5936c',
+  'dawn_revision': '736dd07303323021e92fddc5be02a63af66c20ce',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling feed
   # and whatever else without interference from each other.
@@ -727,7 +727,7 @@ deps = {
       'packages': [
         {
           'package': 'chromium/rts/model/mac-amd64',
-          'version': 'ST_XL0WVEj5Xxvj-kAcMuyZsvgGw_VNlvbupF6-aFXUC',
+          'version': 'LeoA0Wv35bgH_p5lOkwPxa1y0XTsB5tlcoYRFw8ioY4C',
         },
       ],
       'dep_type': 'cipd',
@@ -1038,7 +1038,7 @@ deps = {
   },
 
   'src/third_party/depot_tools':
-    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '48b35e123dff26b1ede11104316cbb7f462db4e8',
+    Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + 'e88997a2613aaaabd83718ef25ff9a47bb70090c',
 
   'src/third_party/devtools-frontend/src':
     Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'),
@@ -1700,7 +1700,7 @@ deps = {
     Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@b52ee54b2a18637068d39e2aa0f4d94588076891',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@cc4f8ef12d745384de360d967ac3f324fdeb8b67',
     'condition': 'checkout_src_internal',
   },
 

ash/BUILD.gn

@@ -2748,6 +2748,7 @@ test("ash_unittests") {
     "//chromeos/components/sensors:sensors",
     "//chromeos/components/sensors:test_support",
     "//chromeos/components/sensors/mojom",
+    "//chromeos/constants",
     "//chromeos/dbus:test_support",
     "//chromeos/dbus/audio",
     "//chromeos/dbus/hammerd",

ash/DEPS

@@ -61,6 +61,7 @@ include_rules = [
   "+chromeos/components/multidevice",
   "+chromeos/components/quick_answers",
   "+chromeos/components/sensors",
+  "+chromeos/constants",
   # crosapi is an API to support lacros.
   "+chromeos/crosapi",
   # //ash can access all D-Bus client libraries. The mustash project previously

ash/accessibility/accessibility_controller_impl.cc

@@ -430,27 +430,267 @@ std::string UmaNameForSwitchAccessCommand(SwitchAccessCommand command) {
 
 // These values are persisted to logs. Entries should not be renumbered and
 // numeric values should never be reused.
-enum class SwitchAccessCommandKeyCode {
+enum class SwitchAccessKeyCode {
   kUnknown = 0,
-  kNone = 1,
-  kSpace = 2,
-  kEnter = 3,
-  kMaxValue = kEnter,
+  kKeycode1 = 1,
+  kKeycode2 = 2,
+  kKeycode3 = 3,
+  kKeycode4 = 4,
+  kKeycode5 = 5,
+  kKeycode6 = 6,
+  kKeycode7 = 7,
+  kBackspace = 8,
+  kTab = 9,
+  kKeycode10 = 10,
+  kKeycode11 = 11,
+  kClear = 12,
+  kReturn = 13,
+  kKeycode14 = 14,
+  kKeycode15 = 15,
+  kShift = 16,
+  kControl = 17,
+  kAlt = 18,
+  kPause = 19,
+  kCapital = 20,
+  kKana = 21,
+  kKeycode22 = 22,
+  kJunja = 23,
+  kFinal = 24,
+  kHanja = 25,
+  kKeycode26 = 26,
+  kEscape = 27,
+  kConvert = 28,
+  kNonconvert = 29,
+  kAccept = 30,
+  kModechange = 31,
+  kSpace = 32,
+  kPrior = 33,
+  kNext = 34,
+  kEnd = 35,
+  kHome = 36,
+  kLeft = 37,
+  kUp = 38,
+  kRight = 39,
+  kDown = 40,
+  kSelect = 41,
+  kPrint = 42,
+  kExecute = 43,
+  kSnapshot = 44,
+  kInsert = 45,
+  kKeyDelete = 46,
+  kHelp = 47,
+  kNum0 = 48,
+  kNum1 = 49,
+  kNum2 = 50,
+  kNum3 = 51,
+  kNum4 = 52,
+  kNum5 = 53,
+  kNum6 = 54,
+  kNum7 = 55,
+  kNum8 = 56,
+  kNum9 = 57,
+  kKeycode58 = 58,
+  kKeycode59 = 59,
+  kKeycode60 = 60,
+  kKeycode61 = 61,
+  kKeycode62 = 62,
+  kKeycode63 = 63,
+  kKeycode64 = 64,
+  kA = 65,
+  kB = 66,
+  kC = 67,
+  kD = 68,
+  kE = 69,
+  kF = 70,
+  kG = 71,
+  kH = 72,
+  kI = 73,
+  kJ = 74,
+  kK = 75,
+  kL = 76,
+  kM = 77,
+  kN = 78,
+  kO = 79,
+  kP = 80,
+  kQ = 81,
+  kR = 82,
+  kS = 83,
+  kT = 84,
+  kU = 85,
+  kV = 86,
+  kW = 87,
+  kX = 88,
+  kY = 89,
+  kZ = 90,
+  kLwin = 91,
+  kRwin = 92,
+  kApps = 93,
+  kKeycode94 = 94,
+  kSleep = 95,
+  kNumpad0 = 96,
+  kNumpad1 = 97,
+  kNumpad2 = 98,
+  kNumpad3 = 99,
+  kNumpad4 = 100,
+  kNumpad5 = 101,
+  kNumpad6 = 102,
+  kNumpad7 = 103,
+  kNumpad8 = 104,
+  kNumpad9 = 105,
+  kMultiply = 106,
+  kAdd = 107,
+  kSeparator = 108,
+  kSubtract = 109,
+  kDecimal = 110,
+  kDivide = 111,
+  kF1 = 112,
+  kF2 = 113,
+  kF3 = 114,
+  kF4 = 115,
+  kF5 = 116,
+  kF6 = 117,
+  kF7 = 118,
+  kF8 = 119,
+  kF9 = 120,
+  kF10 = 121,
+  kF11 = 122,
+  kF12 = 123,
+  kF13 = 124,
+  kF14 = 125,
+  kF15 = 126,
+  kF16 = 127,
+  kF17 = 128,
+  kF18 = 129,
+  kF19 = 130,
+  kF20 = 131,
+  kF21 = 132,
+  kF22 = 133,
+  kF23 = 134,
+  kF24 = 135,
+  kKeycode136 = 136,
+  kKeycode137 = 137,
+  kKeycode138 = 138,
+  kKeycode139 = 139,
+  kKeycode140 = 140,
+  kKeycode141 = 141,
+  kKeycode142 = 142,
+  kKeycode143 = 143,
+  kNumlock = 144,
+  kScroll = 145,
+  kKeycode146 = 146,
+  kKeycode147 = 147,
+  kKeycode148 = 148,
+  kKeycode149 = 149,
+  kKeycode150 = 150,
+  kWlan = 151,
+  kPower = 152,
+  kAssistant = 153,
+  kKeycode154 = 154,
+  kKeycode155 = 155,
+  kKeycode156 = 156,
+  kKeycode157 = 157,
+  kKeycode158 = 158,
+  kKeycode159 = 159,
+  kLshift = 160,
+  kRshift = 161,
+  kLcontrol = 162,
+  kRcontrol = 163,
+  kLmenu = 164,
+  kRmenu = 165,
+  kBrowserBack = 166,
+  kBrowserForward = 167,
+  kBrowserRefresh = 168,
+  kBrowserStop = 169,
+  kBrowserSearch = 170,
+  kBrowserFavorites = 171,
+  kBrowserHome = 172,
+  kVolumeMute = 173,
+  kVolumeDown = 174,
+  kVolumeUp = 175,
+  kMediaNextTrack = 176,
+  kMediaPrevTrack = 177,
+  kMediaStop = 178,
+  kMediaPlayPause = 179,
+  kMediaLaunchMail = 180,
+  kMediaLaunchMediaSelect = 181,
+  kMediaLaunchApp1 = 182,
+  kMediaLaunchApp2 = 183,
+  kKeycode184 = 184,
+  kKeycode185 = 185,
+  kOem1 = 186,
+  kOemPlus = 187,
+  kOemComma = 188,
+  kOemMinus = 189,
+  kOemPeriod = 190,
+  kOem2 = 191,
+  kOem3 = 192,
+  kKeycode193 = 193,
+  kKeycode194 = 194,
+  kKeycode195 = 195,
+  kKeycode196 = 196,
+  kKeycode197 = 197,
+  kKeycode198 = 198,
+  kKeycode199 = 199,
+  kKeycode200 = 200,
+  kKeycode201 = 201,
+  kKeycode202 = 202,
+  kKeycode203 = 203,
+  kKeycode204 = 204,
+  kKeycode205 = 205,
+  kKeycode206 = 206,
+  kKeycode207 = 207,
+  kKeycode208 = 208,
+  kKeycode209 = 209,
+  kKeycode210 = 210,
+  kKeycode211 = 211,
+  kKeycode212 = 212,
+  kKeycode213 = 213,
+  kKeycode214 = 214,
+  kKeycode215 = 215,
+  kBrightnessDown = 216,
+  kBrightnessUp = 217,
+  kKbdBrightnessDown = 218,
+  kOem4 = 219,
+  kOem5 = 220,
+  kOem6 = 221,
+  kOem7 = 222,
+  kOem8 = 223,
+  kKeycode224 = 224,
+  kAltgr = 225,
+  kOem102 = 226,
+  kKeycode227 = 227,
+  kKeycode228 = 228,
+  kProcesskey = 229,
+  kCompose = 230,
+  kPacket = 231,
+  kKbdBrightnessUp = 232,
+  kKeycode233 = 233,
+  kKeycode234 = 234,
+  kKeycode235 = 235,
+  kKeycode236 = 236,
+  kKeycode237 = 237,
+  kKeycode238 = 238,
+  kKeycode239 = 239,
+  kKeycode240 = 240,
+  kKeycode241 = 241,
+  kKeycode242 = 242,
+  kDbeSbcschar = 243,
+  kDbeDbcschar = 244,
+  kKeycode245 = 245,
+  kAttn = 246,
+  kCrsel = 247,
+  kExsel = 248,
+  kEreof = 249,
+  kPlay = 250,
+  kZoom = 251,
+  kNoname = 252,
+  kPa1 = 253,
+  kOemClear = 254,
+  kKeycode255 = 255,
+  kNone = 256,
+  kMaxValue = kNone,
 };
 
-SwitchAccessCommandKeyCode UmaValueForKeyCode(int key_code) {
-  switch (key_code) {
-    case 0:
-      return SwitchAccessCommandKeyCode::kNone;
-    case 13:
-      return SwitchAccessCommandKeyCode::kEnter;
-    case 32:
-      return SwitchAccessCommandKeyCode::kSpace;
-    default:
-      return SwitchAccessCommandKeyCode::kUnknown;
-  }
-}
-
 void MigrateSwitchAccessKeyCodePref(PrefService* prefs,
                                     const std::string& old_pref,
                                     const std::string& new_pref) {
@@ -1835,12 +2075,11 @@ void AccessibilityControllerImpl::UpdateSwitchAccessKeyCodesFromPref(
 
   std::string uma_name = UmaNameForSwitchAccessCommand(command);
   if (key_codes.size() == 0) {
-    SwitchAccessCommandKeyCode uma_value = UmaValueForKeyCode(0);
-    base::UmaHistogramEnumeration(uma_name, uma_value);
+    base::UmaHistogramEnumeration(uma_name, SwitchAccessKeyCode::kNone);
   }
   for (const auto& key_code : key_codes) {
-    SwitchAccessCommandKeyCode uma_value = UmaValueForKeyCode(key_code.first);
-    base::UmaHistogramEnumeration(uma_name, uma_value);
+    base::UmaHistogramEnumeration(
+        uma_name, static_cast<SwitchAccessKeyCode>(key_code.first));
   }
 
   accessibility_event_rewriter_->SetKeyCodesForSwitchAccessCommand(key_codes,