| Index: chrome/browser/nacl_host/nacl_process_host.cc
|
| diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc
|
| index 7b2a8f21821d46e204f66fb195ba413c650506c5..f487a770a96d5d5ee65cd52fc6f35d70a22b25e4 100644
|
| --- a/chrome/browser/nacl_host/nacl_process_host.cc
|
| +++ b/chrome/browser/nacl_host/nacl_process_host.cc
|
| @@ -33,9 +33,10 @@
|
| #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 "components/nacl/common/nacl_delegate.h"
|
| +#include "components/nacl/common/nacl_messages.h"
|
| +#include "components/nacl/common/nacl_switches.h"
|
| #include "content/public/browser/browser_child_process_host.h"
|
| #include "content/public/browser/browser_ppapi_host.h"
|
| #include "content/public/browser/child_process_data.h"
|
| @@ -61,7 +62,7 @@
|
| #include "base/threading/thread.h"
|
| #include "base/win/scoped_handle.h"
|
| #include "chrome/browser/nacl_host/nacl_broker_service_win.h"
|
| -#include "chrome/common/nacl_debug_exception_handler_win.h"
|
| +#include "components/nacl/common/nacl_debug_exception_handler_win.h"
|
| #include "content/public/common/sandbox_init.h"
|
| #include "content/public/common/sandboxed_process_launcher_delegate.h"
|
| #endif
|
| @@ -452,7 +453,7 @@ bool NaClProcessHost::LaunchSelLdr() {
|
| #endif
|
|
|
| scoped_ptr<CommandLine> cmd_line(new CommandLine(exe_path));
|
| - nacl::CopyNaClCommandLineArguments(cmd_line.get());
|
| + GetNaClDelegate()->CopyNaClCommandLineArguments(cmd_line.get());
|
|
|
| cmd_line->AppendSwitchASCII(switches::kProcessType,
|
| switches::kNaClLoaderProcess);
|
|
|