Remove JumpListIconsOld directory and set upper limit for delete attempts

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 fb8d14342f443f70ddd12bf7398fe7d822cf87a8..79f03e230aba8b5fd1ea5924e495e47928df96d6 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -79856,6 +79856,23 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <summary>The type of category clicked in the Windows Jumplist</summary>
 </histogram>
 
+<histogram name="WinJumplist.DeleteStatusJumpListIcons"
+    enum="JumplisticonsDeleteCategory">
+  <owner>chengx@chromium.org</owner>
+  <summary>
+    This metric records the detailed delete result of JumpListIcons directory.
+  </summary>
+</histogram>
+
+<histogram name="WinJumplist.DeleteStatusJumpListIconsOld"
+    enum="JumplisticonsDeleteCategory">
+  <owner>chengx@chromium.org</owner>
+  <summary>
+    This metric records the detailed delete result of JumpListIconsOld
+    directory.
+  </summary>
+</histogram>
+
 <histogram name="WinJumplist.DetailedFolderMoveResults"
     enum="JumplistIconsDetailedFolderMoveCategory">
   <obsolete>
@@ -79893,6 +79910,10 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
 
 <histogram name="WinJumplist.DetailedFolderResultsDeleteUpdated"
     enum="JumplistIconsDetailedFolderOperationDeleteUpdatedCategory">
+  <obsolete>
+    Obselete 03/20/2016. New metrics named WinJumplist.DeleteStatusJumpListIcons
+    and WinJumplist.DeleteStatusJumpListIconsOld are used instead.
+  </obsolete>
   <owner>chengx@chromium.org</owner>
   <summary>
     This metric is recorded when folders JumpListIcons and JumpListIconsOld get
@@ -97598,6 +97619,17 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </int>
 </enum>
 
+<enum name="JumplisticonsDeleteCategory" type="int">
+  <int value="0" label="Success"/>
+  <int value="1" label="Fail as directory name length exceeds MAX_PATH"/>
+  <int value="2" label="Fail as directory is read-only"/>
+  <int value="3" label="Fail as the input directory is actually a file"/>
+  <int value="4" label="Fail as sub-directory exists"/>
+  <int value="5" label="Fail to delete max files without attempt failures"/>
+  <int value="6" label="Fail as maximum attempt failures allowed are hit"/>
+  <int value="7" label="Fail to remove the raw directory"/>
+</enum>
+
 <enum name="JumplistIconsDetailedFolderMoveCategory" type="int">
   <int value="0"
       label="DelTargetDir Succeed - MoveFileEx Succeed - CopyFile Succeed -