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

content/browser/web_contents/web_drag_dest_gtk.h

Index: content/browser/web_contents/web_drag_dest_gtk.h
diff --git a/content/browser/web_contents/web_drag_dest_gtk.h b/content/browser/web_contents/web_drag_dest_gtk.h
index 8b954b94b91fb567b6e0706e61381a1c0e2bb937..b912afa9d3ce8b0107482cef5fdc3cd1b724e044 100644
--- a/content/browser/web_contents/web_drag_dest_gtk.h
+++ b/content/browser/web_contents/web_drag_dest_gtk.h
@@ -11,9 +11,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/common/content_export.h"
+#include "content/public/common/drop_data.h"
 #include "third_party/WebKit/public/web/WebDragOperation.h"
 #include "ui/base/gtk/gtk_signal.h"
-#include "webkit/common/webdropdata.h"
 
 namespace content {
 
@@ -28,7 +28,7 @@ class CONTENT_EXPORT WebDragDestGtk {
   WebDragDestGtk(WebContents* web_contents, GtkWidget* widget);
   ~WebDragDestGtk();
 
-  WebDropData* current_drop_data() const { return drop_data_.get(); }
+  DropData* current_drop_data() const { return drop_data_.get(); }
 
   // This is called when the renderer responds to a drag motion event. We must
   // update the system drag cursor.
@@ -79,7 +79,7 @@ class CONTENT_EXPORT WebDragDestGtk {
   GdkDragContext* context_;
 
   // The data for the current drag, or NULL if |context_| is NULL.
-  scoped_ptr<WebDropData> drop_data_;
+  scoped_ptr<DropData> drop_data_;
 
   // The number of outstanding drag data requests we have sent to the drag
   // source.