Commit e0779ac5 authored by Michael Thiessen's avatar Michael Thiessen Committed by Commit Bot

Revert changes to CookieManagerStartupTest#testStartup

https://chromium-review.googlesource.com/c/chromium/src/+/1901591 made
the test useless by changing the initialization order it was meant to
test. That change is no longer necessary as scheme registration happens
at JNI_Onload, so it can be reverted.

Bug: 783819
Change-Id: I7543eee8e42c13cf2b675d97e29ef3cd14669e9c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2095558Reviewed-by: default avatarRichard Coles <torne@chromium.org>
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748380}
parent 6161a5e3
......@@ -83,10 +83,6 @@ public class CookieManagerStartupTest {
public void testStartup() throws Throwable {
TestWebServer webServer = TestWebServer.start();
try {
// This must come before usages of the AwCookieManager as this call initializes the
// scheme registry that the AwCookieManager uses (indirectly).
startChromium();
String path = "/cookie_test.html";
String url = webServer.setResponse(path, CommonResources.ABOUT_HTML, null);
......@@ -101,6 +97,7 @@ public class CookieManagerStartupTest {
cookieManager.setCookie(url, "count=41");
startChromium();
mActivityTestRule.loadUrlSync(
mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
mActivityTestRule.executeJavaScriptAndWaitForResult(mAwContents, mContentsClient,
......
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