Use base::GUID in bookmarks::BookmarkNode's internals
Store the GUID as a base::GUID instead of a std::string. Change the
constructor of BookmarkNode to take a base::GUID. Modify the code
around callers to make them compatible with the new API.
BookmarkNode::guid() still returns a std::string(). It will be changed
to return a base::GUID() in a follow-up.
Bug: 1026195
Change-Id: I7837de1a641bf946065f9eca67f0646ee50ee6c2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2522162
Reviewed-by: Brandon Wylie <[email protected]>
Reviewed-by: Xing Liu <[email protected]>
Reviewed-by: Theresa <[email protected]>
Reviewed-by: Angela Yoeurng <[email protected]>
Reviewed-by: Mikel Astiz <[email protected]>
Commit-Queue: Daniel Hosseinian <[email protected]>
Cr-Commit-Position: refs/heads/master@{#827511}
diff --git a/components/sync_bookmarks/synced_bookmark_tracker_unittest.cc b/components/sync_bookmarks/synced_bookmark_tracker_unittest.cc
index 63d146f..3baf682 100644
--- a/components/sync_bookmarks/synced_bookmark_tracker_unittest.cc
+++ b/components/sync_bookmarks/synced_bookmark_tracker_unittest.cc
@@ -124,7 +124,7 @@
const sync_pb::EntitySpecifics specifics =
GenerateSpecifics(/*title=*/std::string(), /*url=*/std::string());
- bookmarks::BookmarkNode node(kId, base::GenerateGUID(), kUrl);
+ bookmarks::BookmarkNode node(kId, base::GUID::GenerateRandomV4(), kUrl);
const SyncedBookmarkTracker::Entity* entity =
tracker->Add(&node, kSyncId, kServerVersion, kCreationTime,
unique_position.ToProto(), specifics);
@@ -157,7 +157,7 @@
const sync_pb::UniquePosition unique_position;
const sync_pb::EntitySpecifics specifics =
GenerateSpecifics(/*title=*/std::string(), /*url=*/std::string());
- bookmarks::BookmarkNode node(kId, base::GenerateGUID(), GURL());
+ bookmarks::BookmarkNode node(kId, base::GUID::GenerateRandomV4(), GURL());
const SyncedBookmarkTracker::Entity* entity =
tracker->Add(&node, kSyncId, kServerVersion, kModificationTime,
unique_position, specifics);
@@ -184,7 +184,7 @@
const sync_pb::EntitySpecifics specifics =
GenerateSpecifics(/*title=*/std::string(), /*url=*/std::string());
- bookmarks::BookmarkNode node(kId, base::GenerateGUID(), kUrl);
+ bookmarks::BookmarkNode node(kId, base::GUID::GenerateRandomV4(), kUrl);
tracker->Add(&node, kSyncId, kServerVersion, kCreationTime,
unique_position.ToProto(), specifics);
@@ -211,7 +211,7 @@
const sync_pb::UniquePosition unique_position;
const sync_pb::EntitySpecifics specifics =
GenerateSpecifics(/*title=*/std::string(), /*url=*/std::string());
- bookmarks::BookmarkNode node(kId, base::GenerateGUID(), GURL());
+ bookmarks::BookmarkNode node(kId, base::GUID::GenerateRandomV4(), GURL());
const SyncedBookmarkTracker::Entity* entity =
tracker->Add(&node, kSyncId, kServerVersion, kModificationTime,
unique_position, specifics);
@@ -235,7 +235,7 @@
const sync_pb::UniquePosition unique_position;
const sync_pb::EntitySpecifics specifics =
GenerateSpecifics(/*title=*/std::string(), /*url=*/std::string());
- bookmarks::BookmarkNode node(kId, base::GenerateGUID(), GURL());
+ bookmarks::BookmarkNode node(kId, base::GUID::GenerateRandomV4(), GURL());
const SyncedBookmarkTracker::Entity* entity =
tracker->Add(&node, kSyncId, kServerVersion, kModificationTime,
unique_position, specifics);
@@ -271,7 +271,7 @@
const sync_pb::UniquePosition unique_position;
const sync_pb::EntitySpecifics specifics =
GenerateSpecifics(/*title=*/std::string(), /*url=*/std::string());
- bookmarks::BookmarkNode node(kId, base::GenerateGUID(), GURL());
+ bookmarks::BookmarkNode node(kId, base::GUID::GenerateRandomV4(), GURL());
const SyncedBookmarkTracker::Entity* entity =
tracker->Add(&node, kSyncId, kServerVersion, kModificationTime,
unique_position, specifics);
@@ -306,7 +306,8 @@
const sync_pb::UniquePosition unique_position;
const sync_pb::EntitySpecifics specifics =
GenerateSpecifics(/*title=*/std::string(), /*url=*/std::string());
- bookmarks::BookmarkNode node(/*id=*/1, base::GenerateGUID(), GURL());
+ bookmarks::BookmarkNode node(/*id=*/1, base::GUID::GenerateRandomV4(),
+ GURL());
// Track a sync entity.
const SyncedBookmarkTracker::Entity* entity =
tracker->Add(&node, kSyncId, kServerVersion, kModificationTime,
@@ -467,7 +468,7 @@
const sync_pb::UniquePosition unique_position;
const sync_pb::EntitySpecifics specifics =
GenerateSpecifics(/*title=*/std::string(), /*url=*/std::string());
- bookmarks::BookmarkNode node(kId, base::GenerateGUID(), GURL());
+ bookmarks::BookmarkNode node(kId, base::GUID::GenerateRandomV4(), GURL());
const SyncedBookmarkTracker::Entity* entity =
tracker->Add(&node, kSyncId, kServerVersion, kModificationTime,
unique_position, specifics);
@@ -1031,7 +1032,7 @@
sync_pb::EntitySpecifics specifics = GenerateSpecifics(kTitle, kUrl.spec());
specifics.mutable_bookmark()->set_favicon(kFaviconPngBytes);
- bookmarks::BookmarkNode node(kId, base::GenerateGUID(), kUrl);
+ bookmarks::BookmarkNode node(kId, base::GUID::GenerateRandomV4(), kUrl);
const SyncedBookmarkTracker::Entity* entity =
tracker->Add(&node, kSyncId, kServerVersion, kCreationTime,
kUniquePosition.ToProto(), specifics);
