Convert most of the rest of chrome to ImageSkia

chrome/browser/task_manager/task_manager_unittest.cc

 // 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/task_manager/task_manager.h"
 
 #include <string>
 
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #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 {
 
 #if defined(OS_MACOSX)
 // From task_manager.cc:
 // Activity Monitor shows %cpu with one decimal digit -- be
 // consistent with that.
 const char* kZeroCPUUsage = "0.0";
 #else
 const char* kZeroCPUUsage = "0";
 #endif
 
 class TestResource : public TaskManager::Resource {
  public:
   TestResource() : refresh_called_(false) {}
 
   virtual string16 GetTitle() const OVERRIDE {
     return ASCIIToUTF16("test title");
   }
   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();
   }
   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 { return RENDERER; }
   virtual bool SupportNetworkUsage() const { return false; }
@@ skipping 65 matching lines @@
   TaskManagerModel* model = task_manager.model_;
   TestResource resource;
 
   task_manager.AddResource(&resource);
   ASSERT_FALSE(resource.refresh_called());
   model->update_state_ = TaskManagerModel::TASK_PENDING;
   model->Refresh();
   ASSERT_TRUE(resource.refresh_called());
   task_manager.RemoveResource(&resource);
 }