Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/cocoa/task_manager_mac.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.
 
 #include "chrome/browser/ui/cocoa/task_manager_mac.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #import "chrome/browser/ui/cocoa/window_size_autosaver.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace {
 
 // Width of "a" and most other letters/digits in "small" table views.
 const int kCharWidth = 6;
 
 // Some of the strings below have spaces at the end or are missing letters, to
 // make the columns look nicer, and to take potentially longer localized strings
 // into account.
 const struct ColumnWidth {
@@ skipping 588 matching lines @@
 
 void TaskManagerMac::WindowWasClosed() {
   delete this;
   instance_ = NULL;
 }
 
 int TaskManagerMac::RowCount() const {
   return model_->ResourceCount();
 }
 
-SkBitmap TaskManagerMac::GetIcon(int r) const {
+gfx::ImageSkia TaskManagerMac::GetIcon(int r) const {
   return model_->GetResourceIcon(r);
 }
 
 bool TaskManagerMac::IsBackgroundRow(int row) const {
   return model_->IsBackgroundResource(row);
 }
 
 // static
 void TaskManagerMac::Show(bool highlight_background_resources) {
   if (instance_) {
     if (instance_->highlight_background_resources_ ==
         highlight_background_resources) {
       // There's a Task manager window open already, so just activate it.
       [[instance_->window_controller_ window]
         makeKeyAndOrderFront:instance_->window_controller_];
       return;
     } else {
       // The user is switching between "View Background Pages" and
       // "Task Manager" so close the existing window and fall through to
       // open a new one.
       [[instance_->window_controller_ window] close];
     }
   }
   // Create a new instance.
   instance_ = new TaskManagerMac(TaskManager::GetInstance(),
                                  highlight_background_resources);
   instance_->model_->StartUpdating();
 }