summaryrefslogtreecommitdiffstats
path: root/chrome/browser/nacl_host/nacl_process_host.cc
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-17 05:08:35 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-17 05:08:35 +0000
commitd40624532da58e4aa2cdee8da79b5b42bad4232c (patch)
treeb09fa7f1dcad37d8d9603f7a17bf32dbd2e39561 /chrome/browser/nacl_host/nacl_process_host.cc
parentefb693f6491228101d438ad62d2e8d207f5df9b2 (diff)
downloadchromium_src-d40624532da58e4aa2cdee8da79b5b42bad4232c.zip
chromium_src-d40624532da58e4aa2cdee8da79b5b42bad4232c.tar.gz
chromium_src-d40624532da58e4aa2cdee8da79b5b42bad4232c.tar.bz2
NaCl: Enable untrusted hardware exception handling by default
I'm leaving in NaClProcessHost's enable_exception_handling_ field because we will want to disable exception handling under PNaCl. BUG=https://code.google.com/p/nativeclient/issues/detail?id=2401 TEST=inbrowser_test_runner in nacl_integration Review URL: https://codereview.chromium.org/14122010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194537 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/nacl_host/nacl_process_host.cc')
-rw-r--r--chrome/browser/nacl_host/nacl_process_host.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc
index bada69a..f91bd4e 100644
--- a/chrome/browser/nacl_host/nacl_process_host.cc
+++ b/chrome/browser/nacl_host/nacl_process_host.cc
@@ -196,7 +196,7 @@ NaClProcessHost::NaClProcessHost(const GURL& manifest_url,
#endif
internal_(new NaClInternal()),
ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)),
- enable_exception_handling_(false),
+ enable_exception_handling_(true),
enable_debug_stub_(false),
uses_irt_(uses_irt),
off_the_record_(off_the_record),
@@ -211,13 +211,6 @@ NaClProcessHost::NaClProcessHost(const GURL& manifest_url,
// for this use case.
process_->SetName(net::FormatUrl(manifest_url_, std::string()));
- // We allow untrusted hardware exception handling to be enabled via
- // an env var for consistency with the standalone build of NaCl.
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableNaClExceptionHandling) ||
- getenv("NACL_UNTRUSTED_EXCEPTION_HANDLING") != NULL) {
- enable_exception_handling_ = true;
- }
enable_debug_stub_ = CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableNaClDebug);
}