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 google {
+namespace protobuf {
+class MessageLite;
+}
 }
 
 namespace webapk {
-class CreateWebApkRequest;
+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 of creating or updating WebAPK has been sent
+  // or the creation process of the WebAPK on the server side 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
   // 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 download and install the generated WebAPK. Calls
+  // |callback| after the request to download and install the WebAPK is sent to
+  // the Google Play server.
+  void UpdateAsync(content::BrowserContext* browser_context,
+                   const FinishCallback& callback,
+                   const std::string& webapk_package,
+                   int version);
+
  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.
   // The Method is virtual for the sake of testing.
   virtual bool StartDownloadedWebApkInstall(
       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;
 
   // Initializes |request_context_getter_| on UI thread.
   void InitializeRequestContextGetterOnUIThread(
       content::BrowserContext* browser_context);
 
-  // Sends request to WebAPK server to create WebAPK. During a successful
-  // request the WebAPK server responds with the URL of the generated WebAPK.
+  // Sends request to WebAPK server to create WebAPK.
   void SendCreateWebApkRequest();
 
+  // Sends request to WebAPK server to update a WebAPK.
+  void SendUpdateWebApkRequest();
+
+  // Sends a request to WebAPK server. During a successful request the
+  // WebAPK server responds with a URL to send to Google Play to
+  // download and install the generated WebAPK.
+  void SendRequest(
+      std::unique_ptr<::google::protobuf::MessageLite> 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 std::string& 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,
                           const std::string& package_name,
                           FileDownloader::Result result);
 
-  // Populates webapk::CreateWebApkRequest and returns it.
-  std::unique_ptr<webapk::CreateWebApkRequest> BuildCreateWebApkRequest();
+  // Populate the |webapk| field of a request.
+  void PopulateWebApkProto(webapk::WebApk* webapk);
 
   // 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
@@ skipping 18 matching lines @@
 
   // Web Manifest info.
   const ShortcutInfo shortcut_info_;
 
   // WebAPK app icon.
   const SkBitmap shortcut_icon_;
 
   // WebAPK server URL.
   GURL server_url_;
 
+  // WebAPK package name.
+  std::string webapk_package_;
+
+  // WebAPK version code.
+  int version_;

[pkotwicz, 2016/08/08 18:59:16]

Nit: Rename to |webapk_version_| for the sake of consistency. Also to make clear
that the variable refers to the WebAPK version, not the Chrome version

[Xi Han, 2016/08/08 21:25:05]

Done.

+
+  // A flag to indicate whether the installer is for installing or updating a
+  // WebAPK.
+  TaskType taskType_;
+
   // Used to get |weak_ptr_| on the IO thread.
   base::WeakPtrFactory<WebApkInstaller> io_weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebApkInstaller);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_WEBAPK_WEBAPK_INSTALLER_H_