diff options
| author | mseaborn <mseaborn@chromium.org> | 2016-01-12 16:09:59 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-13 00:11:03 +0000 |
| commit | 6fb080161894aa5b2162faed954483a9068dbf16 (patch) | |
| tree | 2a2f6ce4d7b0bbea307a40b2e43e226f1cdda99c /components/nacl/renderer/ppb_nacl_private_impl.cc | |
| parent | 79c798c00246defd2054c7e0177c27bd007258fa (diff) | |
| download | chromium_src-6fb080161894aa5b2162faed954483a9068dbf16.zip chromium_src-6fb080161894aa5b2162faed954483a9068dbf16.tar.gz chromium_src-6fb080161894aa5b2162faed954483a9068dbf16.tar.bz2 | |
NaCl cleanup: Remove use of the IMC bootstrap channel
This channel was used for establishing further NaCl IMC connections
across which we sent SRPC messages. This is no longer needed now that
we don't use SRPC.
* Stop creating the channel in the browser process
(nacl_process_host.cc).
* Remove the handle/FD fields from IPC messages.
* Stop propagating the renderer-side handle through renderer code
(service_runtime.cc and LaunchSelLdr()).
BUG=302078
TEST=e.g. NaClBrowserTestPnacl.PPAPICore (tests PNaCl translation)
Review URL: https://codereview.chromium.org/1579043002
Cr-Commit-Position: refs/heads/master@{#369042}
Diffstat (limited to 'components/nacl/renderer/ppb_nacl_private_impl.cc')
| -rw-r--r-- | components/nacl/renderer/ppb_nacl_private_impl.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc index b86f560..1a40235 100644 --- a/components/nacl/renderer/ppb_nacl_private_impl.cc +++ b/components/nacl/renderer/ppb_nacl_private_impl.cc @@ -49,7 +49,6 @@ #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/renderer_ppapi_host.h" -#include "native_client/src/public/imc_types.h" #include "net/base/data_url.h" #include "net/base/net_errors.h" #include "net/http/http_util.h" @@ -405,7 +404,6 @@ void LaunchSelLdr(PP_Instance instance, const PP_NaClFileInfo* nexe_file_info, PP_Bool uses_nonsfi_mode, PP_NaClAppProcessType pp_process_type, - void* imc_handle, scoped_ptr<IPC::SyncChannel>* translator_channel, base::ProcessId* process_id, PP_CompletionCallback callback) { @@ -506,7 +504,6 @@ void LaunchSelLdr(PP_Instance instance, // Even on error, some FDs/handles may be passed to here. // We must release those resources. // See also nacl_process_host.cc. - IPC::PlatformFileForTransitToFile(launch_result.imc_channel_handle); base::SharedMemory::CloseHandle(launch_result.crash_info_shmem_handle); if (PP_ToBool(main_service_runtime)) { @@ -547,10 +544,6 @@ void LaunchSelLdr(PP_Instance instance, } } - *(static_cast<NaClHandle*>(imc_handle)) = - IPC::PlatformFileForTransitToPlatformFile( - launch_result.imc_channel_handle); - // Store the crash information shared memory handle. load_manager->set_crash_info_shmem_handle( launch_result.crash_info_shmem_handle); |