| Index: chrome/browser/sync/engine/syncer_proto_util.h
|
| diff --git a/chrome/browser/sync/engine/syncer_proto_util.h b/chrome/browser/sync/engine/syncer_proto_util.h
|
| old mode 100644
|
| new mode 100755
|
| index e3583cf66960e4c012c7fdea19f58214e824f73a..287cf493a18959c659482e50a2ce19de06978227
|
| --- a/chrome/browser/sync/engine/syncer_proto_util.h
|
| +++ b/chrome/browser/sync/engine/syncer_proto_util.h
|
| @@ -56,11 +56,12 @@ class SyncerProtoUtil {
|
| static void CopyBlobIntoProtoBytes(const syncable::Blob& blob,
|
| std::string* proto_bytes);
|
|
|
| - // Extract the name fields from a sync entity.
|
| - static syncable::SyncName NameFromSyncEntity(const SyncEntity& entry);
|
| + // Extract the name field from a sync entity.
|
| + static std::string NameFromSyncEntity(const SyncEntity& entry);
|
|
|
| - // Extract the name fields from a commit entry response.
|
| - static syncable::SyncName NameFromCommitEntryResponse(
|
| +
|
| + // Extract the name field from a commit entry response.
|
| + static std::string NameFromCommitEntryResponse(
|
| const CommitResponse_EntryResponse& entry);
|
|
|
| private:
|
|
|