Add WebDragData to blink::WebView::dragtargetDrop

chrome/browser/ui/webui/webui_webview_browsertest.cc

 // Copyright 2015 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.
 
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h"
@@ skipping 285 matching lines @@
                                       "destNode.offsetHeight"));
   const gfx::Point client_pt(
       guest_dest_rect.x() + guest_dest_rect.width() / 2 + webview_rect.x(),
       guest_dest_rect.y() + guest_dest_rect.height() / 2 + webview_rect.y());
   gfx::Rect container_bounds = embedder_web_contents->GetContainerBounds();
   const gfx::Point screen_pt(container_bounds.x(), container_bounds.y());
   const blink::WebDragOperationsMask drag_operation_mask =
       static_cast<blink::WebDragOperationsMask>(blink::WebDragOperationCopy |
                                      blink::WebDragOperationLink |
                                      blink::WebDragOperationMove);
+  content::DropData dropdata;
+  dropdata.did_originate_from_renderer = true;
+  dropdata.url = GURL(url::kAboutBlankURL);
+  dropdata.url_title = base::string16(base::ASCIIToUTF16("Drop me"));
 
   // Drag url into input in webview.
 
   {
     EXPECT_TRUE(content::ExecuteScript(embedder_web_contents,
                                        "console.log('step1: Drag Enter')"));
 
-    content::DropData dropdata;
-    dropdata.did_originate_from_renderer = true;
-    dropdata.url = GURL(url::kAboutBlankURL);
-    dropdata.url_title = base::string16(base::ASCIIToUTF16("Drop me"));
-
     WebUIMessageListener listener(embedder_web_contents->GetWebUI(),
                                   "Step1: destNode gets dragenter");
+    render_view_host->FilterDropData(&dropdata);
     render_view_host->DragTargetDragEnter(dropdata, client_pt, screen_pt,
                                           drag_operation_mask,
                                           blink::WebInputEvent::LeftButtonDown);
     ASSERT_TRUE(listener.Wait());
   }
 
   {
     EXPECT_TRUE(content::ExecuteScript(embedder_web_contents,
                                        "console.log('step2: Drag Over')"));
 
     WebUIMessageListener listener(embedder_web_contents->GetWebUI(),
                                   "Step2: destNode gets dragover");
     render_view_host->DragTargetDragOver(client_pt, screen_pt,
                                          drag_operation_mask,
                                          blink::WebInputEvent::LeftButtonDown);
     ASSERT_TRUE(listener.Wait());
   }
 
   {
     EXPECT_TRUE(content::ExecuteScript(embedder_web_contents,
                                        "console.log('step3: Drop')"));
 
     DNDToInputNavigationObserver observer(embedder_web_contents);
     WebUIMessageListener listener(embedder_web_contents->GetWebUI(),
                                   "Step3: destNode gets drop");
-    render_view_host->DragTargetDrop(client_pt, screen_pt, 0);
+    render_view_host->DragTargetDrop(dropdata, client_pt, screen_pt, 0);
     ASSERT_TRUE(listener.Wait());
     // Confirm no navigation
     EXPECT_FALSE(observer.Navigated());
     EXPECT_EQ(GetWebViewEnabledWebUIURL(), embedder_web_contents->GetURL());
   }
 }
 #endif