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, 1 insertions, 1 deletions

diff --git a/chrome/browser/sessions/session_service_test_helper.cc b/chrome/browser/sessions/session_service_test_helper.cc
index 7703bc8..a36562d 100644
--- a/chrome/browser/sessions/session_service_test_helper.cc
+++ b/chrome/browser/sessions/session_service_test_helper.cc
@@ -69,7 +69,7 @@ void SessionServiceTestHelper::AssertTabEquals(
 void SessionServiceTestHelper::AssertNavigationEquals(
     const TabNavigation& expected,
     const TabNavigation& actual) {
-  EXPECT_TRUE(expected.url() == actual.url());
+  EXPECT_TRUE(expected.virtual_url() == actual.virtual_url());
   EXPECT_EQ(expected.referrer(), actual.referrer());
   EXPECT_EQ(expected.title(), actual.title());
   EXPECT_EQ(expected.state(), actual.state());