tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 2e3627dec342cb5337ccf17b8f1aa0da6dd82600..2ebbdf5d47c2a327fa6a839b63b80e1ffb1792b6 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -31566,6 +31566,15 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="SBOffDomainInclusion.Abort" enum="ContentResourceType">
+  <owner>gab@chromium.org</owner>
+  <summary>
+    Logs the resource type of each resource request for which the off-domain
+    inclusion analysis was aborted. This histogram is suffixed with the abort
+    reason.
+  </summary>
+</histogram>
+
 <histogram name="SBOffDomainInclusion.Detected" enum="ContentResourceType">
   <obsolete>
     Deprecated 01/2015.
@@ -31579,6 +31588,9 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 
 <histogram name="SBOffDomainInclusion.EmptyMainFrameURL"
     enum="ContentResourceType">
+  <obsolete>
+    Deprecated 01/2015. Moved to SBOffDomainInclusion.Abort.EmptyMainFrameURL.
+  </obsolete>
   <owner>gab@chromium.org</owner>
   <summary>
     Logs the resource type of each resource request for which the main frame URL
@@ -31586,8 +31598,21 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
+<histogram name="SBOffDomainInclusion.InHistory" enum="ContentResourceType">
+  <owner>gab@chromium.org</owner>
+  <summary>
+    Logs the resource type of each resource request for which the off-domain
+    inclusion analysis concluded in no inclusion whitelist hit but a browsing
+    history hit.
+  </summary>
+</histogram>
+
 <histogram name="SBOffDomainInclusion.InvalidMainFrameURL"
     enum="ContentResourceType">
+  <obsolete>
+    Deprecated 01/2015 (was never reported, confirming experiment that handling
+    it is irrelevant).
+  </obsolete>
   <owner>gab@chromium.org</owner>
   <summary>
     Logs the resource type of each resource request for which the main frame URL
@@ -31616,9 +31641,8 @@ Therefore, the affected-histogram name has to have at least one dot in it.
 <histogram name="SBOffDomainInclusion.Whitelisted" 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 and ignored because
-    it was present on the inclusion whitelist.
+    Logs the resource type of each resource request for which the off-domain
+    inclusion analysis concluded in an inclusion whitelist hit.
   </summary>
 </histogram>
 
@@ -61663,6 +61687,25 @@ To add a new entry, add it with any value and run test to compute valid value.
   <affected-histogram name="NewTabPage.SuggestionsImpression"/>
 </histogram_suffixes>
 
+<histogram_suffixes name="OffDomainInclusionAbortReason" separator=".">
+  <suffix name="EmptyMainFrameURL" label="The main frame URL was empty."/>
+  <suffix name="HistoryLookupFailed"
+      label="The lookup to the HistoryService failed."/>
+  <suffix name="Incognito"
+      label="The profile associated with the frame under analysis is an
+             incognito profile."/>
+  <suffix name="NoHistoryService"
+      label="There was no HistoryService associated with the profile of the
+             frame under analysis (this can happen seldomly on startup for
+             early net requests, or on shutdown by the asynchronous nature of
+             the analysis, but shouldn't be common)."/>
+  <suffix name="NoProfile"
+      label="The profile associated with the frame under analysis couldn't be
+             resolved (expected to happen at a low frequency by the
+             asynchronous nature of the analysis)."/>
+  <affected-histogram name="SBOffDomainInclusion.Abort"/>
+</histogram_suffixes>
+
 <histogram_suffixes name="OmniboxProviderTime" separator=".">
   <suffix name="Bookmark"/>
   <suffix name="Builtin"/>