4 files changed, 29 insertions, 25 deletions
diff --git a/webkit/tools/test_shell/mac/test_webview_delegate.mm b/webkit/tools/test_shell/mac/test_webview_delegate.mm
index 9ae7a80..8df8d40 100755
--- a/webkit/tools/test_shell/mac/test_webview_delegate.mm
+++ b/webkit/tools/test_shell/mac/test_webview_delegate.mm
@@ -27,15 +27,17 @@ using WebKit::WebRect;
   NSMenu* menu_;  // Non-owning
   BOOL menuItemWasChosen_;
 }
-- (id)initWithItems:(const std::vector<MenuItem>&)items forMenu:(NSMenu*)menu;
-- (void)addItem:(const MenuItem&)item;
+- (id)initWithItems:(const std::vector<WebMenuItem>&)items
+            forMenu:(NSMenu*)menu;
+- (void)addItem:(const WebMenuItem&)item;
 - (BOOL)menuItemWasChosen;
 - (void)menuItemSelected:(id)sender;
 @end
 
 @implementation MenuDelegate
 
-- (id)initWithItems:(const std::vector<MenuItem>&)items forMenu:(NSMenu*)menu {
+- (id)initWithItems:(const std::vector<WebMenuItem>&)items
+            forMenu:(NSMenu*)menu {
   if ((self = [super init])) {
     menu_ = menu;
     menuItemWasChosen_ = NO;
@@ -45,8 +47,8 @@ using WebKit::WebRect;
   return self;
 }
 
-- (void)addItem:(const MenuItem&)item {
-  if (item.type == MenuItem::SEPARATOR) {
+- (void)addItem:(const WebMenuItem&)item {
+  if (item.type == WebMenuItem::SEPARATOR) {
     [menu_ addItem:[NSMenuItem separatorItem]];
     return;
   }
@@ -55,7 +57,7 @@ using WebKit::WebRect;
   NSMenuItem* menu_item = [menu_ addItemWithTitle:title
                                            action:@selector(menuItemSelected:)
                                     keyEquivalent:@""];
-  [menu_item setEnabled:(item.enabled && item.type != MenuItem::GROUP)];
+  [menu_item setEnabled:(item.enabled && item.type != WebMenuItem::GROUP)];
   [menu_item setTarget:self];
 }
 
@@ -122,12 +124,12 @@ void TestWebViewDelegate::Show(WebWidget* webview,
 }
 
 // Display a HTML select menu.
-void TestWebViewDelegate::ShowWithItems(
+void TestWebViewDelegate::ShowAsPopupWithItems(
     WebWidget* webview,
     const WebRect& bounds,
     int item_height,
     int selected_index,
-    const std::vector<MenuItem>& items) {
+    const std::vector<WebMenuItem>& items) {
   // Populate the menu.
   NSMenu* menu = [[[NSMenu alloc] initWithTitle:@""] autorelease];
   [menu setAutoenablesItems:NO];
diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h
index e1692fe..03d7387 100644
--- a/webkit/tools/test_shell/test_webview_delegate.h
+++ b/webkit/tools/test_shell/test_webview_delegate.h
@@ -217,11 +217,11 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>,
   virtual void DidScrollRect(WebWidget* webwidget, int dx, int dy,
                              const WebKit::WebRect& clip_rect);
   virtual void Show(WebWidget* webview, WindowOpenDisposition disposition);
-  virtual void ShowWithItems(WebWidget* webwidget,
-                             const WebKit::WebRect& bounds,
-                             int item_height,
-                             int selected_index,
-                             const std::vector<MenuItem>& items);
+  virtual void ShowAsPopupWithItems(WebWidget* webwidget,
+                                    const WebKit::WebRect& bounds,
+                                    int item_height,
+                                    int selected_index,
+                                    const std::vector<WebMenuItem>& items);
   virtual void CloseWidgetSoon(WebWidget* webwidget);
   virtual void Focus(WebWidget* webwidget);
   virtual void Blur(WebWidget* webwidget);
diff --git a/webkit/tools/test_shell/test_webview_delegate_gtk.cc b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
index ef92a3b..b389c6f 100755
--- a/webkit/tools/test_shell/test_webview_delegate_gtk.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_gtk.cc
@@ -115,12 +115,13 @@ void TestWebViewDelegate::Show(WebWidget* webwidget,
   gtk_widget_show_all(window);
 }
 
-void TestWebViewDelegate::ShowWithItems(WebWidget* webwidget,
-                                        const WebRect& bounds,
-                                        int item_height,
-                                        int selected_index,
-                                        const std::vector<MenuItem>& items) {
-  NOTIMPLEMENTED();
+void TestWebViewDelegate::ShowAsPopupWithItems(
+    WebWidget* webwidget,
+    const WebRect& bounds,
+    int item_height,
+    int selected_index,
+    const std::vector<WebMenuItem>& items) {
+  NOTREACHED();
 }
 
 void TestWebViewDelegate::CloseWidgetSoon(WebWidget* webwidget) {
diff --git a/webkit/tools/test_shell/test_webview_delegate_win.cc b/webkit/tools/test_shell/test_webview_delegate_win.cc
index 125c1b2..16d84e9 100755
--- a/webkit/tools/test_shell/test_webview_delegate_win.cc
+++ b/webkit/tools/test_shell/test_webview_delegate_win.cc
@@ -81,12 +81,13 @@ void TestWebViewDelegate::Show(WebWidget* webwidget, WindowOpenDisposition) {
   }
 }
 
-void TestWebViewDelegate::ShowWithItems(WebWidget* webwidget,
-                                        const WebRect& bounds,
-                                        int item_height,
-                                        int selected_index,
-                                        const std::vector<MenuItem>& items) {
-  NOTIMPLEMENTED();
+void TestWebViewDelegate::ShowAsPopupWithItems(
+    WebWidget* webwidget,
+    const WebRect& bounds,
+    int item_height,
+    int selected_index,
+    const std::vector<WebMenuItem>& items) {
+  NOTREACHED();
 }
 
 void TestWebViewDelegate::CloseWidgetSoon(WebWidget* webwidget) {