Revert my recent changes regarding title directionality.

content/browser/tab_contents/navigation_entry.h

 // 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.
 
 #ifndef CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_
 #define CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
-#include "base/i18n/rtl.h"
 #include "chrome/common/security_style.h"
 #include "content/common/page_transition_types.h"
 #include "content/common/page_type.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class SiteInstance;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ skipping 153 matching lines @@
     // Copy and assignment is explicitly allowed for this class.
   };
 
   // ---------------------------------------------------------------------------
 
   NavigationEntry();
   NavigationEntry(SiteInstance* instance,
                   int page_id,
                   const GURL& url,
                   const GURL& referrer,
-                  const base::i18n::String16WithDirection& title,
+                  const string16& title,
                   PageTransition::Type transition_type);
   ~NavigationEntry();
 
   // Page-related stuff --------------------------------------------------------
 
   // A unique ID is preserved across commits and redirects, which means that
   // sometimes a NavigationEntry's unique ID needs to be set (e.g. when
   // creating a committed entry to correspond to a to-be-deleted pending entry,
   // the pending entry's ID must be copied).
   void set_unique_id(int unique_id) {
@@ skipping 22 matching lines @@
   }
   PageType page_type() const {
     return page_type_;
   }
 
   // The actual URL of the page. For some about pages, this may be a scary
   // data: URL or something like that. Use virtual_url() below for showing to
   // the user.
   void set_url(const GURL& url) {
     url_ = url;
-    cached_display_title_ = base::i18n::String16WithDirection();
+    cached_display_title_.clear();
   }
   const GURL& url() const {
     return url_;
   }
 
   // The referring URL. Can be empty.
   void set_referrer(const GURL& referrer) {
     referrer_ = referrer;
   }
   const GURL& referrer() const {
     return referrer_;
   }
 
   // The virtual URL, when nonempty, will override the actual URL of the page
   // when we display it to the user. This allows us to have nice and friendly
   // URLs that the user sees for things like about: URLs, but actually feed
   // the renderer a data URL that results in the content loading.
   //
   // virtual_url() will return the URL to display to the user in all cases, so
   // if there is no overridden display URL, it will return the actual one.
   void set_virtual_url(const GURL& url) {
     virtual_url_ = (url == url_) ? GURL() : url;
-    cached_display_title_ = base::i18n::String16WithDirection();
+    cached_display_title_.clear();
   }
   bool has_virtual_url() const {
     return !virtual_url_.is_empty();
   }
   const GURL& virtual_url() const {
     return virtual_url_.is_empty() ? url_ : virtual_url_;
   }
 
   bool update_virtual_url_with_url() const {
     return update_virtual_url_with_url_;
   }
   void set_update_virtual_url_with_url(bool update) {
     update_virtual_url_with_url_ = update;
   }
 
   // The title as set by the page. This will be empty if there is no title set.
   // The caller is responsible for detecting when there is no title and
   // displaying the appropriate "Untitled" label if this is being displayed to
   // the user.
-  void set_title(const base::i18n::String16WithDirection& title) {
+  void set_title(const string16& title) {
     title_ = title;
-    cached_display_title_ = base::i18n::String16WithDirection();
+    cached_display_title_.clear();
   }
-  const base::i18n::String16WithDirection& title() const {
+  const string16& title() const {
     return title_;
   }
 
   // The favicon data and tracking information. See FaviconStatus above.
   const FaviconStatus& favicon() const {
     return favicon_;
   }
   FaviconStatus& favicon() {
     return favicon_;
   }
@@ skipping 30 matching lines @@
   SSLStatus& ssl() {
     return ssl_;
   }
 
   // Page-related helpers ------------------------------------------------------
 
   // Returns the title to be displayed on the tab. This could be the title of
   // the page if it is available or the URL. |languages| is the list of
   // accpeted languages (e.g., prefs::kAcceptLanguages) or empty if proper
   // URL formatting isn't needed (e.g., unit tests).
-  const base::i18n::String16WithDirection& GetTitleForDisplay(
-      const std::string& languages);
+  const string16& GetTitleForDisplay(const std::string& languages);
 
   // Returns true if the current tab is in view source mode. This will be false
   // if there is no navigation.
   bool IsViewSourceMode() const;
 
   // Tracking stuff ------------------------------------------------------------
 
   // The transition type indicates what the user did to move to this page from
   // the previous page.
   void set_transition_type(PageTransition::Type transition_type) {
@@ skipping 62 matching lines @@
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 
   // See the accessors above for descriptions.
   int unique_id_;
   scoped_refptr<SiteInstance> site_instance_;
   PageType page_type_;
   GURL url_;
   GURL referrer_;
   GURL virtual_url_;
   bool update_virtual_url_with_url_;
-  base::i18n::String16WithDirection title_;
+  string16 title_;
   FaviconStatus favicon_;
   std::string content_state_;
   int32 page_id_;
   SSLStatus ssl_;
   PageTransition::Type transition_type_;
   GURL user_typed_url_;
   bool has_post_data_;
   RestoreType restore_type_;
 
   // This is a cached version of the result of GetTitleForDisplay. It prevents
   // us from having to do URL formatting on the URL evey time the title is
   // displayed. When the URL, virtual URL, or title is set, this should be
   // cleared to force a refresh.
-  base::i18n::String16WithDirection cached_display_title_;
+  string16 cached_display_title_;
 
   // Copy and assignment is explicitly allowed for this class.
 };
 
 #endif  // CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_ENTRY_H_