diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 00:57:39 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-14 00:57:39 +0000 |
| commit | 6254de6cd41eb3b61d7f4a013ccbc3e6f091e8bb (patch) | |
| tree | e0ad1a6cbcd3ebc89766a45776fa148d3f0ba323 /chrome/renderer | |
| parent | daede9b9ac8afb19cabb530028b154d7561e0b85 (diff) | |
| download | chromium_src-6254de6cd41eb3b61d7f4a013ccbc3e6f091e8bb.zip chromium_src-6254de6cd41eb3b61d7f4a013ccbc3e6f091e8bb.tar.gz chromium_src-6254de6cd41eb3b61d7f4a013ccbc3e6f091e8bb.tar.bz2 | |
Improve NaCl startup error reporting in plugin and IPC proxy.
BUG=116317
TEST=nacl_integration
Review URL: https://chromiumcodereview.appspot.com/11415142
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/pepper/ppb_nacl_private_impl.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/renderer/pepper/ppb_nacl_private_impl.cc b/chrome/renderer/pepper/ppb_nacl_private_impl.cc index a819f5b..3acfaf8 100644 --- a/chrome/renderer/pepper/ppb_nacl_private_impl.cc +++ b/chrome/renderer/pepper/ppb_nacl_private_impl.cc @@ -163,11 +163,9 @@ PP_NaClResult StartPpapiProxy(PP_Instance instance) { instance_info.plugin_child_id); if (!renderer_ppapi_host) return PP_NACL_ERROR_MODULE; - // Finally, switch the instance to the proxy. - if (!nacl_plugin_module->InitAsProxiedNaCl(plugin_instance)) - return PP_NACL_ERROR_INSTANCE; - return PP_NACL_OK; + // Finally, switch the instance to the proxy. + return nacl_plugin_module->InitAsProxiedNaCl(plugin_instance); } int UrandomFD(void) { |