Display both capture and upload times in chrome://crashes.

components/crash/core/browser/resources/crashes.js

Index: components/crash/core/browser/resources/crashes.js
diff --git a/components/crash/core/browser/resources/crashes.js b/components/crash/core/browser/resources/crashes.js
index 85b5197cf1daa9842c7a7b59b6492a91adbd2477..dbd2ae8df59756c61d28091cff70098c897db8f4 100644
--- a/components/crash/core/browser/resources/crashes.js
+++ b/components/crash/core/browser/resources/crashes.js
@@ -49,6 +49,7 @@ function updateCrashList(
     var crashBlock = document.createElement('div');
     if (crash.state != 'uploaded')
       crashBlock.className = 'notUploaded';
+
     var title = document.createElement('h3');
     var uploaded = crash.state == 'uploaded';
     if (uploaded) {
@@ -60,11 +61,20 @@ function updateCrashList(
                                                   crash.local_id);
     }
     crashBlock.appendChild(title);
+
     if (uploaded) {
       var date = document.createElement('p');
-      date.textContent = loadTimeData.getStringF('crashTimeFormat',
-                                                 crash.time);
+      date.textContent = ""
+      if (crash.capture_time) {
+        date.textContent += loadTimeData.getStringF(
+            'crashCaptureAndUploadTimeFormat', crash.capture_time,
+            crash.upload_time);
+      } else {
+        date.textContent += loadTimeData.getStringF('crashUploadTimeFormat',
+                                                    crash.upload_time);
+      }
       crashBlock.appendChild(date);
+
       var linkBlock = document.createElement('p');
       var link = document.createElement('a');
       var commentLines = [
@@ -116,7 +126,7 @@ function updateCrashList(
 
       var crashText = document.createElement('p');
       crashText.textContent = loadTimeData.getStringF(textContentKey,
-                                                      crash.time);
+                                                      crash.capture_time);
       crashBlock.appendChild(crashText);
 
       if (crash.file_size != '') {