Initialize ICU early in npchrome_frame.dll's lifetime.

chrome_frame/chrome_tab.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.
 
 // chrome_tab.cc : Implementation of DLL Exports.
 
 // Need to include this before the ATL headers below.
 #include "chrome_frame/chrome_tab.h"
 
 #include <atlsecurity.h>
 #include <objbase.h>
 
 #include "base/at_exit.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
+#include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "base/logging_win.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 72 matching lines @@
   static const char kDummyUrl[] = "http://www.google.com";
 
   url_util::IsStandard(kDummyUrl,
                        url_parse::MakeRange(0, arraysize(kDummyUrl)));
 }
 
 class ChromeTabModule : public CAtlDllModuleT<ChromeTabModule> {
  public:
   typedef CAtlDllModuleT<ChromeTabModule> ParentClass;
 
-  ChromeTabModule() : do_system_registration_(true), crash_reporting_(NULL) {}
+  ChromeTabModule() : do_system_registration_(true),
+                      crash_reporting_(NULL),
+                      icu_initialized_(false) {}
 
   DECLARE_LIBID(LIBID_ChromeTabLib)
   DECLARE_REGISTRY_APPID_RESOURCEID(IDR_CHROMETAB,
                                     "{FD9B1B31-F4D8-436A-8F4F-D3C2E36733D3}")
 
   // Override to add our SYSTIME binary value to registry scripts.
   // See chrome_frame_activex.rgs for usage.
   virtual HRESULT AddCommonRGSReplacements(IRegistrarBase* registrar) throw() {
     HRESULT hr = ParentClass::AddCommonRGSReplacements(registrar);
 
@@ skipping 71 matching lines @@
       wchar_t cf_clsid[64];
       StringFromGUID2(CLSID_ChromeFrame, &cf_clsid[0], arraysize(cf_clsid));
       hr = registrar->AddReplacement(L"CHROME_FRAME_CLSID", &cf_clsid[0]);
     }
 
     return hr;
   }
 
   // The module is "locked" when an object takes a reference on it. The first
   // time it is locked, take a reference on crash reporting to bind its lifetime
-  // to the module.
+  // to the module and initialize ICU.
   virtual LONG Lock() throw() {
     LONG result = ParentClass::Lock();
     if (result == 1) {
       DCHECK_EQ(crash_reporting_,
                 static_cast<chrome_frame::ScopedCrashReporting*>(NULL));
       crash_reporting_ = new chrome_frame::ScopedCrashReporting();
+
+      // Initialize ICU if this is the first time the module has been locked.
+      if (!icu_initialized_) {
+        icu_initialized_ = true;
+        // Best-effort since something is better than nothing here.
+        ignore_result(base::i18n::InitializeICU());
+      }
     }
     return result;
   }
 
   // The module is "unlocked" when an object that had a reference on it is
   // destroyed. The last time it is unlocked, release the reference on crash
   // reporting.
   virtual LONG Unlock() throw() {
     LONG result = ParentClass::Unlock();
     if (!result) {
       DCHECK_NE(crash_reporting_,
                 static_cast<chrome_frame::ScopedCrashReporting*>(NULL));
       delete crash_reporting_;
       crash_reporting_ = NULL;
     }
     return result;
   }
 
   // See comments in AddCommonRGSReplacements
   bool do_system_registration_;
 
  private:
   // A scoper created when the module is initially locked and destroyed when it
   // is finally unlocked. This is not a scoped_ptr since that could cause
   // reporting to shut down at exit, which would lead to problems with the
   // loader lock.
   chrome_frame::ScopedCrashReporting* crash_reporting_;
+
+  // Initially false, this is flipped to true to indicate that ICU has been
+  // initialized for the module.
+  bool icu_initialized_;
 };
 
 ChromeTabModule _AtlModule;
 
 base::AtExitManager* g_exit_manager = NULL;
 
 HRESULT RefreshElevationPolicy() {
   const wchar_t kIEFrameDll[] = L"ieframe.dll";
   const char kIERefreshPolicy[] = "IERefreshElevationPolicy";
   HRESULT hr = E_NOTIMPL;
@@ skipping 767 matching lines @@
   HRESULT hr = CustomRegistration(ALL, FALSE, false);
   return hr;
 }
 
 // Object entries go here instead of with each object, so that we can move
 // the objects to a lib. Also reduces magic.
 OBJECT_ENTRY_AUTO(CLSID_ChromeFrameBHO, Bho)
 OBJECT_ENTRY_AUTO(__uuidof(ChromeActiveDocument), ChromeActiveDocument)
 OBJECT_ENTRY_AUTO(__uuidof(ChromeFrame), ChromeFrameActivex)
 OBJECT_ENTRY_AUTO(__uuidof(ChromeProtocol), ChromeProtocol)