[Android WebAPK] Make webapk_installer.cc return proto as base64 string

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>
-#include <vector>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/android/shortcut_info.h"
 #include "chrome/browser/android/webapk/webapk_install_service.h"
 #include "net/url_request/url_fetcher.h"
@@ skipping 22 matching lines @@
   // APK to be installed. Calls |callback| once the install completed or failed.
   static void InstallAsync(content::BrowserContext* context,
                            const ShortcutInfo& shortcut_info,
                            const SkBitmap& primary_icon,
                            const SkBitmap& badge_icon,
                            const FinishCallback& finish_callback);
 
   // Creates a self-owned WebApkInstaller instance and talks to the Chrome
   // WebAPK server to update a WebAPK on the server and locally requests the
   // APK to be installed. Calls |callback| once the install completed or failed.
-  static void UpdateAsync(
-      content::BrowserContext* context,
-      const std::string& webapk_package,
-      const GURL& start_url,
-      const base::string16& short_name,
-      std::unique_ptr<std::vector<uint8_t>> serialized_proto,
-      const FinishCallback& callback);
+  static void UpdateAsync(content::BrowserContext* context,
+                          const std::string& webapk_package,
+                          const GURL& start_url,
+                          const base::string16& short_name,
+                          std::unique_ptr<std::string> serialized_proto,
+                          const FinishCallback& callback);
 
   // Calls the private function |InstallAsync| for testing.
   // Should be used only for testing.
   static void InstallAsyncForTesting(WebApkInstaller* installer,
                                      const ShortcutInfo& shortcut_info,
                                      const SkBitmap& primary_icon,
                                      const SkBitmap& badge_icon,
                                      const FinishCallback& finish_callback);
 
   // Calls the private function |UpdateAsync| for testing.
   // Should be used only for testing.
   static void UpdateAsyncForTesting(
       WebApkInstaller* installer,
       const std::string& webapk_package,
       const GURL& start_url,
       const base::string16& short_name,
-      std::unique_ptr<std::vector<uint8_t>> serialized_proto,
+      std::unique_ptr<std::string> serialized_proto,
       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);
 
   // 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,
-      const base::Callback<void(std::unique_ptr<std::vector<uint8_t>>)>&
-          callback);
+      const base::Callback<void(std::unique_ptr<std::string>)>& callback);
 
   // Registers JNI hooks.
   static bool Register(JNIEnv* env);
 
  protected:
   explicit WebApkInstaller(content::BrowserContext* browser_context);
 
   // Called when the package name of the WebAPK is available and the install
   // or update request should be issued.
   virtual void InstallOrUpdateWebApk(const std::string& package_name,
@@ skipping 20 matching lines @@
                     const SkBitmap& primary_icon,
                     const SkBitmap& badge_icon,
                     const FinishCallback& finish_callback);
 
   // Talks to the Chrome WebAPK server to update a WebAPK on the server and to
   // the Google Play server to install the downloaded WebAPK. Calls
   // |finish_callback| once the update completed or failed.
   void UpdateAsync(const std::string& webapk_package,
                    const GURL& start_url,
                    const base::string16& short_name,
-                   const std::unique_ptr<std::vector<uint8_t>> serialized_proto,
+                   const std::unique_ptr<std::string> serialized_proto,
                    const FinishCallback& callback);
 
   // net::URLFetcherDelegate:
   void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // 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 a request to WebAPK server to create/update WebAPK. During a
   // successful request the WebAPK server responds with a token to send to
   // Google Play.
-  void SendRequest(std::unique_ptr<std::vector<uint8_t>> serialized_proto);
+  void SendRequest(std::unique_ptr<std::string> serialized_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 29 matching lines @@
   // 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_