Separate JumpListIcons delete task and update task

The JumpListIcons delete task deletes the existing icons in JumpListIcons,
while the update task creates the new icons, writes them into JumpListIcons
and notifies the shell. It is better to separate them so we can track
the individual cost. Since a base::SingleThreadTaskRunner is used for
posting these tasks, the tasks are always running in the correct order.

This CL also adds a base::SequencedTaskRunner for JumpListIconsOld
delete tasks as they are not required to run on a single thread.

BUG=40407, 179576

Review-Url: https://codereview.chromium.org/2807883002
Cr-Commit-Position: refs/heads/master@{#463396}

chrome/browser/win/jumplist.cc

@@ -13,6 +13,7 @@
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/path_service.h"
+#include "base/sequenced_task_runner.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -250,31 +251,10 @@ void RunUpdateJumpList(IncognitoModePrefs::Availability incognito_availability,
     local_recently_closed_pages = data->recently_closed_pages_;
   }
 
-  // Delete the contents in JumpListIcons directory and log the delete status
-  // to UMA.
-  FolderDeleteResult delete_status =
-      DeleteDirectoryContent(icon_dir, kFileDeleteLimit);
-
-  UMA_HISTOGRAM_ENUMERATION("WinJumplist.DeleteStatusJumpListIcons",
-                            delete_status, END);
-
-  // If JumpListIcons directory is not empty, skip updating the jumplist icons.
-  // If the directory doesn't exist which shouldn't though, try to create
-  // a new JumpListIcons directory. If the creation fails, skip updating the
+  // If JumpListIcons directory doesn't exist or is not empty, skip updating the
   // jumplist icons. The jumplist links should be updated anyway, as it doesn't
   // involve disk IO.
