Revert 212230 "Create top-level separate targets for browser and..."

trunk/src/chrome/app/client_util.cc

Index: trunk/src/chrome/app/client_util.cc
===================================================================
--- trunk/src/chrome/app/client_util.cc	(revision 212238)
+++ trunk/src/chrome/app/client_util.cc	(working copy)
@@ -74,6 +74,18 @@
   GoogleUpdateSettings::UpdateDidRunState(false, system_level);
 }
 
+#if defined(CHROME_SPLIT_DLL)
+// Deferred initialization entry point for chrome1.dll.
+typedef BOOL (__stdcall *DoDeferredCrtInitFunc)(HINSTANCE hinstance);
+
+bool InitSplitChromeDll(HMODULE mod) {
+  if (!mod)
+    return false;
+  DoDeferredCrtInitFunc init = reinterpret_cast<DoDeferredCrtInitFunc>(
+      ::GetProcAddress(mod, "_DoDeferredCrtInit@4"));
+  return (init(mod) == TRUE);
+}
+#endif
 }  // namespace
 
 string16 GetExecutablePath() {
@@ -154,6 +166,14 @@
 
   DCHECK(dll);
 
+#if defined(CHROME_SPLIT_DLL)
+  // In split dlls mode, we need to manually initialize both DLLs because
+  // the circular dependencies between them make the loader not call the
+  // Dllmain for DLL_PROCESS_ATTACH.
+  InitSplitChromeDll(dll);
+  InitSplitChromeDll(::GetModuleHandleA("chrome1.dll"));
+#endif
+
   return dll;
 }