Skip to content

GitLab

T
tangled
Commit 739d3df6 authored by Scott Violet's avatar Scott Violet Committed by Chromium LUCI CQ
Browse files
Options

weblayer: remove unused argument in registering ids 

The name hasn't been needed for a while. This drops it from
the API (but not the aidl). This is an incompatible change to
the client library, but is backward compatible as the name
hasn't been needed since 84 (
https://chromium-review.googlesource.com/c/chromium/src/+/2324172 )

BUG=1154283
TEST=covered by tests

Change-Id: Iabbbd524ecb105b079805fb73e65ec23feda9aac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2580679Reviewed-by: default avatarJohn Abd-El-Malek <jam@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835242}
parent 86953b62
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
weblayer/browser/android/javatests/src/org/chromium/weblayer/test/RegisterExternalExperimentIdsTest.java
View file @ 739d3df6
......@@ -49,7 +49,7 @@ public class RegisterExternalExperimentIdsTest {
mActivityTestRule.navigateAndWait(url);
String initialValue = testServer.getLastRequest("/ok.html").headerValue("X-Client-Data");
runOnUiThreadBlocking(() -> {
mActivityTestRule.getWebLayer().registerExternalExperimentIDs("Test", new int[] {1});
mActivityTestRule.getWebLayer().registerExternalExperimentIDs(new int[] {1});
});
String url2 = testServer.setResponse("/ok2.html", "<html>ok</html>", null);
......
weblayer/browser/java/org/chromium/weblayer_private/WebLayerImpl.java
View file @ 739d3df6
......@@ -487,7 +487,7 @@ public final class WebLayerImpl extends IWebLayer.Stub {
@Override
public void registerExternalExperimentIDs(String trialName, int[] experimentIDs) {
StrictModeWorkaround.apply();
WebLayerImplJni.get().registerExternalExperimentIDs(trialName, experimentIDs);
WebLayerImplJni.get().registerExternalExperimentIDs(experimentIDs);
}
@Override
......@@ -914,7 +914,7 @@ public final class WebLayerImpl extends IWebLayer.Stub {
boolean isRemoteDebuggingEnabled();
void setIsWebViewCompatMode(boolean value);
String getUserAgentString();
void registerExternalExperimentIDs(String trialName, int[] experimentIDs);
void registerExternalExperimentIDs(int[] experimentIDs);
boolean isLocationPermissionManaged(String origin);
}
}
weblayer/browser/weblayer_impl_android.cc
View file @ 739d3df6
......@@ -45,7 +45,6 @@ JNI_WebLayerImpl_GetUserAgentString(JNIEnv* env) {
static void JNI_WebLayerImpl_RegisterExternalExperimentIDs(
JNIEnv* env,
const JavaParamRef<jstring>& jtrial_name,
const JavaParamRef<jintArray>& jexperiment_ids) {
std::vector<int> experiment_ids;
// A null |jexperiment_ids| is the same as an empty list.
......
weblayer/public/java/org/chromium/weblayer/WebLayer.java
View file @ 739d3df6
......@@ -585,11 +585,12 @@ public class WebLayer {
*
* @since 84
*/
public void registerExternalExperimentIDs(
@NonNull String trialName, @NonNull int[] experimentIds) {
public void registerExternalExperimentIDs(@NonNull int[] experimentIds) {
ThreadCheck.ensureOnUiThread();
try {
mImpl.registerExternalExperimentIDs(trialName, experimentIds);
// First param no longer used. First param was not used in the backend as of 85, and
// always supplied as empty as of 89 client.
mImpl.registerExternalExperimentIDs("", experimentIds);
} catch (RemoteException e) {
throw new APICallException(e);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment