Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ui / base / dragdrop / os_exchange_data_unittest.cc

diff --git a/src/ui/base/dragdrop/os_exchange_data_unittest.cc b/src/ui/base/dragdrop/os_exchange_data_unittest.cc
index ff0ddfc..417b6a6 100644 (file)
--- a/src/ui/base/dragdrop/os_exchange_data_unittest.cc
+++ b/src/ui/base/dragdrop/os_exchange_data_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.h"
@@ -104,6 +104,7 @@ TEST_F(OSExchangeDataTest, TestFileToURLConversion) {
   ASSERT_TRUE(base::GetCurrentDirectory(&current_directory));
 
   data.SetFilename(current_directory);
+
   {
     EXPECT_FALSE(data.HasURL(OSExchangeData::DO_NOT_CONVERT_FILENAMES));
     GURL actual_url;
@@ -113,6 +114,7 @@ TEST_F(OSExchangeDataTest, TestFileToURLConversion) {
     EXPECT_EQ(GURL(), actual_url);
     EXPECT_EQ(base::string16(), actual_title);
   }
+
   {
 // Filename to URL conversion is not implemented on ChromeOS or on non-X11 Linux
 // builds.
@@ -130,7 +132,9 @@ TEST_F(OSExchangeDataTest, TestFileToURLConversion) {
         expected_success,
         data.GetURLAndTitle(
             OSExchangeData::CONVERT_FILENAMES, &actual_url, &actual_title));
-    EXPECT_EQ(expected_url, actual_url);
+    // Some Mac OS versions return the URL in file://localhost form instead
+    // of file:///, so we compare the url's path not its absolute string.
+    EXPECT_EQ(expected_url.path(), actual_url.path());
     EXPECT_EQ(base::string16(), actual_title);
   }
   EXPECT_TRUE(data.HasFile());