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

chrome_frame/utils.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_frame/utils.h"
 
 #include <htiframe.h>
 #include <mshtml.h>
 #include <shlobj.h>
 
@@ skipping 397 matching lines @@
   return browser_type;
 }
 
 uint32 GetIEMajorVersion() {
   static uint32 ie_major_version = UINT_MAX;
 
   if (ie_major_version == UINT_MAX) {
     wchar_t exe_path[MAX_PATH];
     HMODULE mod = GetModuleHandle(NULL);
     GetModuleFileName(mod, exe_path, arraysize(exe_path) - 1);
-    std::wstring exe_name(file_util::GetFilenameFromPath(exe_path));
+    std::wstring exe_name = FilePath(exe_path).BaseName().ToWStringHack();

[evanm, 2010/12/23 18:13:33]

Since this is Windows-specific code, could you use .value() instead of
.ToWStringHack()?

[tfarina, 2010/12/23 18:27:00]

Done.

     if (!LowerCaseEqualsASCII(exe_name, kIEImageName)) {
       ie_major_version = 0;
     } else {
       uint32 high = 0;
       uint32 low  = 0;
       if (GetModuleVersion(mod, &high, &low)) {
         ie_major_version = HIWORD(high);
       } else {
         ie_major_version = 0;
       }
@@ skipping 1136 matching lines @@
     ++url_list;
   }
 }
 
 std::wstring GetCurrentModuleVersion() {
   scoped_ptr<FileVersionInfo> module_version_info(
       FileVersionInfo::CreateFileVersionInfoForCurrentModule());
   DCHECK(module_version_info.get() != NULL);
   return module_version_info->file_version();
 }