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

content/browser/tab_contents/interstitial_page.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 "content/browser/tab_contents/interstitial_page.h"
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
@@ skipping 365 matching lines @@
   }
 
   // Notify the tab we are not loading so the throbber is stopped. It also
   // causes a NOTIFY_LOAD_STOP notification, that the AutomationProvider (used
   // by the UI tests) expects to consider a navigation as complete. Without
   // this, navigating in a UI test to a URL that triggers an interstitial would
   // hang.
   tab_->SetIsLoading(false, NULL);
 }
 
-void InterstitialPage::UpdateTitle(RenderViewHost* render_view_host,
-                                   int32 page_id,
-                                   const string16& title,
-                                   WebKit::WebTextDirection title_direction) {
+void InterstitialPage::UpdateTitle(
+    RenderViewHost* render_view_host,
+    int32 page_id,
+    const base::i18n::String16WithDirection& title) {
   DCHECK(render_view_host == render_view_host_);
   NavigationEntry* entry = tab_->controller().GetActiveEntry();
   if (!entry) {
     // Crash reports from the field indicate this can be NULL.
     // This is unexpected as InterstitialPages constructed with the
     // new_navigation flag set to true create a transient navigation entry
     // (that is returned as the active entry). And the only case so far of
     // interstitial created with that flag set to false is with the
     // SafeBrowsingBlockingPage, when the resource triggering the interstitial
     // is a sub-resource, meaning the main page has already been loaded and a
     // navigation entry should have been created.
     NOTREACHED();
     return;
   }
 
   // If this interstitial is shown on an existing navigation entry, we'll need
   // to remember its title so we can revert to it when hidden.
   if (!new_navigation_ && !should_revert_tab_title_) {
     original_tab_title_ = UTF16ToWideHack(entry->title());
     should_revert_tab_title_ = true;
   }
-  // TODO(evan): use directionality of title.
-  // http://code.google.com/p/chromium/issues/detail?id=27094
   entry->set_title(title);
   tab_->NotifyNavigationStateChanged(TabContents::INVALIDATE_TITLE);
 }
 
 void InterstitialPage::DomOperationResponse(const std::string& json_string,
                                             int automation_id) {
   if (enabled_)
     CommandReceived(json_string);
 }
 
@@ skipping 311 matching lines @@
 
 void InterstitialPage::UpdateInspectorSetting(const std::string& key,
                                               const std::string& value) {
   RenderViewHostDelegateHelper::UpdateInspectorSetting(
       tab_->profile(), key, value);
 }
 
 void InterstitialPage::ClearInspectorSettings() {
   RenderViewHostDelegateHelper::ClearInspectorSettings(tab_->profile());
 }