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"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/android/shortcut_helper.h"
 #include "chrome/browser/android/webapk/webapk.pb.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/WebApkInstaller_jni.h"
 #include "net/http/http_status_code.h"
-#include "net/url_request/url_fetcher.h"
 #include "third_party/smhasher/src/MurmurHash2.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 WebAPK server.

[pkotwicz, 2016/08/09 14:35:42]

Nit: "from WebAPK server" -> "from the WebAPK server"

[Xi Han, 2016/08/11 19:01:15]

Done.

+const char kDefaultWebApkServerUrlResponseType[] = "?alt=proto";
 
 // The MIME type of the POST data sent to the server.
 const char kProtoMimeType[] = "application/x-protobuf";
 
 // The seed to use the murmur2 hash of the app icon.
 const uint32_t kMurmur2HashSeed = 0;
 
 // The default number of milliseconds to wait for the WebAPK download URL from
 // the WebAPK server.
 const int kWebApkDownloadUrlTimeoutMs = 60000;
@@ skipping 34 matching lines @@
 }
 
 }  // 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),
       io_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) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   finish_callback_ = finish_callback;
+  task_type_ = INSTALL;
   // base::Unretained() is safe because WebApkInstaller owns itself and does not
   // start the timeout timer till after
   // InitializeRequestContextGetterOnUIThread() is called.
-  content::BrowserThread::PostTask(
+  content::BrowserThread::PostTaskAndReply(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&WebApkInstaller::InitializeRequestContextGetterOnUIThread,
-                 base::Unretained(this), browser_context));
+                 base::Unretained(this), browser_context),
+      base::Bind(&WebApkInstaller::SendCreateWebApkRequest,
+                 io_weak_ptr_factory_.GetWeakPtr()));
 }
 
 void WebApkInstaller::InstallAsyncWithURLRequestContextGetter(
     net::URLRequestContextGetter* request_context_getter,
     const FinishCallback& finish_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   request_context_getter_ = request_context_getter;
   finish_callback_ = finish_callback;
+  task_type_ = INSTALL;
 
   SendCreateWebApkRequest();
 }
 
 void WebApkInstaller::SetTimeoutMs(int timeout_ms) {
   webapk_download_url_timeout_ms_ = timeout_ms;
   download_timeout_ms_ = timeout_ms;
 }
 
+void WebApkInstaller::UpdateAsync(content::BrowserContext* browser_context,
+                                  const FinishCallback& finish_callback,
+                                  const std::string& webapk_package,
+                                  int version) {

[pkotwicz, 2016/08/09 14:35:42]

Nit: |version| -> |webapk_version|

[Xi Han, 2016/08/11 19:01:15]

Done.

+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+  finish_callback_ = finish_callback;
+  webapk_package_ = webapk_package;
+  webapk_version_ = version;
+  task_type_ = UPDATE;
+  // base::Unretained() is safe because WebApkInstaller owns itself and does not
+  // start the timeout timer till after
+  // InitializeRequestContextGetterOnUIThread() is called.
+  content::BrowserThread::PostTaskAndReply(
+      content::BrowserThread::UI, FROM_HERE,
+      base::Bind(&WebApkInstaller::InitializeRequestContextGetterOnUIThread,
+          base::Unretained(this), browser_context),
+      base::Bind(&WebApkInstaller::SendUpdateWebApkRequest,
+                 io_weak_ptr_factory_.GetWeakPtr()));
+}
+
 bool WebApkInstaller::StartDownloadedWebApkInstall(
     JNIEnv* env,
     const base::android::ScopedJavaLocalRef<jstring>& java_file_path,
     const base::android::ScopedJavaLocalRef<jstring>& java_package_name) {

[pkotwicz, 2016/08/09 14:35:42]

Can you move this logic to OnWebApkDownloaded()? This function exists so that
WebApkInstallerTest can stub it out. Since it is stubbed out in tests the
function should be short.

I am suggesting renaming this function to:
WebApkInstaller::StartInstallingDownloadedWebApk()
and adding a new function:
WebApkInstaller::StartUpdateUsingDownloadedWebApk()

[Xi Han, 2016/08/11 19:01:14]

Done.

-  return Java_WebApkInstaller_installAsyncFromNative(env, java_file_path.obj(),
-                                                     java_package_name.obj());
+  if (task_type_ == INSTALL) {
+    return Java_WebApkInstaller_installAsyncFromNative(
+        env, java_file_path.obj(), java_package_name.obj());
+  } else if (task_type_ == UPDATE) {
+    return Java_WebApkInstaller_updateAsyncFromNative(
+        env, java_file_path.obj(), java_package_name.obj());
+  } else {
+    return false;
+  }
 }
 
 void WebApkInstaller::OnURLFetchComplete(const net::URLFetcher* source) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   timer_.Stop();
 
   if (!source->GetStatus().is_success() ||
       source->GetResponseCode() != net::HTTP_OK) {
     OnFailure();
     return;
@@ skipping 16 matching lines @@
   }
   OnGotWebApkDownloadUrl(signed_download_url, response->package_name());
 }
 
 void WebApkInstaller::InitializeRequestContextGetterOnUIThread(
     content::BrowserContext* browser_context) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   // Profile::GetRequestContext() must be called on UI thread.
   request_context_getter_ =
       Profile::FromBrowserContext(browser_context)->GetRequestContext();
