diff options
author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-21 18:23:11 +0000 |
---|---|---|
committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-21 18:23:11 +0000 |
commit | 2dcc60d03351e86838bde4b460e1617aba3d0629 (patch) | |
tree | f98e92ccb052b5689d1e4d80e107d97d373b3565 /ppapi | |
parent | c5a6fe4871a48f97179c77acfcb96f3bc1e23feb (diff) | |
download | chromium_src-2dcc60d03351e86838bde4b460e1617aba3d0629.zip chromium_src-2dcc60d03351e86838bde4b460e1617aba3d0629.tar.gz chromium_src-2dcc60d03351e86838bde4b460e1617aba3d0629.tar.bz2 |
NaCl IRT: Remove now-unneeded IrtInit() definition and call
It used to be that this Chrome-provided function was called from the
NaCl side, but reportedly only in the x86 build and not the ARM build.
It is now consistently defined on the NaCl side and called there, so
we can remove the Chrome side's duplicated definition and call.
Also remove the unnecessary NaClSrpcModuleFini() call: We never really
need to finalise modules like this when exiting. NaClSrpcModuleFini()
might only have the effect of breaking get_random_bytes() if it's used
after the PPAPI event loop exits (though I don't think we ever really
expect the PPAPI event loop to exit).
BUG=https://code.google.com/p/nativeclient/issues/detail?id=3186
TEST=browser_tests, nacl_integration
Review URL: https://codereview.chromium.org/19479005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r-- | ppapi/proxy/plugin_main_nacl.cc | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/ppapi/proxy/plugin_main_nacl.cc b/ppapi/proxy/plugin_main_nacl.cc index ab71dcf..f00d371 100644 --- a/ppapi/proxy/plugin_main_nacl.cc +++ b/ppapi/proxy/plugin_main_nacl.cc @@ -246,21 +246,7 @@ void PpapiPluginRegisterThreadCreator( ppapi::PPB_Audio_Shared::SetThreadFunctions(thread_functions); } -int IrtInit() { - static int initialized = 0; - if (initialized) { - return 0; - } - if (!NaClSrpcModuleInit()) { - return 1; - } - initialized = 1; - return 0; -} - int PpapiPluginMain() { - IrtInit(); - // Though it isn't referenced here, we must instantiate an AtExitManager. base::AtExitManager exit_manager; base::MessageLoop loop; @@ -292,7 +278,5 @@ int PpapiPluginMain() { loop.Run(); - NaClSrpcModuleFini(); - return 0; } |