OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef SYNC_INTERNAL_API_PUBLIC_BASE_NODE_H_ | 5 #ifndef SYNC_INTERNAL_API_PUBLIC_BASE_NODE_H_ |
6 #define SYNC_INTERNAL_API_PUBLIC_BASE_NODE_H_ | 6 #define SYNC_INTERNAL_API_PUBLIC_BASE_NODE_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
| 11 #include <memory> |
11 #include <string> | 12 #include <string> |
12 #include <vector> | 13 #include <vector> |
13 | 14 |
14 #include "base/gtest_prod_util.h" | 15 #include "base/gtest_prod_util.h" |
15 #include "base/macros.h" | 16 #include "base/macros.h" |
16 #include "base/memory/scoped_ptr.h" | |
17 #include "base/time/time.h" | 17 #include "base/time/time.h" |
18 #include "sync/api/attachments/attachment.h" | 18 #include "sync/api/attachments/attachment.h" |
19 #include "sync/base/sync_export.h" | 19 #include "sync/base/sync_export.h" |
20 #include "sync/internal_api/public/base/model_type.h" | 20 #include "sync/internal_api/public/base/model_type.h" |
21 #include "sync/protocol/sync.pb.h" | 21 #include "sync/protocol/sync.pb.h" |
22 #include "url/gurl.h" | 22 #include "url/gurl.h" |
23 | 23 |
24 // Forward declarations of internal class types so that sync API objects | 24 // Forward declarations of internal class types so that sync API objects |
25 // may have opaque pointers to these types. | 25 // may have opaque pointers to these types. |
26 namespace base { | 26 namespace base { |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
228 FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, SetNonBookmarkTitleWithEncryption); | 228 FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, SetNonBookmarkTitleWithEncryption); |
229 FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, SetPreviouslyEncryptedSpecifics); | 229 FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, SetPreviouslyEncryptedSpecifics); |
230 FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, IncrementTransactionVersion); | 230 FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, IncrementTransactionVersion); |
231 | 231 |
232 void* operator new(size_t size); // Node is meant for stack use only. | 232 void* operator new(size_t size); // Node is meant for stack use only. |
233 | 233 |
234 // A holder for the unencrypted data stored in an encrypted node. | 234 // A holder for the unencrypted data stored in an encrypted node. |
235 sync_pb::EntitySpecifics unencrypted_data_; | 235 sync_pb::EntitySpecifics unencrypted_data_; |
236 | 236 |
237 // Same as |unencrypted_data_|, but for legacy password encryption. | 237 // Same as |unencrypted_data_|, but for legacy password encryption. |
238 scoped_ptr<sync_pb::PasswordSpecificsData> password_data_; | 238 std::unique_ptr<sync_pb::PasswordSpecificsData> password_data_; |
239 | 239 |
240 DISALLOW_COPY_AND_ASSIGN(BaseNode); | 240 DISALLOW_COPY_AND_ASSIGN(BaseNode); |
241 }; | 241 }; |
242 | 242 |
243 } // namespace syncer | 243 } // namespace syncer |
244 | 244 |
245 #endif // SYNC_INTERNAL_API_PUBLIC_BASE_NODE_H_ | 245 #endif // SYNC_INTERNAL_API_PUBLIC_BASE_NODE_H_ |
OLD | NEW |