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

content/browser/web_contents/web_drag_source_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_source_mac.h"
 
 #include <sys/param.h>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/mac/mac_logging.h"
 #include "base/mac/mac_util.h"
 #include "base/pickle.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/download/drag_download_file.h"
 #include "content/browser/download/drag_download_util.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_client.h"
+#include "content/public/common/drop_data.h"
 #include "content/public/common/url_constants.h"
 #include "grit/ui_resources.h"
 #include "net/base/escape.h"
 #include "net/base/file_stream.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
 #include "ui/base/clipboard/custom_data_helper.h"
 #include "ui/base/dragdrop/cocoa_dnd_util.h"
 #include "ui/gfx/image/image.h"
-#include "webkit/common/webdropdata.h"
 
 using base::SysNSStringToUTF8;
 using base::SysUTF8ToNSString;
 using base::SysUTF16ToNSString;
 using content::BrowserThread;
 using content::DragDownloadFile;
+using content::DropData;
 using content::PromiseFileFinalizer;
 using content::RenderViewHostImpl;
 using net::FileStream;
 
 namespace {
 
 // An unofficial standard pasteboard title type to be provided alongside the
 // |NSURLPboardType|.
 NSString* const kNSURLTitlePboardType = @"public.url-name";
 
 // Converts a string16 into a FilePath. Use this method instead of
 // -[NSString fileSystemRepresentation] to prevent exceptions from being thrown.
 // See http://crbug.com/78782 for more info.
 base::FilePath FilePathFromFilename(const string16& filename) {
   NSString* str = SysUTF16ToNSString(filename);
   char buf[MAXPATHLEN];
   if (![str getFileSystemRepresentation:buf maxLength:sizeof(buf)])
     return base::FilePath();
   return base::FilePath(buf);
 }
 
 // Returns a filename appropriate for the drop data
 // TODO(viettrungluu): Refactor to make it common across platforms,
 // and move it somewhere sensible.
-base::FilePath GetFileNameFromDragData(const WebDropData& drop_data) {
+base::FilePath GetFileNameFromDragData(const DropData& drop_data) {
   base::FilePath file_name(
       FilePathFromFilename(drop_data.file_description_filename));
 
   // Images without ALT text will only have a file extension so we need to
   // synthesize one from the provided extension and URL.
   if (file_name.empty()) {
     // Retrieve the name from the URL.
     string16 suggested_filename =
         net::GetSuggestedFilename(drop_data.url, "", "", "", "", "");
     const std::string extension = file_name.Extension();
     file_name = FilePathFromFilename(suggested_filename);
     file_name = file_name.ReplaceExtension(extension);
   }
 
   return file_name;
 }
 
 // This helper's sole task is to write out data for a promised file; the caller
 // is responsible for opening the file. It takes the drop data and an open file
 // stream.
-void PromiseWriterHelper(const WebDropData& drop_data,
+void PromiseWriterHelper(const DropData& drop_data,
                          scoped_ptr<FileStream> file_stream) {
   DCHECK(file_stream);
   file_stream->WriteSync(drop_data.file_contents.data(),
                          drop_data.file_contents.length());
 }
 
 // Returns the drop location from a pasteboard.
 NSString* GetDropLocation(NSPasteboard* pboard) {
   // The API to get the drop location during a callback from
   // kPasteboardTypeFileURLPromise is PasteboardCopyPasteLocation, which takes
@@ skipping 30 matching lines @@
 - (void)fillPasteboard;
 - (NSImage*)dragImage;
 
 @end  // @interface WebDragSource(Private)
 
 
 @implementation WebDragSource
 
 - (id)initWithContents:(content::WebContentsImpl*)contents
                   view:(NSView*)contentsView
-              dropData:(const WebDropData*)dropData
+              dropData:(const DropData*)dropData
                  image:(NSImage*)image
                 offset:(NSPoint)offset
             pasteboard:(NSPasteboard*)pboard
      dragOperationMask:(NSDragOperation)dragOperationMask {
   if ((self = [super init])) {
     contents_ = contents;
     DCHECK(contents_);
 
     contentsView_ = contentsView;
     DCHECK(contentsView_);
 
-    dropData_.reset(new WebDropData(*dropData));
+    dropData_.reset(new DropData(*dropData));
     DCHECK(dropData_.get());
 
     dragImage_.reset([image retain]);
     imageOffset_ = offset;
 
     pasteboard_.reset([pboard retain]);
     DCHECK(pasteboard_.get());
 
     dragOperationMask_ = dragOperationMask;
 
@@ skipping 302 matching lines @@
     }
   }
 
   // HTML.
   bool hasHTMLData = !dropData_->html.string().empty();
   // Mail.app and TextEdit accept drags that have both HTML and image flavors on
   // them, but don't process them correctly <http://crbug.com/55879>. Therefore,
   // if there is an image flavor, don't put the HTML data on as HTML, but rather
   // put it on as this Chrome-only flavor.
   //
-  // (The only time that Blink fills in the WebDropData::file_contents is with
+  // (The only time that Blink fills in the DropData::file_contents is with
   // an image drop, but the MIME time is tested anyway for paranoia's sake.)
   bool hasImageData = !dropData_->file_contents.empty() &&
                       fileUTI_ &&
                       UTTypeConformsTo(fileUTI_.get(), kUTTypeImage);
   if (hasHTMLData) {
     if (hasImageData) {
       [pasteboard_ addTypes:@[ui::kChromeDragImageHTMLPboardType]
                       owner:contentsView_];
     } else {
       [pasteboard_ addTypes:@[NSHTMLPboardType] owner:contentsView_];
@@ skipping 15 matching lines @@
 - (NSImage*)dragImage {
   if (dragImage_)
     return dragImage_;
 
   // Default to returning a generic image.
   return content::GetContentClient()->GetNativeImageNamed(
       IDR_DEFAULT_FAVICON).ToNSImage();
 }
 
 @end  // @implementation WebDragSource (Private)