Move WebDropData to content::DropData and split off conversion function.

content/browser/web_contents/web_contents_drag_win.h

Index: content/browser/web_contents/web_contents_drag_win.h
diff --git a/content/browser/web_contents/web_contents_drag_win.h b/content/browser/web_contents/web_contents_drag_win.h
index 42d2c689c5fdfe9d30f9cd49108f32070bce8cad..b6a9805819626e7494dac0579cc7835beeca6f1d 100644
--- a/content/browser/web_contents/web_contents_drag_win.h
+++ b/content/browser/web_contents/web_contents_drag_win.h
@@ -17,7 +17,6 @@
 #include "ui/gfx/point.h"
 
 class SkBitmap;
-struct WebDropData;
 
 namespace gfx {
 class ImageSkia;
@@ -28,6 +27,7 @@ class DragDropThread;
 class WebContents;
 class WebDragDest;
 class WebDragSource;
+struct DropData;
 
 // Windows-specific drag-and-drop handling in WebContentsView.
 // If we are dragging a virtual file out of the browser, we use a background
@@ -45,7 +45,7 @@ class CONTENT_EXPORT WebContentsDragWin
   virtual ~WebContentsDragWin();
 
   // Called on UI thread.
-  void StartDragging(const WebDropData& drop_data,
+  void StartDragging(const DropData& drop_data,
                      WebKit::WebDragOperationsMask ops,
                      const gfx::ImageSkia& image,
                      const gfx::Vector2d& image_offset);
@@ -61,19 +61,19 @@ class CONTENT_EXPORT WebContentsDragWin
 
  private:
   // Called on either UI thread or drag-and-drop thread.
-  void PrepareDragForDownload(const WebDropData& drop_data,
+  void PrepareDragForDownload(const DropData& drop_data,
                               ui::OSExchangeData* data,
                               const GURL& page_url,
                               const std::string& page_encoding);
-  void PrepareDragForFileContents(const WebDropData& drop_data,
+  void PrepareDragForFileContents(const DropData& drop_data,
                                   ui::OSExchangeData* data);
-  void PrepareDragForUrl(const WebDropData& drop_data,
+  void PrepareDragForUrl(const DropData& drop_data,
                          ui::OSExchangeData* data);
   // Returns false if the source window becomes invalid when the drag ends.
   // This could happen when the window gets destroyed when the drag is still in
   // progress. No further processing should be done beyond this return point
   // because the instance has been destroyed.
-  bool DoDragging(const WebDropData& drop_data,
+  bool DoDragging(const DropData& drop_data,
                   WebKit::WebDragOperationsMask ops,
                   const GURL& page_url,
                   const std::string& page_encoding,
@@ -81,7 +81,7 @@ class CONTENT_EXPORT WebContentsDragWin
                   const gfx::Vector2d& image_offset);
 
   // Called on drag-and-drop thread.
-  void StartBackgroundDragging(const WebDropData& drop_data,
+  void StartBackgroundDragging(const DropData& drop_data,
                                WebKit::WebDragOperationsMask ops,
                                const GURL& page_url,
                                const std::string& page_encoding,