Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm

Index: chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm
diff --git a/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm b/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm
index ecca71e91a7083a2437cc9379db3b4ba43aac73b..cc8b40333234982762343677d8bc313c94d46185 100644
--- a/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm
+++ b/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm
@@ -6,6 +6,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace {
 
@@ -20,8 +21,8 @@ class TestTable : public TableRowNSImageCache::Table {
   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: