Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm

 // Copyright (c) 2010 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 "chrome/browser/ui/cocoa/table_row_nsimage_cache.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace {
 
 class TestTable : public TableRowNSImageCache::Table {
  public:
 
   std::vector<SkBitmap>* rows() {
     return &rows_;
   }
 
   // TableRowNSImageCache::Table overrides.
   virtual int RowCount() const {
     return rows_.size();
   }
-  virtual SkBitmap GetIcon(int index) const {
-    return rows_[index];
+  virtual gfx::ImageSkia GetIcon(int index) const {
+    return gfx::ImageSkia(rows_[index]);
   }
 
  private:
   std::vector<SkBitmap> rows_;
 };
 
 SkBitmap MakeImage(int width, int height) {
   SkBitmap image;
   image.setConfig(SkBitmap::kARGB_8888_Config, width, height);
   EXPECT_TRUE(image.allocPixels());
@@ skipping 156 matching lines @@
   cache.OnItemsRemoved(1, 3);
 
   image0 = cache.GetImageForRow(0);
   image1 = cache.GetImageForRow(1);
 
   COMPARE_SK_NS_IMG_SIZES(rows->at(0), image0);
   COMPARE_SK_NS_IMG_SIZES(rows->at(1), image1);
 }
 
 }  // namespace