Converts remainder of ui and chrome/browser/ui/views/frame to use ImageSkia

ui/base/dragdrop/os_exchange_data_provider_aura.h

Index: ui/base/dragdrop/os_exchange_data_provider_aura.h
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.h b/ui/base/dragdrop/os_exchange_data_provider_aura.h
index 0758a7aa973611dca1c1632709c6e86329c40f66..6137062d9800c31082dbc34508f7f01234beb8c0 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aura.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_aura.h
@@ -8,11 +8,11 @@
 
 #include <map>
 
-#include "base/pickle.h"
 #include "base/file_path.h"
+#include "base/pickle.h"
 #include "googleurl/src/gurl.h"
-#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/point.h"
 
 namespace ui {
@@ -59,8 +59,11 @@ class UI_EXPORT OSExchangeDataProviderAura : public OSExchangeData::Provider {
   virtual bool GetHtml(string16* html, GURL* base_url) const OVERRIDE;
   virtual bool HasHtml() const OVERRIDE;
 
-  void set_drag_image(const SkBitmap& drag_image) { drag_image_ = drag_image; }
-  const SkBitmap& drag_image() const { return drag_image_; }
+  void set_drag_image(const gfx::ImageSkia& drag_image) {
+      drag_image_ = drag_image;
+  }
+
+  const gfx::ImageSkia& drag_image() const { return drag_image_; }
   void set_drag_image_offset(const gfx::Point& drag_image_offset) {
     drag_image_offset_ = drag_image_offset;
   }
@@ -91,7 +94,7 @@ class UI_EXPORT OSExchangeDataProviderAura : public OSExchangeData::Provider {
   PickleData pickle_data_;
 
   // Drag image and offset data.
-  SkBitmap drag_image_;
+  gfx::ImageSkia drag_image_;
   gfx::Point drag_image_offset_;
 
   // For HTML format