[Reading List iOS] Collapse whitespace on item title.

components/reading_list/ios/reading_list_model_impl.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/reading_list/ios/reading_list_model_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
@@ skipping 295 matching lines @@
 
 const ReadingListEntry& ReadingListModelImpl::AddEntry(
     const GURL& url,
     const std::string& title,
     reading_list::EntrySource source) {
   DCHECK(CalledOnValidThread());
   DCHECK(loaded());
   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);
   SetUnseenFlag();
   entries_->insert(std::make_pair(url, std::move(entry)));
 
   if (storage_layer_) {
     storage_layer_->SaveEntry(*GetEntryByURL(url));
   }
 
@@ skipping 35 matching lines @@
 
 void ReadingListModelImpl::SetEntryTitle(const GURL& url,
                                          const std::string& title) {
   DCHECK(CalledOnValidThread());
   DCHECK(loaded());
   auto iterator = entries_->find(url);
   if (iterator == entries_->end()) {
     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);
   }
   for (ReadingListModelObserver& observer : observers_) {
     observer.ReadingListDidApplyChanges(this);
   }
 }
 
 void ReadingListModelImpl::SetEntryDistilledInfo(
     const GURL& url,
@@ skipping 103 matching lines @@
 syncer::ModelTypeSyncBridge* ReadingListModelImpl::GetModelTypeSyncBridge() {
   DCHECK(loaded());
   if (!storage_layer_)
     return nullptr;
   return storage_layer_.get();
 }
 
 ReadingListModelStorage* ReadingListModelImpl::StorageLayer() {
   return storage_layer_.get();
 }