Add and use a base::i18n::StringWithDirection for carrying titles.

This is a refactoring of r82400.  We're going to need the title
direction in a bunch of different places; it's better to package
it up as one object.

BUG=27094

Review URL: http://codereview.chromium.org/6878089

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82582 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 24 insertions, 20 deletions

diff --git a/chrome/browser/notifications/balloon_host.h b/chrome/browser/notifications/balloon_host.h
index aba22e06..0d483fa 100644
--- a/chrome/browser/notifications/balloon_host.h
+++ b/chrome/browser/notifications/balloon_host.h
@@ -56,10 +56,10 @@ class BalloonHost : public RenderViewHostDelegate,
   virtual void RenderViewGone(RenderViewHost* render_view_host,
                               base::TerminationStatus status,
                               int error_code);
-  virtual void UpdateTitle(RenderViewHost* render_view_host,
-                           int32 page_id,
-                           const string16& title,
-                           WebKit::WebTextDirection title_direction) OVERRIDE {}
+  virtual void UpdateTitle(
+      RenderViewHost* render_view_host,
+      int32 page_id,
+      const base::i18n::String16WithDirection& title) OVERRIDE {}
   virtual int GetBrowserWindowID() const;
   virtual ViewType::Type GetRenderViewType() const;
   virtual RenderViewHostDelegate::View* GetViewDelegate();
diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
index 2d325955..f4fa033 100644
--- a/chrome/browser/prerender/prerender_contents.cc
+++ b/chrome/browser/prerender/prerender_contents.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/prerender/prerender_contents.h"
 
+#include "base/i18n/rtl.h"
 #include "base/process_util.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
@@ -266,16 +267,16 @@ void PrerenderContents::DidNavigate(
   url_ = params.url;
 }
 
-void PrerenderContents::UpdateTitle(RenderViewHost* render_view_host,
-                                    int32 page_id,
-                                    const string16& title,
-                                    WebKit::WebTextDirection title_direction) {
-  if (title.empty())
+void PrerenderContents::UpdateTitle(
+    RenderViewHost* render_view_host,
+    int32 page_id,
+    const base::i18n::String16WithDirection& title) {
+  if (title.string().empty())
     return;
 
   // TODO(evan): use directionality of title.
   // http://code.google.com/p/chromium/issues/detail?id=27094
-  title_ = title;
+  title_ = title.string();
   page_id_ = page_id;
 }
 
diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h
index 56ed08e..0b2476a 100644
--- a/chrome/browser/prerender/prerender_contents.h
+++ b/chrome/browser/prerender/prerender_contents.h
@@ -117,10 +117,10 @@ class PrerenderContents : public RenderViewHostDelegate,
   virtual int GetBrowserWindowID() const;
   virtual void DidNavigate(RenderViewHost* render_view_host,
                            const ViewHostMsg_FrameNavigate_Params& params);
-  virtual void UpdateTitle(RenderViewHost* render_view_host,
-                           int32 page_id,
-                           const string16& title,
-                           WebKit::WebTextDirection title_direction) OVERRIDE;
+  virtual void UpdateTitle(
+      RenderViewHost* render_view_host,
+      int32 page_id,
+      const base::i18n::String16WithDirection& title) OVERRIDE;
   virtual WebPreferences GetWebkitPrefs();
   virtual void RunJavaScriptMessage(const std::wstring& message,
                                     const std::wstring& default_prompt,
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index 06507e0..372c4d3 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -350,10 +350,11 @@ bool PrerenderManager::MaybeUsePreloadedPage(TabContents* tc, const GURL& url) {
 
   // TODO(evan): use directionality of title.
   // http://code.google.com/p/chromium/issues/detail?id=27094
-  string16 title = pc->title();
-  if (!title.empty()) {
-    tc->UpdateTitle(rvh, pc->page_id(), title,
-                    WebKit::WebTextDirectionLeftToRight);
+  string16 title_str = pc->title();
+  if (!title_str.empty()) {
+    base::i18n::String16WithDirection title(title_str,
+                                            base::i18n::LEFT_TO_RIGHT);
+    tc->UpdateTitle(rvh, pc->page_id(), title);
   }
 
   GURL icon_url = pc->icon_url();
diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc
index f026b0c..7b21143 100644
--- a/chrome/browser/tab_contents/web_contents_unittest.cc
+++ b/chrome/browser/tab_contents/web_contents_unittest.cc
@@ -237,8 +237,10 @@ TEST_F(TabContentsTest, UpdateTitle) {
   NavigationController::LoadCommittedDetails details;
   controller().RendererDidNavigate(params, 0, &details);
 
-  contents()->UpdateTitle(rvh(), 0, ASCIIToUTF16("    Lots O' Whitespace\n"),
-                          WebKit::WebTextDirectionLeftToRight);
+  base::i18n::String16WithDirection new_title(
+      ASCIIToUTF16("    Lots O' Whitespace\n"),
+      base::i18n::LEFT_TO_RIGHT);
+  contents()->UpdateTitle(rvh(), 0, new_title);
   EXPECT_EQ(ASCIIToUTF16("Lots O' Whitespace"), contents()->GetTitle());
 }