[Android:WebAPK] Don't add webapp to homescreen if WebAPK install times out part 1/3

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 <map>
 #include <memory>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/android/shortcut_info.h"
+#include "chrome/browser/android/webapk/webapk_install_service.h"
 #include "chrome/browser/net/file_downloader.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 namespace base {
 class FilePath;
 }
 
 namespace content {
 class BrowserContext;
 }
 
 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. The native WebApkInstaller owns the
 // Java WebApkInstaller counterpart.
 class WebApkInstaller : public net::URLFetcherDelegate {
  public:
-  // Called when the creation/updating of a WebAPK is finished or failed.
-  // Parameters:
-  // - whether the process succeeds.
-  // - the package name of the WebAPK.
-  // - true if Chrome received a "request updates less frequently" directive
-  //   from the WebAPK server.
-  using FinishCallback = base::Callback<void(bool, bool, const std::string&)>;
+  using FinishCallback = WebApkInstallService::FinishCallback;
 
   ~WebApkInstaller() override;
 
   // Creates a self-owned WebApkInstaller instance and talks to the Chrome
   // WebAPK server to generate a WebAPK on the server and to Google Play to
   // install the downloaded WebAPK. Calls |callback| once the install completed
   // or failed.
   static void InstallAsync(content::BrowserContext* context,
                            const ShortcutInfo& shortcut_info,
                            const SkBitmap& shortcut_icon,
@@ skipping 27 matching lines @@
       const std::map<std::string, std::string>& icon_url_to_murmur2_hash,
       bool is_manifest_stale,
       const FinishCallback& callback);
 
   // Sets the timeout for the server requests.
   void SetTimeoutMs(int timeout_ms);
 
   // Called once the installation is complete or failed.
   void OnInstallFinished(JNIEnv* env,
                          const base::android::JavaParamRef<jobject>& obj,
-                         jboolean success);
+                         jint result);
 
   // Creates a WebApk install or update request.
   // Should be used only for testing.
   void BuildWebApkProtoInBackgroundForTesting(
       const base::Callback<void(std::unique_ptr<webapk::WebApk>)>& callback,
       const std::map<std::string, std::string>& icon_url_to_murmur2_hash,
       bool is_manifest_stale);
 
   // Registers JNI hooks.
   static bool Register(JNIEnv* env);
@@ skipping 20 matching lines @@
   // Returns whether Google Play supports installing WebAPKs.
   virtual bool CanUseGooglePlayInstallService();
 
   // Called when the package name of the WebAPK is available and the install
   // or update request is handled by Google Play.
   virtual void InstallOrUpdateWebApkFromGooglePlay(
       const std::string& package_name,
       int version,
       const std::string& token);
 
-  // Called when the request to install the WebAPK is sent to Google Play.
-  void OnSuccess();
+  // Called when the install or update process has completed or failed.
+  void OnResult(WebApkInstallResult result);
 
  private:
   enum TaskType {
     UNDEFINED,
     INSTALL,
     UPDATE,
   };
 
   // Create the Java object.
   void CreateJavaRef();
@@ skipping 64 matching lines @@
                           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.
   // |change_permission_success| is whether the WebAPK could be made world
   // readable.
   void OnWebApkMadeWorldReadable(const base::FilePath& file_path,
                                  bool change_permission_success);
 
-  // Called when the request to the WebAPK server times out or when the WebAPK
-  // download times out.
-  void OnTimeout();
-
-  // 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_;
@@ skipping 36 matching lines @@
   // Points to the Java Object.
   base::android::ScopedJavaGlobalRef<jobject> java_ref_;
 
   // Used to get |weak_ptr_|.
   base::WeakPtrFactory<WebApkInstaller> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebApkInstaller);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_WEBAPK_WEBAPK_INSTALLER_H_