Fix RemoteToLocalSwapOnMainFrameInitializesCoreFrame to not crash on Android.

Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2288 matching lines @@
             EXPECT_EQ(initialPageScaleFactor, webViewHelper.webViewImpl()->pageScaleFactor());
             EXPECT_EQ(expectedScrollOffset, webViewHelper.webViewImpl()->mainFrame()->scrollOffset());
         }
     }
 };
 
 INSTANTIATE_TEST_CASE_P(All, WebFrameResizeTest, ::testing::Values(
     ParameterizedWebFrameTestConfig::Default,
     ParameterizedWebFrameTestConfig::RootLayerScrolls));
 
-// Fails on Android: https://crbug.com/528186
-#if OS(ANDROID)
-TEST_P(WebFrameResizeTest, DISABLED_ResizeYieldsCorrectScrollAndScaleForWidthEqualsDeviceWidth)
-#else
 TEST_P(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForWidthEqualsDeviceWidth)
-#endif
 {
     // With width=device-width, pageScaleFactor is preserved across resizes as
     // long as the content adjusts according to the device-width.
     const char* url = "resize_scroll_mobile.html";
     const float initialPageScaleFactor = 1;
     const WebSize scrollOffset(0, 50);
     const WebSize viewportSize(120, 160);
     const bool shouldScaleRelativeToViewportWidth = true;
 
     testResizeYieldsCorrectScrollAndScale(
         url, initialPageScaleFactor, scrollOffset, viewportSize, shouldScaleRelativeToViewportWidth);
 }
 
-// Fails on Android: https://crbug.com/528186
-#if OS(ANDROID)
-TEST_P(WebFrameResizeTest, DISABLED_ResizeYieldsCorrectScrollAndScaleForMinimumScale)
-#else
 TEST_P(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForMinimumScale)
-#endif
 {
     // This tests a scenario where minimum-scale is set to 1.0, but some element
     // on the page is slightly larger than the portrait width, so our "natural"
     // minimum-scale would be lower. In that case, we should stick to 1.0 scale
     // on rotation and not do anything strange.
     const char* url = "resize_scroll_minimum_scale.html";
     const float initialPageScaleFactor = 1;
     const WebSize scrollOffset(0, 0);
     const WebSize viewportSize(240, 320);
     const bool shouldScaleRelativeToViewportWidth = false;
 
     testResizeYieldsCorrectScrollAndScale(
         url, initialPageScaleFactor, scrollOffset, viewportSize, shouldScaleRelativeToViewportWidth);
 }
 
-// Fails on Android: https://crbug.com/528186
-#if OS(ANDROID)
-TEST_P(WebFrameResizeTest, DISABLED_ResizeYieldsCorrectScrollAndScaleForFixedWidth)
-#else
 TEST_P(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForFixedWidth)
-#endif
 {
     // With a fixed width, pageScaleFactor scales by the relative change in viewport width.
     const char* url = "resize_scroll_fixed_width.html";
     const float initialPageScaleFactor = 2;
     const WebSize scrollOffset(0, 200);
     const WebSize viewportSize(240, 320);
     const bool shouldScaleRelativeToViewportWidth = true;
 
     testResizeYieldsCorrectScrollAndScale(
         url, initialPageScaleFactor, scrollOffset, viewportSize, shouldScaleRelativeToViewportWidth);
 }
 
-// Fails on Android: https://crbug.com/528186
-#if OS(ANDROID)
-TEST_P(WebFrameResizeTest, DISABLED_ResizeYieldsCorrectScrollAndScaleForFixedLayout)
-#else
 TEST_P(WebFrameResizeTest, ResizeYieldsCorrectScrollAndScaleForFixedLayout)
-#endif
 {
     // With a fixed layout, pageScaleFactor scales by the relative change in viewport width.
     const char* url = "resize_scroll_fixed_layout.html";
     const float initialPageScaleFactor = 2;
     const WebSize scrollOffset(200, 400);
     const WebSize viewportSize(320, 240);
     const bool shouldScaleRelativeToViewportWidth = true;
 
     testResizeYieldsCorrectScrollAndScale(
         url, initialPageScaleFactor, scrollOffset, viewportSize, shouldScaleRelativeToViewportWidth);
@@ skipping 5426 matching lines @@
     }
 
     FixedLayoutTestWebViewClient m_client;
     FrameTestHelpers::WebViewHelper m_webViewHelper;
 };
 
 INSTANTIATE_TEST_CASE_P(All, ViewportOnResizeTest, ::testing::Values(
     ParameterizedWebFrameTestConfig::Default,
     ParameterizedWebFrameTestConfig::RootLayerScrolls));
 
