| Index: tools/metrics/histograms/histograms.xml
|
| diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
|
| index c06b504e9634c4aa0a7933f9d67d25dda8c17ea3..24c6a3228402035f933bdda752288d0bcd12cdf9 100644
|
| --- a/tools/metrics/histograms/histograms.xml
|
| +++ b/tools/metrics/histograms/histograms.xml
|
| @@ -30642,6 +30642,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>
|
| @@ -34454,7 +34489,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
|
| @@ -34476,7 +34511,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
|
| @@ -34524,7 +34559,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
|
| @@ -34546,7 +34581,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
|
| @@ -34604,7 +34639,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
|
| @@ -34635,7 +34670,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
|
| @@ -34658,7 +34693,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
|
| @@ -34707,7 +34742,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
|
| @@ -34737,7 +34772,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
|
| @@ -34759,7 +34794,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
|
| @@ -42082,6 +42117,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"/>
|
| @@ -54000,24 +54054,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"/>
|
|
|