Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse…

base/i18n/icu_util.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 "base/i18n/icu_util.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 26 matching lines @@
 #elif ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_SHARED
 #define ICU_UTIL_DATA_SYMBOL "icudt" U_ICU_VERSION_SHORT "_dat"
 #if defined(OS_WIN)
 #define ICU_UTIL_DATA_SHARED_MODULE_NAME "icudt.dll"
 #endif
 #endif
 
 namespace base {
 namespace i18n {
 
+namespace {
+
+#ifndef NDEBUG

[sky, 2014/03/14 21:35:56]

#if !defined(NDEBUG)

[jam, 2014/03/14 22:35:40]

Done.

+// Assert that we are not called more than once.  Even though calling this
+// function isn't harmful (ICU can handle it), being called twice probably
+// indicates a programming error.
+bool g_called_once = false;

[sky, 2014/03/14 21:35:56]

I'm pretty sure these don't get g_ (just called_once).

[jam, 2014/03/14 22:35:40]

really? I see > 1K hits for " g_" in cs

+bool g_check_called_once = true;
+#endif
+}
+
 bool InitializeICU() {
 #ifndef NDEBUG
-  // Assert that we are not called more than once.  Even though calling this
-  // function isn't harmful (ICU can handle it), being called twice probably
-  // indicates a programming error.
-  static bool called_once = false;
-  DCHECK(!called_once);
-  called_once = true;
+  DCHECK(!g_check_called_once || !g_called_once);

[sky, 2014/03/14 21:35:56]

I'm not familiar with this code. Do you need to worry about multiple threads?

[jam, 2014/03/14 22:35:40]

not multiple threads, but multiple initializations on the same thread. in the
browser tests case, it gets initialized by base::TestSuite and also ContentMain.

+  g_called_once = true;
 #endif
 
 #if (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_SHARED)
   // We expect to find the ICU data module alongside the current module.
   FilePath data_path;
   PathService::Get(base::DIR_MODULE, &data_path);
   data_path = data_path.AppendASCII(ICU_UTIL_DATA_SHARED_MODULE_NAME);
 
   HMODULE module = LoadLibrary(data_path.value().c_str());
   if (!module) {
@@ skipping 52 matching lines @@
       DLOG(ERROR) << "Couldn't mmap " << data_path.AsUTF8Unsafe();
       return false;
     }
   }
   UErrorCode err = U_ZERO_ERROR;
   udata_setCommonData(const_cast<uint8*>(mapped_file.data()), &err);
   return err == U_ZERO_ERROR;
 #endif
 }
 
+void AllowMultipleInitializeCallsForTesting() {
+#ifndef NDEBUG

[sky, 2014/03/14 21:35:56]

#if !defined(NDEBUG)

[jam, 2014/03/14 22:35:40]

Done.

+  g_check_called_once = false;
+#endif
+}
+
 }  // namespace i18n
 }  // namespace base