Remove redundant JumpListUpdater::IsEnabled calls

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 248 matching lines @@
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   Terminate();
 }
 
 void JumpList::TopSitesLoaded(history::TopSites* top_sites) {}
 
 void JumpList::TopSitesChanged(history::TopSites* top_sites,
                                ChangeReason change_reason) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
+  if (!JumpListUpdater::IsEnabled())

[grt (UTC plus 2), 2017/06/24 20:42:44]

BrowserView::InitViews only constructs a JumpList if IsEnabled() returns true.
is it enough to put a DCHECK(IsEnabled()) in the ctor?

[chengx, 2017/06/29 19:14:37]

That should be enough.

+    return;
+
   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();
 }
 
 void JumpList::TabRestoreServiceChanged(sessions::TabRestoreService* service) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
+  if (!JumpListUpdater::IsEnabled())
+    return;
+
   tab_restore_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();
 }
 
 void JumpList::TabRestoreServiceDestroyed(
     sessions::TabRestoreService* service) {}
 
 void JumpList::OnIncognitoAvailabilityChanged() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
 
+  if (!JumpListUpdater::IsEnabled())
+    return;
+
   if (icon_urls_.empty())
     PostRunUpdate();
 }
 
 void JumpList::InitializeTimerForUpdate() {
   if (timer_.IsRunning()) {
     timer_.Reset();
   } else {
     // base::Unretained is safe since |this| is guaranteed to outlive timer_.
     timer_.Start(FROM_HERE, kDelayForJumplistUpdate,
@@ skipping 343 matching lines @@
 // static
 void JumpList::RunUpdateJumpList(
     const base::string16& app_id,
     const base::FilePath& profile_dir,
     const ShellLinkItemList& most_visited_pages,
     const ShellLinkItemList& recently_closed_pages,
     bool most_visited_should_update,
     bool recently_closed_should_update,
     IncognitoModePrefs::Availability incognito_availability,
     UpdateResults* update_results) {
-  if (!JumpListUpdater::IsEnabled())
-    return;
-
   DCHECK(update_results);
 
   JumpListUpdater jumplist_updater(app_id);
 
   base::ElapsedTimer begin_update_timer;
 
   if (!jumplist_updater.BeginUpdate())
     return;
 
   // Discard this JumpList update if JumpListUpdater::BeginUpdate takes longer
@@ skipping 142 matching lines @@
                                URLIconCache* icon_cache) {
   // Put all cached icon file paths into a set.
   base::flat_set<base::FilePath> cached_files;
   cached_files.reserve(icon_cache->size());
 
   for (const auto& url_path_pair : *icon_cache)
     cached_files.insert(url_path_pair.second);
 
   DeleteNonCachedFiles(icon_dir, cached_files);
 }