Updating MakeMenuItemStringsFor() to test icon attribute of menuitems.

content/shell/renderer/test_runner/event_sender.cc

 // 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 "content/shell/renderer/test_runner/event_sender.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "content/public/common/page_zoom.h"
@@ skipping 135 matching lines @@
   for (size_t i = 0; i < customItems.size(); ++i) {
     std::string prefixCopy = prefix;
     if (!customItems[i].enabled)
         prefixCopy = kDisabledIdentifier + prefix;
     if (customItems[i].checked)
         prefixCopy = kCheckedIdentifier + prefix;
     if (customItems[i].type == blink::WebMenuItemInfo::Separator) {
       strings->push_back(prefixCopy + kSeparatorIdentifier);
     } else if (customItems[i].type == blink::WebMenuItemInfo::SubMenu) {
       strings->push_back(prefixCopy + customItems[i].label.utf8() +
-          kSubMenuIdentifier);
+          customItems[i].icon.utf8() + kSubMenuIdentifier);
       PopulateCustomItems(customItems[i].subMenuItems, prefixCopy +
           kSubMenuDepthIdentifier, strings);
     } else {
-      strings->push_back(prefixCopy + customItems[i].label.utf8());
+      strings->push_back(prefixCopy + customItems[i].label.utf8() +
+          customItems[i].icon.utf8());
     }
   }
 }
 
 // Because actual context menu is implemented by the browser side,
 // this function does only what LayoutTests are expecting:
 // - Many test checks the count of items. So returning non-zero value makes
 // sense.
 // - Some test compares the count before and after some action. So changing the
 // count based on flags also makes sense. This function is doing such for some
@@ skipping 2181 matching lines @@
 
 bool EventSender::HandleInputEventOnViewOrPopup(const WebInputEvent& event) {
   if (WebPagePopup* popup = view_->pagePopup()) {
     if (!WebInputEvent::isKeyboardEventType(event.type))
       return popup->handleInputEvent(event);
   }
   return view_->handleInputEvent(event);
 }
 
 }  // namespace content