Fix a bug in file_util::Delete() where symlinks are not handled right

base/file_util_unittest.cc

 // Copyright (c) 2012 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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 726 matching lines @@
   // Test recursive case, create a new file
   file_name = temp_dir_.path().Append(FPL("Test DeleteFile 2.txt"));
   CreateTextFile(file_name, bogus_content);
   ASSERT_TRUE(file_util::PathExists(file_name));
 
   // Make sure it's deleted
   EXPECT_TRUE(file_util::Delete(file_name, true));
   EXPECT_FALSE(file_util::PathExists(file_name));
 }
 
+#if defined(OS_POSIX)
+TEST_F(FileUtilTest, DeleteSymlinkOfExistentFile) {

[satorux1, 2012/06/29 18:25:20]

DeleteSymlinkToExistentFile

[yoshiki, 2012/06/29 19:12:27]

Done.

+  // Create a file
+  FilePath file_name = temp_dir_.path().Append(FPL("Test DeleteFile 2.txt"));
+  CreateTextFile(file_name, bogus_content);
+  ASSERT_TRUE(file_util::PathExists(file_name));
+
+  // Create a symlink to the file.
+  FilePath file_link = temp_dir_.path().Append("file_link_2");
+  ASSERT_TRUE(file_util::CreateSymbolicLink(file_name, file_link))
+      << "Failed to create symlink.";
+
+  // Delete the symbolic link.
+  EXPECT_TRUE(file_util::Delete(file_link, false));
+
+  // Make sure original file is not deleted
+  EXPECT_FALSE(file_util::PathExists(file_link));
+  EXPECT_TRUE(file_util::PathExists(file_name));
+}
+
+TEST_F(FileUtilTest, DeleteSymlinkOfNonExistentFile) {

[satorux1, 2012/06/29 18:25:20]

DeleteSymlinkToNonExistentFile

[satorux1, 2012/06/29 18:25:20]

DeleteSymlinkToNonExistentFile

[yoshiki, 2012/06/29 19:12:27]

Done.

+  // Create a dummy file to be deleted.
+  FilePath non_existent = temp_dir_.path().Append(FPL("Test DeleteFile 3.txt"));
+  CreateTextFile(non_existent, bogus_content);
+  EXPECT_TRUE(file_util::PathExists(non_existent));

[satorux1, 2012/06/29 18:25:20]

You don't need a dummy file to create a dangling symlink

[yoshiki, 2012/06/29 19:12:27]

Done.

+
+  // Create a symlink to the dummy file.
+  FilePath file_link = temp_dir_.path().Append("file_link_3");
+  ASSERT_TRUE(file_util::CreateSymbolicLink(non_existent, file_link))
+      << "Failed to create symlink.";
+  EXPECT_TRUE(file_util::PathExists(non_existent));
+  EXPECT_TRUE(file_util::PathExists(file_link));
+
+  // Delete the dummy file, keeping the symbolic link.
+  EXPECT_TRUE(file_util::Delete(non_existent, false));
+  EXPECT_FALSE(file_util::PathExists(non_existent));
+  EXPECT_FALSE(file_util::PathExists(file_link));

[satorux1, 2012/06/29 18:25:20]

I'd suggest to remove this part too.

[yoshiki, 2012/06/29 19:12:27]

Done.

+
+  // Make sure the symbolic link is not deleted
+  EXPECT_TRUE(file_util::IsLink(file_link));
+
+  // Delete the symbolic link.
+  EXPECT_TRUE(file_util::Delete(file_link, false));
+
+  // Make sure the symbolic link is deleted
+  EXPECT_FALSE(file_util::IsLink(file_link));
+}
+#endif  // defined(OS_POSIX)
+
 #if defined(OS_WIN)
 // Tests that the Delete function works for wild cards, especially
 // with the recursion flag.  Also coincidentally tests PathExists.
 // TODO(erikkay): see if anyone's actually using this feature of the API
 TEST_F(FileUtilTest, DeleteWildCard) {
   // Create a file and a directory
   FilePath file_name = temp_dir_.path().Append(FPL("Test DeleteWildCard.txt"));
   CreateTextFile(file_name, bogus_content);
   ASSERT_TRUE(file_util::PathExists(file_name));
 
@@ skipping 1519 matching lines @@
       file_util::VerifyPathControlledByUser(
           base_dir_, text_file_, uid_, ok_gids_));
   EXPECT_TRUE(
       file_util::VerifyPathControlledByUser(
           sub_dir_, text_file_, uid_, ok_gids_));
 }
 
 #endif  // defined(OS_POSIX)
 
 }  // namespace