Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Unified Diff: ui/base/dragdrop/os_exchange_data_unittest.cc

Issue 394983002: Fix TestFileToURLConversion on Linux non-X11 builds (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/dragdrop/os_exchange_data_unittest.cc
diff --git a/ui/base/dragdrop/os_exchange_data_unittest.cc b/ui/base/dragdrop/os_exchange_data_unittest.cc
index 39364bf4a73d4b330729e5f2f61356d9bc47ddfa..ff0ddfc2c21cdcf72b0f133b9fb1ffdda5286ca9 100644
--- a/ui/base/dragdrop/os_exchange_data_unittest.cc
+++ b/ui/base/dragdrop/os_exchange_data_unittest.cc
@@ -114,13 +114,14 @@ TEST_F(OSExchangeDataTest, TestFileToURLConversion) {
EXPECT_EQ(base::string16(), actual_title);
}
{
-// Filename to URL conversion is not implemented on ChromeOS.
-#if !defined(OS_CHROMEOS)
- const bool expected_success = true;
- const GURL expected_url(net::FilePathToFileURL(current_directory));
-#else
+// Filename to URL conversion is not implemented on ChromeOS or on non-X11 Linux
+// builds.
+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(USE_X11))
const bool expected_success = false;
const GURL expected_url;
+#else
+ const bool expected_success = true;
+ const GURL expected_url(net::FilePathToFileURL(current_directory));
#endif
EXPECT_EQ(expected_success, data.HasURL(OSExchangeData::CONVERT_FILENAMES));
GURL actual_url;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698