-
-  DirectoryStatus dir_status = NON_EXIST;
-  if (base::DirectoryExists(icon_dir))
-    dir_status = base::IsDirectoryEmpty(icon_dir) ? EMPTY : NON_EMPTY;
-
-  if (dir_status == NON_EXIST && base::CreateDirectory(icon_dir))
-    dir_status = EMPTY;
-
-  UMA_HISTOGRAM_ENUMERATION("WinJumplist.DirectoryStatusJumpListIcons",
-                            dir_status, DIRECTORY_STATUS_END);
-
-  if (dir_status == EMPTY) {
+  if (base::DirectoryExists(icon_dir) && base::IsDirectoryEmpty(icon_dir)) {
     // Create icon files for shortcuts in the "Most Visited" category.
     CreateIconFiles(icon_dir, local_most_visited_pages);
 
@@ -302,7 +282,14 @@ JumpList::JumpList(Profile* profile)
       profile_(profile),
       jumplist_data_(new base::RefCountedData<JumpListData>),
       task_id_(base::CancelableTaskTracker::kBadTaskId),
-      single_thread_task_runner_(base::CreateCOMSTATaskRunnerWithTraits(
+      update_jumplisticons_task_runner_(base::CreateCOMSTATaskRunnerWithTraits(
+          base::TaskTraits()
+              .WithPriority(base::TaskPriority::BACKGROUND)
+              .WithShutdownBehavior(
+                  base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN)
+              .MayBlock())),
+      delete_jumplisticonsold_task_runner_(
+          base::CreateSequencedTaskRunnerWithTraits(
               base::TaskTraits()
                   .WithPriority(base::TaskPriority::BACKGROUND)
                   .WithShutdownBehavior(
@@ -604,17 +591,22 @@ void JumpList::DeferredRunUpdate() {
       profile_ ? IncognitoModePrefs::GetAvailability(profile_->GetPrefs())
                : IncognitoModePrefs::ENABLED;
 
+  // Post a task to delete the content in JumpListIcons folder and log the
+  // results to UMA.
+  update_jumplisticons_task_runner_->PostTask(
+      FROM_HERE, base::Bind(&DeleteDirectoryContentAndLogResults, icon_dir_,
+                            kFileDeleteLimit));
+
   // Post a task to update the jumplist used by the shell.
-  single_thread_task_runner_->PostTask(
+  update_jumplisticons_task_runner_->PostTask(
       FROM_HERE, base::Bind(&RunUpdateJumpList, incognito_availability, app_id_,
                             icon_dir_, base::RetainedRef(jumplist_data_)));
 
-  // Post a task to delete JumpListIconsOld folder if it exists and log the
-  // delete results to UMA.
+  // Post a task to delete JumpListIconsOld folder and log the results to UMA.
   base::FilePath icon_dir_old = icon_dir_.DirName().Append(
       icon_dir_.BaseName().value() + FILE_PATH_LITERAL("Old"));
 
-  single_thread_task_runner_->PostTask(
+  delete_jumplisticonsold_task_runner_->PostTask(
       FROM_HERE, base::Bind(&DeleteDirectoryAndLogResults,
                             std::move(icon_dir_old), kFileDeleteLimit));
 }

chrome/browser/win/jumplist.h

@@ -32,6 +32,7 @@
 
 namespace base {
 class SingleThreadTaskRunner;
+class SequencedTaskRunner;
 }
 
 namespace chrome {
@@ -185,9 +186,11 @@ class JumpList : public sessions::TabRestoreServiceObserver,
   // comes in before it finishes.
   base::CancelableTaskTracker::TaskId task_id_;
 
-  // A task runner running tasks to update the jumplist in JumpListIcons and to
-  // delete JumpListIconsOld sequentially.
-  scoped_refptr<base::SingleThreadTaskRunner> single_thread_task_runner_;
+  // A task runner running tasks to update the jumplist in JumpListIcons.
+  scoped_refptr<base::SingleThreadTaskRunner> update_jumplisticons_task_runner_;
+
+  // A task runner running tasks to delete JumpListIconsOld directory.
+  scoped_refptr<base::SequencedTaskRunner> delete_jumplisticonsold_task_runner_;
 
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<JumpList> weak_ptr_factory_;

chrome/browser/win/jumplist_file_util.cc

@@ -122,3 +122,25 @@ void DeleteDirectoryAndLogResults(const base::FilePath& path,
   UMA_HISTOGRAM_ENUMERATION("WinJumplist.DirectoryStatusJumpListIconsOld",
                             dir_status, DIRECTORY_STATUS_END);
 }
+
+void DeleteDirectoryContentAndLogResults(const base::FilePath& path,
+                                         int max_file_deleted) {
+  DirectoryStatus dir_status = NON_EXIST;
+
+  // Delete the content in |path|. If |path| doesn't exist, create one.
+  if (base::DirectoryExists(path)) {
+    FolderDeleteResult delete_status =
+        DeleteDirectoryContent(path, kFileDeleteLimit);
+
+    UMA_HISTOGRAM_ENUMERATION("WinJumplist.DeleteStatusJumpListIcons",
+                              delete_status, FolderDeleteResult::END);
+
+    if (base::DirectoryExists(path))
+      dir_status = base::IsDirectoryEmpty(path) ? EMPTY : NON_EMPTY;
+  } else if (base::CreateDirectory(path)) {
+    dir_status = EMPTY;
+  }
+
+  UMA_HISTOGRAM_ENUMERATION("WinJumplist.DirectoryStatusJumpListIcons",
+                            dir_status, DIRECTORY_STATUS_END);
+}

chrome/browser/win/jumplist_file_util.h

@@ -78,4 +78,8 @@ FolderDeleteResult DeleteDirectory(const base::FilePath& path,
 void DeleteDirectoryAndLogResults(const base::FilePath& path,
                                   int max_file_deleted);
 
+// Deletes the content in the directory at |path| and records the result to UMA.
+void DeleteDirectoryContentAndLogResults(const base::FilePath& path,
+                                         int max_file_deleted);
+
 #endif  // CHROME_BROWSER_WIN_JUMPLIST_FILE_UTIL_H_