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

chrome/browser/android/webapk/webapk_update_manager.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_update_manager.h"
 
 #include <jni.h>
 #include <memory>
 #include <vector>
 
@@ skipping 17 matching lines @@
 #include "url/gurl.h"
 
 using base::android::JavaRef;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaGlobalRef;
 
 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.
 void OnUpdated(const JavaRef<jobject>& java_callback,
                WebApkInstallResult result,
                bool relax_updates,
                const std::string& webapk_package) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_WebApkUpdateCallback_onResultFromNative(
       env, java_callback, static_cast<int>(result), relax_updates);
@@ skipping 79 matching lines @@
       java_is_manifest_stale,
       base::Bind(&OnBuiltProto, ScopedJavaGlobalRef<jobject>(java_callback)));
 }
 
 // static JNI method.
 static void UpdateWebApk(JNIEnv* env,
                          const JavaParamRef<jclass>& clazz,
                          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);
 
   ScopedJavaGlobalRef<jobject> callback_ref(java_callback);
 
   Profile* profile = ProfileManager::GetLastUsedProfile();
   if (profile == nullptr) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&OnUpdated, callback_ref, WebApkInstallResult::FAILURE,
                    false /* relax_updates */, "" /* webapk_package */));
     return;
   }
 
   std::string webapk_package =
       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),
       base::Bind(&OnUpdated, callback_ref));
 }