Don't ignore manifest icons for sites that don't have a service worker.

chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h

Index: chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h
diff --git a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h
index 4dc6b26cde9e37477445bb083987632044c31056..ff384187cb1ba70ca2437b7c5866fae80a3c8764 100644
--- a/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h
+++ b/chrome/browser/android/webapps/add_to_homescreen_data_fetcher.h
@@ -30,6 +30,7 @@ class Message;
 }
 
 class GURL;
+class InstallableManager;
 struct InstallableData;
 struct WebApplicationInfo;
 
@@ -38,8 +39,7 @@ struct WebApplicationInfo;
 //
 // Because of the various asynchronous calls made by this class, it is
 // refcounted to prevent the class from being prematurely deleted.  If the
-// pointer to the ShortcutHelper becomes invalid, the pipeline should kill
-// itself.
+// |weak_observer_| pointer becomes invalid, the pipeline should kill itself.
 class AddToHomescreenDataFetcher
     : public base::RefCounted<AddToHomescreenDataFetcher>,
       public content::WebContentsObserver {
@@ -103,6 +103,9 @@ class AddToHomescreenDataFetcher
   void OnDataTimedout();
 
   // Called when InstallableManager finishes looking for a manifest and icon.
+  void OnDidGetManifestAndIcon(const InstallableData& data);
+
+  // Called when InstallableManager finishes checking for installability.
   void OnDidPerformInstallableCheck(const InstallableData& data);
 
   // Grabs the favicon for the current URL.
@@ -116,18 +119,20 @@ class AddToHomescreenDataFetcher
   SkBitmap CreateLauncherIconFromFaviconInBackground(
       const favicon_base::FaviconRawBitmapResult& bitmap_result);
 
-  // Creates the launcher icon from the given |raw_icon|.
-  void CreateLauncherIcon(const SkBitmap& raw_icon);
-  SkBitmap CreateLauncherIconInBackground(const SkBitmap& raw_icon);
+  // Creates the primary launcher icon from the given |icon|.
+  void CreateLauncherIcon(const SkBitmap& icon);
+  SkBitmap CreateLauncherIconInBackground(const SkBitmap& icon);
 
   // Notifies the observer that the shortcut data is all available.
   void NotifyObserver(const SkBitmap& icon);
 
   scoped_refptr<base::TaskRunner> background_task_runner_;
 
+  InstallableManager* installable_manager_;
   Observer* weak_observer_;
 
   // The icons must only be set on the UI thread for thread safety.
+  SkBitmap raw_icon_;
   SkBitmap badge_icon_;
   SkBitmap primary_icon_;
   ShortcutInfo shortcut_info_;