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

Unified Diff: webkit/tools/test_shell/test_webview_delegate.cc

Issue 2861042: Deprecate more old filepath functions. (Closed)
Patch Set: Created 10 years, 6 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 | « webkit/tools/test_shell/test_shell.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « webkit/tools/test_shell/test_shell.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698