Revert of Fetch ARC Kiosk app name and icon from Android side.

chrome/browser/chromeos/app_mode/kiosk_app_data.h

Index: chrome/browser/chromeos/app_mode/kiosk_app_data.h
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_data.h b/chrome/browser/chromeos/app_mode/kiosk_app_data.h
index 2baa6a709b35f640000f83ae0ba563dd61da7594..7f5d5c9dd596a2237fac5a75899c358425674afe 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_data.h
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_data.h
@@ -10,10 +10,11 @@
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/app_mode/kiosk_app_data_base.h"
 #include "chrome/browser/extensions/webstore_data_fetcher_delegate.h"
 #include "components/signin/core/account_id/account_id.h"
+#include "ui/gfx/image/image_skia.h"
 #include "url/gurl.h"
 
 class Profile;
@@ -37,7 +38,7 @@
 
 // Fetches an app's web store data and manages the cached info such as name
 // and icon.
-class KioskAppData : public KioskAppDataBase,
+class KioskAppData : public base::SupportsWeakPtr<KioskAppData>,
                      public extensions::WebstoreDataFetcherDelegate {
  public:
   enum Status {
@@ -58,6 +59,9 @@
   // from web store.
   void Load();
 
+  // Clears locally cached data.
+  void ClearCache();
+
   // Loads app data from the app installed in the given profile.
   void LoadFromInstalledApp(Profile* profile, const extensions::Extension* app);
 
@@ -71,7 +75,11 @@
   // Returns true if the update url points to Webstore.
   bool IsFromWebStore() const;
 
+  const std::string& app_id() const { return app_id_; }
+  const AccountId& account_id() const { return account_id_; }
+  const std::string& name() const { return name_; }
   const GURL& update_url() const { return update_url_; }
+  const gfx::ImageSkia& icon() const { return icon_; }
   const std::string& required_platform_version() const {
     return required_platform_version_;
   }
@@ -86,12 +94,9 @@
       const GURL& update_url,
       const std::string& required_platform_version);
 
-  // Callbacks for KioskAppIconLoader.
-  void OnIconLoadSuccess(const gfx::ImageSkia& icon) override;
-  void OnIconLoadFailure() override;
-
  private:
   class CrxLoader;
+  class IconLoader;
   class WebstoreDataParser;
 
   void SetStatus(Status status);
@@ -104,11 +109,20 @@
 
   // Sets the cached data.
   void SetCache(const std::string& name,
+                const base::FilePath& icon_path,
+                const std::string& required_platform_version);
+
+  // Helper to set the cached data using a SkBitmap icon.
+  void SetCache(const std::string& name,
                 const SkBitmap& icon,
                 const std::string& required_platform_version);
 
   // Callback for extensions::ImageLoader.
   void OnExtensionIconLoaded(const gfx::Image& icon);
+
+  // Callbacks for IconLoader.
+  void OnIconLoadSuccess(const gfx::ImageSkia& icon);
+  void OnIconLoadFailure();
 
   // Callbacks for WebstoreDataParser
   void OnWebstoreParseSuccess(const SkBitmap& icon,
@@ -140,14 +154,17 @@
   KioskAppDataDelegate* delegate_;  // not owned.
   Status status_;
 
+  std::string app_id_;
+  AccountId account_id_;
+  std::string name_;
   GURL update_url_;
+  gfx::ImageSkia icon_;
   std::string required_platform_version_;
 
   std::unique_ptr<extensions::WebstoreDataFetcher> webstore_fetcher_;
+  base::FilePath icon_path_;
 
   base::FilePath crx_file_;
-
-  base::WeakPtrFactory<KioskAppData> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(KioskAppData);
 };