Convert most of the rest of chrome to ImageSkia

chrome/browser/task_manager/task_manager.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 "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/rtl.h"
@@ skipping 21 matching lines @@
 #include "content/public/browser/browser_child_process_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/result_codes.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources.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/base/text/bytes_formatting.h"
+#include "ui/gfx/image/image_skia.h"
 #include "unicode/coll.h"
 
 using content::BrowserThread;
 using content::OpenURLParams;
 using content::Referrer;
 using content::ResourceRequestInfo;
 using content::WebContents;
 
 namespace {
 
@@ skipping 243 matching lines @@
   DCHECK(iter != group_map_.end());
   const ResourceList* group = iter->second;
   return (group->back() == resource);
 }
 
 bool TaskManagerModel::IsBackgroundResource(int index) const {
   CHECK_LT(index, ResourceCount());
   return resources_[index]->IsBackground();
 }
 
-SkBitmap TaskManagerModel::GetResourceIcon(int index) const {
+gfx::ImageSkia TaskManagerModel::GetResourceIcon(int index) const {
   CHECK_LT(index, ResourceCount());
-  SkBitmap icon = resources_[index]->GetIcon();
+  gfx::ImageSkia icon = resources_[index]->GetIcon();
   if (!icon.isNull())
     return icon;
 
-  static SkBitmap* default_icon = ResourceBundle::GetSharedInstance().
-      GetBitmapNamed(IDR_DEFAULT_FAVICON);
+  static gfx::ImageSkia* default_icon = ResourceBundle::GetSharedInstance().
+      GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
   return *default_icon;
 }
 
 TaskManagerModel::GroupRange
 TaskManagerModel::GetGroupRangeForResource(int index) const {
   CHECK_LT(index, ResourceCount());
   TaskManager::Resource* resource = resources_[index];
   GroupMap::const_iterator group_iter =
       group_map_.find(resource->GetProcess());
   DCHECK(group_iter != group_map_.end());
@@ skipping 865 matching lines @@
     // Count the number of extensions with background pages (including
     // incognito).
     count += CountExtensionBackgroundPagesForProfile(profile);
     if (profile->HasOffTheRecordProfile()) {
       count += CountExtensionBackgroundPagesForProfile(
           profile->GetOffTheRecordProfile());
     }
   }
   return count;
 }