diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 17:06:27 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 17:06:27 +0000 |
| commit | 2c716f9958ab05db3ab7be57c30e893d57d289d3 (patch) | |
| tree | 66b1015701107ef5ae86aa641e8a8b78b85b4974 /ppapi | |
| parent | 5110538a6e595e09e6040c5030d101d97c615124 (diff) | |
| download | chromium_src-2c716f9958ab05db3ab7be57c30e893d57d289d3.zip chromium_src-2c716f9958ab05db3ab7be57c30e893d57d289d3.tar.gz chromium_src-2c716f9958ab05db3ab7be57c30e893d57d289d3.tar.bz2 | |
Revert of Add very simple loading test for non-SFI NaCl. (https://codereview.chromium.org/189553005/)
Reason for revert:
The newly added NonSfiLoad test fails on linux asan-lsan bot: http://build.chromium.org/p/chromium.memory/builders/Linux%20ASan%2BLSan%20Tests%20%282%29/builds/491/steps/browser_tests/logs/NonSfiLoad
Original issue's description:
> Add very simple loading test for non-SFI NaCl.
>
> This is the first step to add test cases for non-SFI NaCl.
> The testee binary is build by a new target rule introduced by this CL, which is relocatable/libc-free binary. The code has a minimum set of handlers for irt_ppapi, to load the plugin successfully done with communicating hosts (browser/renderer processes).
>
> Along this change, some DCHECK errors are found. So they're fixed, too.
> 1) AtExitManager is conflicting. In non-SFI mode, AtExitManager is already instantiated in nacl_helper. To avoid the conflicting, skip to create it in plugin_main_irt.cc.
> 2) Allowed creating Singleton on the plugin's main thread.
> 3) SRPC may be successfully done, and then NOTREACHED catch it in nacl_listener. It is false alarm, so removed it.
>
> BUG=https://code.google.com/p/nativeclient/issues/detail?id=3734
> TEST=run ./browser_tests --gtest_filter=NaCl*NonSFI* locally. Run trybots.
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=257118
TBR=mseaborn@chromium.org,dmichael@chromium.org,hidehiko@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=https://code.google.com/p/nativeclient/issues/detail?id=3734
Review URL: https://codereview.chromium.org/200503002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/proxy/plugin_main_irt.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ppapi/proxy/plugin_main_irt.cc b/ppapi/proxy/plugin_main_irt.cc index 7182ab0..a3ea6c1 100644 --- a/ppapi/proxy/plugin_main_irt.cc +++ b/ppapi/proxy/plugin_main_irt.cc @@ -14,6 +14,7 @@ // IPC_MESSAGE_MACROS_LOG_ENABLED so ppapi_messages.h will generate the // ViewMsgLog et al. functions. +#include "base/at_exit.h" #include "base/command_line.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" @@ -35,7 +36,6 @@ #include "ppapi/shared_impl/ppb_audio_shared.h" #if defined(__native_client__) -#include "base/at_exit.h" #include "native_client/src/public/chrome_main.h" #include "native_client/src/shared/srpc/nacl_srpc.h" #endif @@ -327,12 +327,8 @@ void PpapiPluginRegisterThreadCreator( } int PpapiPluginMain() { - // For non-SFI mode, the manager is already instantiated in nacl_helper, - // so we don't need to instantiate it here. -#if defined(__native_client__) // Though it isn't referenced here, we must instantiate an AtExitManager. base::AtExitManager exit_manager; -#endif base::MessageLoop loop; #if defined(IPC_MESSAGE_LOG_ENABLED) IPC::Logging::set_log_function_map(&g_log_function_mapping); |