diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 09:08:35 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-20 09:08:35 +0000 |
| commit | 0d501d4fd0c6136e99477bf485acaaf8d5f838f9 (patch) | |
| tree | e61cb92b1abbde60b3029d0bcc1a117561b0d37b /components | |
| parent | 464d2e72df3488361b550354cbf8cc98d4cae614 (diff) | |
| download | chromium_src-0d501d4fd0c6136e99477bf485acaaf8d5f838f9.zip chromium_src-0d501d4fd0c6136e99477bf485acaaf8d5f838f9.tar.gz chromium_src-0d501d4fd0c6136e99477bf485acaaf8d5f838f9.tar.bz2 | |
Revert of Add very simple loading test for non-SFI NaCl. (https://codereview.chromium.org/189553005/)
Reason for revert:
Broken linking on ChromiumOS
http://build.chromium.org/p/chromium.chromiumos/builders/ChromiumOS%20%28x86%29/builds/20529/steps/BuildPackages/logs/stdio
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
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=257743
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=258200
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/206223002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258258 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
| -rw-r--r-- | components/nacl/loader/nacl_listener.cc | 1 | ||||
| -rw-r--r-- | components/nacl/loader/nonsfi/nonsfi_main.cc | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/components/nacl/loader/nacl_listener.cc b/components/nacl/loader/nacl_listener.cc index b5ee5f7..4a4efef 100644 --- a/components/nacl/loader/nacl_listener.cc +++ b/components/nacl/loader/nacl_listener.cc @@ -423,6 +423,7 @@ void NaClListener::OnStart(const nacl::NaClStartParams& params) { #if defined(OS_LINUX) if (params.uses_nonsfi_mode) { nacl::nonsfi::MainStart(args->imc_bootstrap_handle); + NOTREACHED(); return; } #endif diff --git a/components/nacl/loader/nonsfi/nonsfi_main.cc b/components/nacl/loader/nonsfi/nonsfi_main.cc index 5293498e..87fbc1b 100644 --- a/components/nacl/loader/nonsfi/nonsfi_main.cc +++ b/components/nacl/loader/nonsfi/nonsfi_main.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/threading/platform_thread.h" -#include "base/threading/thread_restrictions.h" #include "components/nacl/loader/nonsfi/elf_loader.h" #include "components/nacl/loader/nonsfi/irt_interfaces.h" #include "native_client/src/include/elf_auxv.h" @@ -39,9 +38,6 @@ class PluginMainDelegate : public base::PlatformThread::Delegate { virtual void ThreadMain() OVERRIDE { base::PlatformThread::SetName("NaClMainThread"); - // This will only happen once per process, so we give the permission to - // create Singletons. - base::ThreadRestrictions::SetSingletonAllowed(true); uintptr_t info[] = { 0, // Do not use fini. 0, // envc. |