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

ui/base/dragdrop/os_exchange_data_provider_aura.h

 // 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.
 
 #ifndef UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURA_H_
 #define UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURA_H_
 #pragma once
 
 #include <map>
 
+#include "base/file_path.h"
 #include "base/pickle.h"
-#include "base/file_path.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 {
 
 class Clipboard;
 
 // OSExchangeData::Provider implementation for aura on linux.
 class UI_EXPORT OSExchangeDataProviderAura : public OSExchangeData::Provider {
  public:
   OSExchangeDataProviderAura();
@@ skipping 26 matching lines @@
                                std::string* file_contents) const OVERRIDE;
   virtual bool HasFileContents() const OVERRIDE;
   virtual void SetDownloadFileInfo(
       const OSExchangeData::DownloadFileInfo& download) OVERRIDE;
 #endif
 
   virtual void SetHtml(const string16& html, const GURL& base_url) OVERRIDE;
   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;
   }
   const gfx::Point& drag_image_offset() const { return drag_image_offset_; }
 
  private:
   typedef std::map<OSExchangeData::CustomFormat, Pickle>  PickleData;
 
   // Returns true if |formats_| contains a string format and the string can be
   // parsed as a URL.
@@ skipping 10 matching lines @@
   GURL url_;
   string16 title_;
 
   // File name.
   std::vector<OSExchangeData::FileInfo> filenames_;
 
   // PICKLED_DATA contents.
   PickleData pickle_data_;
 
   // Drag image and offset data.
-  SkBitmap drag_image_;
+  gfx::ImageSkia drag_image_;
   gfx::Point drag_image_offset_;
 
   // For HTML format
   string16 html_;
   GURL base_url_;
 
   DISALLOW_COPY_AND_ASSIGN(OSExchangeDataProviderAura);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURA_H_