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

chrome/browser/ui/views/frame/browser_root_view.cc

Index: chrome/browser/ui/views/frame/browser_root_view.cc
===================================================================
--- chrome/browser/ui/views/frame/browser_root_view.cc	(revision 245050)
+++ chrome/browser/ui/views/frame/browser_root_view.cc	(working copy)
@@ -96,7 +96,9 @@
   GURL url;
   base::string16 title;
   ui::OSExchangeData mapped_data;
-  if (!event.data().GetURLAndTitle(&url, &title) || !url.is_valid()) {
+  if (!event.data().GetURLAndTitle(
+           ui::OSExchangeData::CONVERT_FILENAMES, &url, &title) ||
+      !url.is_valid()) {
     // The url isn't valid. Use the paste and go url.
     if (GetPasteAndGoURL(event.data(), &url))
       mapped_data.SetURL(url, base::string16());