Implement WebContentsView::GetDropData for Mac; disable on Aura

content/browser/web_contents/web_contents_view_aura.cc

Index: content/browser/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index 0578572dbe317d2ebdc2e974a588703335a77ce2..549fcfec9b7af35f85015ac85b434190629c7550 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -339,7 +339,7 @@ void WebContentsViewAura::CancelDragAndCloseTab() {
 }
 
 WebDropData* WebContentsViewAura::GetDropData() const {
-  return NULL;
+  return current_incoming_drop_data_.get();
 }
 
 bool WebContentsViewAura::IsEventTracking() const {
@@ -565,14 +565,14 @@ void WebContentsViewAura::OnDragEntered(const aura::DropTargetEvent& event) {
   if (drag_dest_delegate_)
     drag_dest_delegate_->DragInitialize(web_contents_);
 
-  WebDropData drop_data;
-  PrepareWebDropData(&drop_data, event.data());
+  current_incoming_drop_data_.reset(new WebDropData());
+  PrepareWebDropData(current_incoming_drop_data_.get(), event.data());
   WebKit::WebDragOperationsMask op = ConvertToWeb(event.source_operations());
 
   gfx::Point screen_pt =
       GetNativeView()->GetRootWindow()->last_mouse_location();
   web_contents_->GetRenderViewHost()->DragTargetDragEnter(
-      drop_data, event.location(), screen_pt, op);
+      *current_incoming_drop_data_, event.location(), screen_pt, op);
 
   if (drag_dest_delegate_) {
     drag_dest_delegate_->OnReceiveDragData(event.data());
@@ -597,6 +597,7 @@ void WebContentsViewAura::OnDragExited() {
   web_contents_->GetRenderViewHost()->DragTargetDragLeave();
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDragLeave();
+  current_incoming_drop_data_.reset();
 }
 
 int WebContentsViewAura::OnPerformDrop(const aura::DropTargetEvent& event) {
@@ -605,5 +606,6 @@ int WebContentsViewAura::OnPerformDrop(const aura::DropTargetEvent& event) {
       GetNativeView()->GetRootWindow()->last_mouse_location());
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDrop();
+  current_incoming_drop_data_.reset();
   return current_drag_op_;
 }