Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia

chrome/browser/ui/tests/ui_gfx_image_unittest.cc

-// Copyright (c) 2011 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 "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_unittest_util.h"
 
 #if defined(TOOLKIT_GTK)
@@ skipping 11 matching lines @@
 
 #if defined(TOOLKIT_VIEWS)
 TEST(UiGfxImageTest, ViewsImageView) {
   gfx::Image image(gfx::test::CreatePlatformImage());
 
   scoped_ptr<views::View> container(new views::View());
   container->SetBounds(0, 0, 200, 200);
   container->SetVisible(true);
 
   scoped_ptr<views::ImageView> image_view(new views::ImageView());
-  image_view->SetImage(*image.ToSkBitmap());
+  image_view->SetImage(*image.ToImageSkia());
   container->AddChildView(image_view.get());
 }
 #endif
 
 #if defined(TOOLKIT_GTK)
 TEST(UiGfxImageTest, GtkImageView) {
   GtkWidget* window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   gtk_window_resize(GTK_WINDOW(window), 200, 200);
   gtk_window_move(GTK_WINDOW(window), 300, 300);
 
   GtkWidget* fixed = gtk_fixed_new();
   gtk_container_add(GTK_CONTAINER(window), fixed);
 
   gfx::Image image(gfx::test::CreateBitmap(25, 25));
   GtkWidget* image_view = gtk_image_new_from_pixbuf(image.ToGdkPixbuf());
   gtk_fixed_put(GTK_FIXED(fixed), image_view, 10, 10);
   gtk_widget_set_size_request(image_view, 25, 25);
 
   gtk_widget_show_all(window);
 
   gtk_widget_destroy(window);
 }
 #endif
 
 }  // namespace