[bookmarks] Update straggling uses of the deprecated GUID API

Bug: 1026195
Change-Id: I6bd42a7c4611dac978f812af701317c5f50660f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2553870
Commit-Queue: Daniel Hosseinian <dhoss@chromium.org>
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Auto-Submit: Daniel Hosseinian <dhoss@chromium.org>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#830128}

components/bookmarks/browser/bookmark_codec_unittest.cc

@@ -598,7 +598,7 @@ TEST_F(BookmarkCodecTest, ReassignMissingGUID) {
 
 TEST_F(BookmarkCodecTest, ReassignInvalidGUID) {
   const std::string kInvalidGuid = "0000";
-  ASSERT_FALSE(base::IsValidGUID(kInvalidGuid));
+  ASSERT_FALSE(base::GUID::ParseCaseInsensitive(kInvalidGuid).is_valid());
 
   std::unique_ptr<BookmarkModel> model_to_encode(CreateTestModel1());
 

components/sync/engine_impl/bookmark_update_preprocessing.cc

@@ -78,7 +78,8 @@ std::string ComputeGuidFromBytes(base::span<const uint8_t> bytes) {
 std::string InferGuidForLegacyBookmark(
     const std::string& originator_cache_guid,
     const std::string& originator_client_item_id) {
-  DCHECK(!base::IsValidGUID(originator_client_item_id));
+  DCHECK(
+      !base::GUID::ParseCaseInsensitive(originator_client_item_id).is_valid());
 
   const std::string unique_tag =
       base::StrCat({originator_cache_guid, originator_client_item_id});
@@ -88,7 +89,7 @@ std::string InferGuidForLegacyBookmark(
   static_assert(base::kSHA1Length >= 16, "16 bytes needed to infer GUID");
 
   const std::string guid = ComputeGuidFromBytes(base::make_span(hash));
-  DCHECK(base::IsValidGUIDOutputString(guid));
+  DCHECK(base::GUID::ParseLowercase(guid).is_valid());
   return guid;
 }
 

components/sync_bookmarks/bookmark_model_merger_unittest.cc

@@ -1528,7 +1528,8 @@ TEST(BookmarkModelMergerTest, ShouldIgnoreRemoteUpdateWithInvalidGUID) {
 
   // |originator_client_item_id| cannot itself be duplicated because
   // ModelTypeWorker guarantees otherwise.
-  updates.back().entity.originator_client_item_id = base::GenerateGUID();
+  updates.back().entity.originator_client_item_id =
+      base::GUID::GenerateRandomV4().AsLowercaseString();
 
   std::unique_ptr<SyncedBookmarkTracker> tracker =
       Merge(std::move(updates), bookmark_model.get());

components/sync_bookmarks/bookmark_remote_updates_handler_unittest.cc

@@ -618,7 +618,8 @@ TEST_F(BookmarkRemoteUpdatesHandlerWithInitialMergeTest,
       /*unique_position=*/kPosition));
 
   // Override the originator client item ID to mimic a mismatch.
-  updates.back().entity.originator_client_item_id = base::GenerateGUID();
+  updates.back().entity.originator_client_item_id =
+      base::GUID::GenerateRandomV4().AsLowercaseString();
 
   base::HistogramTester histogram_tester;
   updates_handler()->Process(updates,
@@ -997,7 +998,8 @@ TEST_F(BookmarkRemoteUpdatesHandlerWithInitialMergeTest,
                              .ToProto();
   sync_pb::BookmarkSpecifics* bookmark_specifics =
       data.specifics.mutable_bookmark();
-  bookmark_specifics->set_guid(base::GenerateGUID());
+  bookmark_specifics->set_guid(
+      base::GUID::GenerateRandomV4().AsLowercaseString());
   // Use the server id as the title for simplicity.
   bookmark_specifics->set_legacy_canonicalized_title(kTitle);
   bookmark_specifics->set_url(kUrl.spec());
@@ -1045,7 +1047,8 @@ TEST_F(BookmarkRemoteUpdatesHandlerWithInitialMergeTest,
                              .ToProto();
   sync_pb::BookmarkSpecifics* bookmark_specifics =
       data.specifics.mutable_bookmark();
-  bookmark_specifics->set_guid(base::GenerateGUID());
+  bookmark_specifics->set_guid(
+      base::GUID::GenerateRandomV4().AsLowercaseString());
   // Use the server id as the title for simplicity.
   bookmark_specifics->set_legacy_canonicalized_title(kTitle);
   bookmark_specifics->set_url(kUrl.spec());
@@ -1084,7 +1087,8 @@ TEST_F(BookmarkRemoteUpdatesHandlerWithInitialMergeTest,
                              .ToProto();
   sync_pb::BookmarkSpecifics* bookmark_specifics =
       data.specifics.mutable_bookmark();
-  bookmark_specifics->set_guid(base::GenerateGUID());
+  bookmark_specifics->set_guid(
+      base::GUID::GenerateRandomV4().AsLowercaseString());
   // Use the server id as the title for simplicity.
   bookmark_specifics->set_legacy_canonicalized_title(kTitle);
   bookmark_specifics->set_url(kUrl.spec());
@@ -1109,7 +1113,8 @@ TEST_F(BookmarkRemoteUpdatesHandlerWithInitialMergeTest,
 TEST_F(BookmarkRemoteUpdatesHandlerWithInitialMergeTest,
        ShouldUpdateSyncIdWhenRecevingAnUpdateForNewlyCreatedLocalNode) {
   const std::string kCacheGuid = "generated_id";
-  const std::string kOriginatorClientItemId = base::GenerateGUID();
+  const std::string kOriginatorClientItemId =
+      base::GUID::GenerateRandomV4().AsLowercaseString();
   const std::string kSyncId = "server_id";
   const int64_t kServerVersion = 1000;
   const base::Time kModificationTime(base::Time::Now() -
@@ -1122,7 +1127,8 @@ TEST_F(BookmarkRemoteUpdatesHandlerWithInitialMergeTest,
   const sync_pb::UniquePosition unique_position;
   sync_pb::EntitySpecifics specifics;
   sync_pb::BookmarkSpecifics* bookmark_specifics = specifics.mutable_bookmark();
-  bookmark_specifics->set_guid(base::GenerateGUID());
+  bookmark_specifics->set_guid(
+      base::GUID::GenerateRandomV4().AsLowercaseString());
   bookmark_specifics->set_legacy_canonicalized_title("Title");
   bookmarks::BookmarkNode node(/*id=*/1, base::GUID::GenerateRandomV4(),
                                GURL());

components/sync_bookmarks/bookmark_specifics_conversions.cc

@@ -151,7 +151,8 @@ std::string ComputeGuidFromBytes(base::span<const uint8_t> bytes) {
 std::string InferGuidForLegacyBookmark(
     const std::string& originator_cache_guid,
     const std::string& originator_client_item_id) {
-  DCHECK(!base::IsValidGUID(originator_client_item_id));
+  DCHECK(
+      !base::GUID::ParseCaseInsensitive(originator_client_item_id).is_valid());
 
   const std::string unique_tag =
       base::StrCat({originator_cache_guid, originator_client_item_id});
@@ -161,7 +162,7 @@ std::string InferGuidForLegacyBookmark(
   static_assert(base::kSHA1Length >= 16, "16 bytes needed to infer GUID");
 
   const std::string guid = ComputeGuidFromBytes(base::make_span(hash));
-  DCHECK(base::IsValidGUIDOutputString(guid));
+  DCHECK(base::GUID::ParseLowercase(guid).is_valid());
   return guid;
 }
 
@@ -395,7 +396,7 @@ bool IsValidBookmarkSpecifics(const sync_pb::BookmarkSpecifics& specifics,
 bool HasExpectedBookmarkGuid(const sync_pb::BookmarkSpecifics& specifics,
                              const std::string& originator_cache_guid,
                              const std::string& originator_client_item_id) {
-  DCHECK(base::IsValidGUIDOutputString(specifics.guid()));
+  DCHECK(base::GUID::ParseLowercase(specifics.guid()).is_valid());
 
   if (originator_client_item_id.empty()) {
     // This could be a future bookmark with a client tag instead of an
@@ -404,7 +405,7 @@ bool HasExpectedBookmarkGuid(const sync_pb::BookmarkSpecifics& specifics,
     return true;
   }
 
-  if (base::IsValidGUID(originator_client_item_id)) {
+  if (base::GUID::ParseCaseInsensitive(originator_client_item_id).is_valid()) {
     // Bookmarks created around 2016, between [M44..M52) use an uppercase GUID
     // as originator client item ID, so it needs to be lowercased to adhere to
     // the invariant that GUIDs in specifics are canonicalized.