Convert NavigationEntry title to string16. TabContents::GetTitle no longer ne...

chrome/browser/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:
   NavigationEntryTest() : instance_(NULL) {
   }
 
   virtual void SetUp() {
     entry1_.reset(new NavigationEntry(TAB_CONTENTS_WEB));
 
     instance_ = SiteInstance::CreateSiteInstance(NULL);
     entry2_.reset(new NavigationEntry(TAB_CONTENTS_DOM_UI, instance_, 3,
                                       GURL("test:url"),
                                       GURL("from"),
-                                      L"title",
+                                      ASCIIToUTF16("title"),
                                       PageTransition::TYPED));
   }
 
   virtual void TearDown() {
   }
 
  protected:
   scoped_ptr<NavigationEntry> entry1_;
   scoped_ptr<NavigationEntry> entry2_;
   // SiteInstances are deleted when their NavigationEntries are gone.
@@ skipping 11 matching lines @@
 }
 
 // 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());
 
   EXPECT_EQ(GURL(), entry1_.get()->url());
   EXPECT_EQ(GURL(), entry1_.get()->display_url());
-  EXPECT_EQ(L"", entry1_.get()->GetTitleForDisplay());
+  EXPECT_TRUE(entry1_.get()->GetTitleForDisplay(NULL).empty());
 
   // Setting URL affects display_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(L"http://www.google.com/", entry1_.get()->GetTitleForDisplay());
+  EXPECT_EQ(ASCIIToUTF16("http://www.google.com/"),
+            entry1_.get()->GetTitleForDisplay(NULL));
 
   // Title affects GetTitleForDisplay
-  entry1_.get()->set_title(L"Google");
-  EXPECT_EQ(L"Google", entry1_.get()->GetTitleForDisplay());
+  entry1_.get()->set_title(ASCIIToWide("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());
   EXPECT_EQ(GURL("test:url"), entry2_.get()->url());
   EXPECT_EQ(GURL("display:url"), entry2_.get()->display_url());
 
   // Having a title set in constructor overrides display URL
-  EXPECT_EQ(L"title", entry2_.get()->GetTitleForDisplay());
+  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
 TEST_F(NavigationEntryTest, NavigationEntryFavicons) {
@@ skipping 57 matching lines @@
 
   // Referrer
   EXPECT_EQ(GURL(), entry1_.get()->referrer());
   EXPECT_EQ(GURL("from"), entry2_.get()->referrer());
   entry2_.get()->set_referrer(GURL("from2"));
   EXPECT_EQ(GURL("from2"), entry2_.get()->referrer());
 
   // Title
   EXPECT_EQ(std::wstring(), entry1_.get()->title());
   EXPECT_EQ(L"title", entry2_.get()->title());
-  entry2_.get()->set_title(L"title2");
-  EXPECT_EQ(L"title2", entry2_.get()->title());
+  entry2_.get()->set_title(ASCIIToUTF16("title2"));
+  EXPECT_EQ(ASCIIToUTF16("title2"), entry2_.get()->title());
 
   // State
   EXPECT_EQ(std::string(), entry1_.get()->content_state());
   EXPECT_EQ(std::string(), entry2_.get()->content_state());
   entry2_.get()->set_content_state("state");
   EXPECT_EQ("state", entry2_.get()->content_state());
 
   // Page ID
   EXPECT_EQ(-1, entry1_.get()->page_id());
   EXPECT_EQ(3, entry2_.get()->page_id());
@@ skipping 11 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());
 }