Add synchronization around access when using ReloadLocaleResources

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/utf_string_conversions.h"
@@ skipping 52 matching lines @@
     const std::string& page_url) {
   WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(page_url, false);
 }
 
 void WebUIBidiCheckerBrowserTestRTL::RunBidiCheckerOnPage(
     const std::string& page_url) {
   WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(page_url, true);
 }
 
 void WebUIBidiCheckerBrowserTestRTL::SetUpOnMainThread() {
+  // Ensure that no other page (NTP4, home page, e.g.) is loading when we reload
+  // the locale resources.
+  ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
+
   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);
-  ResourceBundle::GetSharedInstance().ReloadLocaleResources("he");
+  ASSERT_FALSE(
+      ResourceBundle::GetSharedInstance().ReloadLocaleResources("he").empty());
   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);
 #endif
   base::i18n::SetICUDefaultLocale(app_locale_);
   ResourceBundle::GetSharedInstance().OverrideLocalePakForTest(FilePath());
-  ResourceBundle::GetSharedInstance().ReloadLocaleResources(app_locale_);
+  ASSERT_EQ(
+      app_locale_,
+      ResourceBundle::GetSharedInstance().ReloadLocaleResources(app_locale_));
 }
 
 // Tests
 
 //==============================
 // chrome://settings/history
 //==============================
 
 static void SetupHistoryPageTest(Browser* browser,
                                  const std::string page_url,
@@ skipping 726 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);
 }