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

content/browser/web_contents/web_drag_dest_gtk.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 CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_DEST_GTK_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_DEST_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include "base/gtest_prod_util.h"
 #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 {
 
 class RenderViewHostImpl;
 class WebContents;
 class WebDragDestDelegate;
 
 // A helper class that handles DnD for drops in the renderer. In GTK parlance,
 // this handles destination-side DnD, but not source-side DnD.
 class CONTENT_EXPORT WebDragDestGtk {
  public:
   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.
   void UpdateDragStatus(WebKit::WebDragOperation operation);
 
   // Informs the renderer when a system drag has left the render view.
   // See OnDragLeave().
   void DragLeave();
 
   WebDragDestDelegate* delegate() const { return delegate_; }
@@ skipping 30 matching lines @@
   WebContents* web_contents_;
 
   // The render view.
   GtkWidget* widget_;
 
   // The current drag context for system drags over our render view, or NULL if
   // there is no system drag or the system drag is not over our render view.
   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.
   int data_requests_;
 
   // The last time we sent a message to the renderer related to a drag motion.
   gint drag_over_time_;
 
   // Whether the cursor is over a drop target, according to the last message we
   // got from the renderer.
@@ skipping 12 matching lines @@
   bool canceled_;
 
   base::WeakPtrFactory<WebDragDestGtk> method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDragDestGtk);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_DEST_GTK_H_