diff options
author | scr@chromium.org <scr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 20:56:36 +0000 |
---|---|---|
committer | scr@chromium.org <scr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-13 20:56:36 +0000 |
commit | b56717517cf3296c05350bbfdcfc67077abc4484 (patch) | |
tree | 18907190b7581e58669db2b4629ebfd3f49d9c5f /chrome/browser/ui/webui/bidi_checker_web_ui_test.h | |
parent | 7ded9f106803da50fe3755a65865fa2b700d1633 (diff) | |
download | chromium_src-b56717517cf3296c05350bbfdcfc67077abc4484.zip chromium_src-b56717517cf3296c05350bbfdcfc67077abc4484.tar.gz chromium_src-b56717517cf3296c05350bbfdcfc67077abc4484.tar.bz2 |
Do the ReloadLocaleResources() call on the IO thread to avoid synchronization issues.
Followup to https://chromiumcodereview.appspot.com/10543015/
Forced the Reload on the same thread (IO) that was racing with the call. Since Tony doesn't want us to add synchronization to ResourceBundle from a case that's only exercised in test, we'll go this route to stop the race.
R=tony@chromium.org, estade@chromium.org
BUG=95425
TEST=browser_tests --gtest_filter=WebUIBidiCheckerBrowserTestRTL.*TestSettingsFrameStartup --gtest_also_run_disabled_tests
Review URL: https://chromiumcodereview.appspot.com/10546139
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141964 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/bidi_checker_web_ui_test.h')
-rw-r--r-- | chrome/browser/ui/webui/bidi_checker_web_ui_test.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.h b/chrome/browser/ui/webui/bidi_checker_web_ui_test.h index b4a107f..417e080 100644 --- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.h +++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.h @@ -11,6 +11,10 @@ #include "chrome/browser/ui/webui/web_ui_browsertest.h" #include "chrome/test/base/in_process_browser_test.h" +namespace base { +class WaitableEvent; +} + // Base class for BidiChecker-based tests. Preloads the BidiChecker JS library // for each test. class WebUIBidiCheckerBrowserTest : public WebUIBrowserTest { @@ -43,6 +47,8 @@ class WebUIBidiCheckerBrowserTestRTL : public WebUIBidiCheckerBrowserTest { virtual void SetUpOnMainThread() OVERRIDE; virtual void CleanUpOnMainThread() OVERRIDE; + static void SetUpOnIOThread(base::WaitableEvent* event); + // The app locale before we change it std::string app_locale_; }; |