Make install and update WebAPK URLs the same

chrome/browser/android/webapk/webapk_installer_unittest.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 <jni.h>
 #include <memory>
 #include <string>
 
@@ skipping 25 matching lines @@
     FILE_PATH_LITERAL("chrome/test/data");
 
 // URL of mock WebAPK server.
 const char* kServerUrl = "/webapkserver/";
 
 // Icon URL from Web Manifest. We use a random file in the test data directory.
 // Since WebApkInstaller does not try to decode the file as an image it is OK
 // that the file is not an image.
 const char* kIconUrl = "/simple.html";
 
-// The response format type expected from the WebAPK server.
-const char* kWebApkServerUrlResponseType = "?alt=proto";
-
 // URL of file to download from the WebAPK server. We use a random file in the
 // test data directory.
 const char* kDownloadUrl = "/simple.html";
 
 // The package name of the downloaded WebAPK.
 const char* kDownloadedWebApkPackageName = "party.unicode";
 
 // WebApkInstaller subclass where
 // WebApkInstaller::StartInstallingDownloadedWebApk() and
 // WebApkInstaller::StartUpdateUsingDownloadedWebApk() are stubbed out.
@@ skipping 170 matching lines @@
     SetIconUrl(icon_url);
     GURL server_url = test_server_.GetURL(kServerUrl);
     SetWebApkServerUrl(server_url);
     GURL download_url = test_server_.GetURL(kDownloadUrl);
     SetWebApkResponseBuilder(
         base::Bind(&BuildValidWebApkResponse, download_url));
   }
 
   std::unique_ptr<net::test_server::HttpResponse> HandleWebApkRequest(
       const net::test_server::HttpRequest& request) {
-    return (request.relative_url == GetServerUrlForCreateWebApk() ||
-            request.relative_url == GetServerUrlForUpdateWebApk())
+    return (request.relative_url == kServerUrl)
                ? webapk_response_builder_.Run()
                : std::unique_ptr<net::test_server::HttpResponse>();
   }
 
-  std::string GetServerUrlForCreateWebApk() const {
-    std::string url(kServerUrl);
-    return url.append(kWebApkServerUrlResponseType);
-  }
-
-  std::string GetServerUrlForUpdateWebApk() const {
-    std::string url(kServerUrl);
-    url.append(kDownloadedWebApkPackageName);
-    url.append("/");
-    url.append(kWebApkServerUrlResponseType);
-    return url;
-  }
-
   content::TestBrowserThreadBundle thread_bundle_;
   net::EmbeddedTestServer test_server_;
 
   // Web Manifest's icon URL.
   GURL icon_url_;
 
   // Builds response to the WebAPK creation request.
   WebApkResponseBuilder webapk_response_builder_;
 
   DISALLOW_COPY_AND_ASSIGN(WebApkInstallerTest);
@@ skipping 71 matching lines @@
   runner->RunInstallWebApk();
   EXPECT_FALSE(runner->success());
 }
 
 // Test update succeeding.
 TEST_F(WebApkInstallerTest, UpdateSuccess) {
   std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
   runner->RunUpdateWebApk();
   EXPECT_TRUE(runner->success());
 }