From 96c3f943b2f6e26bd871ecfcce71b6a33e214ebf Mon Sep 17 00:00:00 2001
From: jrandolf <86539915+jrandolf@users.noreply.github.com>
Date: Fri, 4 Feb 2022 12:18:53 +0100
Subject: [PATCH] feat(chromium): roll to Chromium 99.0.4844.16 (r961656)
 (#7960)

Co-authored-by: Randolf Jung <jrandolf@chromium.org>
---
 package.json                  | 2 +-
 src/revisions.ts              | 2 +-
 test/ariaqueryhandler.spec.ts | 9 ++++++++-
 utils/check_availability.js   | 7 ++++++-
 versions.js                   | 1 +
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index b26b54e485e99..08e44d153de38 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "debug": "4.3.3",
-    "devtools-protocol": "0.0.948846",
+    "devtools-protocol": "0.0.960912",
     "extract-zip": "2.0.1",
     "https-proxy-agent": "5.0.0",
     "node-fetch": "2.6.7",
diff --git a/src/revisions.ts b/src/revisions.ts
index f7265888eeaa6..6cdec040a296e 100644
--- a/src/revisions.ts
+++ b/src/revisions.ts
@@ -20,6 +20,6 @@ type Revisions = Readonly<{
 }>;
 
 export const PUPPETEER_REVISIONS: Revisions = {
-  chromium: '950341',
+  chromium: '961656',
   firefox: 'latest',
 };
diff --git a/test/ariaqueryhandler.spec.ts b/test/ariaqueryhandler.spec.ts
index 504706af88a2d..061f5b6b467b4 100644
--- a/test/ariaqueryhandler.spec.ts
+++ b/test/ariaqueryhandler.spec.ts
@@ -594,7 +594,14 @@ describeChromeOnly('AriaQueryHandler', () => {
       const { page } = getTestState();
       const found = await page.$$<HTMLButtonElement>('aria/[role="button"]');
       const ids = await getIds(found);
-      expect(ids).toEqual(['node5', 'node6', 'node8', 'node10', 'node21']);
+      expect(ids).toEqual([
+        'node5',
+        'node6',
+        'node7',
+        'node8',
+        'node10',
+        'node21',
+      ]);
     });
     it('should find by role "heading"', async () => {
       const { page } = getTestState();
diff --git a/utils/check_availability.js b/utils/check_availability.js
index fbc115c1a53f0..ba8129554d42d 100755
--- a/utils/check_availability.js
+++ b/utils/check_availability.js
@@ -256,7 +256,12 @@ function fetch(url) {
       });
     })
     .on('error', function (e) {
-      console.error('Error fetching json: ' + e);
+      // This is okay; the server may just be faster at closing than us after
+      // the body is fully sent.
+      if (e.message.includes('ECONNRESET')) {
+        return;
+      }
+      console.error(`Error fetching json from ${url}: ${e}`);
       resolve(null);
     });
   return promise;
diff --git a/versions.js b/versions.js
index cbfb6942d2f80..f44f1cc2dea78 100644
--- a/versions.js
+++ b/versions.js
@@ -17,6 +17,7 @@
 const versionsPerRelease = new Map([
   // This is a mapping from Chromium version => Puppeteer version.
   // In Chromium roll patches, use 'NEXT' for the Puppeteer version.
+  ['99.0.4844.16', 'NEXT'],
   ['98.0.4758.0', 'v13.1.0'],
   ['97.0.4692.0', 'v12.0.0'],
   ['93.0.4577.0', 'v10.2.0'],