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

chrome/browser/tab_contents/navigation_entry_unittest.cc

 // Copyright (c) 2009 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 "base/string16.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class NavigationEntryTest : public testing::Test {
  public:
@@ skipping 26 matching lines @@
   // Two entries should have different IDs by default
   EXPECT_NE(entry1_.get()->unique_id(), entry2_.get()->unique_id());
 
   // Can set an entry to have the same ID as another
   entry2_.get()->set_unique_id(entry1_.get()->unique_id());
   EXPECT_EQ(entry1_.get()->unique_id(), entry2_.get()->unique_id());
 }
 
 // Test URL accessors
 TEST_F(NavigationEntryTest, NavigationEntryURLs) {
-  // Start with no display_url (even if a url is set)
-  EXPECT_FALSE(entry1_.get()->has_display_url());
-  EXPECT_FALSE(entry2_.get()->has_display_url());
+  // Start with no virtual_url (even if a url is set)
+  EXPECT_FALSE(entry1_.get()->has_virtual_url());
+  EXPECT_FALSE(entry2_.get()->has_virtual_url());
 
   EXPECT_EQ(GURL(), entry1_.get()->url());
-  EXPECT_EQ(GURL(), entry1_.get()->display_url());
+  EXPECT_EQ(GURL(), entry1_.get()->virtual_url());
   EXPECT_TRUE(entry1_.get()->GetTitleForDisplay(NULL).empty());
 
-  // Setting URL affects display_url and GetTitleForDisplay
+  // Setting URL affects virtual_url and GetTitleForDisplay
   entry1_.get()->set_url(GURL("http://www.google.com"));
   EXPECT_EQ(GURL("http://www.google.com"), entry1_.get()->url());
-  EXPECT_EQ(GURL("http://www.google.com/"), entry1_.get()->display_url());
+  EXPECT_EQ(GURL("http://www.google.com/"), entry1_.get()->virtual_url());
   EXPECT_EQ(ASCIIToUTF16("http://www.google.com/"),
             entry1_.get()->GetTitleForDisplay(NULL));
 
   // Title affects GetTitleForDisplay
   entry1_.get()->set_title(ASCIIToUTF16("Google"));
   EXPECT_EQ(ASCIIToUTF16("Google"), entry1_.get()->GetTitleForDisplay(NULL));
 
-  // Setting display_url doesn't affect URL
-  entry2_.get()->set_display_url(GURL("display:url"));
-  EXPECT_TRUE(entry2_.get()->has_display_url());
+  // Setting virtual_url doesn't affect URL
+  entry2_.get()->set_virtual_url(GURL("display:url"));
+  EXPECT_TRUE(entry2_.get()->has_virtual_url());
   EXPECT_EQ(GURL("test:url"), entry2_.get()->url());
-  EXPECT_EQ(GURL("display:url"), entry2_.get()->display_url());
+  EXPECT_EQ(GURL("display:url"), entry2_.get()->virtual_url());
 
-  // Having a title set in constructor overrides display URL
+  // Having a title set in constructor overrides virtual URL
   EXPECT_EQ(ASCIIToUTF16("title"), entry2_.get()->GetTitleForDisplay(NULL));
 
   // User typed URL is independent of the others
   EXPECT_EQ(GURL(), entry1_.get()->user_typed_url());
   EXPECT_EQ(GURL(), entry2_.get()->user_typed_url());
   entry2_.get()->set_user_typed_url(GURL("typedurl"));
   EXPECT_EQ(GURL("typedurl"), entry2_.get()->user_typed_url());
 }
 
 // Test Favicon inner class
@@ skipping 87 matching lines @@
   EXPECT_FALSE(entry2_.get()->has_post_data());
   entry2_.get()->set_has_post_data(true);
   EXPECT_TRUE(entry2_.get()->has_post_data());
 
   // Restored
   EXPECT_FALSE(entry1_.get()->restored());
   EXPECT_FALSE(entry2_.get()->restored());
   entry2_.get()->set_restored(true);
   EXPECT_TRUE(entry2_.get()->restored());
 }