From d4b44d8b69c157d3f6f54b8875cf1f15ea345ba3 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Thu, 1 Dec 2016 18:19:57 -0800
Subject: [PATCH 01/11] Expose crash reporter start for child node processes

---
 atom/app/node_main.cc            |  8 +++++---
 atom/common/api/atom_bindings.cc | 35 ++++++++++++++++++++++++++------
 atom/common/api/atom_bindings.h  |  9 ++++++++
 default_app/default_app.js       |  7 ++++++-
 default_app/forkedProcess.js     | 12 +++++++++++
 default_app/index.html           | 17 +++++++++++++++-
 6 files changed, 77 insertions(+), 11 deletions(-)
 create mode 100644 default_app/forkedProcess.js

diff --git a/atom/app/node_main.cc b/atom/app/node_main.cc
index af8974fb29..5f12d9602e 100644
--- a/atom/app/node_main.cc
+++ b/atom/app/node_main.cc
@@ -14,11 +14,11 @@
 #include "gin/public/isolate_holder.h"
 #include "gin/v8_initializer.h"
 
-#if defined(OS_WIN)
+
 #include "atom/common/api/atom_bindings.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "native_mate/dictionary.h"
-#endif
+
 
 #include "atom/common/node_includes.h"
 
@@ -58,10 +58,12 @@ int NodeMain(int argc, char *argv[]) {
     if (node_debugger.IsRunning())
       env->AssignToContext(v8::Debug::GetDebugContext(gin_env.isolate()));
 
-#if defined(OS_WIN)
     mate::Dictionary process(gin_env.isolate(), env->process_object());
+#if defined(OS_WIN)
     process.SetMethod("log", &AtomBindings::Log);
 #endif
+    process.SetMethod("startCrashReporter", &AtomBindings::StartCrashReporter);
+    process.SetMethod("crash", &AtomBindings::Crash);
 
     node::LoadEnvironment(env);
 
diff --git a/atom/common/api/atom_bindings.cc b/atom/common/api/atom_bindings.cc
index 9173a10a38..2ea6d28463 100644
--- a/atom/common/api/atom_bindings.cc
+++ b/atom/common/api/atom_bindings.cc
@@ -6,10 +6,12 @@
 
 #include <algorithm>
 #include <iostream>
+#include <map>
 #include <string>
 
 #include "atom/common/atom_version.h"
 #include "atom/common/chrome_version.h"
+#include "atom/common/crash_reporter/crash_reporter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "atom/common/node_includes.h"
 #include "base/logging.h"
@@ -23,10 +25,6 @@ namespace {
 // Dummy class type that used for crashing the program.
 struct DummyClass { bool crash; };
 
-void Crash() {
-  static_cast<DummyClass*>(nullptr)->crash = true;
-}
-
 void Hang() {
   for (;;)
     base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1));
@@ -76,7 +74,7 @@ v8::Local<v8::Value> GetSystemMemoryInfo(v8::Isolate* isolate,
 // we can get the stack trace.
 void FatalErrorCallback(const char* location, const char* message) {
   LOG(ERROR) << "Fatal error in V8: " << location << " " << message;
-  Crash();
+  AtomBindings::Crash();
 }
 
 }  // namespace
@@ -95,7 +93,7 @@ void AtomBindings::BindTo(v8::Isolate* isolate,
   v8::V8::SetFatalErrorHandler(FatalErrorCallback);
 
   mate::Dictionary dict(isolate, process);
-  dict.SetMethod("crash", &Crash);
+  dict.SetMethod("crash", &AtomBindings::Crash);
   dict.SetMethod("hang", &Hang);
   dict.SetMethod("log", &Log);
   dict.SetMethod("getProcessMemoryInfo", &GetProcessMemoryInfo);
@@ -159,4 +157,29 @@ void AtomBindings::Log(const base::string16& message) {
   std::cout << message << std::flush;
 }
 
+void AtomBindings::Crash() {
+  static_cast<DummyClass*>(nullptr)->crash = true;
+}
+
+void AtomBindings::StartCrashReporter(
+    const std::string& productName,
+    const std::string& companyName,
+    const std::string& submitUrl,
+    const std::string& tmpPath,
+    const std::map<std::string, std::string>& extra_parameters) {
+  std::map<std::string, std::string> allParameters;
+  allParameters.insert(std::make_pair("_productName", productName));
+  allParameters.insert(std::make_pair("_companyName", companyName));
+  allParameters.insert(extra_parameters.begin(), extra_parameters.end());
+
+  auto reporter = crash_reporter::CrashReporter::GetInstance();
+  reporter->Start(productName,
+                  companyName,
+                  submitUrl,
+                  base::FilePath(tmpPath),
+                  true,
+                  false,
+                  allParameters);
+}
+
 }  // namespace atom
diff --git a/atom/common/api/atom_bindings.h b/atom/common/api/atom_bindings.h
index 2e4c4a937b..108682d46e 100644
--- a/atom/common/api/atom_bindings.h
+++ b/atom/common/api/atom_bindings.h
@@ -6,6 +6,8 @@
 #define ATOM_COMMON_API_ATOM_BINDINGS_H_
 
 #include <list>
+#include <map>
+#include <string>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
@@ -28,6 +30,13 @@ class AtomBindings {
   void BindTo(v8::Isolate* isolate, v8::Local<v8::Object> process);
 
   static void Log(const base::string16& message);
+  static void Crash();
+  static void StartCrashReporter(
+    const std::string& productName,
+    const std::string& companyName,
+    const std::string& submitUrl,
+    const std::string& tmpPath,
+    const std::map<std::string, std::string>& extra_parameters);
 
  private:
   void ActivateUVLoop(v8::Isolate* isolate);
diff --git a/default_app/default_app.js b/default_app/default_app.js
index bfb97a9ab0..989dac5c58 100644
--- a/default_app/default_app.js
+++ b/default_app/default_app.js
@@ -1,4 +1,4 @@
-const {app, BrowserWindow} = require('electron')
+const {app, BrowserWindow, crashReporter} = require('electron')
 const path = require('path')
 
 let mainWindow = null
@@ -20,6 +20,11 @@ exports.load = (appUrl) => {
     if (process.platform === 'linux') {
       options.icon = path.join(__dirname, 'icon.png')
     }
+    crashReporter.start({
+      submitURL: "http://localhost:8080/uploadDump/mainDump",
+      companyName: "Main Company",
+      productName: "Main Product"
+    })
 
     mainWindow = new BrowserWindow(options)
     mainWindow.loadURL(appUrl)
diff --git a/default_app/forkedProcess.js b/default_app/forkedProcess.js
new file mode 100644
index 0000000000..6d61392015
--- /dev/null
+++ b/default_app/forkedProcess.js
@@ -0,0 +1,12 @@
+const os = require('os')
+const path = require('path')
+
+let productName = 'Child Product';
+let companyName = 'Child Company';
+let tmpPath = path.join(os.tmpdir(), productName + ' Crashes');
+
+process.startCrashReporter(productName, companyName, 'http://localhost:8080/uploadDump/childDump', tmpPath, {
+    randomData1: 'The Holidays are here!',
+    randomData2: 'Happy New Year!'
+});
+process.crash();
diff --git a/default_app/index.html b/default_app/index.html
index 292fd119b2..bc77cbb560 100644
--- a/default_app/index.html
+++ b/default_app/index.html
@@ -114,11 +114,24 @@
 </head>
 <body>
   <script>
-    const {remote, shell} = require('electron');
+    const {remote, shell, crashReporter} = require('electron');
+    const cp = require('child_process')
 
     const execPath = remote.process.execPath;
     const command = execPath + ' path-to-your-app';
 
+    crashReporter.start({
+        productName: 'Renderer Product',
+        companyName: 'Renderer Company',
+        submitURL: 'http://localhost:8080/uploadDump/rendererDump'
+      });
+
+    document.addEventListener("DOMContentLoaded", function(event) { 
+      document.getElementById('crashMe').addEventListener('click', () => {
+          cp.fork('./default_app/forkedProcess')
+      })
+    });
+
     document.onclick = function(e) {
       e.preventDefault();
       if (e.target.tagName == 'A')
@@ -157,6 +170,8 @@
 
   <div class="container">
 
+    <button id="crashMe">Fork a process which crashes</button>
+
     <p>
     To run your app with Electron, execute the following command in your
     Console (or Terminal):

From 1f07cf2545a68a2f9234c776515a8ab85a40bcfe Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Fri, 9 Dec 2016 01:44:12 -0800
Subject: [PATCH 02/11] Add crashReporter property to process

---
 atom/app/node_main.cc            |  6 +++++-
 atom/common/api/atom_bindings.cc | 25 ++++++++++++-------------
 atom/common/api/atom_bindings.h  |  8 ++++----
 default_app/forkedProcess.js     |  2 +-
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/atom/app/node_main.cc b/atom/app/node_main.cc
index 5f12d9602e..aaf9257fe5 100644
--- a/atom/app/node_main.cc
+++ b/atom/app/node_main.cc
@@ -62,9 +62,13 @@ int NodeMain(int argc, char *argv[]) {
 #if defined(OS_WIN)
     process.SetMethod("log", &AtomBindings::Log);
 #endif
-    process.SetMethod("startCrashReporter", &AtomBindings::StartCrashReporter);
     process.SetMethod("crash", &AtomBindings::Crash);
 
+    v8::Local<v8::Object> crashReporterObj = v8::Object::New(env->isolate());
+    mate::Dictionary crashReporterDict(gin_env.isolate(), crashReporterObj);
+    crashReporterDict.SetMethod("start", &AtomBindings::StartCrashReporter);
+    process.Set("crashReporter", crashReporterObj);
+
     node::LoadEnvironment(env);
 
     bool more;
diff --git a/atom/common/api/atom_bindings.cc b/atom/common/api/atom_bindings.cc
index 2ea6d28463..eed02f5785 100644
--- a/atom/common/api/atom_bindings.cc
+++ b/atom/common/api/atom_bindings.cc
@@ -162,24 +162,23 @@ void AtomBindings::Crash() {
 }
 
 void AtomBindings::StartCrashReporter(
-    const std::string& productName,
-    const std::string& companyName,
-    const std::string& submitUrl,
-    const std::string& tmpPath,
+    const std::string& product_name,
+    const std::string& company_name,
+    const std::string& submit_url,
+    const std::string& tmp_path,
     const std::map<std::string, std::string>& extra_parameters) {
-  std::map<std::string, std::string> allParameters;
-  allParameters.insert(std::make_pair("_productName", productName));
-  allParameters.insert(std::make_pair("_companyName", companyName));
-  allParameters.insert(extra_parameters.begin(), extra_parameters.end());
+  auto all_parameters = extra_parameters;
+  all_parameters["_productName"] = product_name;
+  all_parameters["_companyName"] = company_name;
 
   auto reporter = crash_reporter::CrashReporter::GetInstance();
-  reporter->Start(productName,
-                  companyName,
-                  submitUrl,
-                  base::FilePath(tmpPath),
+  reporter->Start(product_name,
+                  company_name,
+                  submit_url,
+                  base::FilePath(tmp_path),
                   true,
                   false,
-                  allParameters);
+                  all_parameters);
 }
 
 }  // namespace atom
diff --git a/atom/common/api/atom_bindings.h b/atom/common/api/atom_bindings.h
index 108682d46e..2be34c989f 100644
--- a/atom/common/api/atom_bindings.h
+++ b/atom/common/api/atom_bindings.h
@@ -32,10 +32,10 @@ class AtomBindings {
   static void Log(const base::string16& message);
   static void Crash();
   static void StartCrashReporter(
-    const std::string& productName,
-    const std::string& companyName,
-    const std::string& submitUrl,
-    const std::string& tmpPath,
+    const std::string& product_name,
+    const std::string& company_name,
+    const std::string& submit_url,
+    const std::string& tmp_path,
     const std::map<std::string, std::string>& extra_parameters);
 
  private:
diff --git a/default_app/forkedProcess.js b/default_app/forkedProcess.js
index 6d61392015..44a74801be 100644
--- a/default_app/forkedProcess.js
+++ b/default_app/forkedProcess.js
@@ -5,7 +5,7 @@ let productName = 'Child Product';
 let companyName = 'Child Company';
 let tmpPath = path.join(os.tmpdir(), productName + ' Crashes');
 
-process.startCrashReporter(productName, companyName, 'http://localhost:8080/uploadDump/childDump', tmpPath, {
+process.crashReporter.start(productName, companyName, 'http://localhost:8080/uploadDump/childDump', tmpPath, {
     randomData1: 'The Holidays are here!',
     randomData2: 'Happy New Year!'
 });

From 91f8d6092b183b35d4143c0d08491ac1b0b95074 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 12 Dec 2016 14:35:59 -0800
Subject: [PATCH 03/11] Take options object in process.crashReporter.start

---
 atom/common/api/atom_bindings.cc             | 23 ++++----------------
 atom/common/api/atom_bindings.h              | 10 ++-------
 atom/common/crash_reporter/crash_reporter.cc | 20 +++++++++++++++++
 atom/common/crash_reporter/crash_reporter.h  |  2 ++
 default_app/forkedProcess.js                 |  8 ++++++-
 5 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/atom/common/api/atom_bindings.cc b/atom/common/api/atom_bindings.cc
index eed02f5785..adc8f061ae 100644
--- a/atom/common/api/atom_bindings.cc
+++ b/atom/common/api/atom_bindings.cc
@@ -6,7 +6,6 @@
 
 #include <algorithm>
 #include <iostream>
-#include <map>
 #include <string>
 
 #include "atom/common/atom_version.h"
@@ -157,28 +156,14 @@ void AtomBindings::Log(const base::string16& message) {
   std::cout << message << std::flush;
 }
 
+// static
 void AtomBindings::Crash() {
   static_cast<DummyClass*>(nullptr)->crash = true;
 }
 
-void AtomBindings::StartCrashReporter(
-    const std::string& product_name,
-    const std::string& company_name,
-    const std::string& submit_url,
-    const std::string& tmp_path,
-    const std::map<std::string, std::string>& extra_parameters) {
-  auto all_parameters = extra_parameters;
-  all_parameters["_productName"] = product_name;
-  all_parameters["_companyName"] = company_name;
-
-  auto reporter = crash_reporter::CrashReporter::GetInstance();
-  reporter->Start(product_name,
-                  company_name,
-                  submit_url,
-                  base::FilePath(tmp_path),
-                  true,
-                  false,
-                  all_parameters);
+// static
+void AtomBindings::StartCrashReporter(const mate::Dictionary& options) {
+  crash_reporter::CrashReporter::GetInstance()->StartWithOptions(options);
 }
 
 }  // namespace atom
diff --git a/atom/common/api/atom_bindings.h b/atom/common/api/atom_bindings.h
index 2be34c989f..be5352ef1b 100644
--- a/atom/common/api/atom_bindings.h
+++ b/atom/common/api/atom_bindings.h
@@ -6,11 +6,10 @@
 #define ATOM_COMMON_API_ATOM_BINDINGS_H_
 
 #include <list>
-#include <map>
-#include <string>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
+#include "native_mate/dictionary.h"
 #include "v8/include/v8.h"
 #include "vendor/node/deps/uv/include/uv.h"
 
@@ -31,12 +30,7 @@ class AtomBindings {
 
   static void Log(const base::string16& message);
   static void Crash();
-  static void StartCrashReporter(
-    const std::string& product_name,
-    const std::string& company_name,
-    const std::string& submit_url,
-    const std::string& tmp_path,
-    const std::map<std::string, std::string>& extra_parameters);
+  static void StartCrashReporter(const mate::Dictionary& options);
 
  private:
   void ActivateUVLoop(v8::Isolate* isolate);
diff --git a/atom/common/crash_reporter/crash_reporter.cc b/atom/common/crash_reporter/crash_reporter.cc
index 5e13bd6fe5..28184445fd 100644
--- a/atom/common/crash_reporter/crash_reporter.cc
+++ b/atom/common/crash_reporter/crash_reporter.cc
@@ -6,6 +6,7 @@
 
 #include "atom/browser/browser.h"
 #include "atom/common/atom_version.h"
+#include "atom/common/native_mate_converters/file_path_converter.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_number_conversions.h"
@@ -22,6 +23,25 @@ CrashReporter::CrashReporter() {
 CrashReporter::~CrashReporter() {
 }
 
+void CrashReporter::StartWithOptions(const mate::Dictionary& options) {
+  std::string product_name;
+  options.Get("productName", &product_name);
+  std::string company_name;
+  options.Get("companyName", &company_name);
+  std::string submit_url;
+  options.Get("submitURL", &submit_url);
+  base::FilePath crashes_dir;
+  options.Get("crashesDirectory", &crashes_dir);
+  StringMap extra_parameters;
+  options.Get("extra", &extra_parameters);
+
+  extra_parameters["_productName"] = product_name;
+  extra_parameters["_companyName"] = company_name;
+
+  Start(product_name, company_name, submit_url, crashes_dir, true, false,
+        extra_parameters);
+}
+
 void CrashReporter::Start(const std::string& product_name,
                           const std::string& company_name,
                           const std::string& submit_url,
diff --git a/atom/common/crash_reporter/crash_reporter.h b/atom/common/crash_reporter/crash_reporter.h
index 6eb43d0a2d..c04b5d7ba2 100644
--- a/atom/common/crash_reporter/crash_reporter.h
+++ b/atom/common/crash_reporter/crash_reporter.h
@@ -12,6 +12,7 @@
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
+#include "native_mate/dictionary.h"
 
 namespace crash_reporter {
 
@@ -29,6 +30,7 @@ class CrashReporter {
              bool upload_to_server,
              bool skip_system_crash_handler,
              const StringMap& extra_parameters);
+  void StartWithOptions(const mate::Dictionary& options);
 
   virtual std::vector<CrashReporter::UploadReportResult> GetUploadedReports(
       const base::FilePath& crashes_dir);
diff --git a/default_app/forkedProcess.js b/default_app/forkedProcess.js
index 44a74801be..864b51ef68 100644
--- a/default_app/forkedProcess.js
+++ b/default_app/forkedProcess.js
@@ -5,8 +5,14 @@ let productName = 'Child Product';
 let companyName = 'Child Company';
 let tmpPath = path.join(os.tmpdir(), productName + ' Crashes');
 
-process.crashReporter.start(productName, companyName, 'http://localhost:8080/uploadDump/childDump', tmpPath, {
+process.crashReporter.start({
+  productName: productName,
+  companyName: companyName,
+  submitURL: 'http://localhost:1127/post',
+  crashesDirectory: tmpPath,
+  extra: {
     randomData1: 'The Holidays are here!',
     randomData2: 'Happy New Year!'
+  }
 });
 process.crash();

From 4107174cfdb34e0635dd0d31760b2fd65443c8e5 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 12 Dec 2016 14:36:54 -0800
Subject: [PATCH 04/11] Group includes

---
 atom/app/node_main.cc | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/atom/app/node_main.cc b/atom/app/node_main.cc
index aaf9257fe5..e7f4628630 100644
--- a/atom/app/node_main.cc
+++ b/atom/app/node_main.cc
@@ -7,19 +7,16 @@
 #include "atom/app/uv_task_runner.h"
 #include "atom/browser/javascript_environment.h"
 #include "atom/browser/node_debugger.h"
+#include "atom/common/api/atom_bindings.h"
+#include "atom/common/native_mate_converters/string16_converter.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "gin/array_buffer.h"
 #include "gin/public/isolate_holder.h"
 #include "gin/v8_initializer.h"
-
-
-#include "atom/common/api/atom_bindings.h"
-#include "atom/common/native_mate_converters/string16_converter.h"
 #include "native_mate/dictionary.h"
 
-
 #include "atom/common/node_includes.h"
 
 namespace atom {

From f1cd1c6dff127c67577887eccad7346bc3dda496 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Mon, 12 Dec 2016 14:38:31 -0800
Subject: [PATCH 05/11] Use mate::Dictionary::CreateEmpty

---
 atom/app/node_main.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/atom/app/node_main.cc b/atom/app/node_main.cc
index e7f4628630..634342aad7 100644
--- a/atom/app/node_main.cc
+++ b/atom/app/node_main.cc
@@ -61,10 +61,10 @@ int NodeMain(int argc, char *argv[]) {
 #endif
     process.SetMethod("crash", &AtomBindings::Crash);
 
-    v8::Local<v8::Object> crashReporterObj = v8::Object::New(env->isolate());
-    mate::Dictionary crashReporterDict(gin_env.isolate(), crashReporterObj);
-    crashReporterDict.SetMethod("start", &AtomBindings::StartCrashReporter);
-    process.Set("crashReporter", crashReporterObj);
+    mate::Dictionary crashReporter =
+        mate::Dictionary::CreateEmpty(gin_env.isolate());
+    crashReporter.SetMethod("start", &AtomBindings::StartCrashReporter);
+    process.Set("crashReporter", crashReporter);
 
     node::LoadEnvironment(env);
 

From 2814e04e7dc1e34a81755f64541de319cb5febae Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Mon, 12 Dec 2016 21:32:58 -0800
Subject: [PATCH 06/11] Getting rid of linting errors

---
 default_app/default_app.js   |  6 +++---
 default_app/forkedProcess.js | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/default_app/default_app.js b/default_app/default_app.js
index 989dac5c58..035a347fa7 100644
--- a/default_app/default_app.js
+++ b/default_app/default_app.js
@@ -21,9 +21,9 @@ exports.load = (appUrl) => {
       options.icon = path.join(__dirname, 'icon.png')
     }
     crashReporter.start({
-      submitURL: "http://localhost:8080/uploadDump/mainDump",
-      companyName: "Main Company",
-      productName: "Main Product"
+      submitURL: 'http://localhost:8080/uploadDump/mainDump',
+      companyName: 'Main Company',
+      productName: 'Main Product'
     })
 
     mainWindow = new BrowserWindow(options)
diff --git a/default_app/forkedProcess.js b/default_app/forkedProcess.js
index 864b51ef68..473254bfdc 100644
--- a/default_app/forkedProcess.js
+++ b/default_app/forkedProcess.js
@@ -1,9 +1,9 @@
 const os = require('os')
 const path = require('path')
 
-let productName = 'Child Product';
-let companyName = 'Child Company';
-let tmpPath = path.join(os.tmpdir(), productName + ' Crashes');
+let productName = 'Child Product'
+let companyName = 'Child Company'
+let tmpPath = path.join(os.tmpdir(), productName + ' Crashes')
 
 process.crashReporter.start({
   productName: productName,
@@ -14,5 +14,5 @@ process.crashReporter.start({
     randomData1: 'The Holidays are here!',
     randomData2: 'Happy New Year!'
   }
-});
-process.crash();
+})
+process.crash()

From d453dbdb404d41200e8b657dbebaebc782950e8a Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Fri, 30 Dec 2016 20:55:42 -0800
Subject: [PATCH 07/11] Support crash reporting from child process in Windows

---
 default_app/forkedProcess.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/default_app/forkedProcess.js b/default_app/forkedProcess.js
index 473254bfdc..3a90248ac9 100644
--- a/default_app/forkedProcess.js
+++ b/default_app/forkedProcess.js
@@ -1,14 +1,31 @@
 const os = require('os')
 const path = require('path')
+const {spawn} = require('child_process')
 
+let submitURL = 'http://localhost:1127/post'
 let productName = 'Child Product'
 let companyName = 'Child Company'
 let tmpPath = path.join(os.tmpdir(), productName + ' Crashes')
 
+if (process.platform === 'win32') {
+  const args = [
+    '--reporter-url=' + submitURL,
+    '--application-name=' + productName,
+    '--crashes-directory=' + tmpPath
+  ]
+  const env = {
+    ELECTRON_INTERNAL_CRASH_SERVICE: 1
+  }
+  spawn(process.execPath, args, {
+    env: env,
+    detached: true
+  })
+}
+
 process.crashReporter.start({
   productName: productName,
   companyName: companyName,
-  submitURL: 'http://localhost:1127/post',
+  submitURL: submitURL,
   crashesDirectory: tmpPath,
   extra: {
     randomData1: 'The Holidays are here!',

From 241773f2f00908bc06bbe0dbeb007d5d259bd05a Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Tue, 17 Jan 2017 17:01:56 -0800
Subject: [PATCH 08/11] Clean up testing code written for crash for children

---
 default_app/default_app.js   |  7 +------
 default_app/forkedProcess.js | 35 -----------------------------------
 default_app/index.html       | 17 +----------------
 3 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 default_app/forkedProcess.js

diff --git a/default_app/default_app.js b/default_app/default_app.js
index 035a347fa7..bfb97a9ab0 100644
--- a/default_app/default_app.js
+++ b/default_app/default_app.js
@@ -1,4 +1,4 @@
-const {app, BrowserWindow, crashReporter} = require('electron')
+const {app, BrowserWindow} = require('electron')
 const path = require('path')
 
 let mainWindow = null
@@ -20,11 +20,6 @@ exports.load = (appUrl) => {
     if (process.platform === 'linux') {
       options.icon = path.join(__dirname, 'icon.png')
     }
-    crashReporter.start({
-      submitURL: 'http://localhost:8080/uploadDump/mainDump',
-      companyName: 'Main Company',
-      productName: 'Main Product'
-    })
 
     mainWindow = new BrowserWindow(options)
     mainWindow.loadURL(appUrl)
diff --git a/default_app/forkedProcess.js b/default_app/forkedProcess.js
deleted file mode 100644
index 3a90248ac9..0000000000
--- a/default_app/forkedProcess.js
+++ /dev/null
@@ -1,35 +0,0 @@
-const os = require('os')
-const path = require('path')
-const {spawn} = require('child_process')
-
-let submitURL = 'http://localhost:1127/post'
-let productName = 'Child Product'
-let companyName = 'Child Company'
-let tmpPath = path.join(os.tmpdir(), productName + ' Crashes')
-
-if (process.platform === 'win32') {
-  const args = [
-    '--reporter-url=' + submitURL,
-    '--application-name=' + productName,
-    '--crashes-directory=' + tmpPath
-  ]
-  const env = {
-    ELECTRON_INTERNAL_CRASH_SERVICE: 1
-  }
-  spawn(process.execPath, args, {
-    env: env,
-    detached: true
-  })
-}
-
-process.crashReporter.start({
-  productName: productName,
-  companyName: companyName,
-  submitURL: submitURL,
-  crashesDirectory: tmpPath,
-  extra: {
-    randomData1: 'The Holidays are here!',
-    randomData2: 'Happy New Year!'
-  }
-})
-process.crash()
diff --git a/default_app/index.html b/default_app/index.html
index bc77cbb560..292fd119b2 100644
--- a/default_app/index.html
+++ b/default_app/index.html
@@ -114,24 +114,11 @@
 </head>
 <body>
   <script>
-    const {remote, shell, crashReporter} = require('electron');
-    const cp = require('child_process')
+    const {remote, shell} = require('electron');
 
     const execPath = remote.process.execPath;
     const command = execPath + ' path-to-your-app';
 
-    crashReporter.start({
-        productName: 'Renderer Product',
-        companyName: 'Renderer Company',
-        submitURL: 'http://localhost:8080/uploadDump/rendererDump'
-      });
-
-    document.addEventListener("DOMContentLoaded", function(event) { 
-      document.getElementById('crashMe').addEventListener('click', () => {
-          cp.fork('./default_app/forkedProcess')
-      })
-    });
-
     document.onclick = function(e) {
       e.preventDefault();
       if (e.target.tagName == 'A')
@@ -170,8 +157,6 @@
 
   <div class="container">
 
-    <button id="crashMe">Fork a process which crashes</button>
-
     <p>
     To run your app with Electron, execute the following command in your
     Console (or Terminal):

From 170c51ae85bd9806e9656bc2b1f3f62bc986f28e Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 Jan 2017 13:49:45 -0800
Subject: [PATCH 09/11] Add spec for crashing node process

---
 spec/api-crash-reporter-spec.js | 114 ++++++++++++++++++++------------
 spec/fixtures/module/crash.js   |  13 ++++
 2 files changed, 84 insertions(+), 43 deletions(-)
 create mode 100644 spec/fixtures/module/crash.js

diff --git a/spec/api-crash-reporter-spec.js b/spec/api-crash-reporter-spec.js
index 2407641da6..2e219ea819 100644
--- a/spec/api-crash-reporter-spec.js
+++ b/spec/api-crash-reporter-spec.js
@@ -1,4 +1,5 @@
 const assert = require('assert')
+const childProcess = require('child_process')
 const http = require('http')
 const multiparty = require('multiparty')
 const path = require('path')
@@ -40,51 +41,34 @@ describe('crashReporter module', function () {
 
     this.timeout(120000)
 
-    var called = false
-    var server = http.createServer(function (req, res) {
-      server.close()
-      var form = new multiparty.Form()
-      form.parse(req, function (error, fields) {
-        if (error) throw error
-        if (called) return
-        called = true
-        assert.equal(fields['prod'], 'Electron')
-        assert.equal(fields['ver'], process.versions.electron)
-        assert.equal(fields['process_type'], 'renderer')
-        assert.equal(fields['platform'], process.platform)
-        assert.equal(fields['extra1'], 'extra1')
-        assert.equal(fields['extra2'], 'extra2')
-        assert.equal(fields['_productName'], 'Zombies')
-        assert.equal(fields['_companyName'], 'Umbrella Corporation')
-        assert.equal(fields['_version'], app.getVersion())
-
-        const reportId = 'abc-123-def-456-abc-789-abc-123-abcd'
-        res.end(reportId, () => {
-          waitForCrashReport().then(() => {
-            assert.equal(crashReporter.getLastCrashReport().id, reportId)
-            assert.notEqual(crashReporter.getUploadedReports().length, 0)
-            assert.equal(crashReporter.getUploadedReports()[0].id, reportId)
-            done()
-          }, done)
+    startServer({
+      callback (port) {
+        const crashUrl = url.format({
+          protocol: 'file',
+          pathname: path.join(fixtures, 'api', 'crash.html'),
+          search: '?port=' + port
         })
-      })
+        w.loadURL(crashUrl)
+      },
+      processType: 'renderer',
+      done: done
     })
-    var port = remote.process.port
-    server.listen(port, '127.0.0.1', function () {
-      port = server.address().port
-      remote.process.port = port
-      const crashUrl = url.format({
-        protocol: 'file',
-        pathname: path.join(fixtures, 'api', 'crash.html'),
-        search: '?port=' + port
-      })
-      if (process.platform === 'darwin') {
-        crashReporter.start({
-          companyName: 'Umbrella Corporation',
-          submitURL: 'http://127.0.0.1:' + port
-        })
-      }
-      w.loadURL(crashUrl)
+  })
+
+  it('should send minidump when node processes crash', function (done) {
+    if (isCI) return done()
+
+    this.timeout(120000)
+
+    startServer({
+      callback (port) {
+        const crashesDir = path.join(app.getPath('temp'), `${app.getName()} Crashes`)
+        const version = app.getVersion()
+        const crashPath = path.join(fixtures, 'module', 'crash.js')
+        childProcess.fork(crashPath, [port, version, crashesDir], {silent: true})
+      },
+      processType: 'browser',
+      done: done
     })
   })
 
@@ -155,3 +139,47 @@ const waitForCrashReport = () => {
     checkForReport()
   })
 }
+
+const startServer = ({callback, processType, done}) => {
+  var called = false
+  var server = http.createServer((req, res) => {
+    server.close()
+    var form = new multiparty.Form()
+    form.parse(req, (error, fields) => {
+      if (error) throw error
+      if (called) return
+      called = true
+      assert.equal(fields.prod, 'Electron')
+      assert.equal(fields.ver, process.versions.electron)
+      assert.equal(fields.process_type, processType)
+      assert.equal(fields.platform, process.platform)
+      assert.equal(fields.extra1, 'extra1')
+      assert.equal(fields.extra2, 'extra2')
+      assert.equal(fields._productName, 'Zombies')
+      assert.equal(fields._companyName, 'Umbrella Corporation')
+      assert.equal(fields._version, app.getVersion())
+
+      const reportId = 'abc-123-def-456-abc-789-abc-123-abcd'
+      res.end(reportId, () => {
+        waitForCrashReport().then(() => {
+          assert.equal(crashReporter.getLastCrashReport().id, reportId)
+          assert.notEqual(crashReporter.getUploadedReports().length, 0)
+          assert.equal(crashReporter.getUploadedReports()[0].id, reportId)
+          done()
+        }, done)
+      })
+    })
+  })
+  let {port} = remote.process
+  server.listen(port, '127.0.0.1', () => {
+    port = server.address().port
+    remote.process.port = port
+    if (process.platform === 'darwin') {
+      crashReporter.start({
+        companyName: 'Umbrella Corporation',
+        submitURL: 'http://127.0.0.1:' + port
+      })
+    }
+    callback(port)
+  })
+}
diff --git a/spec/fixtures/module/crash.js b/spec/fixtures/module/crash.js
new file mode 100644
index 0000000000..e7ab365dc1
--- /dev/null
+++ b/spec/fixtures/module/crash.js
@@ -0,0 +1,13 @@
+process.crashReporter.start({
+  productName: 'Zombies',
+  companyName: 'Umbrella Corporation',
+  crashesDirectory: process.argv[4],
+  submitURL: `http://127.0.0.1:${process.argv[2]}`,
+  extra: {
+    extra1: 'extra1',
+    extra2: 'extra2',
+    _version: process.argv[3]
+  }
+})
+
+process.nextTick(() => process.crash())

From 795b674996297c0f6c8a7daaf45cc783483efca7 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 Jan 2017 13:53:05 -0800
Subject: [PATCH 10/11] Add StartInstance helper on CrashReporter

---
 atom/app/node_main.cc                        |  7 ++--
 atom/common/api/atom_bindings.cc             |  6 ---
 atom/common/api/atom_bindings.h              |  2 -
 atom/common/crash_reporter/crash_reporter.cc | 42 +++++++++++---------
 atom/common/crash_reporter/crash_reporter.h  |  3 +-
 5 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/atom/app/node_main.cc b/atom/app/node_main.cc
index 634342aad7..af33c05d63 100644
--- a/atom/app/node_main.cc
+++ b/atom/app/node_main.cc
@@ -8,6 +8,7 @@
 #include "atom/browser/javascript_environment.h"
 #include "atom/browser/node_debugger.h"
 #include "atom/common/api/atom_bindings.h"
+#include "atom/common/crash_reporter/crash_reporter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ -61,9 +62,9 @@ int NodeMain(int argc, char *argv[]) {
 #endif
     process.SetMethod("crash", &AtomBindings::Crash);
 
-    mate::Dictionary crashReporter =
-        mate::Dictionary::CreateEmpty(gin_env.isolate());
-    crashReporter.SetMethod("start", &AtomBindings::StartCrashReporter);
+    auto crashReporter = mate::Dictionary::CreateEmpty(gin_env.isolate());
+    crashReporter.SetMethod("start",
+                            &crash_reporter::CrashReporter::StartInstance);
     process.Set("crashReporter", crashReporter);
 
     node::LoadEnvironment(env);
diff --git a/atom/common/api/atom_bindings.cc b/atom/common/api/atom_bindings.cc
index adc8f061ae..2b4bec6328 100644
--- a/atom/common/api/atom_bindings.cc
+++ b/atom/common/api/atom_bindings.cc
@@ -10,7 +10,6 @@
 
 #include "atom/common/atom_version.h"
 #include "atom/common/chrome_version.h"
-#include "atom/common/crash_reporter/crash_reporter.h"
 #include "atom/common/native_mate_converters/string16_converter.h"
 #include "atom/common/node_includes.h"
 #include "base/logging.h"
@@ -161,9 +160,4 @@ void AtomBindings::Crash() {
   static_cast<DummyClass*>(nullptr)->crash = true;
 }
 
-// static
-void AtomBindings::StartCrashReporter(const mate::Dictionary& options) {
-  crash_reporter::CrashReporter::GetInstance()->StartWithOptions(options);
-}
-
 }  // namespace atom
diff --git a/atom/common/api/atom_bindings.h b/atom/common/api/atom_bindings.h
index be5352ef1b..58c2336c0e 100644
--- a/atom/common/api/atom_bindings.h
+++ b/atom/common/api/atom_bindings.h
@@ -9,7 +9,6 @@
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
-#include "native_mate/dictionary.h"
 #include "v8/include/v8.h"
 #include "vendor/node/deps/uv/include/uv.h"
 
@@ -30,7 +29,6 @@ class AtomBindings {
 
   static void Log(const base::string16& message);
   static void Crash();
-  static void StartCrashReporter(const mate::Dictionary& options);
 
  private:
   void ActivateUVLoop(v8::Isolate* isolate);
diff --git a/atom/common/crash_reporter/crash_reporter.cc b/atom/common/crash_reporter/crash_reporter.cc
index 28184445fd..a36e5525b6 100644
--- a/atom/common/crash_reporter/crash_reporter.cc
+++ b/atom/common/crash_reporter/crash_reporter.cc
@@ -23,25 +23,6 @@ CrashReporter::CrashReporter() {
 CrashReporter::~CrashReporter() {
 }
 
-void CrashReporter::StartWithOptions(const mate::Dictionary& options) {
-  std::string product_name;
-  options.Get("productName", &product_name);
-  std::string company_name;
-  options.Get("companyName", &company_name);
-  std::string submit_url;
-  options.Get("submitURL", &submit_url);
-  base::FilePath crashes_dir;
-  options.Get("crashesDirectory", &crashes_dir);
-  StringMap extra_parameters;
-  options.Get("extra", &extra_parameters);
-
-  extra_parameters["_productName"] = product_name;
-  extra_parameters["_companyName"] = company_name;
-
-  Start(product_name, company_name, submit_url, crashes_dir, true, false,
-        extra_parameters);
-}
-
 void CrashReporter::Start(const std::string& product_name,
                           const std::string& company_name,
                           const std::string& submit_url,
@@ -113,4 +94,27 @@ CrashReporter* CrashReporter::GetInstance() {
 }
 #endif
 
+void CrashReporter::StartInstance(const mate::Dictionary& options) {
+  auto reporter = GetInstance();
+  if (!reporter) return;
+
+  std::string product_name;
+  options.Get("productName", &product_name);
+  std::string company_name;
+  options.Get("companyName", &company_name);
+  std::string submit_url;
+  options.Get("submitURL", &submit_url);
+  base::FilePath crashes_dir;
+  options.Get("crashesDirectory", &crashes_dir);
+  StringMap extra_parameters;
+  options.Get("extra", &extra_parameters);
+
+  extra_parameters["_productName"] = product_name;
+  extra_parameters["_companyName"] = company_name;
+
+  reporter->Start(product_name, company_name, submit_url, crashes_dir, true,
+                  false, extra_parameters);
+}
+
+
 }  // namespace crash_reporter
diff --git a/atom/common/crash_reporter/crash_reporter.h b/atom/common/crash_reporter/crash_reporter.h
index c04b5d7ba2..df05574fcb 100644
--- a/atom/common/crash_reporter/crash_reporter.h
+++ b/atom/common/crash_reporter/crash_reporter.h
@@ -22,6 +22,7 @@ class CrashReporter {
   typedef std::pair<int, std::string> UploadReportResult;  // upload-date, id
 
   static CrashReporter* GetInstance();
+  static void StartInstance(const mate::Dictionary& options);
 
   void Start(const std::string& product_name,
              const std::string& company_name,
@@ -30,8 +31,6 @@ class CrashReporter {
              bool upload_to_server,
              bool skip_system_crash_handler,
              const StringMap& extra_parameters);
-  void StartWithOptions(const mate::Dictionary& options);
-
   virtual std::vector<CrashReporter::UploadReportResult> GetUploadedReports(
       const base::FilePath& crashes_dir);
 

From 43ef4faf7953d62d488142bed80312153b3798dc Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevinsawicki@gmail.com>
Date: Tue, 24 Jan 2017 13:58:39 -0800
Subject: [PATCH 11/11] :art:

---
 atom/app/node_main.cc                        | 8 ++++----
 atom/common/crash_reporter/crash_reporter.cc | 1 -
 atom/common/crash_reporter/crash_reporter.h  | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/atom/app/node_main.cc b/atom/app/node_main.cc
index af33c05d63..9e80ef2e5d 100644
--- a/atom/app/node_main.cc
+++ b/atom/app/node_main.cc
@@ -62,10 +62,10 @@ int NodeMain(int argc, char *argv[]) {
 #endif
     process.SetMethod("crash", &AtomBindings::Crash);
 
-    auto crashReporter = mate::Dictionary::CreateEmpty(gin_env.isolate());
-    crashReporter.SetMethod("start",
-                            &crash_reporter::CrashReporter::StartInstance);
-    process.Set("crashReporter", crashReporter);
+    // Setup process.crashReporter.start in child node processes
+    auto reporter = mate::Dictionary::CreateEmpty(gin_env.isolate());
+    reporter.SetMethod("start", &crash_reporter::CrashReporter::StartInstance);
+    process.Set("crashReporter", reporter);
 
     node::LoadEnvironment(env);
 
diff --git a/atom/common/crash_reporter/crash_reporter.cc b/atom/common/crash_reporter/crash_reporter.cc
index a36e5525b6..f8a5f5e29e 100644
--- a/atom/common/crash_reporter/crash_reporter.cc
+++ b/atom/common/crash_reporter/crash_reporter.cc
@@ -116,5 +116,4 @@ void CrashReporter::StartInstance(const mate::Dictionary& options) {
                   false, extra_parameters);
 }
 
-
 }  // namespace crash_reporter
diff --git a/atom/common/crash_reporter/crash_reporter.h b/atom/common/crash_reporter/crash_reporter.h
index df05574fcb..c564527109 100644
--- a/atom/common/crash_reporter/crash_reporter.h
+++ b/atom/common/crash_reporter/crash_reporter.h
@@ -31,6 +31,7 @@ class CrashReporter {
              bool upload_to_server,
              bool skip_system_crash_handler,
              const StringMap& extra_parameters);
+
   virtual std::vector<CrashReporter::UploadReportResult> GetUploadedReports(
       const base::FilePath& crashes_dir);