| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "sync/internal_api/public/change_record.h" | 5 #include "sync/internal_api/public/change_record.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
| 9 #include "base/test/values_test_util.h" | 9 #include "base/test/values_test_util.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 void CheckChangeRecordValue( | 48 void CheckChangeRecordValue( |
| 49 const ChangeRecord& record, | 49 const ChangeRecord& record, |
| 50 const base::DictionaryValue& value) { | 50 const base::DictionaryValue& value) { |
| 51 ExpectChangeRecordActionValue(record.action, value, "action"); | 51 ExpectChangeRecordActionValue(record.action, value, "action"); |
| 52 ExpectDictStringValue(base::Int64ToString(record.id), value, "id"); | 52 ExpectDictStringValue(base::Int64ToString(record.id), value, "id"); |
| 53 if (record.action == ChangeRecord::ACTION_DELETE) { | 53 if (record.action == ChangeRecord::ACTION_DELETE) { |
| 54 scoped_ptr<base::DictionaryValue> expected_extra_value; | 54 scoped_ptr<base::DictionaryValue> expected_extra_value; |
| 55 if (record.extra.get()) { | 55 if (record.extra.get()) { |
| 56 expected_extra_value.reset(record.extra->ToValue()); | 56 expected_extra_value.reset(record.extra->ToValue()); |
| 57 } | 57 } |
| 58 base::Value* extra_value = NULL; | 58 const base::Value* extra_value = NULL; |
| 59 EXPECT_EQ(record.extra.get() != NULL, | 59 EXPECT_EQ(record.extra.get() != NULL, |
| 60 value.Get("extra", &extra_value)); | 60 value.Get("extra", &extra_value)); |
| 61 EXPECT_TRUE(Value::Equals(extra_value, expected_extra_value.get())); | 61 EXPECT_TRUE(Value::Equals(extra_value, expected_extra_value.get())); |
| 62 | 62 |
| 63 scoped_ptr<DictionaryValue> expected_specifics_value( | 63 scoped_ptr<DictionaryValue> expected_specifics_value( |
| 64 EntitySpecificsToValue(record.specifics)); | 64 EntitySpecificsToValue(record.specifics)); |
| 65 ExpectDictDictionaryValue(*expected_specifics_value, | 65 ExpectDictDictionaryValue(*expected_specifics_value, |
| 66 value, "specifics"); | 66 value, "specifics"); |
| 67 } | 67 } |
| 68 } | 68 } |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 Invoke(&extra_value, &DictionaryValue::DeepCopy)); | 128 Invoke(&extra_value, &DictionaryValue::DeepCopy)); |
| 129 | 129 |
| 130 record.extra.reset(extra.release()); | 130 record.extra.reset(extra.release()); |
| 131 scoped_ptr<DictionaryValue> value(record.ToValue()); | 131 scoped_ptr<DictionaryValue> value(record.ToValue()); |
| 132 CheckChangeRecordValue(record, *value); | 132 CheckChangeRecordValue(record, *value); |
| 133 } | 133 } |
| 134 } | 134 } |
| 135 | 135 |
| 136 } // namespace | 136 } // namespace |
| 137 } // namespace syncer | 137 } // namespace syncer |
| OLD | NEW |