3 files changed, 34 insertions, 2 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 3dce551..859beaf 100755
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/automation/automation_provider.h"
 
+#include "app/l10n_util.h"
 #include "app/message_box_flags.h"
 #include "base/file_version_info.h"
 #include "base/message_loop.h"
@@ -956,6 +957,7 @@ void AutomationProvider::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(AutomationMsg_NormalBrowserWindowCount,
                         GetNormalBrowserWindowCount)
     IPC_MESSAGE_HANDLER(AutomationMsg_BrowserWindow, GetBrowserWindow)
+    IPC_MESSAGE_HANDLER(AutomationMsg_GetBrowserLocale, GetBrowserLocale)
     IPC_MESSAGE_HANDLER(AutomationMsg_LastActiveBrowserWindow,
                         GetLastActiveBrowserWindow)
     IPC_MESSAGE_HANDLER(AutomationMsg_ActiveWindow, GetActiveWindow)
@@ -1338,6 +1340,11 @@ void AutomationProvider::GetActiveTabIndex(int handle, int* active_tab_index) {
   }
 }
 
+void AutomationProvider::GetBrowserLocale(string16* locale) {
+  DCHECK(g_browser_process);
+  *locale = WideToUTF16(g_browser_process->GetApplicationLocale());
+}
+
 void AutomationProvider::GetBrowserWindowCount(int* window_count) {
   *window_count = static_cast<int>(BrowserList::size());
 }
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index 59935f5..389543a 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -16,6 +16,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/scoped_ptr.h"
 #include "chrome/browser/automation/automation_autocomplete_edit_tracker.h"
 #include "chrome/browser/automation/automation_browser_tracker.h"
 #include "chrome/browser/automation/automation_tab_tracker.h"
@@ -149,6 +150,7 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>,
                  int handle,
                  int* response_value);
   void GetBrowserWindowCount(int* window_count);
+  void GetBrowserLocale(string16* locale);
   void GetNormalBrowserWindowCount(int* window_count);
   void GetShowingAppModalDialog(bool* showing_dialog, int* dialog_button);
   void ClickAppModalDialogButton(int button, bool* success);
diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc
index adeea1f..e2533c7 100644
--- a/chrome/browser/browser_uitest.cc
+++ b/chrome/browser/browser_uitest.cc
@@ -59,6 +59,29 @@ class BrowserTest : public UITest {
     EXPECT_TRUE(window->GetWindowTitle(&title));
     return UTF16ToWide(title);
   }
+
+  // In RTL locales wrap the page title with RTL embedding characters so that it
+  // matches the value returned by GetWindowTitle().
+  std::wstring LocaleWindowCaptionFromPageTitle(
+      const std::wstring& expected_title) {
+    std::wstring page_title = WindowCaptionFromPageTitle(expected_title);
+#if defined(OS_WIN)
+    string16  browser_locale;
+
+    EXPECT_TRUE(automation()->GetBrowserLocale(&browser_locale));
+
+    const std::string& locale_utf8 = UTF16ToUTF8(browser_locale);
+    if (l10n_util::GetTextDirectionForLocale(locale_utf8.c_str()) ==
+        l10n_util::RIGHT_TO_LEFT) {
+      l10n_util::WrapStringWithLTRFormatting(&page_title);
+    }
+
+    return page_title;
+#else
+    // Do we need to use the above code on POSIX as well?
+    return page_title;
+#endif
+  }
 };
 
 class VisibleBrowserTest : public UITest {
@@ -77,7 +100,7 @@ TEST_F(BrowserTest, NoTitle) {
   NavigateToURL(net::FilePathToFileURL(test_file));
   // The browser lazily updates the title.
   PlatformThread::Sleep(sleep_timeout_ms());
-  EXPECT_EQ(WindowCaptionFromPageTitle(L"title1.html"), GetWindowTitle());
+  EXPECT_EQ(LocaleWindowCaptionFromPageTitle(L"title1.html"), GetWindowTitle());
   EXPECT_EQ(L"title1.html", GetActiveTabTitle());
 }
 
@@ -92,7 +115,7 @@ TEST_F(BrowserTest, Title) {
   PlatformThread::Sleep(sleep_timeout_ms());
 
   const std::wstring test_title(L"Title Of Awesomeness");
-  EXPECT_EQ(WindowCaptionFromPageTitle(test_title), GetWindowTitle());
+  EXPECT_EQ(LocaleWindowCaptionFromPageTitle(test_title), GetWindowTitle());
   EXPECT_EQ(test_title, GetActiveTabTitle());
 }