Take Murmur2 hash of untransformed icon when creating WebAPK part 1

chrome/browser/android/webapk/webapk_installer.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_INSTALLER_H_
 #define CHROME_BROWSER_ANDROID_WEBAPK_WEBAPK_INSTALLER_H_
 
 #include <jni.h>
 #include <memory>
 
@@ skipping 17 matching lines @@
 
 namespace net {
 class URLFetcher;
 class URLRequestContextGetter;
 }
 
 namespace webapk {
 class WebApk;
 }
 
+class WebApkIconHasher;
+
 // Talks to Chrome WebAPK server and Google Play to generate a WebAPK on the
 // server, download it, and install it.
 class WebApkInstaller : public net::URLFetcherDelegate {
  public:
   using FinishCallback = base::Callback<void(bool)>;
 
   WebApkInstaller(const ShortcutInfo& shortcut_info,
                   const SkBitmap& shorcut_icon);
   ~WebApkInstaller() override;
 
@@ skipping 18 matching lines @@
   // |package_name| is the package name that the WebAPK should be installed at.
   virtual bool StartDownloadedWebApkInstall(
       JNIEnv* env,
       const base::android::ScopedJavaLocalRef<jstring>& java_file_path,
       const base::android::ScopedJavaLocalRef<jstring>& java_package_name);
 
  private:
   // net::URLFetcherDelegate:
   void OnURLFetchComplete(const net::URLFetcher* source) override;
 
+  // Downloads app icon in order to compute Murmur2 hash.
+  void DownloadAppIconAndComputeMurmur2Hash();
+
+  // Called with the computed Murmur2 hash for the app icon.
+  void OnGotIconMurmur2Hash(const std::string& icon_murmur2_hash);
+
   // Sends request to WebAPK server to create WebAPK. During a successful
   // request the WebAPK server responds with the URL of the generated WebAPK.
-  // |webapk| is the proto to send to the WebAPK server.
-  void SendCreateWebApkRequest(std::unique_ptr<webapk::WebApk> webapk_proto);
+  void SendCreateWebApkRequest();
+
+  void SendCreateWebApkRequestWithProto(
+      std::unique_ptr<webapk::WebApk> webapk_proto);
 
   // Called with the URL of generated WebAPK and the package name that the
   // WebAPK should be installed at.
   void OnGotWebApkDownloadUrl(const GURL& download_url,
                               const std::string& package_name);
 
   // Called once the WebAPK has been downloaded. Makes the downloaded WebAPK
   // world readable and installs the WebAPK if the download was successful.
   // |file_path| is the file path that the WebAPK was downloaded to.
   // |package_name| is the package name that the WebAPK should be installed at.
   void OnWebApkDownloaded(const base::FilePath& file_path,
                           const std::string& package_name,
                           FileDownloader::Result result);
 
   // Called once the downloaded WebAPK has been made world readable. Installs
   // the WebAPK.
   // |file_path| is the file path that the WebAPK was downloaded to.
   // |package_name| is the package name that the WebAPK should be installed at.
   // |change_permission_success| is whether the WebAPK could be made world
   // readable.
   void OnWebApkMadeWorldReadable(const base::FilePath& file_path,
                                  const std::string& package_name,
                                  bool change_permission_success);
 
-  // Populates webapk::WebApk and returns it.
-  // Must be called on a worker thread because it encodes an SkBitmap.
-  std::unique_ptr<webapk::WebApk> BuildWebApkProtoInBackground();
-
   // Called when the request to the WebAPK server times out or when the WebAPK
   // download times out.
   void OnTimeout();
 
   // Called when the request to install the WebAPK is sent to Google Play.
   void OnSuccess();
 
   // Called if a WebAPK could not be created. WebApkInstaller only tracks the
   // WebAPK creation and the WebAPK download. It does not track the
   // WebAPK installation. OnFailure() is not called if the WebAPK could not be
   // installed.
   void OnFailure();
 
   net::URLRequestContextGetter* request_context_getter_;
 
   // Sends HTTP request to WebAPK server.
   std::unique_ptr<net::URLFetcher> url_fetcher_;
 
+  // Downloads app icon and computes Murmur2 hash.
+  std::unique_ptr<WebApkIconHasher> icon_hasher_;
+
   // Downloads WebAPK.
   std::unique_ptr<FileDownloader> downloader_;
 
   // Fails WebApkInstaller if WebAPK server takes too long to respond or if the
   // download takes too long.
   base::OneShotTimer timer_;
 
   // Callback to call once WebApkInstaller succeeds or fails.
   FinishCallback finish_callback_;
 
   // Web Manifest info.
   const ShortcutInfo shortcut_info_;
 
   // WebAPK app icon.
   const SkBitmap shortcut_icon_;
 
+  // Murmur2 hash of the bitmap at the app icon URL prior to any transformations
+  // being applied to the bitmap (such as encoding/decoding the icon bitmap).
+  std::string shortcut_icon_murmur2_hash_;
+
   // WebAPK server URL.
   GURL server_url_;
 
   // The number of milliseconds to wait for the WebAPK download URL from the
   // WebAPK server.
   int webapk_download_url_timeout_ms_;
 
   // The number of milliseconds to wait for the WebAPK download to complete.
   int download_timeout_ms_;
 
   // Used to get |weak_ptr_|.
   base::WeakPtrFactory<WebApkInstaller> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebApkInstaller);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_WEBAPK_WEBAPK_INSTALLER_H_