| Index: components/sync/syncable/entry_kernel.h
|
| diff --git a/components/sync/syncable/entry_kernel.h b/components/sync/syncable/entry_kernel.h
|
| index d231c30081068b11cc96ed94ede0989e5f093f41..82a58988864e4be3788ef8c9e71a3a41fd65686a 100644
|
| --- a/components/sync/syncable/entry_kernel.h
|
| +++ b/components/sync/syncable/entry_kernel.h
|
| @@ -9,7 +9,6 @@
|
|
|
| #include <algorithm>
|
| #include <map>
|
| -#include <memory>
|
| #include <set>
|
| #include <string>
|
|
|
| @@ -195,8 +194,9 @@ enum { BIT_TEMPS_COUNT = BIT_TEMPS_END - BIT_TEMPS_BEGIN };
|
|
|
| struct EntryKernel {
|
| private:
|
| - typedef ProtoValuePtr<sync_pb::EntitySpecifics> EntitySpecificsPtr;
|
| - typedef ProtoValuePtr<sync_pb::AttachmentMetadata> AttachmentMetadataPtr;
|
| + typedef syncer::ProtoValuePtr<sync_pb::EntitySpecifics> EntitySpecificsPtr;
|
| + typedef syncer::ProtoValuePtr<sync_pb::AttachmentMetadata>
|
| + AttachmentMetadataPtr;
|
|
|
| std::string string_fields[STRING_FIELDS_COUNT];
|
| EntitySpecificsPtr specifics_fields[PROTO_FIELDS_COUNT];
|
|
|