[Reading List iOS] Collapse whitespace on item title.

components/reading_list/ios/reading_list_model_impl.cc

Index: components/reading_list/ios/reading_list_model_impl.cc
diff --git a/components/reading_list/ios/reading_list_model_impl.cc b/components/reading_list/ios/reading_list_model_impl.cc
index 015bcc44970745800c8c832d13017071958f6446..d58fc1ba6fb797c8d8b73144ced97edfb61a33c5 100644
--- a/components/reading_list/ios/reading_list_model_impl.cc
+++ b/components/reading_list/ios/reading_list_model_impl.cc
@@ -313,10 +313,9 @@ const ReadingListEntry& ReadingListModelImpl::AddEntry(
   DCHECK(url.SchemeIsHTTPOrHTTPS());
   RemoveEntryByURL(url);
 
-  std::string trimmedTitle(title);
-  base::TrimWhitespaceASCII(trimmedTitle, base::TRIM_ALL, &trimmedTitle);
+  std::string trimmed_title = base::CollapseWhitespaceASCII(title, false);
 
-  ReadingListEntry entry(url, trimmedTitle);
+  ReadingListEntry entry(url, trimmed_title);

[gambard, 2017/02/14 08:37:26]

What happens if the entry is added with empty title at the start?

[Olivier, 2017/02/14 08:44:47]

tab.title is never empty, so it does not happen when adding an item from Reading
List.
If using the share extension, the line stays empty.
I propose to add a fix in ReadingListCollectionViewController to set title to
URL if there is no title.

[Olivier, 2017/02/14 09:09:53]

Done.

   for (auto& observer : observers_)
     observer.ReadingListWillAddEntry(this, entry);
   UpdateEntryStateCountersOnEntryInsertion(entry);
@@ -372,14 +371,15 @@ void ReadingListModelImpl::SetEntryTitle(const GURL& url,
     return;
   }
   ReadingListEntry& entry = iterator->second;
-  if (entry.Title() == title) {
+  std::string trimmed_title = base::CollapseWhitespaceASCII(title, false);
+  if (entry.Title() == trimmed_title) {
     return;
   }
 
   for (ReadingListModelObserver& observer : observers_) {
     observer.ReadingListWillUpdateEntry(this, url);
   }
-  entry.SetTitle(title);
+  entry.SetTitle(trimmed_title);
   if (storage_layer_) {
     storage_layer_->SaveEntry(entry);
   }