Make favicon and manifest icon processing more consistent for add to homescreen.

chrome/browser/android/webapps/add_to_homescreen_data_fetcher.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_ANDROID_WEBAPPS_ADD_TO_HOMESCREEN_DATA_FETCHER_H_
 #define CHROME_BROWSER_ANDROID_WEBAPPS_ADD_TO_HOMESCREEN_DATA_FETCHER_H_
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ skipping 76 matching lines @@
  private:
   friend class base::RefCounted<AddToHomescreenDataFetcher>;
 
   ~AddToHomescreenDataFetcher() override;
 
   // Grabs the favicon for the current URL.
   void FetchFavicon();
   void OnFaviconFetched(
       const favicon_base::FaviconRawBitmapResult& bitmap_result);
 
-  // Creates the launcher icon from the given bitmap and page URL. The page URL
-  // is used to generate an icon if there is no bitmap in |bitmap_result| or the
+  // Creates the launcher icon from the given bitmap. shortcut_info_.url is
+  // used to generate an icon if there is no bitmap in |bitmap_result| or the
   // bitmap is not large enough.
-  void CreateLauncherIconInBackground(
-      const GURL& page_url,
+  void CreateLauncherIconFromFaviconInBackground(
       const favicon_base::FaviconRawBitmapResult& bitmap_result);
 
   // Called when InstallableManager finishes looking for a manifest and icon.
   void OnDidPerformInstallableCheck(const InstallableData& data);
 
+  // Creates the launcher icon from the given |icon|.
+  void CreateLauncherIconInBackground(const SkBitmap& raw__icon);
+
   // Notifies the observer that the shortcut data is all available.
-  void NotifyObserver(const GURL& icon_url, const SkBitmap& icon);
+  void NotifyObserver(const SkBitmap& icon);
 
   Observer* weak_observer_;
 
   // The icon must only be set on the UI thread for thread safety.
   SkBitmap shortcut_icon_;
   ShortcutInfo shortcut_info_;
   GURL splash_screen_url_;
 
   base::CancelableTaskTracker favicon_task_tracker_;
   base::Timer data_timeout_timer_;
 
   const int ideal_icon_size_in_dp_;
   const int minimum_icon_size_in_dp_;
   const int ideal_splash_image_size_in_dp_;
   const int minimum_splash_image_size_in_dp_;
   bool is_waiting_for_web_application_info_;
   bool is_icon_saved_;
   bool is_ready_;
 
   DISALLOW_COPY_AND_ASSIGN(AddToHomescreenDataFetcher);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_WEBAPPS_ADD_TO_HOMESCREEN_DATA_FETCHER_H_