[STTS] Revert special case handling of non utf8 strings

(cherry picked from commit 94184d0)

Bug: 1290500
Change-Id: Ibe0c5dd656c37e4950cfca27e7c26b4bbd5ecb8a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3646087
Reviewed-by: Travis Skare <skare@chromium.org>
Commit-Queue: Jeffrey Cohen <jeffreycohen@chromium.org>
Cr-Original-Commit-Position: refs/heads/main@{#1002907}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3648576
Auto-Submit: Jeffrey Cohen <jeffreycohen@chromium.org>
Cr-Commit-Position: refs/branch-heads/5005@{#769}
Cr-Branched-From: 5b4d945-refs/heads/main@{#992738}

components/send_tab_to_self/send_tab_to_self_bridge.cc

@@ -619,6 +619,7 @@ void SendTabToSelfBridge::DoGarbageCollection() {
   auto entry = entries_.begin();
   while (entry != entries_.end()) {
     DCHECK_EQ(entry->first, entry->second->GetGUID());
+
     std::string guid = entry->first;
     bool expired = entry->second->IsExpired(clock_->Now());
     entry++;

components/send_tab_to_self/send_tab_to_self_entry.cc

@@ -12,7 +12,6 @@
 #include "base/strings/string_util.h"
 #include "components/send_tab_to_self/proto/send_tab_to_self.pb.h"
 #include "components/sync/protocol/send_tab_to_self_specifics.pb.h"
-#include "third_party/icu/source/common/unicode/unistr.h"
 
 namespace send_tab_to_self {
 
@@ -50,12 +49,6 @@ SendTabToSelfEntry::SendTabToSelfEntry(
       opened_(false) {
   DCHECK(!guid_.empty());
   DCHECK(url_.is_valid());
-  if (!base::IsStringUTF8(guid_) || !base::IsStringUTF8(title_) ||
-      !base::IsStringUTF8(target_device_sync_cache_guid_) ||
-      !base::IsStringUTF8(device_name_)) {
-    // Set GUID as an empty strings to make entry invalid.
-    guid_ = std::string();
-  }
 }
 
 SendTabToSelfEntry::~SendTabToSelfEntry() {}
@@ -128,13 +121,7 @@ std::unique_ptr<SendTabToSelfEntry> SendTabToSelfEntry::FromProto(
     const sync_pb::SendTabToSelfSpecifics& pb_entry,
     base::Time now) {
   std::string guid(pb_entry.guid());
-  std::string title(pb_entry.title());
-  std::string device_name(pb_entry.device_name());
-  std::string target_device_sync_cache_guid(
-      pb_entry.target_device_sync_cache_guid());
-  if (guid.empty() || !base::IsStringUTF8(guid) || !base::IsStringUTF8(title) ||
-      !base::IsStringUTF8(device_name) ||
-      !base::IsStringUTF8(target_device_sync_cache_guid)) {
+  if (guid.empty()) {
     return nullptr;
   }
 
@@ -156,8 +143,8 @@ std::unique_ptr<SendTabToSelfEntry> SendTabToSelfEntry::FromProto(
 
   // Protobuf parsing enforces utf8 encoding for all strings.
   auto entry = std::make_unique<SendTabToSelfEntry>(
-      guid, url, title, shared_time, navigation_time, device_name,
-      target_device_sync_cache_guid);
+      guid, url, pb_entry.title(), shared_time, navigation_time,
+      pb_entry.device_name(), pb_entry.target_device_sync_cache_guid());
 
   if (pb_entry.opened()) {
     entry->MarkOpened();

components/send_tab_to_self/send_tab_to_self_entry_unittest.cc

@@ -118,8 +118,7 @@ TEST(SendTabToSelfEntry, IsExpired) {
   EXPECT_FALSE(entry.IsExpired(base::Time::FromTimeT(11)));
 }
 
-// Tests that the send tab to self entry rejects strings that are not utf8
-// gracefully.
+// Tests that the send tab to self entry rejects strings that are not utf8.
 TEST(SendTabToSelfEntry, InvalidStrings) {
   const char16_t term[1] = {u'\uFDD1'};
   std::string invalid_utf8;
@@ -129,25 +128,25 @@ TEST(SendTabToSelfEntry, InvalidStrings) {
                               base::Time::FromTimeT(10),
                               base::Time::FromTimeT(10), "device", "device");
 
-  EXPECT_EQ(std::string(), invalid1.GetGUID());
+  EXPECT_EQ("1", invalid1.GetGUID());
 
   SendTabToSelfEntry invalid2(invalid_utf8, GURL("http://example.com"), "title",
                               base::Time::FromTimeT(10),
                               base::Time::FromTimeT(10), "device", "device");
 
-  EXPECT_EQ(std::string(), invalid2.GetGUID());
+  EXPECT_EQ(invalid_utf8, invalid2.GetGUID());
 
   SendTabToSelfEntry invalid3(
       "1", GURL("http://example.com"), "title", base::Time::FromTimeT(10),
       base::Time::FromTimeT(10), invalid_utf8, "device");
 
-  EXPECT_EQ(std::string(), invalid3.GetGUID());
+  EXPECT_EQ("1", invalid3.GetGUID());
 
   SendTabToSelfEntry invalid4(
       "1", GURL("http://example.com"), "title", base::Time::FromTimeT(10),
       base::Time::FromTimeT(10), "device", invalid_utf8);
 
-  EXPECT_EQ(std::string(), invalid4.GetGUID());
+  EXPECT_EQ("1", invalid4.GetGUID());
 
   std::unique_ptr<sync_pb::SendTabToSelfSpecifics> pb_entry =
       std::make_unique<sync_pb::SendTabToSelfSpecifics>();
@@ -163,7 +162,7 @@ TEST(SendTabToSelfEntry, InvalidStrings) {
   std::unique_ptr<SendTabToSelfEntry> invalid_entry(
       SendTabToSelfEntry::FromProto(*pb_entry, base::Time::FromTimeT(10)));
 
-  EXPECT_EQ(invalid_entry, nullptr);
+  EXPECT_EQ(invalid_entry->GetGUID(), invalid_utf8);
 }
 
 // Tests that the send tab to self entry is correctly encoded to