Remove the Menu object, converting all the remaining callers to use Menu2. I'...

chrome/browser/tab_contents/tab_contents_view_win.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/tab_contents/tab_contents_view_win.h"
 
 #include <windows.h>
 
 #include "app/gfx/canvas.h"
 #include "app/os_exchange_data.h"
@@ skipping 376 matching lines @@
   // Any unhandled keyboard/character messages should be defproced.
   // This allows stuff like Alt+F4, etc to work correctly.
   DefWindowProc(event.os_event.hwnd,
                 event.os_event.message,
                 event.os_event.wParam,
                 event.os_event.lParam);
 }
 
 void TabContentsViewWin::ShowContextMenu(const ContextMenuParams& params) {
   // Allow delegates to handle the context menu operation first.
-  if (tab_contents()->delegate()->HandleContextMenu(params)) {
+  if (tab_contents()->delegate()->HandleContextMenu(params))
     return;
-  }
 
-  RenderViewContextMenuWin menu(tab_contents(),
-                                params,
-                                GetNativeView());
-
-  menu.Init();
+  context_menu_.reset(new RenderViewContextMenuWin(tab_contents(), params));
 
   POINT screen_pt = { params.x, params.y };
   MapWindowPoints(GetNativeView(), HWND_DESKTOP, &screen_pt, 1);
 
   // Enable recursive tasks on the message loop so we can get updates while
   // the context menu is being displayed.
   bool old_state = MessageLoop::current()->NestableTasksAllowed();
   MessageLoop::current()->SetNestableTasksAllowed(true);
-  menu.RunMenuAt(screen_pt.x, screen_pt.y);
+  context_menu_->RunMenuAt(screen_pt.x, screen_pt.y);
   MessageLoop::current()->SetNestableTasksAllowed(old_state);
 }
 
 void TabContentsViewWin::OnHScroll(int scroll_type, short position,
                                    HWND scrollbar) {
   ScrollCommon(WM_HSCROLL, scroll_type, position, scrollbar);
 }
 
 void TabContentsViewWin::OnMouseLeave() {
   // Let our delegate know that the mouse moved (useful for resetting status
@@ skipping 187 matching lines @@
   }
   return false;
 }
 
 void TabContentsViewWin::WheelZoom(int distance) {
   if (tab_contents()->delegate()) {
     bool zoom_in = distance > 0;
     tab_contents()->delegate()->ContentsZoomChange(zoom_in);
   }
 }