summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 21:50:13 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 21:50:13 +0000
commite83eedcd41bdebf055f130051d2c84d39f27a466 (patch)
tree2108eb93717e3629397246e25b98afe3798525c9 /webkit
parente62dbbfc6f722159733239d396098e2e0407f56f (diff)
downloadchromium_src-e83eedcd41bdebf055f130051d2c84d39f27a466.zip
chromium_src-e83eedcd41bdebf055f130051d2c84d39f27a466.tar.gz
chromium_src-e83eedcd41bdebf055f130051d2c84d39f27a466.tar.bz2
file_util: deprecate remaining wstring functions
This removes the last wstring-accepting functions from file_util on non-Windows platforms. BUG=24672 Review URL: http://codereview.chromium.org/3005005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/plugins/test/plugin_geturl_test.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/webkit/glue/plugins/test/plugin_geturl_test.cc b/webkit/glue/plugins/test/plugin_geturl_test.cc
index fab83c9..f321b4b 100644
--- a/webkit/glue/plugins/test/plugin_geturl_test.cc
+++ b/webkit/glue/plugins/test/plugin_geturl_test.cc
@@ -155,13 +155,20 @@ NPError PluginGetURLTest::NewStream(NPMIMEType type, NPStream* stream,
break;
}
+ // TODO(evanm): use the net:: functions to convert file:// URLs to
+ // on-disk file paths. But it probably doesn't actually matter in
+ // this test.
+
#if defined(OS_WIN)
filename = filename.substr(8); // remove "file:///"
+ // Assume an ASCII path on Windows.
+ FilePath path = FilePath(ASCIIToWide(filename));
#else
filename = filename.substr(7); // remove "file://"
+ FilePath path = FilePath(filename);
#endif
- test_file_ = file_util::OpenFile(filename, "r");
+ test_file_ = file_util::OpenFile(path, "r");
if (!test_file_) {
SetError("Could not open source file");
}