Add calls to the server to request WebAPK updates.

chrome/browser/android/webapk/webapk_installer.cc

 // 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.
 
 #include "chrome/browser/android/webapk/webapk_installer.h"
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/path_utils.h"
@@ skipping 18 matching lines @@
 #include "jni/WebApkInstaller_jni.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "url/gurl.h"
 
 namespace {
 
 // The default WebAPK server URL.
 const char kDefaultWebApkServerUrl[] =
-    "https://webapk.googleapis.com/v1alpha/webApks?alt=proto";
+    "https://webapk.googleapis.com/v1alpha/webApks/";
+
+// The response format type expected from the WebAPK server.
+const char kDefaultWebApkServerUrlResponseType[] = "?alt=proto";
 
 // The MIME type of the POST data sent to the server.
 const char kProtoMimeType[] = "application/x-protobuf";
 
 // The default number of milliseconds to wait for the WebAPK download URL from
 // the WebAPK server.
 const int kWebApkDownloadUrlTimeoutMs = 60000;
 
 // The default number of milliseconds to wait for the WebAPK download to
 // complete.
@@ skipping 61 matching lines @@
   return webapk;
 }
 
 // Returns task runner for running background tasks.
 scoped_refptr<base::TaskRunner> GetBackgroundTaskRunner() {
   return content::BrowserThread::GetBlockingPool()
       ->GetTaskRunnerWithShutdownBehavior(
           base::SequencedWorkerPool::SKIP_ON_SHUTDOWN);
 }
 
+GURL GetServerUrlForUpdate(const GURL& server_url,
+                           const std::string& webapk_package) {
+  // crbug.com/636552. Simplify the server URL.
+  return GURL(server_url.spec() + webapk_package + "/" +
+              kDefaultWebApkServerUrlResponseType);
+}
+
 }  // anonymous namespace
 
 WebApkInstaller::WebApkInstaller(const ShortcutInfo& shortcut_info,
                                  const SkBitmap& shortcut_icon)
     : shortcut_info_(shortcut_info),
       shortcut_icon_(shortcut_icon),
       webapk_download_url_timeout_ms_(kWebApkDownloadUrlTimeoutMs),
       download_timeout_ms_(kDownloadTimeoutMs),
+      task_type_(UNDEFINED),
       weak_ptr_factory_(this) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   server_url_ =
       GURL(command_line->HasSwitch(switches::kWebApkServerUrl)
                ? command_line->GetSwitchValueASCII(switches::kWebApkServerUrl)
                : kDefaultWebApkServerUrl);
 }
 
 WebApkInstaller::~WebApkInstaller() {}
 
 void WebApkInstaller::InstallAsync(content::BrowserContext* browser_context,
                                    const FinishCallback& finish_callback) {
   InstallAsyncWithURLRequestContextGetter(
       Profile::FromBrowserContext(browser_context)->GetRequestContext(),
       finish_callback);
 }
 
 void WebApkInstaller::InstallAsyncWithURLRequestContextGetter(
     net::URLRequestContextGetter* request_context_getter,
     const FinishCallback& finish_callback) {
   request_context_getter_ = request_context_getter;
   finish_callback_ = finish_callback;
+  task_type_ = INSTALL;
 
   if (!shortcut_info_.icon_url.is_valid()) {
     OnFailure();
     return;
   }
 
   // We need to take the hash of the bitmap at the icon URL prior to any
   // transformations being applied to the bitmap (such as encoding/decoding
   // the bitmap). The icon hash is used to determine whether the icon that
   // the user sees matches the icon of a WebAPK that the WebAPK server
   // generated for another user. (The icon can be dynamically generated.)
   //
   // We redownload the icon in order to take the Murmur2 hash. The redownload
   // should be fast because the icon should be in the HTTP cache.
   DownloadAppIconAndComputeMurmur2Hash();
 }
 
 void WebApkInstaller::SetTimeoutMs(int timeout_ms) {
   webapk_download_url_timeout_ms_ = timeout_ms;
   download_timeout_ms_ = timeout_ms;
 }
 