-
-  content::BrowserThread::PostTask(
-      content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&WebApkInstaller::SendCreateWebApkRequest,
-                 io_weak_ptr_factory_.GetWeakPtr()));
 }
 
 void WebApkInstaller::SendCreateWebApkRequest() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
-  std::unique_ptr<webapk::WebApk> webapk_proto = BuildWebApkProto();
 
+  std::unique_ptr<webapk::WebApk> webapk = BuildWebApkProto();

[pkotwicz, 2016/08/09 14:35:42]

Nit: Remove the comment. It just reiterates what is on  line 213

[Xi Han, 2016/08/11 19:01:15]

Done.

+  // The WebAPK server URL to download and install a WebAPK is:
+  // |server_url_| + |kDeaultWebApkServerUrlResponseType|.
+  GURL server_url(server_url_.spec() + kDefaultWebApkServerUrlResponseType);
+  SendRequest(std::move(webapk), net::URLFetcher::POST, server_url);
+}
+
+void WebApkInstaller::SendUpdateWebApkRequest() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+
+  std::unique_ptr<webapk::WebApk> webapk = BuildWebApkProto();
+  webapk->set_package_name(webapk_package_);
+  webapk->set_version(std::to_string(webapk_version_));
+  // The WebAPK server URL to download and update a WebAPK is:
+  // |server_url_| + |WebAPK package name| + "/"
+  // + |kDeaultWebApkServerUrlResponseType|

[pkotwicz, 2016/08/09 14:35:42]

Nit: The comment is not useful. It just reiterates what is on line 226-227.

Is the WebAPK version code supposed to be part of the server URL? The comment in
webapk_service.proto suggests that it is

If you want you can add a new function to clarify things:
GURL GetServerUrlForUpdate(const std::string& webapk_package_name) {}
Computing |server_url| in SendUpdateWebApkRequest() is fine by me though

Aside: It would be nice if we could change the server and simplify the server
URL. (Maybe log a bug?)

[Xi Han, 2016/08/11 19:01:15]

I think it is part of the package name in the comments.
I would prefer it inline since it is very simple.
Filed a bug 636552.

+  GURL server_url(server_url_.spec() + webapk_package_ + "/"
+                  + kDefaultWebApkServerUrlResponseType);
+  SendRequest(std::move(webapk), net::URLFetcher::PUT, server_url);
+}
+
+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,
                           io_weak_ptr_factory_.GetWeakPtr()));
 
   url_fetcher_ =
-      net::URLFetcher::Create(server_url_, net::URLFetcher::POST, this);
+      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) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   base::FilePath output_dir;
   base::android::GetCacheDirectory(&output_dir);
@@ skipping 77 matching lines @@
 
 void WebApkInstaller::OnSuccess() {
   finish_callback_.Run(true);
   delete this;
 }
 
 void WebApkInstaller::OnFailure() {
   finish_callback_.Run(false);
   delete this;
 }