Unescape and use the filename when we have no title to display for a given en...

chrome/browser/navigation_entry.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/navigation_entry.h"
 
 #include "chrome/common/resource_bundle.h"
+#include "net/base/escape.h"
 
 // Use this to get a new unique ID for a NavigationEntry during construction.
 // The returned ID is guaranteed to be nonzero (which is the "no ID" indicator).
 static int GetUniqueID() {
   static int unique_id_counter = 0;
   return ++unique_id_counter;
 }
 
 NavigationEntry::SSLStatus::SSLStatus()
     : security_style_(SECURITY_STYLE_UNKNOWN),
@@ skipping 33 matching lines @@
       url_(url),
       referrer_(referrer),
       title_(title),
       page_id_(page_id),
       transition_type_(transition_type),
       has_post_data_(false),
       restored_(false) {
 }
 
 const std::wstring& NavigationEntry::GetTitleForDisplay() {
-  if (title_.empty())
-    return url_as_string_;
+  if (title_.empty()) {
+    title_ = UTF8ToWide(url_.ExtractFileName().empty() ? 
+        url_.spec() : 
+        UnescapeURLComponent(url_.ExtractFileName(), 
+            UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS));
+  }
   return title_;
 }