Converts remainder of ui and chrome/browser/ui/views/frame to use ImageSkia

ui/oak/oak_window.cc

Index: ui/oak/oak_window.cc
diff --git a/ui/oak/oak_window.cc b/ui/oak/oak_window.cc
index 52663365da76598c898932f22c658ea4658e2e3f..1cdd9f52cab4e162f747b6b2c51a31adcaf12fa7 100644
--- a/ui/oak/oak_window.cc
+++ b/ui/oak/oak_window.cc
@@ -57,9 +57,9 @@ views::View* OakWindow::GetContentsView() {
   return this;
 }
 
-SkBitmap OakWindow::GetWindowIcon() {
+gfx::ImageSkia OakWindow::GetWindowIcon() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  return *rb.GetImageNamed(IDR_OAK).ToSkBitmap();
+  return *rb.GetImageNamed(IDR_OAK).ToImageSkia();
 }
 
 bool OakWindow::ShouldShowWindowIcon() const {