-// Fails on Android: https://crbug.com/528186
-#if OS(ANDROID)
-TEST_P(ViewportOnResizeTest, DISABLED_ViewportInvalidatedOnResizeWithEmulation)
-#else
 TEST_P(ViewportOnResizeTest, ViewportInvalidatedOnResizeWithEmulation)
-#endif
 {
     WebDeviceEmulationParams params;
     params.screenPosition = WebDeviceEmulationParams::Mobile;
     m_webViewHelper.webView()->enableDeviceEmulation(params);
 
     testResize(WebSize(700, 500), "300x300");
     testResize(WebSize(710, 500), "400x300");
     testResize(WebSize(690, 500), "200x300");
     testResize(WebSize(700, 510), "300x400");
     testResize(WebSize(700, 490), "300x200");
@@ skipping 81 matching lines @@
     // Finally, make sure an embedder triggered load in the local frame swapped
     // back in works.
     registerMockedHttpURLLoad("send_beacon.html");
     registerMockedHttpURLLoad("reload_post.html"); // url param to sendBeacon()
     FrameTestHelpers::loadFrame(localFrame, m_baseURL + "send_beacon.html");
 
     view->close();
 }
 
 // See https://crbug.com/525285.
-// Fails on Android: https://crbug.com/528186
-#if OS(ANDROID)
-TEST_P(ParameterizedWebFrameTest, DISABLED_RemoteToLocalSwapOnMainFrameInitializesCoreFrame)
-#else
 TEST_P(ParameterizedWebFrameTest, RemoteToLocalSwapOnMainFrameInitializesCoreFrame)
-#endif
 {
     FrameTestHelpers::TestWebViewClient viewClient;
     FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
     WebView* view = WebView::create(&viewClient);
     view->setMainFrame(remoteClient.frame());
     WebRemoteFrame* remoteRoot = view->mainFrame()->toWebRemoteFrame();
     remoteRoot->setReplicatedOrigin(SecurityOrigin::createUnique());
 
     FrameTestHelpers::TestWebFrameClient localFrameClient;
     remoteRoot->createLocalChild(WebTreeScopeType::Document, "", WebSandboxFlags::None, &localFrameClient, nullptr);
 
     // Do a remote-to-local swap of the top frame.
     FrameTestHelpers::TestWebFrameClient localClient;
     WebLocalFrame* localRoot = WebLocalFrame::create(WebTreeScopeType::Document, &localClient);
     localRoot->initializeToReplaceRemoteFrame(remoteRoot, "", WebSandboxFlags::None);
     remoteRoot->swap(localRoot);
 
     // Load a page with a child frame in the new root to make sure this doesn't
     // crash when the child frame invokes setCoreFrame.
-    FrameTestHelpers::loadFrame(localRoot, "data:text/html,<iframe></iframe>");
+    registerMockedHttpURLLoad("single_iframe.html");
+    registerMockedHttpURLLoad("visible_iframe.html");
+    FrameTestHelpers::loadFrame(localRoot, m_baseURL + "single_iframe.html");
 
     view->close();
 }
 
 class OverscrollWebViewClient : public FrameTestHelpers::TestWebViewClient {
 public:
     MOCK_METHOD4(didOverscroll, void(const WebFloatSize&, const WebFloatSize&, const WebFloatPoint&, const WebFloatSize&));
 };
 
 class WebFrameOverscrollTest : public WebFrameTest {
@@ skipping 268 matching lines @@
 
 TEST_F(WebFrameTest, MaxFramesDetach)
 {
     registerMockedHttpURLLoad("max-frames-detach.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "max-frames-detach.html", true);
     webViewImpl->mainFrameImpl()->collectGarbage();
 }
 
 } // namespace blink