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

content/browser/tab_contents/render_view_host_manager_unittest.cc

 // Copyright (c) 2011 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 "chrome/browser/browser_url_handler.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/test_notification_tracker.h"
 #include "chrome/test/testing_profile.h"
 #include "content/browser/browser_thread.h"
@@ skipping 158 matching lines @@
   // Create.
   RenderViewHostManager manager(&tab_contents, &tab_contents);
 
   manager.Init(profile_.get(), instance, MSG_ROUTING_NONE);
 
   RenderViewHost* host;
 
   // 1) The first navigation. --------------------------
   GURL url1("http://www.google.com/");
   NavigationEntry entry1(NULL /* instance */, -1 /* page_id */, url1,
-                         GURL() /* referrer */, string16() /* title */,
+                         GURL() /* referrer */,
+                         base::i18n::String16WithDirection() /* title */,
                          PageTransition::TYPED);
   host = manager.Navigate(entry1);
 
   // The RenderViewHost created in Init will be reused.
   EXPECT_TRUE(host == manager.current_host());
   EXPECT_FALSE(manager.pending_render_view_host());
 
   // Commit.
   manager.DidNavigateMainFrame(host);
   // Commit to SiteInstance should be delayed until RenderView commit.
   EXPECT_TRUE(host == manager.current_host());
   ASSERT_TRUE(host);
   EXPECT_FALSE(host->site_instance()->has_site());
   host->site_instance()->SetSite(url1);
 
   // 2) Navigate to next site. -------------------------
   GURL url2("http://www.google.com/foo");
   NavigationEntry entry2(NULL /* instance */, -1 /* page_id */, url2,
-                         url1 /* referrer */, string16() /* title */,
+                         url1 /* referrer */,
+                         base::i18n::String16WithDirection() /* title */,
                          PageTransition::LINK);
   host = manager.Navigate(entry2);
 
   // The RenderViewHost created in Init will be reused.
   EXPECT_TRUE(host == manager.current_host());
   EXPECT_FALSE(manager.pending_render_view_host());
 
   // Commit.
   manager.DidNavigateMainFrame(host);
   EXPECT_TRUE(host == manager.current_host());
   ASSERT_TRUE(host);
   EXPECT_TRUE(host->site_instance()->has_site());
 
   // 3) Cross-site navigate to next site. --------------
   GURL url3("http://webkit.org/");
   NavigationEntry entry3(NULL /* instance */, -1 /* page_id */, url3,
-                         url2 /* referrer */, string16() /* title */,
+                         url2 /* referrer */,
+                         base::i18n::String16WithDirection() /* title */,
                          PageTransition::LINK);
   host = manager.Navigate(entry3);
 
   // A new RenderViewHost should be created.
   EXPECT_TRUE(manager.pending_render_view_host());
   EXPECT_TRUE(host == manager.pending_render_view_host());
 
   notifications.Reset();
 
   // Commit.
@@ skipping 14 matching lines @@
   BrowserThread ui_thread(BrowserThread::UI, MessageLoop::current());
   SiteInstance* instance = SiteInstance::CreateSiteInstance(profile_.get());
 
   TestTabContents tab_contents(profile_.get(), instance);
   RenderViewHostManager manager(&tab_contents, &tab_contents);
 
   manager.Init(profile_.get(), instance, MSG_ROUTING_NONE);
 
   GURL url(chrome::kChromeUINewTabURL);
   NavigationEntry entry(NULL /* instance */, -1 /* page_id */, url,
-                        GURL() /* referrer */, string16() /* title */,
+                        GURL() /* referrer */,
+                        base::i18n::String16WithDirection() /* title */,
                         PageTransition::TYPED);
   RenderViewHost* host = manager.Navigate(entry);
 
   EXPECT_TRUE(host);
   EXPECT_TRUE(host == manager.current_host());
   EXPECT_FALSE(manager.pending_render_view_host());
 
   // It's important that the site instance get set on the Web UI page as soon
   // as the navigation starts, rather than lazily after it commits, so we don't
   // try to re-use the SiteInstance/process for non DOM-UI things that may
@@ skipping 17 matching lines @@
 TEST_F(RenderViewHostManagerTest, NonWebUIChromeURLs) {
   BrowserThread thread(BrowserThread::UI, &message_loop_);
   SiteInstance* instance = SiteInstance::CreateSiteInstance(profile_.get());
   TestTabContents tab_contents(profile_.get(), instance);
   RenderViewHostManager manager(&tab_contents, &tab_contents);
   manager.Init(profile_.get(), instance, MSG_ROUTING_NONE);
 
   // NTP is a Web UI page.
   GURL ntp_url(chrome::kChromeUINewTabURL);
   NavigationEntry ntp_entry(NULL /* instance */, -1 /* page_id */, ntp_url,
-                            GURL() /* referrer */, string16() /* title */,
+                            GURL() /* referrer */,
+                            base::i18n::String16WithDirection() /* title */,
                             PageTransition::TYPED);
 
   // about: URLs are not Web UI pages.
   GURL about_url(chrome::kAboutMemoryURL);
   // Rewrite so it looks like chrome://about/memory
   bool reverse_on_redirect = false;
   BrowserURLHandler::RewriteURLIfNecessary(
       &about_url, profile_.get(), &reverse_on_redirect);
   NavigationEntry about_entry(NULL /* instance */, -1 /* page_id */, about_url,
-                              GURL() /* referrer */, string16() /* title */,
+                              GURL() /* referrer */,
+                              base::i18n::String16WithDirection() /* title */,
                               PageTransition::TYPED);
 
   EXPECT_TRUE(ShouldSwapProcesses(&manager, &ntp_entry, &about_entry));
 }
 
 // Tests that we don't end up in an inconsistent state if a page does a back and
 // then reload. http://crbug.com/51680
 TEST_F(RenderViewHostManagerTest, PageDoesBackAndReload) {
   GURL url1("http://www.google.com/");
   GURL url2("http://www.evil-site.com/");
@@ skipping 28 matching lines @@
   // That should have cancelled the pending RVH, and the evil RVH should be the
   // current one.
   EXPECT_TRUE(contents()->render_manager()->pending_render_view_host() == NULL);
   EXPECT_EQ(evil_rvh, contents()->render_manager()->current_host());
 
   // Also we should not have a pending navigation entry.
   NavigationEntry* entry = contents()->controller().GetActiveEntry();
   ASSERT_TRUE(entry != NULL);
   EXPECT_EQ(url2, entry->url());
 }