Convert NativeTextFieldViews context menu from Menu2 to MenuItemView.

views/controls/textfield/native_textfield_views_unittest.cc

Index: views/controls/textfield/native_textfield_views_unittest.cc
diff --git a/views/controls/textfield/native_textfield_views_unittest.cc b/views/controls/textfield/native_textfield_views_unittest.cc
index 6307d6b1a58e32201b95d04d297e63e889ba86c6..30ff8e8bcc48b354f4147376840febd5d905251b 100644
--- a/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/views/controls/textfield/native_textfield_views_unittest.cc
@@ -188,9 +188,9 @@ class NativeTextfieldViewsTest : public ViewsTestBase,
     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:
@@ -537,11 +537,11 @@ void VerifyTextfieldContextMenuContents(bool textfield_has_selection,
 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) {