Merge 244538 "Don't populate URL data in WebDropData when draggi..."

ui/base/dragdrop/os_exchange_data_provider_win.cc

Index: ui/base/dragdrop/os_exchange_data_provider_win.cc
===================================================================
--- ui/base/dragdrop/os_exchange_data_provider_win.cc	(revision 245050)
+++ ui/base/dragdrop/os_exchange_data_provider_win.cc	(working copy)
@@ -386,10 +386,16 @@
   return ClipboardUtil::GetPlainText(source_object_, data);
 }
 
-bool OSExchangeDataProviderWin::GetURLAndTitle(GURL* url,
-                                               base::string16* title) const {
+bool OSExchangeDataProviderWin::GetURLAndTitle(
+    OSExchangeData::FilenameToURLPolicy policy,
+    GURL* url,
+    base::string16* title) const {
   base::string16 url_str;
-  bool success = ClipboardUtil::GetUrl(source_object_, &url_str, title, true);
+  bool success = ClipboardUtil::GetUrl(
+      source_object_,
+      &url_str,
+      title,
+      policy == OSExchangeData::CONVERT_FILENAMES ? true : false);
   if (success) {
     GURL test_url(url_str);
     if (test_url.is_valid()) {