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

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

 // Copyright (c) 2012 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/ui/views/frame/browser_root_view.h"
 
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/defaults.h"
@@ skipping 78 matching lines @@
 int BrowserRootView::OnPerformDrop(const ui::DropTargetEvent& event) {
   if (!forwarding_to_tab_strip_)
     return ui::DragDropTypes::DRAG_NONE;
 
   // Extract the URL and create a new ui::OSExchangeData containing the URL. We
   // do this as the TabStrip doesn't know about the autocomplete edit and needs
   // to know about it to handle 'paste and go'.
   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());
     // else case: couldn't extract a url or 'paste and go' url. This ends up
     // passing through an ui::OSExchangeData with nothing in it. We need to do
     // this so that the tab strip cleans up properly.
   } else {
     mapped_data.SetURL(url, base::string16());
   }
   forwarding_to_tab_strip_ = false;
@@ skipping 84 matching lines @@
   AutocompleteClassifierFactory::GetForProfile(
       browser_view_->browser()->profile())->Classify(text, false, false, &match,
                                                      NULL);
   if (!match.destination_url.is_valid())
     return false;
 
   if (url)
     *url = match.destination_url;
   return true;
 }