Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(144)

Side by Side Diff: chrome/installer/util/duplicate_tree_detector.cc

Issue 13165005: Move FileEnumerator to its own file, do some refactoring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge, fixes Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 // 4 //
5 5
6 #include "chrome/installer/util/duplicate_tree_detector.h" 6 #include "chrome/installer/util/duplicate_tree_detector.h"
7 7
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/files/file_enumerator.h"
9 #include "base/logging.h" 10 #include "base/logging.h"
10 11
11 namespace installer { 12 namespace installer {
12 13
13 bool IsIdenticalFileHierarchy(const base::FilePath& src_path, 14 bool IsIdenticalFileHierarchy(const base::FilePath& src_path,
14 const base::FilePath& dest_path) { 15 const base::FilePath& dest_path) {
15 using file_util::FileEnumerator;
16 base::PlatformFileInfo src_info; 16 base::PlatformFileInfo src_info;
17 base::PlatformFileInfo dest_info; 17 base::PlatformFileInfo dest_info;
18 18
19 bool is_identical = false; 19 bool is_identical = false;
20 if (file_util::GetFileInfo(src_path, &src_info) && 20 if (file_util::GetFileInfo(src_path, &src_info) &&
21 file_util::GetFileInfo(dest_path, &dest_info)) { 21 file_util::GetFileInfo(dest_path, &dest_info)) {
22 // Both paths exist, check the types: 22 // Both paths exist, check the types:
23 if (!src_info.is_directory && !dest_info.is_directory) { 23 if (!src_info.is_directory && !dest_info.is_directory) {
24 // Two files are "identical" if the file sizes are equivalent. 24 // Two files are "identical" if the file sizes are equivalent.
25 is_identical = src_info.size == dest_info.size; 25 is_identical = src_info.size == dest_info.size;
26 #ifndef NDEBUG 26 #ifndef NDEBUG
27 // For Debug builds, also check last modification time (to make sure 27 // For Debug builds, also check last modification time (to make sure
28 // version dir DLLs are replaced on over-install even if the tested change 28 // version dir DLLs are replaced on over-install even if the tested change
29 // doesn't happen to change a given DLL's size). 29 // doesn't happen to change a given DLL's size).
30 if (is_identical) 30 if (is_identical)
31 is_identical = (src_info.last_modified == dest_info.last_modified); 31 is_identical = (src_info.last_modified == dest_info.last_modified);
32 #endif 32 #endif
33 } else if (src_info.is_directory && dest_info.is_directory) { 33 } else if (src_info.is_directory && dest_info.is_directory) {
34 // Two directories are "identical" if dest_path contains entries that are 34 // Two directories are "identical" if dest_path contains entries that are
35 // "identical" to all the entries in src_path. 35 // "identical" to all the entries in src_path.
36 is_identical = true; 36 is_identical = true;
37 37
38 FileEnumerator path_enum(src_path, false /* not recursive */, 38 base::FileEnumerator path_enum(src_path, false /* not recursive */,
39 FileEnumerator::FILES | FileEnumerator::DIRECTORIES); 39 base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
40 for (base::FilePath path = path_enum.Next(); 40 for (base::FilePath path = path_enum.Next();
41 is_identical && !path.empty(); 41 is_identical && !path.empty();
42 path = path_enum.Next()) { 42 path = path_enum.Next()) {
43 is_identical = 43 is_identical =
44 IsIdenticalFileHierarchy(path, dest_path.Append(path.BaseName())); 44 IsIdenticalFileHierarchy(path, dest_path.Append(path.BaseName()));
45 } 45 }
46 } else { 46 } else {
47 // The two paths are of different types, so they cannot be identical. 47 // The two paths are of different types, so they cannot be identical.
48 DCHECK(!is_identical); 48 DCHECK(!is_identical);
49 } 49 }
50 } 50 }
51 51
52 return is_identical; 52 return is_identical;
53 } 53 }
54 54
55 } // namespace installer 55 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/installer/util/delete_after_reboot_helper.cc ('k') | chrome/installer/util/installer_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698