Relanding [Android] Adding Smart GO/NEXT feature in Chrome

third_party/WebKit/Source/core/page/FocusControllerTest.cpp

Index: third_party/WebKit/Source/core/page/FocusControllerTest.cpp
diff --git a/third_party/WebKit/Source/core/page/FocusControllerTest.cpp b/third_party/WebKit/Source/core/page/FocusControllerTest.cpp
index bb96315b9125c70eee6e9a3b693d52104ad8a96b..3639f3619bd1002e40f03e3d24fd9b5e01feb9ed 100644
--- a/third_party/WebKit/Source/core/page/FocusControllerTest.cpp
+++ b/third_party/WebKit/Source/core/page/FocusControllerTest.cpp
@@ -94,4 +94,30 @@ TEST_F(FocusControllerTest, SetActiveOnInactiveDocument) {
   PageHolder()->GetPage().GetFocusController().SetActive(true);
 }
 
+// This test is for crbug.com/733218
+TEST_F(FocusControllerTest, SVGFocusableElementInForm) {
+  GetDocument().body()->setInnerHTML(
+      "<form>"
+      "<input id='first'>"
+      "<svg width='100px' height='100px' tabindex='0'>"
+      "<circle cx='50' cy='50' r='30' />"
+      "</svg>"
+      "<input id='last'>"
+      "</form>");
+
+  Element* form = ToElement(GetDocument().body()->firstChild());
+  Element* first = ToElement(form->firstChild());
+  Element* last = ToElement(form->lastChild());
+
+  Element* next = GetFocusController().NextFocusableElementInForm(
+      first, kWebFocusTypeForward);
+  EXPECT_EQ(next, last)
+      << "SVG Element should be skipped even when focusable in form.";
+
+  Element* prev = GetFocusController().NextFocusableElementInForm(
+      next, kWebFocusTypeBackward);
+  EXPECT_EQ(prev, first)
+      << "SVG Element should be skipped even when focusable in form.";
+}
+
 }  // namespace blink