| 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/syncable_prefs/pref_service_syncable.h" | 5 #include "components/syncable_prefs/pref_service_syncable.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
| 10 #include "base/json/json_string_value_serializer.h" | 10 #include "base/json/json_string_value_serializer.h" |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 base::ListValue* url_list = update.Get(); | 256 base::ListValue* url_list = update.Get(); |
| 257 url_list->Append(new base::StringValue(kExampleUrl0)); | 257 url_list->Append(new base::StringValue(kExampleUrl0)); |
| 258 url_list->Append(new base::StringValue(kExampleUrl1)); | 258 url_list->Append(new base::StringValue(kExampleUrl1)); |
| 259 } | 259 } |
| 260 syncer::SyncChangeList out; | 260 syncer::SyncChangeList out; |
| 261 InitWithSyncDataTakeOutput(syncer::SyncDataList(), &out); | 261 InitWithSyncDataTakeOutput(syncer::SyncDataList(), &out); |
| 262 | 262 |
| 263 scoped_ptr<base::Value> value(FindValue(kStringPrefName, out)); | 263 scoped_ptr<base::Value> value(FindValue(kStringPrefName, out)); |
| 264 ASSERT_TRUE(value.get()); | 264 ASSERT_TRUE(value.get()); |
| 265 EXPECT_TRUE(GetPreferenceValue(kStringPrefName).Equals(value.get())); | 265 EXPECT_TRUE(GetPreferenceValue(kStringPrefName).Equals(value.get())); |
| 266 value = FindValue(kListPrefName, out).Pass(); | 266 value = FindValue(kListPrefName, out); |
| 267 ASSERT_TRUE(value.get()); | 267 ASSERT_TRUE(value.get()); |
| 268 EXPECT_TRUE(GetPreferenceValue(kListPrefName).Equals(value.get())); | 268 EXPECT_TRUE(GetPreferenceValue(kListPrefName).Equals(value.get())); |
| 269 } | 269 } |
| 270 | 270 |
| 271 TEST_F(PrefServiceSyncableTest, ModelAssociationCloudHasData) { | 271 TEST_F(PrefServiceSyncableTest, ModelAssociationCloudHasData) { |
| 272 prefs_.SetString(kStringPrefName, kExampleUrl0); | 272 prefs_.SetString(kStringPrefName, kExampleUrl0); |
| 273 { | 273 { |
| 274 ListPrefUpdate update(GetPrefs(), kListPrefName); | 274 ListPrefUpdate update(GetPrefs(), kListPrefName); |
| 275 base::ListValue* url_list = update.Get(); | 275 base::ListValue* url_list = update.Get(); |
| 276 url_list->Append(new base::StringValue(kExampleUrl0)); | 276 url_list->Append(new base::StringValue(kExampleUrl0)); |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 syncer::SyncChangeList list; | 553 syncer::SyncChangeList list; |
| 554 list.push_back(MakeRemoteChange( | 554 list.push_back(MakeRemoteChange( |
| 555 1, kStringPrefName, *null_value, SyncChange::ACTION_DELETE)); | 555 1, kStringPrefName, *null_value, SyncChange::ACTION_DELETE)); |
| 556 pref_sync_service_->ProcessSyncChanges(FROM_HERE, list); | 556 pref_sync_service_->ProcessSyncChanges(FROM_HERE, list); |
| 557 EXPECT_TRUE(pref->IsDefaultValue()); | 557 EXPECT_TRUE(pref->IsDefaultValue()); |
| 558 } | 558 } |
| 559 | 559 |
| 560 } // namespace | 560 } // namespace |
| 561 | 561 |
| 562 } // namespace syncable_prefs | 562 } // namespace syncable_prefs |
| OLD | NEW |