[Offline Pages] Removes two-step expiration related.

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 4b31d9c38efbed28decc7c0c0d31cbd325edbb04..a917ced712a403ae4902253502270a8db53bf15d 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -40111,6 +40111,13 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <summary>Status code of wiping out the offline page data.</summary>
 </histogram>
 
+<histogram name="OfflinePages.ClearStorageBatchSize" units="pages">
+  <owner>romax@chromium.org</owner>
+  <summary>
+    Number of pages deleted in a batch during one clear-storage request.
+  </summary>
+</histogram>
+
 <histogram name="OfflinePages.ClearStorageResult"
     enum="OfflinePagesClearStorageResult">
   <owner>romax@chromium.org</owner>
@@ -40125,8 +40132,20 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="OfflinePages.Consistency.DeletePagesMissingArchiveFileResult"
+    enum="OfflinePagesDeletePageResult">
+  <owner>romax@chromium.org</owner>
+  <summary>
+    Whether an attempt to delete pages without archives was successful.
+  </summary>
+</histogram>
+
 <histogram name="OfflinePages.Consistency.ExpirePagesMissingArchiveFileResult"
     enum="BooleanSuccess">
+  <obsolete>
+    Deprecated 11/2016, replaced by
+    OfflinePages.Consistency.DeletePagesMissingArchiveFileResult.
+  </obsolete>
   <owner>romax@chromium.org</owner>
   <summary>
     Whether an attempt to expire pages without archives was successful.
@@ -40283,11 +40302,17 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 </histogram>
 
 <histogram name="OfflinePages.ExpirePage.BatchSize">
+  <obsolete>
+    Deprecated 11/2016. Offline pages no longer use two-step expiration.
+  </obsolete>
   <owner>romax@chromium.org</owner>
   <summary>Number of pages that are expired in a batch.</summary>
 </histogram>
 
 <histogram name="OfflinePages.ExpirePage.PageLifetime" units="minutes">
+  <obsolete>
+    Deprecated 11/2016. Offline pages no longer use two-step expiration.
+  </obsolete>
   <owner>romax@chromium.org</owner>
   <summary>
     Length of time between when an offline page was created and was expired.
@@ -40296,11 +40321,17 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram name="OfflinePages.ExpirePage.StoreUpdateResult"
     enum="BooleanSuccess">
+  <obsolete>
+    Deprecated 11/2016. Offline pages no longer use two-step expiration.
+  </obsolete>
   <owner>romax@chromium.org</owner>
   <summary>Result of updating expired page in store.</summary>
 </histogram>
 
 <histogram name="OfflinePages.ExpirePage.TimeSinceLastAccess" units="minutes">
+  <obsolete>
+    Deprecated 11/2016. Offline pages no longer use two-step expiration.
+  </obsolete>
   <owner>romax@chromium.org</owner>
   <summary>
     Length of time between when an offline page was last opened and was expired.
@@ -95411,9 +95442,10 @@ value.
 <enum name="OfflinePagesClearStorageResult" type="int">
   <int value="0" label="Success"/>
   <int value="1" label="Unnecessary to clean"/>
-  <int value="2" label="Page expiration failed"/>
+  <int value="2" label="Page expiration failed (deprecated 11/2016)"/>
   <int value="3" label="Page record deletion failed"/>
-  <int value="4" label="Both expiration and deletion failed"/>
+  <int value="4"
+      label="Both expiration and deletion failed (deprecated 11/2016)"/>
 </enum>
 
 <enum name="OfflinePagesDeletePageResult" type="int">