Deprecate more old filepath functions.

webkit/tools/test_shell/test_webview_delegate.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
@@ skipping 119 matching lines @@
 const char* kIllegalString = "illegal value";
 
 int next_page_id_ = 1;
 
 // Used to write a platform neutral file:/// URL by only taking the filename
 // (e.g., converts "file:///tmp/foo.txt" to just "foo.txt").
 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;
 }
 
 // Used to write a platform neutral file:/// URL by taking the
 // filename and its directory. (e.g., converts
 // "file:///tmp/foo/bar.txt" to just "bar.txt").
 std::string DescriptionSuitableForTestResult(const std::string& url) {
   if (url.empty() || std::string::npos == url.find("file://"))
@@ skipping 1144 matching lines @@
 }
 
 void TestWebViewDelegate::set_fake_window_rect(const WebRect& rect) {
   fake_rect_ = rect;
   using_fake_rect_ = true;
 }
 
 WebRect TestWebViewDelegate::fake_window_rect() {
   return fake_rect_;
 }