Remove delay for the first JumpList top site sync in one session

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 257 matching lines @@
 
   top_sites_has_pending_notification_ = true;
 
   // Postpone handling this notification until a pending update completes.
   if (update_in_progress_)
     return;
 
   // If we have a pending favicon request, cancel it here as it's out of date.
   CancelPendingUpdate();
 
-  // Initialize the one-shot timer to update the JumpList in a while.
-  InitializeTimerForUpdate();
+  // When the first tab is closed in one session, it doesn't trigger an update
+  // but a TopSites sync. This sync will trigger an update for both mostly
+  // visited and recently closed categories. We don't delay this TopSites sync.
+  if (has_topsites_sync)
+    InitializeTimerForUpdate();
+  else
+    ProcessNotifications();
 }
 
 void JumpList::TabRestoreServiceChanged(sessions::TabRestoreService* service) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   tab_restore_has_pending_notification_ = true;
 
   // Postpone handling this notification until a pending update completes.
   if (update_in_progress_)
     return;
@@ skipping 15 matching lines @@
     PostRunUpdate();
 }
 
 void JumpList::InitializeTimerForUpdate() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   if (timer_.IsRunning()) {
     timer_.Reset();
   } else {
     // base::Unretained is safe since |this| is guaranteed to outlive timer_.
-    timer_.Start(FROM_HERE, kDelayForJumplistUpdate,
-                 base::Bind(&JumpList::OnDelayTimer, base::Unretained(this)));
+    timer_.Start(
+        FROM_HERE, kDelayForJumplistUpdate,
+        base::Bind(&JumpList::ProcessNotifications, base::Unretained(this)));
   }
 }
 
-void JumpList::OnDelayTimer() {
+void JumpList::ProcessNotifications() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(!update_in_progress_);
 
   if (updates_to_skip_ > 0) {
     --updates_to_skip_;
     return;
   }
 
   // Retrieve the recently closed URLs synchronously.
   if (tab_restore_has_pending_notification_) {
     tab_restore_has_pending_notification_ = false;
     ProcessTabRestoreServiceNotification();
+
+    // Force a TopSite history sync when closing a first tab in one session.
+    if (!has_tab_closed_) {
+      has_tab_closed_ = true;
+      scoped_refptr<history::TopSites> top_sites =
+          TopSitesFactory::GetForProfile(profile_);
+      if (top_sites) {
+        top_sites->SyncWithHistory();
+        return;
+      }
+    }
   }
 
   // If TopSites has updates, retrieve the URLs asynchronously, and on its
   // completion, trigger favicon loading.
   // Otherwise, call StartLoadingFavicon directly to start favicon loading.
   if (top_sites_has_pending_notification_)
     ProcessTopSitesNotification();
   else
     StartLoadingFavicon();
 }
 
 void JumpList::ProcessTopSitesNotification() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(!update_in_progress_);
 
   // Opening the first tab in one session triggers a TopSite history sync.
   // Delay this sync till the first tab is closed to allow the "recently closed"
   // category from last session to stay longer. All previous pending
   // notifications from TopSites are ignored.
   if (!has_tab_closed_) {
     top_sites_has_pending_notification_ = false;
     return;
   }
 
+  has_topsites_sync = true;
+
   scoped_refptr<history::TopSites> top_sites =
       TopSitesFactory::GetForProfile(profile_);
   if (top_sites) {
     top_sites->GetMostVisitedURLs(
         base::Bind(&JumpList::OnMostVisitedURLsAvailable,
                    weak_ptr_factory_.GetWeakPtr()),
         false);
   }
 }
 
@@ skipping 26 matching lines @@
         break;
       case sessions::TabRestoreService::WINDOW:
         AddWindow(
             static_cast<const sessions::TabRestoreService::Window&>(*entry),
             kRecentlyClosedItems);
         break;
     }
   }
 
   recently_closed_should_update_ = true;
-
-  // Force a TopSite history sync when closing a first tab in one session.
-  if (!has_tab_closed_) {
-    has_tab_closed_ = true;
-    scoped_refptr<history::TopSites> top_sites =
-        TopSitesFactory::GetForProfile(profile_);
-    if (top_sites)
-      top_sites->SyncWithHistory();
-  }
 }
 
 void JumpList::OnMostVisitedURLsAvailable(
     const history::MostVisitedURLList& urls) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
   top_sites_has_pending_notification_ = false;
 
   // There is no need to update the JumpList if the top most visited sites in
   // display have not changed.
@@ skipping 441 matching lines @@
                                const URLIconCache& icons_cache) {
   // Put all cached icon file paths into a set.
   base::flat_set<base::FilePath> cached_files;
   cached_files.reserve(icons_cache.size());
 
   for (const auto& url_path_pair : icons_cache)
     cached_files.insert(url_path_pair.second);
 
   DeleteNonCachedFiles(icon_dir, cached_files);
 }