| OLD | NEW |
| 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 #include "net/disk_cache/cache_util.h" | 5 #include "net/disk_cache/cache_util.h" |
| 6 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 | 10 |
| 11 namespace disk_cache { | 11 namespace disk_cache { |
| 12 | 12 |
| 13 bool MoveCache(const FilePath& from_path, const FilePath& to_path) { | 13 bool MoveCache(const FilePath& from_path, const FilePath& to_path) { |
| 14 #if defined(OS_CHROMEOS) | 14 #if defined(OS_CHROMEOS) |
| 15 // For ChromeOS, we don't actually want to rename the cache | 15 // For ChromeOS, we don't actually want to rename the cache |
| 16 // directory, because if we do, then it'll get recreated through the | 16 // directory, because if we do, then it'll get recreated through the |
| 17 // encrypted filesystem (with encrypted names), and we won't be able | 17 // encrypted filesystem (with encrypted names), and we won't be able |
| 18 // to see these directories anymore in an unmounted encrypted | 18 // to see these directories anymore in an unmounted encrypted |
| 19 // filesystem, so we just move each item in the cache to a new | 19 // filesystem, so we just move each item in the cache to a new |
| 20 // directory. | 20 // directory. |
| 21 if (!file_util::CreateDirectory(to_path)) { | 21 if (!file_util::CreateDirectory(to_path)) { |
| 22 LOG(ERROR) << "Unable to create destination cache directory."; | 22 LOG(ERROR) << "Unable to create destination cache directory."; |
| 23 return false; | 23 return false; |
| 24 } | 24 } |
| 25 file_util::FileEnumerator iter( | 25 file_util::FileEnumerator iter( |
| 26 from_path, | 26 from_path, |
| 27 /* recursive */ false, | 27 /* recursive */ false, |
| 28 static_cast<file_util::FileEnumerator::FileType>( | 28 (file_util::FileEnumerator::DIRECTORIES | |
| 29 file_util::FileEnumerator::DIRECTORIES | | 29 file_util::FileEnumerator::FILES)); |
| 30 file_util::FileEnumerator::FILES)); | |
| 31 for (FilePath name = iter.Next(); !name.value().empty(); name = iter.Next()) { | 30 for (FilePath name = iter.Next(); !name.value().empty(); name = iter.Next()) { |
| 32 FilePath destination = to_path.Append(name.BaseName()); | 31 FilePath destination = to_path.Append(name.BaseName()); |
| 33 if (!file_util::Move(name, destination)) { | 32 if (!file_util::Move(name, destination)) { |
| 34 LOG(ERROR) << "Unable to move cache item."; | 33 LOG(ERROR) << "Unable to move cache item."; |
| 35 return false; | 34 return false; |
| 36 } | 35 } |
| 37 } | 36 } |
| 38 return true; | 37 return true; |
| 39 #else | 38 #else |
| 40 return file_util::Move(from_path, to_path); | 39 return file_util::Move(from_path, to_path); |
| (...skipping 17 matching lines...) Expand all Loading... |
| 58 return; | 57 return; |
| 59 } | 58 } |
| 60 } | 59 } |
| 61 } | 60 } |
| 62 | 61 |
| 63 bool DeleteCacheFile(const FilePath& name) { | 62 bool DeleteCacheFile(const FilePath& name) { |
| 64 return file_util::Delete(name, false); | 63 return file_util::Delete(name, false); |
| 65 } | 64 } |
| 66 | 65 |
| 67 } // namespace disk_cache | 66 } // namespace disk_cache |
| OLD | NEW |