Bump v4.0.0-beta.7

(cherry picked from commit d567bdba3d)

.circleci/config.yml

@@ -154,6 +154,7 @@ step-install-nodejs-on-mac: &step-install-nodejs-on-mac
       if [ "`uname`" == "Darwin" ]; then
         brew update
         brew install node@10
+        echo 'export PATH="/usr/local/opt/node@10/bin:$PATH"' >> $BASH_ENV
       fi
 
 step-gn-gen-default: &step-gn-gen-default
@@ -719,8 +720,10 @@ jobs:
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
     <<: *steps-checkout
 
-  linux-x64-checkout:
+  linux-checkout-for-native-tests:
     <<: *machine-linux-2xlarge
+    environment:
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_pyyaml=True'
     <<: *steps-checkout
 
   # Layer 2: Builds.
@@ -1222,15 +1225,15 @@ workflows:
                 - master
                 - *chromium-upgrade-branches
     jobs:
-      - linux-x64-checkout
+      - linux-checkout-for-native-tests
 
       # TODO(alexeykuzmin): Enable it back.
       # Tons of crashes right now, see
       # https://circleci.com/gh/electron/electron/67463
 #      - linux-x64-browsertests:
 #          requires:
-#            - linux-x64-checkout
+#            - linux-checkout-for-native-tests
 
       - linux-x64-unittests:
           requires:
-            - linux-x64-checkout
+            - linux-checkout-for-native-tests

DEPS

