| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "components/user_prefs/tracked/pref_hash_store_impl.h" | 5 #include "components/user_prefs/tracked/pref_hash_store_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 } else { | 196 } else { |
| 197 // Keep the common part from the old |keyed_path| and replace the key to | 197 // Keep the common part from the old |keyed_path| and replace the key to |
| 198 // get the new |keyed_path|. | 198 // get the new |keyed_path|. |
| 199 keyed_path.replace(common_part_length, std::string::npos, it.key()); | 199 keyed_path.replace(common_part_length, std::string::npos, it.key()); |
| 200 switch (outer_->pref_hash_calculator_.Validate(keyed_path, &it.value(), | 200 switch (outer_->pref_hash_calculator_.Validate(keyed_path, &it.value(), |
| 201 entry->second)) { | 201 entry->second)) { |
| 202 case PrefHashCalculator::VALID: | 202 case PrefHashCalculator::VALID: |
| 203 break; | 203 break; |
| 204 case SECURE_LEGACY: | 204 case SECURE_LEGACY: |
| 205 // Secure legacy device IDs based hashes are still accepted, but we | 205 // Secure legacy device IDs based hashes are still accepted, but we |
| 206 // should make sure to notify the caller for him to update the legacy | 206 // should make sure to notify the caller for them to update the legacy |
| 207 // hashes. | 207 // hashes. |
| 208 has_secure_legacy_id_hashes = true; | 208 has_secure_legacy_id_hashes = true; |
| 209 break; | 209 break; |
| 210 case PrefHashCalculator::INVALID: | 210 case PrefHashCalculator::INVALID: |
| 211 invalid_keys->push_back(it.key()); | 211 invalid_keys->push_back(it.key()); |
| 212 break; | 212 break; |
| 213 } | 213 } |
| 214 // Remove processed MACs, remaining MACs at the end will also be | 214 // Remove processed MACs, remaining MACs at the end will also be |
| 215 // considered invalid. | 215 // considered invalid. |
| 216 split_macs.erase(entry); | 216 split_macs.erase(entry); |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 303 bool PrefHashStoreImpl::PrefHashStoreTransactionImpl::IsSuperMACValid() const { | 303 bool PrefHashStoreImpl::PrefHashStoreTransactionImpl::IsSuperMACValid() const { |
| 304 return super_mac_valid_; | 304 return super_mac_valid_; |
| 305 } | 305 } |
| 306 | 306 |
| 307 bool PrefHashStoreImpl::PrefHashStoreTransactionImpl::StampSuperMac() { | 307 bool PrefHashStoreImpl::PrefHashStoreTransactionImpl::StampSuperMac() { |
| 308 if (!outer_->use_super_mac_ || super_mac_valid_) | 308 if (!outer_->use_super_mac_ || super_mac_valid_) |
| 309 return false; | 309 return false; |
| 310 super_mac_dirty_ = true; | 310 super_mac_dirty_ = true; |
| 311 return true; | 311 return true; |
| 312 } | 312 } |
| OLD | NEW |