Always use atom-shell's verion when uploading crash report.
authorCheng Zhao <zcbenz@gmail.com>
Mon, 18 Nov 2013 10:03:41 +0000 (18:03 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Mon, 18 Nov 2013 10:03:41 +0000 (18:03 +0800)
common/crash_reporter/crash_reporter.cc
spec/api/crash-reporter.coffee

index 8e63cbf..66b3cc8 100644 (file)
@@ -25,21 +25,10 @@ void CrashReporter::Start(std::string product_name,
                           const std::string& submit_url,
                           bool auto_submit,
                           bool skip_system_crash_handler) {
-  std::string version;
-  if (is_browser_) {
-    // Use application's version for crashes in browser.
-    version = atom::Browser::Get()->GetVersion();
-  } else {
-    // Just use atom-shell's version in renderer, since we can not get
-    // application's version here.
-    version = ATOM_VERSION_STRING;
-
-    // Append "Renderer" for the renderer.
-    product_name += " Renderer";
-  }
-
-  InitBreakpad(product_name, version, company_name, submit_url, auto_submit,
-               skip_system_crash_handler);
+  // Append "Renderer" for the renderer.
+  product_name += " Renderer";
+  InitBreakpad(product_name, ATOM_VERSION_STRING, company_name, submit_url,
+               auto_submit, skip_system_crash_handler);
 }
 
 void CrashReporter::SetUploadParameters() {
@@ -47,7 +36,6 @@ void CrashReporter::SetUploadParameters() {
   std::string type = command.GetSwitchValueASCII(switches::kProcessType);
 
   upload_parameters_["process_type"] = type;
-  upload_parameters_["atom_shell_version"] = ATOM_VERSION_STRING;
 }
 
 }  // namespace crash_reporter
index e6ad559..415c2a0 100644 (file)
@@ -13,7 +13,7 @@ describe 'crash-reporter module', ->
     server = http.createServer (req, res) ->
       form = new formidable.IncomingForm()
       form.parse req, (error, fields, files) ->
-        assert.equal fields['atom_shell_version'], process.versions['atom-shell']
+        assert.equal fields['ver'], process.versions['atom-shell']
         assert.equal fields['process_type'], 'renderer'
         assert.equal files['upload_file_minidump']['name'], 'minidump.dmp'