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

content/browser/web_contents/web_drag_dest_mac.mm

 // 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 "content/browser/web_contents/web_drag_dest_mac.h"
 
 #import <Carbon/Carbon.h>
 
 #include "base/strings/sys_string_conversions.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_drag_dest_delegate.h"
+#include "content/public/common/drop_data.h"
 #import "third_party/mozilla/NSPasteboard+Utils.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/base/clipboard/custom_data_helper.h"
 #import "ui/base/dragdrop/cocoa_dnd_util.h"
 #include "ui/base/window_open_disposition.h"
-#include "webkit/common/webdropdata.h"
 
 using WebKit::WebDragOperationsMask;
+using content::DropData;
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContentsImpl;
 
 int GetModifierFlags() {
   int modifier_state = 0;
   UInt32 currentModifiers = GetCurrentKeyModifiers();
   if (currentModifiers & ::shiftKey)
     modifier_state |= WebKit::WebInputEvent::ShiftKey;
   if (currentModifiers & ::controlKey)
@@ skipping 11 matching lines @@
 // drag&drop messages to WebCore and handle navigation on a successful drop
 // (if necessary).
 - (id)initWithWebContentsImpl:(WebContentsImpl*)contents {
   if ((self = [super init])) {
     webContents_ = contents;
     canceled_ = false;
   }
   return self;
 }
 
-- (WebDropData*)currentDropData {
+- (DropData*)currentDropData {
   return dropData_.get();
 }
 
 - (void)setDragDelegate:(content::WebDragDestDelegate*)delegate {
   delegate_ = delegate;
 }
 
 // Call to set whether or not we should allow the drop. Takes effect the
 // next time |-draggingUpdated:| is called.
 - (void)setCurrentOperation:(NSDragOperation)operation {
@@ skipping 34 matching lines @@
 
 // Messages to send during the tracking of a drag, usually upon receiving
 // calls from the view system. Communicates the drag messages to WebCore.
 
 - (NSDragOperation)draggingEntered:(id<NSDraggingInfo>)info
                               view:(NSView*)view {
   // Save off the RVH so we can tell if it changes during a drag. If it does,
   // we need to send a new enter message in draggingUpdated:.
   currentRVH_ = webContents_->GetRenderViewHost();
 
-  // Fill out a WebDropData from pasteboard.
-  scoped_ptr<WebDropData> dropData;
-  dropData.reset(new WebDropData());
-  [self populateWebDropData:dropData.get()
+  // Fill out a DropData from pasteboard.
+  scoped_ptr<DropData> dropData;
+  dropData.reset(new DropData());
+  [self populateDropData:dropData.get()
              fromPasteboard:[info draggingPasteboard]];
 
   NSDragOperation mask = [info draggingSourceOperationMask];
 
   // Give the delegate an opportunity to cancel the drag.
   canceled_ = !webContents_->GetDelegate()->CanDragEnter(
       webContents_,
       *dropData,
       static_cast<WebDragOperationsMask>(mask));
   if (canceled_)
@@ skipping 117 matching lines @@
       GetModifierFlags());
 
   dropData_.reset();
 
   return YES;
 }
 
 // Given |data|, which should not be nil, fill it in using the contents of the
 // given pasteboard. The types handled by this method should be kept in sync
 // with [WebContentsViewCocoa registerDragTypes].
-- (void)populateWebDropData:(WebDropData*)data
-             fromPasteboard:(NSPasteboard*)pboard {
+- (void)populateDropData:(DropData*)data
+          fromPasteboard:(NSPasteboard*)pboard {
   DCHECK(data);
   DCHECK(pboard);
   NSArray* types = [pboard types];
 
   // Get URL if possible. To avoid exposing file system paths to web content,
   // filenames in the drag are not converted to file URLs.
   ui::PopulateURLAndTitleFromPasteboard(&data->url,
                                         &data->url_title,
                                         pboard,
                                         NO);
@@ skipping 20 matching lines @@
   // Get files.
   if ([types containsObject:NSFilenamesPboardType]) {
     NSArray* files = [pboard propertyListForType:NSFilenamesPboardType];
     if ([files isKindOfClass:[NSArray class]] && [files count]) {
       for (NSUInteger i = 0; i < [files count]; i++) {
         NSString* filename = [files objectAtIndex:i];
         BOOL exists = [[NSFileManager defaultManager]
                            fileExistsAtPath:filename];
         if (exists) {
           data->filenames.push_back(
-              WebDropData::FileInfo(
+              DropData::FileInfo(
                   base::SysNSStringToUTF16(filename), string16()));
         }
       }
     }
   }
 
   // TODO(pinkerton): Get file contents. http://crbug.com/34661
 
   // Get custom MIME data.
   if ([types containsObject:ui::kWebCustomDataPboardType]) {
     NSData* customData = [pboard dataForType:ui::kWebCustomDataPboardType];
     ui::ReadCustomDataIntoMap([customData bytes],
                               [customData length],
                               &data->custom_data);
   }
 }
 
 @end