From 9bd52ba7d08fba0181fd97ecea95c0f316a9e9c1 Mon Sep 17 00:00:00 2001
From: jonkeller <jonkeller@google.com>
Date: Thu, 29 Aug 2019 14:53:01 -0400
Subject: [PATCH 1/8] Adds AdSense utility functions

---
 .../utils/resource-classification.js          | 55 ++++++++++++++++++-
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/lighthouse-plugin-publisher-ads/utils/resource-classification.js b/lighthouse-plugin-publisher-ads/utils/resource-classification.js
index 8c073248..29ef2613 100644
--- a/lighthouse-plugin-publisher-ads/utils/resource-classification.js
+++ b/lighthouse-plugin-publisher-ads/utils/resource-classification.js
@@ -69,6 +69,29 @@ function isGpt(url) {
   return isGptTag(url) || isImplTag(url);
 }
 
+/**
+ * Checks if the url is loading an AdSense script.
+ * @param {URL|string} url
+ * @return {boolean}
+ */
+function isAdSenseTag(url) {
+  const {host, pathname} = toURL(url);
+  const matchesHost = [
+    'pagead2.googlesyndication.com'].includes(host);
+  const matchesPath =
+      ['pagead/js/adsbygoogle.js'].includes(pathname);
+  return matchesHost && matchesPath;
+}
+
+/**
+ * Checks if the url is loading an AdSense script.
+ * @param {URL} url
+ * @return {boolean}
+ */
+function isAdSense(url) {
+  return isAdSenseTag(url);
+}
+
 /**
  * Checks if str contains at least one provided substring.
  * @param {string} str
@@ -88,9 +111,23 @@ function isGptAdRequest(request) {
   if (!request) return false;
   const url = new URL(request.url);
   return (
-    url.pathname === '/gampad/ads' &&
-    url.host === 'securepubads.g.doubleclick.net' &&
-    request.resourceType === 'XHR'
+      url.pathname === '/gampad/ads' &&
+      url.host === 'securepubads.g.doubleclick.net' &&
+      request.resourceType === 'XHR'
+  );
+}
+
+/**
+ * Checks if a network request is an AdSense ad request.
+ * @param {LH.Artifacts.NetworkRequest} request
+ * @return {boolean}
+ */
+function isAdSenseAdRequest(request) {
+  if (!request) return false;
+  const url = new URL(request.url);
+  return (
+      url.pathname === 'pagead/ads' &&
+      url.host === 'googleads.g.doubleclick.net'
   );
 }
 
@@ -168,6 +205,14 @@ function isGptIframe(iframe) {
   return /(^google_ads_iframe_)/.test(iframe.id);
 }
 
+/**
+ * @param {Artifacts['IFrameElement']} iframe
+ * @return {boolean}
+ */
+function isAdSenseIframe(iframe) {
+  return /(^google_ads_frame)/.test(iframe.id);
+}
+
 /**
  * Removes the query string from the URL.
  * @param {string} url
@@ -201,14 +246,18 @@ module.exports = {
   isBidRequest,
   isGoogleAds,
   isGptAdRequest,
+  isAdSenseAdRequest,
   hasImpressionPath,
   isGpt,
   isGptTag,
   isImplTag,
+  isAdSense,
+  isAdSenseTag,
   containsAnySubstring,
   getHeaderBidder,
   isStaticRequest,
   isGptIframe,
+  isAdSenseIframe,
   getAbbreviatedUrl,
   trimUrl,
 };

From aa64d466c2e827a3ccfc2bbbdfcee6a55f14405c Mon Sep 17 00:00:00 2001
From: jonkeller <jonkeller@google.com>
Date: Wed, 4 Sep 2019 11:27:52 -0400
Subject: [PATCH 2/8] LoadsGptOverHttps to LoadsAdTagOverHttps

---
 .../audits/gpt-bids-parallel.js               |   4 +-
 ...er-https.js => loads-ad-tag-over-https.js} |  52 +++---
 .../audits/loads-gpt-from-sgdn.js             |   2 +-
 .../messages/common-strings.js                |   2 -
 .../messages/en-US.json                       |  20 +--
 .../messages/locales/en-XL.json               |  13 +-
 lighthouse-plugin-publisher-ads/plugin.js     |   4 +-
 ...est.js => loads-ad-tag-over-https_test.js} | 124 ++++++++++-----
 .../utils/resource-classification.js          | 148 ++++++++++--------
 9 files changed, 216 insertions(+), 153 deletions(-)
 rename lighthouse-plugin-publisher-ads/audits/{loads-gpt-over-https.js => loads-ad-tag-over-https.js} (61%)
 rename lighthouse-plugin-publisher-ads/test/audits/{loads-gpt-over-https_test.js => loads-ad-tag-over-https_test.js} (68%)

diff --git a/lighthouse-plugin-publisher-ads/audits/gpt-bids-parallel.js b/lighthouse-plugin-publisher-ads/audits/gpt-bids-parallel.js
index 0b2777ad..fef27e8c 100644
--- a/lighthouse-plugin-publisher-ads/audits/gpt-bids-parallel.js
+++ b/lighthouse-plugin-publisher-ads/audits/gpt-bids-parallel.js
@@ -18,7 +18,7 @@ const {auditNotApplicable} = require('../messages/common-strings');
 const {Audit} = require('lighthouse');
 const {getCriticalGraph} = require('../utils/graph');
 const {getTimingsByRecord} = require('../utils/network-timing');
-const {isImplTag, isBidRequest, getAbbreviatedUrl, getHeaderBidder} = require('../utils/resource-classification');
+const {isGptImplTag, isBidRequest, getAbbreviatedUrl, getHeaderBidder} = require('../utils/resource-classification');
 
 /** @typedef {LH.Artifacts.NetworkRequest} NetworkRequest */
 /** @typedef {LH.Gatherer.Simulation.NodeTiming} NodeTiming */
