Use FilePath::BaseName instead of the deprecated file_util::GetFilenameFromPath. Part 3.

chrome/test/mini_installer_test/mini_installer_test_util.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.
 
 #include "chrome/test/mini_installer_test/mini_installer_test_util.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/process_util.h"
@@ skipping 72 matching lines @@
   return_command->append(mini_installer_constants::kChromeApplyTagParameters);
   VLOG(1) << "Command to run Apply tag: " << return_command->c_str();
   return true;
 }
 
 std::wstring MiniInstallerTestUtil::GetFilePath(const wchar_t* exe_name) {
   FilePath installer_path;
   PathService::Get(base::DIR_EXE, &installer_path);
   installer_path = installer_path.Append(exe_name);
   VLOG(1) << "Chrome exe path: " << installer_path.value().c_str();
-  return installer_path.ToWStringHack();
+  return installer_path.value();
 }
 
 // This method will first call GetLatestFile to get the list of all
 // builds, sorted on creation time. Then goes through each build folder
 // until it finds the installer file that matches the pattern argument.
 bool MiniInstallerTestUtil::GetInstaller(const wchar_t* pattern,
     std::wstring *path, const wchar_t* channel_type, bool chrome_frame) {
   FileInfoList builds_list;
   FileInfoList exe_list;
   std::wstring chrome_diff_installer(
@@ skipping 57 matching lines @@
     ret = FindNextFile(file_handle, &find_file_data);
   }
   std::sort(file_details->rbegin(), file_details->rend(), &IsNewer);
   FindClose(file_handle);
   return return_val;
 }
 
 // This method retrieves the previous build version for the given diff
 // installer path.
 bool MiniInstallerTestUtil::GetPreviousBuildNumber(const std::wstring& path,
-    std::wstring *build_number) {
+                                                   std::wstring *build_number) {
 
-  std::wstring diff_name = file_util::GetFilenameFromPath(path);
+  std::wstring diff_name = FilePath(path).BaseName().value();
   // We want to remove 'from_', so add its length to found index (which is 5)
   std::wstring::size_type start_position = diff_name.find(L"from_") + 5;
   std::wstring::size_type end_position = diff_name.find(L"_c");
   std::wstring::size_type size = end_position - start_position;
 
   std::wstring build_no = diff_name.substr(start_position, size);
 
   // Search for a build folder with this build suffix.
   std::wstring pattern = L"*" + build_no;
 
   file_util::FileEnumerator files(FilePath(
       mini_installer_constants::kChromeDiffInstallerLocation),
       false, file_util::FileEnumerator::DIRECTORIES, pattern);
   FilePath folder = files.Next();
   if (folder.empty())
     return false;
 
-  build_number->assign(folder.BaseName().ToWStringHack());
+  build_number->assign(folder.BaseName().value());
   return true;
 }
 
 
 // This method will get the previous full installer path
 // from given diff installer path. It will first get the
 // filename from the diff installer path, gets the previous
 // build information from the filename, then computes the
 // path for previous full installer.
 bool MiniInstallerTestUtil::GetPreviousFullInstaller(
@@ skipping 98 matching lines @@
   }
   return true;
 }
 
 bool MiniInstallerTestUtil::VerifyProcessHandleClosed(
     base::ProcessHandle handle) {
   DWORD result = WaitForSingleObject(handle,
       TestTimeouts::large_test_timeout_ms());
   return result == WAIT_OBJECT_0;
 }