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

chrome/browser/android/webapk/webapk_update_manager.cc

Index: chrome/browser/android/webapk/webapk_update_manager.cc
diff --git a/chrome/browser/android/webapk/webapk_update_manager.cc b/chrome/browser/android/webapk/webapk_update_manager.cc
index 1b721b9e28bc920dea06f50a3f08d7c0ef00bf1c..cc01e4e51720b44b1e29ec403411f51fc6527854 100644
--- a/chrome/browser/android/webapk/webapk_update_manager.cc
+++ b/chrome/browser/android/webapk/webapk_update_manager.cc
@@ -35,8 +35,11 @@ namespace {
 
 // Called with the serialized proto to send to the WebAPK server.
 void OnBuiltProto(const JavaRef<jobject>& java_callback,
-                  std::unique_ptr<std::vector<uint8_t>> proto) {
-  base::android::RunCallbackAndroid(java_callback, *proto);
+                  std::unique_ptr<std::string> proto) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  base::android::ScopedJavaLocalRef<jstring> j_proto =

[Xi Han, 2017/06/19 17:14:14]

Nit: rename j_proto to java_proto, since we already use java_callback.

+      base::android::ConvertUTF8ToJavaString(env, *proto);
+  base::android::RunCallbackAndroid(java_callback, j_proto);
 }
 
 // Called after the update either succeeds or fails.
@@ -136,7 +139,7 @@ static void UpdateWebApk(JNIEnv* env,
                          const JavaParamRef<jstring>& java_webapk_package,
                          const JavaParamRef<jstring>& java_start_url,
                          const JavaParamRef<jstring>& java_short_name,
-                         const JavaParamRef<jbyteArray>& java_serialized_proto,
+                         const JavaParamRef<jstring>& java_serialized_proto,
                          const JavaParamRef<jobject>& java_callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
@@ -155,9 +158,9 @@ static void UpdateWebApk(JNIEnv* env,
       ConvertJavaStringToUTF8(env, java_webapk_package);
   GURL start_url = GURL(ConvertJavaStringToUTF8(env, java_start_url));
   base::string16 short_name = ConvertJavaStringToUTF16(env, java_short_name);
-  std::unique_ptr<std::vector<uint8_t>> serialized_proto =
-      base::MakeUnique<std::vector<uint8_t>>();
-  JavaByteArrayToByteVector(env, java_serialized_proto, serialized_proto.get());
+  std::unique_ptr<std::string> serialized_proto =
+      base::MakeUnique<std::string>();
+  ConvertJavaStringToUTF8(env, java_serialized_proto, serialized_proto.get());
 
   WebApkInstallService::Get(profile)->UpdateAsync(
       webapk_package, start_url, short_name, std::move(serialized_proto),