Add calls to the server to request WebAPK updates.

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>
 
 #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/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 net {
-class URLFetcher;
-class URLRequestContextGetter;
-}
-
 namespace webapk {
 class WebApk;
 }
 
 // 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:
+  // Called when either a request for creating/updating a WebAPK has been sent
+  // to Google Play or the create/update process fails.
+  // Parameters:
+  // - whether the request succeeds.
   using FinishCallback = base::Callback<void(bool)>;
 
   WebApkInstaller(const ShortcutInfo& shortcut_info,
                   const SkBitmap& shorcut_icon);
+
   ~WebApkInstaller() override;
 
   // Talks to the Chrome WebAPK server to generate a WebAPK on the server and to
-  // Google Play to install the generated WebAPK. Calls |callback| after the
+  // Google Play to install the downloaded WebAPK. Calls |callback| after the
   // request to install the WebAPK is sent to Google Play.
   void InstallAsync(content::BrowserContext* browser_context,
                     const FinishCallback& callback);
 
   // Same as InstallAsync() but uses the passed in |request_context_getter|.
   void InstallAsyncWithURLRequestContextGetter(
       net::URLRequestContextGetter* request_context_getter,
       const FinishCallback& callback);
 
+  // Talks to the Chrome WebAPK server to update a WebAPK on the server and to
+  // the Google Play server to install the downloaded WebAPK. Calls |callback|
+  // after the request to download and install the WebAPK is sent to

[pkotwicz, 2016/08/11 22:02:44]

Nit: "request to download and install" -> "request to install"

[Xi Han, 2016/08/15 21:38:45]

Done.

+  // the Google Play server.
+  void UpdateAsync(content::BrowserContext* browser_context,
+                   const FinishCallback& callback,
+                   const std::string& webapk_package,
+                   int webapk_version);
+
+  // Same as UpdateAsync() but uses the passed in |request_context_getter|.
+  void UpdateAsyncWithURLRequestContextGetter(
+      net::URLRequestContextGetter* request_context_getter,
+      const FinishCallback& callback,
+      const std::string& webapk_package,
+      int webapk_version);
+
   // Sets the timeout for the server requests.
   void SetTimeoutMs(int timeout_ms);
 
  protected:
   // Starts installation of the downloaded WebAPK. Returns whether the install
   // could be started. The installation may still fail if true is returned.
   // |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.
-  virtual bool StartDownloadedWebApkInstall(
+  virtual bool StartInstallingDownloadedWebApk(
+      JNIEnv* env,
+      const base::android::ScopedJavaLocalRef<jstring>& java_file_path,
+      const base::android::ScopedJavaLocalRef<jstring>& java_package_name);
+
+  // Starts updating of the downloaded WebAPK. Returns whether the updating

[pkotwicz, 2016/08/11 22:02:44]

Nit: "updating of the downloaded WebAPK" -> "update using the downloaded WebAPK"

You are updating to the downloaded WebAPK. The "downloaded WebAPK" does not need
to be updated.

[Xi Han, 2016/08/15 21:38:45]

Done.

+  // could be started. The updating may still fail if true is returned.
+  // |file_path| is the file path that the WebAPK was downloaded to.
+  // |package_name| is the package name of the WebAPK.
+  virtual bool StartUpdateUsingDownloadedWebApk(
       JNIEnv* env,
       const base::android::ScopedJavaLocalRef<jstring>& java_file_path,
       const base::android::ScopedJavaLocalRef<jstring>& java_package_name);
 
  private:
+  enum TaskType {
+    UNDEFINED,
+    INSTALL,
+    UPDATE,
+  };
+
   // net::URLFetcherDelegate:
   void OnURLFetchComplete(const net::URLFetcher* source) override;
 
-  // 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.
+  // Sends request to WebAPK server to create WebAPK.
   void SendCreateWebApkRequest(std::unique_ptr<webapk::WebApk> webapk_proto);
 
+  // Sends request to WebAPK server to update a WebAPK.
+  void SendUpdateWebApkRequest(std::unique_ptr<webapk::WebApk> webapk_proto);
+
+  // Sends a request to WebAPK server to create/update WebAPK. During a
+  // successful request the WebAPK server responds with the URL of the generated
+  // WebAPK.
+  void SendRequest(std::unique_ptr<webapk::WebApk> request_proto,
+                   net::URLFetcher::RequestType request_type,
+                   const GURL& server_url);
+
   // 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. 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,
@@ skipping 41 matching lines @@
   // 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_;
 
+  // WebAPK package name.
+  std::string webapk_package_;
+
+  // WebAPK version code.
+  int webapk_version_;
+
+  // Indicates whether the installer is for installing or updating a WebAPK.
+  TaskType task_type_;
+
   // Used to get |weak_ptr_|.
   base::WeakPtrFactory<WebApkInstaller> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebApkInstaller);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_WEBAPK_WEBAPK_INSTALLER_H_