Revert some jumplist function names

In crrev.com/2811003002, some methods were renamed which they shouldn't.
This CL changes them back.

BUG=40407, 179576

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

chrome/browser/win/jumplist.cc

@@ -231,11 +231,10 @@ bool UpdateJumpList(const wchar_t* app_id,
 }
 
 // Updates the jumplist, once all the data has been fetched.
-void RunUpdateJumpListUserVisiblePriority(
-    IncognitoModePrefs::Availability incognito_availability,
-    const std::wstring& app_id,
-    const base::FilePath& icon_dir,
-    base::RefCountedData<JumpListData>* ref_counted_data) {
+void RunUpdateJumpList(IncognitoModePrefs::Availability incognito_availability,
+                       const std::wstring& app_id,
+                       const base::FilePath& icon_dir,
+                       base::RefCountedData<JumpListData>* ref_counted_data) {
   JumpListData* data = &ref_counted_data->data;
   ShellLinkItemList local_most_visited_pages;
   ShellLinkItemList local_recently_closed_pages;
@@ -508,7 +507,7 @@ void JumpList::StartLoadingFavicon() {
 
   if (!waiting_for_icons) {
     // No more favicons are needed by the application JumpList. Schedule a
-    // RunUpdateJumpListUserVisiblePriority call.
+    // RunUpdateJumpList call.
     PostRunUpdate();
     return;
   }
@@ -534,7 +533,7 @@ void JumpList::OnFaviconDataAvailable(
     JumpListData* data = &jumplist_data_->data;
     base::AutoLock auto_lock(data->list_lock_);
     // Attach the received data to the ShellLinkItem object.
-    // This data will be decoded by the RunUpdateJumpListUserVisiblePriority
+    // This data will be decoded by the RunUpdateJumpList
     // method.
     if (!image_result.image.IsEmpty() && !data->icon_urls_.empty() &&
         data->icon_urls_.front().second.get()) {
@@ -596,15 +595,13 @@ void JumpList::DeferredRunUpdate() {
   // 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(&DeleteDirectoryContentAndLogResultsUserVisiblePriority,
-                 icon_dir_, kFileDeleteLimit));
+      FROM_HERE, base::Bind(&DeleteDirectoryContentAndLogResults, icon_dir_,
+                            kFileDeleteLimit));
 
   // Post a task to update the jumplist used by the shell.
   update_jumplisticons_task_runner_->PostTask(
-      FROM_HERE,
-      base::Bind(&RunUpdateJumpListUserVisiblePriority, incognito_availability,
-                 app_id_, icon_dir_, base::RetainedRef(jumplist_data_)));
+      FROM_HERE, base::Bind(&RunUpdateJumpList, incognito_availability, app_id_,
+                            icon_dir_, base::RetainedRef(jumplist_data_)));
 
   // Post a task to delete JumpListIconsOld folder and log the results to UMA.
   base::FilePath icon_dir_old = icon_dir_.DirName().Append(

chrome/browser/win/jumplist.h

@@ -152,7 +152,7 @@ class JumpList : public sessions::TabRestoreServiceObserver,
   // Helper for RunUpdate() that determines its parameters.
   void PostRunUpdate();
 
-  // Called on a timer to invoke RunUpdateJumpListUserVisiblePriority() after
+  // Called on a timer to invoke RunUpdateJumpList() after
   // requests storms have subsided.
   void DeferredRunUpdate();
 

chrome/browser/win/jumplist_file_util.cc

@@ -123,9 +123,8 @@ void DeleteDirectoryAndLogResults(const base::FilePath& path,
                             dir_status, DIRECTORY_STATUS_END);
 }
 
-void DeleteDirectoryContentAndLogResultsUserVisiblePriority(
-    const base::FilePath& path,
-    int max_file_deleted) {
+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.

chrome/browser/win/jumplist_file_util.h

@@ -79,8 +79,7 @@ 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 DeleteDirectoryContentAndLogResultsUserVisiblePriority(
-    const base::FilePath& path,
-    int max_file_deleted);
+void DeleteDirectoryContentAndLogResults(const base::FilePath& path,
+                                         int max_file_deleted);
 
 #endif  // CHROME_BROWSER_WIN_JUMPLIST_FILE_UTIL_H_