Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_nsobject.h"
 #include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h"
@@ skipping 160 matching lines @@
 
   // Return the correct tiling/alignment information.
   EXPECT_CALL(provider,
       GetDisplayProperty(ThemeService::NTP_BACKGROUND_TILING, _))
       .WillRepeatedly(SetBackgroundTiling());
   EXPECT_CALL(provider,
       GetDisplayProperty(ThemeService::NTP_BACKGROUND_ALIGNMENT, _))
       .WillRepeatedly(SetAlignLeft());
 
   // Create a dummy bitmap full of not-red to blit with.
-  SkBitmap fake_bg;
-  fake_bg.setConfig(SkBitmap::kARGB_8888_Config, 800, 800);
-  fake_bg.allocPixels();
-  fake_bg.eraseColor(SK_ColorGREEN);
-  EXPECT_CALL(provider, GetBitmapNamed(IDR_THEME_NTP_BACKGROUND))
+  SkBitmap fake_bg_bitmap;
+  fake_bg_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 800, 800);
+  fake_bg_bitmap.allocPixels();
+  fake_bg_bitmap.eraseColor(SK_ColorGREEN);
+  gfx::ImageSkia fake_bg(fake_bg_bitmap);
+  EXPECT_CALL(provider, GetImageSkiaNamed(IDR_THEME_NTP_BACKGROUND))
       .WillRepeatedly(Return(&fake_bg));
 
   [controller_.get() setThemeProvider:&provider];
   [controller_.get() setCurrentTabContentsHeight:200];
 
   [view_ display];
 }
 
 // TODO(viettrungluu): write more unit tests, especially after my refactoring.