arc: 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 226 matching lines @@
     return app_instance_holder_;
   }
 
   bool package_list_initial_refreshed() const {
     return package_list_initial_refreshed_;
   }
 
   std::unordered_set<std::string> GetAppsForPackage(
       const std::string& package_name) const;
 
+  bool IsIconRequestRecorded(const std::string& app_id,

[khmel, 2017/03/15 01:16:56]

nit: as commented above please move this to private and use this logic
internally.

[lgcheng, 2017/03/15 19:59:31]

Done.

+                             ui::ScaleFactor scale_factor) 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 100 matching lines @@
   // 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();
 
+  // 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 of icon request sent to Android. In each user session, one
+  // request per app per scale_factor is allowed once. Arc is disabled or the
+  // app is uninstalled the record will be erased.
+  std::map<std::string, uint32_t> request_icon_record_;

[khmel, 2017/03/15 01:16:56]

Can we use request_icon_deferred_ for this purpose, I feel it is duplicate by
logic

[lgcheng, 2017/03/15 19:59:31]

Done.

   // 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_