views/bookmarks: Convert BookmarkEditorView from Menu2 API to MenuModelApdater/MenuRunner API.

chrome/browser/ui/views/bookmarks/bookmark_editor_view.h

Index: chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
index e087d354ebd0d19dd47eb6dd10417129d70fb319..df94a2001e3f7584d7b45063d7beb58bbc38bb1c 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
@@ -25,7 +25,7 @@
 
 namespace views {
 class Label;
-class Menu2;
+class MenuRunner;
 class TextButton;
 class TreeView;
 }
@@ -224,6 +224,8 @@ class BookmarkEditorView : public BookmarkEditor,
   void UpdateExpandedNodes(EditorNode* editor_node,
                            BookmarkExpandedStateTracker::Nodes* expanded_nodes);
 
+  ui::SimpleMenuModel* GetMenuModel();
+
   // Profile the entry is from.
   Profile* profile_;
 
@@ -255,10 +257,8 @@ class BookmarkEditorView : public BookmarkEditor,
   const EditDetails details_;
 
   // The context menu.
-  scoped_ptr<ui::SimpleMenuModel> context_menu_contents_;
-#if !defined(USE_AURA)
-  scoped_ptr<views::Menu2> context_menu_;
-#endif
+  scoped_ptr<ui::SimpleMenuModel> context_menu_model_;
+  scoped_ptr<views::MenuRunner> context_menu_runner_;
 
   // Mode used to create nodes from.
   BookmarkModel* bb_model_;