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 ce717a0f8f3c9c5f116e588c6e1888b604b7746a..761bac7973967351464acbdc2c54696668286eda 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -80314,6 +80314,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>
@@ -80351,6 +80368,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
@@ -80366,6 +80387,14 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="WinJumplist.EmptyStatusJumpListIcons"
+    enum="JumpListIconsFolderEmptyCategory">
+  <owner>chengx@chromium.org</owner>
+  <summary>
+    This metric records the empty status of folder JumpListIcons.
+  </summary>
+</histogram>
+
 <histogram name="WinJumplist.FolderMoveResults"
     enum="JumplistIconsFolderMoveCategory">
   <obsolete>
@@ -98160,6 +98189,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 -
@@ -98506,6 +98546,11 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="7" label="Del Fail - Mov Fail - Create Fail"/>
 </enum>
 
+<enum name="JumpListIconsFolderEmptyCategory" type="int">
+  <int value="0" label="Empty"/>
+  <int value="1" label="Non-Empty"/>
+</enum>
+
 <enum name="JumplistIconsFolderMoveCategory" type="int">
   <int value="0"
       label="Del Succeed - MaxPathCheck Succeed - MoveFileEx Succeed -