summaryrefslogtreecommitdiffstats
path: root/chrome/browser/navigation_entry_unittest.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-04 06:13:02 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-04 06:13:02 +0000
commitcee9de4e4af9a1d441a1540c6c7a676c35042994 (patch)
treeac2034b3195281551dde58be9f4b2c32d8b8f8c0 /chrome/browser/navigation_entry_unittest.cc
parentd01902d70e46a90fc24d3a442805a4a665d373ca (diff)
downloadchromium_src-cee9de4e4af9a1d441a1540c6c7a676c35042994.zip
chromium_src-cee9de4e4af9a1d441a1540c6c7a676c35042994.tar.gz
chromium_src-cee9de4e4af9a1d441a1540c6c7a676c35042994.tar.bz2
Fix the build with some forgotten string conversions on non-Windows.
Review URL: http://codereview.chromium.org/40099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/navigation_entry_unittest.cc')
-rw-r--r--chrome/browser/navigation_entry_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/navigation_entry_unittest.cc b/chrome/browser/navigation_entry_unittest.cc
index ebeeae8..7d4f77a 100644
--- a/chrome/browser/navigation_entry_unittest.cc
+++ b/chrome/browser/navigation_entry_unittest.cc
@@ -60,7 +60,7 @@ TEST_F(NavigationEntryTest, NavigationEntryURLs) {
entry1_.get()->GetTitleForDisplay(NULL));
// Title affects GetTitleForDisplay
- entry1_.get()->set_title(ASCIIToWide("Google"));
+ entry1_.get()->set_title(ASCIIToUTF16("Google"));
EXPECT_EQ(ASCIIToUTF16("Google"), entry1_.get()->GetTitleForDisplay(NULL));
// Setting display_url doesn't affect URL
@@ -146,8 +146,8 @@ TEST_F(NavigationEntryTest, NavigationEntryAccessors) {
EXPECT_EQ(GURL("from2"), entry2_.get()->referrer());
// Title
- EXPECT_EQ(std::wstring(), entry1_.get()->title());
- EXPECT_EQ(L"title", entry2_.get()->title());
+ EXPECT_EQ(string16(), entry1_.get()->title());
+ EXPECT_EQ(ASCIIToUTF16("title"), entry2_.get()->title());
entry2_.get()->set_title(ASCIIToUTF16("title2"));
EXPECT_EQ(ASCIIToUTF16("title2"), entry2_.get()->title());