Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/cocoa/task_manager_mac_unittest.mm

Index: chrome/browser/ui/cocoa/task_manager_mac_unittest.mm
diff --git a/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm b/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm
index 0728257fb7d078ee19c5544a74c5a427330c8b27..8d3b8f39b326bf72016b93546a37e93ded84b806 100644
--- a/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm
+++ b/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm
@@ -13,7 +13,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace {
 
@@ -22,7 +22,7 @@ class TestResource : public TaskManager::Resource {
   TestResource(const string16& title, pid_t pid) : title_(title), pid_(pid) {}
   virtual string16 GetTitle() const OVERRIDE { return title_; }
   virtual string16 GetProfileName() const OVERRIDE { return string16(); }
-  virtual SkBitmap GetIcon() const OVERRIDE { return SkBitmap(); }
+  virtual gfx::ImageSkia GetIcon() const OVERRIDE { return gfx::ImageSkia(); }
   virtual base::ProcessHandle GetProcess() const OVERRIDE { return pid_; }
   virtual int GetUniqueChildProcessId() const OVERRIDE {
     // In reality the unique child process ID is not the actual process ID,