After verifying the startup win though more testing, removing the guards arou...

chrome/app/client_util.cc

 // Copyright (c) 2006-2008 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 <windows.h>
 #include <shlwapi.h>
 
 #include "base/file_util.h"
 #include "chrome/app/breakpad_win.h"
 #include "chrome/app/client_util.h"
@@ skipping 64 matching lines @@
 bool EnvQueryStr(const wchar_t* key_name, std::wstring* value) {
   wchar_t out[128];
   DWORD count = sizeof(out)/sizeof(out[0]);
   DWORD rv = ::GetEnvironmentVariableW(key_name, out, count);
   if ((rv == 0) || (rv >= count))
     return false;
   *value = out;
   return true;
 }
 
-bool IsRunningHeadless() {
-  return (0 != ::GetEnvironmentVariableW(L"CHROME_HEADLESS", NULL, 0));
-}
-
 // Expects that |dir| has a trailing backslash. |dir| is modified so it
 // contains the full path that was tried. Caller must check for the return
 // value not being null to dermine if this path contains a valid dll.
 HMODULE LoadChromeWithDirectory(std::wstring* dir) {
   ::SetCurrentDirectoryW(dir->c_str());
   const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
 #ifdef _WIN64
   if ((cmd_line.GetSwitchValueASCII(switches::kProcessType) ==
       switches::kNaClBrokerProcess) ||
       (cmd_line.GetSwitchValueASCII(switches::kProcessType) ==
       switches::kNaClLoaderProcess)) {
     // Load the 64-bit DLL when running in a 64-bit process.
     dir->append(installer_util::kChromeNaCl64Dll);
   } else {
     // Only NaCl broker and loader can be launched as Win64 processes.
     NOTREACHED();
     return NULL;
   }
 #else
   dir->append(installer_util::kChromeDll);
 #endif
 
 #ifdef NDEBUG
   // Experimental pre-reading optimization
   // The idea is to pre read significant portion of chrome.dll in advance
   // so that subsequent hard page faults are avoided.
-  if (!cmd_line.HasSwitch(switches::kProcessType) &&
-      (IsRunningHeadless() || InstallUtil::IsChromeFrameProcess())) {
+  if (!cmd_line.HasSwitch(switches::kProcessType)) {
     // The kernel brings in 8 pages for the code section at a time and 4 pages
     // for other sections. We can skip over these pages to avoid a soft page
     // fault which may not occur during code execution. However skipping 4K at
     // a time still has better performance over 32K and 16K according to data.
     // TODO(ananta)
     // Investigate this and tune.
     const size_t kStepSize = 4 * 1024;
 
     DWORD pre_read_size = 0;
     DWORD pre_read_step_size = kStepSize;
@@ skipping 168 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }