From 829050daabbf029427504b79b3456b84be14cbfa Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Wed, 17 Apr 2019 17:18:03 -0400
Subject: [PATCH] build: rename sandbox bundle (#17831)

---
 BUILD.gn                                        | 8 ++++----
 atom/renderer/atom_sandboxed_renderer_client.cc | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index ba8f857c0..eeb0671c9 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -80,7 +80,7 @@ npm_action("atom_browserify_sandbox_unwrapped") {
   inputs = auto_filenames.sandbox_browserify_deps
 
   outputs = [
-    "$target_gen_dir/js2c/preload_bundle_unwrapped.js",
+    "$target_gen_dir/js2c/sandbox_bundle_unwrapped.js",
   ]
 
   args = [
@@ -194,11 +194,11 @@ js_wrap("atom_browserify_sandbox") {
   ]
 
   inputs = [
-    "$target_gen_dir/js2c/preload_bundle_unwrapped.js",
+    "$target_gen_dir/js2c/sandbox_bundle_unwrapped.js",
   ]
 
   outputs = [
-    "$target_gen_dir/js2c/preload_bundle.js",
+    "$target_gen_dir/js2c/sandbox_bundle.js",
   ]
 }
 
@@ -223,7 +223,7 @@ action("atom_js2c") {
   browserify_sources = [
     "$target_gen_dir/js2c/content_script_bundle.js",
     "$target_gen_dir/js2c/isolated_bundle.js",
-    "$target_gen_dir/js2c/preload_bundle.js",
+    "$target_gen_dir/js2c/sandbox_bundle.js",
   ]
 
   sources = browserify_sources + [
diff --git a/atom/renderer/atom_sandboxed_renderer_client.cc b/atom/renderer/atom_sandboxed_renderer_client.cc
index d87beab4b..045590990 100644
--- a/atom/renderer/atom_sandboxed_renderer_client.cc
+++ b/atom/renderer/atom_sandboxed_renderer_client.cc
@@ -218,14 +218,14 @@ void AtomSandboxedRendererClient::DidCreateScriptContext(
   InitializeBindings(binding, context, render_frame->IsMainFrame());
   AddRenderBindings(isolate, binding);
 
-  std::vector<v8::Local<v8::String>> preload_bundle_params = {
+  std::vector<v8::Local<v8::String>> sandbox_preload_bundle_params = {
       node::FIXED_ONE_BYTE_STRING(isolate, "binding")};
 
-  std::vector<v8::Local<v8::Value>> preload_bundle_args = {binding};
+  std::vector<v8::Local<v8::Value>> sandbox_preload_bundle_args = {binding};
 
   node::per_process::native_module_loader.CompileAndCall(
-      isolate->GetCurrentContext(), "electron/js2c/preload_bundle",
-      &preload_bundle_params, &preload_bundle_args, nullptr);
+      isolate->GetCurrentContext(), "electron/js2c/sandbox_bundle",
+      &sandbox_preload_bundle_params, &sandbox_preload_bundle_args, nullptr);
 
   v8::HandleScope handle_scope(isolate);
   v8::Context::Scope context_scope(context);