Reland Tab History and BrowserViewController CRWSessionEntry removal.

ios/web/navigation/navigation_item_impl.mm

 // Copyright 2014 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.
 
 #import "ios/web/navigation/navigation_item_impl.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 136 matching lines @@
   // Most pages have real titles. Don't even bother caching anything if this is
   // the case.
   if (!title_.empty())
     return title_;
 
   // More complicated cases will use the URLs as the title. This result we will
   // cache since it's more complicated to compute.
   if (!cached_display_title_.empty())
     return cached_display_title_;
 
-  // Use the virtual URL first if any, and fall back on using the real URL.
-  base::string16 title;
-  if (!virtual_url_.is_empty()) {
-    title = url_formatter::FormatUrl(virtual_url_);
-  } else if (!url_.is_empty()) {
-    title = url_formatter::FormatUrl(url_);
-  }
-
-  // For file:// URLs use the filename as the title, not the full path.
-  if (url_.SchemeIsFile()) {
-    base::string16::size_type slashpos = title.rfind('/');
-    if (slashpos != base::string16::npos)
-      title = title.substr(slashpos + 1);
-  }
-
-  const size_t kMaxTitleChars = 4 * 1024;
-  gfx::ElideString(title, kMaxTitleChars, &cached_display_title_);
+  cached_display_title_ =
+      NavigationItemImpl::GetDisplayTitleForURL(GetVirtualURL());
   return cached_display_title_;
 }
 
 void NavigationItemImpl::SetTransitionType(ui::PageTransition transition_type) {
   transition_type_ = transition_type;
 }
 
 ui::PageTransition NavigationItemImpl::GetTransitionType() const {
   return transition_type_;
 }
@@ skipping 119 matching lines @@
 void NavigationItemImpl::ResetHttpRequestHeaders() {
   http_request_headers_.reset();
 }
 
 void NavigationItemImpl::ResetForCommit() {
   // Navigation initiation type is only valid for pending navigations, thus
   // always reset to NONE after the item is committed.
   SetNavigationInitiationType(web::NavigationInitiationType::NONE);
 }
 
+// static
+base::string16 NavigationItemImpl::GetDisplayTitleForURL(const GURL& url) {
+  DCHECK(!url.is_empty());

[Eugene But (OOO till 7-30), 2017/03/01 22:45:44]

Is this DCHECK valid?

[kkhorimoto, 2017/03/01 23:23:47]

I've updated to an early return for code robustness.

+  base::string16 title = url_formatter::FormatUrl(url);
+
+  // For file:// URLs use the filename as the title, not the full path.
+  if (url.SchemeIsFile()) {

[Eugene But (OOO till 7-30), 2017/03/01 22:45:44]

Old code used url, new code uses virtualURL. Is that ok?

[kkhorimoto, 2017/03/01 23:23:47]

Yes, since the virtual URL is what's displayed to the user, it also makes sense
to use it to decide the displayed title.  I've updated the CL comment with this
as well.

+    base::string16::size_type slashpos = title.rfind('/');
+    if (slashpos != base::string16::npos)
+      title = title.substr(slashpos + 1);
+  }
+
+  const size_t kMaxTitleChars = 4 * 1024;
+  gfx::ElideString(title, kMaxTitleChars, &title);
+  return title;
+}
+
 }  // namespace web