Make install and update WebAPK URLs the same

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/";
-
-// The response format type expected from the WebAPK server.
-const char kDefaultWebApkServerUrlResponseType[] = "?alt=proto";
+    "https://webapk.googleapis.com/v1alpha/webApks/?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 65 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);
-}
-
 // Creates a directory depending on the type of the task, and set permissions.
 // It also creates any parent directory along the path if doesn't exist,
 // and sets permissions as well.
 // The previously downloaded APKs are deleted in order to clean up unused cached
 // data.
 base::FilePath CreateSubDirAndSetPermissionsInBackground(
     const base::StringPiece& output_dir_name,
     const std::string& package_name) {
   base::FilePath output_root_dir;
   base::android::GetCacheDirectory(&output_root_dir);
@@ skipping 201 matching lines @@
   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()));
 }
 
 void WebApkInstaller::SendCreateWebApkRequest(
     std::unique_ptr<webapk::WebApk> webapk) {
-  GURL server_url(server_url_.spec() + kDefaultWebApkServerUrlResponseType);
-  SendRequest(std::move(webapk), net::URLFetcher::POST, server_url);
+  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_));
+  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, weak_ptr_factory_.GetWeakPtr()));
 
@@ skipping 112 matching lines @@
   std::string webapk_package = webapk_package_;
   delete this;
   callback.Run(true, webapk_package);
 }
 
 void WebApkInstaller::OnFailure() {
   FinishCallback callback = finish_callback_;
   delete this;
   callback.Run(false, "");
 }