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

chrome/installer/setup/uninstall.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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 defines the methods useful for uninstalling Chrome.
 
 #include "chrome/installer/setup/uninstall.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/registry.h"
@@ skipping 120 matching lines @@
     ret = ScheduleFileSystemEntityForDeletion(grandparent_dir.value().c_str());
     if (!ret) {
       LOG(ERROR) << "Failed to schedule grandparent dir for deletion: "
                  << grandparent_dir.value();
     }
   }
   return ret;
 }
 
 // Deletes empty parent & empty grandparent dir of given path.
-bool DeleteEmptyParentDir(const std::wstring& path) {
+bool DeleteEmptyParentDir(const FilePath& path) {
   bool ret = true;
-  std::wstring parent_dir = file_util::GetDirectoryFromPath(path);
-  if (!parent_dir.empty() && file_util::IsDirectoryEmpty(parent_dir)) {
+  FilePath parent_dir = path.DirName();
+  if (!parent_dir.empty() && file_util::IsDirectoryEmpty(parent_dir.value())) {
     if (!file_util::Delete(parent_dir, true)) {
       ret = false;
-      LOG(ERROR) << "Failed to delete folder: " << parent_dir;
+      LOG(ERROR) << "Failed to delete folder: " << parent_dir.value();
     }
 
-    parent_dir = file_util::GetDirectoryFromPath(parent_dir);
-    if (!parent_dir.empty() && file_util::IsDirectoryEmpty(parent_dir)) {
+    parent_dir = parent_dir.DirName();
+    if (!parent_dir.empty() &&
+        file_util::IsDirectoryEmpty(parent_dir.value())) {

[tony, 2010/05/24 03:32:29]

Nit: It would be good to make a FilePath version of this.  Would be good for a
follow up patch.

       if (!file_util::Delete(parent_dir, true)) {
         ret = false;
-        LOG(ERROR) << "Failed to delete folder: " << parent_dir;
+        LOG(ERROR) << "Failed to delete folder: " << parent_dir.value();
       }
     }
   }
   return ret;
 }
 
 enum DeleteResult {
   DELETE_SUCCEEDED,
   DELETE_FAILED,
   DELETE_REQUIRES_REBOOT
@@ skipping 84 matching lines @@
       if (InstallUtil::IsChromeFrameProcess()) {
         ScheduleDirectoryForDeletion(user_local_state.value().c_str());
         result = DELETE_REQUIRES_REBOOT;
       } else {
         result = DELETE_FAILED;
       }
     }
     if (result == DELETE_REQUIRES_REBOOT) {
       ScheduleParentAndGrandparentForDeletion(user_local_state);
     } else {
-      DeleteEmptyParentDir(user_local_state.value());
+      DeleteEmptyParentDir(user_local_state);
     }
   }
 
   if (result == DELETE_REQUIRES_REBOOT) {
     // If we need a reboot to continue, schedule the parent directories for
     // deletion unconditionally. If they are not empty, the session manager
     // will not delete them on reboot.
     ScheduleParentAndGrandparentForDeletion(FilePath(install_path));
   } else {
     // Now check and delete if the parent directories are empty
     // For example Google\Chrome or Chromium
-    DeleteEmptyParentDir(install_path);
+    DeleteEmptyParentDir(FilePath(install_path));
   }
   return result;
 }
 
 // This method tries to delete a registry key and logs an error message
 // in case of failure. It returns true if deletion is successful,
 // otherwise false.
 bool DeleteRegistryKey(RegKey& key, const std::wstring& key_path) {
   LOG(INFO) << "Deleting registry key " << key_path;
   if (!key.DeleteKey(key_path.c_str()) &&
@@ skipping 306 matching lines @@
                                     distribution_data);
   }
 
   // Try and delete the preserved local state once the post-install
   // operations are complete.
   if (!local_state_path.empty())
     file_util::Delete(local_state_path, false);
 
   return ret;
 }