Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2245)

Unified Diff: chrome/browser/android/webapk/webapk_installer.h

Issue 2943913002: [Android WebAPK] Make webapk_installer.cc return proto as base64 string
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/webapk/webapk_installer.h
diff --git a/chrome/browser/android/webapk/webapk_installer.h b/chrome/browser/android/webapk/webapk_installer.h
index 2c21121a35cd4ef41edc180b4adec9df6d6b2e91..807ff83ff1b265ee753777765f680a657fa1df6f 100644
--- a/chrome/browser/android/webapk/webapk_installer.h
+++ b/chrome/browser/android/webapk/webapk_installer.h
@@ -8,7 +8,6 @@
#include <jni.h>
#include <map>
#include <memory>
-#include <vector>
#include "base/android/scoped_java_ref.h"
#include "base/callback.h"
@@ -51,13 +50,12 @@ class WebApkInstaller : public net::URLFetcherDelegate {
// 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.
@@ -74,7 +72,7 @@ class WebApkInstaller : public net::URLFetcherDelegate {
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.
@@ -95,8 +93,7 @@ class WebApkInstaller : public net::URLFetcherDelegate {
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);
@@ -137,7 +134,7 @@ class WebApkInstaller : public net::URLFetcherDelegate {
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:
@@ -156,7 +153,7 @@ class WebApkInstaller : public net::URLFetcherDelegate {
// 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_;

Powered by Google App Engine
This is Rietveld 408576698