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

chrome/browser/ui/cocoa/menu_controller_unittest.mm

 // Copyright (c) 2011 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/ui/cocoa/menu_controller.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image_skia.h"
 
 class MenuControllerTest : public CocoaTest {
 };
 
 // A menu delegate that counts the number of times certain things are called
 // to make sure things are hooked up properly.
 class Delegate : public ui::SimpleMenuModel::Delegate {
  public:
   Delegate()
       : execute_count_(0),
@@ skipping 41 matching lines @@
   bool did_close_;
 };
 
 // Just like Delegate, except the items are treated as "dynamic" so updates to
 // the label/icon in the model are reflected in the menu.
 class DynamicDelegate : public Delegate {
  public:
   DynamicDelegate() : icon_(NULL) {}
   virtual bool IsItemForCommandIdDynamic(int command_id) const { return true; }
   virtual string16 GetLabelForCommandId(int command_id) const { return label_; }
-  virtual bool GetIconForCommandId(int command_id, SkBitmap* icon) const {
+  virtual bool GetIconForCommandId(int command_id, gfx::ImageSkia* icon) const {
     if (icon_) {
       *icon = *icon_;
       return true;
     } else {
       return false;
     }
   }
   void SetDynamicLabel(string16 label) { label_ = label; }
   void SetDynamicIcon(SkBitmap* icon) { icon_ = icon; }
 
@@ skipping 233 matching lines @@
   // the delegate. But since this is a test and there's no running MessageLoop,
   // |did_close_| will remain false until we pump the task manually.
   EXPECT_FALSE(delegate.did_close_);
 
   // Pump the task that notifies the delegate.
   message_loop.RunAllPending();
 
   // Expect that the delegate got notified properly.
   EXPECT_TRUE(delegate.did_close_);
 }