Lands http://codereview.chromium.org/1744011/show for Hans:

Make reopened tabs with "about:" URLs display properly. 

- Rename TabNavigation::url_ to virtual_url_. 
Make it more explicit that a TabNavigation stores the *virtual* URL of
a 
NavigationEntry. 

- Translate virtual URLs when restoring tabs. 
Instead of putting the virtual URL in the URL proper field when
creating a 
NavigationEntry from a TabNavigation, put it in the virtual URL field,
and 
then translate this to a proper URL in 
NavigationController::CreateNavigationEntriesFromTabNavigations(). 
This fixes bug 31905. 

Contributed by Hans Wennborg <hans@chromium.org> 

BUG=31905
TEST=ui_tests --gtest_filter=TabRestoreUITest.RestoreTabWithSpecialURL*

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

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

1 files changed, 11 insertions, 8 deletions

diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc
index 3a32b55..3a4e905 100644
--- a/chrome/browser/sessions/session_service_unittest.cc
+++ b/chrome/browser/sessions/session_service_unittest.cc
@@ -53,7 +53,7 @@ class SessionServiceTest : public BrowserWithTestWindowTest {
                         int index,
                         bool select) {
     NavigationEntry entry;
-    entry.set_url(navigation.url());
+    entry.set_url(navigation.virtual_url());
     entry.set_referrer(navigation.referrer());
     entry.set_title(navigation.title());
     entry.set_content_state(navigation.state());
@@ -520,9 +520,12 @@ TEST_F(SessionServiceTest, PruneFromFront) {
   SessionTab* tab = windows[0]->tabs[0];
   ASSERT_EQ(1, tab->current_navigation_index);
   EXPECT_EQ(3U, tab->navigations.size());
-  EXPECT_TRUE(GURL(base_url + IntToString(2)) == tab->navigations[0].url());
-  EXPECT_TRUE(GURL(base_url + IntToString(3)) == tab->navigations[1].url());
-  EXPECT_TRUE(GURL(base_url + IntToString(4)) == tab->navigations[2].url());
+  EXPECT_TRUE(GURL(base_url + IntToString(2)) ==
+              tab->navigations[0].virtual_url());
+  EXPECT_TRUE(GURL(base_url + IntToString(3)) ==
+              tab->navigations[1].virtual_url());
+  EXPECT_TRUE(GURL(base_url + IntToString(4)) ==
+              tab->navigations[2].virtual_url());
 }
 
 // Prunes from front so that we have no entries.
@@ -592,14 +595,14 @@ class GetCurrentSessionCallbackHandler {
     EXPECT_EQ(2U, (*windows)[0]->tabs.size());
     EXPECT_EQ(2U, (*windows)[0]->tabs[0]->navigations.size());
     EXPECT_EQ(GURL("http://bar/1"),
-              (*windows)[0]->tabs[0]->navigations[0].url());
+              (*windows)[0]->tabs[0]->navigations[0].virtual_url());
     EXPECT_EQ(GURL("http://bar/2"),
-              (*windows)[0]->tabs[0]->navigations[1].url());
+              (*windows)[0]->tabs[0]->navigations[1].virtual_url());
     EXPECT_EQ(2U, (*windows)[0]->tabs[1]->navigations.size());
     EXPECT_EQ(GURL("http://foo/1"),
-              (*windows)[0]->tabs[1]->navigations[0].url());
+              (*windows)[0]->tabs[1]->navigations[0].virtual_url());
     EXPECT_EQ(GURL("http://foo/2"),
-              (*windows)[0]->tabs[1]->navigations[1].url());
+              (*windows)[0]->tabs[1]->navigations[1].virtual_url());
   }
 };