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

content/browser/web_contents/web_drag_dest_win.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_WIN_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_DEST_WIN_H_
 
 #include "base/memory/scoped_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/dragdrop/drop_target_win.h"
-#include "webkit/common/webdropdata.h"
 
 namespace content {
 class InterstitialDropTarget;
 class RenderViewHost;
 class WebContents;
 class WebDragDestDelegate;
 
 // A helper object that provides drop capabilities to a WebContentsImpl. The
 // DropTarget handles drags that enter the region of the WebContents by
 // passing on the events to the renderer.
 class CONTENT_EXPORT WebDragDest : public ui::DropTargetWin {
  public:
   // Create a new WebDragDest associating it with the given HWND and
   // WebContents.
   WebDragDest(HWND source_hwnd, WebContents* contents);
   virtual ~WebDragDest();
 
-  WebDropData* current_drop_data() const { return drop_data_.get(); }
+  DropData* current_drop_data() const { return drop_data_.get(); }
 
   void set_drag_cursor(WebKit::WebDragOperation op) {
     drag_cursor_ = op;
   }
 
   WebDragDestDelegate* delegate() const { return delegate_; }
   void set_delegate(WebDragDestDelegate* d) { delegate_ = d; }
 
  protected:
   virtual DWORD OnDragEnter(IDataObject* data_object,
@@ skipping 28 matching lines @@
   WebKit::WebDragOperation drag_cursor_;
 
   // A special drop target handler for when we try to d&d while an interstitial
   // page is showing.
   scoped_ptr<InterstitialDropTarget> interstitial_drop_target_;
 
   // A delegate that can receive drag information about drag events.
   WebDragDestDelegate* delegate_;
 
   // The data for the current drag, or NULL if |context_| is NULL.
-  scoped_ptr<WebDropData> drop_data_;
+  scoped_ptr<DropData> drop_data_;
 
   // True if the drag has been canceled.
   bool canceled_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDragDest);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_DRAG_DEST_WIN_H_