Make the NaCl windows 64 bit binaries not depend on chrome targets.

chrome/app/client_util.cc

 // Copyright (c) 2011 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/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/environment.h"
@@ skipping 150 matching lines @@
 }
 #endif  // if defined(GOOGLE_CHROME_BUILD)
 #endif  // if defined(OS_WIN)
 
 // 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 determine 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::kChromeNaCl64Dll);
-  } else {
-    // Only NaCl broker and loader can be launched as Win64 processes.
-    NOTREACHED();
-    return NULL;
-  }
-#else
   dir->append(installer::kChromeDll);
-#endif
 
 #ifndef WIN_DISABLE_PREREAD
 #ifdef NDEBUG
   // Experimental pre-reading optimization
   // The idea is to pre-read a significant portion of chrome.dll in advance
   // so that subsequent hard page faults are avoided.
   //
   // Pre-read may be disabled at compile time by defining WIN_DISABLE_PREREAD,
   // but by default it is enabled in release builds. The ability to disable it
   // is useful for evaluating competing optimization techniques.
@@ skipping 214 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }