[Explore Sites] Forcing update of 'downloading' to 'current' on every

GetCatalogTask execution.

Bug: 908476
Change-Id: I5459d7fdfe8e5eaf2cd9c42e39c1606710cec838
Reviewed-on: https://chromium-review.googlesource.com/c/1355489
Commit-Queue: Jonathan Freed <freedjm@chromium.org>
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612367}

chrome/browser/android/explore_sites/explore_sites_service_impl.cc

@@ -58,9 +58,11 @@ void ExploreSitesServiceImpl::GetCatalog(CatalogCallback callback) {
   if (!IsExploreSitesEnabled())
     return;
 
+  // TODO(https://crbug.com/910255): Ensure the catalog swap doesn't happen
+  // during a session.
   task_queue_.AddTask(std::make_unique<GetCatalogTask>(
-      explore_sites_store_.get(), check_for_new_catalog_, std::move(callback)));
-  check_for_new_catalog_ = false;
+      explore_sites_store_.get(), /*update_current*/ true,
+      std::move(callback)));
 }
 
 void ExploreSitesServiceImpl::GetCategoryImage(int category_id,

chrome/browser/android/explore_sites/explore_sites_service_impl.h

@@ -92,11 +92,6 @@ class ExploreSitesServiceImpl : public ExploreSitesService,
                             int pixel_size,
                             EncodedImageList images);
 
-  // True when Chrome starts up, this is reset after the catalog is requested
-  // the first time in Chrome. This prevents the ESP from changing out from
-  // under a viewer.
-  bool check_for_new_catalog_ = true;
-
   ImageHelper image_helper_;
 
   // Used to control access to the ExploreSitesStore.