summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-13 22:29:24 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-13 22:29:24 +0000
commitc1ae2105f9b941535dbc534226e3b33310c3ea44 (patch)
tree64c2e502a07a82faa97ac94423b63ae999641e96
parenta67276686e5149796a96347accb1eba97d63b204 (diff)
downloadchromium_src-c1ae2105f9b941535dbc534226e3b33310c3ea44.zip
chromium_src-c1ae2105f9b941535dbc534226e3b33310c3ea44.tar.gz
chromium_src-c1ae2105f9b941535dbc534226e3b33310c3ea44.tar.bz2
NaCl: Remove old variant of LaunchNaClProcess()
This function is no longer used by the NaCl plugin. It was superseded by LaunchNaClProcessMultiFD(). BUG=none TEST=nacl_ui_tests Review URL: http://codereview.chromium.org/3372007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59292 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/renderer/render_process_impl.cc26
1 files changed, 0 insertions, 26 deletions
diff --git a/chrome/renderer/render_process_impl.cc b/chrome/renderer/render_process_impl.cc
index 6fa10ee..e12206a 100644
--- a/chrome/renderer/render_process_impl.cc
+++ b/chrome/renderer/render_process_impl.cc
@@ -46,30 +46,6 @@
namespace {
-bool LaunchNaClProcess(const char* url,
- int imc_fd,
- nacl::Handle* imc_handle,
- nacl::Handle* nacl_process_handle,
- int* nacl_process_id) {
- // TODO(gregoryd): nacl::FileDescriptor will be soon merged with
- // base::FileDescriptor
- std::vector<nacl::FileDescriptor> sockets;
- base::ProcessHandle nacl_process;
- if (!RenderThread::current()->Send(
- new ViewHostMsg_LaunchNaCl(
- ASCIIToWide(url),
- /* socket_count= */ 1,
- &sockets,
- &nacl_process,
- reinterpret_cast<base::ProcessId*>(nacl_process_id)))) {
- return false;
- }
- CHECK(static_cast<int>(sockets.size()) == 1);
- *imc_handle = nacl::ToNativeHandle(sockets[0]);
- *nacl_process_handle = nacl_process;
- return true;
-}
-
bool LaunchNaClProcessMultiFD(const char* alleged_url,
int socket_count,
nacl::Handle* imc_handles,
@@ -187,8 +163,6 @@ RenderProcessImpl::RenderProcessImpl()
#ifndef DISABLE_NACL
if (command_line.HasSwitch(switches::kInternalNaCl)) {
std::map<std::string, uintptr_t> funcs;
- funcs["launch_nacl_process"] =
- reinterpret_cast<uintptr_t>(LaunchNaClProcess);
funcs["launch_nacl_process_multi_fd"] =
reinterpret_cast<uintptr_t>(LaunchNaClProcessMultiFD);
RegisterInternalNaClPlugin(funcs);