diff options
| author | jvoung <jvoung@chromium.org> | 2015-07-15 15:21:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-15 22:22:42 +0000 |
| commit | bc46caa5414aeba6d4294eb2790264c8e966eb75 (patch) | |
| tree | 94da7ded2b1bce2f79af556b0d0bb76c0e9dd2a8 /components | |
| parent | 15589a459c096ea61d0228b594e4d549e463e94d (diff) | |
| download | chromium_src-bc46caa5414aeba6d4294eb2790264c8e966eb75.zip chromium_src-bc46caa5414aeba6d4294eb2790264c8e966eb75.tar.gz chromium_src-bc46caa5414aeba6d4294eb2790264c8e966eb75.tar.bz2 | |
Remove fallback code for getting pnacl-subzero tool name.
The pnacl.json file should have gotten the name after the M43 push,
and we are on M46 now.
BUG=none
Review URL: https://codereview.chromium.org/1234293002
Cr-Commit-Position: refs/heads/master@{#338928}
Diffstat (limited to 'components')
| -rw-r--r-- | components/nacl/renderer/ppb_nacl_private_impl.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc index f407aa4..e40bdd3 100644 --- a/components/nacl/renderer/ppb_nacl_private_impl.cc +++ b/components/nacl/renderer/ppb_nacl_private_impl.cc @@ -1221,14 +1221,8 @@ PP_Bool GetPNaClResourceInfo(PP_Instance instance, *ld_tool_name = ppapi::StringVar::StringToPPVar(pnacl_ld_name); std::string pnacl_sz_name; - if (json_dict->GetString("pnacl-sz-name", &pnacl_sz_name)) { + if (json_dict->GetString("pnacl-sz-name", &pnacl_sz_name)) *subzero_tool_name = ppapi::StringVar::StringToPPVar(pnacl_sz_name); - } else { - // TODO(jvoung): remove fallback after one chrome release - // or when we bump the kMinPnaclVersion. - // TODO(jvoung): Just use strings instead of PP_Var! - *subzero_tool_name = ppapi::StringVar::StringToPPVar("pnacl-sz.nexe"); - } return PP_TRUE; } |