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 "components/sync_preferences/pref_model_associator.h" | 5 #include "components/sync_preferences/pref_model_associator.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 std::string server_url1_; | 110 std::string server_url1_; |
111 std::string local_url0_; | 111 std::string local_url0_; |
112 std::string local_url1_; | 112 std::string local_url1_; |
113 base::ListValue server_url_list_; | 113 base::ListValue server_url_list_; |
114 }; | 114 }; |
115 | 115 |
116 TEST_F(ListPreferenceMergeTest, NotListOrDictionary) { | 116 TEST_F(ListPreferenceMergeTest, NotListOrDictionary) { |
117 pref_service_->SetString(kStringPrefName, local_url0_); | 117 pref_service_->SetString(kStringPrefName, local_url0_); |
118 const PrefService::Preference* pref = | 118 const PrefService::Preference* pref = |
119 pref_service_->FindPreference(kStringPrefName); | 119 pref_service_->FindPreference(kStringPrefName); |
120 std::unique_ptr<base::Value> server_value( | 120 std::unique_ptr<base::Value> server_value(new base::Value(server_url0_)); |
121 new base::StringValue(server_url0_)); | |
122 std::unique_ptr<base::Value> merged_value(pref_sync_service_->MergePreference( | 121 std::unique_ptr<base::Value> merged_value(pref_sync_service_->MergePreference( |
123 pref->name(), *pref->GetValue(), *server_value)); | 122 pref->name(), *pref->GetValue(), *server_value)); |
124 EXPECT_TRUE(merged_value->Equals(server_value.get())); | 123 EXPECT_TRUE(merged_value->Equals(server_value.get())); |
125 } | 124 } |
126 | 125 |
127 TEST_F(ListPreferenceMergeTest, LocalEmpty) { | 126 TEST_F(ListPreferenceMergeTest, LocalEmpty) { |
128 SetPrefToEmpty(kListPrefName); | 127 SetPrefToEmpty(kListPrefName); |
129 const PrefService::Preference* pref = | 128 const PrefService::Preference* pref = |
130 pref_service_->FindPreference(kListPrefName); | 129 pref_service_->FindPreference(kListPrefName); |
131 std::unique_ptr<base::Value> merged_value(pref_sync_service_->MergePreference( | 130 std::unique_ptr<base::Value> merged_value(pref_sync_service_->MergePreference( |
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
432 base::DictionaryValue server_patterns_; | 431 base::DictionaryValue server_patterns_; |
433 }; | 432 }; |
434 | 433 |
435 TEST_F(IndividualPreferenceMergeTest, ListPreference) { | 434 TEST_F(IndividualPreferenceMergeTest, ListPreference) { |
436 EXPECT_TRUE(MergeListPreference(kListPrefName)); | 435 EXPECT_TRUE(MergeListPreference(kListPrefName)); |
437 } | 436 } |
438 | 437 |
439 } // namespace | 438 } // namespace |
440 | 439 |
441 } // namespace sync_preferences | 440 } // namespace sync_preferences |
OLD | NEW |