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

chrome/browser/bookmarks/bookmark_node_data_views.cc

 // Copyright 2013 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 "chrome/browser/bookmarks/bookmark_node_data.h"
 
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/url_constants.h"
@@ skipping 38 matching lines @@
     Pickle drag_data_pickle;
     if (data.GetPickledData(GetBookmarkCustomFormat(), &drag_data_pickle)) {
       if (!ReadFromPickle(&drag_data_pickle))
         return false;
     }
   } else {
     // See if there is a URL on the clipboard.
     Element element;
     GURL url;
     base::string16 title;
-    if (data.GetURLAndTitle(&url, &title))
+    if (data.GetURLAndTitle(
+            ui::OSExchangeData::CONVERT_FILENAMES, &url, &title))
       ReadFromTuple(url, title);
   }
 
   return is_valid();
 }