diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/weblayer/browser/weblayer_impl_android.cc | |
parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
download | qtwebengine-chromium-85-based.tar.gz |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/weblayer/browser/weblayer_impl_android.cc')
-rw-r--r-- | chromium/weblayer/browser/weblayer_impl_android.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/weblayer/browser/weblayer_impl_android.cc b/chromium/weblayer/browser/weblayer_impl_android.cc index 3f54f31edf7..d07dc34ef0e 100644 --- a/chromium/weblayer/browser/weblayer_impl_android.cc +++ b/chromium/weblayer/browser/weblayer_impl_android.cc @@ -13,6 +13,7 @@ #include "weblayer/browser/java/jni/WebLayerImpl_jni.h" #include "weblayer/browser/url_bar/page_info_client_impl.h" #include "weblayer/browser/user_agent.h" +#include "weblayer/common/crash_reporter/crash_keys.h" using base::android::JavaParamRef; @@ -30,7 +31,7 @@ static jboolean JNI_WebLayerImpl_IsRemoteDebuggingEnabled(JNIEnv* env) { static void JNI_WebLayerImpl_SetIsWebViewCompatMode(JNIEnv* env, jboolean value) { static crash_reporter::CrashKeyString<1> crash_key( - "WEBLAYER_WEB_VIEW_COMPAT_MODE"); + crash_keys::kWeblayerWebViewCompatMode); crash_key.Set(value ? "1" : "0"); } @@ -44,7 +45,6 @@ static void JNI_WebLayerImpl_RegisterExternalExperimentIDs( JNIEnv* env, const JavaParamRef<jstring>& jtrial_name, const JavaParamRef<jintArray>& jexperiment_ids) { - const std::string trial_name_utf8(ConvertJavaStringToUTF8(env, jtrial_name)); std::vector<int> experiment_ids; // A null |jexperiment_ids| is the same as an empty list. if (jexperiment_ids) { @@ -52,8 +52,8 @@ static void JNI_WebLayerImpl_RegisterExternalExperimentIDs( &experiment_ids); } - WebLayerMetricsServiceClient::GetInstance() - ->RegisterSyntheticMultiGroupFieldTrial(trial_name_utf8, experiment_ids); + WebLayerMetricsServiceClient::GetInstance()->RegisterExternalExperiments( + experiment_ids); } base::string16 GetClientApplicationName() { |