Use FilePath::DirName instead of the deprecated file_util::GetDirectoryFromPath.

chrome/installer/util/lzma_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/installer/util/lzma_util.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 
@@ skipping 141 matching lines @@
     CFileItem *f = db.Database.Files + i;
 
     if ((ret = SzExtract(&archiveStream.InStream, &db, i, &blockIndex,
                          &outBuffer, &outBufferSize, &offset, &outSizeProcessed,
                          &allocImp, &allocTempImp)) != SZ_OK) {
       LOG(ERROR) << L"Error returned by SzExtract: " << ret;
       break;
     }
 
     // Append location to the file path in archive, to get full path.
-    std::wstring wfileName(location);
-    file_util::AppendToPath(&wfileName, UTF8ToWide(f->Name));
+    std::wstring file_name(location);

[Evan Martin, 2011/01/06 23:39:49]

Maybe better to make this a FilePath?  Then we could use FilePath::Append() in
the next line instead of file_util::AppendToPath()

[tfarina, 2011/01/06 23:52:48]

Done. PTAL!

+    file_util::AppendToPath(&file_name, UTF8ToWide(f->Name));
     if (output_file)
-      *output_file = wfileName;
+      *output_file = file_name;
 
     // If archive entry is directory create it and move on to the next entry.
     if (f->IsDirectory) {
-      file_util::CreateDirectory(FilePath(wfileName));
+      file_util::CreateDirectory(FilePath(file_name));
       continue;
     }
 
     HANDLE hFile;
-    std::wstring directory = file_util::GetDirectoryFromPath(wfileName);
-    file_util::CreateDirectory(FilePath(directory));
+    file_util::CreateDirectory(FilePath(file_name).DirName());
 
-    hFile = CreateFile(wfileName.c_str(), GENERIC_WRITE, 0, NULL,
+    hFile = CreateFile(file_name.c_str(), GENERIC_WRITE, 0, NULL,
                        CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
     if (hFile == INVALID_HANDLE_VALUE)  {
       ret = GetLastError();
       LOG(ERROR) << L"Error returned by CreateFile: " << ret;
       break;
     }
 
     if ((!WriteFile(hFile, outBuffer + offset, (DWORD) outSizeProcessed,
                     &written, NULL)) ||
         (written != outSizeProcessed)) {
@@ skipping 23 matching lines @@
   SzArDbExFree(&db, allocImp.Free);
   return ret;
 }
 
 void LzmaUtil::CloseArchive() {
   if (archive_handle_) {
     CloseHandle(archive_handle_);
     archive_handle_ = NULL;
   }
 }