@@ -30,6 +30,13 @@ vars = {
   # Python interface to Amazon Web Services. Is used for releases only.
   'checkout_boto': False,
 
+  # To allow in-house builds to checkout those manually.
+  'checkout_chromium': True,
+  'checkout_node': True,
+
+  # It's only needed to parse the native tests configurations.
+  'checkout_pyyaml': False,
+
   # Python "requests" module is used for releases only.
   'checkout_requests': False,
 
@@ -52,12 +59,18 @@ vars = {
 }
 
 deps = {
-  'src':
-    (Var("chromium_git")) + '/chromium/src.git@' + (Var("chromium_version")),
-  'src/third_party/electron_node':
-    (Var("electron_git")) + '/node.git@' + (Var("node_version")),
-  'src/electron/vendor/pyyaml':
-    (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
+  'src': {
+    'url': (Var("chromium_git")) + '/chromium/src.git@' + (Var("chromium_version")),
+    'condition': 'checkout_chromium',
+  },
+  'src/third_party/electron_node': {
+    'url': (Var("electron_git")) + '/node.git@' + (Var("node_version")),
+    'condition': 'checkout_node',
+  },
+  'src/electron/vendor/pyyaml': {
+    'url': (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
+    'condition': 'checkout_pyyaml',
+  },
   'src/electron/vendor/boto': {
     'url': Var('boto_git') + '/boto.git' + '@' +  Var('boto_version'),
     'condition': 'checkout_boto',
@@ -71,13 +84,12 @@ deps = {
 hooks = [
   {
     'name': 'patch_chromium',
-    'condition': 'apply_patches',
+    'condition': 'checkout_chromium and apply_patches',
     'pattern': 'src/electron',
     'action': [
       'python',
-      'src/electron/script/apply-patches',
-      '--project-root=.',
-      '--commit',
+      'src/electron/script/apply_all_patches.py',
+      'src/electron/patches/common/config.json',
     ],
   },
   {

VERSION

@@ -1 +1 @@
-4.0.0-beta.5
+4.0.0-beta.7

atom/browser/api/atom_api_event.cc

@@ -0,0 +1,26 @@
+// Copyright (c) 2018 GitHub, Inc.
+// Use of this source code is governed by the MIT license that can be
+// found in the LICENSE file.
+
+#include "atom/browser/api/event_emitter.h"
+#include "atom/common/node_includes.h"
+#include "native_mate/dictionary.h"
+
+namespace {
+
+v8::Local<v8::Object> CreateWithSender(v8::Isolate* isolate,
+                                       v8::Local<v8::Object> sender) {
+  return mate::internal::CreateJSEvent(isolate, sender, nullptr, nullptr);
+}
+
+void Initialize(v8::Local<v8::Object> exports,
+                v8::Local<v8::Value> unused,
+                v8::Local<v8::Context> context,
+                void* priv) {
+  mate::Dictionary dict(context->GetIsolate(), exports);
+  dict.SetMethod("createWithSender", &CreateWithSender);
+}
+
+}  // namespace
+
+NODE_BUILTIN_MODULE_CONTEXT_AWARE(atom_browser_event, Initialize)

atom/browser/mac/in_app_purchase.mm

@@ -167,7 +167,7 @@ void FinishTransactionByDate(const std::string& date) {
 std::string GetReceiptURL() {
   NSURL* receiptURL = [[NSBundle mainBundle] appStoreReceiptURL];
   if (receiptURL != nil) {
-    return [[receiptURL absoluteString] UTF8String];
+    return std::string([[receiptURL path] UTF8String]);
   } else {
     return "";
   }

atom/browser/native_window_mac.mm

@@ -341,6 +341,9 @@ NativeWindowMac::NativeWindowMac(const mate::Dictionary& options,
   if (!useStandardWindow || transparent() || !has_frame()) {
     styleMask |= NSTexturedBackgroundWindowMask;
   }
+  if (resizable_) {
+    styleMask |= NSResizableWindowMask;
+  }
 
   // Create views::Widget and assign window_ with it.
   // TODO(zcbenz): Get rid of the window_ in future.

atom/browser/resources/mac/Info.plist

@@ -23,7 +23,7 @@
   <key>LSApplicationCategoryType</key>
   <string>public.app-category.developer-tools</string>
   <key>LSMinimumSystemVersion</key>
-  <string>10.9.0</string>
+  <string>10.10.0</string>
   <key>NSMainNibFile</key>
   <string>MainMenu</string>
   <key>NSPrincipalClass</key>

atom/browser/resources/win/atom.rc

@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,0,0,5
- PRODUCTVERSION 4,0,0,5
+ FILEVERSION 4,0,0,7
+ PRODUCTVERSION 4,0,0,7
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L

atom/browser/ui/cocoa/atom_ns_window_delegate.mm

@@ -9,6 +9,7 @@
 #include "atom/browser/ui/cocoa/atom_preview_item.h"
 #include "atom/browser/ui/cocoa/atom_touch_bar.h"
 #include "base/mac/mac_util.h"
+#include "ui/views/cocoa/bridged_native_widget.h"
 #include "ui/views/widget/native_widget_mac.h"
 
 @implementation AtomNSWindowDelegate
@@ -246,7 +247,10 @@
   // Clears the delegate when window is going to be closed, since EL Capitan it
   // is possible that the methods of delegate would get called after the window
   // has been closed.
-  [shell_->GetNativeWindow() setDelegate:nil];
+  views::BridgedNativeWidget* bridged_view =
+      views::NativeWidgetMac::GetBridgeForNativeWindow(
+          shell_->GetNativeWindow());
+  bridged_view->OnWindowWillClose();
 }
 
 - (BOOL)windowShouldClose:(id)window {

atom/browser/ui/file_dialog_gtk.cc

@@ -94,10 +94,14 @@ class FileChooserDialog {
   }
 
   void SetupProperties(int properties) {
-    if (properties & FILE_DIALOG_MULTI_SELECTIONS)
-      gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog()), TRUE);
-    if (properties & FILE_DIALOG_SHOW_HIDDEN_FILES)
-      g_object_set(dialog(), "show-hidden", TRUE, NULL);
+    const auto hasProp = [properties](FileDialogProperty prop) {
+      return gboolean((properties & prop) != 0);
+    };
+    auto* file_chooser = GTK_FILE_CHOOSER(dialog());
+    gtk_file_chooser_set_select_multiple(file_chooser,
+                                         hasProp(FILE_DIALOG_MULTI_SELECTIONS));
+    gtk_file_chooser_set_show_hidden(file_chooser,
+                                     hasProp(FILE_DIALOG_SHOW_HIDDEN_FILES));
   }
 
   void RunAsynchronous() {

atom/browser/ui/message_box_gtk.cc

@@ -40,7 +40,8 @@ class GtkMessageBox : public NativeWindowObserver {
                 const std::string& message,
                 const std::string& detail,
                 const std::string& checkbox_label,
-                bool checkbox_checked)
+                bool checkbox_checked,
+                const gfx::ImageSkia& icon)
       : cancel_id_(cancel_id),
         parent_(static_cast<NativeWindow*>(parent_window)) {
     // Create dialog.
@@ -56,6 +57,21 @@ class GtkMessageBox : public NativeWindowObserver {
     if (!title.empty())
       gtk_window_set_title(GTK_WINDOW(dialog_), title.c_str());
 
+    if (!icon.isNull()) {
+      // No easy way to obtain this programmatically, but GTK+'s docs
+      // define GTK_ICON_SIZE_DIALOG to be 48 pixels
+      static constexpr int pixel_width = 48;
+      static constexpr int pixel_height = 48;
+      GdkPixbuf* pixbuf = libgtkui::GdkPixbufFromSkBitmap(*icon.bitmap());
+      GdkPixbuf* scaled_pixbuf = gdk_pixbuf_scale_simple(
+          pixbuf, pixel_width, pixel_height, GDK_INTERP_BILINEAR);
+      GtkWidget* w = gtk_image_new_from_pixbuf(scaled_pixbuf);
+      gtk_message_dialog_set_image(GTK_MESSAGE_DIALOG(dialog_), w);
+      gtk_widget_show(w);
+      g_clear_pointer(&scaled_pixbuf, gdk_pixbuf_unref);
+      g_clear_pointer(&pixbuf, gdk_pixbuf_unref);
+    }
+
     if (!checkbox_label.empty()) {
       GtkWidget* message_area =
           gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(dialog_));
@@ -66,15 +82,15 @@ class GtkMessageBox : public NativeWindowObserver {
       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button),
                                    checkbox_checked);
       gtk_container_add(GTK_CONTAINER(message_area), check_button);
+      gtk_widget_show(check_button);
     }
 
     // Add buttons.
+    GtkDialog* dialog = GTK_DIALOG(dialog_);
     for (size_t i = 0; i < buttons.size(); ++i) {
-      GtkWidget* button = gtk_dialog_add_button(
-          GTK_DIALOG(dialog_), TranslateToStock(i, buttons[i]), i);
-      if (static_cast<int>(i) == default_id)
-        gtk_widget_grab_focus(button);
+      gtk_dialog_add_button(dialog, TranslateToStock(i, buttons[i]), i);
     }
+    gtk_dialog_set_default_response(dialog, default_id);
 
     // Parent window.
     if (parent_) {
@@ -122,7 +138,7 @@ class GtkMessageBox : public NativeWindowObserver {
   }
 
   void Show() {
-    gtk_widget_show_all(dialog_);
+    gtk_widget_show(dialog_);
     // We need to call gtk_window_present after making the widgets visible to
     // make sure window gets correctly raised and gets focus.
     int time = ui::X11EventSource::GetInstance()->GetTimestamp();
@@ -195,9 +211,9 @@ int ShowMessageBox(NativeWindow* parent,
                    const std::string& title,
                    const std::string& message,
                    const std::string& detail,
-                   const gfx::ImageSkia& /*icon*/) {
+                   const gfx::ImageSkia& icon) {
   return GtkMessageBox(parent, type, buttons, default_id, cancel_id, title,
-                       message, detail, "", false)
+                       message, detail, "", false, icon)
       .RunSynchronous();
 }
 
@@ -212,10 +228,10 @@ void ShowMessageBox(NativeWindow* parent,
                     const std::string& detail,
                     const std::string& checkbox_label,
                     bool checkbox_checked,
-                    const gfx::ImageSkia& /*icon*/,
+                    const gfx::ImageSkia& icon,
                     const MessageBoxCallback& callback) {
   (new GtkMessageBox(parent, type, buttons, default_id, cancel_id, title,
-                     message, detail, checkbox_label, checkbox_checked))
+                     message, detail, checkbox_label, checkbox_checked, icon))
       ->RunAsynchronous(callback);
 }
 
@@ -223,7 +239,8 @@ void ShowErrorBox(const base::string16& title, const base::string16& content) {
   if (Browser::Get()->is_ready()) {
     GtkMessageBox(nullptr, MESSAGE_BOX_TYPE_ERROR, {"OK"}, -1, 0, "Error",
                   base::UTF16ToUTF8(title).c_str(),
-                  base::UTF16ToUTF8(content).c_str(), "", false)
+                  base::UTF16ToUTF8(content).c_str(), "", false,
+                  gfx::ImageSkia())
         .RunSynchronous();
   } else {
     fprintf(stderr,

atom/common/atom_version.h

@@ -9,7 +9,7 @@
 #define ATOM_MINOR_VERSION 0
 #define ATOM_PATCH_VERSION 0
 // clang-format off
-#define ATOM_PRE_RELEASE_VERSION -beta.5
+#define ATOM_PRE_RELEASE_VERSION -beta.7
 // clang-format on
 
 #ifndef ATOM_STRINGIFY

atom/common/node_bindings.cc

@@ -38,6 +38,7 @@
   V(atom_browser_debugger)                   \
   V(atom_browser_dialog)                     \
   V(atom_browser_download_item)              \
+  V(atom_browser_event)                      \
   V(atom_browser_global_shortcut)            \
   V(atom_browser_in_app_purchase)            \
   V(atom_browser_menu)                       \

atom/common/node_includes.h

@@ -30,7 +30,7 @@
 #undef NO_RETURN
 #undef LIKELY
 #undef arraysize
-#undef debug_string  // This is defined in macOS 10.9 SDK in AssertMacros.h.
+#undef debug_string  // This is defined in macOS SDK in AssertMacros.h.
 #include "env-inl.h"
 #include "env.h"
 #include "node.h"

atom/common/platform_util_linux.cc

@@ -15,7 +15,7 @@
 #include "url/gurl.h"
 
 #define ELECTRON_TRASH "ELECTRON_TRASH"
-#define ELECTRON_DEFAULT_TRASH "gvfs-trash"
+#define ELECTRON_DEFAULT_TRASH "gio"
 
 namespace {
 
@@ -125,12 +125,13 @@ bool MoveItemToTrash(const base::FilePath& full_path) {
   } else if (trash.compare("trash-cli") == 0) {
     argv.push_back("trash-put");
     argv.push_back(full_path.value());
-  } else if (trash.compare("gio") == 0) {
-    argv.push_back("gio");
-    argv.push_back("trash");
+  } else if (trash.compare("gvfs-trash") == 0) {
+    // retain support for deprecated gvfs-trash
+    argv.push_back("gvfs-trash");
     argv.push_back(full_path.value());
   } else {
     argv.push_back(ELECTRON_DEFAULT_TRASH);
+    argv.push_back("trash");
     argv.push_back(full_path.value());
   }
   return XDGUtilV(argv, true);

brightray/browser/inspectable_web_contents_impl.cc

@@ -514,8 +514,9 @@ void InspectableWebContentsImpl::ShowItemInFolder(
     const std::string& file_system_path) {
   if (file_system_path.empty())
     return;
+
   base::FilePath path = base::FilePath::FromUTF8Unsafe(file_system_path);
-  platform_util::ShowItemInFolder(path);
+  platform_util::OpenItem(path);
 }
 
 void InspectableWebContentsImpl::SaveToFile(const std::string& url,

build/zip.py

@@ -13,6 +13,11 @@ PATHS_TO_SKIP = [
   'swiftshader', #Skipping because it is an output of //ui/gl that we don't need
   './libVkLayer_', #Skipping because these are outputs that we don't need
   './VkLayerLayer_', #Skipping because these are outputs that we don't need
+
+  # //chrome/browser:resources depends on this via
+  # //chrome/browser/resources/ssl/ssl_error_assistant, but we don't need to
+  # ship it.
+  'pyproto',
 ]
 
 def skip_path(dep):

docs/api/app.md

@@ -398,6 +398,30 @@ non-minimized.
 This event is guaranteed to be emitted after the `ready` event of `app`
 gets emitted.
 
+### Event: 'remote-require'
+
+Returns:
+
+* `event` Event
+* `webContents` [WebContents](web-contents.md)
+* `moduleName` String
+
+Emitted when `remote.require()` is called in the renderer process of `webContents`.
+Calling `event.preventDefault()` will prevent the module from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
+### Event: 'remote-get-global'
+
+Returns:
+
+* `event` Event
+* `webContents` [WebContents](web-contents.md)
+* `globalName` String
+
+Emitted when `remote.getGlobal()` is called in the renderer process of `webContents`.
+Calling `event.preventDefault()` will prevent the global from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
 ## Methods
 
 The `app` object has the following methods:

docs/api/breaking-changes.md

@@ -35,7 +35,7 @@ app.makeSingleInstance(function (argv, cwd) {
 })
 // Replace with
 app.requestSingleInstanceLock()
-app.on('second-instance', function (argv, cwd) {
+app.on('second-instance', function (event, argv, cwd) {
 
 })
 ```

docs/api/environment-variables.md

@@ -80,6 +80,16 @@ Don't attach to the current console session.
 
 Don't use the global menu bar on Linux.
 
+### `ELECTRON_TRASH` _Linux_
+
+Set the trash implementation on Linux. Default is `gio`.
+
+Options:
+* `gvfs-trash`
+* `trash-cli`
+* `kioclient5`
+* `kioclient`
+
 ## Development Variables
 
 The following environment variables are intended primarily for development and

docs/api/frameless-window.md

@@ -21,11 +21,10 @@ win.show()
 
 ### Alternatives on macOS
 
-On macOS 10.9 Mavericks and newer, there's an alternative way to specify
-a chromeless window. Instead of setting `frame` to `false` which disables
-both the titlebar and window controls, you may want to have the title bar
-hidden and your content extend to the full window size, yet still preserve
-the window controls ("traffic lights") for standard window actions.
+There's an alternative way to specify a chromeless window.
+Instead of setting `frame` to `false` which disables both the titlebar and window controls,
+you may want to have the title bar hidden and your content extend to the full window size,
+yet still preserve the window controls ("traffic lights") for standard window actions.
 You can do so by specifying the `titleBarStyle` option:
 
 #### `hidden`

docs/api/ipc-renderer.md

@@ -74,13 +74,13 @@ and replies by setting `event.returnValue`.
 **Note:** Sending a synchronous message will block the whole renderer process,
 unless you know what you are doing you should never use it.
 
-### `ipcRenderer.sendTo(windowId, channel, [, arg1][, arg2][, ...])`
+### `ipcRenderer.sendTo(webContentsId, channel, [, arg1][, arg2][, ...])`
 
-* `windowId` Number
+* `webContentsId` Number
 * `channel` String
 * `...args` any[]
 
-Sends a message to a window with `windowid` via `channel`.
+Sends a message to a window with `webContentsId` via `channel`.
 
 ### `ipcRenderer.sendToHost(channel[, arg1][, arg2][, ...])`
 

docs/api/menu-item.md

@@ -108,6 +108,8 @@ When specifying a `role` on macOS, `label` and `accelerator` are the only
 options that will affect the menu item. All other options will be ignored.
 Lowercase `role`, e.g. `toggledevtools`, is still supported.
 
+**Nota Bene:** The `enabled` and `visibility` properties are not available for top-level menu items in the tray on MacOS.
+
 ### Instance Properties
 
 The following properties are available on instances of `MenuItem`:

docs/api/protocol.md

@@ -169,6 +169,7 @@ should be called with either a `String` or an object that has the `data`,
 * `handler` Function
   * `request` Object
     * `url` String
+    * `headers` Object
     * `referrer` String
     * `method` String
     * `uploadData` [UploadData[]](structures/upload-data.md)
@@ -329,6 +330,7 @@ which sends a `Buffer` as a response.
 * `handler` Function
   * `request` Object
     * `url` String
+    * `headers` Object
     * `referrer` String
     * `method` String
     * `uploadData` [UploadData[]](structures/upload-data.md)

docs/api/system-preferences.md

@@ -83,6 +83,8 @@ that contains the user information dictionary sent along with the notification.
 * `callback` Function
   * `event` String
   * `userInfo` Object
+  
+Returns `Number` - The ID of this subscription
 
 Subscribes to native notifications of macOS, `callback` will be called with
 `callback(event, userInfo)` when the corresponding `event` happens. The
@@ -106,6 +108,8 @@ example values of `event` are:
 * `callback` Function
   * `event` String
   * `userInfo` Object
+  
+Returns `Number` - The ID of this subscription
 
 Same as `subscribeNotification`, but uses `NSNotificationCenter` for local defaults.
 This is necessary for events such as `NSUserDefaultsDidChangeNotification`.

docs/api/web-contents.md

@@ -663,6 +663,28 @@ Returns:
 Emitted when the associated window logs a console message. Will not be emitted
 for windows with *offscreen rendering* enabled.
 
+#### Event: 'remote-require'
+
+Returns:
+
+* `event` Event
+* `moduleName` String
+
+Emitted when `remote.require()` is called in the renderer process.
+Calling `event.preventDefault()` will prevent the module from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
+#### Event: 'remote-get-global'
+
+Returns:
+
+* `event` Event
+* `globalName` String
+
+Emitted when `remote.getGlobal()` is called in the renderer process.
+Calling `event.preventDefault()` will prevent the global from being returned.
+Custom value can be returned by setting `event.returnValue`.
+
 ### Instance Methods
 
 #### `contents.loadURL(url[, options])`
@@ -1084,7 +1106,7 @@ Use `page-break-before: always; ` CSS style to force to print to a new page.
 * `options` Object
   * `marginsType` Integer (optional) - Specifies the type of margins to use. Uses 0 for
     default margin, 1 for no margin, and 2 for minimum margin.
-  * `pageSize` String (optional) - Specify page size of the generated PDF. Can be `A3`,
+  * `pageSize` String | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
     `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`
     and `width` in microns.
   * `printBackground` Boolean (optional) - Whether to print CSS backgrounds.

docs/api/webview-tag.md

@@ -526,7 +526,7 @@ Prints `webview`'s web page. Same as `webContents.print([options])`.
 * `options` Object
   * `marginsType` Integer (optional) - Specifies the type of margins to use. Uses 0 for
     default margin, 1 for no margin, and 2 for minimum margin.
-  * `pageSize` String (optional) - Specify page size of the generated PDF. Can be `A3`,
+  * `pageSize` String | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
     `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`
     and `width` in microns.
   * `printBackground` Boolean (optional) - Whether to print CSS backgrounds.

docs/tutorial/development-environment.md

@@ -7,7 +7,7 @@ rudimentary understanding of your operating system's command line client.
 
 ## Setting up macOS
 
-> Electron supports Mac OS X 10.9 (and all versions named macOS) and up. Apple
+> Electron supports macOS 10.10 (Yosemite) and up. Apple
 does not allow running macOS in virtual machines unless the host computer is
 already an Apple computer, so if you find yourself in need of a Mac, consider
 using a cloud service that rents access to Macs (like [MacInCloud][macincloud]

docs/tutorial/support.md

@@ -61,7 +61,7 @@ Following platforms are supported by Electron:
 ### macOS
 
 Only 64bit binaries are provided for macOS, and the minimum macOS version
-supported is macOS 10.9.
+supported is macOS 10.10 (Yosemite).
 
 ### Windows
 
@@ -79,7 +79,7 @@ Ubuntu 12.04, the `armv7l` binary is built against ARM v7 with hard-float ABI an
 NEON for Debian Wheezy.
 
 [Until the release of Electron 2.0][arm-breaking-change], Electron will also
-continue to release the `armv7l` binary with a simple `arm` suffix. Both binaries 
+continue to release the `armv7l` binary with a simple `arm` suffix. Both binaries
 are identical.
 
 Whether the prebuilt binary can run on a distribution depends on whether the

filenames.gni

@@ -133,6 +133,7 @@ filenames = {
     "atom/browser/api/atom_api_dialog.cc",
     "atom/browser/api/atom_api_download_item.cc",
     "atom/browser/api/atom_api_download_item.h",
+    "atom/browser/api/atom_api_event.cc",
     "atom/browser/api/atom_api_global_shortcut.cc",
     "atom/browser/api/atom_api_global_shortcut.h",
     "atom/browser/api/atom_api_in_app_purchase.cc",

lib/browser/api/web-contents.js

@@ -336,6 +336,14 @@ WebContents.prototype._init = function () {
     })
   })
 
+  this.on('remote-require', (event, ...args) => {
+    app.emit('remote-require', event, this, ...args)
+  })
+
+  this.on('remote-get-global', (event, ...args) => {
+    app.emit('remote-get-global', event, this, ...args)
+  })
+
   deprecate.event(this, 'did-get-response-details', '-did-get-response-details')
   deprecate.event(this, 'did-get-redirect-request', '-did-get-redirect-request')
 

lib/browser/rpc-server.js

@@ -7,6 +7,7 @@ const fs = require('fs')
 const os = require('os')
 const path = require('path')
 const v8Util = process.atomBinding('v8_util')
+const eventBinding = process.atomBinding('event')
 
 const { isPromise } = electron
 
@@ -151,9 +152,10 @@ const throwRPCError = function (message) {
   throw error
 }
 
-const removeRemoteListenersAndLogWarning = (sender, meta, callIntoRenderer) => {
+const removeRemoteListenersAndLogWarning = (sender, callIntoRenderer) => {
+  const location = v8Util.getHiddenValue(callIntoRenderer, 'location')
   let message = `Attempting to call a function in a renderer window that has been closed or released.` +
-    `\nFunction provided here: ${meta.location}`
+    `\nFunction provided here: ${location}`
 
   if (sender instanceof EventEmitter) {
     const remoteEvents = sender.eventNames().filter((eventName) => {
@@ -213,14 +215,14 @@ const unwrapArgs = function (sender, contextId, args) {
           return rendererFunctions.get(objectId)
         }
 
-        const processId = sender.getProcessId()
         const callIntoRenderer = function (...args) {
-          if (!sender.isDestroyed() && processId === sender.getProcessId()) {
+          if (!sender.isDestroyed()) {
             sender._sendInternal('ELECTRON_RENDERER_CALLBACK', contextId, meta.id, valueToMeta(sender, contextId, args))
           } else {
-            removeRemoteListenersAndLogWarning(this, meta, callIntoRenderer)
+            removeRemoteListenersAndLogWarning(this, callIntoRenderer)
           }
         }
+        v8Util.setHiddenValue(callIntoRenderer, 'location', meta.location)
         Object.defineProperty(callIntoRenderer, 'length', { value: meta.length })
 
         v8Util.setRemoteCallbackFreer(callIntoRenderer, contextId, meta.id, sender)
@@ -280,16 +282,47 @@ const handleRemoteCommand = function (channel, handler) {
   })
 }
 
-handleRemoteCommand('ELECTRON_BROWSER_REQUIRE', function (event, contextId, module) {
-  return valueToMeta(event.sender, contextId, process.mainModule.require(module))
+handleRemoteCommand('ELECTRON_BROWSER_WRONG_CONTEXT_ERROR', function (event, contextId, passedContextId, id) {
+  const objectId = [passedContextId, id]
+  if (!rendererFunctions.has(objectId)) {
+    // Do nothing if the error has already been reported before.
+    return
+  }
+  removeRemoteListenersAndLogWarning(event.sender, rendererFunctions.get(objectId))
+})
+
+handleRemoteCommand('ELECTRON_BROWSER_REQUIRE', function (event, contextId, moduleName) {
+  const customEvent = eventBinding.createWithSender(event.sender)
+  event.sender.emit('remote-require', customEvent, moduleName)
+
+  if (customEvent.defaultPrevented) {
+    if (typeof customEvent.returnValue === 'undefined') {
+      throw new Error(`Invalid module: ${moduleName}`)
+    }
+  } else {
+    customEvent.returnValue = process.mainModule.require(moduleName)
+  }
+
+  return valueToMeta(event.sender, contextId, customEvent.returnValue)
 })
 
 handleRemoteCommand('ELECTRON_BROWSER_GET_BUILTIN', function (event, contextId, module) {
   return valueToMeta(event.sender, contextId, electron[module])
 })
 
-handleRemoteCommand('ELECTRON_BROWSER_GLOBAL', function (event, contextId, name) {
-  return valueToMeta(event.sender, contextId, global[name])
+handleRemoteCommand('ELECTRON_BROWSER_GLOBAL', function (event, contextId, globalName) {
+  const customEvent = eventBinding.createWithSender(event.sender)
+  event.sender.emit('remote-get-global', customEvent, globalName)
+
+  if (customEvent.defaultPrevented) {
+    if (typeof customEvent.returnValue === 'undefined') {
+      throw new Error(`Invalid global: ${globalName}`)
+    }
+  } else {
+    customEvent.returnValue = global[globalName]
+  }
+
+  return valueToMeta(event.sender, contextId, customEvent.returnValue)
 })
 
 handleRemoteCommand('ELECTRON_BROWSER_CURRENT_WINDOW', function (event, contextId) {

lib/common/asar.js

@@ -238,9 +238,9 @@
     }
 
     const { lstatSync } = fs
-    fs.lstatSync = pathArgument => {
+    fs.lstatSync = (pathArgument, options) => {
       const { isAsar, asarPath, filePath } = splitPath(pathArgument)
-      if (!isAsar) return lstatSync(pathArgument)
+      if (!isAsar) return lstatSync(pathArgument, options)
 
       const archive = getOrCreateArchive(asarPath)
       if (!archive) throw createError(AsarError.INVALID_ARCHIVE, { asarPath })
@@ -252,9 +252,13 @@
     }
 
     const { lstat } = fs
-    fs.lstat = (pathArgument, callback) => {
+    fs.lstat = function (pathArgument, options, callback) {
       const { isAsar, asarPath, filePath } = splitPath(pathArgument)
-      if (!isAsar) return lstat(pathArgument, callback)
+      if (typeof options === 'function') {
+        callback = options
+        options = {}
+      }
+      if (!isAsar) return lstat(pathArgument, options, callback)
 
       const archive = getOrCreateArchive(asarPath)
       if (!archive) {
@@ -275,25 +279,29 @@
     }
 
     const { statSync } = fs
-    fs.statSync = pathArgument => {
+    fs.statSync = (pathArgument, options) => {
       const { isAsar } = splitPath(pathArgument)
-      if (!isAsar) return statSync(pathArgument)
+      if (!isAsar) return statSync(pathArgument, options)
 
       // Do not distinguish links for now.
-      return fs.lstatSync(pathArgument)
+      return fs.lstatSync(pathArgument, options)
     }
 
     const { stat } = fs
-    fs.stat = (pathArgument, callback) => {
+    fs.stat = (pathArgument, options, callback) => {
       const { isAsar } = splitPath(pathArgument)
-      if (!isAsar) return stat(pathArgument, callback)
+      if (typeof options === 'function') {
+        callback = options
+        options = {}
+      }
+      if (!isAsar) return stat(pathArgument, options, callback)
 
       // Do not distinguish links for now.
-      process.nextTick(() => fs.lstat(pathArgument, callback))
+      process.nextTick(() => fs.lstat(pathArgument, options, callback))
     }
 
     const { realpathSync } = fs
-    fs.realpathSync = function (pathArgument) {
+    fs.realpathSync = function (pathArgument, options) {
       const { isAsar, asarPath, filePath } = splitPath(pathArgument)
       if (!isAsar) return realpathSync.apply(this, arguments)
 
@@ -307,10 +315,10 @@
         throw createError(AsarError.NOT_FOUND, { asarPath, filePath })
       }
 
-      return path.join(realpathSync(asarPath), fileRealPath)
+      return path.join(realpathSync(asarPath, options), fileRealPath)
     }
 
-    fs.realpathSync.native = function (pathArgument) {
+    fs.realpathSync.native = function (pathArgument, options) {
       const { isAsar, asarPath, filePath } = splitPath(pathArgument)
       if (!isAsar) return realpathSync.native.apply(this, arguments)
 
@@ -324,17 +332,17 @@
         throw createError(AsarError.NOT_FOUND, { asarPath, filePath })
       }
 
-      return path.join(realpathSync.native(asarPath), fileRealPath)
+      return path.join(realpathSync.native(asarPath, options), fileRealPath)
     }
 
     const { realpath } = fs
-    fs.realpath = function (pathArgument, cache, callback) {
+    fs.realpath = function (pathArgument, options, callback) {
       const { isAsar, asarPath, filePath } = splitPath(pathArgument)
       if (!isAsar) return realpath.apply(this, arguments)
 
-      if (typeof cache === 'function') {
-        callback = cache
-        cache = undefined
+      if (arguments.length < 3) {
+        callback = options
+        options = {}
       }
 
       const archive = getOrCreateArchive(asarPath)
@@ -351,7 +359,7 @@
         return
       }
 
-      realpath(asarPath, (error, archiveRealPath) => {
+      realpath(asarPath, options, (error, archiveRealPath) => {
         if (error === null) {
           const fullPath = path.join(archiveRealPath, fileRealPath)
           callback(null, fullPath)
@@ -361,13 +369,13 @@
       })
     }
 
-    fs.realpath.native = function (pathArgument, cache, callback) {
+    fs.realpath.native = function (pathArgument, options, callback) {
       const { isAsar, asarPath, filePath } = splitPath(pathArgument)
       if (!isAsar) return realpath.native.apply(this, arguments)
 
-      if (typeof cache === 'function') {
-        callback = cache
-        cache = undefined
+      if (arguments.length < 3) {
+        callback = options
+        options = {}
       }
 
       const archive = getOrCreateArchive(asarPath)
@@ -384,7 +392,7 @@
         return
       }
 
-      realpath.native(asarPath, (error, archiveRealPath) => {
+      realpath.native(asarPath, options, (error, archiveRealPath) => {
         if (error === null) {
           const fullPath = path.join(archiveRealPath, fileRealPath)
           callback(null, fullPath)
@@ -602,8 +610,12 @@
     }
 
     const { readdir } = fs
-    fs.readdir = function (pathArgument, callback) {
+    fs.readdir = function (pathArgument, options, callback) {
       const { isAsar, asarPath, filePath } = splitPath(pathArgument)
+      if (typeof options === 'function') {
+        callback = options
+        options = {}
+      }
       if (!isAsar) return readdir.apply(this, arguments)
 
       const archive = getOrCreateArchive(asarPath)
@@ -624,7 +636,7 @@
     }
 
     const { readdirSync } = fs
-    fs.readdirSync = function (pathArgument) {
+    fs.readdirSync = function (pathArgument, options) {
       const { isAsar, asarPath, filePath } = splitPath(pathArgument)
       if (!isAsar) return readdirSync.apply(this, arguments)
 
@@ -684,14 +696,12 @@
 
     // Calling mkdir for directory inside asar archive should throw ENOTDIR
     // error, but on Windows it throws ENOENT.
-    // This is to work around the recursive looping bug of mkdirp since it is
-    // widely used.
     if (process.platform === 'win32') {
       const { mkdir } = fs
-      fs.mkdir = (pathArgument, mode, callback) => {
-        if (typeof mode === 'function') {
-          callback = mode
-          mode = undefined
+      fs.mkdir = (pathArgument, options, callback) => {
+        if (typeof options === 'function') {
+          callback = options
+          options = {}
         }
 
         const { isAsar, filePath } = splitPath(pathArgument)
@@ -701,14 +711,14 @@
           return
         }
 
-        mkdir(pathArgument, mode, callback)
+        mkdir(pathArgument, options, callback)
       }
 
       const { mkdirSync } = fs
-      fs.mkdirSync = function (pathArgument, mode) {
+      fs.mkdirSync = function (pathArgument, options) {
         const { isAsar, filePath } = splitPath(pathArgument)
         if (isAsar && filePath.length) throw createError(AsarError.NOT_DIR)
-        return mkdirSync(pathArgument, mode)
+        return mkdirSync(pathArgument, options)
       }
     }
 

lib/renderer/api/remote.js

@@ -270,9 +270,12 @@ function metaToPlainObject (meta) {
 }
 
 function handleMessage (channel, handler) {
-  ipcRenderer.on(channel, (event, passedContextId, ...args) => {
+  ipcRenderer.on(channel, (event, passedContextId, id, ...args) => {
     if (passedContextId === contextId) {
-      handler(...args)
+      handler(id, ...args)
+    } else {
+      // Message sent to an un-exist context, notify the error to main process.
+      ipcRenderer.send('ELECTRON_BROWSER_WRONG_CONTEXT_ERROR', contextId, passedContextId, id)
     }
   })
 }

lib/renderer/chrome-api.js

@@ -43,12 +43,12 @@ class Port {
   disconnect () {
     if (this.disconnected) return
 
-    ipcRenderer._sendInternalToAll(this.tabId, `CHROME_PORT_DISCONNECT_${this.portId}`)
+    ipcRenderer.sendToAll(this.tabId, `CHROME_PORT_DISCONNECT_${this.portId}`)
     this._onDisconnect()
   }
 
   postMessage (message) {
-    ipcRenderer._sendInternalToAll(this.tabId, `CHROME_PORT_POSTMESSAGE_${this.portId}`, message)
+    ipcRenderer.sendToAll(this.tabId, `CHROME_PORT_POSTMESSAGE_${this.portId}`, message)
   }
 
   _onDisconnect () {

lib/renderer/inspector.js

@@ -4,10 +4,19 @@ window.onload = function () {
   // Use menu API to show context menu.
   window.InspectorFrontendHost.showContextMenuAtPoint = createMenu
 
+  // correct for Chromium returning undefined for filesystem
+  window.Persistence.FileSystemWorkspaceBinding.completeURL = completeURL
+
   // Use dialog API to override file chooser dialog.
   window.UI.createFileSelectorElement = createFileSelectorElement
 }
 
+// Extra / is needed as a result of MacOS requiring absolute paths
+function completeURL (project, path) {
+  project = 'file:///'
+  return `${project}${path}`
+}
+
 window.confirm = function (message, title) {
   const { dialog } = require('electron').remote
   if (title == null) {

npm/cli.js

@@ -4,7 +4,7 @@ var electron = require('./')
 
 var proc = require('child_process')
 
-var child = proc.spawn(electron, process.argv.slice(2), { stdio: 'inherit' })
+var child = proc.spawn(electron, process.argv.slice(2), { stdio: 'inherit', windowsHide: false })
 child.on('close', function (code) {
   process.exit(code)
 })

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.7",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "4.0.0-beta.5",
+  "version": "4.0.0-beta.7",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {

patches/common/boringssl/.patches

@@ -0,0 +1 @@
+implement-SSL_get_tlsext_status_type.patch

patches/common/boringssl/.patches.yaml

@@ -1,8 +0,0 @@
-repo: src/third_party/boringssl/src
-patches:
--
-  author: Aleksei Kuzmin <alkuzmin@microsoft.com>
-  file: implement-SSL_get_tlsext_status_type.patch
-  description: |
-    BoringSSL doesn't implement `SSL_get_tlsext_status_type()`,
-    but Node.js expects it to be present cause OpenSSL has it.

patches/common/boringssl/implement-SSL_get_tlsext_status_type.patch

@@ -1,8 +1,16 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aleksei Kuzmin <alkuzmin@microsoft.com>
+Date: Mon, 22 Oct 2018 10:46:33 -0700
+Subject: implement-SSL_get_tlsext_status_type.patch
+
+BoringSSL doesn't implement `SSL_get_tlsext_status_type()`,
+but Node.js expects it to be present cause OpenSSL has it.
+
 diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
-index d04390df..0b8677ce 100644
+index f693030a8a7c4bf79dd791e1abd0e94f8e97a292..59c1881b34289401e6c998cd266cb1e2fb8f7cc9 100644
 --- a/include/openssl/ssl.h
 +++ b/include/openssl/ssl.h
-@@ -4120,6 +4120,8 @@ extern "C++" OPENSSL_EXPORT void SSL_CTX_sess_set_get_cb(
+@@ -4293,6 +4293,8 @@ OPENSSL_EXPORT int OPENSSL_init_ssl(uint64_t opts,
  // Use |SSL_enable_ocsp_stapling| instead.
  OPENSSL_EXPORT int SSL_set_tlsext_status_type(SSL *ssl, int type);
  
@@ -12,10 +20,10 @@ index d04390df..0b8677ce 100644
  // success and zero on error. On success, |ssl| takes ownership of |resp|, which
  // must have been allocated by |OPENSSL_malloc|.
 diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
-index 0c004fd4..6c849b5b 100644
+index c68968a514b76717d4c42448ef4b9c440c330fb2..c82ffeaa37268e54c6b142b31706d478ba93ff63 100644
 --- a/ssl/ssl_lib.cc
 +++ b/ssl/ssl_lib.cc
-@@ -2723,6 +2723,14 @@ int SSL_set_tlsext_status_type(SSL *ssl, int type) {
+@@ -2896,6 +2896,14 @@ int SSL_set_tlsext_status_type(SSL *ssl, int type) {
    return 1;
  }
  

patches/common/chromium/.patches

@@ -0,0 +1,81 @@
+add_realloc.patch
+build_gn.patch
+dcheck.patch
+accelerator.patch
+allow_new_privs.patch
+app_indicator_icon_menu.patch
+blink_file_path.patch
+blink_local_frame.patch
+blink_world_context.patch
+browser_compositor_mac.patch
+browser_plugin_wheel.patch
+build_toolchain_win_patch.patch
+can_create_window.patch
+compositor_delegate.patch
+desktop_screen_win.patch
+disable_hidden.patch
+dom_storage_map.patch
+frame_host_manager.patch
+net_url_request_job.patch
+no_stack_dumping.patch
+out_of_process_instance.patch
+render_widget_host_view_base.patch
+render_widget_host_view_mac.patch
+scoped_clipboard_writer.patch
+stream_resource_handler.patch
+thread_capabilities.patch
+use_transparent_window.patch
+web_contents.patch
+webgl_context_attributes.patch
+webview_cross_drag.patch
+worker_context_will_destroy.patch
+webui_in_subframes.patch
+statically_build_power_save_blocker.patch
+browser_plugin_guest.patch
+disable_user_gesture_requirement_for_beforeunload_dialogs.patch
+add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch
+gin_enable_disable_v8_platform.patch
+blink-worker-enable-csp-in-file-scheme.patch
+disable-redraw-lock.patch
+v8_context_snapshot_generator.patch
+boringssl_build_gn.patch
+pepper_flash.patch
+no_cache_storage_check.patch
+blink_fix_prototype_assert.patch
+disable_scroll_begin_dcheck.patch
+libgtkui_export.patch
+gtk_visibility.patch
+sysroot.patch
+mas_blink_no_private_api.patch
+mas_no_private_api.patch
+resource_file_conflict.patch
+scroll_bounce_flag.patch
+webview_reattach.patch
+mas-cfisobjc.patch
+mas-cgdisplayusesforcetogray.patch
+mas-audiodeviceduck.patch
+mas-lssetapplicationlaunchservicesserverconnectionstatus.patch
+allow_webview_file_url.patch
+windows_cc_wrapper.patch
+enable_osr_components.patch
+ignore_rc_check.patch
+enable_widevine.patch
+chrome_key_systems.patch
+allow_nested_error_trackers.patch
+blink_initialization_order.patch
+disable_detach_webview_frame.patch
+ssl_security_state_tab_helper.patch
+leveldb_ssize_t.patch
+exclude-a-few-test-files-from-build.patch
+disable_extensions_gn.patch
+crashpad_http_status.patch
+expose-net-observer-api.patch
+desktop_media_list.patch
+proxy_config_monitor.patch
+gritsettings_resource_ids.patch
+isolate_holder.patch
+notification_provenance.patch
+content_browser_main_loop.patch
+dump_syms.patch
+web_preferences.patch
+verbose_generate_breakpad_symbols.patch

patches/common/chromium/.patches.yaml

@@ -1,502 +0,0 @@
-repo: src
-patches:
--
-  author: Shelley Vohr <shelley.vohr@gmail.com>
-  file: add_realloc.patch
-  description: |
-    Blink overrides ArrayBuffer's allocator with its own one, while Node simply
-    uses malloc and free, so we need to use v8's allocator in Node. As part of the
-    10.6.0 upgrade, we needed to make SerializerDelegate accept an allocator
-    argument in its constructor, and override ReallocateBufferMemory and
-    FreeBufferMemory to use the allocator. We cannot simply allocate and then memcpy
-    when we override ReallocateBufferMemory, so we therefore need to implement
-    Realloc on the v8 side and correspondingly in gin.
--
-  author: Ales Pergl <alpergl@microsoft.com>
-  file: build_gn.patch
-  description: null
--
-  author: deepak1556 <hop2deep@gmail.com>
-  file: dcheck.patch
-  description: |
-    This disables some debug checks which currently fail when running the Electron
-    test suite. In general there should be sustained effort to have all debug checks
-    enabled. If you want to help, choose one of the diffs below and remove it. Then
-    build Electron (debug configuration) and make sure all tests pass on the CI
-    systems. Unfortunately the tests don't always cover the check failures, so it's
-    good to also run some non-trivial Electron app to verify.
-
-    Apart from getting rid of a whole diff, you may also be able to replace one diff
-    with another which enables at least some of the previously disabled checks. For
-    example, the checks might be disabled for a whole build target, but actually
-    only one or two specific checks fail. Then it's better to simply comment out the
-    failing checks and allow the rest of the target to have them enabled.
-
-    Please keep the following lists updated.
-
-    The ELECTRON_NO_DCHECK build flag disables debug checks universally.
-    This patch applies the flag to the following GN targets:
-
-      third_party/blink/renderer/core/loader:loader
-      url:url
-
-    These files have debug checks explicitly commented out:
-
-      base/process/kill_win.cc
-      components/viz/service/display/program_binding.h
-      content/browser/frame_host/navigation_controller_impl.cc
-      content/browser/frame_host/render_frame_host_impl.cc
-      content/browser/renderer_host/render_widget_host_view_mac.mm
-      ppapi/host/ppapi_host.cc
-      third_party/blink/renderer/core/dom/node.cc
-      third_party/blink/renderer/platform/wtf/text/string_impl.cc
-      ui/base/clipboard/clipboard_win.cc
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: accelerator.patch
-  description: null
--
-  author: Ales Pergl <alpergl@microsoft.com>
-  file: allow_new_privs.patch
-  description: null
--
-  author: null
-  file: app_indicator_icon_menu.patch
-  description: null
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: blink_file_path.patch
-  description: null
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: blink_local_frame.patch
-  description: |
-    According to electron/electron#3699, it is unreliable to use |unload|
-    event for process.exit('exit'), so we have to do that in
-    willReleaseScriptContext.
-
-    However Chromium then disallowed scripting in willReleaseScriptContext
-    in https://codereview.chromium.org/1657583002, and crash will happen
-    when there is code doing that.
-
-    This patch reverts the change to fix the crash in Electron.
--
-  author: null
-  file: blink_world_context.patch
-  description: null
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: browser_compositor_mac.patch
-  description: null
--
-  author: null
-  file: browser_plugin_wheel.patch
-  description: null
--
-  author: null
-  file: build_toolchain_win_patch.patch
-  description: |
-    Patch the Windows build toolchain to generate unique PDB names
-
-    When the PDB files generated by the `static_library` build are
-    packaged for distribution they are all copied to a single folder,
-    some of the PDB files have identical names so they end up
-    overwriting each other. The missing PDB files cause linker warnings
-    when building Electron in Release mode, and make it more difficult
-    to debug release builds.
-
-    This patch modifies the PDB naming convention for the
-    `static_library` build configuration to ensure PDB names are unique.
-    For example, instead of generating `obj/ui/base/base_cc.pdb` the
-    build will now generate `obj/ui/base/obj_ui_base_base_cc.pdb`.
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: can_create_window.patch
-  description: null
--
-  author: null
-  file: compositor_delegate.patch
-  description: null
--
-  author: null
-  file: desktop_screen_win.patch
-  description: null
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: disable_hidden.patch
-  description: null
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: dom_storage_map.patch
-  description: null
--
-  author: deepak1556 <hop2deep@gmail.com>
-  file: frame_host_manager.patch
-  description: null
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: net_url_request_job.patch
-  description: null
--
-  author: Aleksei Kuzmin <alkuzmin@microsoft.com>
-  file: no_stack_dumping.patch
-  description: null
--
-  author: deepak1556 <hop2deep@gmail.com>
-  file: out_of_process_instance.patch
-  description: null
--
-  author: null
-  file: render_widget_host_view_base.patch
-  description: null
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: render_widget_host_view_mac.patch
-  description: null
--
-  author: null
-  file: scoped_clipboard_writer.patch
-  description: null
--
-  author: deepak1556 <hop2deep@gmail.com>
-  file: stream_resource_handler.patch
-  description: null
--
-  author: null
-  file: thread_capabilities.patch
-  description: |
-    Chromium automatically drops all capabilities of renderer threads in
-    Linux, which may cause issues in a context like Electron, where the main
-    and renderer threads are supposed to keep inherited permissions over the
-    system.
-
-    See https://github.com/atom/electron/issues/3666
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: use_transparent_window.patch
-  description: null
--
-  author: null
-  file: web_contents.patch
-  description: null
--
-  author: Milan Burda <milan.burda@gmail.com>
-  file: webgl_context_attributes.patch
-  description: null
--
-  author: null
-  file: webview_cross_drag.patch
-  description: null
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: worker_context_will_destroy.patch
-  description: null
--
-  author: null
-  file: webui_in_subframes.patch
-  description: null
--
-  author: Aleksei Kuzmin <alkuzmin@microsoft.com>
-  file: statically_build_power_save_blocker.patch
-  description: null
--
-  author: Tomas Rycl <torycl@microsoft.com>
-  file: browser_plugin_guest.patch
-  description: null
--
-  author: Aleksei Kuzmin <alkuzmin@microsoft.com>
-  file: disable_user_gesture_requirement_for_beforeunload_dialogs.patch
-  description: See https://github.com/electron/electron/issues/10754
--
-  author: Aleksei Kuzmin <alkuzmin@microsoft.com>
-  file: add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch
-  description: null
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: gin_enable_disable_v8_platform.patch
-  description: null
--
-  author: deepak1556 <hop2deep@gmail.com>
-  file: blink-worker-enable-csp-in-file-scheme.patch
-  description: null
--
-  author: Heilig Benedek <benecene@gmail.com>
-  file: disable-redraw-lock.patch
-  description:  |
-    Chromium uses a custom window titlebar implementation on Windows when DWM
-    is disabled (Windows 7 and earlier, non Aero theme). The native titlebar
-    sometimes painted over this custom titlebar, so a workaround was put in
-    place to lock redraws in reaction to certain events if DWM is disabled,
-    since the code assumes that in that case, the custom titlebar is painted.
-    Electron forces the use of the native titlebar, which the workaround doesn't
-    take into account, and still locks redraws, causing weird repainting issues
-    in electron (and other applications). This patch provides a way to disable
-    the redraw locking mechanism, which fixes these issues. The electron issue
-    can be found at https://github.com/electron/electron/issues/1821
--
-  author: Nitish Sakhawalkar <nitsakh@icloud.com>
-  file: v8_context_snapshot_generator.patch
-  description: |
-      v8_context_snapshot_generator is a build time executable.
-      The patch adds the config.
--
-  author: Jeremy Apthorp <nornagon@nornagon.net>
-  file: boringssl_build_gn.patch
-  description: |
-    Build BoringSSL with some extra functions that nodejs needs. Only affects
-    the GN build; with the GYP build, nodejs is still built with OpenSSL.
--
-  author: deepak1556 <hop2deep@gmail.com>
-  file: pepper_flash.patch
-  description: |
-    Allows building chrome pepper flash integration for Electron.
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: no_cache_storage_check.patch
-  description: |
-    Do not check for unique origin in CacheStorage, in Electron we may have
-    scripts running without an origin.
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: blink_fix_prototype_assert.patch
-  description: |
-    A recent Chromium change has accidentally added assertion for the case when
-    a new window object may not have a prototype attached. In Electron it may
-    happen when preventDefault for a native new-window event.
-    https://chromium.googlesource.com/chromium/src/+/f47b361887a31cccf42a6e21a82bccf28372bdaa%5E%21
-    In the long term we should investigate why it happened, and take a more
-    formal fix. But for now I'm just make this assertion silently pass away.
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: disable_scroll_begin_dcheck.patch
-  description: |
-    When testing https://github.com/electron/electron/issues/13137 I have met
-    these assertions. I grouped them together since they are all related to the
-    ScrollBegin event.
--
-  author: Jeremy Apthorp <nornagon@nornagon.net>
-  file: libgtkui_export.patch
-  description: |
-    Export libgtkui symbols for the GN component build.
--
-  author: Jeremy Apthorp <nornagon@nornagon.net>
-  file: gtk_visibility.patch
-  description: |
-    Allow electron and brightray to depend on GTK in the GN build.
--
-  author: Jeremy Apthorp <nornagon@nornagon.net>
-  file: sysroot.patch
-  description: |
-    Make chrome's install-sysroot scripts point to our custom sysroot builds,
-    which include extra deps that Electron needs (e.g. libnotify)
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: mas_blink_no_private_api.patch
-  description: |
-    Guard usages in chromium code of private Mac APIs by MAS_BUILD, so they can
-    be excluded for people who want to submit their apps to the Mac App store.
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: mas_no_private_api.patch
-  description: |
-    Guard usages in blink of private Mac APIs by MAS_BUILD, so they can be
-    excluded for people who want to submit their apps to the Mac App store.
--
-  author: Jeremy Apthorp <nornagon@nornagon.net>
-  file: resource_file_conflict.patch
-  description: |
-    Resolve conflict between //chrome's .pak files and //electron's. The paths
-    that chrome code hardcodes require that we generate resources at these
-    paths, but GN throws errors if there are multiple targets that generate the
-    same files.
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: scroll_bounce_flag.patch
-  description: |
-    Patch to make scrollBounce option work.
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: webview_reattach.patch
-  description: |
-    Backports https://chromium-review.googlesource.com/c/chromium/src/+/1161391
-    Fixes webview not working after renderer process restarted.
--
-  author: Jeremy Apthorp <nornagon@nornagon.net>
-  file: mas-cfisobjc.patch
-  description: |
-    Removes usage of the _CFIsObjC private API.
--
-  author: Jeremy Apthorp <nornagon@nornagon.net>
-  file: mas-cgdisplayusesforcetogray.patch
-  description: |
-    Removes usage of the CGDisplayUsesForceToGray private API.
--
-  author: Jeremy Apthorp <nornagon@nornagon.net>
-  file: mas-audiodeviceduck.patch
-  description: |
-    Removes usage of the AudioDeviceDuck private API.
--
-  author: Jeremy Apthorp <nornagon@nornagon.net>
-  file: mas-lssetapplicationlaunchservicesserverconnectionstatus.patch
-  description: |
-    Removes usage of the _LSSetApplicationLaunchServicesServerConnectionStatus
-    private API.
--
-  author: Cheng Zhao <zcbenz@gmail.com>
-  file: allow_webview_file_url.patch
-  description: |
-    Allow webview to load non-web URLs.
--
-  author: John Kleinschmidt <jkleinsc@github.com>
-  file: windows_cc_wrapper.patch
-  description: |
-    Allow use of cc_wrapper (eg sccache).
--
-  author: Shelley Vohr <shelley.vohr@gmail.com>
-  file: enable_osr_components.patch
-  description: |
-    Add MouseWheelPhaseHandler for OSR.
--
-  author: Zac Walker <zac.walker@microsoft.com>
-  file: ignore_rc_check.patch
-  description: |
-    Dont compare RC.exe and RC.py output.
-    FIXME: It has to be reverted once the script is fixed.
--
-  author: Aleksei Kuzmin <alkuzmin@microsoft.com>
-  file: enable_widevine.patch
-  description: |
-    Turns `enable_widevine` flag on by default on Mac and Windows.
-    Electron needs that flag to be enabled on those paltforms,
-    but there's no way to conditionally set it during a `gn gen` call.
--
-  author: deepak1556 <hop2deep@gmail.com>
-  file: chrome_key_systems.patch
-  description: |
-    Disable persiste licence support check for widevine cdm,
-    as its not supported in the current version of chrome.
--
-  author: Charles Kerr <charles@charleskerr.com>
-  file: allow_nested_error_trackers.patch
-  description: |
-    Only one X11ErrorTracker should exist at a time, but upstream has a bug
-    where two can exist if running in headless mode -- 
-      ui::(anonymous namespace)::SupportsEWMH() [inner tracker is created]
-      ui::WmSupportsHint()
-      ui::IsX11WindowFullScreen()
-      ui::ScreensaverWindowFinder::IsScreensaverWindow()
-      ui::ScreensaverWindowFinder::ShouldStopIterating()
-      ui::EnumerateTopLevelWindows()
-      ui::ScreensaverWindowFinder::ScreensaverWindowExists() [outer tracker created]
-      ui::CheckIdleStateIsLocked()
-      ui::CalculateIdleState()
-    Removal of either tracker could have side-effects in some code paths,
-    so this is probably better handled upstream. This patch tries to do the
-    least harm in the interim by removing the check that prevents more than
-    one tracker from existing at a time.
--
-  author: Samuel Attard <samuel.r.attard@gmail.com>
-  file: blink_initialization_order.patch
-  description: |
-    Backport of https://chromium-review.googlesource.com/c/chromium/src/+/1030530
-    to fix the order of V8 and Blink initialization.  Also fixes order
-    of DidCreateScriptContext notification with initialization of window globals
-    to fix electron/electron#13787.  The backport landed in Chromium 67 but the
-    DidCreateScriptContext re-ordering needs to be upstreamed or kept indefinitely
--
-  author: zcbenz <zcbenz@gmail.com>
-  file: disable_detach_webview_frame.patch
-  description: |
-    Don't detach the frame for webview, we will manage the WebContents
-    manually.
-    This is part of the fixes for https://github.com/electron/electron/issues/14211.
-    We should revisit this bug after upgrading to newer versions of Chrome,
-    this patch was introduced in Chrome 66.
--
-  author: deepak1556 <hop2deep@gmail.com>
-  file: ssl_security_state_tab_helper.patch
-  description: |
-    Allows populating security tab info for devtools in Electron.
--
-  author: Jeremy Apthorp <jeremya@chromium.org>
-  file: leveldb_ssize_t.patch
-  description: |
-    Fix conflict between leveldb & node's definition of ssize_t on
-    Windows by preventing leveldb from re-defining the type if it's
-    already defined.
--
-  author: Aleksei Kuzmin <alkuzmin@microsoft.com>
-  file: exclude-a-few-test-files-from-build.patch
-  description: |
-    Compilation of those files fails with the Chromium 68.
-    Remove the patch during the Chromium 69 upgrade.
--
-  author: deepak1556 <hop2deep@gmail.com>
-  file: disable_extensions_gn.patch
-  description: |
-    Fix build files generation when chrome extensions are disabled.
--
-  author: Jeremy Apthorp <nornagon@nornagon.net>
-  file: crashpad_http_status.patch
-  description: backport of crashpad f540abb506
--
-  author: Jeremy Apthorp <jeremya@chromium.org>
-  file: expose-net-observer-api.patch
-  description: |
-    Expose URLRequestContextGetter::{Add,Remove}Observer.
-    This patch should be removed once we switch to using the net service (cc @robo)
--
-  author: deepak1556 <hop2deep@gmail.com>
-  file: desktop_media_list.patch
-  description: |
-    * Adds a new observer method to DesktopMediaListObserver for
-      desktop capture api.
-    * Backports https://chromium-review.googlesource.com/c/chromium/src/+/1199806
-      that fixes crash with screen capturer, can be removed in 71.0.3539.0
--
-  author: deepak1556 <hop2deep@gmail.com>
-  file: proxy_config_monitor.patch
-  description: |
-    Allow monitoring proxy config changes for a pref service.
--
-  author: deepak1556 <hop2deep@gmail.com>
-  file: gritsettings_resource_ids.patch
-  description: |
-    Add electron resources file to the list of resource ids generation.
--
-  author: Samuel Attard <samuel.r.attard@gmail.com>
-  file: isolate_holder.patch
-  description: |
-    Pass pre allocated isolate for initialization, node platform
-    needs to register on an isolate so that it can be used later
-    down in the initialization process of an isolate.
--
-  author: Jeremy Apthorp <jeremya@chromium.org>
-  file: notification_provenance.patch
-  description: |
-    Pass RenderProcessHost through to PlatformNotificationService.
-
-    This is so Electron can identify which renderer a notification came from.
--
-  author: deepak1556 <hop2deep@gmail.com>
-  file: content_browser_main_loop.patch
-  description: |
-    Pass idle quit closure for main message loop, so that pending tasks are
-    run before shutdown. This is required to cleanup WebContents asynchronously
-    in atom::CommonWebContentsDelegate::ResetManageWebContents.
--
-  author: Samuel Attard <samuel.r.attard@gmail.com>
-  file: dump_syms.patch
-  description: |
-    dylib currently fails to resolve Squirrel.framework on OSX, we need to fix
-    this but it is not a blocker for releasing Electron.  This patch removes
-    the hard fail on dylib resolve failure from dump_syms
--
-  author: zcbenz <zcbenz@gmail.com>
-  file: web_preferences.patch
-  description: |
-    Add a node_integration field to WebPreferences so we can determine whether
-    a frame has node integration in renderer process.
-
-    This is required by the nativeWindowOpen option, which put multiple main
-    frames in one renderer process.

patches/common/chromium/accelerator.patch

@@ -1,11 +1,11 @@
-From 61cd6b5bc2068a3740313d7f4680ef3fcaaacb1a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <zcbenz@gmail.com>
 Date: Thu, 4 Oct 2018 14:57:02 -0700
 Subject: accelerator.patch
 
 
 diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
-index 7e55ef366ac8..c3fb98b426cd 100644
+index 7e55ef366ac8320f730cdcb268453b1fa2710887..c3fb98b426cd7c12f66eaaf358f4ff184628bba1 100644
 --- a/ui/base/accelerators/accelerator.cc
 +++ b/ui/base/accelerators/accelerator.cc
 @@ -11,6 +11,7 @@
@@ -97,6 +97,3 @@ index 7e55ef366ac8..c3fb98b426cd 100644
    parts.push_back(base::string16(IsCmdDown() ? kCommandSymbol : kNoSymbol));
    parts.push_back(shortcut);
    return base::StrCat(parts);
--- 
-2.17.0
-

patches/common/chromium/add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch

@@ -1,11 +1,11 @@
-From e686584a3758c1954f31e107746b40c6a63ad776 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aleksei Kuzmin <alkuzmin@microsoft.com>
 Date: Thu, 20 Sep 2018 17:47:36 -0700
 Subject: add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch
 
 
 diff --git a/base/BUILD.gn b/base/BUILD.gn
-index 7fb93868d6e0..53c5744953da 100644
+index 7fb93868d6e009323eceb2ba0f1ff9c506dc5f3b..53c5744953da460c02b43de1bfd184cd92489167 100644
 --- a/base/BUILD.gn
 +++ b/base/BUILD.gn
 @@ -1248,7 +1248,7 @@ jumbo_component("base") {
@@ -17,6 +17,3 @@ index 7fb93868d6e0..53c5744953da 100644
        host_toolchain != "//build/toolchain/cros:host") {
      libs += [ "atomic" ]
    }
--- 
-2.17.0
-

patches/common/chromium/add_realloc.patch

@@ -1,4 +1,4 @@
-From 0e2864c50cb039dd2f8d9b9cc88ae26f5bd62581 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Shelley Vohr <shelley.vohr@gmail.com>
 Date: Thu, 20 Sep 2018 17:44:26 -0700
 Subject: add_realloc.patch
@@ -12,7 +12,7 @@ when we override ReallocateBufferMemory, so we therefore need to implement
 Realloc on the v8 side and correspondingly in gin.
 
 diff --git a/gin/array_buffer.cc b/gin/array_buffer.cc
-index f84934bfd712..fc23fef68b6f 100644
+index f84934bfd712dbad0e85d908165a5a4033bff170..fc23fef68b6fb9a4cccdf99bc427078faed2f62e 100644
 --- a/gin/array_buffer.cc
 +++ b/gin/array_buffer.cc
 @@ -43,6 +43,10 @@ void* ArrayBufferAllocator::AllocateUninitialized(size_t length) {
@@ -27,7 +27,7 @@ index f84934bfd712..fc23fef68b6f 100644
    free(data);
  }
 diff --git a/gin/array_buffer.h b/gin/array_buffer.h
-index 2aef366ac819..3c7d66c81032 100644
+index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f4ddb2de2 100644
 --- a/gin/array_buffer.h
 +++ b/gin/array_buffer.h
 @@ -21,6 +21,7 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
@@ -39,7 +39,7 @@ index 2aef366ac819..3c7d66c81032 100644
  
    GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
 diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
-index 83a6639306a9..8511e7d594ce 100644
+index 83a6639306a9a2c907b478a974628cc89e2de97c..8511e7d594ce5116f19619fa89115e24422e419c 100644
 --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
 @@ -665,6 +665,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
@@ -54,7 +54,7 @@ index 83a6639306a9..8511e7d594ce 100644
      WTF::ArrayBufferContents::FreeMemory(data);
    }
 diff --git a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc
-index 053babce1051..e33d6d4ceb5a 100644
+index 053babce10512d9967546f2e547f826c9ad1b158..e33d6d4ceb5a10ffbe853dc87cad8a1145992154 100644
 --- a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc
 +++ b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc
 @@ -121,6 +121,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size,
@@ -70,7 +70,7 @@ index 053babce1051..e33d6d4ceb5a 100644
    Partitions::ArrayBufferPartition()->Free(data);
  }
 diff --git a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
-index 809229caa872..6248ad32d6b0 100644
+index 809229caa872789345218538d945f3ed6a871adc..6248ad32d6b045fbd4c863cbdbeb859a3ecde3a5 100644
 --- a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
 +++ b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
 @@ -178,6 +178,7 @@ class WTF_EXPORT ArrayBufferContents {
@@ -81,6 +81,3 @@ index 809229caa872..6248ad32d6b0 100644
    static void FreeMemory(void*);
    static DataHandle CreateDataHandle(size_t, InitializationPolicy);
    static void Initialize(
--- 
-2.17.0
-

patches/common/chromium/allow_nested_error_trackers.patch

@@ -1,4 +1,4 @@
-From 602c08e90102a25894a4d48d236258cae6b982c6 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Charles Kerr <charles@charleskerr.com>
 Date: Thu, 20 Sep 2018 17:50:17 -0700
 Subject: allow_nested_error_trackers.patch
@@ -20,7 +20,7 @@ least harm in the interim by removing the check that prevents more than
 one tracker from existing at a time.
 
 diff --git a/ui/gfx/x/x11_error_tracker.cc b/ui/gfx/x/x11_error_tracker.cc
-index af031de356c5..2a5c18dc473a 100644
+index af031de356c5e0938fd3b84a494e48dc9a0e0476..2a5c18dc473a4f88fc0427bec69142917159bbd9 100644
 --- a/ui/gfx/x/x11_error_tracker.cc
 +++ b/ui/gfx/x/x11_error_tracker.cc
 @@ -24,7 +24,7 @@ namespace gfx {
@@ -32,6 +32,3 @@ index af031de356c5..2a5c18dc473a 100644
    g_handler = this;
    XSync(GetXDisplay(), False);
    old_handler_ = XSetErrorHandler(X11ErrorHandler);
--- 
-2.17.0
-

patches/common/chromium/allow_new_privs.patch

@@ -17,6 +17,3 @@ index 7a2def2ef436..50afeaf5553a 100644
  
    // Sets parent process death signal to SIGKILL.
    bool kill_on_parent_death = false;
--- 
-2.17.0
-

patches/common/chromium/allow_webview_file_url.patch

@@ -1,4 +1,4 @@
-From 0556b9d98cbc0b786e0a47681bea1593b65660a7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <zcbenz@gmail.com>
 Date: Thu, 20 Sep 2018 17:49:42 -0700
 Subject: allow_webview_file_url.patch
@@ -6,7 +6,7 @@ Subject: allow_webview_file_url.patch
 Allow webview to load non-web URLs.
 
 diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
-index 061ad189c46d..d64ba4f20d49 100644
+index 061ad189c46d5f0f1afb09052cc21aeb7e60a744..d64ba4f20d49a57b29e1ad5bc7ac53616974efc9 100644
 --- a/content/browser/loader/resource_dispatcher_host_impl.cc
 +++ b/content/browser/loader/resource_dispatcher_host_impl.cc
 @@ -1488,6 +1488,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
@@ -18,6 +18,3 @@ index 061ad189c46d..d64ba4f20d49 100644
    if (is_shutdown_ || non_web_url_in_guest) {
      url_loader_client->OnComplete(
          network::URLLoaderCompletionStatus(net::ERR_ABORTED));
--- 
-2.17.0
-

patches/common/chromium/app_indicator_icon_menu.patch

@@ -1,11 +1,11 @@
-From acf81b764b448b2979792e5d3d97f248030b49bc Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Anonymous <anonymous@electronjs.org>
 Date: Thu, 20 Sep 2018 17:44:52 -0700
 Subject: app_indicator_icon_menu.patch
 
 
 diff --git a/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc b/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc
-index 40399a35f8d2..1d3a0da948dc 100644
+index 40399a35f8d2c70827adec732c898a5be09cf69b..1d3a0da948dca3fef3af53256d23e8ae2bd23bfa 100644
 --- a/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc
 +++ b/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc
 @@ -116,7 +116,7 @@ void AppIndicatorIconMenu::OnMenuItemActivated(GtkWidget* menu_item) {
@@ -17,6 +17,3 @@ index 40399a35f8d2..1d3a0da948dc 100644
      ExecuteCommand(model, id);
  }
  
--- 
-2.17.0
-

patches/common/chromium/blink-worker-enable-csp-in-file-scheme.patch

@@ -1,11 +1,11 @@
-From 439ba549807dab957a49a3959dccded956fc1b6b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: deepak1556 <hop2deep@gmail.com>
 Date: Thu, 20 Sep 2018 17:47:47 -0700
 Subject: blink-worker-enable-csp-in-file-scheme.patch
 
 
 diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
-index 6e803af108f3..94a72b37ae8e 100644
+index 6e803af108f310b6df0ff0f3e2f0ddb0cce3cae3..94a72b37ae8ebf7f142b5dfdd02261220b6eeb99 100644
 --- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
 +++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
 @@ -244,7 +244,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
@@ -16,6 +16,3 @@ index 6e803af108f3..94a72b37ae8e 100644
        !response.Url().ProtocolIs("filesystem")) {
      content_security_policy_ = ContentSecurityPolicy::Create();
      content_security_policy_->SetOverrideURLForSelf(response.Url());
--- 
-2.17.0
-

patches/common/chromium/blink_file_path.patch

@@ -1,11 +1,11 @@
-From 50f9d1164c07306d128d9860be5a4891310ef495 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <zcbenz@gmail.com>
 Date: Thu, 20 Sep 2018 17:45:00 -0700
 Subject: blink_file_path.patch
 
 
 diff --git a/third_party/blink/renderer/core/fileapi/file.h b/third_party/blink/renderer/core/fileapi/file.h
-index 39831f1902c6..fddb013aa122 100644
+index 39831f1902c6ab85a0a4cac61a614931ee050ed6..fddb013aa122049de7142bca624d7d0749b58372 100644
 --- a/third_party/blink/renderer/core/fileapi/file.h
 +++ b/third_party/blink/renderer/core/fileapi/file.h
 @@ -168,6 +168,9 @@ class CORE_EXPORT File final : public Blob {
@@ -19,7 +19,7 @@ index 39831f1902c6..fddb013aa122 100644
    // http://dev.w3.org/2006/webapi/FileAPI/#file-attrs
    long long lastModified() const;
 diff --git a/third_party/blink/renderer/core/fileapi/file.idl b/third_party/blink/renderer/core/fileapi/file.idl
-index a74beceda3e7..7196fd5f5f9e 100644
+index a74beceda3e769aaf5673cabc6663bb883f54705..7196fd5f5f9e51616d49c09142247c8382e83cc0 100644
 --- a/third_party/blink/renderer/core/fileapi/file.idl
 +++ b/third_party/blink/renderer/core/fileapi/file.idl
 @@ -32,6 +32,7 @@
@@ -30,6 +30,3 @@ index a74beceda3e7..7196fd5f5f9e 100644
      readonly attribute long long lastModified;
  
      // Non-standard APIs
--- 
-2.17.0
-

patches/common/chromium/blink_fix_prototype_assert.patch

@@ -1,4 +1,4 @@
-From 3ac191f7b549fb23471d357294a84836520d7373 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <zcbenz@gmail.com>
 Date: Thu, 20 Sep 2018 17:48:19 -0700
 Subject: blink_fix_prototype_assert.patch
@@ -11,7 +11,7 @@ In the long term we should investigate why it happened, and take a more
 formal fix. But for now I'm just make this assertion silently pass away.
 
 diff --git a/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc b/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc
-index 87f2176ce897..ce3d9ce19bff 100644
+index 87f2176ce897583b6682e8f49d1e4cac1392aacb..ce3d9ce19bff686640be08776a7dc5736e9bd83a 100644
 --- a/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc
 +++ b/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc
 @@ -98,8 +98,10 @@ v8::Local<v8::Function> V8ObjectConstructor::CreateInterfaceObject(
@@ -27,6 +27,3 @@ index 87f2176ce897..ce3d9ce19bff 100644
  
      prototype_object = prototype_value.As<v8::Object>();
      if (prototype_object->InternalFieldCount() ==
--- 
-2.17.0
-

patches/common/chromium/blink_initialization_order.patch

@@ -1,4 +1,4 @@
-From d3439444d4aa219c6d3ebacb241bff165a76cf22 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Samuel Attard <samuel.r.attard@gmail.com>
 Date: Thu, 20 Sep 2018 17:50:24 -0700
 Subject: blink_initialization_order.patch
@@ -10,7 +10,7 @@ to fix electron/electron#13787.  The backport landed in Chromium 67 but the
 DidCreateScriptContext re-ordering needs to be upstreamed or kept indefinitely
 
 diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
-index cbd9f811d978..160e5bc7d57a 100644
+index cbd9f811d97855e8bf083cbb2dd9ebcbcab0a1a5..160e5bc7d57ad18619a4c912d57b6b07b790ddf5 100644
 --- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
 +++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
 @@ -177,11 +177,10 @@ void LocalWindowProxy::Initialize() {
@@ -26,6 +26,3 @@ index cbd9f811d978..160e5bc7d57a 100644
    if (World().IsMainWorld()) {
      GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
    }
--- 
-2.17.0
-

patches/common/chromium/blink_local_frame.patch

@@ -1,4 +1,4 @@
-From 791d604902bb958ca62522ce3a50aa496c3f713b Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <zcbenz@gmail.com>
 Date: Thu, 20 Sep 2018 17:45:03 -0700
 Subject: blink_local_frame.patch
@@ -14,7 +14,7 @@ when there is code doing that.
 This patch reverts the change to fix the crash in Electron.
 
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index 52810bba03b0..65575d432df5 100644
+index 52810bba03b0c2916ae84d5b1642740cc2d7a2e6..65575d432df5e8e27f8285dcf6dd77e48e2ea1ec 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
 @@ -392,10 +392,6 @@ void LocalFrame::Detach(FrameDetachType type) {
@@ -39,6 +39,3 @@ index 52810bba03b0..65575d432df5 100644
  
    // TODO(crbug.com/729196): Trace why LocalFrameView::DetachFromLayout crashes.
    CHECK(!view_->IsAttached());
--- 
-2.17.0
-

patches/common/chromium/blink_world_context.patch

@@ -1,11 +1,11 @@
-From 026d3f1ce69e4b94b5168422018c744103437e72 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Anonymous <anonymous@electronjs.org>
 Date: Thu, 20 Sep 2018 17:45:11 -0700
 Subject: blink_world_context.patch
 
 
 diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
-index 437e8b22c0f5..0ff6b21fd5a9 100644
+index 437e8b22c0f589df3eb41ba8628092c3146b1f8c..0ff6b21fd5a9e49254f283dcbab0b2be9668b296 100644
 --- a/third_party/blink/public/web/web_local_frame.h
 +++ b/third_party/blink/public/web/web_local_frame.h
 @@ -438,6 +438,9 @@ class WebLocalFrame : public WebFrame {
@@ -19,7 +19,7 @@ index 437e8b22c0f5..0ff6b21fd5a9 100644
    // that the script evaluated to with callback. Script execution can be
    // suspend.
 diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
-index 082b055a570c..345d97f888b5 100644
+index 082b055a570c9d6ec944b3310f54934e65fbe6a0..345d97f888b522c17c755f48e43e7a699ca78472 100644
 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
 +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
 @@ -874,6 +874,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
@@ -37,7 +37,7 @@ index 082b055a570c..345d97f888b5 100644
    return BindingSecurity::ShouldAllowAccessToFrame(
        CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
 diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
-index feb4b14bc8e5..95d1cc2c91ca 100644
+index feb4b14bc8e52c8335e93d133506ecd6226c051d..95d1cc2c91ca01ec95dc3f63aa5f2546a7074095 100644
 --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
 +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
 @@ -145,6 +145,8 @@ class CORE_EXPORT WebLocalFrameImpl final
@@ -49,6 +49,3 @@ index feb4b14bc8e5..95d1cc2c91ca 100644
    v8::Local<v8::Object> GlobalProxy() const override;
    void StartReload(WebFrameLoadType) override;
    void ReloadImage(const WebNode&) override;
--- 
-2.17.0
-

patches/common/chromium/boringssl_build_gn.patch

@@ -1,4 +1,4 @@
-From 1e77d2109d61aea5270d1026a7df5fb44e639568 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Apthorp <nornagon@nornagon.net>
 Date: Thu, 20 Sep 2018 17:48:05 -0700
 Subject: boringssl_build_gn.patch
@@ -7,7 +7,7 @@ Build BoringSSL with some extra functions that nodejs needs. Only affects
 the GN build; with the GYP build, nodejs is still built with OpenSSL.
 
 diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
-index d31a9f29fa9c..dea5a6403f4c 100644
+index d31a9f29fa9c12e753708b2a1e75c33b70924300..dea5a6403f4c32f94bb58198c467bc7cc87a8217 100644
 --- a/third_party/boringssl/BUILD.gn
 +++ b/third_party/boringssl/BUILD.gn
 @@ -46,6 +46,13 @@ config("no_asm_config") {
@@ -24,6 +24,3 @@ index d31a9f29fa9c..dea5a6403f4c 100644
  
  # Windows' assembly is built with Yasm. The other platforms use the platform
  # assembler.
--- 
-2.17.0
-

patches/common/chromium/browser_compositor_mac.patch

@@ -1,11 +1,11 @@
-From 4b6fd85950701d177879f3a239b19f08c9ff3a66 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <zcbenz@gmail.com>
 Date: Thu, 20 Sep 2018 17:45:14 -0700
 Subject: browser_compositor_mac.patch
 
 
 diff --git a/content/browser/renderer_host/browser_compositor_view_mac.h b/content/browser/renderer_host/browser_compositor_view_mac.h
-index 46be85eea4b5..4c816b7021f8 100644
+index 46be85eea4b52b191d9e717fd34408a6c2445199..4c816b7021f87873a524e0dc2384146193b86e3c 100644
 --- a/content/browser/renderer_host/browser_compositor_view_mac.h
 +++ b/content/browser/renderer_host/browser_compositor_view_mac.h
 @@ -59,6 +59,8 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient,
@@ -26,7 +26,7 @@ index 46be85eea4b5..4c816b7021f8 100644
        viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink);
    void OnDidNotProduceFrame(const viz::BeginFrameAck& ack);
 diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/content/browser/renderer_host/browser_compositor_view_mac.mm
-index 92afcc779106..42bd6fd7c169 100644
+index 92afcc77910610e53378f55adc003cc1bdf3109a..42bd6fd7c169de36c775471c68b456f1386ff666 100644
 --- a/content/browser/renderer_host/browser_compositor_view_mac.mm
 +++ b/content/browser/renderer_host/browser_compositor_view_mac.mm
 @@ -81,6 +81,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {
@@ -42,6 +42,3 @@ index 92afcc779106..42bd6fd7c169 100644
  DelegatedFrameHost* BrowserCompositorMac::GetDelegatedFrameHost() {
    DCHECK(delegated_frame_host_);
    return delegated_frame_host_.get();
--- 
-2.17.0
-

patches/common/chromium/browser_plugin_guest.patch

@@ -1,11 +1,11 @@
-From 402d52b4cf68772c493920f9e4977132918d9b48 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Tomas Rycl <torycl@microsoft.com>
 Date: Thu, 20 Sep 2018 17:47:25 -0700
 Subject: browser_plugin_guest.patch
 
 
 diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
-index f56ce93c3d5b..19c302c2714f 100644
+index f56ce93c3d5b1b46b706800a12a21f29cabafb33..19c302c2714fb8ce89b261dd44d9939d3345a803 100644
 --- a/content/browser/browser_plugin/browser_plugin_guest.cc
 +++ b/content/browser/browser_plugin/browser_plugin_guest.cc
 @@ -206,8 +206,11 @@ void BrowserPluginGuest::Init() {
@@ -22,6 +22,3 @@ index f56ce93c3d5b..19c302c2714f 100644
  }
  
  base::WeakPtr<BrowserPluginGuest> BrowserPluginGuest::AsWeakPtr() {
--- 
-2.17.0
-

patches/common/chromium/browser_plugin_wheel.patch

@@ -1,11 +1,11 @@
-From 4032ed30d0df7f78fde3da3725f8aa3759493e4c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Anonymous <anonymous@electronjs.org>
 Date: Thu, 20 Sep 2018 17:45:21 -0700
 Subject: browser_plugin_wheel.patch
 
 
 diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
-index 4d8251069ae9..fbd5cc809962 100644
+index 4d8251069ae9a45e1be22fa03f23b3196116b612..fbd5cc8099629971d670d087fdee89204e3137e3 100644
 --- a/content/renderer/browser_plugin/browser_plugin.cc
 +++ b/content/renderer/browser_plugin/browser_plugin.cc
 @@ -656,15 +656,11 @@ blink::WebInputEventResult BrowserPlugin::HandleInputEvent(
@@ -29,6 +29,3 @@ index 4d8251069ae9..fbd5cc809962 100644
  
    if (blink::WebInputEvent::IsGestureEventType(event.GetType())) {
      auto gesture_event = static_cast<const blink::WebGestureEvent&>(event);
--- 
-2.17.0
-

patches/common/chromium/build_gn.patch

@@ -1,11 +1,11 @@
-From aca453bd9e35003bc70adfc77a576492f05c5954 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Ales Pergl <alpergl@microsoft.com>
 Date: Thu, 20 Sep 2018 17:44:29 -0700
 Subject: build_gn.patch
 
 
 diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
-index fcc00ee0e49f..3232a0360e94 100644
+index fcc00ee0e49f101cb1b10629747c4c4fa521776d..3232a0360e94e78621f7f672e3de4bdcc5f7b8d5 100644
 --- a/build/config/BUILDCONFIG.gn
 +++ b/build/config/BUILDCONFIG.gn
 @@ -123,6 +123,9 @@ if (current_os == "") {
@@ -49,6 +49,3 @@ index 959a59231746..48f1285c4657 100644
  
      # Work-around for http://openradar.appspot.com/20356002
      if (is_mac) {
--- 
-2.17.0
-

patches/common/chromium/build_toolchain_win_patch.patch

@@ -77,6 +77,3 @@ index cb0393ecd507..ee21eb4b194b 100644
  
  if __name__ == '__main__':
    sys.exit(main(sys.argv[1:]))
--- 
-2.17.0
-

patches/common/chromium/can_create_window.patch

@@ -1,11 +1,11 @@
-From 0809b4654f69adbc8912ad8922465f46b2d3be18 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <zcbenz@gmail.com>
 Date: Thu, 20 Sep 2018 17:45:32 -0700
 Subject: can_create_window.patch
 
 
 diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
-index 520dcffb5353..783dc705f748 100644
+index 520dcffb53534e76d739cff74ea58d49bdfb682a..783dc705f748bc6c9d3b8630ce12ad39ff2fd7d2 100644
 --- a/content/browser/frame_host/render_frame_host_impl.cc
 +++ b/content/browser/frame_host/render_frame_host_impl.cc
 @@ -3142,6 +3142,38 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -56,7 +56,7 @@ index 520dcffb5353..783dc705f748 100644
            &no_javascript_access);
  
 diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc
-index e3b04edb5a30..254f94016b97 100644
+index e3b04edb5a301115d894190a64e734eb2c8b3499..254f94016b97620cfbc102cbbc7677cfcfe38e22 100644
 --- a/content/browser/security_exploit_browsertest.cc
 +++ b/content/browser/security_exploit_browsertest.cc
 @@ -313,6 +313,7 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest,
@@ -68,7 +68,7 @@ index e3b04edb5a30..254f94016b97 100644
        std::move(params), base::BindOnce([](mojom::CreateNewWindowStatus,
                                             mojom::CreateNewWindowReplyPtr) {}));
 diff --git a/content/common/frame.mojom b/content/common/frame.mojom
-index fb4732e6e666..804086522994 100644
+index fb4732e6e666044233716fc3ae629dedad7b2618..804086522994b038c86a31e7acdcffc1e039c260 100644
 --- a/content/common/frame.mojom
 +++ b/content/common/frame.mojom
 @@ -12,6 +12,8 @@ import "content/public/common/resource_type.mojom";
@@ -117,7 +117,7 @@ index fb4732e6e666..804086522994 100644
  
  // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index 2a896c7072ca..bb54b89bef5c 100644
+index 2a896c7072caae655be1902b536d9172448abddb..bb54b89bef5c6f32e7b4a056336c85494e2a04de 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
 @@ -435,6 +435,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -130,7 +130,7 @@ index 2a896c7072ca..bb54b89bef5c 100644
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index fd5d62fee117..3be31602689c 100644
+index fd5d62fee1172b07a692fcf6ce06a30096d25b03..3be31602689cb93b965729cc4e35cf6d23a8ec2f 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
 @@ -162,6 +162,7 @@ class RenderFrameHost;
@@ -151,7 +151,7 @@ index fd5d62fee117..3be31602689c 100644
        bool opener_suppressed,
        bool* no_javascript_access);
 diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
-index 03d9cda9f95d..edad9fc3198c 100644
+index 03d9cda9f95daa369101b6f922e0978061e0225f..edad9fc3198ca12bd326c9f407a62866373e3b29 100644
 --- a/content/renderer/render_view_impl.cc
 +++ b/content/renderer/render_view_impl.cc
 @@ -79,6 +79,7 @@
@@ -210,7 +210,7 @@ index 03d9cda9f95d..edad9fc3198c 100644
    // moved on send.
    bool is_background_tab =
 diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.cc b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
-index fe0e3720ea5d..4a31617b5a89 100644
+index fe0e3720ea5d60d65ecbbc3836bc87785997a513..4a31617b5a898b0f6d7e25cc05992d36862678a0 100644
 --- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc
 +++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
 @@ -276,6 +276,8 @@ bool LayoutTestContentBrowserClient::CanCreateWindow(
@@ -223,7 +223,7 @@ index fe0e3720ea5d..4a31617b5a89 100644
      bool opener_suppressed,
      bool* no_javascript_access) {
 diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.h b/content/shell/browser/layout_test/layout_test_content_browser_client.h
-index fa458cf0c92d..cdd95a1d88e5 100644
+index fa458cf0c92d6f75ecd71e296ba1af88ace400dc..cdd95a1d88e582a31aca43cd2fc9001113dcde1c 100644
 --- a/content/shell/browser/layout_test/layout_test_content_browser_client.h
 +++ b/content/shell/browser/layout_test/layout_test_content_browser_client.h
 @@ -66,6 +66,8 @@ class LayoutTestContentBrowserClient : public ShellContentBrowserClient {
@@ -235,6 +235,3 @@ index fa458cf0c92d..cdd95a1d88e5 100644
                         bool user_gesture,
                         bool opener_suppressed,
                         bool* no_javascript_access) override;
--- 
-2.17.0
-

patches/common/chromium/chrome_key_systems.patch

@@ -1,4 +1,4 @@
-From 63fb1abe3afa2b19ac0640b462658e6f286b3c6c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: deepak1556 <hop2deep@gmail.com>
 Date: Thu, 20 Sep 2018 17:50:13 -0700
 Subject: chrome_key_systems.patch
@@ -7,7 +7,7 @@ Disable persiste licence support check for widevine cdm,
 as its not supported in the current version of chrome.
 
 diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
-index 5c38d0b1ce7c..4ffaf2a3301e 100644
+index 5c38d0b1ce7c6d395126b6cc428467d31bb3c0a5..4ffaf2a3301eec188b1b40b06b2152f17b4c7641 100644
 --- a/chrome/renderer/media/chrome_key_systems.cc
 +++ b/chrome/renderer/media/chrome_key_systems.cc
 @@ -15,7 +15,9 @@
@@ -35,6 +35,3 @@ index 5c38d0b1ce7c..4ffaf2a3301e 100644
  
    if (!supported_by_the_cdm) {
      DVLOG(2) << __func__ << ": Not supported by the CDM.";
--- 
-2.17.0
-

patches/common/chromium/compositor_delegate.patch

@@ -1,11 +1,11 @@
-From df47eeaea5e574c7af03eed15d384ad9cad58fb1 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Anonymous <anonymous@electronjs.org>
 Date: Thu, 20 Sep 2018 17:45:36 -0700
 Subject: compositor_delegate.patch
 
 
 diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
-index 511d805187b1..5fb01fee0378 100644
+index 511d805187b15325f72c574ad37fb43e4e5e2df6..5fb01fee0378ac807ee4fde6d4bea8d76db75d42 100644
 --- a/content/browser/compositor/gpu_process_transport_factory.cc
 +++ b/content/browser/compositor/gpu_process_transport_factory.cc
 @@ -494,10 +494,20 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
@@ -32,7 +32,7 @@ index 511d805187b1..5fb01fee0378 100644
      } else {
        DCHECK(context_provider);
 diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
-index e0ec33400b17..29ba88a504c3 100644
+index e0ec33400b179a600d95501fb93826075ffc52eb..29ba88a504c33d850c7a3425bd7d874ac3323fe1 100644
 --- a/ui/compositor/compositor.h
 +++ b/ui/compositor/compositor.h
 @@ -24,6 +24,7 @@
@@ -78,6 +78,3 @@ index e0ec33400b17..29ba88a504c3 100644
    // The root of the Layer tree drawn by this compositor.
    Layer* root_layer_ = nullptr;
  
--- 
-2.17.0
-

patches/common/chromium/content_browser_main_loop.patch

@@ -1,5 +1,14 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: deepak1556 <hop2deep@gmail.com>
+Date: Thu, 18 Oct 2018 17:07:42 -0700
+Subject: content_browser_main_loop.patch
+
+Pass idle quit closure for main message loop, so that pending tasks are
+run before shutdown. This is required to cleanup WebContents asynchronously
+in atom::CommonWebContentsDelegate::ResetManageWebContents.
+
 diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
-index eb942391306e..9111cf18b7fc 100644
+index eb942391306e86e8ee8dc2584c63440b10ec76bd..9111cf18b7fc8fb67e7ee65e3cd76bd1e713aee8 100644
 --- a/content/browser/browser_main_loop.cc
 +++ b/content/browser/browser_main_loop.cc
 @@ -1571,7 +1571,7 @@ void BrowserMainLoop::MainMessageLoopRun() {

patches/common/chromium/crashpad_http_status.patch

@@ -1,8 +1,15 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Apthorp <nornagon@nornagon.net>
+Date: Thu, 18 Oct 2018 17:06:46 -0700
+Subject: crashpad_http_status.patch
+
+backport of crashpad f540abb506
+
 diff --git a/third_party/crashpad/crashpad/util/net/http_transport.h b/third_party/crashpad/crashpad/util/net/http_transport.h
-index f91a556..acd4e44 100644
+index f91a55612a2ffc2f4a78ff48ceba6174adc58cbf..acd4e442462b031dd304f303cdaa3664f5cffb64 100644
 --- a/third_party/crashpad/crashpad/util/net/http_transport.h
 +++ b/third_party/crashpad/crashpad/util/net/http_transport.h
-@@ -90,7 +90,7 @@
+@@ -90,7 +90,7 @@ class HTTPTransport {
    //!     if the response body is not required.
    //!
    //! \return Whether or not the request was successful, defined as returning
@@ -12,10 +19,10 @@ index f91a556..acd4e44 100644
  
   protected:
 diff --git a/third_party/crashpad/crashpad/util/net/http_transport_mac.mm b/third_party/crashpad/crashpad/util/net/http_transport_mac.mm
-index 8d5f78c..a433bb3 100644
+index 8d5f78cc6efc8b8e349958f51c78921a8c163c4e..a433bb357da5865144ade7d3663b1c9b36199f8e 100644
 --- a/third_party/crashpad/crashpad/util/net/http_transport_mac.mm
 +++ b/third_party/crashpad/crashpad/util/net/http_transport_mac.mm
-@@ -293,7 +293,7 @@
+@@ -293,7 +293,7 @@ bool HTTPTransportMac::ExecuteSynchronously(std::string* response_body) {
        return false;
      }
      NSInteger http_status = [http_response statusCode];
@@ -25,7 +32,7 @@ index 8d5f78c..a433bb3 100644
                                         implicit_cast<long>(http_status));
        return false;
 diff --git a/third_party/crashpad/crashpad/util/net/http_transport_socket.cc b/third_party/crashpad/crashpad/util/net/http_transport_socket.cc
-index f0e2dc14a8a4..34d8deeb5c25 100644
+index f0e2dc14a8a487b5960d700be57100c9bed4f271..34d8deeb5c25f6b49fd0acadce67a3816869d3da 100644
 --- a/third_party/crashpad/crashpad/util/net/http_transport_socket.cc
 +++ b/third_party/crashpad/crashpad/util/net/http_transport_socket.cc
 @@ -457,10 +457,18 @@ bool ReadResponseLine(Stream* stream) {
@@ -49,13 +56,13 @@ index f0e2dc14a8a4..34d8deeb5c25 100644
 +                            &http_status) &&
 +         http_status >= 200 && http_status <= 203;
  }
-
+ 
  bool ReadResponseHeaders(Stream* stream, HTTPHeaders* headers) {
 diff --git a/third_party/crashpad/crashpad/util/net/http_transport_test.cc b/third_party/crashpad/crashpad/util/net/http_transport_test.cc
-index 7b5f41d..d73dc99 100644
+index 7b5f41dfd1e18b212d7dd349cff8f4396e20dbc3..d73dc99217e08f7c84ded50868cbef02141a6b9b 100644
 --- a/third_party/crashpad/crashpad/util/net/http_transport_test.cc
 +++ b/third_party/crashpad/crashpad/util/net/http_transport_test.cc
-@@ -137,7 +137,7 @@
+@@ -137,7 +137,7 @@ class HTTPTransportTestFixture : public MultiprocessExec {
  
      std::string response_body;
      bool success = transport->ExecuteSynchronously(&response_body);
@@ -65,10 +72,10 @@ index 7b5f41d..d73dc99 100644
        std::string expect_response_body = random_string + "\r\n";
        EXPECT_EQ(response_body, expect_response_body);
 diff --git a/third_party/crashpad/crashpad/util/net/http_transport_win.cc b/third_party/crashpad/crashpad/util/net/http_transport_win.cc
-index 18d343c..2919bc1 100644
+index 18d343ccef0396ee6679f4b5fd8316c3109003f4..2919bc11d0ba4bf84a11e146bf2961b830db35fe 100644
 --- a/third_party/crashpad/crashpad/util/net/http_transport_win.cc
 +++ b/third_party/crashpad/crashpad/util/net/http_transport_win.cc
-@@ -375,7 +375,7 @@
+@@ -375,7 +375,7 @@ bool HTTPTransportWin::ExecuteSynchronously(std::string* response_body) {
      return false;
    }
  

patches/common/chromium/dcheck.patch

@@ -1,4 +1,4 @@
-From 0a8757b6650df0e762cc4ec400ecb7ee8ca7be4a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: deepak1556 <hop2deep@gmail.com>
 Date: Thu, 20 Sep 2018 17:44:38 -0700
 Subject: dcheck.patch
@@ -39,25 +39,25 @@ These files have debug checks explicitly commented out:
   ui/base/clipboard/clipboard_win.cc
 
 diff --git a/base/logging.h b/base/logging.h
-index 08c1f0fc5967..7a758ce3ef90 100644
+index 08c1f0fc59672b2134c634e081f0c4df4d261b75..7a758ce3ef90145d2b68e07e17f00fc30cfb30a6 100644
 --- a/base/logging.h
 +++ b/base/logging.h
 @@ -874,7 +874,7 @@ const LogSeverity LOG_DCHECK = LOG_FATAL;
-
+ 
  #else  // !(defined(_PREFAST_) && defined(OS_WIN))
-
+ 
 -#if DCHECK_IS_ON()
 +#if DCHECK_IS_ON() && !defined(ELECTRON_NO_DCHECK)
-
+ 
  #define DCHECK(condition)                                           \
    LAZY_STREAM(LOG_STREAM(DCHECK), !ANALYZER_ASSUME_TRUE(condition)) \
 diff --git a/base/memory/weak_ptr.cc b/base/memory/weak_ptr.cc
-index c993fcb8a13a..80a5b708d259 100644
+index c993fcb8a13a156c1ba6fc1979d8d18fbedd9059..80a5b708d2597bbda53826dac4175fe9788bf154 100644
 --- a/base/memory/weak_ptr.cc
 +++ b/base/memory/weak_ptr.cc
 @@ -25,8 +25,8 @@ void WeakReference::Flag::Invalidate() {
  }
-
+ 
  bool WeakReference::Flag::IsValid() const {
 -  DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_)
 -      << "WeakPtrs must be checked on the same sequenced thread.";
@@ -65,22 +65,22 @@ index c993fcb8a13a..80a5b708d259 100644
 +  //     << "WeakPtrs must be checked on the same sequenced thread.";
    return !invalidated_.IsSet();
  }
-
+ 
 diff --git a/base/process/kill_win.cc b/base/process/kill_win.cc
-index 7a664429bcd3..26f49dc3d1e7 100644
+index 7a664429bcd305b10da8c7317700f9124742f3b8..26f49dc3d1e782e69e74f2d177535b80a54b2433 100644
 --- a/base/process/kill_win.cc
 +++ b/base/process/kill_win.cc
 @@ -23,7 +23,7 @@ TerminationStatus GetTerminationStatus(ProcessHandle handle, int* exit_code) {
    DWORD tmp_exit_code = 0;
-
+ 
    if (!::GetExitCodeProcess(handle, &tmp_exit_code)) {
 -    DPLOG(FATAL) << "GetExitCodeProcess() failed";
 +    // DPLOG(FATAL) << "GetExitCodeProcess() failed";
-
+ 
      // This really is a random number.  We haven't received any
      // information about the exit code, presumably because this
 diff --git a/base/process/process_metrics_win.cc b/base/process/process_metrics_win.cc
-index 18ef58a725c3..239f319c8b4c 100644
+index 18ef58a725c3a87a30413a4676044533f1751c7c..239f319c8b4cf52c115acd6173a15978f6ff3386 100644
 --- a/base/process/process_metrics_win.cc
 +++ b/base/process/process_metrics_win.cc
 @@ -153,10 +153,9 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
@@ -98,7 +98,7 @@ index 18ef58a725c3..239f319c8b4c 100644
    }
  }
 diff --git a/components/viz/service/display/program_binding.h b/components/viz/service/display/program_binding.h
-index 2a8fb9f54847..2c318b310b2a 100644
+index 2a8fb9f5484768f88ec6d383639da2d42fd777fd..2c318b310b2aeb39a1256feb612e19dc0fd53a72 100644
 --- a/components/viz/service/display/program_binding.h
 +++ b/components/viz/service/display/program_binding.h
 @@ -434,7 +434,7 @@ class VIZ_SERVICE_EXPORT Program : public ProgramBindingBase {
@@ -109,37 +109,37 @@ index 2a8fb9f54847..2c318b310b2a 100644
 +      // DCHECK(IsContextLost(context_provider->ContextGL()));
        return;
      }
-
+ 
 @@ -446,7 +446,7 @@ class VIZ_SERVICE_EXPORT Program : public ProgramBindingBase {
-
+ 
      // Link after binding uniforms
      if (!Link(context_provider->ContextGL())) {
 -      DCHECK(IsContextLost(context_provider->ContextGL()));
 +      // DCHECK(IsContextLost(context_provider->ContextGL()));
        return;
      }
-
+ 
 diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
-index d8aca9e2cbff..86224ab7a3c5 100644
+index d8aca9e2cbffdfd0bbb0bd67e8adfb53547132bb..86224ab7a3c5637422559da25bc8c1040a03e937 100644
 --- a/content/browser/frame_host/navigation_controller_impl.cc
 +++ b/content/browser/frame_host/navigation_controller_impl.cc
 @@ -995,8 +995,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
      return NAVIGATION_TYPE_NEW_SUBFRAME;
    }
-
+ 
 -  // We only clear the session history when navigating to a new page.
 -  DCHECK(!params.history_list_was_cleared);
 +  // Electron does its own book keeping of navigation entries and we
 +  // expect content to not track any, by clearing history list for
 +  // all navigations.
 +  // DCHECK(!params.history_list_was_cleared);
-
+ 
    if (rfh->GetParent()) {
      // All manual subframes would be did_create_new_entry and handled above, so
 @@ -1233,7 +1235,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
      new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon();
    }
-
+ 
 -  DCHECK(!params.history_list_was_cleared || !replace_entry);
 +  // Electron does its own book keeping of navigation entries and we
 +  // expect content to not track any, by clearing history list for
@@ -149,12 +149,12 @@ index d8aca9e2cbff..86224ab7a3c5 100644
    // navigation. Now we know that the renderer has updated its state accordingly
    // and it is safe to also clear the browser side history.
 diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
-index 8e5af3e3b9c5..520dcffb5353 100644
+index 8e5af3e3b9c5b9e5c7a2462600fb2c9582df0c7c..520dcffb53534e76d739cff74ea58d49bdfb682a 100644
 --- a/content/browser/frame_host/render_frame_host_impl.cc
 +++ b/content/browser/frame_host/render_frame_host_impl.cc
 @@ -2416,8 +2416,10 @@ void RenderFrameHostImpl::AllowBindings(int bindings_flags) {
    }
-
+ 
    enabled_bindings_ |= bindings_flags;
 -  if (GetParent())
 -    DCHECK_EQ(GetParent()->GetEnabledBindings(), GetEnabledBindings());
@@ -162,28 +162,28 @@ index 8e5af3e3b9c5..520dcffb5353 100644
 +  // Fix this when we use OOPIF in Electron.
 +  // if (GetParent())
 +  //  DCHECK_EQ(GetParent()->GetEnabledBindings(), GetEnabledBindings());
-
+ 
    if (render_frame_created_) {
      if (!frame_bindings_control_)
 diff --git a/ppapi/host/ppapi_host.cc b/ppapi/host/ppapi_host.cc
-index 3f80e73535c8..bf40b94ad24c 100644
+index 3f80e73535c8b4a2bcff08821e3585306f691c8b..bf40b94ad24c0621cbe093002c3355693219ebc4 100644
 --- a/ppapi/host/ppapi_host.cc
 +++ b/ppapi/host/ppapi_host.cc
 @@ -238,7 +238,7 @@ void PpapiHost::OnHostMsgResourceCreated(
        CreateResourceHost(params.pp_resource(), instance, nested_msg);
-
+ 
    if (!resource_host.get()) {
 -    NOTREACHED();
 +    // NOTREACHED();
      return;
    }
-
+ 
 diff --git a/third_party/blink/renderer/core/dom/node.cc b/third_party/blink/renderer/core/dom/node.cc
-index 5629f8170851..bc773ac9b1e4 100644
+index 5629f8170851f0b58069e2cd0c14ebe093d89d00..bc773ac9b1e462385dcbb8bef2fc4c2d7e6c7b06 100644
 --- a/third_party/blink/renderer/core/dom/node.cc
 +++ b/third_party/blink/renderer/core/dom/node.cc
 @@ -2568,7 +2568,7 @@ StaticNodeList* Node::getDestinationInsertionPoints() {
-
+ 
  HTMLSlotElement* Node::AssignedSlot() const {
    // assignedSlot doesn't need to call updateDistribution().
 -  DCHECK(!IsPseudoElement());
@@ -192,7 +192,7 @@ index 5629f8170851..bc773ac9b1e4 100644
      return root->AssignedSlotFor(*this);
    return nullptr;
 diff --git a/third_party/blink/renderer/core/loader/BUILD.gn b/third_party/blink/renderer/core/loader/BUILD.gn
-index 49b4ead3dc52..0083e5c8efb7 100644
+index 49b4ead3dc521796bf3c6a207a072ff5eeff1849..0083e5c8efb71cf2cb097944174dcad8eff1cc3e 100644
 --- a/third_party/blink/renderer/core/loader/BUILD.gn
 +++ b/third_party/blink/renderer/core/loader/BUILD.gn
 @@ -135,4 +135,11 @@ blink_core_sources("loader") {
@@ -208,12 +208,12 @@ index 49b4ead3dc52..0083e5c8efb7 100644
 +  }
  }
 diff --git a/third_party/blink/renderer/platform/wtf/text/string_impl.h b/third_party/blink/renderer/platform/wtf/text/string_impl.h
-index 0e7c40b732ec..7c513d95a586 100644
+index 0e7c40b732ec283e006b2e3517c42e699d7e3102..7c513d95a586d8ac80e691aa89abaf49793e9a18 100644
 --- a/third_party/blink/renderer/platform/wtf/text/string_impl.h
 +++ b/third_party/blink/renderer/platform/wtf/text/string_impl.h
 @@ -258,21 +258,21 @@ class WTF_EXPORT StringImpl {
    }
-
+ 
    ALWAYS_INLINE bool HasOneRef() const {
 -#if DCHECK_IS_ON()
 +#if 0
@@ -221,7 +221,7 @@ index 0e7c40b732ec..7c513d95a586 100644
  #endif
      return ref_count_ == 1;
    }
-
+ 
    ALWAYS_INLINE void AddRef() const {
 -#if DCHECK_IS_ON()
 +#if 0
@@ -229,7 +229,7 @@ index 0e7c40b732ec..7c513d95a586 100644
  #endif
      ++ref_count_;
    }
-
+ 
    ALWAYS_INLINE void Release() const {
 -#if DCHECK_IS_ON()
 +#if 0
@@ -237,12 +237,12 @@ index 0e7c40b732ec..7c513d95a586 100644
          << AsciiForDebugging() << " " << CurrentThread();
  #endif
 diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
-index e49dd8c81270..9e61c901cd2d 100644
+index e49dd8c81270cdd9794ddee11bad036c2f444af5..9e61c901cd2df168520b83a8522ca8c032f4c0ae 100644
 --- a/ui/base/clipboard/clipboard_win.cc
 +++ b/ui/base/clipboard/clipboard_win.cc
 @@ -905,9 +905,9 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap,
  }
-
+ 
  void ClipboardWin::WriteToClipboard(unsigned int format, HANDLE handle) {
 -  DCHECK(clipboard_owner_->hwnd() != NULL);
 +  // DCHECK(clipboard_owner_->hwnd() != NULL);
@@ -253,7 +253,7 @@ index e49dd8c81270..9e61c901cd2d 100644
    }
  }
 diff --git a/url/BUILD.gn b/url/BUILD.gn
-index 57bbe16c15ea..07725187c595 100644
+index 57bbe16c15ea442963a53f89b009e2c99c7b090a..07725187c595784d9e5f49d45a8835da78144830 100644
 --- a/url/BUILD.gn
 +++ b/url/BUILD.gn
 @@ -98,6 +98,10 @@ component("url") {
@@ -265,7 +265,5 @@ index 57bbe16c15ea..07725187c595 100644
 +    defines += [ "ELECTRON_NO_DCHECK" ]
 +  }
  }
-
+ 
  if (is_android) {
---
-2.17.0

patches/common/chromium/desktop_media_list.patch

@@ -1,5 +1,15 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: deepak1556 <hop2deep@gmail.com>
+Date: Thu, 18 Oct 2018 17:07:01 -0700
+Subject: desktop_media_list.patch
+
+* Adds a new observer method to DesktopMediaListObserver for
+  desktop capture api.
+* Backports https://chromium-review.googlesource.com/c/chromium/src/+/1199806
+  that fixes crash with screen capturer, can be removed in 71.0.3539.0
+
 diff --git a/chrome/browser/media/webrtc/desktop_media_list.h b/chrome/browser/media/webrtc/desktop_media_list.h
-index 8e02a8a95eb0..3497b85428a5 100644
+index 8e02a8a95eb07516162eacdf5b361231d3a02975..3497b85428a52c6019cfb5d30229071f99ecfb20 100644
 --- a/chrome/browser/media/webrtc/desktop_media_list.h
 +++ b/chrome/browser/media/webrtc/desktop_media_list.h
 @@ -32,6 +32,9 @@ class DesktopMediaList {
@@ -26,7 +36,7 @@ index 8e02a8a95eb0..3497b85428a5 100644
    virtual content::DesktopMediaID::Type GetMediaListType() const = 0;
  };
 diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.cc b/chrome/browser/media/webrtc/desktop_media_list_base.cc
-index 43dd95ef72f5..d4662708f649 100644
+index 43dd95ef72f5b35b91471950cc114800d54945ab..d4662708f64934372422b853673eaaf8f05e4baf 100644
 --- a/chrome/browser/media/webrtc/desktop_media_list_base.cc
 +++ b/chrome/browser/media/webrtc/desktop_media_list_base.cc
 @@ -18,6 +18,11 @@ DesktopMediaListBase::DesktopMediaListBase(base::TimeDelta update_period)
@@ -88,7 +98,7 @@ index 43dd95ef72f5..d4662708f649 100644
                                   base::BindOnce(&DesktopMediaListBase::Refresh,
                                                  weak_factory_.GetWeakPtr()),
 diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.h b/chrome/browser/media/webrtc/desktop_media_list_base.h
-index 746df1210aa9..461e0edf8509 100644
+index 746df1210aa92af5c9d4703112b4bd6c09b94fdf..461e0edf8509569d05c86f466c02b5035183d0df 100644
 --- a/chrome/browser/media/webrtc/desktop_media_list_base.h
 +++ b/chrome/browser/media/webrtc/desktop_media_list_base.h
 @@ -24,12 +24,14 @@ class DesktopMediaListBase : public DesktopMediaList {
@@ -108,7 +118,7 @@ index 746df1210aa9..461e0edf8509 100644
  
    static uint32_t GetImageHash(const gfx::Image& image);
 diff --git a/chrome/browser/media/webrtc/desktop_media_list_observer.h b/chrome/browser/media/webrtc/desktop_media_list_observer.h
-index 47401abc984e..ca6a527ffac8 100644
+index 47401abc984e6fe26c7f4c5399aa565c687060b0..ca6a527ffac877c27aac94337ec5a7b546e09768 100644
 --- a/chrome/browser/media/webrtc/desktop_media_list_observer.h
 +++ b/chrome/browser/media/webrtc/desktop_media_list_observer.h
 @@ -18,6 +18,10 @@ class DesktopMediaListObserver {
@@ -123,7 +133,7 @@ index 47401abc984e..ca6a527ffac8 100644
   protected:
    virtual ~DesktopMediaListObserver() {}
 diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
-index 0c9ba953cb3c..c2482774f074 100644
+index 0c9ba953cb3c268930fb101105c22416ed3cae08..c2482774f0747a0300d72d7ef05ed429caaf7d19 100644
 --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
 +++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
 @@ -5,11 +5,15 @@
@@ -262,7 +272,7 @@ index 0c9ba953cb3c..c2482774f074 100644
                                    base::Unretained(worker_.get()), native_ids,
                                    thumbnail_size_));
 diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.h b/chrome/browser/media/webrtc/native_desktop_media_list.h
-index e6f0e17b05ee..75c9ca04ce48 100644
+index e6f0e17b05ee4dc45827dc2dd00d484201f74646..75c9ca04ce481ab79615515da948c29d449865dc 100644
 --- a/chrome/browser/media/webrtc/native_desktop_media_list.h
 +++ b/chrome/browser/media/webrtc/native_desktop_media_list.h
 @@ -8,7 +8,7 @@

patches/common/chromium/desktop_screen_win.patch

@@ -17,6 +17,3 @@ index f772f64d656e..7d13f9f81b6c 100644
    aura::WindowTreeHost* host = window->GetHost();
    return host ? host->GetAcceleratedWidget() : NULL;
  }
--- 
-2.17.0
-

patches/common/chromium/disable-redraw-lock.patch

@@ -1,4 +1,4 @@
-From 2067d5a31905f889d7537c4a4ab680577bb5e75f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Heilig Benedek <benecene@gmail.com>
 Date: Thu, 20 Sep 2018 17:47:54 -0700
 Subject: disable-redraw-lock.patch
@@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
 can be found at https://github.com/electron/electron/issues/1821
 
 diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
-index d5f442f71da7..a8f39b060115 100644
+index d5f442f71da7ad3b7087af40967d6df0579803f5..a8f39b0601157dc75d35460eccff67f36bc07941 100644
 --- a/ui/views/win/hwnd_message_handler.cc
 +++ b/ui/views/win/hwnd_message_handler.cc
 @@ -281,6 +281,10 @@ const int kSynthesizedMouseMessagesTimeDifference = 500;
@@ -49,7 +49,7 @@ index d5f442f71da7..a8f39b060115 100644
  // HWNDMessageHandler, gfx::WindowImpl overrides:
  
 diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
-index 91afedec8e29..fa514d102538 100644
+index 91afedec8e2951e3f0176fce2e84261a3846d218..fa514d102538e141f48ff6af5f5c8fc4d6da17b0 100644
 --- a/ui/views/win/hwnd_message_handler.h
 +++ b/ui/views/win/hwnd_message_handler.h
 @@ -181,6 +181,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
@@ -62,7 +62,7 @@ index 91afedec8e29..fa514d102538 100644
    HICON GetDefaultWindowIcon() const override;
    HICON GetSmallWindowIcon() const override;
 diff --git a/ui/views/win/hwnd_message_handler_delegate.h b/ui/views/win/hwnd_message_handler_delegate.h
-index 1b2d98a85738..dd080180aebd 100644
+index 1b2d98a857385d31b5f401d685fd9524da228726..dd080180aebda193ef885bf7f41587802787a3c6 100644
 --- a/ui/views/win/hwnd_message_handler_delegate.h
 +++ b/ui/views/win/hwnd_message_handler_delegate.h
 @@ -46,6 +46,8 @@ class VIEWS_EXPORT HWNDMessageHandlerDelegate {
@@ -74,6 +74,3 @@ index 1b2d98a85738..dd080180aebd 100644
    // Returns who we want to be drawing the frame. Either the system (Windows)
    // will handle it or Chrome will custom draw it.
    virtual FrameMode GetFrameMode() const = 0;
--- 
-2.17.0
-

patches/common/chromium/disable_detach_webview_frame.patch

@@ -1,4 +1,4 @@
-From 4d1fb504c014998e2cc80b63db3a820dd73adbec Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: zcbenz <zcbenz@gmail.com>
 Date: Thu, 20 Sep 2018 17:50:27 -0700
 Subject: disable_detach_webview_frame.patch
@@ -10,7 +10,7 @@ We should revisit this bug after upgrading to newer versions of Chrome,
 this patch was introduced in Chrome 66.
 
 diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
-index b06a4b9242d3..b7793aaa094a 100644
+index b06a4b9242d30869f9b37fee1dc3ecbe7dcc06d4..b7793aaa094ad342fa15491653baac268a89d524 100644
 --- a/content/browser/frame_host/render_frame_proxy_host.cc
 +++ b/content/browser/frame_host/render_frame_proxy_host.cc
 @@ -286,6 +286,12 @@ void RenderFrameProxyHost::SetDestructionCallback(
@@ -26,6 +26,3 @@ index b06a4b9242d3..b7793aaa094a 100644
      // Only main frame proxy can detach for inner WebContents.
      DCHECK(frame_tree_node_->IsMainFrame());
      frame_tree_node_->render_manager()->RemoveOuterDelegateFrame();
--- 
-2.17.0
-

patches/common/chromium/disable_extensions_gn.patch

@@ -61,5 +61,3 @@ index 1b14d628a63b..00401612c191 100644
  
        # Truly cocoa-browser-specific sources. These are secondary UI pieces that
        # are obsolete before mac_views_browser will ever ship, so they aren't
--- 
-2.17.0

patches/common/chromium/disable_hidden.patch

@@ -1,11 +1,11 @@
-From 624474e13fd8533e9e1f69e3d9b2d551c8fb807a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <zcbenz@gmail.com>
 Date: Thu, 20 Sep 2018 17:45:47 -0700
 Subject: disable_hidden.patch
 
 
 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index 9ab96c3f933b..28879dc5e9bb 100644
+index 9ab96c3f933b7ca0c8a7da396bd6015e620f2e81..28879dc5e9bb3f391513da6a7ad829244b39799d 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
 @@ -712,6 +712,9 @@ void RenderWidgetHostImpl::WasHidden() {
@@ -19,7 +19,7 @@ index 9ab96c3f933b..28879dc5e9bb 100644
  
    TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::WasHidden");
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index 4af5870e7c40..f2e19fe92e56 100644
+index 4af5870e7c40056b98e67f71c2c037490f2634f2..f2e19fe92e56d5d98a3ea0491a719c899b0cdcfe 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
 @@ -154,6 +154,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
@@ -32,6 +32,3 @@ index 4af5870e7c40..f2e19fe92e56 100644
    void set_hung_renderer_delay(const base::TimeDelta& delay) {
      hung_renderer_delay_ = delay;
    }
--- 
-2.17.0
-

patches/common/chromium/disable_scroll_begin_dcheck.patch

@@ -35,6 +35,3 @@ index 28879dc5e9bb..222b5d7e91ec 100644
      is_in_gesture_scroll_[gesture_event.SourceDevice()] = true;
    } else if (gesture_event.GetType() ==
               blink::WebInputEvent::kGestureScrollEnd) {
--- 
-2.17.0
-

patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch

@@ -1,4 +1,4 @@
-From 1294052a41b0f304e45e5bea986b194bee511d49 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aleksei Kuzmin <alkuzmin@microsoft.com>
 Date: Thu, 20 Sep 2018 17:47:33 -0700
 Subject: disable_user_gesture_requirement_for_beforeunload_dialogs.patch
@@ -6,7 +6,7 @@ Subject: disable_user_gesture_requirement_for_beforeunload_dialogs.patch
 See https://github.com/electron/electron/issues/10754
 
 diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
-index 5bfe30b8b880..70129284e60b 100644
+index 5bfe30b8b88073b83c8128b889298bd9af5938f3..70129284e60b20258b2e5d3506f93600a2628fc2 100644
 --- a/third_party/blink/renderer/core/dom/document.cc
 +++ b/third_party/blink/renderer/core/dom/document.cc
 @@ -3508,7 +3508,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient& chrome_client,
@@ -20,6 +20,3 @@ index 5bfe30b8b880..70129284e60b 100644
    }
  
    if (did_allow_navigation) {
--- 
-2.17.0
-

patches/common/chromium/dom_storage_map.patch

@@ -1,11 +1,11 @@
-From 71828a0d7703c56120f127ca42f097fda647ef1c Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <zcbenz@gmail.com>
 Date: Thu, 20 Sep 2018 17:45:55 -0700
 Subject: dom_storage_map.patch
 
 
 diff --git a/content/common/dom_storage/dom_storage_map.cc b/content/common/dom_storage/dom_storage_map.cc
-index fd088fb170be..a9e4b3375e9b 100644
+index fd088fb170bead6452ded14016f21f0c29659e03..a9e4b3375e9b614ed1e8b737a30f4436adb12c37 100644
 --- a/content/common/dom_storage/dom_storage_map.cc
 +++ b/content/common/dom_storage/dom_storage_map.cc
 @@ -185,10 +185,12 @@ bool DOMStorageMap::SetItemInternal(MapType* map_type,
@@ -21,6 +21,3 @@ index fd088fb170be..a9e4b3375e9b 100644
  
    (*map_type)[key] = value;
    ResetKeyIterator();
--- 
-2.17.0
-

patches/common/chromium/dump_syms.patch

@@ -1,5 +1,14 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <samuel.r.attard@gmail.com>
+Date: Thu, 18 Oct 2018 17:07:47 -0700
+Subject: dump_syms.patch
+
+dylib currently fails to resolve Squirrel.framework on OSX, we need to fix
+this but it is not a blocker for releasing Electron.  This patch removes
+the hard fail on dylib resolve failure from dump_syms
+
 diff --git a/components/crash/content/tools/generate_breakpad_symbols.py b/components/crash/content/tools/generate_breakpad_symbols.py
-index 2032f1991ada..58646a10591a 100755
+index 2032f1991ada8669a393838c57b2fd054a81a3e1..58646a10591a1d3e7c2dd1782c3642b9cbe06738 100755
 --- a/components/crash/content/tools/generate_breakpad_symbols.py
 +++ b/components/crash/content/tools/generate_breakpad_symbols.py
 @@ -159,7 +159,7 @@ def GetSharedLibraryDependenciesMac(binary, exe_path):

patches/common/chromium/enable_osr_components.patch

@@ -1,4 +1,4 @@
-From dab99d95ea1d84d1bb263029096a23634b795a94 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Shelley Vohr <shelley.vohr@gmail.com>
 Date: Thu, 20 Sep 2018 17:49:52 -0700
 Subject: enable_osr_components.patch
@@ -6,7 +6,7 @@ Subject: enable_osr_components.patch
 Add MouseWheelPhaseHandler for OSR.
 
 diff --git a/content/browser/renderer_host/input/mouse_wheel_phase_handler.h b/content/browser/renderer_host/input/mouse_wheel_phase_handler.h
-index 305095fc420e..f5ca4eda4a66 100644
+index 305095fc420e1732bdf089dfeee7672f69d85167..f5ca4eda4a663b9297ce69e6a455d7554f1fbe5c 100644
 --- a/content/browser/renderer_host/input/mouse_wheel_phase_handler.h
 +++ b/content/browser/renderer_host/input/mouse_wheel_phase_handler.h
 @@ -7,6 +7,7 @@
@@ -26,6 +26,3 @@ index 305095fc420e..f5ca4eda4a66 100644
   public:
    MouseWheelPhaseHandler(RenderWidgetHostViewBase* const host_view);
    ~MouseWheelPhaseHandler() {}
--- 
-2.17.0
-

patches/common/chromium/enable_widevine.patch

@@ -1,4 +1,4 @@
-From 40198545a62b90741d1adf0e1f61e1fb43b4b73a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aleksei Kuzmin <alkuzmin@microsoft.com>
 Date: Thu, 20 Sep 2018 17:50:03 -0700
 Subject: enable_widevine.patch
@@ -8,7 +8,7 @@ Electron needs that flag to be enabled on those paltforms,
 but there's no way to conditionally set it during a `gn gen` call.
 
 diff --git a/third_party/widevine/cdm/widevine.gni b/third_party/widevine/cdm/widevine.gni
-index 82a93622585a..cbd10bed9f3b 100644
+index 82a93622585a424f56c3567050f9ba4822de6c1e..cbd10bed9f3bdbeb61ec5daa2f8d0e158549b7fd 100644
 --- a/third_party/widevine/cdm/widevine.gni
 +++ b/third_party/widevine/cdm/widevine.gni
 @@ -7,7 +7,7 @@ import("//media/media_options.gni")
@@ -20,6 +20,3 @@ index 82a93622585a..cbd10bed9f3b 100644
  }
  
  enable_widevine_cdm_host_verification =
--- 
-2.17.0
-

patches/common/chromium/exclude-a-few-test-files-from-build.patch

@@ -1,13 +1,13 @@
-From 2f416aedbe6580b1ef07a2f76c22bcd9d1ef5942 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aleksei Kuzmin <alkuzmin@microsoft.com>
 Date: Thu, 20 Sep 2018 17:50:45 -0700
 Subject: exclude-a-few-test-files-from-build.patch
 
-Compilation of those files fails with the Chromium 67.
-Remove the patch during the Chromium 68 upgrade.
+Compilation of those files fails with the Chromium 68.
+Remove the patch during the Chromium 69 upgrade.
 
 diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
-index d5d8e48305ba..070c6be426f4 100644
+index d5d8e48305ba20926415a3e94f8732baf327a14b..070c6be426f4affcfb3a08199f8f1bd71ebd5f52 100644
 --- a/third_party/blink/renderer/platform/BUILD.gn
 +++ b/third_party/blink/renderer/platform/BUILD.gn
 @@ -1790,7 +1790,7 @@ jumbo_source_set("blink_platform_unittests_sources") {
@@ -19,6 +19,3 @@ index d5d8e48305ba..070c6be426f4 100644
      "graphics/paint/paint_chunk_test.cc",
      "graphics/paint/paint_chunker_test.cc",
      "graphics/paint/paint_controller_test.cc",
--- 
-2.17.0
-

patches/common/chromium/expose-net-observer-api.patch

@@ -1,11 +1,13 @@
-From f9178257245c16180336ff06debc6778d80b0975 Mon Sep 17 00:00:00 2001
-From: Jeremy Apthorp <nornagon@nornagon.net>
-Date: Mon, 1 Oct 2018 12:16:41 -0700
-Subject: Expose URLRequestContextGetter::{Add,Remove}Observer
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jeremy Apthorp <jeremya@chromium.org>
+Date: Thu, 18 Oct 2018 17:06:56 -0700
+Subject: expose-net-observer-api.patch
 
+Expose URLRequestContextGetter::{Add,Remove}Observer.
+This patch should be removed once we switch to using the net service (cc @robo)
 
 diff --git a/net/url_request/url_request_context_getter.h b/net/url_request/url_request_context_getter.h
-index 7a2dcd9de423..494526c843b9 100644
+index 7a2dcd9de423cca8e39f84e7f6839eefd86c11ae..494526c843b9e39eba46785618960c3e94d06866 100644
 --- a/net/url_request/url_request_context_getter.h
 +++ b/net/url_request/url_request_context_getter.h
 @@ -79,11 +79,16 @@ class NET_EXPORT URLRequestContextGetter
@@ -25,6 +27,3 @@ index 7a2dcd9de423..494526c843b9 100644
  
    // OnDestruct is used to ensure deletion on the thread on which the request
    // IO happens.
--- 
-2.17.0
-

patches/common/chromium/frame_host_manager.patch

@@ -1,11 +1,11 @@
-From 4730f77f43c648f6168db58897b4569326a75627 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: deepak1556 <hop2deep@gmail.com>
 Date: Thu, 20 Sep 2018 17:45:59 -0700
 Subject: frame_host_manager.patch
 
 
 diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
-index 872e4609c94f..a59676004f24 100644
+index 872e4609c94f1e052d623ae57c1279c72eb2c3f4..a59676004f2411631418bf12e2978623b9b27b53 100644
 --- a/content/browser/frame_host/render_frame_host_manager.cc
 +++ b/content/browser/frame_host/render_frame_host_manager.cc
 @@ -1960,6 +1960,18 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -68,7 +68,7 @@ index 872e4609c94f..a59676004f24 100644
        request.state() == NavigationRequest::FAILED,
        request.restore_type() != RestoreType::NONE, request.is_view_source(),
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 3be31602689c..2c22cb1cfe0d 100644
+index 3be31602689cb93b965729cc4e35cf6d23a8ec2f..2c22cb1cfe0dddc97c00e5f4ff89de6b18bc232f 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
 @@ -196,6 +196,15 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -87,6 +87,3 @@ index 3be31602689c..2c22cb1cfe0d 100644
    // Allows the embedder to set any number of custom BrowserMainParts
    // implementations for the browser startup code. See comments in
    // browser_main_parts.h.
--- 
-2.17.0
-

patches/common/chromium/gin_enable_disable_v8_platform.patch

@@ -1,11 +1,11 @@
-From eaf64921a97d513151d48ab01975b5ac966a7e34 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <zcbenz@gmail.com>
 Date: Thu, 20 Sep 2018 17:47:44 -0700
 Subject: gin_enable_disable_v8_platform.patch
 
 
 diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
-index e3a23cf30e42..e099fd3f03e5 100644
+index e3a23cf30e42e11da1880c4ef13daf254b931d4b..e099fd3f03e56bbbf3ceab45edb8f4b8eb0b2b0f 100644
 --- a/gin/isolate_holder.cc
 +++ b/gin/isolate_holder.cc
 @@ -116,9 +116,10 @@ IsolateHolder::~IsolateHolder() {
@@ -22,7 +22,7 @@ index e3a23cf30e42..e099fd3f03e5 100644
    g_reference_table = reference_table;
  }
 diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
-index a70ad1ce51a9..84cf66e6e9cd 100644
+index a70ad1ce51a9e1ba3f4152bde9f1bb097ffe6341..84cf66e6e9cdbfcdc3d8f0a1f0c122e5994ef1c2 100644
 --- a/gin/public/isolate_holder.h
 +++ b/gin/public/isolate_holder.h
 @@ -83,7 +83,8 @@ class GIN_EXPORT IsolateHolder {
@@ -36,7 +36,7 @@ index a70ad1ce51a9..84cf66e6e9cd 100644
    v8::Isolate* isolate() { return isolate_; }
  
 diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-index be2b9149e440..816e56aa4f6b 100644
+index be2b9149e4407a7a946aa9fd240781fe25e9a51e..816e56aa4f6becbc8840ca567b30e874d72825fb 100644
 --- a/gin/v8_initializer.cc
 +++ b/gin/v8_initializer.cc
 @@ -236,12 +236,14 @@ LoadV8FileResult MapOpenedFile(const OpenedFileMap::mapped_type& file_region,
@@ -57,7 +57,7 @@ index be2b9149e440..816e56aa4f6b 100644
    if (base::FeatureList::IsEnabled(features::kV8OptimizeJavascript)) {
      static const char optimize[] = "--opt";
 diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h
-index 6f3265ba4d06..29f28bebbdcd 100644
+index 6f3265ba4d06e70930630432bf739f89847d0b3c..29f28bebbdcde5a7f1c7b31a625d30f1b8079c39 100644
 --- a/gin/v8_initializer.h
 +++ b/gin/v8_initializer.h
 @@ -21,7 +21,8 @@ class GIN_EXPORT V8Initializer {
@@ -70,6 +70,3 @@ index 6f3265ba4d06..29f28bebbdcd 100644
  
    // Get address and size information for currently loaded snapshot.
    // If no snapshot is loaded, the return values are null for addresses
--- 
-2.17.0
-

patches/common/chromium/gritsettings_resource_ids.patch

@@ -1,5 +1,12 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: deepak1556 <hop2deep@gmail.com>
+Date: Thu, 18 Oct 2018 17:07:17 -0700
+Subject: gritsettings_resource_ids.patch
+
+Add electron resources file to the list of resource ids generation.
+
 diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
-index efa6e5c90b88..a40476bb9c87 100644
+index efa6e5c90b88c25f412ad4e49c94f82a87f0f456..a40476bb9c8794f1db05b930e80ad483759a3508 100644
 --- a/tools/gritsettings/resource_ids
 +++ b/tools/gritsettings/resource_ids
 @@ -407,6 +407,11 @@

patches/common/chromium/gtk_visibility.patch

@@ -1,4 +1,4 @@
-From cac9e74e69a7f46b9e1f7b719b17e9a7167d3836 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Apthorp <nornagon@nornagon.net>
 Date: Thu, 20 Sep 2018 17:48:38 -0700
 Subject: gtk_visibility.patch
@@ -18,6 +18,3 @@ index deae4d3455a8..fd5d906b98b0 100644
      "//examples:peerconnection_client",
      "//gpu/gles2_conform_support:gles2_conform_test_windowless",
      "//remoting/host",
--- 
-2.17.0
-

patches/common/chromium/ignore_rc_check.patch

@@ -1,4 +1,4 @@
-From 6b31ce372295634832d0c2aa28534c8f4cc885f3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Zac Walker <zac.walker@microsoft.com>
 Date: Thu, 20 Sep 2018 17:49:55 -0700
 Subject: ignore_rc_check.patch
@@ -7,7 +7,7 @@ Dont compare RC.exe and RC.py output.
 FIXME: It has to be reverted once the script is fixed.
 
 diff --git a/build/toolchain/win/tool_wrapper.py b/build/toolchain/win/tool_wrapper.py
-index ee21eb4b194b..ab98a033a61c 100644
+index cb0393ecd507b865169e9d7c3037d7d5523ae30e..34eebb06295b38dfa0b567f66780ce144b6b5f34 100644
 --- a/build/toolchain/win/tool_wrapper.py
 +++ b/build/toolchain/win/tool_wrapper.py
 @@ -231,7 +231,11 @@ class WinTool(object):
@@ -23,6 +23,3 @@ index ee21eb4b194b..ab98a033a61c 100644
      return rc_exe_exit_code
  
    def ExecActionWrapper(self, arch, rspfile, *dirname):
--- 
-2.17.0
-

patches/common/chromium/isolate_holder.patch

@@ -1,5 +1,14 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <samuel.r.attard@gmail.com>
+Date: Thu, 18 Oct 2018 17:07:27 -0700
+Subject: isolate_holder.patch
+
+Pass pre allocated isolate for initialization, node platform
+needs to register on an isolate so that it can be used later
+down in the initialization process of an isolate.
+
 diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
-index e099fd3f03e5..4b362843e4f8 100644
+index e099fd3f03e56bbbf3ceab45edb8f4b8eb0b2b0f..4b362843e4f8f3a1e2abfa152a51554b1d36dd96 100644
 --- a/gin/isolate_holder.cc
 +++ b/gin/isolate_holder.cc
 @@ -46,7 +46,8 @@ IsolateHolder::IsolateHolder(
@@ -26,7 +35,7 @@ index e099fd3f03e5..4b362843e4f8 100644
        new PerIsolateData(isolate_, allocator, access_mode_, task_runner));
    if (isolate_creation_mode == IsolateCreationMode::kCreateSnapshot) {
 diff --git a/gin/public/isolate_holder.h b/gin/public/isolate_holder.h
-index 84cf66e6e9cd..cc0d65e4e4be 100644
+index 84cf66e6e9cdbfcdc3d8f0a1f0c122e5994ef1c2..cc0d65e4e4be5818d526c0a46a60e1165697cac0 100644
 --- a/gin/public/isolate_holder.h
 +++ b/gin/public/isolate_holder.h
 @@ -66,7 +66,8 @@ class GIN_EXPORT IsolateHolder {

patches/common/chromium/leveldb_ssize_t.patch

@@ -1,4 +1,4 @@
-From 070bbbe44c20c52f5e12b04b01fc101a42633119 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Apthorp <jeremya@chromium.org>
 Date: Thu, 20 Sep 2018 17:50:38 -0700
 Subject: leveldb_ssize_t.patch
@@ -8,7 +8,7 @@ Windows by preventing leveldb from re-defining the type if it's
 already defined.
 
 diff --git a/third_party/leveldatabase/port/port_chromium.h b/third_party/leveldatabase/port/port_chromium.h
-index a7c449eba19c..acbce7efd582 100644
+index a7c449eba19c3e3f46eec9c428fb497f6b1a7852..acbce7efd582e226419054cf80e1c27f4919b2fb 100644
 --- a/third_party/leveldatabase/port/port_chromium.h
 +++ b/third_party/leveldatabase/port/port_chromium.h
 @@ -26,7 +26,11 @@
@@ -23,6 +23,3 @@ index a7c449eba19c..acbce7efd582 100644
  #endif
  
  namespace leveldb {
--- 
-2.17.0
-

patches/common/chromium/libgtkui_export.patch

@@ -1,4 +1,4 @@
-From 4eacd7975250d8954e461f880d6bb97dcb4b003d Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Apthorp <nornagon@nornagon.net>
 Date: Thu, 20 Sep 2018 17:48:31 -0700
 Subject: libgtkui_export.patch
@@ -6,7 +6,7 @@ Subject: libgtkui_export.patch
 Export libgtkui symbols for the GN component build.
 
 diff --git a/chrome/browser/ui/libgtkui/app_indicator_icon.h b/chrome/browser/ui/libgtkui/app_indicator_icon.h
-index 7815fbb2cea8..f17a5c59e64b 100644
+index 7815fbb2cea8d3c3434287fa32c57e095199c217..f17a5c59e64b22ef0b864c3b8dd2dcb8b17d0c84 100644
 --- a/chrome/browser/ui/libgtkui/app_indicator_icon.h
 +++ b/chrome/browser/ui/libgtkui/app_indicator_icon.h
 @@ -12,6 +12,7 @@
@@ -27,7 +27,7 @@ index 7815fbb2cea8..f17a5c59e64b 100644
    // The id uniquely identifies the new status icon from other chrome status
    // icons.
 diff --git a/chrome/browser/ui/libgtkui/gtk_status_icon.h b/chrome/browser/ui/libgtkui/gtk_status_icon.h
-index e4e0da40981c..af028715ada9 100644
+index e4e0da40981ca58964dfdcbd3fc0f730c9c09ec1..af028715ada9b8023f0ff7cf60e0f7e7acd6c042 100644
 --- a/chrome/browser/ui/libgtkui/gtk_status_icon.h
 +++ b/chrome/browser/ui/libgtkui/gtk_status_icon.h
 @@ -10,6 +10,7 @@
@@ -48,7 +48,7 @@ index e4e0da40981c..af028715ada9 100644
    Gtk2StatusIcon(const gfx::ImageSkia& image, const base::string16& tool_tip);
    ~Gtk2StatusIcon() override;
 diff --git a/chrome/browser/ui/libgtkui/gtk_util.h b/chrome/browser/ui/libgtkui/gtk_util.h
-index d9f245070249..56cce5fa3e0b 100644
+index d9f245070249f5f153bd8fe11e0a5e718c7d3629..a0f033c3e3f7f3996897f5f969b2a209d7d5cf3f 100644
 --- a/chrome/browser/ui/libgtkui/gtk_util.h
 +++ b/chrome/browser/ui/libgtkui/gtk_util.h
 @@ -11,6 +11,7 @@
@@ -81,17 +81,17 @@ index d9f245070249..56cce5fa3e0b 100644
  
  // Gets the transient parent aura window for |dialog|.
  aura::Window* GetAuraTransientParent(GtkWidget* dialog);
-@@ -190,7 +190,7 @@ void RenderBackground(const gfx::Size& size,
+@@ -193,7 +194,7 @@ void RenderBackground(const gfx::Size& size,
  // Renders a background from the style context created by
  // GetStyleContextFromCss(|css_selector|) into a 24x24 bitmap and
  // returns the average color.
 -SkColor GetBgColor(const std::string& css_selector);
 +LIBGTKUI_EXPORT SkColor GetBgColor(const std::string& css_selector);
-
+ 
  // Renders the border from the style context created by
  // GetStyleContextFromCss(|css_selector|) into a 24x24 bitmap and
 diff --git a/chrome/browser/ui/libgtkui/skia_utils_gtk.h b/chrome/browser/ui/libgtkui/skia_utils_gtk.h
-index e05fbe9d8b2f..3afca9a72ab6 100644
+index e05fbe9d8b2fe537a5eecbd3642dcc9eb848f3d7..3afca9a72ab69fed0144cfff8159aff5a480c4f5 100644
 --- a/chrome/browser/ui/libgtkui/skia_utils_gtk.h
 +++ b/chrome/browser/ui/libgtkui/skia_utils_gtk.h
 @@ -7,6 +7,7 @@
@@ -112,7 +112,7 @@ index e05fbe9d8b2f..3afca9a72ab6 100644
  }  // namespace libgtkui
  
 diff --git a/chrome/browser/ui/libgtkui/unity_service.h b/chrome/browser/ui/libgtkui/unity_service.h
-index 8d67e1460837..95fbb27b6a81 100644
+index 8d67e1460837c7f8adb151adea131cc6440659a3..95fbb27b6a81e4d73d239e94f5105078a936b5af 100644
 --- a/chrome/browser/ui/libgtkui/unity_service.h
 +++ b/chrome/browser/ui/libgtkui/unity_service.h
 @@ -5,18 +5,20 @@
@@ -139,6 +139,3 @@ index 8d67e1460837..95fbb27b6a81 100644
  
  }  // namespace unity
  
--- 
-2.17.0
-

patches/common/chromium/mas-audiodeviceduck.patch

@@ -1,4 +1,4 @@
-From 2a1f4c039a4522620daea2898870c220318d539a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Apthorp <nornagon@nornagon.net>
 Date: Thu, 20 Sep 2018 17:49:31 -0700
 Subject: mas-audiodeviceduck.patch
@@ -6,7 +6,7 @@ Subject: mas-audiodeviceduck.patch
 Removes usage of the AudioDeviceDuck private API.
 
 diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
-index 53586b888d82..c1d750dbf32d 100644
+index 53586b888d82b9602e3f76b84072a1e6a7df1ec0..c1d750dbf32d9c56d557e5bf5ff5d63a3abe12ef 100644
 --- a/media/audio/mac/audio_low_latency_input_mac.cc
 +++ b/media/audio/mac/audio_low_latency_input_mac.cc
 @@ -31,19 +31,23 @@
@@ -33,6 +33,3 @@ index 53586b888d82..c1d750dbf32d 100644
  }
  
  }  // namespace
--- 
-2.17.0
-

patches/common/chromium/mas-cfisobjc.patch

@@ -1,4 +1,4 @@
-From 715baf9c695bdfffc525cc2984306768bfa7140e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Apthorp <nornagon@nornagon.net>
 Date: Thu, 20 Sep 2018 17:49:20 -0700
 Subject: mas-cfisobjc.patch
@@ -6,7 +6,7 @@ Subject: mas-cfisobjc.patch
 Removes usage of the _CFIsObjC private API.
 
 diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
-index 15fc15ba307e..7ca4e0ec5ca8 100644
+index 15fc15ba307e18f438852f00f41b2f5ecf7ff85f..7ca4e0ec5ca87f34e0baa22ba0b704e25fe7ca21 100644
 --- a/base/mac/foundation_util.mm
 +++ b/base/mac/foundation_util.mm
 @@ -26,7 +26,6 @@ CFTypeID SecKeyGetTypeID();
@@ -37,6 +37,3 @@ index 15fc15ba307e..7ca4e0ec5ca8 100644
    id<NSObject> ns_val = reinterpret_cast<id>(const_cast<void*>(cf_val));
    if ([ns_val isKindOfClass:[NSFont class]]) {
      return (CTFontRef)(cf_val);
--- 
-2.17.0
-

patches/common/chromium/mas-cgdisplayusesforcetogray.patch

@@ -1,4 +1,4 @@
-From a767540b22c787e0ec6809f275e7cba5f9048792 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Apthorp <nornagon@nornagon.net>
 Date: Thu, 20 Sep 2018 17:49:24 -0700
 Subject: mas-cgdisplayusesforcetogray.patch
@@ -6,7 +6,7 @@ Subject: mas-cgdisplayusesforcetogray.patch
 Removes usage of the CGDisplayUsesForceToGray private API.
 
 diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm
-index 99a128511250..7200a5df74e1 100644
+index 99a128511250d594cdac79ebf9b291823db18962..7200a5df74e168b817f7e7598b7fce8b41c6515c 100644
 --- a/ui/display/mac/screen_mac.mm
 +++ b/ui/display/mac/screen_mac.mm
 @@ -106,7 +106,17 @@ Display BuildDisplayForScreen(NSScreen* screen) {
@@ -27,6 +27,3 @@ index 99a128511250..7200a5df74e1 100644
  
    // CGDisplayRotation returns a double. Display::SetRotationAsDegree will
    // handle the unexpected situations were the angle is not a multiple of 90.
--- 
-2.17.0
-

patches/common/chromium/mas-lssetapplicationlaunchservicesserverconnectionstatus.patch

@@ -1,4 +1,4 @@
-From c7042021cfd9d4e50b107e372225a14f7492bce5 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jeremy Apthorp <nornagon@nornagon.net>
 Date: Thu, 20 Sep 2018 17:49:34 -0700
 Subject: mas-lssetapplicationlaunchservicesserverconnectionstatus.patch
@@ -7,7 +7,7 @@ Removes usage of the _LSSetApplicationLaunchServicesServerConnectionStatus
 private API.
 
 diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
-index f14c045d47ad..9c8751a6fe0b 100644
+index f14c045d47add3159e9099a8bdb511b233a2911b..9c8751a6fe0bcd0c69cc47dbbcf4fcc8a5c6684f 100644
 --- a/content/gpu/gpu_main.cc
 +++ b/content/gpu/gpu_main.cc
 @@ -274,8 +274,10 @@ int GpuMain(const MainFunctionParams& parameters) {
@@ -21,6 +21,3 @@ index f14c045d47ad..9c8751a6fe0b 100644
  #else
      main_message_loop.reset(
          new base::MessageLoop(base::MessageLoop::TYPE_DEFAULT));
--- 
-2.17.0
-

patches/common/chromium/mas_blink_no_private_api.patch

@@ -1,4 +1,4 @@
-From b75117921e735e5d892a7320e1ebec84a2c2fd1a Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <zcbenz@gmail.com>
 Date: Thu, 20 Sep 2018 17:48:49 -0700
 Subject: mas_blink_no_private_api.patch
@@ -7,7 +7,7 @@ Guard usages in chromium code of private Mac APIs by MAS_BUILD, so they can
 be excluded for people who want to submit their apps to the Mac App store.
 
 diff --git a/third_party/blink/renderer/core/editing/kill_ring_mac.mm b/third_party/blink/renderer/core/editing/kill_ring_mac.mm
-index 94afefcee81b..2ec7f04c7182 100644
+index 94afefcee81b87c05bf9b1199d90d3d4b5ea84a6..2ec7f04c71824b47de1ddbf1f0e8625d33e833a8 100644
 --- a/third_party/blink/renderer/core/editing/kill_ring_mac.mm
 +++ b/third_party/blink/renderer/core/editing/kill_ring_mac.mm
 @@ -27,6 +27,7 @@
@@ -73,7 +73,7 @@ index 94afefcee81b..2ec7f04c7182 100644
  
  }  // namespace blink
 diff --git a/third_party/blink/renderer/core/paint/theme_painter_mac.mm b/third_party/blink/renderer/core/paint/theme_painter_mac.mm
-index 7a1260db0a13..bf9cf7046e2f 100644
+index 7a1260db0a139f9f3f8a823af2c220f36162812a..bf9cf7046e2fc9cdfee5b92f2a348185cc00b944 100644
 --- a/third_party/blink/renderer/core/paint/theme_painter_mac.mm
 +++ b/third_party/blink/renderer/core/paint/theme_painter_mac.mm
 @@ -42,6 +42,7 @@
@@ -118,6 +118,3 @@ index 7a1260db0a13..bf9cf7046e2f 100644
    return false;
  }
  
--- 
-2.17.0
-

patches/common/chromium/mas_no_private_api.patch

@@ -1,4 +1,4 @@
-From c353972f86d7c8afea19128dd404f4532b3ac9c1 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <zcbenz@gmail.com>
 Date: Tue, 9 Oct 2018 10:36:20 -0700
 Subject: mas_no_private_api.patch
@@ -7,7 +7,7 @@ Guard usages in blink of private Mac APIs by MAS_BUILD, so they can be
 excluded for people who want to submit their apps to the Mac App store.
 
 diff --git a/content/browser/accessibility/browser_accessibility_cocoa.h b/content/browser/accessibility/browser_accessibility_cocoa.h
-index 44c85b5ad571..1714c403edf2 100644
+index 44c85b5ad571c39c4580cb9d0cdf08f694c1dfb4..1714c403edf21092e43192f25cf0c19f50dd8486 100644
 --- a/content/browser/accessibility/browser_accessibility_cocoa.h
 +++ b/content/browser/accessibility/browser_accessibility_cocoa.h
 @@ -111,7 +111,9 @@ struct AXTextEdit {
@@ -38,7 +38,7 @@ index 44c85b5ad571..1714c403edf2 100644
  // is concerned.
  @property(nonatomic, readonly) NSString* subrole;
 diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
-index 07e9862b76a9..efa52aa9de2f 100644
+index 07e9862b76a920438a779f22d67d3a45ab39abf7..efa52aa9de2f819f28109978c8cef518325ef70a 100644
 --- a/content/browser/accessibility/browser_accessibility_cocoa.mm
 +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
 @@ -135,6 +135,7 @@ NSDictionary* attributeToMethodNameMap = nil;
@@ -181,7 +181,7 @@ index 07e9862b76a9..efa52aa9de2f 100644
    return nil;
  }
 diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
-index 8e32a0822607..93bb7273684f 100644
+index 8e32a08226079c6d7515b8e784babacb3226ecd6..93bb7273684fa529bdc6049af2ed379f8b059397 100644
 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
 +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
 @@ -437,6 +437,7 @@ NSDictionary* BrowserAccessibilityManagerMac::
@@ -201,7 +201,7 @@ index 8e32a0822607..93bb7273684f 100644
    }
  
 diff --git a/content/renderer/renderer_main_platform_delegate_mac.mm b/content/renderer/renderer_main_platform_delegate_mac.mm
-index 1e2cc38d3868..daa934c345e2 100644
+index 1e2cc38d3868ceccf8e45f5f82f57bcaa478f982..daa934c345e2686fd2174b7721d0f69a2d094692 100644
 --- a/content/renderer/renderer_main_platform_delegate_mac.mm
 +++ b/content/renderer/renderer_main_platform_delegate_mac.mm
 @@ -22,6 +22,7 @@
@@ -237,7 +237,7 @@ index 1e2cc38d3868..daa934c345e2 100644
  
  // You are about to read a pretty disgusting hack. In a static initializer,
 diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm
-index 8b2092ec78f9..4f2ee8e28097 100644
+index 8b2092ec78f9f6bc1bd4c8af21ada74538f54d29..4f2ee8e2809790df68aedcee0946263143c7e758 100644
 --- a/device/bluetooth/bluetooth_adapter_mac.mm
 +++ b/device/bluetooth/bluetooth_adapter_mac.mm
 @@ -34,6 +34,7 @@
@@ -281,7 +281,7 @@ index 8b2092ec78f9..4f2ee8e28097 100644
  
  void BluetoothAdapterMac::RemovePairingDelegateInternal(
 diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
-index 585ad87c6cb4..4305c2e67dcc 100644
+index 585ad87c6cb45d199bec8ed6e2430139546c83c2..4305c2e67dccb94a6cacd0664783906473f219e9 100644
 --- a/media/audio/BUILD.gn
 +++ b/media/audio/BUILD.gn
 @@ -196,6 +196,12 @@ source_set("audio") {
@@ -298,7 +298,7 @@ index 585ad87c6cb4..4305c2e67dcc 100644
        "AudioToolbox.framework",
        "AudioUnit.framework",
 diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc
-index 74dd21d45b4f..d7dd95b4d461 100644
+index 74dd21d45b4ff8da203ef7d759bbccf05033f862..d7dd95b4d461981c36061d1031c932fcb6f2e31b 100644
 --- a/media/audio/mac/audio_manager_mac.cc
 +++ b/media/audio/mac/audio_manager_mac.cc
 @@ -868,7 +868,7 @@ AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters(
@@ -311,7 +311,7 @@ index 74dd21d45b4f..d7dd95b4d461 100644
  }
  
 diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
-index 06e9d7969c0f..6fc766e981fd 100644
+index 06e9d7969c0f21726de216cd670e4752c8aff6ab..6fc766e981fdc59fcbb3c0780fde87c5cd953e2d 100644
 --- a/net/dns/dns_config_service_posix.cc
 +++ b/net/dns/dns_config_service_posix.cc
 @@ -242,6 +242,7 @@ class DnsConfigServicePosix::Watcher {
@@ -331,7 +331,7 @@ index 06e9d7969c0f..6fc766e981fd 100644
    }
  
 diff --git a/sandbox/mac/sandbox_compiler.cc b/sandbox/mac/sandbox_compiler.cc
-index e524aa7b8510..718d3f963da5 100644
+index e524aa7b851022abed1edac39e18d8d92e5349b4..718d3f963da5c1a15a1bdb0e6043f89bc0f940f8 100644
 --- a/sandbox/mac/sandbox_compiler.cc
 +++ b/sandbox/mac/sandbox_compiler.cc
 @@ -28,6 +28,7 @@ bool SandboxCompiler::InsertStringParam(const std::string& key,
@@ -351,7 +351,7 @@ index e524aa7b8510..718d3f963da5 100644
  }
  
 diff --git a/sandbox/mac/seatbelt.cc b/sandbox/mac/seatbelt.cc
-index dfba0bded9e3..876f96999f53 100644
+index dfba0bded9e34be276ed111cbab44210a95b9875..876f96999f53b4666508f783a33cea245d1bc03e 100644
 --- a/sandbox/mac/seatbelt.cc
 +++ b/sandbox/mac/seatbelt.cc
 @@ -64,7 +64,11 @@ void Seatbelt::FreeError(char* errorbuf) {
@@ -367,7 +367,7 @@ index dfba0bded9e3..876f96999f53 100644
  
  }  // namespace sandbox
 diff --git a/sandbox/mac/seatbelt_extension.cc b/sandbox/mac/seatbelt_extension.cc
-index 9073364142e8..2356add74dfa 100644
+index 9073364142e8f98c8872d9b5509f92f433e06624..2356add74dfae98299a4e2b207aa26fc109f47f3 100644
 --- a/sandbox/mac/seatbelt_extension.cc
 +++ b/sandbox/mac/seatbelt_extension.cc
 @@ -8,6 +8,7 @@
@@ -423,7 +423,7 @@ index 9073364142e8..2356add74dfa 100644
        NOTREACHED();
        return nullptr;
 diff --git a/ui/views/cocoa/bridged_native_widget.mm b/ui/views/cocoa/bridged_native_widget.mm
-index 69c5f1f44d7e..8841b59f6b70 100644
+index 69c5f1f44d7e39e8480319b3da02725b5cb89eea..8841b59f6b70ac4687adfde61a1fba1424e57e48 100644
 --- a/ui/views/cocoa/bridged_native_widget.mm
 +++ b/ui/views/cocoa/bridged_native_widget.mm
 @@ -43,6 +43,7 @@
@@ -442,6 +442,3 @@ index 69c5f1f44d7e..8841b59f6b70 100644
  namespace {
  constexpr auto kUIPaintTimeout = base::TimeDelta::FromSeconds(5);
  }  // namespace
--- 
-2.17.0
-

patches/common/chromium/net_url_request_job.patch

@@ -1,11 +1,11 @@
-From 49270a5ff41a1808c33e61e832e251979670f6f7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <zcbenz@gmail.com>
 Date: Thu, 20 Sep 2018 17:46:06 -0700
 Subject: net_url_request_job.patch
 
 
 diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
-index 7a2239587510..08a3940915c6 100644
+index 7a223958751012b2042a91edf85578b00702d565..08a3940915c61746c7bf80d24400875099f9686c 100644
 --- a/net/url_request/url_request_job.h
 +++ b/net/url_request/url_request_job.h
 @@ -292,6 +292,7 @@ class NET_EXPORT URLRequestJob : public base::PowerObserver {
@@ -16,6 +16,3 @@ index 7a2239587510..08a3940915c6 100644
    // Called to read raw (pre-filtered) data from this Job. Reads at most
    // |buf_size| bytes into |buf|.
    // Possible return values:
--- 
-2.17.0
-

patches/common/chromium/no_cache_storage_check.patch

@@ -1,4 +1,4 @@
-From 528adce1472de7f07de909d451c215c474f9c646 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Cheng Zhao <zcbenz@gmail.com>
 Date: Thu, 20 Sep 2018 17:48:16 -0700
 Subject: no_cache_storage_check.patch
@@ -7,7 +7,7 @@ Do not check for unique origin in CacheStorage, in Electron we may have
 scripts running without an origin.
 
 diff --git a/content/browser/cache_storage/cache_storage.cc b/content/browser/cache_storage/cache_storage.cc
-index d91b54a4d2a1..7f946a5a04c9 100644
+index d91b54a4d2a15f4d48f6e82488e0c27c68c5abdb..7f946a5a04c97635f783aeecebc13fc20b26631e 100644
 --- a/content/browser/cache_storage/cache_storage.cc
 +++ b/content/browser/cache_storage/cache_storage.cc
 @@ -132,7 +132,7 @@ class CacheStorage::CacheLoader {
@@ -19,6 +19,3 @@ index d91b54a4d2a1..7f946a5a04c9 100644
    }
  
    virtual ~CacheLoader() {}
--- 
-2.17.0
-

patches/common/chromium/no_stack_dumping.patch

@@ -1,11 +1,11 @@
-From 643954ec09f12c4d97767cbfcfb24e92fbcd5230 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Aleksei Kuzmin <alkuzmin@microsoft.com>
 Date: Thu, 20 Sep 2018 17:46:10 -0700
 Subject: no_stack_dumping.patch
 
 
 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index 8d789ef1b9f7..034fdcad958c 100644
+index 8d789ef1b9f76aacbf1bc8c13b79de04618b9141..034fdcad958cb25780c304d184b2fbb721a13200 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
 @@ -835,7 +835,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
@@ -17,6 +17,3 @@ index 8d789ef1b9f7..034fdcad958c 100644
  #if defined(OS_WIN)
      bool should_enable_stack_dump = !process_type.empty();
  #else
--- 
-2.17.0
-