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

chrome/browser/bookmarks/bookmark_node_data_unittest.cc

Index: chrome/browser/bookmarks/bookmark_node_data_unittest.cc
===================================================================
--- chrome/browser/bookmarks/bookmark_node_data_unittest.cc	(revision 245050)
+++ chrome/browser/bookmarks/bookmark_node_data_unittest.cc	(working copy)
@@ -126,7 +126,8 @@
   // Writing should also put the URL and title on the clipboard.
   GURL read_url;
   base::string16 read_title;
-  EXPECT_TRUE(data2.GetURLAndTitle(&read_url, &read_title));
+  EXPECT_TRUE(data2.GetURLAndTitle(
+      ui::OSExchangeData::CONVERT_FILENAMES, &read_url, &read_title));
   EXPECT_EQ(url, read_url);
   EXPECT_EQ(title, read_title);
 }