Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/cocoa/table_row_nsimage_cache.mm

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "chrome/browser/ui/cocoa/table_row_nsimage_cache.h"
 
 #include "base/logging.h"
 #include "skia/ext/skia_utils_mac.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"
 
 TableRowNSImageCache::TableRowNSImageCache(Table* model)
     : model_(model),
       icon_images_([[NSPointerArray alloc] initWithOptions:
           NSPointerFunctionsStrongMemory |
           NSPointerFunctionsObjectPersonality]) {
   int count = model_->RowCount();
   [icon_images_ setCount:count];
 }
 
@@ skipping 39 matching lines @@
             static_cast<int>([icon_images_ count]));
 }
 
 NSImage* TableRowNSImageCache::GetImageForRow(int row) {
   DCHECK_EQ(model_->RowCount(),
             static_cast<int>([icon_images_ count]));
   DCHECK_GE(row, 0);
   DCHECK_LT(row, static_cast<int>([icon_images_ count]));
   NSImage* image = static_cast<NSImage*>([icon_images_ pointerAtIndex:row]);
   if (!image) {
-    const SkBitmap bitmap_icon =
+    const gfx::ImageSkia bitmap_icon =
         model_->GetIcon(row);
     // This means GetIcon() will get called until it returns a non-empty bitmap.
     // Empty bitmaps are intentionally not cached.
     if (!bitmap_icon.isNull()) {
       image = gfx::SkBitmapToNSImage(bitmap_icon);
       DCHECK(image);
       [icon_images_ replacePointerAtIndex:row withPointer:image];
     }
   }
   return image;
 }