Convert most of the rest of chrome to ImageSkia

chrome/browser/task_manager/task_manager_notification_resource_provider.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_resource_providers.h"
 
 #include "base/basictypes.h"
 #include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/debugger/devtools_window.h"
+#include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/notifications/balloon_host.h"
-#include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image_skia.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerNotificationResource class
 ////////////////////////////////////////////////////////////////////////////////
 
-SkBitmap* TaskManagerNotificationResource::default_icon_ = NULL;
+gfx::ImageSkia* TaskManagerNotificationResource::default_icon_ = NULL;
 
 TaskManagerNotificationResource::TaskManagerNotificationResource(
     BalloonHost* balloon_host)
     : balloon_host_(balloon_host) {
   if (!default_icon_) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    default_icon_ = rb.GetBitmapNamed(IDR_PLUGIN);
+    default_icon_ = rb.GetImageSkiaNamed(IDR_PLUGIN);
   }
   process_handle_ =
       balloon_host_->web_contents()->GetRenderProcessHost()->GetHandle();
   unique_process_id_ =
       balloon_host_->web_contents()->GetRenderProcessHost()->GetID();
   pid_ = base::GetProcId(process_handle_);
   title_ = l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_NOTIFICATION_PREFIX,
                                       balloon_host_->GetSource());
 }
 
 TaskManagerNotificationResource::~TaskManagerNotificationResource() {
 }
 
 string16 TaskManagerNotificationResource::GetTitle() const {
   return title_;
 }
 
 string16 TaskManagerNotificationResource::GetProfileName() const {
   return string16();
 }
 
-SkBitmap TaskManagerNotificationResource::GetIcon() const {
+gfx::ImageSkia TaskManagerNotificationResource::GetIcon() const {
   return *default_icon_;
 }
 
 base::ProcessHandle TaskManagerNotificationResource::GetProcess() const {
   return process_handle_;
 }
 
 int TaskManagerNotificationResource::GetUniqueChildProcessId() const {
   return unique_process_id_;
 }
@@ skipping 116 matching lines @@
   // Remove the resource from the Task Manager.
   TaskManagerNotificationResource* resource = iter->second;
   task_manager_->RemoveResource(resource);
 
   // Remove it from the map.
   resources_.erase(iter);
 
   // Finally, delete the resource.
   delete resource;
 }