Fixed 3 tests that failed in hebrew enabled vista...

chrome/browser/browser_uitest.cc

 // Copyright (c) 2006-2008 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 "app/l10n_util.h"
 #include "base/file_path.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/values.h"
@@ skipping 41 matching lines @@
 #endif
 
   std::wstring GetWindowTitle() {
     scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
     scoped_refptr<WindowProxy> window(browser->GetWindow());
 
     string16 title;
     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 {
  protected:
   VisibleBrowserTest() : UITest() {
     show_window_ = true;
   }
 };
 
 // Launch the app on a page with no title, check that the app title was set
 // correctly.
 TEST_F(BrowserTest, NoTitle) {
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("title1.html");
 
   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());
 }
 
 // Launch the app, navigate to a page with a title, check that the app title
 // was set correctly.
 TEST_F(BrowserTest, Title) {
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("title2.html");
 
   NavigateToURL(net::FilePathToFileURL(test_file));
   // The browser lazily updates the 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());
 }
 
 // Create 34 tabs and verify that a lot of processes have been created. The
 // exact number of processes depends on the amount of memory. Previously we
 // had a hard limit of 31 processes and this test is mainly directed at
 // verifying that we don't crash when we pass this limit.
 TEST_F(BrowserTest, ThirtyFourTabs) {
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("title2.html");
@@ skipping 189 matching lines @@
       break;
     }
   }
 
   if (i == 10)
     FAIL() << "failed to get error page title";
 }
 #endif
 
 }  // namespace