[Merge To M58]Fix Default icon issue when cached icon file is corrupted.

chrome/browser/ui/app_list/arc/arc_app_list_prefs.h

 // Copyright 2015 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.
 
 #ifndef CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_LIST_PREFS_H_
 #define CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_LIST_PREFS_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 181 matching lines @@
                              ui::ScaleFactor scale_factor) const;
   // Constructs path to default app icon for specific scale factor. This path
   // is used to resolve icon if no icon is available at |GetIconPath|.
   base::FilePath MaybeGetIconPathForDefaultApp(
       const std::string& app_id,
       ui::ScaleFactor scale_factor) const;
 
   // Sets last launched time for the requested app.
   void SetLastLaunchTime(const std::string& app_id, const base::Time& time);
 
-  // Requests to load an app icon for specific scale factor. If the app or ARC
-  // bridge service is not ready, then defer this request until the app gets
-  // available. Once new icon is installed notifies an observer
-  // OnAppIconUpdated.
-  void RequestIcon(const std::string& app_id, ui::ScaleFactor scale_factor);
+  // Calls RequestIcon if no request is recorded.
+  void MaybeRequestIcon(const std::string& app_id,
+                        ui::ScaleFactor scale_factor);
 
   // Sets notification enabled flag for given value. If the app or ARC bridge
   // service is not ready, then defer this request until the app gets
   // available. Once new value is set notifies an observer
   // OnNotificationsEnabledChanged.
   void SetNotificationsEnabled(const std::string& app_id, bool enabled);
 
   // Returns true if app is registered.
   bool IsRegistered(const std::string& app_id) const;
   // Returns true if app is a default app.
@@ skipping 25 matching lines @@
   }
 
   std::unordered_set<std::string> GetAppsForPackage(
       const std::string& package_name) const;
 
   void SetDefaltAppsReadyCallback(base::Closure callback);
   void SimulateDefaultAppAvailabilityTimeoutForTesting();
 
  private:
   friend class ChromeLauncherControllerImplTest;
+  friend class ArcAppModelBuilderTest;
 
   // See the Create methods.
   ArcAppListPrefs(
       Profile* profile,
       arc::InstanceHolder<arc::mojom::AppInstance>* app_instance_holder);
 
   // arc::InstanceHolder<arc::mojom::AppInstance>::Observer:
   void OnInstanceReady() override;
   void OnInstanceClosed() override;
 
@@ skipping 74 matching lines @@
 
   // Installs an icon to file system in the special folder of the profile
   // directory.
   void InstallIcon(const std::string& app_id,
                    ui::ScaleFactor scale_factor,
                    const std::vector<uint8_t>& contentPng);
   void OnIconInstalled(const std::string& app_id,
                        ui::ScaleFactor scale_factor,
                        bool install_succeed);
 
+  // Requests to load an app icon for specific scale factor. If the app or ARC
+  // bridge service is not ready, then defer this request until the app gets
+  // available. Once new icon is installed notifies an observer
+  // OnAppIconUpdated.
+  void RequestIcon(const std::string& app_id, ui::ScaleFactor scale_factor);
+
   // This checks if app is not registered yet and in this case creates
   // non-launchable app entry.
   void MaybeAddNonLaunchableApp(const base::Optional<std::string>& name,
                                 const std::string& package_name,
                                 const std::string& activity);
 
   // Reveals first app from provided package in app launcher if package is newly
   // installed by user. If all apps in package are hidden then app list is not
   // shown.
   void MaybeShowPackageInAppLauncher(
       const arc::mojom::ArcPackageInfo& package_info);
 
   // Returns true is specified package is new in the system, was not installed
   // and it is not scheduled to install by sync.
   bool IsUnknownPackage(const std::string& package_name) const;
 
   // Detects that default apps either exist or installation session is started.
   void DetectDefaultAppAvailability();
 
   // Performs data clean up for removed package.
   void HandlePackageRemoved(const std::string& package_name);
 
   // Sets timeout to wait for default app installed or installation started if
   // some default app is not available yet.
   void MaybeSetDefaultAppLoadingTimeout();
 
+  bool IsIconRequestRecorded(const std::string& app_id,
+                             ui::ScaleFactor scale_factor) const;
+
+  // Remove the IconRequestRecord associated with app_id.
+  void MaybeRemoveIconRequestRecord(const std::string& app_id);
+
+  void ClearIconRequestRecord();
+
   Profile* const profile_;
 
   // Owned by the BrowserContext.
   PrefService* const prefs_;
 
   arc::InstanceHolder<arc::mojom::AppInstance>* const app_instance_holder_;
 
   // List of observers.
   base::ObserverList<Observer> observer_list_;
   // Keeps root folder where ARC app icons for different scale factor are
   // stored.
   base::FilePath base_path_;
   // Contains set of ARC apps that are currently ready.
   std::unordered_set<std::string> ready_apps_;
   // Contains set of ARC apps that are currently tracked.
   std::unordered_set<std::string> tracked_apps_;
   // Contains number of ARC packages that are currently installing.
   int installing_packages_count_ = 0;
-  // Keeps deferred icon load requests. Each app may contain several requests
-  // for different scale factor. Scale factor is defined by specific bit
-  // position.
-  std::map<std::string, uint32_t> request_icon_deferred_;
+  // Keeps record for icon request. Each app may contain several requests for
+  // different scale factor. Scale factor is defined by specific bit position.
+  // Mainly two usages:
+  // 1. Keeps deferred icon load requests when apps are not ready. Request will
+  // be sent when apps becomes ready.
+  // 2. Keeps record of icon request sent to Android. In each user session, one
+  // request per app per scale_factor is allowed once.
+  // When ARC is disabled or the app is uninstalled, the record will be erased.
+  std::map<std::string, uint32_t> request_icon_recorded_;
   // True if this preference has been initialized once.
   bool is_initialized_ = false;
   // True if apps were restored.
   bool apps_restored_ = false;
   // True is ARC package list has been refreshed once.
   bool package_list_initial_refreshed_ = false;
   // Play Store does not have publicly available observers for default app
   // installations. This timeout is for validating default app availability.
   // Default apps should be either already installed or their installations
   // should be started soon after initial app list refresh.
@@ skipping 10 matching lines @@
   base::Closure default_apps_ready_callback_;
   int last_shown_batch_installation_revision_ = -1;
   int current_batch_installation_revision_ = 0;
 
   base::WeakPtrFactory<ArcAppListPrefs> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcAppListPrefs);
 };
 
 #endif  // CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_LIST_PREFS_H_