Add support for starting NaCl win64 process if nacl64.exe is in the version directory.

We now assume that nacl64.exe is in the same directory as chrome.dll (and not as chrome.exe as we assumed before).

BUG=28176
TEST=none
Review URL: http://codereview.chromium.org/668130

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40809 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 3 deletions

diff --git a/chrome/browser/nacl_host/nacl_broker_host.cc b/chrome/browser/nacl_host/nacl_broker_host.cc
index 92ed181..f620a6a 100644
--- a/chrome/browser/nacl_host/nacl_broker_host.cc
+++ b/chrome/browser/nacl_host/nacl_broker_host.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/nacl_host/nacl_broker_host.h"
 
 #include "base/command_line.h"
+#include "base/path_service.h"
 #include "ipc/ipc_switches.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/nacl_host/nacl_broker_service.h"
@@ -34,11 +35,11 @@ bool NaClBrokerHost::Init() {
     return false;
 
   // Create the path to the nacl broker/loader executable.
-  FilePath exe_path = GetChildPath(false);
-  if (exe_path.empty())
+  FilePath module_path;
+  if (!PathService::Get(base::FILE_MODULE, &module_path))
     return false;
 
-  FilePath nacl_path = exe_path.DirName().Append(chrome::kNaClAppName);
+  FilePath nacl_path = module_path.DirName().Append(chrome::kNaClAppName);
   CommandLine* cmd_line = new CommandLine(nacl_path);
   nacl::CopyNaClCommandLineArguments(cmd_line);