@@ -73,7 +73,7 @@ class GptBidsInParallel extends Audit {
     const trace = artifacts.traces[Audit.DEFAULT_PASS];
     const network = await NetworkRecords.request(devtoolsLog, context);
 
-    const pubadsImpl = network.find((r) => isImplTag(r.url));
+    const pubadsImpl = network.find((r) => isGptImplTag(r.url));
     if (!pubadsImpl) {
       return auditNotApplicable.NoTag;
     }
diff --git a/lighthouse-plugin-publisher-ads/audits/loads-gpt-over-https.js b/lighthouse-plugin-publisher-ads/audits/loads-ad-tag-over-https.js
similarity index 61%
rename from lighthouse-plugin-publisher-ads/audits/loads-gpt-over-https.js
rename to lighthouse-plugin-publisher-ads/audits/loads-ad-tag-over-https.js
index 74408cae..19201f5e 100644
--- a/lighthouse-plugin-publisher-ads/audits/loads-gpt-over-https.js
+++ b/lighthouse-plugin-publisher-ads/audits/loads-ad-tag-over-https.js
@@ -17,37 +17,41 @@ const NetworkRecords = require('lighthouse/lighthouse-core/computed/network-reco
 const util = require('util');
 const {auditNotApplicable} = require('../messages/common-strings');
 const {Audit} = require('lighthouse');
-const {isGptTag} = require('../utils/resource-classification');
+const {isAdTag} = require('../utils/resource-classification');
 const {URL} = require('url');
 
 const UIStrings = {
-  title: 'GPT tag is loaded over HTTPS',
-  failureTitle: 'Load GPT over HTTPS',
-  description: 'For privacy and security, always load GPT over HTTPS. ' +
-  'Insecure pages should explicitly request the GPT script securely. Example:' +
-  '`<script async src=\"https://securepubads.g.doubleclick.net/tag/js/gpt.js\"' +
-  '>`. [Learn more](' +
-  'https://developers.google.com/publisher-ads-audits/reference/audits/loads-gpt-over-https' +
+  title: 'Ad tag is loaded over HTTPS',
+  failureTitle: 'Load ad tag over HTTPS',
+  description: 'For privacy and security, always load GPT/AdSense over ' +
+  'HTTPS. Insecure pages should explicitly request the ad script securely. ' +
+  'Examples: ' +
+  '`<script async ' +
+  'src=\"https://securepubads.g.doubleclick.net/tag/js/gpt.js\">` or ' +
+  '`<script async ' +
+  'src=\"https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js\">`' +
+  '. [Learn more](' +
+  'https://developers.google.com/publisher-ads-audits/reference/audits/loads-ad-tag-over-https' +
   ').',
-  failureDisplayValue: 'Load gpt.js over HTTPS',
+  failureDisplayValue: 'Load ad tag over HTTPS',
 };
 
 const str_ = i18n.createMessageInstanceIdFn(__filename, UIStrings);
 
 
 /**
- * Simple audit that checks if gpt is loaded over https.
+ * Simple audit that checks if GPT/AdSense is loaded over https.
  * Currently based on network logs since it covers statically and dynamically
  * loaded scripts from the main page and iframes.
  */
-class LoadsGptOverHttps extends Audit {
+class LoadsAdTagOverHttps extends Audit {
   /**
    * @return {LH.Audit.Meta}
    * @override
    */
   static get meta() {
     return {
-      id: 'loads-gpt-over-https',
+      id: 'loads-ad-tag-over-https',
       title: str_(UIStrings.title),
       failureTitle: str_(UIStrings.failureTitle),
       description: str_(UIStrings.description),
@@ -69,35 +73,35 @@ class LoadsGptOverHttps extends Audit {
       return auditNotApplicable.NoRecords;
     }
 
-    const gptRequests = networkRecords
-        .filter((record) => isGptTag(new URL(record.url)));
+    const adRequests = networkRecords
+        .filter((record) => isAdTag(new URL(record.url)));
 
-    const secureGptRequests = gptRequests.filter((request) => request.isSecure);
+    const secureAdRequests = adRequests.filter((request) => request.isSecure);
 
     /** @type {LH.Audit.Details.DebugData} */
     const details = {
       type: 'debugdata',
-      numGptHttpReqs: gptRequests.length - secureGptRequests.length,
-      numGptHttpsReqs: secureGptRequests.length,
+      numAdTagHttpReqs: adRequests.length - secureAdRequests.length,
+      numAdTagHttpsReqs: secureAdRequests.length,
     };
 
-    if (!gptRequests.length) {
-      const returnVal = auditNotApplicable.NoGpt;
+    if (!adRequests.length) {
+      const returnVal = auditNotApplicable.NoTag;
       returnVal.details = details;
       return returnVal;
     }
 
     return {
-      numericValue: details.numGptHttpReqs,
-      score: details.numGptHttpReqs ? 0 : 1,
-      displayValue: details.numGptHttpReqs ?
+      numericValue: details.numAdTagHttpReqs,
+      score: details.numAdTagHttpReqs ? 0 : 1,
+      displayValue: details.numAdTagHttpReqs ?
         util.format(
-          str_(UIStrings.failureDisplayValue), details.numGptHttpReqs) :
+          str_(UIStrings.failureDisplayValue), details.numAdTagHttpReqs) :
         '',
       details,
     };
   }
 }
 
-module.exports = LoadsGptOverHttps;
+module.exports = LoadsAdTagOverHttps;
 module.exports.UIStrings = UIStrings;
diff --git a/lighthouse-plugin-publisher-ads/audits/loads-gpt-from-sgdn.js b/lighthouse-plugin-publisher-ads/audits/loads-gpt-from-sgdn.js
index 81379854..d2027ec2 100644
--- a/lighthouse-plugin-publisher-ads/audits/loads-gpt-from-sgdn.js
+++ b/lighthouse-plugin-publisher-ads/audits/loads-gpt-from-sgdn.js
@@ -61,7 +61,7 @@ class LoadsGptFromSgdn extends Audit {
     const networkRecords = await NetworkRecords.request(devtoolsLog, context);
     const gptUrl = networkRecords.map((r) => new URL(r.url)).find(isGptTag);
     if (!gptUrl) {
-      return auditNotApplicable.NoGpt;
+      return auditNotApplicable.NoTag;
     }
     return {
       score: Number(gptUrl.host === 'securepubads.g.doubleclick.net'),
diff --git a/lighthouse-plugin-publisher-ads/messages/common-strings.js b/lighthouse-plugin-publisher-ads/messages/common-strings.js
index 76f22805..769b4410 100644
--- a/lighthouse-plugin-publisher-ads/messages/common-strings.js
+++ b/lighthouse-plugin-publisher-ads/messages/common-strings.js
@@ -25,7 +25,6 @@ const UIStrings = {
   NOT_APPLICABLE__NO_ADS: 'No ads requested',
   NOT_APPLICABLE__NO_BIDS: 'No bids detected',
   NOT_APPLICABLE__NO_EVENT_MATCHING_REQ: 'No event matches network records',
-  NOT_APPLICABLE__NO_GPT: 'GPT not requested',
   NOT_APPLICABLE__NO_RECORDS: 'No successful network records',
   NOT_APPLICABLE__NO_VISIBLE_SLOTS: 'No visible slots',
   NOT_APPLICABLE__NO_TAG: 'No tag requested',
@@ -69,7 +68,6 @@ const auditNotApplicable = {
   NoBids: notApplicableObj(UIStrings.NOT_APPLICABLE__NO_BIDS),
   NoEventMatchingReq: notApplicableObj(
     UIStrings.NOT_APPLICABLE__NO_EVENT_MATCHING_REQ),
-  NoGpt: notApplicableObj(UIStrings.NOT_APPLICABLE__NO_GPT),
   NoRecords: notApplicableObj(UIStrings.NOT_APPLICABLE__NO_RECORDS),
   NoVisibleSlots: notApplicableObj(UIStrings.NOT_APPLICABLE__NO_VISIBLE_SLOTS),
   NoTag: notApplicableObj(UIStrings.NOT_APPLICABLE__NO_TAG),
diff --git a/lighthouse-plugin-publisher-ads/messages/en-US.json b/lighthouse-plugin-publisher-ads/messages/en-US.json
index 4d4ead72..2f72c258 100644
--- a/lighthouse-plugin-publisher-ads/messages/en-US.json
+++ b/lighthouse-plugin-publisher-ads/messages/en-US.json
@@ -299,20 +299,20 @@
     "message": "GPT tag is loaded from recommended host",
     "description": ""
   },
-  "audits/loads-gpt-over-https.js | description": {
-    "message": "For privacy and security, always load GPT over HTTPS. Insecure pages should explicitly request the GPT script securely. Example:`<script async src=\"https://securepubads.g.doubleclick.net/tag/js/gpt.js\">`. [Learn more](https://developers.google.com/publisher-ads-audits/reference/audits/loads-gpt-over-https).",
+  "audits/loads-ad-tag-over-https.js | description": {
+    "message": "For privacy and security, always load GPT/AdSense over HTTPS. Insecure pages should explicitly request the ad script securely. Example:`<script async src=\"https://securepubads.g.doubleclick.net/tag/js/gpt.js\">` or `<script async src=\"https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js\">`. [Learn more](https://developers.google.com/publisher-ads-audits/reference/audits/loads-ad-tag-over-https).",
     "description": ""
   },
-  "audits/loads-gpt-over-https.js | failureDisplayValue": {
-    "message": "Load gpt.js over HTTPS",
+  "audits/loads-ad-tag-over-https.js | failureDisplayValue": {
+    "message": "Load ad tag over HTTPS",
     "description": ""
   },
-  "audits/loads-gpt-over-https.js | failureTitle": {
-    "message": "Load GPT over HTTPS",
+  "audits/loads-ad-tag-over-https.js | failureTitle": {
+    "message": "Load ad tag over HTTPS",
     "description": ""
   },
-  "audits/loads-gpt-over-https.js | title": {
-    "message": "GPT tag is loaded over HTTPS",
+  "audits/loads-ad-tag-over-https.js | title": {
+    "message": "Ad tag is loaded over HTTPS",
     "description": ""
   },
   "audits/script-injected-tags.js | columnDuration": {
@@ -483,10 +483,6 @@
     "message": "No event matches network records",
     "description": ""
   },
-  "messages/common-strings.js | NOT_APPLICABLE__NO_GPT": {
-    "message": "GPT not requested",
-    "description": ""
-  },
   "messages/common-strings.js | NOT_APPLICABLE__NO_RECORDS": {
     "message": "No successful network records",
     "description": ""
diff --git a/lighthouse-plugin-publisher-ads/messages/locales/en-XL.json b/lighthouse-plugin-publisher-ads/messages/locales/en-XL.json
index ef70a27c..b6162f70 100644
--- a/lighthouse-plugin-publisher-ads/messages/locales/en-XL.json
+++ b/lighthouse-plugin-publisher-ads/messages/locales/en-XL.json
@@ -224,16 +224,16 @@
   "audits/loads-gpt-from-sgdn.js | title": {
     "message": "ĜṔT̂ t́âǵ îś l̂óâd́êd́ f̂ŕôḿ r̂éĉóm̂ḿêńd̂éd̂ h́ôśt̂"
   },
-  "audits/loads-gpt-over-https.js | description": {
-    "message": "F̂ór̂ ṕr̂ív̂áĉý âńd̂ śêćûŕît́ŷ, ál̂ẃâýŝ ĺôád̂ ǴP̂T́ ôv́êŕ ĤT́T̂ṔŜ. Ín̂śêćûŕê ṕâǵêś ŝh́ôúl̂d́ êx́p̂ĺîćît́l̂ý r̂éq̂úêśt̂ t́ĥé ĜṔT̂ śĉŕîṕt̂ śêćûŕêĺŷ. Éx̂ám̂ṕl̂é:`<ŝćr̂íp̂t́ âśŷńĉ śr̂ć=\"ĥt́t̂ṕŝ://śêćûŕêṕûb́âd́ŝ.ǵ.d̂óûb́l̂éĉĺîćk̂.ńêt́/t̂áĝ/j́ŝ/ǵp̂t́.ĵś\">`. [L̂éâŕn̂ ḿôŕê](h́t̂t́p̂ś://d̂év̂él̂óp̂ér̂ś.ĝóôǵl̂é.ĉóm̂/ṕûb́l̂íŝh́êŕ-âd́ŝ-áûd́ît́ŝ/ŕêf́êŕêńĉé/âúd̂ít̂ś/l̂óâd́ŝ-ǵp̂t́-ôv́êŕ-ĥt́t̂ṕŝ)."
+  "audits/loads-ad-tag-over-https.js | description": {
+    "message": "F̂ór̂ ṕr̂ív̂áĉý âńd̂ śêćûŕît́ŷ, ál̂ẃâýŝ ĺôád̂ ǴP̂T́ ôv́êŕ ĤT́T̂ṔŜ. Ín̂śêćûŕê ṕâǵêś ŝh́ôúl̂d́ êx́p̂ĺîćît́l̂ý r̂éq̂úêśt̂ t́ĥé ĜṔT̂ śĉŕîṕt̂ śêćûŕêĺŷ. Éx̂ám̂ṕl̂é:`<ŝćr̂íp̂t́ âśŷńĉ śr̂ć=\"ĥt́t̂ṕŝ://śêćûŕêṕûb́âd́ŝ.ǵ.d̂óûb́l̂éĉĺîćk̂.ńêt́/t̂áĝ/j́ŝ/ǵp̂t́.ĵś\"> ôŕ `<script async src=\"https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js\">``. [L̂éâŕn̂ ḿôŕê](h́t̂t́p̂ś://d̂év̂él̂óp̂ér̂ś.ĝóôǵl̂é.ĉóm̂/ṕûb́l̂íŝh́êŕ-âd́ŝ-áûd́ît́ŝ/ŕêf́êŕêńĉé/âúd̂ít̂ś/l̂óâd́ŝ-ǵp̂t́-ôv́êŕ-ĥt́t̂ṕŝ)."
   },
-  "audits/loads-gpt-over-https.js | failureDisplayValue": {
+  "audits/loads-ad-tag-over-https.js | failureDisplayValue": {
     "message": "L̂óâd́ ĝṕt̂.j́ŝ óv̂ér̂ H́T̂T́P̂Ś"
   },
-  "audits/loads-gpt-over-https.js | failureTitle": {
+  "audits/loads-ad-tag-over-https.js | failureTitle": {
     "message": "L̂óâd́ ĜṔT̂ óv̂ér̂ H́T̂T́P̂Ś"
   },
-  "audits/loads-gpt-over-https.js | title": {
+  "audits/loads-ad-tag-over-https.js | title": {
     "message": "ĜṔT̂ t́âǵ îś l̂óâd́êd́ ôv́êŕ ĤT́T̂ṔŜ"
   },
   "audits/script-injected-tags.js | columnDuration": {
@@ -362,9 +362,6 @@
   "messages/common-strings.js | NOT_APPLICABLE__NO_EVENT_MATCHING_REQ": {
     "message": "N̂ó êv́êńt̂ ḿât́ĉh́êś n̂ét̂ẃôŕk̂ ŕêćôŕd̂ś"
   },
-  "messages/common-strings.js | NOT_APPLICABLE__NO_GPT": {
-    "message": "ĜṔT̂ ńôt́ r̂éq̂úêśt̂éd̂"
-  },
   "messages/common-strings.js | NOT_APPLICABLE__NO_RECORDS": {
     "message": "N̂ó ŝúĉćêśŝf́ûĺ n̂ét̂ẃôŕk̂ ŕêćôŕd̂ś"
   },
diff --git a/lighthouse-plugin-publisher-ads/plugin.js b/lighthouse-plugin-publisher-ads/plugin.js
index 48c808bb..d4df4d45 100644
--- a/lighthouse-plugin-publisher-ads/plugin.js
+++ b/lighthouse-plugin-publisher-ads/plugin.js
@@ -35,7 +35,7 @@ module.exports = {
     {path: `${PLUGIN_PATH}/audits/gpt-bids-parallel`},
     {path: `${PLUGIN_PATH}/audits/idle-network-times`},
     {path: `${PLUGIN_PATH}/audits/loads-gpt-from-sgdn`},
-    {path: `${PLUGIN_PATH}/audits/loads-gpt-over-https`},
+    {path: `${PLUGIN_PATH}/audits/loads-ad-tag-over-https`},
     {path: `${PLUGIN_PATH}/audits/script-injected-tags`},
     {path: `${PLUGIN_PATH}/audits/serial-header-bidding`},
     {path: `${PLUGIN_PATH}/audits/tag-load-time`},
@@ -72,7 +72,7 @@ module.exports = {
       // Best Practices group.
       {id: 'ads-in-viewport', weight: 4, group: 'ads-best-practices'},
       {id: 'async-ad-tags', weight: 2, group: 'ads-best-practices'},
-      {id: 'loads-gpt-over-https', weight: 1, group: 'ads-best-practices'},
+      {id: 'loads-ad-tag-over-https', weight: 1, group: 'ads-best-practices'},
       {id: 'loads-gpt-from-sgdn', weight: 1, group: 'ads-best-practices'},
       {id: 'viewport-ad-density', weight: 1, group: 'ads-best-practices'},
       {id: 'ad-top-of-viewport', weight: 2, group: 'ads-best-practices'},
diff --git a/lighthouse-plugin-publisher-ads/test/audits/loads-gpt-over-https_test.js b/lighthouse-plugin-publisher-ads/test/audits/loads-ad-tag-over-https_test.js
similarity index 68%
rename from lighthouse-plugin-publisher-ads/test/audits/loads-gpt-over-https_test.js
rename to lighthouse-plugin-publisher-ads/test/audits/loads-ad-tag-over-https_test.js
index 5b6e9408..af37ac9b 100644
--- a/lighthouse-plugin-publisher-ads/test/audits/loads-gpt-over-https_test.js
+++ b/lighthouse-plugin-publisher-ads/test/audits/loads-ad-tag-over-https_test.js
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-const LoadsGptOverHttps = require('../../audits/loads-gpt-over-https');
+const LoadsAdTagOverHttps = require('../../audits/loads-ad-tag-over-https');
 const NetworkRecords = require('lighthouse/lighthouse-core/computed/network-records');
 const sinon = require('sinon');
 const {expect} = require('chai');
 
-describe('LoadsGptOverHttps', async () => {
+describe('LoadsAdTagOverHttps', async () => {
   let sandbox;
   beforeEach(() => {
     sandbox = sinon.createSandbox();
@@ -25,7 +25,7 @@ describe('LoadsGptOverHttps', async () => {
   afterEach(() => {
     sandbox.restore();
   });
-  describe('numGptHttpReqs', async () => {
+  describe('numAdTagHttpReqs', async () => {
     const testCases = [
       {
         networkRecords: [],
@@ -48,8 +48,8 @@ describe('LoadsGptOverHttps', async () => {
           },
         ],
         expectedScore: 0,
-        expectedNumGptHttpReqs: 1,
-        expectedNumGptHttpsReqs: 1,
+        expectedNumAdTagHttpReqs: 1,
+        expectedNumAdTagHttpsReqs: 1,
       },
       {
         networkRecords: [
@@ -64,8 +64,8 @@ describe('LoadsGptOverHttps', async () => {
           },
         ],
         expectedScore: 1,
-        expectedNumGptHttpReqs: 0,
-        expectedNumGptHttpsReqs: 1,
+        expectedNumAdTagHttpReqs: 0,
+        expectedNumAdTagHttpsReqs: 1,
       },
       {
         networkRecords: [
@@ -84,8 +84,8 @@ describe('LoadsGptOverHttps', async () => {
           },
         ],
         expectedScore: 0,
-        expectedNumGptHttpReqs: 1,
-        expectedNumGptHttpsReqs: 1,
+        expectedNumAdTagHttpReqs: 1,
+        expectedNumAdTagHttpsReqs: 1,
       },
       {
         networkRecords: [
@@ -100,8 +100,8 @@ describe('LoadsGptOverHttps', async () => {
           },
         ],
         expectedScore: 0,
-        expectedNumGptHttpReqs: 1,
-        expectedNumGptHttpsReqs: 0,
+        expectedNumAdTagHttpReqs: 1,
+        expectedNumAdTagHttpsReqs: 0,
       },
       {
         networkRecords: [
@@ -124,8 +124,8 @@ describe('LoadsGptOverHttps', async () => {
           },
         ],
         expectedScore: 0,
-        expectedNumGptHttpReqs: 2,
-        expectedNumGptHttpsReqs: 1,
+        expectedNumAdTagHttpReqs: 2,
+        expectedNumAdTagHttpsReqs: 1,
       },
       {
         networkRecords: [
@@ -148,36 +148,56 @@ describe('LoadsGptOverHttps', async () => {
           },
         ],
         expectedScore: 0,
-        expectedNumGptHttpReqs: 3,
-        expectedNumGptHttpsReqs: 0,
+        expectedNumAdTagHttpReqs: 3,
+        expectedNumAdTagHttpsReqs: 0,
+      },
+      {
+        networkRecords: [
+          {
+            url: 'https://example.com',
+            isSecure: true,
+            statusCode: 200,
+          },
+          {
+            url: 'https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js',
+            isSecure: true,
+          },
+          {
+            url: 'http://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js#foo',
+            isSecure: false,
+          },
+        ],
+        expectedScore: 0,
+        expectedNumAdTagHttpReqs: 1,
+        expectedNumAdTagHttpsReqs: 1,
       },
     ];
     for (const {networkRecords, expectedScore, expectedNotAppl,
-      expectedNumGptHttpReqs, expectedNumGptHttpsReqs} of testCases) {
+      expectedNumAdTagHttpReqs, expectedNumAdTagHttpsReqs} of testCases) {
       it(`should have a score of ${expectedScore} with` +
-        ` ${expectedNumGptHttpReqs} HTTP requests and` +
-        ` ${expectedNumGptHttpsReqs} HTTPS requests`, async () => {
+        ` ${expectedNumAdTagHttpReqs} HTTP requests and` +
+        ` ${expectedNumAdTagHttpsReqs} HTTPS requests`, async () => {
         sandbox.stub(NetworkRecords, 'request').returns(networkRecords);
-        const results = await LoadsGptOverHttps.audit({devtoolsLogs: {}}, {});
+        const results = await LoadsAdTagOverHttps.audit({devtoolsLogs: {}}, {});
         if (expectedNotAppl) {
           expect(results).to.have.property('notApplicable', true);
         } else {
           expect(results).to.have.property('score', expectedScore);
           expect(results).with.property('details')
-              .property('numGptHttpReqs').equal(expectedNumGptHttpReqs);
+              .property('numAdTagHttpReqs').equal(expectedNumAdTagHttpReqs);
           expect(results).with.property('details')
-              .property('numGptHttpsReqs').equal(expectedNumGptHttpsReqs);
+              .property('numAdTagHttpsReqs').equal(expectedNumAdTagHttpsReqs);
         }
       });
     }
   });
 
-  describe('numGptHttpsReqs', async () => {
+  describe('numAdTagHttpsReqs', async () => {
     const testCases = [
       {
         networkRecords: [],
-        expectedNumGptHttpReqs: 0,
-        expectedNumGptHttpsReqs: 0,
+        expectedNumAdTagHttpReqs: 0,
+        expectedNumAdTagHttpsReqs: 0,
         expectedNotAppl: true,
       },
       {
@@ -193,8 +213,8 @@ describe('LoadsGptOverHttps', async () => {
           },
         ],
         expectedScore: 0,
-        expectedNumGptHttpReqs: 1,
-        expectedNumGptHttpsReqs: 0,
+        expectedNumAdTagHttpReqs: 1,
+        expectedNumAdTagHttpsReqs: 0,
       },
       {
         networkRecords: [
@@ -217,8 +237,8 @@ describe('LoadsGptOverHttps', async () => {
           },
         ],
         expectedScore: 0,
-        expectedNumGptHttpReqs: 1,
-        expectedNumGptHttpsReqs: 2,
+        expectedNumAdTagHttpReqs: 1,
+        expectedNumAdTagHttpsReqs: 2,
       },
       {
         networkRecords: [
@@ -233,8 +253,8 @@ describe('LoadsGptOverHttps', async () => {
           },
         ],
         expectedScore: 1,
-        expectedNumGptHttpReqs: 0,
-        expectedNumGptHttpsReqs: 1,
+        expectedNumAdTagHttpReqs: 0,
+        expectedNumAdTagHttpsReqs: 1,
       },
       {
         networkRecords: [
@@ -253,8 +273,8 @@ describe('LoadsGptOverHttps', async () => {
           },
         ],
         expectedScore: 1,
-        expectedNumGptHttpReqs: 0,
-        expectedNumGptHttpsReqs: 2,
+        expectedNumAdTagHttpReqs: 0,
+        expectedNumAdTagHttpsReqs: 2,
       },
       {
         networkRecords: [
@@ -277,25 +297,49 @@ describe('LoadsGptOverHttps', async () => {
           },
         ],
         expectedScore: 1,
-        expectedNumGptHttpReqs: 0,
-        expectedNumGptHttpsReqs: 3,
+        expectedNumAdTagHttpReqs: 0,
+        expectedNumAdTagHttpsReqs: 3,
+      },
+      {
+        networkRecords: [
+          {
+            url: 'http://example.com',
+            isSecure: false,
+            statusCode: 200,
+          },
+          {
+            url: 'https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js',
+            isSecure: true,
+          },
+          {
+            url: 'https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?foo=bar',
+            isSecure: true,
+          },
+          {
+            url: 'http://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js#foo',
+            isSecure: false,
+          },
+        ],
+        expectedScore: 0,
+        expectedNumAdTagHttpReqs: 1,
+        expectedNumAdTagHttpsReqs: 2,
       },
     ];
     for (const {networkRecords, expectedScore, expectedNotAppl,
-      expectedNumGptHttpReqs, expectedNumGptHttpsReqs} of testCases) {
+      expectedNumAdTagHttpReqs, expectedNumAdTagHttpsReqs} of testCases) {
       it(`should have a score of ${expectedScore} with` +
-        ` ${expectedNumGptHttpReqs} HTTP requests and` +
-        ` ${expectedNumGptHttpsReqs} HTTPS requests`, async () => {
+        ` ${expectedNumAdTagHttpReqs} HTTP requests and` +
+        ` ${expectedNumAdTagHttpsReqs} HTTPS requests`, async () => {
         sandbox.stub(NetworkRecords, 'request').returns(networkRecords);
-        const results = await LoadsGptOverHttps.audit({devtoolsLogs: {}}, {});
+        const results = await LoadsAdTagOverHttps.audit({devtoolsLogs: {}}, {});
         if (expectedNotAppl) {
           expect(results).to.have.property('notApplicable', true);
         } else {
           expect(results).to.have.property('score', expectedScore);
           expect(results).with.property('details')
-              .property('numGptHttpReqs').equal(expectedNumGptHttpReqs);
+              .property('numAdTagHttpReqs').equal(expectedNumAdTagHttpReqs);
           expect(results).with.property('details')
-              .property('numGptHttpsReqs').equal(expectedNumGptHttpsReqs);
+              .property('numAdTagHttpsReqs').equal(expectedNumAdTagHttpsReqs);
         }
       });
     }
diff --git a/lighthouse-plugin-publisher-ads/utils/resource-classification.js b/lighthouse-plugin-publisher-ads/utils/resource-classification.js
index 29ef2613..a0df19fb 100644
--- a/lighthouse-plugin-publisher-ads/utils/resource-classification.js
+++ b/lighthouse-plugin-publisher-ads/utils/resource-classification.js
@@ -36,15 +36,6 @@ function isGoogleAds(url) {
       .test(url.hostname);
 }
 
-/**
- * Checks if the url is for pubads implementation tag.
- * @param {URL|string} url
- * @return {boolean}
- */
-function isImplTag(url) {
-  return /(^\/gpt\/pubads_impl_\d+.js)/.test(toURL(url).pathname);
-}
-
 /**
  * Checks if the url is loading a gpt.js script.
  * @param {URL|string} url
@@ -60,13 +51,45 @@ function isGptTag(url) {
   return matchesHost && matchesPath;
 }
 
+/**
+ * Checks if the url is for pubads implementation tag.
+ * @param {URL|string} url
+ * @return {boolean}
+ */
+function isGptImplTag(url) {
+  return /(^\/gpt\/pubads_impl_\d+.js)/.test(toURL(url).pathname);
+}
+
 /**
  * Checks if the url is loading a gpt.js or pubads_impl_*.js script.
  * @param {URL} url
  * @return {boolean}
  */
 function isGpt(url) {
-  return isGptTag(url) || isImplTag(url);
+  return isGptTag(url) || isGptImplTag(url);
+}
+
+/**
+ * Checks if a network request is a GPT ad request.
+ * @param {LH.Artifacts.NetworkRequest} request
+ * @return {boolean}
+ */
+function isGptAdRequest(request) {
+  if (!request) return false;
+  const url = new URL(request.url);
+  return (
+    url.pathname === '/gampad/ads' &&
+    url.host === 'securepubads.g.doubleclick.net' &&
+    request.resourceType === 'XHR'
+  );
+}
+
+/**
+ * @param {Artifacts['IFrameElement']} iframe
+ * @return {boolean}
+ */
+function isGptIframe(iframe) {
+  return /(^google_ads_iframe_)/.test(iframe.id);
 }
 
 /**
@@ -79,12 +102,14 @@ function isAdSenseTag(url) {
   const matchesHost = [
     'pagead2.googlesyndication.com'].includes(host);
   const matchesPath =
-      ['pagead/js/adsbygoogle.js'].includes(pathname);
+      ['/pagead/js/adsbygoogle.js'].includes(pathname);
   return matchesHost && matchesPath;
 }
 
 /**
- * Checks if the url is loading an AdSense script.
+ * Checks if the url is loading an AdSense script. Kind of pointless since
+ * AdSense doesn't have a separate loader, but provided anyway for symmetry with
+ * isGpt().
  * @param {URL} url
  * @return {boolean}
  */
@@ -93,42 +118,55 @@ function isAdSense(url) {
 }
 
 /**
- * Checks if str contains at least one provided substring.
- * @param {string} str
- * @param {Array<string>} substrings
- * @return {boolean}
- */
-function containsAnySubstring(str, substrings) {
-  return substrings.some((substring) => str.includes(substring));
-}
-
-/**
- * Checks if a network request is a GPT ad request.
+ * Checks if a network request is an AdSense ad request.
  * @param {LH.Artifacts.NetworkRequest} request
  * @return {boolean}
  */
-function isGptAdRequest(request) {
+function isAdSenseAdRequest(request) {
   if (!request) return false;
   const url = new URL(request.url);
   return (
-      url.pathname === '/gampad/ads' &&
-      url.host === 'securepubads.g.doubleclick.net' &&
-      request.resourceType === 'XHR'
+    url.pathname === 'pagead/ads' &&
+    url.host === 'googleads.g.doubleclick.net'
   );
 }
 
 /**
- * Checks if a network request is an AdSense ad request.
- * @param {LH.Artifacts.NetworkRequest} request
+ * @param {Artifacts['IFrameElement']} iframe
  * @return {boolean}
  */
-function isAdSenseAdRequest(request) {
-  if (!request) return false;
-  const url = new URL(request.url);
-  return (
-      url.pathname === 'pagead/ads' &&
-      url.host === 'googleads.g.doubleclick.net'
-  );
+function isAdSenseIframe(iframe) {
+  return /(^google_ads_frame)/.test(iframe.id);
+}
+
+/**
+ * Checks if the url is loading either the GPT loader script or the AdSense
+ * script.
+ * @param {URL} url
+ * @return {boolean}
+ */
+function isAdTag(url) {
+  return isAdSenseTag(url) || isGptTag(url);
+}
+
+/**
+ * Checks if the url is loading either the GPT impl script or the AdSense
+ * script.
+ * @param {URL} url
+ * @return {boolean}
+ */
+function isImplTag(url) {
+  return isAdSenseTag(url) || isGptImplTag(url);
+}
+
+/**
+ * Checks if str contains at least one provided substring.
+ * @param {string} str
+ * @param {Array<string>} substrings
+ * @return {boolean}
+ */
+function containsAnySubstring(str, substrings) {
+  return substrings.some((substring) => str.includes(substring));
 }
 
 /**
@@ -197,22 +235,6 @@ function isStaticRequest(request) {
   return ['parser', 'preload', 'other'].includes(request.initiator.type);
 }
 
-/**
- * @param {Artifacts['IFrameElement']} iframe
- * @return {boolean}
- */
-function isGptIframe(iframe) {
-  return /(^google_ads_iframe_)/.test(iframe.id);
-}
-
-/**
- * @param {Artifacts['IFrameElement']} iframe
- * @return {boolean}
- */
-function isAdSenseIframe(iframe) {
-  return /(^google_ads_frame)/.test(iframe.id);
-}
-
 /**
  * Removes the query string from the URL.
  * @param {string} url
@@ -242,22 +264,24 @@ function getAbbreviatedUrl(url) {
 }
 
 module.exports = {
-  isBidRelatedRequest,
-  isBidRequest,
   isGoogleAds,
-  isGptAdRequest,
-  isAdSenseAdRequest,
-  hasImpressionPath,
-  isGpt,
   isGptTag,
-  isImplTag,
+  isGptImplTag,
+  isGpt,
+  isGptAdRequest,
+  isGptIframe,
   isAdSense,
   isAdSenseTag,
+  isAdSenseAdRequest,
+  isAdSenseIframe,
+  isAdTag,
+  isImplTag,
   containsAnySubstring,
+  hasImpressionPath,
   getHeaderBidder,
+  isBidRelatedRequest,
+  isBidRequest,
   isStaticRequest,
-  isGptIframe,
-  isAdSenseIframe,
-  getAbbreviatedUrl,
   trimUrl,
+  getAbbreviatedUrl,
 };

From 7a4ec250c7c29c4c164b6b1b6fe3450e2bde4005 Mon Sep 17 00:00:00 2001
From: jonkeller <jonkeller@google.com>
Date: Wed, 4 Sep 2019 13:35:53 -0400
Subject: [PATCH 3/8] Implements review feedback about UI strings

---
 .../audits/gpt-bids-parallel.js               |   1 +
 .../audits/loads-ad-tag-over-https.js         |   7 +-
 .../messages/en-US.json                       | 172 ++++++++++++------
 .../messages/locales/en-XL.json               | 143 ++++++++++-----
 4 files changed, 221 insertions(+), 102 deletions(-)

diff --git a/lighthouse-plugin-publisher-ads/audits/gpt-bids-parallel.js b/lighthouse-plugin-publisher-ads/audits/gpt-bids-parallel.js
index fef27e8c..6ee16d19 100644
--- a/lighthouse-plugin-publisher-ads/audits/gpt-bids-parallel.js
+++ b/lighthouse-plugin-publisher-ads/audits/gpt-bids-parallel.js
@@ -118,3 +118,4 @@ class GptBidsInParallel extends Audit {
 }
 
 module.exports = GptBidsInParallel;
+module.exports.UIStrings = UIStrings;
diff --git a/lighthouse-plugin-publisher-ads/audits/loads-ad-tag-over-https.js b/lighthouse-plugin-publisher-ads/audits/loads-ad-tag-over-https.js
index 19201f5e..580c623d 100644
--- a/lighthouse-plugin-publisher-ads/audits/loads-ad-tag-over-https.js
+++ b/lighthouse-plugin-publisher-ads/audits/loads-ad-tag-over-https.js
@@ -25,10 +25,9 @@ const UIStrings = {
   failureTitle: 'Load ad tag over HTTPS',
   description: 'For privacy and security, always load GPT/AdSense over ' +
   'HTTPS. Insecure pages should explicitly request the ad script securely. ' +
-  'Examples: ' +
-  '`<script async ' +
-  'src=\"https://securepubads.g.doubleclick.net/tag/js/gpt.js\">` or ' +
-  '`<script async ' +
+  'GPT Example: `<script async ' +
+  'src=\"https://securepubads.g.doubleclick.net/tag/js/gpt.js\">` ' +
+  'AdSense Example: `<script async ' +
   'src=\"https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js\">`' +
   '. [Learn more](' +
   'https://developers.google.com/publisher-ads-audits/reference/audits/loads-ad-tag-over-https' +
diff --git a/lighthouse-plugin-publisher-ads/messages/en-US.json b/lighthouse-plugin-publisher-ads/messages/en-US.json
index 2f72c258..95860ffe 100644
--- a/lighthouse-plugin-publisher-ads/messages/en-US.json
+++ b/lighthouse-plugin-publisher-ads/messages/en-US.json
@@ -76,7 +76,7 @@
     "description": ""
   },
   "audits/ad-request-critical-path.js | displayValue": {
-    "message": "{serialResources, plural, =1 {1 serial resource} other {# serial resources}}, {totalResources, plural, =1 {1 total resource} other {# total resources}}",
+    "message": "{serialResources, plural, =1 {1 serial resource} other {# serial resources}}",
     "description": ""
   },
   "audits/ad-request-critical-path.js | failureTitle": {
@@ -84,7 +84,7 @@
     "description": ""
   },
   "audits/ad-request-critical-path.js | title": {
-    "message": "Minimal requests found in ad critical path",
+    "message": "Ad request waterfall",
     "description": ""
   },
   "audits/ad-request-from-page-start.js | description": {
@@ -171,6 +171,78 @@
     "message": "GPT tag is loaded asynchronously",
     "description": ""
   },
+  "audits/blocking-load-events.js | columnBlockedUrl": {
+    "message": "Blocked URL",
+    "description": ""
+  },
+  "audits/blocking-load-events.js | columnEvent": {
+    "message": "Event Name",
+    "description": ""
+  },
+  "audits/blocking-load-events.js | columnFunctionName": {
+    "message": "Function",
+    "description": ""
+  },
+  "audits/blocking-load-events.js | columnScript": {
+    "message": "Script",
+    "description": ""
+  },
+  "audits/blocking-load-events.js | columnTime": {
+    "message": "Event Time",
+    "description": ""
+  },
+  "audits/blocking-load-events.js | description": {
+    "message": "Waiting on load events increases ad latency. To speed up ads, eliminate the following load event handlers.",
+    "description": ""
+  },
+  "audits/blocking-load-events.js | displayValue": {
+    "message": "{timeInMs, number, seconds} s blocked",
+    "description": ""
+  },
+  "audits/blocking-load-events.js | failureTitle": {
+    "message": "Avoid waiting on load events",
+    "description": ""
+  },
+  "audits/blocking-load-events.js | title": {
+    "message": "Ads not blocked by load events",
+    "description": ""
+  },
+  "audits/bottleneck-requests.js | columnDuration": {
+    "message": "Total Time",
+    "description": ""
+  },
+  "audits/bottleneck-requests.js | columnInitiatorUrl": {
+    "message": "Initiator Request",
+    "description": ""
+  },
+  "audits/bottleneck-requests.js | columnSelfTime": {
+    "message": "Exclusive Time",
+    "description": ""
+  },
+  "audits/bottleneck-requests.js | columnStartTime": {
+    "message": "Start",
+    "description": ""
+  },
+  "audits/bottleneck-requests.js | columnUrl": {
+    "message": "Blocking Request",
+    "description": ""
+  },
+  "audits/bottleneck-requests.js | description": {
+    "message": "Speed up, load earlier, parallelize, or eliminate the following requests and their dependencies in order to speed up ad loading.",
+    "description": ""
+  },
+  "audits/bottleneck-requests.js | displayValue": {
+    "message": "{blockedTime, number, seconds} s spent blocked on requests",
+    "description": ""
+  },
+  "audits/bottleneck-requests.js | failureTitle": {
+    "message": "Avoid bottleneck requests",
+    "description": ""
+  },
+  "audits/bottleneck-requests.js | title": {
+    "message": "No bottleneck requests found",
+    "description": ""
+  },
   "audits/duplicate-tags.js | columnFrameId": {
     "message": "Frame ID",
     "description": ""
@@ -231,6 +303,34 @@
     "message": "Ad slots effectively use horizontal space",
     "description": ""
   },
+  "audits/gpt-bids-parallel.js | columnBidder": {
+    "message": "Bidder",
+    "description": ""
+  },
+  "audits/gpt-bids-parallel.js | columnDuration": {
+    "message": "Duration",
+    "description": ""
+  },
+  "audits/gpt-bids-parallel.js | columnStartTime": {
+    "message": "Start",
+    "description": ""
+  },
+  "audits/gpt-bids-parallel.js | columnUrl": {
+    "message": "URL",
+    "description": ""
+  },
+  "audits/gpt-bids-parallel.js | description": {
+    "message": "To optimize ad loading, bid requests should not wait on GPT to load. This issue can often be fixed by making sure that bid requests do not wait on `googletag.pubadsReady` or `googletag.cmd.push`.",
+    "description": ""
+  },
+  "audits/gpt-bids-parallel.js | failureTitle": {
+    "message": "Load GPT and bids in parallel",
+    "description": ""
+  },
+  "audits/gpt-bids-parallel.js | title": {
+    "message": "GPT and bids loaded in parallel",
+    "description": ""
+  },
   "audits/idle-network-times.js | causeDomContentLoaded": {
     "message": "DOMContentLoaded Event",
     "description": ""
@@ -287,20 +387,8 @@
     "message": "[Experimental] Network is efficiently utilized before ad requests",
     "description": ""
   },
-  "audits/loads-gpt-from-sgdn.js | description": {
-    "message": "Load GPT from 'securepubads.g.doubleclick.net' to reduce GPT load time. By loading GPT from the same host as ad requests, browsers can avoid an additional DNS lookup and HTTP connection. Example:`<script async src=\"https://securepubads.g.doubleclick.net/tag/js/gpt.js\">`. [Learn more](https://developers.google.com/publisher-ads-audits/reference/audits/loads-gpt-from-sgdn).",
-    "description": ""
-  },
-  "audits/loads-gpt-from-sgdn.js | failureTitle": {
-    "message": "Load GPT from recommended host",
-    "description": ""
-  },
-  "audits/loads-gpt-from-sgdn.js | title": {
-    "message": "GPT tag is loaded from recommended host",
-    "description": ""
-  },
   "audits/loads-ad-tag-over-https.js | description": {
-    "message": "For privacy and security, always load GPT/AdSense over HTTPS. Insecure pages should explicitly request the ad script securely. Example:`<script async src=\"https://securepubads.g.doubleclick.net/tag/js/gpt.js\">` or `<script async src=\"https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js\">`. [Learn more](https://developers.google.com/publisher-ads-audits/reference/audits/loads-ad-tag-over-https).",
+    "message": "For privacy and security, always load GPT/AdSense over HTTPS. Insecure pages should explicitly request the ad script securely. GPT Example: `<script async src=\"https://securepubads.g.doubleclick.net/tag/js/gpt.js\">` AdSense Example: `<script async src=\"https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js\">`. [Learn more](https://developers.google.com/publisher-ads-audits/reference/audits/loads-ad-tag-over-https).",
     "description": ""
   },
   "audits/loads-ad-tag-over-https.js | failureDisplayValue": {
@@ -315,36 +403,40 @@
     "message": "Ad tag is loaded over HTTPS",
     "description": ""
   },
-  "audits/script-injected-tags.js | columnDuration": {
-    "message": "Duration",
+  "audits/loads-gpt-from-sgdn.js | description": {
+    "message": "Load GPT from 'securepubads.g.doubleclick.net' to reduce GPT load time. By loading GPT from the same host as ad requests, browsers can avoid an additional DNS lookup and HTTP connection. Example:`<script async src=\"https://securepubads.g.doubleclick.net/tag/js/gpt.js\">`. [Learn more](https://developers.google.com/publisher-ads-audits/reference/audits/loads-gpt-from-sgdn).",
     "description": ""
   },
-  "audits/script-injected-tags.js | columnLineNumber": {
-    "message": "Source Line Number",
+  "audits/loads-gpt-from-sgdn.js | failureTitle": {
+    "message": "Load GPT from recommended host",
     "description": ""
   },
-  "audits/script-injected-tags.js | columnRequest": {
-    "message": "Resource",
+  "audits/loads-gpt-from-sgdn.js | title": {
+    "message": "GPT tag is loaded from recommended host",
     "description": ""
   },
-  "audits/script-injected-tags.js | columnStartTime": {
-    "message": "Start",
+  "audits/script-injected-tags.js | columnLoadTime": {
+    "message": "Load Time",
+    "description": ""
+  },
+  "audits/script-injected-tags.js | columnUrl": {
+    "message": "Script",
     "description": ""
   },
   "audits/script-injected-tags.js | description": {
-    "message": "Load scripts directly with `<script async src=...>` instead of injecting scripts with JavaScript. This allows the browser fetch the script sooner. [Learn more](https://www.igvita.com/2014/05/20/script-injected-async-scripts-considered-harmful/).",
+    "message": "Load the following scripts directly with `<script async src=...>` instead of injecting scripts with JavaScript. Doing so allows the browser to preload scripts sooner. [Learn more](https://www.igvita.com/2014/05/20/script-injected-async-scripts-considered-harmful/).",
     "description": ""
   },
-  "audits/script-injected-tags.js | displayValue": {
-    "message": "{numTags, plural, =1 {1 script-injected resource} other {# script-injected resources}}",
+  "audits/script-injected-tags.js | failureDisplayValue": {
+    "message": "Load {tags, plural, =1 {1 script} other {# scripts}} statically",
     "description": ""
   },
   "audits/script-injected-tags.js | failureTitle": {
-    "message": "Avoid script-injected tags",
+    "message": "Load ad scripts statically",
     "description": ""
   },
   "audits/script-injected-tags.js | title": {
-    "message": "No script-injected tags found",
+    "message": "Ad scripts are loaded statically",
     "description": ""
   },
   "audits/serial-header-bidding.js | columnBidder": {
@@ -375,30 +467,6 @@
     "message": "Header bidding is parallelized",
     "description": ""
   },
-  "audits/static-ad-tags.js | columnLineNumber": {
-    "message": "Line Number",
-    "description": ""
-  },
-  "audits/static-ad-tags.js | columnUrl": {
-    "message": "Initiator",
-    "description": ""
-  },
-  "audits/static-ad-tags.js | description": {
-    "message": "Tags loaded dynamically are not visible to the browser preloader. Consider using a static tag or `<link rel=\"preload\">` so the browser may load GPT sooner. [Learn more](https://developers.google.com/publisher-ads-audits/reference/audits/static-ad-tags).",
-    "description": ""
-  },
-  "audits/static-ad-tags.js | failureDisplayValue": {
-    "message": "Up to {timeInMs, number, seconds} s tag load time improvement",
-    "description": ""
-  },
-  "audits/static-ad-tags.js | failureTitle": {
-    "message": "Load GPT tag statically",
-    "description": ""
-  },
-  "audits/static-ad-tags.js | title": {
-    "message": "GPT tag is loaded statically",
-    "description": ""
-  },
   "audits/tag-load-time.js | description": {
     "message": "This metric measures the time for the Google Publisher Tag's implementation script (pubads_impl.js) to load after the page loads. [Learn more](https://developers.google.com/publisher-ads-audits/reference/audits/metrics).",
     "description": ""
diff --git a/lighthouse-plugin-publisher-ads/messages/locales/en-XL.json b/lighthouse-plugin-publisher-ads/messages/locales/en-XL.json
index b6162f70..a5ef6c52 100644
--- a/lighthouse-plugin-publisher-ads/messages/locales/en-XL.json
+++ b/lighthouse-plugin-publisher-ads/messages/locales/en-XL.json
@@ -57,13 +57,13 @@
     "message": "Ĉón̂śîd́êŕ r̂éd̂úĉín̂ǵ t̂h́ê ńûḿb̂ér̂ óf̂ ŕêśôúr̂ćêś, l̂óâd́îńĝ ḿûĺt̂íp̂ĺê ŕêśôúr̂ćêś ŝím̂úl̂t́âńêóûśl̂ý, ôŕ l̂óâd́îńĝ ŕêśôúr̂ćêś êár̂ĺîér̂ t́ô ím̂ṕr̂óv̂é âd́ ŝṕêéd̂. Ŕêq́ûéŝt́ŝ t́ĥát̂ b́l̂óĉḱ âd́ l̂óâd́îńĝ ćâń b̂é f̂óûńd̂ b́êĺôẃ. [L̂éâŕn̂ ḿôŕê](h́t̂t́p̂ś://d̂év̂él̂óp̂ér̂ś.ĝóôǵl̂é.ĉóm̂/ṕûb́l̂íŝh́êŕ-âd́ŝ-áûd́ît́ŝ/ŕêf́êŕêńĉé/âúd̂ít̂ś/âd́-r̂éq̂úêśt̂-ćr̂ít̂íĉál̂-ṕât́ĥ)."
   },
   "audits/ad-request-critical-path.js | displayValue": {
-    "message": "{serialResources, plural, =1 {1 ŝér̂íâĺ r̂éŝóûŕĉé} other {# ŝér̂íâĺ r̂éŝóûŕĉéŝ}}, {totalResources, plural, =1 {1 t́ôt́âĺ r̂éŝóûŕĉé} other {# t̂ót̂ál̂ ŕêśôúr̂ćêś}}"
+    "message": "{serialResources, plural, =1 {1 ŝér̂íâĺ r̂éŝóûŕĉé} other {# ŝér̂íâĺ r̂éŝóûŕĉéŝ}}"
   },
   "audits/ad-request-critical-path.js | failureTitle": {
     "message": "R̂éd̂úĉé ĉŕît́îćâĺ p̂át̂h́ f̂ór̂ ád̂ ĺôád̂ín̂ǵ"
   },
   "audits/ad-request-critical-path.js | title": {
-    "message": "M̂ín̂ím̂ál̂ ŕêq́ûéŝt́ŝ f́ôún̂d́ îń âd́ ĉŕît́îćâĺ p̂át̂h́"
+    "message": "Âd́ r̂éq̂úêśt̂ ẃât́êŕf̂ál̂ĺ"
   },
   "audits/ad-request-from-page-start.js | description": {
     "message": "T̂h́îś m̂ét̂ŕîć m̂éâśûŕêś t̂h́ê él̂áp̂śêd́ t̂ím̂é f̂ŕôḿ t̂h́ê śt̂ár̂t́ ôf́ p̂áĝé l̂óâd́ ûńt̂íl̂ t́ĥé f̂ír̂śt̂ ád̂ ŕêq́ûéŝt́ îś m̂ád̂é. D̂él̂áŷéd̂ ád̂ ŕêq́ûéŝt́ŝ ẃîĺl̂ d́êćr̂éâśê ím̂ṕr̂éŝśîón̂ś âńd̂ v́îéŵáb̂íl̂ít̂ý, âńd̂ h́âv́ê á n̂éĝát̂ív̂é îḿp̂áĉt́ ôń âd́ r̂év̂én̂úê. [Ĺêár̂ń m̂ór̂é](ĥt́t̂ṕŝ://d́êv́êĺôṕêŕŝ.ǵôóĝĺê.ćôḿ/p̂úb̂ĺîśĥér̂-ád̂ś-âúd̂ít̂ś/r̂éf̂ér̂én̂ćê/áûd́ît́ŝ/ḿêt́r̂íĉś)."
@@ -128,6 +128,60 @@
   "audits/async-ad-tags.js | title": {
     "message": "ĜṔT̂ t́âǵ îś l̂óâd́êd́ âśŷńĉh́r̂ón̂óûśl̂ý"
   },
+  "audits/blocking-load-events.js | columnBlockedUrl": {
+    "message": "B̂ĺôćk̂éd̂ ÚR̂Ĺ"
+  },
+  "audits/blocking-load-events.js | columnEvent": {
+    "message": "Êv́êńt̂ Ńâḿê"
+  },
+  "audits/blocking-load-events.js | columnFunctionName": {
+    "message": "F̂ún̂ćt̂íôń"
+  },
+  "audits/blocking-load-events.js | columnScript": {
+    "message": "Ŝćr̂íp̂t́"
+  },
+  "audits/blocking-load-events.js | columnTime": {
+    "message": "Êv́êńt̂ T́îḿê"
+  },
+  "audits/blocking-load-events.js | description": {
+    "message": "Ŵáît́îńĝ ón̂ ĺôád̂ év̂én̂t́ŝ ín̂ćr̂éâśêś âd́ l̂át̂én̂ćŷ. T́ô śp̂éêd́ ûṕ âd́ŝ, él̂ím̂ín̂át̂é t̂h́ê f́ôĺl̂óŵín̂ǵ l̂óâd́ êv́êńt̂ h́âńd̂ĺêŕŝ."
+  },
+  "audits/blocking-load-events.js | displayValue": {
+    "message": "{timeInMs, number, seconds} ŝ b́l̂óĉḱêd́"
+  },
+  "audits/blocking-load-events.js | failureTitle": {
+    "message": "Âv́ôíd̂ ẃâít̂ín̂ǵ ôń l̂óâd́ êv́êńt̂ś"
+  },
+  "audits/blocking-load-events.js | title": {
+    "message": "Âd́ŝ ńôt́ b̂ĺôćk̂éd̂ b́ŷ ĺôád̂ év̂én̂t́ŝ"
+  },
+  "audits/bottleneck-requests.js | columnDuration": {
+    "message": "T̂ót̂ál̂ T́îḿê"
+  },
+  "audits/bottleneck-requests.js | columnInitiatorUrl": {
+    "message": "Îńît́îát̂ór̂ Ŕêq́ûéŝt́"
+  },
+  "audits/bottleneck-requests.js | columnSelfTime": {
+    "message": "Êx́ĉĺûśîv́ê T́îḿê"
+  },
+  "audits/bottleneck-requests.js | columnStartTime": {
+    "message": "Ŝt́âŕt̂"
+  },
+  "audits/bottleneck-requests.js | columnUrl": {
+    "message": "B̂ĺôćk̂ín̂ǵ R̂éq̂úêśt̂"
+  },
+  "audits/bottleneck-requests.js | description": {
+    "message": "Ŝṕêéd̂ úp̂, ĺôád̂ éâŕl̂íêŕ, p̂ár̂ál̂ĺêĺîźê, ór̂ él̂ím̂ín̂át̂é t̂h́ê f́ôĺl̂óŵín̂ǵ r̂éq̂úêśt̂ś âńd̂ t́ĥéîŕ d̂ép̂én̂d́êńĉíêś îń ôŕd̂ér̂ t́ô śp̂éêd́ ûṕ âd́ l̂óâd́îńĝ."
+  },
+  "audits/bottleneck-requests.js | displayValue": {
+    "message": "{blockedTime, number, seconds} ŝ śp̂én̂t́ b̂ĺôćk̂éd̂ ón̂ ŕêq́ûéŝt́ŝ"
+  },
+  "audits/bottleneck-requests.js | failureTitle": {
+    "message": "Âv́ôíd̂ b́ôt́t̂ĺêńêćk̂ ŕêq́ûéŝt́ŝ"
+  },
+  "audits/bottleneck-requests.js | title": {
+    "message": "N̂ó b̂ót̂t́l̂én̂éĉḱ r̂éq̂úêśt̂ś f̂óûńd̂"
+  },
   "audits/duplicate-tags.js | columnFrameId": {
     "message": "F̂ŕâḿê ÍD̂"
   },
@@ -173,6 +227,27 @@
   "audits/full-width-slots.js | title": {
     "message": "Âd́ ŝĺôt́ŝ éf̂f́êćt̂ív̂él̂ý ûśê h́ôŕîźôńt̂ál̂ śp̂áĉé"
   },
+  "audits/gpt-bids-parallel.js | columnBidder": {
+    "message": "B̂íd̂d́êŕ"
+  },
+  "audits/gpt-bids-parallel.js | columnDuration": {
+    "message": "D̂úr̂át̂íôń"
+  },
+  "audits/gpt-bids-parallel.js | columnStartTime": {
+    "message": "Ŝt́âŕt̂"
+  },
+  "audits/gpt-bids-parallel.js | columnUrl": {
+    "message": "ÛŔL̂"
+  },
+  "audits/gpt-bids-parallel.js | description": {
+    "message": "T̂ó ôṕt̂ím̂íẑé âd́ l̂óâd́îńĝ, b́îd́ r̂éq̂úêśt̂ś ŝh́ôúl̂d́ n̂ót̂ ẃâít̂ ón̂ ǴP̂T́ t̂ó l̂óâd́. T̂h́îś îśŝúê ćâń ôf́t̂én̂ b́ê f́îx́êd́ b̂ý m̂ák̂ín̂ǵ ŝúr̂é t̂h́ât́ b̂íd̂ ŕêq́ûéŝt́ŝ d́ô ńôt́ ŵáît́ ôń `ĝóôǵl̂ét̂áĝ.ṕûb́âd́ŝŔêád̂ý` ôŕ `ĝóôǵl̂ét̂áĝ.ćm̂d́.p̂úŝh́`."
+  },
+  "audits/gpt-bids-parallel.js | failureTitle": {
+    "message": "L̂óâd́ ĜṔT̂ án̂d́ b̂íd̂ś îń p̂ár̂ál̂ĺêĺ"
+  },
+  "audits/gpt-bids-parallel.js | title": {
+    "message": "ĜṔT̂ án̂d́ b̂íd̂ś l̂óâd́êd́ îń p̂ár̂ál̂ĺêĺ"
+  },
   "audits/idle-network-times.js | causeDomContentLoaded": {
     "message": "D̂ÓM̂Ćôńt̂én̂t́L̂óâd́êd́ Êv́êńt̂"
   },
@@ -215,50 +290,44 @@
   "audits/idle-network-times.js | title": {
     "message": "[Êx́p̂ér̂ím̂én̂t́âĺ] N̂ét̂ẃôŕk̂ íŝ éf̂f́îćîén̂t́l̂ý ût́îĺîźêd́ b̂éf̂ór̂é âd́ r̂éq̂úêśt̂ś"
   },
-  "audits/loads-gpt-from-sgdn.js | description": {
-    "message": "L̂óâd́ ĜṔT̂ f́r̂óm̂ 'śêćûŕêṕûb́âd́ŝ.ǵ.d̂óûb́l̂éĉĺîćk̂.ńêt́' t̂ó r̂éd̂úĉé ĜṔT̂ ĺôád̂ t́îḿê. B́ŷ ĺôád̂ín̂ǵ ĜṔT̂ f́r̂óm̂ t́ĥé ŝám̂é ĥóŝt́ âś âd́ r̂éq̂úêśt̂ś, b̂ŕôẃŝér̂ś ĉán̂ áv̂óîd́ âń âd́d̂ít̂íôńâĺ D̂ŃŜ ĺôók̂úp̂ án̂d́ ĤT́T̂Ṕ ĉón̂ńêćt̂íôń. Êx́âḿp̂ĺê:`<śĉŕîṕt̂ áŝýn̂ć ŝŕĉ=\"h́t̂t́p̂ś://ŝéĉúr̂ép̂úb̂ád̂ś.ĝ.d́ôúb̂ĺêćl̂íĉḱ.n̂ét̂/t́âǵ/ĵś/ĝṕt̂.j́ŝ\">`. [Ĺêár̂ń m̂ór̂é](ĥt́t̂ṕŝ://d́êv́êĺôṕêŕŝ.ǵôóĝĺê.ćôḿ/p̂úb̂ĺîśĥér̂-ád̂ś-âúd̂ít̂ś/r̂éf̂ér̂én̂ćê/áûd́ît́ŝ/ĺôád̂ś-ĝṕt̂-f́r̂óm̂-śĝd́n̂)."
-  },
-  "audits/loads-gpt-from-sgdn.js | failureTitle": {
-    "message": "L̂óâd́ ĜṔT̂ f́r̂óm̂ ŕêćôḿm̂én̂d́êd́ ĥóŝt́"
-  },
-  "audits/loads-gpt-from-sgdn.js | title": {
-    "message": "ĜṔT̂ t́âǵ îś l̂óâd́êd́ f̂ŕôḿ r̂éĉóm̂ḿêńd̂éd̂ h́ôśt̂"
-  },
   "audits/loads-ad-tag-over-https.js | description": {
-    "message": "F̂ór̂ ṕr̂ív̂áĉý âńd̂ śêćûŕît́ŷ, ál̂ẃâýŝ ĺôád̂ ǴP̂T́ ôv́êŕ ĤT́T̂ṔŜ. Ín̂śêćûŕê ṕâǵêś ŝh́ôúl̂d́ êx́p̂ĺîćît́l̂ý r̂éq̂úêśt̂ t́ĥé ĜṔT̂ śĉŕîṕt̂ śêćûŕêĺŷ. Éx̂ám̂ṕl̂é:`<ŝćr̂íp̂t́ âśŷńĉ śr̂ć=\"ĥt́t̂ṕŝ://śêćûŕêṕûb́âd́ŝ.ǵ.d̂óûb́l̂éĉĺîćk̂.ńêt́/t̂áĝ/j́ŝ/ǵp̂t́.ĵś\"> ôŕ `<script async src=\"https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js\">``. [L̂éâŕn̂ ḿôŕê](h́t̂t́p̂ś://d̂év̂él̂óp̂ér̂ś.ĝóôǵl̂é.ĉóm̂/ṕûb́l̂íŝh́êŕ-âd́ŝ-áûd́ît́ŝ/ŕêf́êŕêńĉé/âúd̂ít̂ś/l̂óâd́ŝ-ǵp̂t́-ôv́êŕ-ĥt́t̂ṕŝ)."
+    "message": "F̂ór̂ ṕr̂ív̂áĉý âńd̂ śêćûŕît́ŷ, ál̂ẃâýŝ ĺôád̂ ǴP̂T́/Âd́Ŝén̂śê óv̂ér̂ H́T̂T́P̂Ś. Îńŝéĉúr̂é p̂áĝéŝ śĥóûĺd̂ éx̂ṕl̂íĉít̂ĺŷ ŕêq́ûéŝt́ t̂h́ê ád̂ śĉŕîṕt̂ śêćûŕêĺŷ. ǴP̂T́ Êx́âḿp̂ĺê: `<śĉŕîṕt̂ áŝýn̂ć ŝŕĉ=\"h́t̂t́p̂ś://ŝéĉúr̂ép̂úb̂ád̂ś.ĝ.d́ôúb̂ĺêćl̂íĉḱ.n̂ét̂/t́âǵ/ĵś/ĝṕt̂.j́ŝ\">` Ád̂Śêńŝé Êx́âḿp̂ĺê: `<śĉŕîṕt̂ áŝýn̂ć ŝŕĉ=\"h́t̂t́p̂ś://p̂áĝéâd́2.ĝóôǵl̂éŝýn̂d́îćât́îón̂.ćôḿ/p̂áĝéâd́/ĵś/âd́ŝb́ŷǵôóĝĺê.j́ŝ\">`. [Ĺêár̂ń m̂ór̂é](ĥt́t̂ṕŝ://d́êv́êĺôṕêŕŝ.ǵôóĝĺê.ćôḿ/p̂úb̂ĺîśĥér̂-ád̂ś-âúd̂ít̂ś/r̂éf̂ér̂én̂ćê/áûd́ît́ŝ/ĺôád̂ś-âd́-t̂áĝ-óv̂ér̂-h́t̂t́p̂ś)."
   },
   "audits/loads-ad-tag-over-https.js | failureDisplayValue": {
-    "message": "L̂óâd́ ĝṕt̂.j́ŝ óv̂ér̂ H́T̂T́P̂Ś"
+    "message": "L̂óâd́ âd́ t̂áĝ óv̂ér̂ H́T̂T́P̂Ś"
   },
   "audits/loads-ad-tag-over-https.js | failureTitle": {
-    "message": "L̂óâd́ ĜṔT̂ óv̂ér̂ H́T̂T́P̂Ś"
+    "message": "L̂óâd́ âd́ t̂áĝ óv̂ér̂ H́T̂T́P̂Ś"
   },
   "audits/loads-ad-tag-over-https.js | title": {
-    "message": "ĜṔT̂ t́âǵ îś l̂óâd́êd́ ôv́êŕ ĤT́T̂ṔŜ"
+    "message": "Âd́ t̂áĝ íŝ ĺôád̂éd̂ óv̂ér̂ H́T̂T́P̂Ś"
   },
-  "audits/script-injected-tags.js | columnDuration": {
-    "message": "D̂úr̂át̂íôń"
+  "audits/loads-gpt-from-sgdn.js | description": {
+    "message": "L̂óâd́ ĜṔT̂ f́r̂óm̂ 'śêćûŕêṕûb́âd́ŝ.ǵ.d̂óûb́l̂éĉĺîćk̂.ńêt́' t̂ó r̂éd̂úĉé ĜṔT̂ ĺôád̂ t́îḿê. B́ŷ ĺôád̂ín̂ǵ ĜṔT̂ f́r̂óm̂ t́ĥé ŝám̂é ĥóŝt́ âś âd́ r̂éq̂úêśt̂ś, b̂ŕôẃŝér̂ś ĉán̂ áv̂óîd́ âń âd́d̂ít̂íôńâĺ D̂ŃŜ ĺôók̂úp̂ án̂d́ ĤT́T̂Ṕ ĉón̂ńêćt̂íôń. Êx́âḿp̂ĺê:`<śĉŕîṕt̂ áŝýn̂ć ŝŕĉ=\"h́t̂t́p̂ś://ŝéĉúr̂ép̂úb̂ád̂ś.ĝ.d́ôúb̂ĺêćl̂íĉḱ.n̂ét̂/t́âǵ/ĵś/ĝṕt̂.j́ŝ\">`. [Ĺêár̂ń m̂ór̂é](ĥt́t̂ṕŝ://d́êv́êĺôṕêŕŝ.ǵôóĝĺê.ćôḿ/p̂úb̂ĺîśĥér̂-ád̂ś-âúd̂ít̂ś/r̂éf̂ér̂én̂ćê/áûd́ît́ŝ/ĺôád̂ś-ĝṕt̂-f́r̂óm̂-śĝd́n̂)."
   },
-  "audits/script-injected-tags.js | columnLineNumber": {
-    "message": "Ŝóûŕĉé L̂ín̂é N̂úm̂b́êŕ"
+  "audits/loads-gpt-from-sgdn.js | failureTitle": {
+    "message": "L̂óâd́ ĜṔT̂ f́r̂óm̂ ŕêćôḿm̂én̂d́êd́ ĥóŝt́"
   },
-  "audits/script-injected-tags.js | columnRequest": {
-    "message": "R̂éŝóûŕĉé"
+  "audits/loads-gpt-from-sgdn.js | title": {
+    "message": "ĜṔT̂ t́âǵ îś l̂óâd́êd́ f̂ŕôḿ r̂éĉóm̂ḿêńd̂éd̂ h́ôśt̂"
   },
-  "audits/script-injected-tags.js | columnStartTime": {
-    "message": "Ŝt́âŕt̂"
+  "audits/script-injected-tags.js | columnLoadTime": {
+    "message": "L̂óâd́ T̂ím̂é"
+  },
+  "audits/script-injected-tags.js | columnUrl": {
+    "message": "Ŝćr̂íp̂t́"
   },
   "audits/script-injected-tags.js | description": {
-    "message": "L̂óâd́ ŝćr̂íp̂t́ŝ d́îŕêćt̂ĺŷ ẃît́ĥ `<śĉŕîṕt̂ áŝýn̂ć ŝŕĉ=...>` ín̂śt̂éâd́ ôf́ îńĵéĉt́îńĝ śĉŕîṕt̂ś ŵít̂h́ Ĵáv̂áŜćr̂íp̂t́. T̂h́îś âĺl̂óŵś t̂h́ê b́r̂óŵśêŕ f̂ét̂ćĥ t́ĥé ŝćr̂íp̂t́ ŝóôńêŕ. [L̂éâŕn̂ ḿôŕê](h́t̂t́p̂ś://ŵẃŵ.íĝv́ît́â.ćôḿ/2014/05/20/ŝćr̂íp̂t́-îńĵéĉt́êd́-âśŷńĉ-śĉŕîṕt̂ś-ĉón̂śîd́êŕêd́-ĥár̂ḿf̂úl̂/)."
+    "message": "L̂óâd́ t̂h́ê f́ôĺl̂óŵín̂ǵ ŝćr̂íp̂t́ŝ d́îŕêćt̂ĺŷ ẃît́ĥ `<śĉŕîṕt̂ áŝýn̂ć ŝŕĉ=...>` ín̂śt̂éâd́ ôf́ îńĵéĉt́îńĝ śĉŕîṕt̂ś ŵít̂h́ Ĵáv̂áŜćr̂íp̂t́. D̂óîńĝ śô ál̂ĺôẃŝ t́ĥé b̂ŕôẃŝér̂ t́ô ṕr̂él̂óâd́ ŝćr̂íp̂t́ŝ śôón̂ér̂. [Ĺêár̂ń m̂ór̂é](ĥt́t̂ṕŝ://ẃŵẃ.îǵv̂ít̂á.ĉóm̂/2014/05/20/śĉŕîṕt̂-ín̂j́êćt̂éd̂-áŝýn̂ć-ŝćr̂íp̂t́ŝ-ćôńŝíd̂ér̂éd̂-h́âŕm̂f́ûĺ/)."
   },
-  "audits/script-injected-tags.js | displayValue": {
-    "message": "{numTags, plural, =1 {1 ŝćr̂íp̂t́-îńĵéĉt́êd́ r̂éŝóûŕĉé} other {# ŝćr̂íp̂t́-îńĵéĉt́êd́ r̂éŝóûŕĉéŝ}}"
+  "audits/script-injected-tags.js | failureDisplayValue": {
+    "message": "L̂óâd́ {tags, plural, =1 {1 ŝćr̂íp̂t́} other {# ŝćr̂íp̂t́ŝ}} śt̂át̂íĉál̂ĺŷ"
   },
   "audits/script-injected-tags.js | failureTitle": {
-    "message": "Âv́ôíd̂ śĉŕîṕt̂-ín̂j́êćt̂éd̂ t́âǵŝ"
+    "message": "L̂óâd́ âd́ ŝćr̂íp̂t́ŝ śt̂át̂íĉál̂ĺŷ"
   },
   "audits/script-injected-tags.js | title": {
-    "message": "N̂ó ŝćr̂íp̂t́-îńĵéĉt́êd́ t̂áĝś f̂óûńd̂"
+    "message": "Âd́ ŝćr̂íp̂t́ŝ ár̂é l̂óâd́êd́ ŝt́ât́îćâĺl̂ý"
   },
   "audits/serial-header-bidding.js | columnBidder": {
     "message": "B̂íd̂d́êŕ"
@@ -281,24 +350,6 @@
   "audits/serial-header-bidding.js | title": {
     "message": "Ĥéâd́êŕ b̂íd̂d́îńĝ íŝ ṕâŕâĺl̂él̂íẑéd̂"
   },
-  "audits/static-ad-tags.js | columnLineNumber": {
-    "message": "L̂ín̂é N̂úm̂b́êŕ"
-  },
-  "audits/static-ad-tags.js | columnUrl": {
-    "message": "Îńît́îát̂ór̂"
-  },
-  "audits/static-ad-tags.js | description": {
-    "message": "T̂áĝś l̂óâd́êd́ d̂ýn̂ám̂íĉál̂ĺŷ ár̂é n̂ót̂ v́îśîb́l̂é t̂ó t̂h́ê b́r̂óŵśêŕ p̂ŕêĺôád̂ér̂. Ćôńŝíd̂ér̂ úŝín̂ǵ â śt̂át̂íĉ t́âǵ ôŕ `<l̂ín̂ḱ r̂él̂=\"ṕr̂él̂óâd́\">` ŝó t̂h́ê b́r̂óŵśêŕ m̂áŷ ĺôád̂ ǴP̂T́ ŝóôńêŕ. [L̂éâŕn̂ ḿôŕê](h́t̂t́p̂ś://d̂év̂él̂óp̂ér̂ś.ĝóôǵl̂é.ĉóm̂/ṕûb́l̂íŝh́êŕ-âd́ŝ-áûd́ît́ŝ/ŕêf́êŕêńĉé/âúd̂ít̂ś/ŝt́ât́îć-âd́-t̂áĝś)."
-  },
-  "audits/static-ad-tags.js | failureDisplayValue": {
-    "message": "Ûṕ t̂ó {timeInMs, number, seconds} ŝ t́âǵ l̂óâd́ t̂ím̂é îḿp̂ŕôv́êḿêńt̂"
-  },
-  "audits/static-ad-tags.js | failureTitle": {
-    "message": "L̂óâd́ ĜṔT̂ t́âǵ ŝt́ât́îćâĺl̂ý"
-  },
-  "audits/static-ad-tags.js | title": {
-    "message": "ĜṔT̂ t́âǵ îś l̂óâd́êd́ ŝt́ât́îćâĺl̂ý"
-  },
   "audits/tag-load-time.js | description": {
     "message": "T̂h́îś m̂ét̂ŕîć m̂éâśûŕêś t̂h́ê t́îḿê f́ôŕ t̂h́ê Ǵôóĝĺê Ṕûb́l̂íŝh́êŕ T̂áĝ'ś îḿp̂ĺêḿêńt̂át̂íôń ŝćr̂íp̂t́ (p̂úb̂ád̂ś_îḿp̂ĺ.ĵś) t̂ó l̂óâd́ âf́t̂ér̂ t́ĥé p̂áĝé l̂óâd́ŝ. [Ĺêár̂ń m̂ór̂é](ĥt́t̂ṕŝ://d́êv́êĺôṕêŕŝ.ǵôóĝĺê.ćôḿ/p̂úb̂ĺîśĥér̂-ád̂ś-âúd̂ít̂ś/r̂éf̂ér̂én̂ćê/áûd́ît́ŝ/ḿêt́r̂íĉś)."
   },

From 14f4dfb1c9ec18f64ab0ac93c92d72ad2c81dc43 Mon Sep 17 00:00:00 2001
From: jonkeller <jonkeller@google.com>
Date: Wed, 4 Sep 2019 16:27:31 -0400
Subject: [PATCH 4/8] Updates a few more audits. Still WIP.

---
 .../audits/async-ad-tags.js                          | 12 ++++++------
 .../audits/gpt-bids-parallel.js                      |  2 +-
 .../audits/loads-gpt-from-sgdn.js                    |  2 +-
 .../audits/script-injected-tags.js                   | 11 ++++++-----
 .../audits/tag-load-time.js                          |  6 +++---
 .../messages/common-strings.js                       |  2 ++
 lighthouse-plugin-publisher-ads/messages/en-US.json  | 12 ++++++++----
 .../messages/locales/en-XL.json                      | 11 +++++++----
 lighthouse-plugin-publisher-ads/utils/graph.js       |  4 ++--
 .../utils/resource-classification.js                 | 12 +++++++++++-
 10 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/lighthouse-plugin-publisher-ads/audits/async-ad-tags.js b/lighthouse-plugin-publisher-ads/audits/async-ad-tags.js
index 79af52dd..bd9d3204 100644
--- a/lighthouse-plugin-publisher-ads/audits/async-ad-tags.js
+++ b/lighthouse-plugin-publisher-ads/audits/async-ad-tags.js
@@ -19,15 +19,15 @@ const MainResource = require('lighthouse/lighthouse-core/computed/main-resource'
 const NetworkRecords = require('lighthouse/lighthouse-core/computed/network-records');
 const {auditNotApplicable} = require('../messages/common-strings');
 const {Audit} = require('lighthouse');
-const {isGptTag, isStaticRequest} = require('../utils/resource-classification');
+const {isAdTag, isStaticRequest} = require('../utils/resource-classification');
 const {URL} = require('url');
 
 const UIStrings = {
-  title: 'GPT tag is loaded asynchronously',
-  failureTitle: 'Load GPT asynchronously',
-  description: 'Loading the GPT tag synchronously blocks content rendering ' +
+  title: 'Ad tag is loaded asynchronously',
+  failureTitle: 'Load ad tag asynchronously',
+  description: 'Loading the ad tag synchronously blocks content rendering ' +
   'until the tag is fetched and loaded. Consider using the `async` attribute ' +
-  'to load gpt.js asynchronously. [Learn more](' +
+  'to load gpt.js and/or adsbygoogle.js asynchronously. [Learn more](' +
   'https://developers.google.com/publisher-ads-audits/reference/audits/async-ad-tags' +
   ').',
 };
@@ -72,7 +72,7 @@ class AsyncAdTags extends Audit {
     const mainResource =
         await MainResource.request({URL: artifacts.URL, devtoolsLog}, context);
     const tagReqs = networkRecords
-        .filter((req) => isGptTag(new URL(req.url)))
+        .filter((req) => isAdTag(new URL(req.url)))
         .filter((req) => req.frameId === mainResource.frameId);
 
     if (!tagReqs.length) {
diff --git a/lighthouse-plugin-publisher-ads/audits/gpt-bids-parallel.js b/lighthouse-plugin-publisher-ads/audits/gpt-bids-parallel.js
index 6ee16d19..f7b87797 100644
--- a/lighthouse-plugin-publisher-ads/audits/gpt-bids-parallel.js
+++ b/lighthouse-plugin-publisher-ads/audits/gpt-bids-parallel.js
@@ -75,7 +75,7 @@ class GptBidsInParallel extends Audit {
 
     const pubadsImpl = network.find((r) => isGptImplTag(r.url));
     if (!pubadsImpl) {
-      return auditNotApplicable.NoTag;
+      return auditNotApplicable.NoGpt;
     }
 
     const bids = network.filter(isBidRequest)
diff --git a/lighthouse-plugin-publisher-ads/audits/loads-gpt-from-sgdn.js b/lighthouse-plugin-publisher-ads/audits/loads-gpt-from-sgdn.js
index d2027ec2..81379854 100644
--- a/lighthouse-plugin-publisher-ads/audits/loads-gpt-from-sgdn.js
+++ b/lighthouse-plugin-publisher-ads/audits/loads-gpt-from-sgdn.js
@@ -61,7 +61,7 @@ class LoadsGptFromSgdn extends Audit {
     const networkRecords = await NetworkRecords.request(devtoolsLog, context);
     const gptUrl = networkRecords.map((r) => new URL(r.url)).find(isGptTag);
     if (!gptUrl) {
-      return auditNotApplicable.NoTag;
+      return auditNotApplicable.NoGpt;
     }
     return {
       score: Number(gptUrl.host === 'securepubads.g.doubleclick.net'),
diff --git a/lighthouse-plugin-publisher-ads/audits/script-injected-tags.js b/lighthouse-plugin-publisher-ads/audits/script-injected-tags.js
index f9f6ca05..43f1d462 100644
--- a/lighthouse-plugin-publisher-ads/audits/script-injected-tags.js
+++ b/lighthouse-plugin-publisher-ads/audits/script-injected-tags.js
@@ -61,11 +61,12 @@ const HEADINGS = [
 ];
 
 const STATICALLY_LOADABLE_TAGS = [
-  /amazon-adsystem.com\/aax2\/apstag.js/,
-  /js-sec.indexww.com\/ht\/p\/.*.js/,
-  /pubads.g.doubleclick.net\/tag\/js\/gpt.js/,
-  /static.criteo.net\/js\/.*\/publishertag.js/,
-  /www.googletagservices.com\/tag\/js\/gpt.js/,
+  /amazon-adsystem\.com\/aax2\/apstag.js/,
+  /js-sec\.indexww\.com\/ht\/p\/.*\.js/,
+  /pubads\.g\.doubleclick\.net\/tag\/js\/gpt\.js/,
+  /static\.criteo\.net\/js\/.*\/publishertag\.js/,
+  /www\.googletagservices\.com\/tag\/js\/gpt\.js/,
+  /pagead2\.googlesyndication\.com\/pagead\/js\/adsbygoogle\.js/,
 ];
 
 /**
diff --git a/lighthouse-plugin-publisher-ads/audits/tag-load-time.js b/lighthouse-plugin-publisher-ads/audits/tag-load-time.js
index 2579613b..66df4274 100644
--- a/lighthouse-plugin-publisher-ads/audits/tag-load-time.js
+++ b/lighthouse-plugin-publisher-ads/audits/tag-load-time.js
@@ -20,9 +20,9 @@ const {Audit} = require('lighthouse');
 const UIStrings = {
   title: 'Tag load time',
   failureTitle: 'Reduce tag load time',
-  description: 'This metric measures the time for the Google Publisher ' +
-  'Tag\'s implementation script (pubads_impl.js) to load after the page ' +
-  'loads. [Learn more](' +
+  description: 'This metric measures the time for the ad tag\'s ' +
+  'implementation script (pubads_impl.js for GPT; adsbygoogle.js for ' +
+  'AdSense) to load after the page loads. [Learn more](' +
   'https://developers.google.com/publisher-ads-audits/reference/audits/metrics' +
   ').',
   displayValue: '{timeInMs, number, seconds} s',
diff --git a/lighthouse-plugin-publisher-ads/messages/common-strings.js b/lighthouse-plugin-publisher-ads/messages/common-strings.js
index 769b4410..76f22805 100644
--- a/lighthouse-plugin-publisher-ads/messages/common-strings.js
+++ b/lighthouse-plugin-publisher-ads/messages/common-strings.js
@@ -25,6 +25,7 @@ const UIStrings = {
   NOT_APPLICABLE__NO_ADS: 'No ads requested',
   NOT_APPLICABLE__NO_BIDS: 'No bids detected',
   NOT_APPLICABLE__NO_EVENT_MATCHING_REQ: 'No event matches network records',
+  NOT_APPLICABLE__NO_GPT: 'GPT not requested',
   NOT_APPLICABLE__NO_RECORDS: 'No successful network records',
   NOT_APPLICABLE__NO_VISIBLE_SLOTS: 'No visible slots',
   NOT_APPLICABLE__NO_TAG: 'No tag requested',
@@ -68,6 +69,7 @@ const auditNotApplicable = {
   NoBids: notApplicableObj(UIStrings.NOT_APPLICABLE__NO_BIDS),
   NoEventMatchingReq: notApplicableObj(
     UIStrings.NOT_APPLICABLE__NO_EVENT_MATCHING_REQ),
+  NoGpt: notApplicableObj(UIStrings.NOT_APPLICABLE__NO_GPT),
   NoRecords: notApplicableObj(UIStrings.NOT_APPLICABLE__NO_RECORDS),
   NoVisibleSlots: notApplicableObj(UIStrings.NOT_APPLICABLE__NO_VISIBLE_SLOTS),
   NoTag: notApplicableObj(UIStrings.NOT_APPLICABLE__NO_TAG),
diff --git a/lighthouse-plugin-publisher-ads/messages/en-US.json b/lighthouse-plugin-publisher-ads/messages/en-US.json
index 95860ffe..a066f068 100644
--- a/lighthouse-plugin-publisher-ads/messages/en-US.json
+++ b/lighthouse-plugin-publisher-ads/messages/en-US.json
@@ -160,15 +160,15 @@
     "description": ""
   },
   "audits/async-ad-tags.js | description": {
-    "message": "Loading the GPT tag synchronously blocks content rendering until the tag is fetched and loaded. Consider using the `async` attribute to load gpt.js asynchronously. [Learn more](https://developers.google.com/publisher-ads-audits/reference/audits/async-ad-tags).",
+    "message": "Loading the ad tag synchronously blocks content rendering until the tag is fetched and loaded. Consider using the `async` attribute to load gpt.js and/or adsbygoogle.js asynchronously. [Learn more](https://developers.google.com/publisher-ads-audits/reference/audits/async-ad-tags).",
     "description": ""
   },
   "audits/async-ad-tags.js | failureTitle": {
-    "message": "Load GPT asynchronously",
+    "message": "Load ad tag asynchronously",
     "description": ""
   },
   "audits/async-ad-tags.js | title": {
-    "message": "GPT tag is loaded asynchronously",
+    "message": "Ad tag is loaded asynchronously",
     "description": ""
   },
   "audits/blocking-load-events.js | columnBlockedUrl": {
@@ -468,7 +468,7 @@
     "description": ""
   },
   "audits/tag-load-time.js | description": {
-    "message": "This metric measures the time for the Google Publisher Tag's implementation script (pubads_impl.js) to load after the page loads. [Learn more](https://developers.google.com/publisher-ads-audits/reference/audits/metrics).",
+    "message": "This metric measures the time for the ad tag's implementation script (pubads_impl.js for GPT; adsbygoogle.js for AdSense) to load after the page loads. [Learn more](https://developers.google.com/publisher-ads-audits/reference/audits/metrics).",
     "description": ""
   },
   "audits/tag-load-time.js | displayValue": {
@@ -551,6 +551,10 @@
     "message": "No event matches network records",
     "description": ""
   },
+  "messages/common-strings.js | NOT_APPLICABLE__NO_GPT": {
+    "message": "GPT not requested",
+    "description": ""
+  },
   "messages/common-strings.js | NOT_APPLICABLE__NO_RECORDS": {
     "message": "No successful network records",
     "description": ""
diff --git a/lighthouse-plugin-publisher-ads/messages/locales/en-XL.json b/lighthouse-plugin-publisher-ads/messages/locales/en-XL.json
index a5ef6c52..75389131 100644
--- a/lighthouse-plugin-publisher-ads/messages/locales/en-XL.json
+++ b/lighthouse-plugin-publisher-ads/messages/locales/en-XL.json
@@ -120,13 +120,13 @@
     "message": "F̂éŵ ór̂ ńô ád̂ś l̂óâd́êd́ ôút̂śîd́ê v́îéŵṕôŕt̂"
   },
   "audits/async-ad-tags.js | description": {
-    "message": "L̂óâd́îńĝ t́ĥé ĜṔT̂ t́âǵ ŝýn̂ćĥŕôńôúŝĺŷ b́l̂óĉḱŝ ćôńt̂én̂t́ r̂én̂d́êŕîńĝ ún̂t́îĺ t̂h́ê t́âǵ îś f̂ét̂ćĥéd̂ án̂d́ l̂óâd́êd́. Ĉón̂śîd́êŕ ûśîńĝ t́ĥé `âśŷńĉ` át̂t́r̂íb̂út̂é t̂ó l̂óâd́ ĝṕt̂.j́ŝ áŝýn̂ćĥŕôńôúŝĺŷ. [Ĺêár̂ń m̂ór̂é](ĥt́t̂ṕŝ://d́êv́êĺôṕêŕŝ.ǵôóĝĺê.ćôḿ/p̂úb̂ĺîśĥér̂-ád̂ś-âúd̂ít̂ś/r̂éf̂ér̂én̂ćê/áûd́ît́ŝ/áŝýn̂ć-âd́-t̂áĝś)."
+    "message": "L̂óâd́îńĝ t́ĥé âd́ t̂áĝ śŷńĉh́r̂ón̂óûśl̂ý b̂ĺôćk̂ś ĉón̂t́êńt̂ ŕêńd̂ér̂ín̂ǵ ûńt̂íl̂ t́ĥé t̂áĝ íŝ f́êt́ĉh́êd́ âńd̂ ĺôád̂éd̂. Ćôńŝíd̂ér̂ úŝín̂ǵ t̂h́ê `áŝýn̂ć` ât́t̂ŕîb́ût́ê t́ô ĺôád̂ ǵp̂t́.ĵś âńd̂/ór̂ ád̂śb̂ýĝóôǵl̂é.ĵś âśŷńĉh́r̂ón̂óûśl̂ý. [L̂éâŕn̂ ḿôŕê](h́t̂t́p̂ś://d̂év̂él̂óp̂ér̂ś.ĝóôǵl̂é.ĉóm̂/ṕûb́l̂íŝh́êŕ-âd́ŝ-áûd́ît́ŝ/ŕêf́êŕêńĉé/âúd̂ít̂ś/âśŷńĉ-ád̂-t́âǵŝ)."
   },
   "audits/async-ad-tags.js | failureTitle": {
-    "message": "L̂óâd́ ĜṔT̂ áŝýn̂ćĥŕôńôúŝĺŷ"
+    "message": "L̂óâd́ âd́ t̂áĝ áŝýn̂ćĥŕôńôúŝĺŷ"
   },
   "audits/async-ad-tags.js | title": {
-    "message": "ĜṔT̂ t́âǵ îś l̂óâd́êd́ âśŷńĉh́r̂ón̂óûśl̂ý"
+    "message": "Âd́ t̂áĝ íŝ ĺôád̂éd̂ áŝýn̂ćĥŕôńôúŝĺŷ"
   },
   "audits/blocking-load-events.js | columnBlockedUrl": {
     "message": "B̂ĺôćk̂éd̂ ÚR̂Ĺ"
@@ -351,7 +351,7 @@
     "message": "Ĥéâd́êŕ b̂íd̂d́îńĝ íŝ ṕâŕâĺl̂él̂íẑéd̂"
   },
   "audits/tag-load-time.js | description": {
-    "message": "T̂h́îś m̂ét̂ŕîć m̂éâśûŕêś t̂h́ê t́îḿê f́ôŕ t̂h́ê Ǵôóĝĺê Ṕûb́l̂íŝh́êŕ T̂áĝ'ś îḿp̂ĺêḿêńt̂át̂íôń ŝćr̂íp̂t́ (p̂úb̂ád̂ś_îḿp̂ĺ.ĵś) t̂ó l̂óâd́ âf́t̂ér̂ t́ĥé p̂áĝé l̂óâd́ŝ. [Ĺêár̂ń m̂ór̂é](ĥt́t̂ṕŝ://d́êv́êĺôṕêŕŝ.ǵôóĝĺê.ćôḿ/p̂úb̂ĺîśĥér̂-ád̂ś-âúd̂ít̂ś/r̂éf̂ér̂én̂ćê/áûd́ît́ŝ/ḿêt́r̂íĉś)."
+    "message": "T̂h́îś m̂ét̂ŕîć m̂éâśûŕêś t̂h́ê t́îḿê f́ôŕ t̂h́ê ád̂ t́âǵ'ŝ ím̂ṕl̂ém̂én̂t́ât́îón̂ śĉŕîṕt̂ (ṕûb́âd́ŝ_ím̂ṕl̂.j́ŝ f́ôŕ ĜṔT̂; ád̂śb̂ýĝóôǵl̂é.ĵś f̂ór̂ Ád̂Śêńŝé) t̂ó l̂óâd́ âf́t̂ér̂ t́ĥé p̂áĝé l̂óâd́ŝ. [Ĺêár̂ń m̂ór̂é](ĥt́t̂ṕŝ://d́êv́êĺôṕêŕŝ.ǵôóĝĺê.ćôḿ/p̂úb̂ĺîśĥér̂-ád̂ś-âúd̂ít̂ś/r̂éf̂ér̂én̂ćê/áûd́ît́ŝ/ḿêt́r̂íĉś)."
   },
   "audits/tag-load-time.js | displayValue": {
     "message": "{timeInMs, number, seconds} ŝ"
@@ -413,6 +413,9 @@
   "messages/common-strings.js | NOT_APPLICABLE__NO_EVENT_MATCHING_REQ": {
     "message": "N̂ó êv́êńt̂ ḿât́ĉh́êś n̂ét̂ẃôŕk̂ ŕêćôŕd̂ś"
   },
+  "messages/common-strings.js | NOT_APPLICABLE__NO_GPT": {
+    "message": "ĜṔT̂ ńôt́ r̂éq̂úêśt̂éd̂"
+  },
   "messages/common-strings.js | NOT_APPLICABLE__NO_RECORDS": {
     "message": "N̂ó ŝúĉćêśŝf́ûĺ n̂ét̂ẃôŕk̂ ŕêćôŕd̂ś"
   },
diff --git a/lighthouse-plugin-publisher-ads/utils/graph.js b/lighthouse-plugin-publisher-ads/utils/graph.js
index 15c161f8..e4a5fc7d 100644
--- a/lighthouse-plugin-publisher-ads/utils/graph.js
+++ b/lighthouse-plugin-publisher-ads/utils/graph.js
@@ -22,7 +22,7 @@ const {assert} = require('./asserts');
 const {getAbbreviatedUrl, trimUrl} = require('../utils/resource-classification');
 const {getNetworkInitiators} = require('lighthouse/lighthouse-core/computed/page-dependency-graph');
 const {getTimingsByRecord} = require('../utils/network-timing');
-const {isGptAdRequest, getHeaderBidder} = require('./resource-classification');
+const {isAdRequest, getHeaderBidder} = require('./resource-classification');
 
 /** @typedef {LH.Gatherer.Simulation.NodeTiming} NodeTiming */
 /** @typedef {LH.TraceEvent} TraceEvent */
@@ -366,7 +366,7 @@ function computeSelfTimes(requests) {
 async function computeAdRequestWaterfall(trace, devtoolsLog, context) {
   const networkRecords = await NetworkRecords.request(devtoolsLog, context);
 
-  const maybeFirstAdRequest = networkRecords.find(isGptAdRequest);
+  const maybeFirstAdRequest = networkRecords.find(isAdRequest);
   const criticalRequests = new Set();
   if (maybeFirstAdRequest == null) {
     return Promise.resolve([]);
diff --git a/lighthouse-plugin-publisher-ads/utils/resource-classification.js b/lighthouse-plugin-publisher-ads/utils/resource-classification.js
index a0df19fb..23ebee49 100644
--- a/lighthouse-plugin-publisher-ads/utils/resource-classification.js
+++ b/lighthouse-plugin-publisher-ads/utils/resource-classification.js
@@ -126,7 +126,7 @@ function isAdSenseAdRequest(request) {
   if (!request) return false;
   const url = new URL(request.url);
   return (
-    url.pathname === 'pagead/ads' &&
+    url.pathname === '/pagead/ads' &&
     url.host === 'googleads.g.doubleclick.net'
   );
 }
@@ -149,6 +149,15 @@ function isAdTag(url) {
   return isAdSenseTag(url) || isGptTag(url);
 }
 
+/**
+ * Checks if a network request is a GPT or AdSense ad request.
+ * @param {LH.Artifacts.NetworkRequest} request
+ * @return {boolean}
+ */
+function isAdRequest(request) {
+  return isAdSenseAdRequest(request) || isGptAdRequest(request);
+}
+
 /**
  * Checks if the url is loading either the GPT impl script or the AdSense
  * script.
@@ -275,6 +284,7 @@ module.exports = {
   isAdSenseAdRequest,
   isAdSenseIframe,
   isAdTag,
+  isAdRequest,
   isImplTag,
   containsAnySubstring,
   hasImpressionPath,

From 40c87249f95b10c53f3bf616b3edcf35120081ac Mon Sep 17 00:00:00 2001
From: jonkeller <jonkeller@google.com>
Date: Wed, 4 Sep 2019 16:50:30 -0400
Subject: [PATCH 5/8] Corrects misconception that AdSense has no impl

---
 .../computed/ad-request-time.js               |  4 +-
 .../utils/resource-classification.js          | 90 +++++++++++--------
 2 files changed, 55 insertions(+), 39 deletions(-)

diff --git a/lighthouse-plugin-publisher-ads/computed/ad-request-time.js b/lighthouse-plugin-publisher-ads/computed/ad-request-time.js
index 0fde4dad..68a6fb97 100644
--- a/lighthouse-plugin-publisher-ads/computed/ad-request-time.js
+++ b/lighthouse-plugin-publisher-ads/computed/ad-request-time.js
@@ -18,7 +18,7 @@ const ComputedMetric = require('lighthouse/lighthouse-core/computed/metrics/metr
 // @ts-ignore
 const makeComputedArtifact = require('lighthouse/lighthouse-core/computed/computed-artifact');
 const {getAdStartTime, getPageStartTime} = require('../utils/network-timing');
-const {isGptAdRequest} = require('../utils/resource-classification');
+const {isAdRequest} = require('../utils/resource-classification');
 
 // @ts-ignore
 // eslint-disable-next-line max-len
@@ -35,7 +35,7 @@ class LanternAdRequestTime extends AdLanternMetric {
   static getEstimateFromSimulation(simulationResult, extras) {
     const {nodeTimings} = simulationResult;
     const timeInMs = AdLanternMetric.findNetworkTiming(
-      nodeTimings, isGptAdRequest).startTime;
+      nodeTimings, isAdRequest).startTime;
     return {timeInMs, nodeTimings};
   }
 }
diff --git a/lighthouse-plugin-publisher-ads/utils/resource-classification.js b/lighthouse-plugin-publisher-ads/utils/resource-classification.js
index 23ebee49..a358f942 100644
--- a/lighthouse-plugin-publisher-ads/utils/resource-classification.js
+++ b/lighthouse-plugin-publisher-ads/utils/resource-classification.js
@@ -37,50 +37,56 @@ function isGoogleAds(url) {
 }
 
 /**
- * Checks if the url is loading a gpt.js script.
+ * Checks if the url is loading an AdSense script.
  * @param {URL|string} url
  * @return {boolean}
  */
-function isGptTag(url) {
+function isAdSenseTag(url) {
   const {host, pathname} = toURL(url);
   const matchesHost = [
-    'www.googletagservices.com',
-    'securepubads.g.doubleclick.net'].includes(host);
+    'pagead2.googlesyndication.com'].includes(host);
   const matchesPath =
-    ['/tag/js/gpt.js', '/tag/js/gpt_mobile.js'].includes(pathname);
+      [
+        '/pagead/js/adsbygoogle.js',
+        '/pagead/show_ads.js',
+      ].includes(pathname);
   return matchesHost && matchesPath;
 }
 
 /**
- * Checks if the url is for pubads implementation tag.
+ * Checks if the url is loading an AdSense script.
  * @param {URL|string} url
  * @return {boolean}
  */
-function isGptImplTag(url) {
-  return /(^\/gpt\/pubads_impl_\d+.js)/.test(toURL(url).pathname);
+function isAdSenseImplTag(url) {
+  const {host, pathname} = toURL(url);
+  const matchesHost = [
+    'pagead2.googlesyndication.com'].includes(host);
+  const matchesPath =
+      /(^\/pagead\/js\/.*\/show_ads_impl\.js)/.test(pathname);
+  return matchesHost && matchesPath;
 }
 
 /**
- * Checks if the url is loading a gpt.js or pubads_impl_*.js script.
+ * Checks if the url is loading an AdSense loader or impl script.
  * @param {URL} url
  * @return {boolean}
  */
-function isGpt(url) {
-  return isGptTag(url) || isGptImplTag(url);
+function isAdSense(url) {
+  return isAdSenseTag(url) || isAdSenseImplTag(url);
 }
 
 /**
- * Checks if a network request is a GPT ad request.
+ * Checks if a network request is an AdSense ad request.
  * @param {LH.Artifacts.NetworkRequest} request
  * @return {boolean}
  */
-function isGptAdRequest(request) {
+function isAdSenseAdRequest(request) {
   if (!request) return false;
   const url = new URL(request.url);
   return (
-    url.pathname === '/gampad/ads' &&
-    url.host === 'securepubads.g.doubleclick.net' &&
-    request.resourceType === 'XHR'
+    url.pathname === '/pagead/ads' &&
+    url.host === 'googleads.g.doubleclick.net'
   );
 }
 
@@ -88,46 +94,55 @@ function isGptAdRequest(request) {
  * @param {Artifacts['IFrameElement']} iframe
  * @return {boolean}
  */
-function isGptIframe(iframe) {
-  return /(^google_ads_iframe_)/.test(iframe.id);
+function isAdSenseIframe(iframe) {
+  return /(^google_ads_frame)/.test(iframe.id);
 }
 
 /**
- * Checks if the url is loading an AdSense script.
+ * Checks if the url is loading a gpt.js script.
  * @param {URL|string} url
  * @return {boolean}
  */
-function isAdSenseTag(url) {
+function isGptTag(url) {
   const {host, pathname} = toURL(url);
   const matchesHost = [
-    'pagead2.googlesyndication.com'].includes(host);
+    'www.googletagservices.com',
+    'securepubads.g.doubleclick.net'].includes(host);
   const matchesPath =
-      ['/pagead/js/adsbygoogle.js'].includes(pathname);
+    ['/tag/js/gpt.js', '/tag/js/gpt_mobile.js'].includes(pathname);
   return matchesHost && matchesPath;
 }
 
 /**
- * Checks if the url is loading an AdSense script. Kind of pointless since
- * AdSense doesn't have a separate loader, but provided anyway for symmetry with
- * isGpt().
+ * Checks if the url is for pubads implementation tag.
+ * @param {URL|string} url
+ * @return {boolean}
+ */
+function isGptImplTag(url) {
+  return /(^\/gpt\/pubads_impl_\d+\.js)/.test(toURL(url).pathname);
+}
+
+/**
+ * Checks if the url is loading a gpt.js or pubads_impl_*.js script.
  * @param {URL} url
  * @return {boolean}
  */
-function isAdSense(url) {
-  return isAdSenseTag(url);
+function isGpt(url) {
+  return isGptTag(url) || isGptImplTag(url);
 }
 
 /**
- * Checks if a network request is an AdSense ad request.
+ * Checks if a network request is a GPT ad request.
  * @param {LH.Artifacts.NetworkRequest} request
  * @return {boolean}
  */
-function isAdSenseAdRequest(request) {
+function isGptAdRequest(request) {
   if (!request) return false;
   const url = new URL(request.url);
   return (
-    url.pathname === '/pagead/ads' &&
-    url.host === 'googleads.g.doubleclick.net'
+    url.pathname === '/gampad/ads' &&
+    url.host === 'securepubads.g.doubleclick.net' &&
+    request.resourceType === 'XHR'
   );
 }
 
@@ -135,8 +150,8 @@ function isAdSenseAdRequest(request) {
  * @param {Artifacts['IFrameElement']} iframe
  * @return {boolean}
  */
-function isAdSenseIframe(iframe) {
-  return /(^google_ads_frame)/.test(iframe.id);
+function isGptIframe(iframe) {
+  return /(^google_ads_iframe_)/.test(iframe.id);
 }
 
 /**
@@ -274,15 +289,16 @@ function getAbbreviatedUrl(url) {
 
 module.exports = {
   isGoogleAds,
+  isAdSense,
+  isAdSenseTag,
+  isAdSenseImplTag,
+  isAdSenseAdRequest,
+  isAdSenseIframe,
   isGptTag,
   isGptImplTag,
   isGpt,
   isGptAdRequest,
   isGptIframe,
-  isAdSense,
-  isAdSenseTag,
-  isAdSenseAdRequest,
-  isAdSenseIframe,
   isAdTag,
   isAdRequest,
   isImplTag,

From e1d6a8d71c259ba5b9242d71ba243b77a6786d0e Mon Sep 17 00:00:00 2001
From: jonkeller <jonkeller@google.com>
Date: Thu, 5 Sep 2019 10:01:44 -0400
Subject: [PATCH 6/8] Adds AdSense support to more audits

---
 .../audits/ad-blocking-tasks.js               |  4 +--
 .../audits/ad-render-blocking-resources.js    |  4 +--
 .../audits/ad-top-of-viewport.js              |  4 +--
 .../audits/ads-in-viewport.js                 |  4 +--
 .../audits/full-width-slots.js                |  4 +--
 .../audits/viewport-ad-density.js             |  4 +--
 .../computed/ad-paint-time.js                 | 12 +++++--
 .../utils/network-timing.js                   |  4 +--
 .../utils/resource-classification.js          | 32 +++++++++++++++----
 9 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/lighthouse-plugin-publisher-ads/audits/ad-blocking-tasks.js b/lighthouse-plugin-publisher-ads/audits/ad-blocking-tasks.js
index e5bacaac..96e94bb0 100644
--- a/lighthouse-plugin-publisher-ads/audits/ad-blocking-tasks.js
+++ b/lighthouse-plugin-publisher-ads/audits/ad-blocking-tasks.js
@@ -13,7 +13,7 @@ const LongTasks = require('../computed/long-tasks');
 const {auditNotApplicable} = require('../messages/common-strings');
 const {Audit} = require('lighthouse');
 const {getAttributableUrl} = require('../utils/tasks');
-const {isGpt} = require('../utils/resource-classification');
+const {isAdScript} = require('../utils/resource-classification');
 const {URL} = require('url');
 
 const UIStrings = {
@@ -124,7 +124,7 @@ class AdBlockingTasks extends Audit {
         continue;
       }
       const scriptUrl = getAttributableUrl(longTask);
-      if (scriptUrl && isGpt(new URL(scriptUrl))) {
+      if (scriptUrl && isAdScript(new URL(scriptUrl))) {
         continue;
       }
 
diff --git a/lighthouse-plugin-publisher-ads/audits/ad-render-blocking-resources.js b/lighthouse-plugin-publisher-ads/audits/ad-render-blocking-resources.js
index 1f7ffd32..0f4b55a2 100644
--- a/lighthouse-plugin-publisher-ads/audits/ad-render-blocking-resources.js
+++ b/lighthouse-plugin-publisher-ads/audits/ad-render-blocking-resources.js
@@ -19,7 +19,7 @@ const RenderBlockingResources = require('lighthouse/lighthouse-core/audits/byte-
 const {auditNotApplicable} = require('../messages/common-strings');
 const {Audit} = require('lighthouse');
 const {getPageStartTime} = require('../utils/network-timing');
-const {isGptTag} = require('../utils/resource-classification');
+const {isAdTag} = require('../utils/resource-classification');
 const {URL} = require('url');
 
 const UIStrings = {
@@ -88,7 +88,7 @@ class AdRenderBlockingResources extends RenderBlockingResources {
   static async audit(artifacts, context) {
     const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
     const networkRecords = await NetworkRecords.request(devtoolsLog, context);
-    const hasTag = !!networkRecords.find((req) => isGptTag(new URL(req.url)));
+    const hasTag = !!networkRecords.find((req) => isAdTag(new URL(req.url)));
     if (!hasTag) {
       return auditNotApplicable.NoTag;
     }
diff --git a/lighthouse-plugin-publisher-ads/audits/ad-top-of-viewport.js b/lighthouse-plugin-publisher-ads/audits/ad-top-of-viewport.js
index 040d4cff..0488b549 100644
--- a/lighthouse-plugin-publisher-ads/audits/ad-top-of-viewport.js
+++ b/lighthouse-plugin-publisher-ads/audits/ad-top-of-viewport.js
@@ -15,7 +15,7 @@
 const i18n = require('lighthouse/lighthouse-core/lib/i18n/i18n');
 const {auditNotApplicable} = require('../messages/common-strings');
 const {Audit} = require('lighthouse');
-const {isGptIframe} = require('../utils/resource-classification');
+const {isAdIframe} = require('../utils/resource-classification');
 
 const UIStrings = {
   title: 'No ad found at the very top of the viewport',
@@ -67,7 +67,7 @@ class AdTopOfViewport extends Audit {
    */
   static audit(artifacts) {
     const viewport = artifacts.ViewportDimensions;
-    const slots = artifacts.IFrameElements.filter(isGptIframe)
+    const slots = artifacts.IFrameElements.filter(isAdIframe)
         .filter((slot) => slot.isVisible && !slot.isFixed)
         .map((slot) => ({
           midpoint: slot.clientRect.top + slot.clientRect.height / 2,
diff --git a/lighthouse-plugin-publisher-ads/audits/ads-in-viewport.js b/lighthouse-plugin-publisher-ads/audits/ads-in-viewport.js
index 35345ffe..6835cfad 100644
--- a/lighthouse-plugin-publisher-ads/audits/ads-in-viewport.js
+++ b/lighthouse-plugin-publisher-ads/audits/ads-in-viewport.js
@@ -16,8 +16,8 @@ const {auditNotApplicable} = require('../messages/common-strings');
 const {Audit} = require('lighthouse');
 
 const i18n = require('lighthouse/lighthouse-core/lib/i18n/i18n');
+const {isAdIframe} = require('../utils/resource-classification');
 const {isBoxInViewport} = require('../utils/geometry');
-const {isGptIframe} = require('../utils/resource-classification');
 
 const UIStrings = {
   title: 'Few or no ads loaded outside viewport',
@@ -67,7 +67,7 @@ class AdsInViewport extends Audit {
   static audit(artifacts) {
     const viewport = artifacts.ViewportDimensions;
     const slots = artifacts.IFrameElements
-        .filter((iframe) => isGptIframe(iframe) && iframe.isVisible);
+        .filter((iframe) => isAdIframe(iframe) && iframe.isVisible);
 
     if (!slots.length) {
       return auditNotApplicable.NoVisibleSlots;
diff --git a/lighthouse-plugin-publisher-ads/audits/full-width-slots.js b/lighthouse-plugin-publisher-ads/audits/full-width-slots.js
index 5eaff5d1..99da91c0 100644
--- a/lighthouse-plugin-publisher-ads/audits/full-width-slots.js
+++ b/lighthouse-plugin-publisher-ads/audits/full-width-slots.js
@@ -16,7 +16,7 @@ const i18n = require('lighthouse/lighthouse-core/lib/i18n/i18n');
 const NetworkRecords = require('lighthouse/lighthouse-core/computed/network-records');
 const {auditNotApplicable} = require('../messages/common-strings');
 const {Audit} = require('lighthouse');
-const {isGptAdRequest} = require('../utils/resource-classification');
+const {isAdRequest} = require('../utils/resource-classification');
 const {URL} = require('url');
 
 const UIStrings = {
@@ -61,7 +61,7 @@ class FullWidthSlots extends Audit {
 
     /** @type {Array<URL>} */
     const adRequestUrls = networkRecords
-        .filter(isGptAdRequest)
+        .filter(isAdRequest)
         .map((record) => new URL(record.url));
 
     if (!adRequestUrls.length) {
diff --git a/lighthouse-plugin-publisher-ads/audits/viewport-ad-density.js b/lighthouse-plugin-publisher-ads/audits/viewport-ad-density.js
index 1a7c4ba1..bcda4fec 100644
--- a/lighthouse-plugin-publisher-ads/audits/viewport-ad-density.js
+++ b/lighthouse-plugin-publisher-ads/audits/viewport-ad-density.js
@@ -16,7 +16,7 @@ const i18n = require('lighthouse/lighthouse-core/lib/i18n/i18n');
 const {auditNotApplicable, auditError} = require('../messages/common-strings');
 const {Audit} = require('lighthouse');
 const {boxViewableArea} = require('../utils/geometry');
-const {isGptIframe} = require('../utils/resource-classification');
+const {isAdIframe} = require('../utils/resource-classification');
 
 const UIStrings = {
   title: 'Ad density in initial viewport is within recommended range',
@@ -57,7 +57,7 @@ class ViewportAdDensity extends Audit {
   static audit(artifacts) {
     const viewport = artifacts.ViewportDimensions;
     const slots = artifacts.IFrameElements.filter(
-      (slot) => isGptIframe(slot) && slot.isVisible);
+      (slot) => isAdIframe(slot) && slot.isVisible);
 
     if (!slots.length) {
       return auditNotApplicable.NoVisibleSlots;
diff --git a/lighthouse-plugin-publisher-ads/computed/ad-paint-time.js b/lighthouse-plugin-publisher-ads/computed/ad-paint-time.js
index 6f76ba7c..06ee0ae5 100644
--- a/lighthouse-plugin-publisher-ads/computed/ad-paint-time.js
+++ b/lighthouse-plugin-publisher-ads/computed/ad-paint-time.js
@@ -17,7 +17,7 @@ const AdLanternMetric = require('./ad-lantern-metric');
 const ComputedMetric = require('lighthouse/lighthouse-core/computed/metrics/metric');
 // @ts-ignore
 const makeComputedArtifact = require('lighthouse/lighthouse-core/computed/computed-artifact');
-const {isGptAdRequest, isGptIframe} = require('../utils/resource-classification');
+const {isAdRequest, isAdIframe} = require('../utils/resource-classification');
 
 /**
  * Returns the frame ID of the given event, if present.
@@ -54,7 +54,7 @@ function getAdIframes(data) {
   if (!iframeElements) {
     return [];
   }
-  return iframeElements.filter(isGptIframe);
+  return iframeElements.filter(isAdIframe);
 }
 
 /** Computes simulated first ad request time using Lantern. */
@@ -71,11 +71,17 @@ class LanternAdPaintTime extends AdLanternMetric {
     const adFrameIds = new Set(iframes.map(
       /** @param {Artifacts['IFrameElement']} s */
       (s) => s.frame && s.frame.id));
+    console.log('------- adFrameIds ---------'); // DO NOT SUBMIT - remove before merging PR
+    console.dir(adFrameIds); // DO NOT SUBMIT - remove before merging PR
     const adResponseMs = AdLanternMetric.findNetworkTiming(
-      nodeTimings, isGptAdRequest).endTime;
+      nodeTimings, isAdRequest).endTime;
+    console.log('------- adResponseMs ---------'); // DO NOT SUBMIT - remove before merging PR
+    console.dir(adResponseMs); // DO NOT SUBMIT - remove before merging PR
     // TODO: filter out pixels from resources
     const firstAdResource = AdLanternMetric.findNetworkTiming(
       nodeTimings, (request) => adFrameIds.has(request.frameId)).endTime;
+    console.log('------- firstAdResource ---------'); // DO NOT SUBMIT - remove before merging PR
+    console.dir(firstAdResource); // DO NOT SUBMIT - remove before merging PR
     const timeInMs = adResponseMs + firstAdResource;
     return {timeInMs, nodeTimings};
   }
diff --git a/lighthouse-plugin-publisher-ads/utils/network-timing.js b/lighthouse-plugin-publisher-ads/utils/network-timing.js
index a65b4d4b..7bc5c960 100644
--- a/lighthouse-plugin-publisher-ads/utils/network-timing.js
+++ b/lighthouse-plugin-publisher-ads/utils/network-timing.js
@@ -17,7 +17,7 @@ const AdLanternMetric = require('../computed/ad-lantern-metric');
 const LoadSimulator = require('lighthouse/lighthouse-core/computed/load-simulator');
 const NetworkRecords = require('lighthouse/lighthouse-core/computed/network-records');
 const PageDependencyGraph = require('lighthouse/lighthouse-core/computed/page-dependency-graph');
-const {isGptAdRequest, isImplTag} = require('./resource-classification');
+const {isAdRequest, isImplTag} = require('./resource-classification');
 const {URL} = require('url');
 
 /** @typedef {LH.Artifacts.NetworkRequest} NetworkRequest */
@@ -46,7 +46,7 @@ function getTagEndTime(networkRecords) {
  */
 function getAdStartTime(networkRecords) {
   const firstAdRecord = networkRecords.find(
-    (record) => isGptAdRequest(record));
+    (record) => isAdRequest(record));
   return firstAdRecord ? firstAdRecord.startTime : -1;
 }
 
diff --git a/lighthouse-plugin-publisher-ads/utils/resource-classification.js b/lighthouse-plugin-publisher-ads/utils/resource-classification.js
index a358f942..a4105156 100644
--- a/lighthouse-plugin-publisher-ads/utils/resource-classification.js
+++ b/lighthouse-plugin-publisher-ads/utils/resource-classification.js
@@ -95,7 +95,9 @@ function isAdSenseAdRequest(request) {
  * @return {boolean}
  */
 function isAdSenseIframe(iframe) {
-  return /(^google_ads_frame)/.test(iframe.id);
+  // TODO(jonkeller) Discuss with warrengm@ which of these is correct
+  // return /(^google_ads_frame)/.test(iframe.id);
+  return /(^aswift_\d+)/.test(iframe.id);
 }
 
 /**
@@ -155,8 +157,7 @@ function isGptIframe(iframe) {
 }
 
 /**
- * Checks if the url is loading either the GPT loader script or the AdSense
- * script.
+ * Checks if the url is loading an AdSense or GPT loader script.
  * @param {URL} url
  * @return {boolean}
  */
@@ -165,7 +166,16 @@ function isAdTag(url) {
 }
 
 /**
- * Checks if a network request is a GPT or AdSense ad request.
+ * Checks if the url is loading an AdSense or GPT loader or impl script.
+ * @param {URL} url
+ * @return {boolean}
+ */
+function isAdScript(url) {
+  return isAdSense(url) || isGpt(url);
+}
+
+/**
+ * Checks if a network request is an AdSense or GPT ad request.
  * @param {LH.Artifacts.NetworkRequest} request
  * @return {boolean}
  */
@@ -174,8 +184,16 @@ function isAdRequest(request) {
 }
 
 /**
- * Checks if the url is loading either the GPT impl script or the AdSense
- * script.
+ * Checks if an iframe is an AdSense or GPT iframe.
+ * @param {Artifacts['IFrameElement']} iframe
+ * @return {boolean}
+ */
+function isAdIframe(iframe) {
+  return isAdSenseIframe(iframe) || isGptIframe(iframe);
+}
+
+/**
+ * Checks if the url is loading either the AdSense or GPT impl script.
  * @param {URL} url
  * @return {boolean}
  */
@@ -300,7 +318,9 @@ module.exports = {
   isGptAdRequest,
   isGptIframe,
   isAdTag,
+  isAdScript,
   isAdRequest,
+  isAdIframe,
   isImplTag,
   containsAnySubstring,
   hasImpressionPath,

From ec29a593d911510e5989cdab9a35fac898d791c1 Mon Sep 17 00:00:00 2001
From: jonkeller <jonkeller@google.com>
Date: Thu, 5 Sep 2019 14:14:39 -0400
Subject: [PATCH 7/8] Makes first-ad-paint audit only consider GPT

---
 .../audits/first-ad-paint.js                   |  8 +++++++-
 .../computed/ad-paint-time.js                  | 18 ++++++------------
 .../utils/resource-classification.js           |  4 +---
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/lighthouse-plugin-publisher-ads/audits/first-ad-paint.js b/lighthouse-plugin-publisher-ads/audits/first-ad-paint.js
index f44dcb78..c19e1d1b 100644
--- a/lighthouse-plugin-publisher-ads/audits/first-ad-paint.js
+++ b/lighthouse-plugin-publisher-ads/audits/first-ad-paint.js
@@ -16,6 +16,7 @@ const AdPaintTime = require('../computed/ad-paint-time');
 const i18n = require('lighthouse/lighthouse-core/lib/i18n/i18n');
 const {auditNotApplicable, runWarning} = require('../messages/common-strings');
 const {Audit} = require('lighthouse');
+const {isAdIframe, isGptIframe} = require('../utils/resource-classification');
 
 const UIStrings = {
   title: 'Latency of first ad render',
@@ -71,7 +72,12 @@ class FirstAdPaint extends Audit {
     const {timing} = await AdPaintTime.request(metricData, context);
 
     if (!(timing > 0)) { // Handle NaN, etc.
-      context.LighthouseRunWarnings.push(runWarning.NoAdRendered);
+      // Currently only GPT ads are supported by this audit.
+      const nonGptAdSlots = artifacts.IFrameElements.filter(
+        (iframe) => isAdIframe(iframe) && !isGptIframe(iframe));
+      if (nonGptAdSlots.length === 0) {
+        context.LighthouseRunWarnings.push(runWarning.NoAdRendered);
+      }
       return auditNotApplicable.NoAdRendered;
     }
 
diff --git a/lighthouse-plugin-publisher-ads/computed/ad-paint-time.js b/lighthouse-plugin-publisher-ads/computed/ad-paint-time.js
index 06ee0ae5..805063d6 100644
--- a/lighthouse-plugin-publisher-ads/computed/ad-paint-time.js
+++ b/lighthouse-plugin-publisher-ads/computed/ad-paint-time.js
@@ -17,7 +17,7 @@ const AdLanternMetric = require('./ad-lantern-metric');
 const ComputedMetric = require('lighthouse/lighthouse-core/computed/metrics/metric');
 // @ts-ignore
 const makeComputedArtifact = require('lighthouse/lighthouse-core/computed/computed-artifact');
-const {isAdRequest, isAdIframe} = require('../utils/resource-classification');
+const {isGptAdRequest, isGptIframe} = require('../utils/resource-classification');
 
 /**
  * Returns the frame ID of the given event, if present.
@@ -49,12 +49,12 @@ function getMinEventTime(eventName, traceEvents, adFrameIds) {
  * @param {MetricComputationData} data
  * @return {Array<Artifacts['IFrameElement']>}
  */
-function getAdIframes(data) {
+function getGptIframes(data) {
   const {iframeElements} = data;
   if (!iframeElements) {
     return [];
   }
-  return iframeElements.filter(isAdIframe);
+  return iframeElements.filter(isGptIframe);
 }
 
 /** Computes simulated first ad request time using Lantern. */
@@ -71,17 +71,11 @@ class LanternAdPaintTime extends AdLanternMetric {
     const adFrameIds = new Set(iframes.map(
       /** @param {Artifacts['IFrameElement']} s */
       (s) => s.frame && s.frame.id));
-    console.log('------- adFrameIds ---------'); // DO NOT SUBMIT - remove before merging PR
-    console.dir(adFrameIds); // DO NOT SUBMIT - remove before merging PR
     const adResponseMs = AdLanternMetric.findNetworkTiming(
-      nodeTimings, isAdRequest).endTime;
-    console.log('------- adResponseMs ---------'); // DO NOT SUBMIT - remove before merging PR
-    console.dir(adResponseMs); // DO NOT SUBMIT - remove before merging PR
+      nodeTimings, isGptAdRequest).endTime;
     // TODO: filter out pixels from resources
     const firstAdResource = AdLanternMetric.findNetworkTiming(
       nodeTimings, (request) => adFrameIds.has(request.frameId)).endTime;
-    console.log('------- firstAdResource ---------'); // DO NOT SUBMIT - remove before merging PR
-    console.dir(firstAdResource); // DO NOT SUBMIT - remove before merging PR
     const timeInMs = adResponseMs + firstAdResource;
     return {timeInMs, nodeTimings};
   }
@@ -101,7 +95,7 @@ class AdPaintTime extends ComputedMetric {
    * @override
    */
   static async computeSimulatedMetric(data, context) {
-    const iframes = getAdIframes(data);
+    const iframes = getGptIframes(data);
     // @ts-ignore computeMetricWithGraphs is not a property of
     // LanternAdPaintTime.
     return LanternAdPaintTime.computeMetricWithGraphs(data, context, {iframes});
@@ -114,7 +108,7 @@ class AdPaintTime extends ComputedMetric {
    * @override
    */
   static async computeObservedMetric(data, context) {
-    const iframes = getAdIframes(data);
+    const iframes = getGptIframes(data);
     const {trace: {traceEvents}} = data;
     const {ts: pageNavigationStart} =
       traceEvents.find((e) => e.name == 'navigationStart') || {ts: 0};
diff --git a/lighthouse-plugin-publisher-ads/utils/resource-classification.js b/lighthouse-plugin-publisher-ads/utils/resource-classification.js
index a4105156..42b073d2 100644
--- a/lighthouse-plugin-publisher-ads/utils/resource-classification.js
+++ b/lighthouse-plugin-publisher-ads/utils/resource-classification.js
@@ -95,9 +95,7 @@ function isAdSenseAdRequest(request) {
  * @return {boolean}
  */
 function isAdSenseIframe(iframe) {
-  // TODO(jonkeller) Discuss with warrengm@ which of these is correct
-  // return /(^google_ads_frame)/.test(iframe.id);
-  return /(^aswift_\d+)/.test(iframe.id);
+  return /(^aswift_\d+)/.test(iframe.id); // (^google_ads_frame) is cross-domain
 }
 
 /**

From 2d7a1bac3c3e6e26bebf16541a5bcbe59df8c078 Mon Sep 17 00:00:00 2001
From: jonkeller <jonkeller@google.com>
Date: Fri, 6 Sep 2019 14:33:28 -0400
Subject: [PATCH 8/8] Addresses style nit

---
 .../audits/loads-ad-tag-over-https.js              |  2 ++
 .../utils/resource-classification.js               | 14 ++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lighthouse-plugin-publisher-ads/audits/loads-ad-tag-over-https.js b/lighthouse-plugin-publisher-ads/audits/loads-ad-tag-over-https.js
index 580c623d..ad3005e7 100644
--- a/lighthouse-plugin-publisher-ads/audits/loads-ad-tag-over-https.js
+++ b/lighthouse-plugin-publisher-ads/audits/loads-ad-tag-over-https.js
@@ -90,6 +90,8 @@ class LoadsAdTagOverHttps extends Audit {
       return returnVal;
     }
 
+    // TODO(jonkeller): Add a details table indicating which scripts are loaded
+    // over HTTP.
     return {
       numericValue: details.numAdTagHttpReqs,
       score: details.numAdTagHttpReqs ? 0 : 1,
diff --git a/lighthouse-plugin-publisher-ads/utils/resource-classification.js b/lighthouse-plugin-publisher-ads/utils/resource-classification.js
index 42b073d2..fd130f41 100644
--- a/lighthouse-plugin-publisher-ads/utils/resource-classification.js
+++ b/lighthouse-plugin-publisher-ads/utils/resource-classification.js
@@ -42,14 +42,13 @@ function isGoogleAds(url) {
  * @return {boolean}
  */
 function isAdSenseTag(url) {
-  const {host, pathname} = toURL(url);
-  const matchesHost = [
-    'pagead2.googlesyndication.com'].includes(host);
+  url = toURL(url);
+  const matchesHost = url.host === 'pagead2.googlesyndication.com';
   const matchesPath =
       [
         '/pagead/js/adsbygoogle.js',
         '/pagead/show_ads.js',
-      ].includes(pathname);
+      ].includes(url.pathname);
   return matchesHost && matchesPath;
 }
 
@@ -59,11 +58,10 @@ function isAdSenseTag(url) {
  * @return {boolean}
  */
 function isAdSenseImplTag(url) {
-  const {host, pathname} = toURL(url);
-  const matchesHost = [
-    'pagead2.googlesyndication.com'].includes(host);
+  url = toURL(url);
+  const matchesHost = url.host === 'pagead2.googlesyndication.com';
   const matchesPath =
-      /(^\/pagead\/js\/.*\/show_ads_impl\.js)/.test(pathname);
+      /(^\/pagead\/js\/.*\/show_ads_impl\.js)/.test(url.pathname);
   return matchesHost && matchesPath;
 }