Converts ui/views/controls, ui/views/examples, ui/base/models to ImageSkia

chrome/browser/ui/views/menu_model_adapter_test.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 "base/callback.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/base/view_event_test_base.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/ui_controls/ui_controls.h"
@@ skipping 125 matching lines @@
   }
 
   virtual bool IsItemCheckedAt(int index) const OVERRIDE {
     return false;
   }
 
   virtual int GetGroupIdAt(int index) const OVERRIDE {
     return 0;
   }
 
-  virtual bool GetIconAt(int index, SkBitmap* icon) OVERRIDE {
+  virtual bool GetIconAt(int index, gfx::ImageSkia* icon) OVERRIDE {
     return false;
   }
 
   virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(
       int index) const OVERRIDE {
     return NULL;
   }
 
   virtual bool IsEnabledAt(int index) const OVERRIDE {
     return true;
@@ skipping 231 matching lines @@
   views::MenuItemView* menu_;
   scoped_ptr<views::MenuRunner> menu_runner_;
 };
 
 #if defined(OS_WIN)
 #define MAYBE_RebuildMenu DISABLED_RebuildMenu
 #else
 #define MAYBE_RebuildMenu RebuildMenu
 #endif
 VIEW_TEST(MenuModelAdapterTest, MAYBE_RebuildMenu)