Simplify WebAPK proto building code

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 <map>
 #include <memory>
@@ skipping 69 matching lines @@
       const FinishCallback& callback);
 
   // Sets the timeout for the server requests.
   void SetTimeoutMs(int timeout_ms);
 
   // Called once the installation is complete or failed.
   void OnInstallFinished(JNIEnv* env,
                          const base::android::JavaParamRef<jobject>& obj,
                          jint result);
 
-  // Creates a WebApk install or update request.
-  // Should be used only for testing.
-  void BuildWebApkProtoInBackgroundForTesting(
-      const base::Callback<void(std::unique_ptr<webapk::WebApk>)>& callback,
+  // Asynchronously builds the WebAPK proto on a background thread for an update
+  // or install request. Runs |callback| on the calling thread when complete.
+  static void BuildProto(
+      const ShortcutInfo& shortcut_info,
+      const SkBitmap& primary_icon,
+      const SkBitmap& badge_icon,
+      const std::string& package_name,
+      const std::string& version,
       const std::map<std::string, std::string>& icon_url_to_murmur2_hash,
-      bool is_manifest_stale);
+      bool is_manifest_stale,
+      const base::Callback<void(std::unique_ptr<webapk::WebApk>)>& callback);
 
   // Registers JNI hooks.
   static bool Register(JNIEnv* env);
 
  protected:
   WebApkInstaller(content::BrowserContext* browser_context,
                   const ShortcutInfo& shortcut_info,
                   const SkBitmap& primary_icon,
                   const SkBitmap& badge_icon);
 
@@ skipping 37 matching lines @@
   // Called with the computed Murmur2 hash for the primary icon.
   void OnGotPrimaryIconMurmur2Hash(const std::string& primary_icon_hash);
 
   // Called with the computed Murmur2 hash for the badge icon, and
   // |did_fetch_badge_icon| to indicate whether there was an attempt to fetch
   // badge icon.
   void OnGotBadgeIconMurmur2Hash(bool did_fetch_badge_icon,
                                  const std::string& primary_icon_hash,
                                  const std::string& badge_icon_hash);
 
-  // Sends request to WebAPK server to create WebAPK. During a successful
-  // request the WebAPK server responds with the URL of the generated WebAPK.
-  // |webapk| is the proto to send to the WebAPK server.
-  void SendCreateWebApkRequest(std::unique_ptr<webapk::WebApk> webapk_proto);
-
-  // Sends request to WebAPK server to update a WebAPK. During a successful
-  // request the WebAPK server responds with the URL of the generated WebAPK.
-  // |webapk| is the proto to send to the WebAPK server.
-  void SendUpdateWebApkRequest(int webapk_version,
-                               std::unique_ptr<webapk::WebApk> webapk_proto);
-
   // Sends a request to WebAPK server to create/update WebAPK. During a
   // successful request the WebAPK server responds with the URL of the generated
   // WebAPK.
-  void SendRequest(std::unique_ptr<webapk::WebApk> request_proto,
-                   const GURL& server_url);
+  void SendRequest(std::unique_ptr<webapk::WebApk> request_proto);
 
   net::URLRequestContextGetter* request_context_getter_;
 
   // Sends HTTP request to WebAPK server.
   std::unique_ptr<net::URLFetcher> url_fetcher_;
 
   // Fails WebApkInstaller if WebAPK server takes too long to respond or if the
   // download takes too long.
   base::OneShotTimer timer_;
 
@@ skipping 17 matching lines @@
 
   // The number of milliseconds to wait for the WebAPK server to respond.
   int webapk_server_timeout_ms_;
 
   // WebAPK package name.
   std::string webapk_package_;
 
   // Whether the server wants the WebAPK to request updates less frequently.
   bool relax_updates_;
 
-
   // Indicates whether the installer is for installing or updating a WebAPK.
   TaskType task_type_;
 
   // Points to the Java Object.
   base::android::ScopedJavaGlobalRef<jobject> java_ref_;
 
   // Used to get |weak_ptr_|.
   base::WeakPtrFactory<WebApkInstaller> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebApkInstaller);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_WEBAPK_WEBAPK_INSTALLER_H_