| Index: mojo/public/mojo_application.gni | 
| diff --git a/mojo/public/mojo_application.gni b/mojo/public/mojo_application.gni | 
| index 9b759c1fc9b21d4d45b870c4e0478b2fa0d07cd4..faf9d096db54bdc44b3fd5c499b5610ef573d0b1 100644 | 
| --- a/mojo/public/mojo_application.gni | 
| +++ b/mojo/public/mojo_application.gni | 
| @@ -218,11 +218,11 @@ template("mojo_native_application") { | 
| if (current_cpu == "pnacl") { | 
| input_file_extension = ".pexe" | 
| output_file_extension = ".pexe.mojo" | 
| -        content_handler = "pexe_content_handler" | 
| +        content_handler = "content_handler_nonsfi_pexe" | 
| } else { | 
| input_file_extension = ".nexe" | 
| output_file_extension = "_${target_cpu}.nexe.mojo" | 
| -        content_handler = "nacl_content_handler" | 
| +        content_handler = "content_handler_sfi" | 
| } | 
| input_file = "${base_target_name}${input_file_extension}" | 
| output_file = "${base_target_name}${output_file_extension}" | 
|  |