Revert my recent changes regarding title directionality.

content/browser/tab_contents/interstitial_page.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_INTERSTITIAL_PAGE_H_
 #define CONTENT_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_
 #pragma once
 
 #include <map>
 #include <string>
 
-#include "base/i18n/rtl.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process_util.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/renderer_preferences.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/size.h"
 
 class NavigationEntry;
@@ skipping 99 matching lines @@
                        const NotificationDetails& details);
 
   // RenderViewHostDelegate implementation:
   virtual View* GetViewDelegate();
   virtual const GURL& GetURL() const;
   virtual void RenderViewGone(RenderViewHost* render_view_host,
                               base::TerminationStatus status,
                               int error_code);
   virtual void DidNavigate(RenderViewHost* render_view_host,
                            const ViewHostMsg_FrameNavigate_Params& params);
-  virtual void UpdateTitle(
-      RenderViewHost* render_view_host,
-      int32 page_id,
-      const base::i18n::String16WithDirection& title) OVERRIDE;
+  virtual void UpdateTitle(RenderViewHost* render_view_host,
+                           int32 page_id,
+                           const std::wstring& title);
   virtual void DomOperationResponse(const std::string& json_string,
                                     int automation_id);
   virtual RendererPreferences GetRendererPrefs(Profile* profile) const;
 
   // Invoked when the page sent a command through DOMAutomation.
   virtual void CommandReceived(const std::string& command) {}
 
   // Invoked with the NavigationEntry that is going to be added to the
   // navigation controller.
   // Gives an opportunity to sub-classes to set states on the |entry|.
@@ skipping 75 matching lines @@
   // Whether or not we should change the title of the tab when hidden (to revert
   // it to its original value).
   bool should_revert_tab_title_;
 
   // Whether the ResourceDispatcherHost has been notified to cancel/resume the
   // resource requests blocked for the RenderViewHost.
   bool resource_dispatcher_host_notified_;
 
   // The original title of the tab that should be reverted to when the
   // interstitial is hidden.
-  base::i18n::String16WithDirection original_tab_title_;
+  std::wstring original_tab_title_;
 
   // Our RenderViewHostViewDelegate, necessary for accelerators to work.
   scoped_ptr<InterstitialPageRVHViewDelegate> rvh_view_delegate_;
 
   // We keep a map of the various blocking pages shown as the UI tests need to
   // be able to retrieve them.
   typedef std::map<TabContents*, InterstitialPage*> InterstitialPageMap;
   static InterstitialPageMap* tab_to_interstitial_page_;
 
   // Settings passed to the renderer.
   RendererPreferences renderer_preferences_;
 
   DISALLOW_COPY_AND_ASSIGN(InterstitialPage);
 };
 
 #endif  // CONTENT_BROWSER_TAB_CONTENTS_INTERSTITIAL_PAGE_H_