Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: sync/test/fake_server/bookmark_entity.h

Issue 1866243002: Convert //sync from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix conflicts Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_TEST_FAKE_SERVER_BOOKMARK_ENTITY_H_ 5 #ifndef SYNC_TEST_FAKE_SERVER_BOOKMARK_ENTITY_H_
6 #define SYNC_TEST_FAKE_SERVER_BOOKMARK_ENTITY_H_ 6 #define SYNC_TEST_FAKE_SERVER_BOOKMARK_ENTITY_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
11 #include <string> 11 #include <string>
12 12
13 #include "sync/internal_api/public/base/model_type.h" 13 #include "sync/internal_api/public/base/model_type.h"
14 #include "sync/protocol/sync.pb.h" 14 #include "sync/protocol/sync.pb.h"
15 #include "sync/test/fake_server/fake_server_entity.h" 15 #include "sync/test/fake_server/fake_server_entity.h"
16 16
17 namespace fake_server { 17 namespace fake_server {
18 18
19 // A bookmark version of FakeServerEntity. This type represents entities that 19 // A bookmark version of FakeServerEntity. This type represents entities that
20 // are non-deleted, client-created, and not unique per client account. 20 // are non-deleted, client-created, and not unique per client account.
21 class BookmarkEntity : public FakeServerEntity { 21 class BookmarkEntity : public FakeServerEntity {
22 public: 22 public:
23 ~BookmarkEntity() override; 23 ~BookmarkEntity() override;
24 24
25 // Factory function for BookmarkEntity. This factory should be used only for 25 // Factory function for BookmarkEntity. This factory should be used only for
26 // the first time that a specific bookmark is seen by the server. 26 // the first time that a specific bookmark is seen by the server.
27 static scoped_ptr<FakeServerEntity> CreateNew( 27 static std::unique_ptr<FakeServerEntity> CreateNew(
28 const sync_pb::SyncEntity& client_entity, 28 const sync_pb::SyncEntity& client_entity,
29 const std::string& parent_id, 29 const std::string& parent_id,
30 const std::string& client_guid); 30 const std::string& client_guid);
31 31
32 // Factory function for BookmarkEntity. The server's current entity for this 32 // Factory function for BookmarkEntity. The server's current entity for this
33 // ID, |current_server_entity|, is passed here because the client does not 33 // ID, |current_server_entity|, is passed here because the client does not
34 // always send the complete entity over the wire. This requires copying of 34 // always send the complete entity over the wire. This requires copying of
35 // some of the existing entity when creating a new entity. 35 // some of the existing entity when creating a new entity.
36 static scoped_ptr<FakeServerEntity> CreateUpdatedVersion( 36 static std::unique_ptr<FakeServerEntity> CreateUpdatedVersion(
37 const sync_pb::SyncEntity& client_entity, 37 const sync_pb::SyncEntity& client_entity,
38 const FakeServerEntity& current_server_entity, 38 const FakeServerEntity& current_server_entity,
39 const std::string& parent_id); 39 const std::string& parent_id);
40 40
41 BookmarkEntity(const std::string& id, 41 BookmarkEntity(const std::string& id,
42 int64_t version, 42 int64_t version,
43 const std::string& name, 43 const std::string& name,
44 const std::string& originator_cache_guid, 44 const std::string& originator_cache_guid,
45 const std::string& originator_client_item_id, 45 const std::string& originator_client_item_id,
46 const sync_pb::UniquePosition& unique_position, 46 const sync_pb::UniquePosition& unique_position,
(...skipping 18 matching lines...) Expand all
65 sync_pb::UniquePosition unique_position_; 65 sync_pb::UniquePosition unique_position_;
66 bool is_folder_; 66 bool is_folder_;
67 std::string parent_id_; 67 std::string parent_id_;
68 int64_t creation_time_; 68 int64_t creation_time_;
69 int64_t last_modified_time_; 69 int64_t last_modified_time_;
70 }; 70 };
71 71
72 } // namespace fake_server 72 } // namespace fake_server
73 73
74 #endif // SYNC_TEST_FAKE_SERVER_BOOKMARK_ENTITY_H_ 74 #endif // SYNC_TEST_FAKE_SERVER_BOOKMARK_ENTITY_H_
OLDNEW
« no previous file with comments | « sync/test/fake_server/android/fake_server_helper_android.cc ('k') | sync/test/fake_server/bookmark_entity.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698