diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/android/md5sum/md5sum.cc | 5 | ||||
| -rw-r--r-- | tools/heapcheck/suppressions.txt | 6 | ||||
| -rw-r--r-- | tools/valgrind/tsan/suppressions.txt | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/tools/android/md5sum/md5sum.cc b/tools/android/md5sum/md5sum.cc index 8543fb6..ceee7d5 100644 --- a/tools/android/md5sum/md5sum.cc +++ b/tools/android/md5sum/md5sum.cc @@ -11,7 +11,6 @@ #include <string> #include "base/file_util.h" -#include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/logging.h" #include "base/md5.h" @@ -54,8 +53,8 @@ std::set<std::string> MakeFileSet(const char** files) { for (const char** file = files; *file; ++file) { base::FilePath file_path(*file); if (file_util::DirectoryExists(file_path)) { - base::FileEnumerator file_enumerator( - file_path, true /* recurse */, base::FileEnumerator::FILES); + file_util::FileEnumerator file_enumerator( + file_path, true /* recurse */, file_util::FileEnumerator::FILES); for (base::FilePath child, empty; (child = file_enumerator.Next()) != empty; ) { // If the path contains /.svn/, ignore it. diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt index 5f3de13..d9320f8 100644 --- a/tools/heapcheck/suppressions.txt +++ b/tools/heapcheck/suppressions.txt @@ -595,8 +595,8 @@ fun:std::string::_S_construct_aux fun:std::string::_S_construct fun:*basic_string* - fun:base::FileEnumerator::ReadDirectory - fun:base::FileEnumerator::Next + fun:file_util::FileEnumerator::ReadDirectory + fun:file_util::FileEnumerator::Next fun:::RelayReadDirectory::RunWork fun:::MessageLoopRelay::ProcessOnTargetThread } @@ -1859,4 +1859,4 @@ fun:net::URLRequest::StartJob fun:net::URLRequest::BeforeRequestComplete fun:net::URLRequest::Start -} +}
\ No newline at end of file diff --git a/tools/valgrind/tsan/suppressions.txt b/tools/valgrind/tsan/suppressions.txt index 5d57017..9d20cef 100644 --- a/tools/valgrind/tsan/suppressions.txt +++ b/tools/valgrind/tsan/suppressions.txt @@ -901,8 +901,8 @@ ThreadSanitizer:Race fun:__alloc_dir fun:opendir - fun:base::FileEnumerator::ReadDirectory - fun:base::FileEnumerator::Next + fun:file_util::FileEnumerator::ReadDirectory + fun:file_util::FileEnumerator::Next fun:::GetPrefsCandidateFilesFromFolder fun:ExternalPrefLoader::ReadStandaloneExtensionPrefFiles fun:ExternalPrefLoader::LoadOnFileThread |