Support badge icon in WebAPK update components

chrome/browser/android/webapk/webapk_update_data_fetcher.h

 // Copyright 2016 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_WEBAPK_WEBAPK_UPDATE_DATA_FETCHER_H_
 #define CHROME_BROWSER_ANDROID_WEBAPK_WEBAPK_UPDATE_DATA_FETCHER_H_
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/macros.h"
@@ skipping 42 matching lines @@
 
   // content::WebContentsObserver:
   void DidStopLoading() override;
 
   // Fetches the installable data.
   void FetchInstallableData();
 
   // Called once the installable data has been fetched.
   void OnDidGetInstallableData(const InstallableData& installable_data);
 
-  // Called with the computed Murmur2 hash for the app icon.
-  void OnGotIconMurmur2Hash(const std::string& best_primary_icon_murmur2_hash);
+  // Called with the computed Murmur2 hash for the primary icon.
+  void OnGotPrimaryIconMurmur2Hash(const std::string& primary_icon_hash);
 
-  void OnDataAvailable(const ShortcutInfo& info,
-                       const std::string& best_primary_icon_murmur2_hash,
-                       const SkBitmap& best_primary_icon);
+  void OnDataAvailable(const std::string& primary_icon_murmur2_hash,
+                       bool did_fetch_badge_icon,
+                       const std::string& badge_icon_murmur2_hash);
 
   // Called when a page has no Web Manifest or the Web Manifest is not WebAPK
   // compatible.
   void OnWebManifestNotWebApkCompatible();
 
   // Points to the Java object.
   base::android::ScopedJavaGlobalRef<jobject> java_ref_;
 
   // The detector will only fetch the URL within the scope of the WebAPK.
   const GURL scope_;
 
   // The WebAPK's Web Manifest URL that the detector is looking for.
   const GURL web_manifest_url_;
 
   // Whether this is the initial URL fetch.
   bool is_initial_fetch_;
 
   // The URL for which the installable data is being fetched / was last fetched.
   GURL last_fetched_url_;
 
   // Downloaded data for |web_manifest_url_|.
   ShortcutInfo info_;
-  SkBitmap best_primary_icon_;
+  SkBitmap primary_icon_;
+  SkBitmap badge_icon_;
 
   base::WeakPtrFactory<WebApkUpdateDataFetcher> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebApkUpdateDataFetcher);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_WEBAPK_WEBAPK_UPDATE_DATA_FETCHER_H_