Revert my recent changes regarding title directionality.

content/renderer/render_view.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/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 1083 matching lines @@
 
   // Check if the navigation was within the same page, in which case we don't
   // want to clear the accessibility cache.
   if (accessibility_.get() && !navigation_state->was_within_same_page()) {
     accessibility_.reset();
     pending_accessibility_notifications_.clear();
   }
 }
 
 // Tell the embedding application that the title of the active page has changed
-void RenderView::UpdateTitle(WebFrame* frame, const string16& title,
-                             WebTextDirection title_direction) {
+void RenderView::UpdateTitle(WebFrame* frame, const string16& title) {
   // Ignore all but top level navigations...
   if (!frame->parent()) {
     Send(new ViewHostMsg_UpdateTitle(
         routing_id_,
         page_id_,
-        title.length() > content::kMaxTitleChars ?
-            title.substr(0, content::kMaxTitleChars) : title,
-        title_direction));
+        UTF16ToWideHack(title.length() > content::kMaxTitleChars ?
+            title.substr(0, content::kMaxTitleChars) : title)));
   }
 }
 
 void RenderView::UpdateEncoding(WebFrame* frame,
                                 const std::string& encoding_name) {
   // Only update main frame's encoding_name.
   if (webview()->mainFrame() == frame &&
       last_encoding_name_ != encoding_name) {
     // Save the encoding name for later comparing.
     last_encoding_name_ = encoding_name;
@@ skipping 1323 matching lines @@
     if (frame == webview()->mainFrame())
       Send(new ViewHostMsg_DocumentAvailableInMainFrame(routing_id_));
   }
 
   FOR_EACH_OBSERVER(RenderViewObserver, observers_,
                     DidCreateDocumentElement(frame));
 }
 
 void RenderView::didReceiveTitle(WebFrame* frame, const WebString& title,
                                  WebTextDirection direction) {
-  UpdateTitle(frame, title, direction);
+  // TODO: pass direction through various APIs.
+  // http://code.google.com/p/chromium/issues/detail?id=79903
+  UpdateTitle(frame, title);
 
   // Also check whether we have new encoding name.
   UpdateEncoding(frame, frame->view()->pageEncoding().utf8());
 }
 
 void RenderView::didChangeIcons(WebFrame* frame) {
   FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidChangeIcons(frame));
 }
 
 void RenderView::didFinishDocumentLoad(WebFrame* frame) {
@@ skipping 43 matching lines @@
   // existing navigation state to a content-initiated navigation state.
   // DidCreateDataSource conveniently takes care of this for us.
   didCreateDataSource(frame, frame->dataSource());
 
   NavigationState* new_state =
       NavigationState::FromDataSource(frame->dataSource());
   new_state->set_was_within_same_page(true);
 
   didCommitProvisionalLoad(frame, is_new_navigation);
 
-  // TODO(evan): update this to use ->pageTitleDirection() once we pull in new
-  // WebKit.
-  UpdateTitle(frame, frame->view()->mainFrame()->dataSource()->pageTitle(),
-              WebKit::WebTextDirectionLeftToRight);
+  UpdateTitle(frame, frame->view()->mainFrame()->dataSource()->pageTitle());
 }
 
 void RenderView::didUpdateCurrentHistoryItem(WebFrame* frame) {
   StartNavStateSyncTimerIfNecessary();
 }
 
 void RenderView::assignIdentifierToRequest(
     WebFrame* frame, unsigned identifier, const WebURLRequest& request) {
   // Ignore
 }
@@ skipping 1690 matching lines @@
     const webkit_glue::CustomContextMenuContext& custom_context) {
   if (custom_context.is_pepper_menu)
     pepper_delegate_.OnContextMenuClosed(custom_context);
   else
     context_menu_node_.reset();
 }
 
 void RenderView::OnNetworkStateChanged(bool online) {
   WebNetworkStateNotifier::setOnLine(online);
 }