Use FilePaths in content::DropData to avoid redundant conversions.

ui/base/dragdrop/os_exchange_data_provider_aurax11_unittest.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 "ui/base/dragdrop/os_exchange_data_provider_aurax11.h"
 
 // Clean up X11 header polution
 #undef None
 #undef Bool
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/dragdrop/file_info.h"
 #include "url/gurl.h"
 
 const char kFileURL[] = "file:///home/user/file.txt";
 const char kFileName[] = "/home/user/file.txt";
 const char kGoogleTitle[] = "Google";
 const char kGoogleURL[] = "http://www.google.com/";
 
 namespace ui {
 
 class OSExchangeDataProviderAuraX11Test : public testing::Test {
@@ skipping 56 matching lines @@
 }
 
 TEST_F(OSExchangeDataProviderAuraX11Test, URIListWithBoth) {
   AddURLList("file:///home/user/file.txt\nhttp://www.google.com");
 
   EXPECT_TRUE(provider.HasFile());
   EXPECT_TRUE(provider.HasURL(ui::OSExchangeData::CONVERT_FILENAMES));
   EXPECT_TRUE(provider.HasURL(ui::OSExchangeData::DO_NOT_CONVERT_FILENAMES));
 
   // We should only receive the file from GetFilenames().
-  std::vector<OSExchangeData::FileInfo> filenames;
+  std::vector<FileInfo> filenames;
   EXPECT_TRUE(provider.GetFilenames(&filenames));
   ASSERT_EQ(1u, filenames.size());
   EXPECT_EQ(kFileName, filenames[0].path.value());
 
   // We should only receive the URL here.
   GURL out_gurl;
   base::string16 out_str;
   EXPECT_TRUE(provider.GetURLAndTitle(
       OSExchangeData::DO_NOT_CONVERT_FILENAMES, &out_gurl, &out_str));
   EXPECT_EQ(base::string16(), out_str);
@@ skipping 14 matching lines @@
   AddURLList(kFileURL);
 
   EXPECT_FALSE(provider.HasString());
   base::string16 out_str;
   EXPECT_FALSE(provider.GetString(&out_str));
 
   EXPECT_TRUE(provider.HasFile());
 }
 
 }  // namespace ui