-bool WebApkInstaller::StartDownloadedWebApkInstall(
+void WebApkInstaller::UpdateAsync(content::BrowserContext* browser_context,
+                                  const FinishCallback& finish_callback,
+                                  const std::string& webapk_package,
+                                  int webapk_version) {
+  UpdateAsyncWithURLRequestContextGetter(
+      Profile::FromBrowserContext(browser_context)->GetRequestContext(),
+      finish_callback, webapk_package, webapk_version);
+}
+
+void WebApkInstaller::UpdateAsyncWithURLRequestContextGetter(
+    net::URLRequestContextGetter* request_context_getter,
+    const FinishCallback& finish_callback,
+    const std::string& webapk_package,
+    int webapk_version) {
+  request_context_getter_ = request_context_getter;
+  finish_callback_ = finish_callback;
+  webapk_package_ = webapk_package;
+  webapk_version_ = webapk_version;
+  task_type_ = UPDATE;
+
+  if (!shortcut_info_.icon_url.is_valid()) {
+    OnFailure();
+    return;
+  }
+
+  DownloadAppIconAndComputeMurmur2Hash();
+}
+
+bool WebApkInstaller::StartInstallingDownloadedWebApk(
     JNIEnv* env,
     const base::android::ScopedJavaLocalRef<jstring>& java_file_path,
     const base::android::ScopedJavaLocalRef<jstring>& java_package_name) {
   return Java_WebApkInstaller_installAsyncFromNative(env, java_file_path,
                                                      java_package_name);
 }
 
+bool WebApkInstaller::StartUpdateUsingDownloadedWebApk(
+    JNIEnv* env,
+    const base::android::ScopedJavaLocalRef<jstring>& java_file_path,
+    const base::android::ScopedJavaLocalRef<jstring>& java_package_name) {
+  return Java_WebApkInstaller_updateAsyncFromNative(env, java_file_path,
+                                                    java_package_name);
+}
+
 void WebApkInstaller::OnURLFetchComplete(const net::URLFetcher* source) {
   timer_.Stop();
 
   if (!source->GetStatus().is_success() ||
       source->GetResponseCode() != net::HTTP_OK) {
     OnFailure();
     return;
   }
 
   std::string response_string;
@@ skipping 32 matching lines @@
   icon_hasher_.reset();
 
   shortcut_icon_murmur2_hash_ = icon_murmur2_hash;
 
   // An empty hash indicates that |icon_hasher_| encountered an error.
   if (icon_murmur2_hash.empty()) {
     OnFailure();
     return;
   }
 
-  base::PostTaskAndReplyWithResult(
-      GetBackgroundTaskRunner().get(), FROM_HERE,
-      base::Bind(&BuildWebApkProtoInBackground, shortcut_info_, shortcut_icon_,
-                 shortcut_icon_murmur2_hash_),
-      base::Bind(&WebApkInstaller::SendCreateWebApkRequest,
-                 weak_ptr_factory_.GetWeakPtr()));
+  if (task_type_ == INSTALL) {
+    base::PostTaskAndReplyWithResult(
+        GetBackgroundTaskRunner().get(), FROM_HERE,
+        base::Bind(&BuildWebApkProtoInBackground, shortcut_info_,
+                   shortcut_icon_, shortcut_icon_murmur2_hash_),
+        base::Bind(&WebApkInstaller::SendCreateWebApkRequest,
+                   weak_ptr_factory_.GetWeakPtr()));
+  } else if (task_type_ == UPDATE) {
+    base::PostTaskAndReplyWithResult(
+        GetBackgroundTaskRunner().get(), FROM_HERE,
+        base::Bind(&BuildWebApkProtoInBackground, shortcut_info_,
+                   shortcut_icon_, shortcut_icon_murmur2_hash_),
+        base::Bind(&WebApkInstaller::SendUpdateWebApkRequest,
+                   weak_ptr_factory_.GetWeakPtr()));
+  }
 }
 
 void WebApkInstaller::SendCreateWebApkRequest(
-    std::unique_ptr<webapk::WebApk> webapk_proto) {
+    std::unique_ptr<webapk::WebApk> webapk) {
+  GURL server_url(server_url_.spec() + kDefaultWebApkServerUrlResponseType);
+  SendRequest(std::move(webapk), net::URLFetcher::POST, server_url);
+}
+
+void WebApkInstaller::SendUpdateWebApkRequest(
+    std::unique_ptr<webapk::WebApk> webapk) {
+  webapk->set_package_name(webapk_package_);
+  webapk->set_version(std::to_string(webapk_version_));
+
+  SendRequest(std::move(webapk), net::URLFetcher::PUT,
+              GetServerUrlForUpdate(server_url_, webapk_package_));
+}
+
+void WebApkInstaller::SendRequest(std::unique_ptr<webapk::WebApk> request_proto,
+                                  net::URLFetcher::RequestType request_type,
+                                  const GURL& server_url) {
   timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(webapk_download_url_timeout_ms_),
       base::Bind(&WebApkInstaller::OnTimeout, weak_ptr_factory_.GetWeakPtr()));
 
-  url_fetcher_ =
-      net::URLFetcher::Create(server_url_, net::URLFetcher::POST, this);
+  url_fetcher_ = net::URLFetcher::Create(server_url, request_type, this);
   url_fetcher_->SetRequestContext(request_context_getter_);
   std::string serialized_request;
-  webapk_proto->SerializeToString(&serialized_request);
+  request_proto->SerializeToString(&serialized_request);
   url_fetcher_->SetUploadData(kProtoMimeType, serialized_request);
   url_fetcher_->Start();
 }
 
 void WebApkInstaller::OnGotWebApkDownloadUrl(const GURL& download_url,
                                              const std::string& package_name) {
   base::FilePath output_dir;
   base::android::GetCacheDirectory(&output_dir);
   // TODO(pkotwicz): Download WebAPKs into WebAPK-specific subdirectory
   // directory.
@@ skipping 38 matching lines @@
   if (!change_permission_success) {
     OnFailure();
     return;
   }
 
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jstring> java_file_path =
       base::android::ConvertUTF8ToJavaString(env, file_path.value());
   base::android::ScopedJavaLocalRef<jstring> java_package_name =
       base::android::ConvertUTF8ToJavaString(env, package_name);
-  bool success =
-      StartDownloadedWebApkInstall(env, java_file_path, java_package_name);
+  bool success = false;
+  if (task_type_ == INSTALL) {
+    success = StartInstallingDownloadedWebApk(env, java_file_path,
+                                              java_package_name);
+  } else if (task_type_ == UPDATE) {
+    success = StartUpdateUsingDownloadedWebApk(env, java_file_path,
+                                               java_package_name);
+  }
   if (success)
     OnSuccess();
   else
     OnFailure();
 }
 
 void WebApkInstaller::OnTimeout() {
   OnFailure();
 }
 
 void WebApkInstaller::OnSuccess() {
   FinishCallback callback = finish_callback_;
   delete this;
   callback.Run(true);
 }
 
 void WebApkInstaller::OnFailure() {
   FinishCallback callback = finish_callback_;
   delete this;
   callback.Run(false);
 }