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

ui/base/dragdrop/os_exchange_data.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 "ui/base/dragdrop/os_exchange_data.h"
 
 #include "base/pickle.h"
 #include "url/gurl.h"
 
 namespace ui {
@@ skipping 44 matching lines @@
 
 void OSExchangeData::SetPickledData(const CustomFormat& format,
                                     const Pickle& data) {
   provider_->SetPickledData(format, data);
 }
 
 bool OSExchangeData::GetString(base::string16* data) const {
   return provider_->GetString(data);
 }
 
-bool OSExchangeData::GetURLAndTitle(GURL* url, base::string16* title) const {
-  return provider_->GetURLAndTitle(url, title);
+bool OSExchangeData::GetURLAndTitle(FilenameToURLPolicy policy,
+                                    GURL* url,
+                                    base::string16* title) const {
+  return provider_->GetURLAndTitle(policy, url, title);
 }
 
 bool OSExchangeData::GetFilename(base::FilePath* path) const {
   return provider_->GetFilename(path);
 }
 
 bool OSExchangeData::GetFilenames(
     std::vector<FileInfo>* filenames) const {
   return provider_->GetFilenames(filenames);
 }
@@ skipping 93 matching lines @@
 void OSExchangeData::SetHtml(const base::string16& html, const GURL& base_url) {
   provider_->SetHtml(html, base_url);
 }
 
 bool OSExchangeData::GetHtml(base::string16* html, GURL* base_url) const {
   return provider_->GetHtml(html, base_url);
 }
 #endif
 
 }  // namespace ui