[DevTools] Audits - return artifacts w/ AuditsTestRunner.waitForResults

Change-Id: Id9c20b4f4c7f34e5d8e3670889703e87ad17fc45
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1762582Reviewed-by: Paul Irish <paulirish@chromium.org>
Commit-Queue: Connor Clark <cjamcl@google.com>
Cr-Commit-Position: refs/heads/master@{#688742}

third_party/blink/renderer/devtools/front_end/audits_test_runner/AuditsTestRunner.js

@@ -67,7 +67,8 @@ AuditsTestRunner.addStatusListener = function(onMessage) {
  */
 AuditsTestRunner.waitForResults = function() {
   return new Promise(resolve => {
-    TestRunner.addSniffer(Audits.AuditsPanel.prototype, '_buildReportUI', resolve);
+    TestRunner.addSniffer(Audits.AuditsPanel.prototype, '_buildReportUI',
+      (lhr, artifacts) => resolve({lhr, artifacts}));
   });
 };
 

third_party/blink/web_tests/http/tests/devtools/audits/audits-flags-run-expected.txt

@@ -14,4 +14,5 @@ Run audits: enabled visible
 emulatedFormFactor: desktop
 disableStorageReset: false
 throttlingMethod: provided
+TestedAsMobileDevice: false
 

third_party/blink/web_tests/http/tests/devtools/audits/audits-flags-run.js

@@ -15,11 +15,12 @@
   AuditsTestRunner.dumpStartAuditState();
   AuditsTestRunner.getRunButton().click();
 
-  const results = await AuditsTestRunner.waitForResults();
+  const {artifacts, lhr} = await AuditsTestRunner.waitForResults();
   TestRunner.addResult(`\n=============== Lighthouse Results ===============`);
-  TestRunner.addResult(`emulatedFormFactor: ${results.configSettings.emulatedFormFactor}`);
-  TestRunner.addResult(`disableStorageReset: ${results.configSettings.disableStorageReset}`);
-  TestRunner.addResult(`throttlingMethod: ${results.configSettings.throttlingMethod}`);
+  TestRunner.addResult(`emulatedFormFactor: ${lhr.configSettings.emulatedFormFactor}`);
+  TestRunner.addResult(`disableStorageReset: ${lhr.configSettings.disableStorageReset}`);
+  TestRunner.addResult(`throttlingMethod: ${lhr.configSettings.throttlingMethod}`);
+  TestRunner.addResult(`TestedAsMobileDevice: ${artifacts.TestedAsMobileDevice}`);
 
   TestRunner.completeTest();
 })();

third_party/blink/web_tests/http/tests/devtools/audits/audits-limited-run.js

@@ -21,9 +21,9 @@
   AuditsTestRunner.dumpStartAuditState();
   AuditsTestRunner.getRunButton().click();
 
-  const results = await AuditsTestRunner.waitForResults();
+  const {lhr} = await AuditsTestRunner.waitForResults();
   TestRunner.addResult(`\n=============== Audits run ===============`);
-  TestRunner.addResult(Object.keys(results.audits).sort().join('\n'));
+  TestRunner.addResult(Object.keys(lhr.audits).sort().join('\n'));
 
   TestRunner.completeTest();
 })();

third_party/blink/web_tests/http/tests/devtools/audits/audits-successful-run-expected.txt

@@ -283,6 +283,7 @@ Generating results...
 =============== Lighthouse Results ===============
 URL: http://127.0.0.1:8000/devtools/resources/inspected-page.html
 Version: 5.2.0
+TestedAsMobileDevice: true
 
 
 accesskeys: notApplicable

third_party/blink/web_tests/http/tests/devtools/audits/audits-successful-run.js

@@ -47,14 +47,15 @@
   AuditsTestRunner.addStatusListener(msg => TestRunner.addResult(msg));
   AuditsTestRunner.getRunButton().click();
 
-  var results = await AuditsTestRunner.waitForResults();
+  var {artifacts, lhr} = await AuditsTestRunner.waitForResults();
   TestRunner.addResult(`\n=============== Lighthouse Results ===============`);
-  TestRunner.addResult(`URL: ${results.finalUrl}`);
-  TestRunner.addResult(`Version: ${results.lighthouseVersion}`);
+  TestRunner.addResult(`URL: ${lhr.finalUrl}`);
+  TestRunner.addResult(`Version: ${lhr.lighthouseVersion}`);
+  TestRunner.addResult(`TestedAsMobileDevice: ${artifacts.TestedAsMobileDevice}`);
   TestRunner.addResult('\n');
 
-  Object.keys(results.audits).sort().forEach(auditName => {
-    var audit = results.audits[auditName];
+  Object.keys(lhr.audits).sort().forEach(auditName => {
+    var audit = lhr.audits[auditName];
 
     if (FLAKY_AUDITS.includes(auditName)) {
       TestRunner.addResult(`${auditName}: flaky`);

third_party/blink/web_tests/http/tests/devtools/audits/audits-view-trace-run.js

@@ -21,9 +21,9 @@
   AuditsTestRunner.dumpStartAuditState();
   AuditsTestRunner.getRunButton().click();
 
-  const results = await AuditsTestRunner.waitForResults();
+  const {lhr} = await AuditsTestRunner.waitForResults();
   TestRunner.addResult(`\n=============== Audits run ===============`);
-  TestRunner.addResult(Object.keys(results.audits).sort().join('\n'));
+  TestRunner.addResult(Object.keys(lhr.audits).sort().join('\n'));
 
   const waitForShowView = new Promise(resolve => {
     TestRunner.addSniffer(UI.ViewManager.prototype, 'showView', resolve);