Move more web/tests

In order to move WebFrameTest we allow gfx::ScrollOffset
to be used from core/.

Bug: 712963
Change-Id: I8234af1f7fed70947c278f759b710053034368d9
Reviewed-on: https://chromium-review.googlesource.com/595021
Commit-Queue: Nicholas Verne <nverne@chromium.org>
Reviewed-by: Kent Tamura <tkent@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491189}

third_party/WebKit/PRESUBMIT.py

@@ -198,7 +198,7 @@ def _CheckForForbiddenNamespace(input_api, output_api):
     # This list is not exhaustive, but covers likely ones.
     chromium_namespaces = ["base", "cc", "content", "gfx", "net", "ui"]
     chromium_forbidden_classes = ["scoped_refptr"]
-    chromium_allowed_classes = ["gfx::ColorSpace", "gfx::CubicBezier", "gfx::ICCProfile"]
+    chromium_allowed_classes = ["gfx::ColorSpace", "gfx::CubicBezier", "gfx::ICCProfile", "gfx::ScrollOffset"]
 
     def source_file_filter(path):
         return input_api.FilterSourceFile(path,

third_party/WebKit/Source/core/BUILD.gn

@@ -1353,7 +1353,9 @@ jumbo_source_set("unit_tests") {
     "exported/WebDocumentTest.cpp",
     "exported/WebDragDataTest.cpp",
     "exported/WebElementTest.cpp",
+    "exported/WebFrameSerializerSanitizationTest.cpp",
     "exported/WebFrameSerializerTest.cpp",
+    "exported/WebFrameTest.cpp",
     "exported/WebHelperPluginTest.cpp",
     "exported/WebMeaningfulLayoutsTest.cpp",
     "exported/WebNodeTest.cpp",
@@ -1463,6 +1465,7 @@ jumbo_source_set("unit_tests") {
     "layout/LayoutBoxModelObjectTest.cpp",
     "layout/LayoutBoxTest.cpp",
     "layout/LayoutEmbeddedContentTest.cpp",
+    "layout/LayoutGeometryMapTest.cpp",
     "layout/LayoutInlineTest.cpp",
     "layout/LayoutMediaTest.cpp",
     "layout/LayoutMultiColumnFlowThreadTest.cpp",

third_party/WebKit/Source/web/tests/WebFrameTest.cpp → third_party/WebKit/Source/core/exported/WebFrameTest.cpp

@@ -96,8 +96,6 @@
 #include "core/testing/sim/SimDisplayItemList.h"
 #include "core/testing/sim/SimRequest.h"
 #include "core/testing/sim/SimTest.h"
-#include "modules/mediastream/MediaStream.h"
-#include "modules/mediastream/MediaStreamRegistry.h"
 #include "platform/Cursor.h"
 #include "platform/DragImage.h"
 #include "platform/KeyboardCodes.h"
@@ -5014,9 +5012,10 @@ TEST_P(ParameterizedWebFrameTest, FindDetachFrameBeforeScopeStrings) {
   WebString search_text = WebString::FromUTF8(kFindString);
   WebLocalFrameImpl* main_frame = web_view_helper.LocalMainFrame();
 
-  for (WebFrame* frame = main_frame; frame; frame = frame->TraverseNext())
+  for (WebFrame* frame = main_frame; frame; frame = frame->TraverseNext()) {
     EXPECT_TRUE(frame->ToWebLocalFrame()->Find(kFindIdentifier, search_text,
                                                options, false));
+  }
 
   RunPendingTasks();
   EXPECT_FALSE(client.FindResultsAreReady());
@@ -5053,9 +5052,10 @@ TEST_P(ParameterizedWebFrameTest, FindDetachFrameWhileScopingStrings) {
   WebString search_text = WebString::FromUTF8(kFindString);
   WebLocalFrameImpl* main_frame = web_view_helper.LocalMainFrame();
 
-  for (WebFrame* frame = main_frame; frame; frame = frame->TraverseNext())
+  for (WebFrame* frame = main_frame; frame; frame = frame->TraverseNext()) {
     EXPECT_TRUE(frame->ToWebLocalFrame()->Find(kFindIdentifier, search_text,
                                                options, false));
+  }
 
   RunPendingTasks();
   EXPECT_FALSE(client.FindResultsAreReady());
@@ -5096,9 +5096,10 @@ TEST_P(ParameterizedWebFrameTest, ResetMatchCount) {
   // Check that child frame exists.
   EXPECT_TRUE(!!main_frame->TraverseNext());
 
-  for (WebFrame* frame = main_frame; frame; frame = frame->TraverseNext())
+  for (WebFrame* frame = main_frame; frame; frame = frame->TraverseNext()) {
     EXPECT_FALSE(frame->ToWebLocalFrame()->Find(kFindIdentifier, search_text,
                                                 options, false));
+  }
 
   RunPendingTasks();
   EXPECT_FALSE(client.FindResultsAreReady());
@@ -6077,11 +6078,12 @@ class CompositedSelectionBoundsTest : public ParameterizedWebFrameTest {
     // selection behavior. However, such deviations from the expected value
     // should be consistent for the corresponding y coordinates.
     int y_bottom_epsilon = 0;
-    if (expected_result.Length() == 13)
+    if (expected_result.Length() == 13) {
       y_bottom_epsilon = expected_result.Get(context, 12)
                              .ToLocalChecked()
                              .As<v8::Int32>()
                              ->Value();
+    }
     int y_bottom_deviation =
         start_edge_bottom_in_layer_y - select_start->edge_bottom_in_layer.y;
     EXPECT_GE(y_bottom_epsilon, std::abs(y_bottom_deviation));
@@ -6710,11 +6712,11 @@ TEST_P(ParameterizedWebFrameTest, RemoveSpellingMarkersUnderWords) {
   document->execCommand("InsertText", false, " wellcome ", exception_state);
   EXPECT_FALSE(exception_state.HadException());
 
-  if (RuntimeEnabledFeatures::IdleTimeSpellCheckingEnabled())
+  if (RuntimeEnabledFeatures::IdleTimeSpellCheckingEnabled()) {
     frame->GetSpellChecker()
         .GetIdleSpellCheckCallback()
         .ForceInvocationForTesting();
-
+  }
   WebVector<unsigned> offsets1;
   GetSpellingMarkerOffsets(&offsets1, *frame->GetDocument());
   EXPECT_EQ(1U, offsets1.size());
@@ -6758,9 +6760,10 @@ class StubbornTextCheckClient : public WebTextCheckClient {
     if (!completion_)
       return;
     Vector<WebTextCheckingResult> results;
-    if (misspelling_start_offset >= 0 && misspelling_length > 0)
+    if (misspelling_start_offset >= 0 && misspelling_length > 0) {
       results.push_back(WebTextCheckingResult(type, misspelling_start_offset,
                                               misspelling_length));
+    }
     completion_->DidFinishCheckingText(results);
     completion_ = 0;
   }
@@ -7022,8 +7025,8 @@ TEST_P(ParameterizedWebFrameTest, DidAccessInitialDocumentViaJavascriptUrl) {
   web_view_helper.Reset();
 }
 
-TEST_P(ParameterizedWebFrameTest, DidAccessInitialDocumentBodyBeforeModalDialog)
-{
+TEST_P(ParameterizedWebFrameTest,
+       DidAccessInitialDocumentBodyBeforeModalDialog) {
   TestAccessInitialDocumentWebFrameClient web_frame_client;
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.Initialize(&web_frame_client);
@@ -7055,8 +7058,7 @@ TEST_P(ParameterizedWebFrameTest, DidAccessInitialDocumentBodyBeforeModalDialog)
   web_view_helper.Reset();
 }
 
-TEST_P(ParameterizedWebFrameTest, DidWriteToInitialDocumentBeforeModalDialog)
-{
+TEST_P(ParameterizedWebFrameTest, DidWriteToInitialDocumentBeforeModalDialog) {
   TestAccessInitialDocumentWebFrameClient web_frame_client;
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.Initialize(&web_frame_client);
@@ -7793,13 +7795,11 @@ TEST_P(ParameterizedWebFrameTest, FirstNonBlankSubframeNavigation) {
   WebLocalFrame* frame = web_view_helper.LocalMainFrame();
 
   std::string url1 = base_url_ + "history.html";
-  FrameTestHelpers::LoadFrame(
-      frame,
+  std::string load_frame_js =
       "javascript:var f = document.createElement('iframe'); "
-      "f.src = '" +
-          url1 +
-          "';"
-          "document.body.appendChild(f)");
+      "f.src = '";
+  load_frame_js += url1 + "';" + "document.body.appendChild(f)";
+  FrameTestHelpers::LoadFrame(frame, load_frame_js);
 
   WebLocalFrame* iframe = frame->FirstChild()->ToWebLocalFrame();
   EXPECT_EQ(url1, iframe->GetDocument().Url().GetString().Utf8());

third_party/WebKit/Source/web/BUILD.gn

@@ -69,11 +69,8 @@ test("webkit_unit_tests") {
     # FIXME: Move the tests from web/tests/ to appropriate places.
     # crbug.com/353585
 
-    "tests/LayoutGeometryMapTest.cpp",
     "tests/RunAllTests.cpp",
     "tests/VirtualTimeTest.cpp",
-    "tests/WebFrameSerializerSanitizationTest.cpp",
-    "tests/WebFrameTest.cpp",
   ]
   sources += bindings_unittest_files