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 "base/macros.h" | 5 #include "base/macros.h" |
6 #include "base/memory/ref_counted.h" | 6 #include "base/memory/ref_counted.h" |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/prefs/scoped_user_pref_update.h" | |
9 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "components/prefs/scoped_user_pref_update.h" |
10 #include "components/syncable_prefs/pref_model_associator.h" | 10 #include "components/syncable_prefs/pref_model_associator.h" |
11 #include "components/syncable_prefs/pref_model_associator_client.h" | 11 #include "components/syncable_prefs/pref_model_associator_client.h" |
12 #include "components/syncable_prefs/pref_service_mock_factory.h" | 12 #include "components/syncable_prefs/pref_service_mock_factory.h" |
13 #include "components/syncable_prefs/pref_service_syncable.h" | 13 #include "components/syncable_prefs/pref_service_syncable.h" |
14 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" |
15 | 15 |
16 namespace syncable_prefs { | 16 namespace syncable_prefs { |
17 | 17 |
18 namespace { | 18 namespace { |
19 | 19 |
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
457 base::DictionaryValue server_patterns_; | 457 base::DictionaryValue server_patterns_; |
458 }; | 458 }; |
459 | 459 |
460 TEST_F(IndividualPreferenceMergeTest, ListPreference) { | 460 TEST_F(IndividualPreferenceMergeTest, ListPreference) { |
461 EXPECT_TRUE(MergeListPreference(kListPrefName)); | 461 EXPECT_TRUE(MergeListPreference(kListPrefName)); |
462 } | 462 } |
463 | 463 |
464 } // namespace | 464 } // namespace |
465 | 465 |
466 } // namespace syncable_prefs | 466 } // namespace syncable_prefs |
OLD | NEW |