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

content/browser/web_contents/web_drag_dest_mac.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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "content/common/content_export.h"
-#include "webkit/common/webdropdata.h"
-
+#include "content/public/common/drop_data.h"
 
 namespace content {
 class RenderViewHost;
 class WebContentsImpl;
 class WebDragDestDelegate;
 }
 
 // A typedef for a RenderViewHost used for comparison purposes only.
 typedef content::RenderViewHost* RenderViewHostIdentifier;
 
@@ skipping 11 matching lines @@
 
   // Updated asynchronously during a drag to tell us whether or not we should
   // allow the drop.
   NSDragOperation currentOperation_;
 
   // Keep track of the render view host we're dragging over.  If it changes
   // during a drag, we need to re-send the DragEnter message.
   RenderViewHostIdentifier currentRVH_;
 
   // The data for the current drag, or NULL if none is in progress.
-  scoped_ptr<WebDropData> dropData_;
+  scoped_ptr<content::DropData> dropData_;
 
   // True if the drag has been canceled.
   bool canceled_;
 }
 
 // |contents| is the WebContentsImpl representing this tab, used to communicate
 // drag&drop messages to WebCore and handle navigation on a successful drop
 // (if necessary).
 - (id)initWithWebContentsImpl:(content::WebContentsImpl*)contents;
 
-- (WebDropData*)currentDropData;
+- (content::DropData*)currentDropData;
 
 - (void)setDragDelegate:(content::WebDragDestDelegate*)delegate;
 
 // Sets the current operation negotiated by the source and destination,
 // which determines whether or not we should allow the drop. Takes effect the
 // next time |-draggingUpdated:| is called.
 - (void)setCurrentOperation:(NSDragOperation)operation;
 
 // Messages to send during the tracking of a drag, ususally upon receiving
 // calls from the view system. Communicates the drag messages to WebCore.
 - (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)info
                               view:(NSView*)view;
 - (void)draggingExited:(id<NSDraggingInfo>)info;
 - (NSDragOperation)draggingUpdated:(id<NSDraggingInfo>)info
                               view:(NSView*)view;
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)info
                               view:(NSView*)view;
 
 @end
 
 // Public use only for unit tests.
 @interface WebDragDest(Testing)
 // Given |data|, which should not be nil, fill it in using the contents of the
 // given pasteboard.
-- (void)populateWebDropData:(WebDropData*)data
+- (void)populateDropData:(content::DropData*)data
              fromPasteboard:(NSPasteboard*)pboard;
 // Given a point in window coordinates and a view in that window, return a
 // flipped point in the coordinate system of |view|.
 - (NSPoint)flipWindowPointToView:(const NSPoint&)windowPoint
                             view:(NSView*)view;
 // Given a point in window coordinates and a view in that window, return a
 // flipped point in screen coordinates.
 - (NSPoint)flipWindowPointToScreen:(const NSPoint&)windowPoint
                               view:(NSView*)view;
 @end