Index: components/nacl/nacl/nacl_broker_listener.cc |
diff --git a/chrome/nacl/nacl_broker_listener.cc b/components/nacl/nacl/nacl_broker_listener.cc |
similarity index 90% |
rename from chrome/nacl/nacl_broker_listener.cc |
rename to components/nacl/nacl/nacl_broker_listener.cc |
index e310dfeb406c581d8ee142cfc480e3d4e1724d7d..45574c38e6646740786e41ca7f8b4cd11b523426 100644 |
--- a/chrome/nacl/nacl_broker_listener.cc |
+++ b/components/nacl/nacl/nacl_broker_listener.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/nacl/nacl_broker_listener.h" |
+#include "components/nacl/nacl/nacl_broker_listener.h" |
#include "base/base_switches.h" |
#include "base/bind.h" |
@@ -11,10 +11,10 @@ |
#include "base/message_loop/message_loop_proxy.h" |
#include "base/path_service.h" |
#include "base/process_util.h" |
-#include "chrome/common/chrome_switches.h" |
-#include "chrome/common/nacl_cmd_line.h" |
-#include "chrome/common/nacl_debug_exception_handler_win.h" |
-#include "chrome/common/nacl_messages.h" |
+#include "components/nacl/common/nacl_cmd_line.h" |
+#include "components/nacl/common/nacl_debug_exception_handler_win.h" |
+#include "components/nacl/common/nacl_delegate.h" |
+#include "components/nacl/common/nacl_messages.h" |
#include "content/public/common/sandbox_init.h" |
#include "ipc/ipc_channel.h" |
#include "ipc/ipc_switches.h" |
@@ -97,8 +97,9 @@ void NaClBrokerListener::OnLaunchLoaderThroughBroker( |
CommandLine* cmd_line = new CommandLine(exe_path); |
nacl::CopyNaClCommandLineArguments(cmd_line); |
- cmd_line->AppendSwitchASCII(switches::kProcessType, |
- switches::kNaClLoaderProcess); |
+ cmd_line->AppendSwitchASCII( |
+ GetNaClDelegate()->GetSwitch(NaClDelegate::kProcessType), |
+ GetNaClDelegate()->GetSwitch(NaClDelegate::kNaClLoaderProcess)); |
cmd_line->AppendSwitchASCII(switches::kProcessChannelID, |
loader_channel_id); |