Index: tools/metrics/histograms/histograms.xml |
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml |
index 86771ccd57d46155d4c37aad0f1c259f8212b94c..2905d1e09aae4f2b6f61fefe20be86007c9add5d 100644 |
--- a/tools/metrics/histograms/histograms.xml |
+++ b/tools/metrics/histograms/histograms.xml |
@@ -29579,6 +29579,41 @@ Therefore, the affected-histogram name has to have at least one dot in it. |
</summary> |
</histogram> |
+<histogram name="SBOffDomainInclusion.Detected" enum="ContentResourceType"> |
+ <owner>gab@chromium.org</owner> |
+ <summary> |
+ Logs the resource type of each resource request for which an off-domain |
+ inclusion was detected by the OffDomainInclusionDetector. |
+ </summary> |
+</histogram> |
+ |
+<histogram name="SBOffDomainInclusion.EmptyMainFrameURL" |
+ enum="ContentResourceType"> |
+ <owner>gab@chromium.org</owner> |
+ <summary> |
+ Logs the resource type of each resource request for which the main frame URL |
+ was unexpectedly empty in the OffDomainInclusionDetector. |
+ </summary> |
+</histogram> |
+ |
+<histogram name="SBOffDomainInclusion.InvalidMainFrameURL" |
+ enum="ContentResourceType"> |
+ <owner>gab@chromium.org</owner> |
+ <summary> |
+ Logs the resource type of each resource request for which the main frame URL |
+ was unexpectedly invalid (and not empty) in the OffDomainInclusionDetector. |
+ </summary> |
+</histogram> |
+ |
+<histogram name="SBOffDomainInclusion.RequestAnalyzed" |
+ enum="ContentResourceType"> |
+ <owner>gab@chromium.org</owner> |
+ <summary> |
+ Logs the resource type of each resource request analyzed by the |
+ OffDomainInclusionDetector. |
+ </summary> |
+</histogram> |
+ |
<histogram name="Sdch3.Advertisement_Count"> |
<owner>rdsmith@chromium.org</owner> |
<summary> |
@@ -33357,7 +33392,7 @@ Therefore, the affected-histogram name has to have at least one dot in it. |
</histogram> |
<histogram name="SiteIsolation.XSD.HTML.Blocked.RenderableStatusCode" |
- enum="SiteIsolationResourceType"> |
+ enum="ContentResourceType"> |
<owner>Please list the metric's owners. Add more owner tags as needed.</owner> |
<summary> |
The count of responses with a renderable HTTP status code sub-categorized by |
@@ -33379,7 +33414,7 @@ Therefore, the affected-histogram name has to have at least one dot in it. |
</histogram> |
<histogram name="SiteIsolation.XSD.HTML.NoSniffBlocked.RenderableStatusCode" |
- enum="SiteIsolationResourceType"> |
+ enum="ContentResourceType"> |
<owner>Please list the metric's owners. Add more owner tags as needed.</owner> |
<summary> |
The count of responses with a renderable HTTP status code sub-categorized by |
@@ -33427,7 +33462,7 @@ Therefore, the affected-histogram name has to have at least one dot in it. |
</histogram> |
<histogram name="SiteIsolation.XSD.JSON.Blocked.RenderableStatusCode" |
- enum="SiteIsolationResourceType"> |
+ enum="ContentResourceType"> |
<owner>Please list the metric's owners. Add more owner tags as needed.</owner> |
<summary> |
The count of responses with a renderable HTTP status code sub-categorized by |
@@ -33449,7 +33484,7 @@ Therefore, the affected-histogram name has to have at least one dot in it. |
</histogram> |
<histogram name="SiteIsolation.XSD.JSON.NoSniffBlocked.RenderableStatusCode" |
- enum="SiteIsolationResourceType"> |
+ enum="ContentResourceType"> |
<owner>Please list the metric's owners. Add more owner tags as needed.</owner> |
<summary> |
The count of responses with a renderable HTTP status code sub-categorized by |
@@ -33507,7 +33542,7 @@ Therefore, the affected-histogram name has to have at least one dot in it. |
</histogram> |
<histogram name="SiteIsolation.XSD.Plain.HTML.Blocked.RenderableStatusCode" |
- enum="SiteIsolationResourceType"> |
+ enum="ContentResourceType"> |
<owner>Please list the metric's owners. Add more owner tags as needed.</owner> |
<summary> |
The count of responses with a renderable HTTP status code sub-categorized by |
@@ -33538,7 +33573,7 @@ Therefore, the affected-histogram name has to have at least one dot in it. |
</histogram> |
<histogram name="SiteIsolation.XSD.Plain.JSON.Blocked.RenderableStatusCode" |
- enum="SiteIsolationResourceType"> |
+ enum="ContentResourceType"> |
<owner>Please list the metric's owners. Add more owner tags as needed.</owner> |
<summary> |
The count of responses with a renderable HTTP status code sub-categorized by |
@@ -33561,7 +33596,7 @@ Therefore, the affected-histogram name has to have at least one dot in it. |
</histogram> |
<histogram name="SiteIsolation.XSD.Plain.NoSniffBlocked.RenderableStatusCode" |
- enum="SiteIsolationResourceType"> |
+ enum="ContentResourceType"> |
<owner>Please list the metric's owners. Add more owner tags as needed.</owner> |
<summary> |
The count of responses with a renderable HTTP status code sub-categorized by |
@@ -33610,7 +33645,7 @@ Therefore, the affected-histogram name has to have at least one dot in it. |
</histogram> |
<histogram name="SiteIsolation.XSD.Plain.XML.Blocked.RenderableStatusCode" |
- enum="SiteIsolationResourceType"> |
+ enum="ContentResourceType"> |
<owner>Please list the metric's owners. Add more owner tags as needed.</owner> |
<summary> |
The count of responses with renderable HTTP status codes sub-categorized by |
@@ -33640,7 +33675,7 @@ Therefore, the affected-histogram name has to have at least one dot in it. |
</histogram> |
<histogram name="SiteIsolation.XSD.XML.Blocked.RenderableStatusCode" |
- enum="SiteIsolationResourceType"> |
+ enum="ContentResourceType"> |
<owner>Please list the metric's owners. Add more owner tags as needed.</owner> |
<summary> |
The count of responses with renderable HTTP status codes sub-categorized by |
@@ -33662,7 +33697,7 @@ Therefore, the affected-histogram name has to have at least one dot in it. |
</histogram> |
<histogram name="SiteIsolation.XSD.XML.NoSniffBlocked.RenderableStatusCode" |
- enum="SiteIsolationResourceType"> |
+ enum="ContentResourceType"> |
<owner>Please list the metric's owners. Add more owner tags as needed.</owner> |
<summary> |
The count of responses with a renderable HTTP status code sub-categorized by |
@@ -40699,6 +40734,25 @@ Therefore, the affected-histogram name has to have at least one dot in it. |
<int value="4" label="TEST_NOT_RUN"/> |
</enum> |
+<enum name="ContentResourceType" type="int"> |
+ <int value="0" label="MAIN_FRAME"/> |
+ <int value="1" label="SUB_FRAME"/> |
+ <int value="2" label="STYLESHEET"/> |
+ <int value="3" label="SCRIPT"/> |
+ <int value="4" label="IMAGE"/> |
+ <int value="5" label="FONT_RESOURCE"/> |
+ <int value="6" label="SUB_RESOURCE"/> |
+ <int value="7" label="OBJECT"/> |
+ <int value="8" label="MEDIA"/> |
+ <int value="9" label="WORKER"/> |
+ <int value="10" label="SHARED_WORKER"/> |
+ <int value="11" label="PREFETCH"/> |
+ <int value="12" label="FAVICON"/> |
+ <int value="13" label="XHR"/> |
+ <int value="14" label="PING"/> |
+ <int value="15" label="RESOURCE_TYPE_SERVICE_WORKER"/> |
+</enum> |
+ |
<enum name="ContentSetting" type="int"> |
<int value="1" label="ALLOW"/> |
<int value="2" label="BLOCK"/> |
@@ -52335,24 +52389,6 @@ To add a new entry, add it with any value and run test to compute valid value. |
<int value="4" label="Others"/> |
</enum> |
-<enum name="SiteIsolationResourceType" type="int"> |
- <int value="0" label="MAIN_FRAME"/> |
- <int value="1" label="SUB_FRAME"/> |
- <int value="2" label="STYLESHEET"/> |
- <int value="3" label="SCRIPT"/> |
- <int value="4" label="IMAGE"/> |
- <int value="5" label="FONT_RESOURCE"/> |
- <int value="6" label="SUB_RESOURCE"/> |
- <int value="7" label="OBJECT"/> |
- <int value="8" label="MEDIA"/> |
- <int value="9" label="WORKER"/> |
- <int value="10" label="SHARED_WORKER"/> |
- <int value="11" label="PREFETCH"/> |
- <int value="12" label="FAVICON"/> |
- <int value="13" label="XHR"/> |
- <int value="14" label="PING"/> |
-</enum> |
- |
<enum name="SocketStreamConnectionType" type="int"> |
<int value="0" label="None"/> |
<int value="1" label="All"/> |