Convert ui::MenuModel to use gfx::Image instead of ImageSkia.

ui/views/view_unittest.cc

 // Copyright (c) 2012 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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 1543 matching lines @@
   MOCK_CONST_METHOD0(GetItemCount, int());
   MOCK_CONST_METHOD1(GetTypeAt, ItemType(int index));
   MOCK_CONST_METHOD1(GetCommandIdAt, int(int index));
   MOCK_CONST_METHOD1(GetLabelAt, string16(int index));
   MOCK_CONST_METHOD1(IsItemDynamicAt, bool(int index));
   MOCK_CONST_METHOD1(GetLabelFontAt, const gfx::Font* (int index));
   MOCK_CONST_METHOD2(GetAcceleratorAt, bool(int index,
       ui::Accelerator* accelerator));
   MOCK_CONST_METHOD1(IsItemCheckedAt, bool(int index));
   MOCK_CONST_METHOD1(GetGroupIdAt, int(int index));
-  MOCK_METHOD2(GetIconAt, bool(int index, gfx::ImageSkia* icon));
+  MOCK_METHOD2(GetIconAt, bool(int index, gfx::Image* icon));
   MOCK_CONST_METHOD1(GetButtonMenuItemAt, ui::ButtonMenuItemModel*(int index));
   MOCK_CONST_METHOD1(IsEnabledAt, bool(int index));
   MOCK_CONST_METHOD1(IsVisibleAt, bool(int index));
   MOCK_CONST_METHOD1(GetSubmenuModelAt, MenuModel*(int index));
   MOCK_METHOD1(HighlightChangedTo, void(int index));
   MOCK_METHOD1(ActivatedAt, void(int index));
   MOCK_METHOD2(ActivatedAt, void(int index, int disposition));
   MOCK_METHOD0(MenuWillShow, void());
   MOCK_METHOD0(MenuClosed, void());
   MOCK_METHOD1(SetMenuModelDelegate, void(ui::MenuModelDelegate* delegate));
@@ skipping 1806 matching lines @@
   // Set to non default value.
   v->layer()->set_scale_content(false);
   scoped_ptr<ui::Layer> old_layer(v->RecreateLayer());
   ui::Layer* new_layer = v->layer();
   EXPECT_FALSE(new_layer->scale_content());
 }
 
 #endif  // USE_AURA
 
 }  // namespace views