| Index: components/sync/core/change_record_unittest.cc
|
| diff --git a/sync/internal_api/public/change_record_unittest.cc b/components/sync/core/change_record_unittest.cc
|
| similarity index 90%
|
| rename from sync/internal_api/public/change_record_unittest.cc
|
| rename to components/sync/core/change_record_unittest.cc
|
| index 2a5fa550d9ced58fbd857c33a62b357052e56b9f..1ede7b25d8281cc2545523592ee736db8828b2ff 100644
|
| --- a/sync/internal_api/public/change_record_unittest.cc
|
| +++ b/components/sync/core/change_record_unittest.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/internal_api/public/change_record.h"
|
| +#include "components/sync/core/change_record.h"
|
|
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| @@ -14,9 +14,9 @@
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/test/values_test_util.h"
|
| #include "base/values.h"
|
| -#include "sync/protocol/extension_specifics.pb.h"
|
| -#include "sync/protocol/proto_value_conversions.h"
|
| -#include "sync/protocol/sync.pb.h"
|
| +#include "components/sync/protocol/extension_specifics.pb.h"
|
| +#include "components/sync/protocol/proto_value_conversions.h"
|
| +#include "components/sync/protocol/sync.pb.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -51,9 +51,8 @@ void ExpectChangeRecordActionValue(ChangeRecord::Action expected_value,
|
| }
|
| }
|
|
|
| -void CheckChangeRecordValue(
|
| - const ChangeRecord& record,
|
| - const base::DictionaryValue& value) {
|
| +void CheckChangeRecordValue(const ChangeRecord& record,
|
| + const base::DictionaryValue& value) {
|
| ExpectChangeRecordActionValue(record.action, value, "action");
|
| ExpectDictStringValue(base::Int64ToString(record.id), value, "id");
|
| if (record.action == ChangeRecord::ACTION_DELETE) {
|
| @@ -62,14 +61,12 @@ void CheckChangeRecordValue(
|
| expected_extra_value = record.extra->ToValue();
|
| }
|
| const base::Value* extra_value = NULL;
|
| - EXPECT_EQ(record.extra.get() != NULL,
|
| - value.Get("extra", &extra_value));
|
| + EXPECT_EQ(record.extra.get() != NULL, value.Get("extra", &extra_value));
|
| EXPECT_TRUE(base::Value::Equals(extra_value, expected_extra_value.get()));
|
|
|
| std::unique_ptr<base::DictionaryValue> expected_specifics_value(
|
| EntitySpecificsToValue(record.specifics));
|
| - ExpectDictDictionaryValue(*expected_specifics_value,
|
| - value, "specifics");
|
| + ExpectDictDictionaryValue(*expected_specifics_value, value, "specifics");
|
| }
|
| }
|
|
|
|
|