Update AppBannerManager & AppBannerManagerAndroid to request badge icon.

chrome/browser/banners/app_banner_manager.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_BANNERS_APP_BANNER_MANAGER_H_
 #define CHROME_BROWSER_BANNERS_APP_BANNER_MANAGER_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 102 matching lines @@
   virtual std::string GetAppIdentifier();
 
   // Return a string describing what type of banner is being created. Used when
   // alerting websites that a banner is about to be created.
   virtual std::string GetBannerType();
 
   // Returns a string parameter for a devtools console message corresponding to
   // |code|. Returns the empty string if |code| requires no parameter.
   std::string GetStatusParam(InstallableStatusCode code);
 
-  // Returns the ideal and minimum icon sizes required for being installable.
-  virtual int GetIdealIconSizeInPx();
-  virtual int GetMinimumIconSizeInPx();
+  // Returns the ideal and minimum primary icon size requirements.
+  virtual int GetIdealPrimaryIconSizeInPx();
+  virtual int GetMinimumPrimaryIconSizeInPx();
 
   // Returns a WeakPtr to this object. Exposed so subclasses/infobars may
   // may bind callbacks without needing their own WeakPtrFactory.
   base::WeakPtr<AppBannerManager> GetWeakPtr();
 
   // Returns true if |is_debug_mode_| is true or the
   // kBypassAppBannerEngagementChecks flag is set.
   virtual bool IsDebugMode() const;
 
   // Returns true if the webapp at |start_url| has already been installed.
   virtual bool IsWebAppInstalled(content::BrowserContext* browser_context,
                                  const GURL& start_url,
                                  const GURL& manifest_url);
 
   // Callback invoked by the InstallableManager once it has fetched the page's
   // manifest.
   void OnDidGetManifest(const InstallableData& result);
 
+  // Returns an InstallableParams object that requests all checks necessary for
+  // a web app banner.
+  virtual InstallableParams ParamsToPerformInstallableCheck();
+
   // Run at the conclusion of OnDidGetManifest. For web app banners, this calls
   // back to the InstallableManager to continue checking criteria. For native
   // app banners, this checks whether native apps are preferred in the manifest,
   // and calls to Java to verify native app details. If a native banner isn't or
   // can't be requested, it continues with the web app banner checks.
   virtual void PerformInstallableCheck();
 
   // Callback invoked by the InstallableManager once it has finished checking
   // all other installable properties.
-  void OnDidPerformInstallableCheck(const InstallableData& result);
+  virtual void OnDidPerformInstallableCheck(const InstallableData& result);
 
   // Records that a banner was shown. The |event_name| corresponds to the RAPPOR
   // metric being recorded.
   void RecordDidShowBanner(const std::string& event_name);
 
   // Logs an error message corresponding to |code| to the devtools console
   // attached to |web_contents|. Does nothing if IsDebugMode() returns false.
   void ReportStatus(content::WebContents* web_contents,
                     InstallableStatusCode code);
 
@@ skipping 37 matching lines @@
 
   // The URL for which the banner check is being conducted.
   GURL validated_url_;
 
   // The URL of the manifest.
   GURL manifest_url_;
 
   // The manifest object.
   content::Manifest manifest_;
 
-  // The URL of the icon.
-  GURL icon_url_;
+  // The URL of the primary icon.
+  GURL primary_icon_url_;
 
-  // The icon object.
-  std::unique_ptr<SkBitmap> icon_;
+  // The primary icon object.
+  std::unique_ptr<SkBitmap> primary_icon_;
 
   // The referrer string (if any) specified in the app URL. Used only for native
   // app banners.
   std::string referrer_;
 
  private:
   friend class AppBannerManagerTest;
 
   // Record that the banner could be shown at this point, if the triggering
   // heuristic allowed.
@@ skipping 54 matching lines @@
   // scoped to the WebContents which they are observing. This allows us to use
   // weak pointers for callbacks.
   base::WeakPtrFactory<AppBannerManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AppBannerManager);
 };
 
 }  // namespace banners
 
 #endif  // CHROME_BROWSER_BANNERS_APP_BANNER_MANAGER_H_