OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/tracked_preferences_migration.h" | 5 #include "components/user_prefs/tracked/tracked_preferences_migration.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
12 #include "base/callback.h" | 12 #include "base/callback.h" |
| 13 #include "base/macros.h" |
13 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
14 #include "base/prefs/testing_pref_service.h" | 15 #include "base/prefs/testing_pref_service.h" |
15 #include "base/strings/string_split.h" | 16 #include "base/strings/string_split.h" |
16 #include "base/values.h" | 17 #include "base/values.h" |
17 #include "components/user_prefs/tracked/dictionary_hash_store_contents.h" | 18 #include "components/user_prefs/tracked/dictionary_hash_store_contents.h" |
18 #include "components/user_prefs/tracked/hash_store_contents.h" | 19 #include "components/user_prefs/tracked/hash_store_contents.h" |
19 #include "components/user_prefs/tracked/interceptable_pref_filter.h" | 20 #include "components/user_prefs/tracked/interceptable_pref_filter.h" |
20 #include "components/user_prefs/tracked/pref_hash_store.h" | 21 #include "components/user_prefs/tracked/pref_hash_store.h" |
21 #include "components/user_prefs/tracked/pref_hash_store_impl.h" | 22 #include "components/user_prefs/tracked/pref_hash_store_impl.h" |
22 #include "components/user_prefs/tracked/pref_hash_store_transaction.h" | 23 #include "components/user_prefs/tracked/pref_hash_store_transaction.h" |
(...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
896 expected_unprotected_values); | 897 expected_unprotected_values); |
897 | 898 |
898 base::StringPairs expected_protected_values; | 899 base::StringPairs expected_protected_values; |
899 expected_protected_values.push_back(std::make_pair( | 900 expected_protected_values.push_back(std::make_pair( |
900 kProtectedPref, kProtectedPrefValue)); | 901 kProtectedPref, kProtectedPrefValue)); |
901 expected_protected_values.push_back(std::make_pair( | 902 expected_protected_values.push_back(std::make_pair( |
902 kPreviouslyUnprotectedPref, kPreviouslyUnprotectedPrefValue)); | 903 kPreviouslyUnprotectedPref, kPreviouslyUnprotectedPrefValue)); |
903 VerifyValuesStored(MOCK_PROTECTED_PREF_STORE, expected_protected_values); | 904 VerifyValuesStored(MOCK_PROTECTED_PREF_STORE, expected_protected_values); |
904 } | 905 } |
905 } | 906 } |
OLD | NEW |