reland of http://crrev.com/212230 Create top-level separate targets for...

chrome/app/client_util.cc

Index: chrome/app/client_util.cc
diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc
index 0352e243d8224c043e952221c2ea7fcf9dad0c33..70252ea8dae9a2bd7dee070f50423e2d86aa2743 100644
--- a/chrome/app/client_util.cc
+++ b/chrome/app/client_util.cc
@@ -74,18 +74,6 @@ void ClearDidRun(const string16& dll_path) {
   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() {
@@ -166,14 +154,6 @@ HMODULE MainDllLoader::Load(string16* out_version, string16* out_file) {
 
   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;
 }