Convert most of the rest of chrome to ImageSkia

chrome/browser/task_manager/task_manager_worker_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_worker_resource_provider.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/devtools_agent_host_registry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/worker_service.h"
 #include "grit/generated_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"
 
 using content::BrowserThread;
 using content::DevToolsAgentHost;
 using content::DevToolsAgentHostRegistry;
 using content::WorkerService;
 
 // Objects of this class are created on the IO thread and then passed to the UI
 // thread where they are passed to the task manager. All methods must be called
 // only on the UI thread. Destructor may be called on any thread.
 class TaskManagerSharedWorkerResource : public TaskManager::Resource {
  public:
   TaskManagerSharedWorkerResource(const GURL& url,
                                   const string16& name,
                                   int process_id,
                                   int routing_id,
                                   base::ProcessHandle process_handle);
   virtual ~TaskManagerSharedWorkerResource();
 
   bool Matches(int process_id, int routing_id) const;
 
   void UpdateProcessHandle(base::ProcessHandle handle);
   base::ProcessHandle handle() const { return handle_; }
   int process_id() const { return process_id_; }
 
  private:
   // TaskManager::Resource methods:
   virtual string16 GetTitle() const OVERRIDE;
   virtual string16 GetProfileName() const OVERRIDE;
-  virtual SkBitmap GetIcon() const OVERRIDE;
+  virtual gfx::ImageSkia GetIcon() const OVERRIDE;
   virtual base::ProcessHandle GetProcess() const OVERRIDE;
   virtual int GetUniqueChildProcessId() const OVERRIDE;
   virtual Type GetType() const OVERRIDE;
   virtual bool CanInspect() const OVERRIDE;
   virtual void Inspect() const OVERRIDE;
 
   virtual bool SupportNetworkUsage() const OVERRIDE;
   virtual void SetSupportNetworkUsage() OVERRIDE;
 
   int process_id_;
   int routing_id_;
   string16 title_;
   base::ProcessHandle handle_;
 
-  static SkBitmap* default_icon_;
+  static gfx::ImageSkia* default_icon_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskManagerSharedWorkerResource);
 };
 
-SkBitmap* TaskManagerSharedWorkerResource::default_icon_ = NULL;
+gfx::ImageSkia* TaskManagerSharedWorkerResource::default_icon_ = NULL;
 
 TaskManagerSharedWorkerResource::TaskManagerSharedWorkerResource(
     const GURL& url,
     const string16& name,
     int process_id,
     int routing_id,
     base::ProcessHandle process_handle)
     : process_id_(process_id),
       routing_id_(routing_id),
       handle_(process_handle) {
@@ skipping 16 matching lines @@
 }
 
 string16 TaskManagerSharedWorkerResource::GetTitle() const {
   return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_WORKER_PREFIX, title_);
 }
 
 string16 TaskManagerSharedWorkerResource::GetProfileName() const {
   return string16();
 }
 
-SkBitmap TaskManagerSharedWorkerResource::GetIcon() const {
+gfx::ImageSkia TaskManagerSharedWorkerResource::GetIcon() const {
   if (!default_icon_) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    default_icon_ = rb.GetBitmapNamed(IDR_PLUGIN);
+    default_icon_ = rb.GetImageSkiaNamed(IDR_PLUGIN);
     // TODO(jabdelmalek): use different icon for web workers.
   }
   return *default_icon_;
 }
 
 base::ProcessHandle TaskManagerSharedWorkerResource::GetProcess() const {
   return handle_;
 }
 
 int TaskManagerSharedWorkerResource::GetUniqueChildProcessId() const {
@@ skipping 231 matching lines @@
     int process_id = resource->process_id();
     launching_workers_[process_id].push_back(resource);
   } else {
     task_manager_->AddResource(resource);
   }
 }
 
 void TaskManagerWorkerResourceProvider::DeleteAllResources() {
   STLDeleteElements(&resources_);
 }