Change NavigationEntry's title fields to carry the text direction.

content/browser/tab_contents/navigation_entry_unittest.cc

 // Copyright (c) 2010 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 "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/site_instance.h"
 #include "content/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);
 
     instance_ = SiteInstance::CreateSiteInstance(NULL);
-    entry2_.reset(new NavigationEntry(instance_, 3,
-                                      GURL("test:url"),
-                                      GURL("from"),
-                                      ASCIIToUTF16("title"),
-                                      PageTransition::TYPED));
+    entry2_.reset(new NavigationEntry(
+        instance_, 3,
+        GURL("test:url"),
+        GURL("from"),
+        base::i18n::String16WithDirection(ASCIIToUTF16("title"),
+                                          base::i18n::LEFT_TO_RIGHT),
+        PageTransition::TYPED));
   }
 
   virtual void TearDown() {
   }
 
  protected:
   scoped_ptr<NavigationEntry> entry1_;
   scoped_ptr<NavigationEntry> entry2_;
   // SiteInstances are deleted when their NavigationEntries are gone.
   SiteInstance* instance_;
@@ skipping 10 matching lines @@
 }
 
 // Test URL accessors
 TEST_F(NavigationEntryTest, NavigationEntryURLs) {
   // 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()->virtual_url());
-  EXPECT_TRUE(entry1_.get()->GetTitleForDisplay("").empty());
+  EXPECT_TRUE(entry1_.get()->GetTitleForDisplay("").is_empty());
 
   // 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()->virtual_url());
   EXPECT_EQ(ASCIIToUTF16("www.google.com"),
-            entry1_.get()->GetTitleForDisplay(""));
+            entry1_.get()->GetTitleForDisplay("").string());
 
   // file:/// URLs should only show the filename.
   entry1_.get()->set_url(GURL("file:///foo/bar baz.txt"));
   EXPECT_EQ(ASCIIToUTF16("bar baz.txt"),
-            entry1_.get()->GetTitleForDisplay(""));
+            entry1_.get()->GetTitleForDisplay("").string());
 
   // Title affects GetTitleForDisplay
-  entry1_.get()->set_title(ASCIIToUTF16("Google"));
-  EXPECT_EQ(ASCIIToUTF16("Google"), entry1_.get()->GetTitleForDisplay(""));
+  entry1_.get()->set_title(
+      base::i18n::String16WithDirection(ASCIIToUTF16("Google"),
+                                        base::i18n::LEFT_TO_RIGHT));
+  EXPECT_EQ(ASCIIToUTF16("Google"),
+            entry1_.get()->GetTitleForDisplay("").string());
 
   // 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()->virtual_url());
 
   // Having a title set in constructor overrides virtual URL
-  EXPECT_EQ(ASCIIToUTF16("title"), entry2_.get()->GetTitleForDisplay(""));
+  EXPECT_EQ(ASCIIToUTF16("title"),
+            entry2_.get()->GetTitleForDisplay("").string());
 
   // 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 52 matching lines @@
   entry2_.get()->set_page_type(INTERSTITIAL_PAGE);
   EXPECT_EQ(INTERSTITIAL_PAGE, entry2_.get()->page_type());
 
   // 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(string16(), entry1_.get()->title());
-  EXPECT_EQ(ASCIIToUTF16("title"), entry2_.get()->title());
-  entry2_.get()->set_title(ASCIIToUTF16("title2"));
-  EXPECT_EQ(ASCIIToUTF16("title2"), entry2_.get()->title());
+  EXPECT_EQ(string16(), entry1_.get()->title().string());
+  EXPECT_EQ(ASCIIToUTF16("title"), entry2_.get()->title().string());
+  entry2_.get()->set_title(
+      base::i18n::String16WithDirection(ASCIIToUTF16("title2"),
+                                        base::i18n::LEFT_TO_RIGHT));
+  EXPECT_EQ(ASCIIToUTF16("title2"), entry2_.get()->title().string());
 
   // 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_EQ(NavigationEntry::RESTORE_NONE, entry1_->restore_type());
   EXPECT_EQ(NavigationEntry::RESTORE_NONE, entry2_->restore_type());
   entry2_->set_restore_type(NavigationEntry::RESTORE_LAST_SESSION);
   EXPECT_EQ(NavigationEntry::RESTORE_LAST_SESSION, entry2_->restore_type());
 }