Deprecate more old filepath functions.

These still exist on Windows due to being used by the installer,
but by moving them into the Windows-only block we prevent them
from being used in new code.

BUG=24672

Review URL: http://codereview.chromium.org/2861042

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51453 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 3 deletions

diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 62bacb2..6845a95 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -773,8 +773,7 @@ bool IsDefaultPluginEnabled() {
   FilePath exe_path;
 
   if (PathService::Get(base::FILE_EXE, &exe_path)) {
-    std::wstring exe_name = file_util::GetFilenameFromPath(
-        exe_path.ToWStringHack());
+    std::wstring exe_name = exe_path.BaseName().ToWStringHack();
     if (StartsWith(exe_name, L"test_shell_tests", false))
       return true;
   }
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc
index 8c27c3a..cc5ced31 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;