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/sync_preferences/pref_service_syncable.h" | 5 #include "components/sync_preferences/pref_service_syncable.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 | 10 |
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
532 EXPECT_FALSE(FindValue(kStringPrefName, out).get()); | 532 EXPECT_FALSE(FindValue(kStringPrefName, out).get()); |
533 } | 533 } |
534 | 534 |
535 TEST_F(PrefServiceSyncableTest, DeletePreference) { | 535 TEST_F(PrefServiceSyncableTest, DeletePreference) { |
536 prefs_.SetString(kStringPrefName, kExampleUrl0); | 536 prefs_.SetString(kStringPrefName, kExampleUrl0); |
537 const PrefService::Preference* pref = prefs_.FindPreference(kStringPrefName); | 537 const PrefService::Preference* pref = prefs_.FindPreference(kStringPrefName); |
538 EXPECT_FALSE(pref->IsDefaultValue()); | 538 EXPECT_FALSE(pref->IsDefaultValue()); |
539 | 539 |
540 InitWithNoSyncData(); | 540 InitWithNoSyncData(); |
541 | 541 |
542 std::unique_ptr<base::Value> null_value = base::Value::CreateNullValue(); | 542 auto null_value = base::MakeUnique<base::Value>(); |
543 syncer::SyncChangeList list; | 543 syncer::SyncChangeList list; |
544 list.push_back(MakeRemoteChange(1, kStringPrefName, *null_value, | 544 list.push_back(MakeRemoteChange(1, kStringPrefName, *null_value, |
545 SyncChange::ACTION_DELETE)); | 545 SyncChange::ACTION_DELETE)); |
546 pref_sync_service_->ProcessSyncChanges(FROM_HERE, list); | 546 pref_sync_service_->ProcessSyncChanges(FROM_HERE, list); |
547 EXPECT_TRUE(pref->IsDefaultValue()); | 547 EXPECT_TRUE(pref->IsDefaultValue()); |
548 } | 548 } |
549 | 549 |
550 TEST_F(PrefServiceSyncableTest, RegisterMergeDataFinishedCallback) { | 550 TEST_F(PrefServiceSyncableTest, RegisterMergeDataFinishedCallback) { |
551 int num_callbacks = 0; | 551 int num_callbacks = 0; |
552 | 552 |
553 prefs_.RegisterMergeDataFinishedCallback( | 553 prefs_.RegisterMergeDataFinishedCallback( |
554 base::Bind(&Increment, &num_callbacks)); | 554 base::Bind(&Increment, &num_callbacks)); |
555 EXPECT_EQ(0, num_callbacks); | 555 EXPECT_EQ(0, num_callbacks); |
556 | 556 |
557 InitWithNoSyncData(); | 557 InitWithNoSyncData(); |
558 EXPECT_EQ(1, num_callbacks); | 558 EXPECT_EQ(1, num_callbacks); |
559 } | 559 } |
560 | 560 |
561 } // namespace | 561 } // namespace |
562 | 562 |
563 } // namespace sync_preferences | 563 } // namespace sync_preferences |
OLD | NEW |