| Index: chrome/browser/sync/syncable/directory_backing_store.h
|
| diff --git a/chrome/browser/sync/syncable/directory_backing_store.h b/chrome/browser/sync/syncable/directory_backing_store.h
|
| index 7851e66efdb0f5126e07b5c22fa150833ae32858..7c4efdff05447b4c0d5495d3dca1114c782ca043 100644
|
| --- a/chrome/browser/sync/syncable/directory_backing_store.h
|
| +++ b/chrome/browser/sync/syncable/directory_backing_store.h
|
| @@ -150,12 +150,12 @@ class DirectoryBackingStore {
|
| // a model. We persist a default instance of the specifics protobuf as the
|
| // ID, rather than the enum value.
|
| static ModelType ModelIdToModelTypeEnum(const void* data, int length);
|
| - static string ModelTypeEnumToModelId(ModelType model_type);
|
| + static std::string ModelTypeEnumToModelId(ModelType model_type);
|
|
|
| // Runs an integrity check on the current database. If the
|
| // integrity check fails, false is returned and error is populated
|
| // with an error message.
|
| - bool CheckIntegrity(sqlite3* handle, string* error) const;
|
| + bool CheckIntegrity(sqlite3* handle, std::string* error) const;
|
|
|
| // Migration utilities.
|
| bool AddColumn(const ColumnSpec* column);
|
|
|