Retire some metrics and update file util methods for JumpList

chrome/browser/win/jumplist_file_util_unittest.cc

 // Copyright (c) 2017 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/browser/win/jumplist_file_util.h"
 
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 34 matching lines @@
 TEST_F(JumpListFileUtilTest, DeleteDirectoryContent) {
   base::FilePath dir_path = temp_dir_path();
 
   // Create a file.
   base::FilePath file_name =
       dir_path.Append(FILE_PATH_LITERAL("TestDeleteFile.txt"));
   ASSERT_NO_FATAL_FAILURE(CreateTextFile(file_name, kFileContent));
 
   // Delete the directory content using DeleteDirectoryContent(). The file
   // should be deleted and the directory remains.
-  ASSERT_EQ(DeleteDirectoryContent(dir_path, kFileDeleteLimit), SUCCEED);
+  DeleteDirectoryContent(dir_path, kFileDeleteLimit);
   EXPECT_FALSE(PathExists(file_name));
   EXPECT_TRUE(DirectoryExists(dir_path));
 }
 
 TEST_F(JumpListFileUtilTest, DeleteSubDirectory) {
   base::FilePath dir_path = temp_dir_path();
 
   // Create a subdirectory.
   base::FilePath test_subdir =
       dir_path.Append(FILE_PATH_LITERAL("TestSubDirectory"));
   ASSERT_NO_FATAL_FAILURE(CreateDirectory(test_subdir));
 
   // Delete the directory using DeleteDirectory(), which should fail because
-  // a subdirectory exists.
-  ASSERT_EQ(DeleteDirectory(dir_path, kFileDeleteLimit),
-            FAIL_SUBDIRECTORY_EXISTS);
+  // a subdirectory exists. Therefore, both root directory and sub-directory
+  // should still exist.
+  DeleteDirectory(dir_path, kFileDeleteLimit);
   EXPECT_TRUE(DirectoryExists(dir_path));
   EXPECT_TRUE(DirectoryExists(test_subdir));
 
   // Delete the subdirectory alone should be working.
-  ASSERT_EQ(DeleteDirectory(test_subdir, kFileDeleteLimit), SUCCEED);
+  DeleteDirectory(test_subdir, kFileDeleteLimit);
   EXPECT_TRUE(DirectoryExists(dir_path));
   EXPECT_FALSE(DirectoryExists(test_subdir));
 }
 
 TEST_F(JumpListFileUtilTest, DeleteMaxFilesAllowed) {
   base::FilePath dir_path = temp_dir_path();
 
   // Create 2 files.
   base::FilePath file_name =
       dir_path.Append(FILE_PATH_LITERAL("TestDeleteFile1.txt"));
   ASSERT_NO_FATAL_FAILURE(CreateTextFile(file_name, kFileContent));
 
   file_name = dir_path.Append(FILE_PATH_LITERAL("TestDeleteFile2.txt"));
   ASSERT_NO_FATAL_FAILURE(CreateTextFile(file_name, kFileContent));
 
   // Delete the directory content using DeleteDirectoryContent().
   // Sine the maximum files allowed to delete is 1, only 1 out of the 2
   // files is deleted. Therefore, the directory is not empty yet.
-  ASSERT_EQ(DeleteDirectoryContent(dir_path, kFileDeleteLimitForTest), SUCCEED);
+  DeleteDirectoryContent(dir_path, kFileDeleteLimitForTest);
   EXPECT_FALSE(base::IsDirectoryEmpty(dir_path));
 
   // Delete another file, and now the directory is empty.
-  ASSERT_EQ(DeleteDirectoryContent(dir_path, kFileDeleteLimitForTest), SUCCEED);
+  DeleteDirectoryContent(dir_path, kFileDeleteLimitForTest);
   EXPECT_TRUE(base::IsDirectoryEmpty(dir_path));
   EXPECT_TRUE(DirectoryExists(dir_path));
 }