Fix WPT shell test failure

It is not clear why this only fails on L/M, but
BiMap#remove(Object) is derived from Map#remove(Object) and should
only accept key as parameter.

Bug: 1010552
Change-Id: I00bf337ac1eb88f4868558e8a795f0d131c42657
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1838158Reviewed-by: Nate Fischer <ntfschr@chromium.org>
Commit-Queue: Changwan Ryu <changwan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#702627}

android_webview/tools/system_webview_shell/apk/src/org/chromium/webview_shell/WebPlatformTestsActivity.java

@@ -176,7 +176,7 @@ public class WebPlatformTestsActivity extends Activity {
         if (parent != null) parent.removeView(childLayout);
         WebView childWebView = mLayoutToWebViewBiMap.get(childLayout);
         removeAndDestroyWebView(childWebView);
-        mLayoutToWebViewBiMap.remove(childLayout, childWebView);
+        mLayoutToWebViewBiMap.remove(childLayout);
         if (mTestCallback != null) mTestCallback.onChildLayoutRemoved();
     }
 

android_webview/tools/system_webview_shell/layout_tests/src/org/chromium/webview_shell/test/WebPlatformTestsActivityTest.java

@@ -19,7 +19,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.BaseJUnit4ClassRunner;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.webview_shell.WebPlatformTestsActivity;
 
 import java.util.ArrayList;
@@ -73,7 +72,6 @@ public class WebPlatformTestsActivityTest {
 
     @Test
     @MediumTest
-    @DisabledTest(message = "crbug.com/1010552")
     public void testOpenCloseWindow() throws Exception {
         final BlockingQueue<Integer> queue = new LinkedBlockingQueue<>();
 
@@ -99,7 +97,6 @@ public class WebPlatformTestsActivityTest {
 
     @Test
     @MediumTest
-    @DisabledTest(message = "crbug.com/1010552")
     public void testNestedOpensAndCloses() throws Exception {
         final BlockingQueue<Integer> queue = new LinkedBlockingQueue<>();
         final int depthToTest = 3;