Convert most of the rest of chrome to ImageSkia

chrome/browser/ui/cocoa/task_manager_mac_unittest.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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/utf_string_conversions.h"
 #import "chrome/browser/ui/cocoa/task_manager_mac.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "grit/generated_resources.h"
 #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 {
 
 class TestResource : public TaskManager::Resource {
  public:
   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,
     // but for testing purposes it shouldn't make difference.
     return static_cast<int>(base::GetCurrentProcId());
   }
   virtual Type GetType() const OVERRIDE { return RENDERER; }
   virtual bool SupportNetworkUsage() const OVERRIDE { return false; }
   virtual void SetSupportNetworkUsage() OVERRIDE { NOTREACHED(); }
   virtual void Refresh() OVERRIDE {}
@@ skipping 78 matching lines @@
   NSIndexSet* selection = [table selectedRowIndexes];
   ASSERT_EQ(1u, [selection count]);
   EXPECT_EQ(1u, [selection firstIndex]);
 
   // Releases the controller, which in turn deletes |bridge|.
   [controller close];
 
   task_manager.RemoveResource(&resource1);
   task_manager.RemoveResource(&resource2);
 }