[3P] Add code ID to chrome://conflicts UX.

This makes it so that all the information needed to diagnose
whitelist issues is available in one place.

BUG=847544

Cq-Include-Trybots: luci.chromium.try:closure_compilation
Change-Id: Idef99fa83d84ff1d7258c65f9ca4f481267758f8
Reviewed-on: https://chromium-review.googlesource.com/1142515
Commit-Queue: Chris Hamilton <chrisha@chromium.org>
Reviewed-by: Patrick Monette <pmonette@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576478}

chrome/browser/resources/conflicts/about_conflicts.html

@@ -198,6 +198,9 @@ html[dir=rtl] .clearing {
             <td class="datacell">
               <span dir="ltr">Version</span>
             </td>
+            <td class="datacell">
+              <span dir="ltr">Code Id</span>
+            </td>
             <td class="datacell">
               <span dir="ltr">Location</span>
             </td>
@@ -219,6 +222,9 @@ html[dir=rtl] .clearing {
             <td valign="top" class="datacell">
               <span dir="ltr" jscontent="version" class="nowrap">VERSION</span>
             </td>
+            <td valign="top" class="datacell">
+              <span dir="ltr" jscontent="code_id" class="nowrap">CODE_ID</span>
+            </td>
             <td valign="top" class="datacell">
               <span class="nowrap">
                 <span dir="ltr" jscontent="location">LOCATION</span>

chrome/browser/resources/conflicts/about_conflicts.js

@@ -8,19 +8,16 @@
  */
 var moduleListDataFormat = {
   'moduleList': [{
-    'type': 'The type of module found',
     'type_description':
         'The type of module (string), defaults to blank for regular modules',
-    'status': 'The module status',
     'location': 'The module path, not including filename',
     'name': 'The name of the module',
     'product_name': 'The name of the product the module belongs to',
     'description': 'The module description',
     'version': 'The module version',
     'digital_signer': 'The signer of the digital certificate for the module',
-    'recommended_action': 'The help tips bitmask',
-    'possible_resolution': 'The help tips in string form',
-    'help_url': 'The link to the Help Center article'
+    'code_id': 'The code id of the module',
+    'third_party_module_status': 'The module status'
   }]
 };
 

chrome/browser/ui/webui/conflicts_handler.cc

@@ -168,6 +168,7 @@ void ConflictsHandler::OnNewModuleFound(const ModuleInfoKey& module_key,
   data->SetString("description", inspection_result.description);
   data->SetString("version", inspection_result.version);
   data->SetString("digital_signer", inspection_result.certificate_info.subject);
+  data->SetString("code_id", GenerateCodeId(module_key));
 
   module_list_->Append(std::move(data));
 }