Retrieve favicons from history as NavigationEntries are converted from TabNav...

views/view_unittest.cc

Index: views/view_unittest.cc
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index 2bded077b6d353af3f4330b8a42e9c04ed698798..428f3206ab030b0e1334d067ed7d416655bedf79 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -1232,7 +1232,7 @@ class MockMenuModel : public MenuModel {
       ui::Accelerator* accelerator));
   MOCK_CONST_METHOD1(IsItemCheckedAt, bool(int index));
   MOCK_CONST_METHOD1(GetGroupIdAt, int(int index));
-  MOCK_CONST_METHOD2(GetIconAt, bool(int index, SkBitmap* icon));
+  MOCK_METHOD2(GetIconAt, bool(int index, SkBitmap* icon));
   MOCK_CONST_METHOD1(GetButtonMenuItemAt, ButtonMenuItemModel*(int index));
   MOCK_CONST_METHOD1(IsEnabledAt, bool(int index));
   MOCK_CONST_METHOD1(IsVisibleAt, bool(int index));
@@ -1243,6 +1243,7 @@ class MockMenuModel : public MenuModel {
       int disposition));
   MOCK_METHOD0(MenuWillShow, void());
   MOCK_METHOD0(MenuClosed, void());
+  MOCK_METHOD1(SetMenuModelDelegate, void(MenuModelDelegate* delegate));
   MOCK_METHOD3(GetModelAndIndexForCommandId, bool(int command_id,
       MenuModel** model, int* index));
 };