Log the number of new icons created per jumplist update

chrome/browser/win/jumplist.cc

 // Copyright 2012 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.h"
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 617 matching lines @@
   // Put all cached icon file paths into a set.
   base::flat_set<base::FilePath> cached_files;
   cached_files.reserve(source_map->size());
 
   for (const auto& url_path_pair : *source_map)
     cached_files.insert(url_path_pair.second);
 
   DeleteNonCachedFiles(icon_dir, cached_files);
 }
 
-void JumpList::CreateIconFiles(const base::FilePath& icon_dir,
-                               const ShellLinkItemList& item_list,
-                               size_t max_items,
-                               JumpListCategory category) {
+int JumpList::CreateIconFiles(const base::FilePath& icon_dir,
+                              const ShellLinkItemList& item_list,
+                              size_t max_items,
+                              JumpListCategory category) {
   // TODO(chengx): Remove the UMA histogram after fixing http://crbug.com/40407.
   SCOPED_UMA_HISTOGRAM_TIMER("WinJumplist.CreateIconFilesDuration");
 
+  int icons_created = 0;
+
   // Reuse icons for urls that were already present in the jumplist for this
   // category.
 
   base::flat_map<std::string, base::FilePath>* source_map = nullptr;
   switch (category) {
     case JumpListCategory::kMostVisited:
       source_map = &most_visited_icons_;
       break;
     case JumpListCategory::kRecentlyClosed:
       source_map = &recently_closed_icons_;
       break;
   }
 
   base::flat_map<std::string, base::FilePath> updated_map;
 
   for (ShellLinkItemList::const_iterator iter = item_list.begin();
        iter != item_list.end() && max_items > 0; ++iter, --max_items) {
     ShellLinkItem* item = iter->get();
     auto cache_iter = source_map->find(item->url());
     if (cache_iter != source_map->end()) {
       item->set_icon(cache_iter->second.value(), 0);
       updated_map[item->url()] = cache_iter->second;
     } else {
       base::FilePath icon_path;
       if (CreateIconFile(item->icon_image(), icon_dir, &icon_path)) {
+        ++icons_created;
         item->set_icon(icon_path.value(), 0);
         updated_map[item->url()] = icon_path;
       }
     }
   }
   source_map->swap(updated_map);
+
+  return icons_created;
 }
 
-void JumpList::UpdateIconFiles(const base::FilePath& icon_dir,
-                               const ShellLinkItemList& page_list,
-                               size_t slot_limit,
-                               JumpListCategory category) {
+int JumpList::UpdateIconFiles(const base::FilePath& icon_dir,
+                              const ShellLinkItemList& page_list,
+                              size_t slot_limit,
+                              JumpListCategory category) {
+  int icons_created = 0;
+
   // Maximum number of icon files that each JumpList icon folder may hold.
   size_t icon_limit = (category == JumpListCategory::kMostVisited) ? 10 : 6;
 
   // Clear the JumpList icon folder at |icon_dir| and the cache when
   // 1) "Most visited" category updates for the 1st time after Chrome is
   //     launched. This actually happens right after Chrome is launched.
   // 2) "Recently closed" category updates for the 1st time after Chrome is
   //     launched.
   // 3) The number of icons in |icon_dir| has exceeded the limit.
   if ((category == JumpListCategory::kMostVisited &&
        most_visited_icons_.empty()) ||
       (category == JumpListCategory::kRecentlyClosed &&
        recently_closed_icons_.empty()) ||
       FilesExceedLimitInDir(icon_dir, icon_limit)) {
     DeleteDirectoryContentAndLogRuntime(icon_dir, kFileDeleteLimit);
     most_visited_icons_.clear();
     recently_closed_icons_.clear();
     // Create new icons only when the directory exists and is empty.
     if (base::CreateDirectory(icon_dir) && base::IsDirectoryEmpty(icon_dir))
-      CreateIconFiles(icon_dir, page_list, slot_limit, category);
+      icons_created +=
+          CreateIconFiles(icon_dir, page_list, slot_limit, category);
   } else if (base::CreateDirectory(icon_dir)) {
-    CreateIconFiles(icon_dir, page_list, slot_limit, category);
+    icons_created += CreateIconFiles(icon_dir, page_list, slot_limit, category);
     DeleteIconFiles(icon_dir, category);
   }
+
+  return icons_created;
 }
 
 bool JumpList::UpdateJumpList(
     const base::string16& app_id,
     const base::FilePath& profile_dir,
     const ShellLinkItemList& most_visited_pages,
     const ShellLinkItemList& recently_closed_pages,
     bool most_visited_pages_have_updates,
     bool recently_closed_pages_have_updates,
     IncognitoModePrefs::Availability incognito_availability) {
   if (!JumpListUpdater::IsEnabled())
     return true;
 
   JumpListUpdater jumplist_updater(app_id);
 
   base::ElapsedTimer begin_update_timer;
 
   if (!jumplist_updater.BeginUpdate())
     return false;
 
   // Discard this JumpList update if JumpListUpdater::BeginUpdate takes longer
   // than the maximum allowed time, as it's very likely the following update
   // steps will also take a long time. As we've not updated the icons on the
   // disk, discarding this update wont't affect the current JumpList used by OS.
   if (begin_update_timer.Elapsed() >= kTimeOutForJumplistBeginUpdate) {
     updates_to_skip_ = kUpdatesToSkipUnderHeavyLoad;
     return false;
   }
 
   // Record the desired number of icons to create in this JumpList update.

[grt (UTC plus 2), 2017/05/23 07:03:36]

nit: update comment "Record the number of icons created in this JumpList
update."

[chengx, 2017/05/23 20:39:39]

Done.

-  int icons_to_create = 0;
+  int icons_created = 0;
 
   // Update the icons for "Most Visisted" category of the JumpList if needed.
   if (most_visited_pages_have_updates) {
     base::FilePath icon_dir_most_visited = GenerateJumplistIconDirName(
         profile_dir, FILE_PATH_LITERAL("MostVisited"));
 
-    UpdateIconFiles(icon_dir_most_visited, most_visited_pages,
-                    kMostVisitedItems, JumpListCategory::kMostVisited);
-
-    icons_to_create += std::min(most_visited_pages.size(), kMostVisitedItems);
+    icons_created +=
+        UpdateIconFiles(icon_dir_most_visited, most_visited_pages,
+                        kMostVisitedItems, JumpListCategory::kMostVisited);
   }
 
   // Update the icons for "Recently Closed" category of the JumpList if needed.
   if (recently_closed_pages_have_updates) {
     base::FilePath icon_dir_recent_closed = GenerateJumplistIconDirName(
         profile_dir, FILE_PATH_LITERAL("RecentClosed"));
 
-    UpdateIconFiles(icon_dir_recent_closed, recently_closed_pages,
-                    kRecentlyClosedItems, JumpListCategory::kRecentlyClosed);
-
-    icons_to_create +=
-        std::min(recently_closed_pages.size(), kRecentlyClosedItems);
+    icons_created += UpdateIconFiles(
+        icon_dir_recent_closed, recently_closed_pages, kRecentlyClosedItems,
+        JumpListCategory::kRecentlyClosed);
   }
 
   // TODO(chengx): Remove the UMA histogram after fixing http://crbug.com/40407.
-  UMA_HISTOGRAM_COUNTS_100("WinJumplist.CreateIconFilesCount", icons_to_create);
+  UMA_HISTOGRAM_COUNTS_100("WinJumplist.CreateIconFilesCount", icons_created);
 
   // TODO(chengx): Remove the UMA histogram after fixing http://crbug.com/40407.
   SCOPED_UMA_HISTOGRAM_TIMER("WinJumplist.UpdateJumpListDuration");
 
   base::ElapsedTimer add_custom_category_timer;
 
   // Update the "Most Visited" category of the JumpList if it exists.
   // This update request is applied into the JumpList when we commit this
   // transaction.
   if (!jumplist_updater.AddCustomCategory(
@@ skipping 76 matching lines @@
           app_id, profile_dir, local_most_visited_pages,
           local_recently_closed_pages, most_visited_pages_have_updates,
           recently_closed_pages_have_updates, incognito_availability)) {
     base::AutoLock auto_lock(data->list_lock_);
     if (most_visited_pages_have_updates)
       data->most_visited_pages_have_updates_ = true;
     if (recently_closed_pages_have_updates)
       data->recently_closed_pages_have_updates_ = true;
   }
 }