Remove dependency from NaCl code on chrome_constants.

chrome/browser/nacl_host/nacl_process_host.cc

 // Copyright (c) 2012 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 "chrome/browser/nacl_host/nacl_process_host.h"
 
 #include <string>
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/nacl_host/nacl_browser.h"
 #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
-#include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_process_type.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/nacl_cmd_line.h"
 #include "chrome/common/nacl_messages.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/browser_child_process_host.h"
 #include "content/public/browser/browser_ppapi_host.h"
@@ skipping 501 matching lines @@
   int flags = ChildProcessHost::CHILD_NORMAL;
 #endif
 
   base::FilePath exe_path = ChildProcessHost::GetChildPath(flags);
   if (exe_path.empty())
     return false;
 
 #if defined(OS_WIN)
   // On Windows 64-bit NaCl loader is called nacl64.exe instead of chrome.exe
   if (RunningOnWOW64()) {
-    base::FilePath module_path;
-    if (!PathService::Get(base::FILE_MODULE, &module_path)) {
-      LOG(ERROR) << "NaCl process launch failed: could not resolve module";
+    if (!GetNaclAppPath(exe_path)) {
       return false;
     }
-    exe_path = module_path.DirName().Append(chrome::kNaClAppName);
   }
 #endif
 
   scoped_ptr<CommandLine> cmd_line(new CommandLine(exe_path));
   nacl::CopyNaClCommandLineArguments(cmd_line.get());
 
   cmd_line->AppendSwitchASCII(switches::kProcessType,
                               switches::kNaClLoaderProcess);
   cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id);
   if (logging::DialogsAreSuppressed())
@@ skipping 500 matching lines @@
                weak_factory_.GetWeakPtr(), nacl_pid, process_handle, info);
   } else {
     NaClStartDebugExceptionHandlerThread(
         process_handle.Take(), info,
         base::MessageLoopProxy::current(),
         base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
                    weak_factory_.GetWeakPtr()));
     return true;
   }
 }
+
+bool NaClProcessHost::GetNaclAppPath(base::FilePath& exe_path)
+{

[Mark Seaborn, 2013/05/31 19:42:30]

Style is that '{' goes on previous line

+  static const wchar_t kNaClAppName[] = L"nacl64";

[dmichael (off chromium), 2013/05/31 19:42:18]

nit: static doesn't really add anything here.

[Lei Zhang, 2013/05/31 19:45:48]

Is this Windows-only code? If not, then it won't work with FilePath::Append()
below.

[Mark Seaborn, 2013/05/31 19:51:13]

Yes, this is Windows-only.  It's inside "#if defined(OS_WIN)".

+  base::FilePath module_path;
+  if (!PathService::Get(base::FILE_MODULE, &module_path)) {
+    LOG(ERROR) << "NaCl process launch failed: could not resolve module";

[dmichael (off chromium), 2013/05/31 19:42:18]

FWIW, this log used to only be emitted from this file (but it looks to me like
it's appropriate to emit it in both cases, as you have done).

+    return false;
+  }
+  exe_path = module_path.DirName().Append(kNaClAppName);

[dmichael (off chromium), 2013/05/31 19:42:18]

optional nit: Seems like you could just stick the literal here. We don't seem to
be using it anywhere else in the function. Or...  if we want to use the constant
to make it more self documenting, you can stick it right before you use it.

+  return true;
+}
+

[Mark Seaborn, 2013/05/31 19:51:13]

Nit: make the whitespace after "#if" and before "#endif" consistent.

[Mark Seaborn, 2013/05/31 19:51:13]

Nit: make the whitespace after "#if" and before "#endif" consistent

 #endif