Convert NativeTextFieldViews context menu from Menu2 to MenuItemView.

views/controls/textfield/native_textfield_views_unittest.cc

 // Copyright (c) 2011 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 "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/pickle.h"
@@ skipping 170 matching lines @@
 
     input_method_ = new MockInputMethod();
     widget_->native_widget()->ReplaceInputMethod(input_method_);
 
     // Assumes the Widget is always focused.
     input_method_->OnFocus();
 
     textfield_->RequestFocus();
   }
 
-  views::Menu2* GetContextMenu() {
-    textfield_view_->InitContextMenuIfRequired();
-    return textfield_view_->context_menu_menu_.get();
+  ui::MenuModel* GetContextMenuModel() {
+    textfield_view_->UpdateContextMenu();
+    return textfield_view_->context_menu_contents_.get();
   }
 
  protected:
   void SendKeyEvent(ui::KeyboardCode key_code,
                     bool shift,
                     bool control,
                     bool capslock) {
     int flags = (shift ? ui::EF_SHIFT_DOWN : 0) |
         (control ? ui::EF_CONTROL_DOWN : 0) |
         (capslock ? ui::EF_CAPS_LOCK_DOWN : 0);
@@ skipping 326 matching lines @@
   EXPECT_EQ(textfield_has_selection, menu_model->IsEnabledAt(3 /* DELETE */));
   string16 str;
   views::ViewsDelegate::views_delegate->GetClipboard()->
       ReadText(ui::Clipboard::BUFFER_STANDARD, &str);
   EXPECT_NE(str.empty(), menu_model->IsEnabledAt(2 /* PASTE */));
 }
 
 TEST_F(NativeTextfieldViewsTest, ContextMenuDisplayTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   textfield_->SetText(ASCIIToUTF16("hello world"));
-  EXPECT_TRUE(GetContextMenu());
-  VerifyTextfieldContextMenuContents(false, GetContextMenu()->model());
+  EXPECT_TRUE(GetContextMenuModel());
+  VerifyTextfieldContextMenuContents(false, GetContextMenuModel());
 
   textfield_->SelectAll();
-  VerifyTextfieldContextMenuContents(true, GetContextMenu()->model());
+  VerifyTextfieldContextMenuContents(true, GetContextMenuModel());
 }
 
 TEST_F(NativeTextfieldViewsTest, DoubleAndTripleClickTest) {
   InitTextfield(Textfield::STYLE_DEFAULT);
   textfield_->SetText(ASCIIToUTF16("hello world"));
   MouseEvent click(ui::ET_MOUSE_PRESSED, 0, 0, ui::EF_LEFT_BUTTON_DOWN);
   MouseEvent release(ui::ET_MOUSE_RELEASED, 0, 0, ui::EF_LEFT_BUTTON_DOWN);
   MouseEvent double_click(ui::ET_MOUSE_PRESSED, 0, 0,
                           ui::EF_LEFT_BUTTON_DOWN | ui::EF_IS_DOUBLE_CLICK);
 
@@ skipping 522 matching lines @@
   EXPECT_STR_EQ("a23", textfield_->text());
   SendKeyEvent(ui::VKEY_B);
   EXPECT_STR_EQ("ab3", textfield_->text());
   SendKeyEvent(ui::VKEY_Z, false, true);
   EXPECT_STR_EQ("123", textfield_->text());
   SendKeyEvent(ui::VKEY_Y, false, true);
   EXPECT_STR_EQ("ab3", textfield_->text());
 }
 
 }  // namespace views