Delete JumpListIconsOld and update revised links in every update

chrome/browser/win/jumplist_file_util.cc

 // Copyright (c) 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/win/jumplist_file_util.h"
 
-#include <Shlwapi.h>
 #include <windows.h>
 
 #include "base/files/file_enumerator.h"
+#include "base/files/file_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/thread_restrictions.h"
 
 FolderDeleteResult DeleteFiles(const base::FilePath& path,
                                const base::FilePath::StringType& pattern,
                                int max_file_deleted) {
   int success_count = 0;
   int failure_count = 0;
   FolderDeleteResult delete_status = SUCCEED;
 
@@ skipping 72 matching lines @@
 FolderDeleteResult DeleteDirectory(const base::FilePath& path,
                                    int max_file_deleted) {
   base::ThreadRestrictions::AssertIOAllowed();
   // Delete at most |max_file_deleted| files in |path|.
   FolderDeleteResult delete_status =
       DeleteDirectoryContent(path, max_file_deleted);
   // Since DeleteDirectoryContent() can only delete at most |max_file_deleted|
   // files, its return value cannot indicate if |path| is empty or not.
   // Instead, use PathIsDirectoryEmpty to check if |path| is empty and remove it
   // if it is.
-  if (::PathIsDirectoryEmpty(path.value().c_str()) &&
+  if (base::IsDirectoryEmpty(path) &&
       !::RemoveDirectory(path.value().c_str())) {
     delete_status = FAIL_REMOVE_RAW_DIRECTORY;
   }
   return delete_status;
 }
 
 void DeleteDirectoryAndLogResults(const base::FilePath& path,
                                   int max_file_deleted) {
   FolderDeleteResult delete_status = DeleteDirectory(path, max_file_deleted);
   UMA_HISTOGRAM_ENUMERATION("WinJumplist.DeleteStatusJumpListIconsOld",
                             delete_status, END);
+
+  DirectoryStatus dir_status = NON_EXIST;
+  if (base::DirectoryExists(path))
+    dir_status = base::IsDirectoryEmpty(path) ? EMPTY : NON_EMPTY;
+
+  UMA_HISTOGRAM_ENUMERATION("WinJumplist.DirectoryStatusJumpListIconsOld",
+                            dir_status, DIRECTORY_STATUS_END);
 }