| Index: sync/syncable/syncable_id.h
|
| diff --git a/sync/syncable/syncable_id.h b/sync/syncable/syncable_id.h
|
| index 95157ab1213ce972eb4e5b623386f5a565b8562f..64fc7f695fe3ec3ec884e25fa6c54e8a1b2523f9 100644
|
| --- a/sync/syncable/syncable_id.h
|
| +++ b/sync/syncable/syncable_id.h
|
| @@ -10,6 +10,7 @@
|
| #include <sstream>
|
| #include <string>
|
|
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "base/hash_tables.h"
|
|
|
| class MockConnectionManager;
|
| @@ -111,7 +112,7 @@ class Id {
|
| static Id GetLeastIdForLexicographicComparison();
|
|
|
| private:
|
| - friend EntryKernel* UnpackEntry(sql::Statement* statement);
|
| + friend scoped_ptr<EntryKernel> UnpackEntry(sql::Statement* statement);
|
| friend void BindFields(const EntryKernel& entry,
|
| sql::Statement* statement);
|
| friend std::ostream& operator<<(std::ostream& out, const Id& id);
|
|
|