Convert most of the rest of chrome to ImageSkia

chrome/browser/task_manager/task_manager_unittest.cc

Index: chrome/browser/task_manager/task_manager_unittest.cc
diff --git a/chrome/browser/task_manager/task_manager_unittest.cc b/chrome/browser/task_manager/task_manager_unittest.cc
index c5e286d4e0ffe5b01548e40b2f8a7cf2ba22e67e..c313db6d44a0f6fdd879915c06541a3753e6d93c 100644
--- a/chrome/browser/task_manager/task_manager_unittest.cc
+++ b/chrome/browser/task_manager/task_manager_unittest.cc
@@ -12,8 +12,8 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/image/image_skia.h"
 
 namespace {
 
@@ -36,7 +36,7 @@ class TestResource : public TaskManager::Resource {
   virtual string16 GetProfileName() const OVERRIDE {
     return ASCIIToUTF16("test profile");
   }
-  virtual SkBitmap GetIcon() const { return SkBitmap(); }
+  virtual gfx::ImageSkia GetIcon() const { return gfx::ImageSkia(); }
   virtual base::ProcessHandle GetProcess() const {
     return base::GetCurrentProcessHandle();
   }