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

content/public/browser/web_drag_dest_delegate.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_PUBLIC_BROWSER_WEB_DRAG_DEST_DELEGATE_H_
 #define CONTENT_PUBLIC_BROWSER_WEB_DRAG_DEST_DELEGATE_H_
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif  // TOOLKIT_GTK
 
 #include "base/strings/string16.h"
 
 #if defined(OS_WIN)
 #include "ui/base/dragdrop/drop_target_win.h"
 #endif
 
 class GURL;
-struct WebDropData;
 
 namespace ui {
 class OSExchangeData;
 }
 
 namespace content {
-
 class WebContents;
+struct DropData;
 
 // An optional delegate that listens for drags of bookmark data.
 class WebDragDestDelegate {
  public:
   // Announces that a drag has started. It's valid that a drag starts, along
   // with over/enter/leave/drop notifications without receiving any bookmark
   // data.
   virtual void DragInitialize(WebContents* contents) = 0;
 
   // Notifications of drag progression.
@@ skipping 19 matching lines @@
   virtual void OnReceiveDataFromGtk(GtkSelectionData* data) = 0;
   virtual void OnReceiveProcessedData(const GURL& url,
                                       const string16& title) = 0;
 #elif defined(USE_AURA)
   // Called at the start of every drag to supply the data associated with the
   // drag.
   virtual void OnReceiveDragData(const ui::OSExchangeData& data) = 0;
 #elif defined(OS_WIN)
   // Allows the delegate to set data on the drag. If it doesn't want to set
   // data, it should return false.
-  virtual bool AddDragData(const WebDropData& drop_data,
+  virtual bool AddDragData(const DropData& drop_data,
                            ui::OSExchangeData* data) = 0;
 #endif  // TOOLKIT_GTK
 
   virtual ~WebDragDestDelegate() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_WEB_DRAG_DEST_DELEGATE_H_