diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 17:54:04 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 17:54:04 +0000 |
| commit | 9ffd9adb2cceb9f68596b23e30f9ec004949df36 (patch) | |
| tree | 8c91cb1b2f1039c7bd8a20c35e1f97e3cd601a16 /net | |
| parent | b13dee3299a400d604038b6a49a161a1048a2373 (diff) | |
| download | chromium_src-9ffd9adb2cceb9f68596b23e30f9ec004949df36.zip chromium_src-9ffd9adb2cceb9f68596b23e30f9ec004949df36.tar.gz chromium_src-9ffd9adb2cceb9f68596b23e30f9ec004949df36.tar.bz2 | |
wstring: allow converting FilePath to wstring in tests
Many of our tests want to use Unicode literal strings with the
L"foobar" syntax. Allow us to test FilePaths against these
strings.
BUG=69467
Review URL: http://codereview.chromium.org/6606025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76763 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/net_util_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc index ebb3574..4201400 100644 --- a/net/base/net_util_unittest.cc +++ b/net/base/net_util_unittest.cc @@ -10,6 +10,7 @@ #include "base/string_util.h" #include "base/stringprintf.h" #include "base/sys_string_conversions.h" +#include "base/test/test_file_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "googleurl/src/gurl.h" @@ -517,7 +518,7 @@ TEST(NetUtilTest, FileURLConversion) { // Back to the filename. EXPECT_TRUE(net::FileURLToFilePath(file_url, &output)); - EXPECT_EQ(round_trip_cases[i].file, output.ToWStringHack()); + EXPECT_EQ(round_trip_cases[i].file, file_util::FilePathAsWString(output)); } // Test that various file: URLs get decoded into the correct file type @@ -556,7 +557,7 @@ TEST(NetUtilTest, FileURLConversion) { }; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(url_cases); i++) { net::FileURLToFilePath(GURL(url_cases[i].url), &output); - EXPECT_EQ(url_cases[i].file, output.ToWStringHack()); + EXPECT_EQ(url_cases[i].file, file_util::FilePathAsWString(output)); } // Unfortunately, UTF8ToWide discards invalid UTF8 input. |