| Index: webkit/tools/test_shell/test_webview_delegate.cc
|
| diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
|
| index 8c27c3a386d96c19e1b0a9e5e9162c8f33e10d20..cc5ced31334d0413c00397c2c755fb3693f9476f 100644
|
| --- a/webkit/tools/test_shell/test_webview_delegate.cc
|
| +++ b/webkit/tools/test_shell/test_webview_delegate.cc
|
| @@ -137,8 +137,10 @@ std::string UrlSuitableForTestResult(const std::string& url) {
|
| if (url.empty() || std::string::npos == url.find("file://"))
|
| return url;
|
|
|
| + // TODO: elsewhere in the codebase we use net::FormatUrl() for this.
|
| std::string filename =
|
| - WideToUTF8(file_util::GetFilenameFromPath(UTF8ToWide(url)));
|
| + WideToUTF8(FilePath::FromWStringHack(UTF8ToWide(url))
|
| + .BaseName().ToWStringHack());
|
| if (filename.empty())
|
| return "file:"; // A WebKit test has this in its expected output.
|
| return filename;
|
|
|