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

This reverts commit r23357.

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


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

2 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc
index fcafbe0..832a26e 100644
--- a/chrome/browser/sessions/base_session_service.cc
+++ b/chrome/browser/sessions/base_session_service.cc
@@ -156,7 +156,7 @@ SessionCommand* BaseSessionService::CreateUpdateTabNavigationCommand(
   int bytes_written = 0;
 
   WriteStringToPickle(pickle, &bytes_written, max_state_size,
-                      entry.virtual_url().spec());
+                      entry.display_url().spec());
 
   WriteString16ToPickle(pickle, &bytes_written, max_state_size, entry.title());
 
@@ -215,7 +215,7 @@ bool BaseSessionService::RestoreUpdateTabNavigationCommand(
 }
 
 bool BaseSessionService::ShouldTrackEntry(const NavigationEntry& entry) {
-  return entry.virtual_url().is_valid();
+  return entry.display_url().is_valid();
 }
 
 bool BaseSessionService::ShouldTrackEntry(const TabNavigation& navigation) {
diff --git a/chrome/browser/sessions/session_types.cc b/chrome/browser/sessions/session_types.cc
index 852fe8b..14caf79 100644
--- a/chrome/browser/sessions/session_types.cc
+++ b/chrome/browser/sessions/session_types.cc
@@ -21,14 +21,14 @@ NavigationEntry* TabNavigation::ToNavigationEntry(int page_id) const {
       // Use a transition type of reload so that we don't incorrectly
       // increase the typed count.
       PageTransition::RELOAD);
-  entry->set_virtual_url(url_);
+  entry->set_display_url(url_);
   entry->set_content_state(state_);
   entry->set_has_post_data(type_mask_ & TabNavigation::HAS_POST_DATA);
   return entry;
 }
 
 void TabNavigation::SetFromNavigationEntry(const NavigationEntry& entry) {
-  url_ = entry.virtual_url();
+  url_ = entry.display_url();
   referrer_ = entry.referrer();
   title_ = entry.title();
   state_ = entry.content_state();