Reland r23357 since it doesn't seem to be the cause of unit test

failure:

Renames the NavigationEntry::display_url() to virtual_url().

BUG=6970 (http://crbug.com/6970)
TEST=None

Patch by Thiago Farina <thiago.farina@gmail.com> at
http://codereview.chromium.org/164383

Review URL: http://codereview.chromium.org/165501


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23374 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/tab_contents/navigation_entry.cc b/chrome/browser/tab_contents/navigation_entry.cc
index 5a3ea92..5030c5d 100644
--- a/chrome/browser/tab_contents/navigation_entry.cc
+++ b/chrome/browser/tab_contents/navigation_entry.cc
@@ -74,15 +74,15 @@ const string16& NavigationEntry::GetTitleForDisplay(
   if (!cached_display_title_.empty())
     return cached_display_title_;
 
-  // Use the display URL first if any, and fall back on using the real URL.
+  // Use the virtual URL first if any, and fall back on using the real URL.
   std::wstring languages;
   if (navigation_controller) {
       languages = navigation_controller->profile()->GetPrefs()->GetString(
           prefs::kAcceptLanguages);
   }
-  if (!display_url_.is_empty()) {
+  if (!virtual_url_.is_empty()) {
     cached_display_title_ = WideToUTF16Hack(net::FormatUrl(
-        display_url_, languages));
+        virtual_url_, languages));
   } else if (!url_.is_empty()) {
     cached_display_title_ = WideToUTF16Hack(net::FormatUrl(url_, languages));
   }
@@ -90,5 +90,5 @@ const string16& NavigationEntry::GetTitleForDisplay(
 }
 
 bool NavigationEntry::IsViewSourceMode() const {
-  return display_url_.SchemeIs(chrome::kViewSourceScheme);
+  return virtual_url_.SchemeIs(chrome::kViewSourceScheme);
 }