Do the ReloadLocaleResources() call on the IO thread to avoid synchronization issues.

chrome/browser/ui/webui/bidi_checker_web_ui_test.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/webui/bidi_checker_web_ui_test.h"
 
 #include "base/base_paths.h"
 #include "base/i18n/rtl.h"
 #include "base/path_service.h"
+#include "base/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/browser_thread.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
 static const FilePath::CharType* kWebUIBidiCheckerLibraryJS =
     FILE_PATH_LITERAL("third_party/bidichecker/bidichecker_packaged.js");
 
 namespace {
@@ skipping 29 matching lines @@
 void WebUIBidiCheckerBrowserTestLTR::RunBidiCheckerOnPage(
     const std::string& page_url) {
   WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(page_url, false);
 }
 
 void WebUIBidiCheckerBrowserTestRTL::RunBidiCheckerOnPage(
     const std::string& page_url) {
   WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(page_url, true);
 }
 
+// static
+void WebUIBidiCheckerBrowserTestRTL::SetUpOnIOThread(
+    base::WaitableEvent* event) {
+  std::string locale;
+  {
+    base::ThreadRestrictions::ScopedAllowIO allow_io_scope;
+    locale.assign(
+        ResourceBundle::GetSharedInstance().ReloadLocaleResources("he"));
+  }
+  event->Signal();
+  ASSERT_FALSE(locale.empty());
+}
+
 void WebUIBidiCheckerBrowserTestRTL::SetUpOnMainThread() {
   WebUIBidiCheckerBrowserTest::SetUpOnMainThread();
   FilePath pak_path;
   app_locale_ = base::i18n::GetConfiguredLocale();
   ASSERT_TRUE(PathService::Get(base::FILE_MODULE, &pak_path));
   pak_path = pak_path.DirName();
   pak_path = pak_path.AppendASCII("pseudo_locales");
   pak_path = pak_path.AppendASCII("fake-bidi");
   pak_path = pak_path.ReplaceExtension(FILE_PATH_LITERAL("pak"));
   ResourceBundle::GetSharedInstance().OverrideLocalePakForTest(pak_path);
-  ASSERT_FALSE(
-      ResourceBundle::GetSharedInstance().ReloadLocaleResources("he").empty());
+
+  // Since synchronization isn't complete for the ResourceBundle class, reload
+  // locale resources on the IO thread.
+  base::WaitableEvent event(true, false);
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO, FROM_HERE,
+      base::Bind(&WebUIBidiCheckerBrowserTestRTL::SetUpOnIOThread,
+                 base::Unretained(&event)));
+  ui_test_utils::WaitEventSignaled(&event);

[Joao da Silva, 2012/06/13 22:09:16]

Why not PostTaskAndReply to IO? The posted task does the SetUpOnIOThread, and
the reply is MessageLoop::QuitClosure. Then call Run() on the current loop (or
maybe ui_test_utils::RunMessageLoop()). The reply task will make that return.

[Sheridan Rawlins, 2012/06/15 00:36:23]

This was already committed, but I'll try this on a followup.

On 2012/06/13 22:09:16, Joao da Silva wrote:

+
   base::i18n::SetICUDefaultLocale("he");
 #if defined(OS_POSIX) && defined(TOOLKIT_GTK)
   gtk_widget_set_default_direction(GTK_TEXT_DIR_RTL);
 #endif
 }
 
 void WebUIBidiCheckerBrowserTestRTL::CleanUpOnMainThread() {
   WebUIBidiCheckerBrowserTest::CleanUpOnMainThread();
 #if defined(OS_POSIX) && defined(TOOLKIT_GTK)
   gtk_widget_set_default_direction(GTK_TEXT_DIR_LTR);
@@ skipping 742 matching lines @@
 // chrome://history-frame
 //==============================
 
 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestLTR, TestHistoryFrame) {
   RunBidiCheckerOnPage(chrome::kChromeUIHistoryFrameURL);
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIBidiCheckerBrowserTestRTL, TestHistoryFrame) {
   RunBidiCheckerOnPage(chrome::kChromeUIHistoryFrameURL);
 }