Change <menuitem> parsing rules to match spec

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/page/ContextMenuController.h"
 
 #include "core/clipboard/DataTransfer.h"
 #include "core/events/MouseEvent.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
@@ skipping 23 matching lines @@
 };
 
 TEST_F(ContextMenuControllerTest, TestCustomMenu) {
   GetDocument().GetSettings()->SetScriptEnabled(true);
   // Load the the test page.
   SetBodyInnerHTML(
       "<button id=\"button_id\" contextmenu=\"menu_id\" style=\"height: 100px; "
       "width: 100px;\">"
       "<menu type=\"context\" id=\"menu_id\">"
       "<menuitem label=\"Item1\" onclick='document.title = \"Title 1\";'>"
+      "</menuitem>"
       "<menuitem label=\"Item2\" onclick='document.title = \"Title 2\";'>"
+      "</menuitem>"
       "<menuitem label=\"Item3\" onclick='document.title = \"Title 3\";'>"
+      "</menuitem>"
       "<menu label='Submenu'>"
       "<menuitem label=\"Item4\" onclick='document.title = \"Title 4\";'>"
+      "</menuitem>"
       "<menuitem label=\"Item5\" onclick='document.title = \"Title 5\";'>"
+      "</menuitem>"
       "<menuitem label=\"Item6\" onclick='document.title = \"Title 6\";'>"
+      "</menuitem>"
       "</menu>"
       "<menuitem id=\"item7\" type=\"checkbox\" checked label=\"Item7\""
       "onclick='if "
       "(document.getElementById(\"item7\").hasAttribute(\"checked\"))"
       "document.title = \"Title 7 checked\"; else document.title = \"Title 7 "
       "not checked\";'>"
+      "</menuitem>"
       "<menuitem id=\"item8\" type=\"radio\" radiogroup=\"group\" "
       "label=\"Item8\""
       "onclick='if "
       "(document.getElementById(\"item8\").hasAttribute(\"checked\"))"
       "document.title = \"Title 8 checked\"; else if "
       "(document.getElementById(\"item9\").hasAttribute(\"checked\"))"
       "document.title = \"Title 8 not checked and Title 9 checked\";'>"
+      "</menuitem>"
       "<menuitem id=\"item9\" type=\"radio\" radiogroup=\"group\" checked "
       "label=\"Item9\""
       "onclick='if "
       "(document.getElementById(\"item9\").hasAttribute(\"checked\"))"
       "document.title = \"Title 9 checked\"; else document.title = \"Title 9 "
       "not checked\";'>"
+      "</menuitem>"
       "<menuitem id=\"item10\" type=\"radio\" radiogroup=\"group\" "
       "label=\"Item10\""
       "onclick='if "
       "(document.getElementById(\"item10\").hasAttribute(\"checked\"))"
       "document.title = \"Title 10 checked\"; else if "
       "(document.getElementById(\"item8\").hasAttribute(\"checked\"))"
       "document.title = \"Title 10 not checked and Title 8 checked\";'>"
+      "</menuitem>"
       "</menu>"
       "</button>");
 
   MouseEventInit mouse_initializer;
   mouse_initializer.setView(GetDocument().domWindow());
   mouse_initializer.setScreenX(50);
   mouse_initializer.setScreenY(50);
   mouse_initializer.setButton(1);
 
   // Create right button click event and pass it to context menu controller.
@@ skipping 43 matching lines @@
       &items[5]);
   EXPECT_STREQ("Title 8 not checked and Title 9 checked",
                GetDocument().title().Utf8().Data());
   GetDocument().GetPage()->GetContextMenuController().ContextMenuItemSelected(
       &items[7]);
   EXPECT_STREQ("Title 10 not checked and Title 8 checked",
                GetDocument().title().Utf8().Data());
 }
 
 }  // namespace blink