Integrate about:conflicts with --diagnostics

This should enable the user to find conflicting dlls that are crashing Chrome on startup.

This changelist introduces a limited_mode for scanning, since the diagnostics tests run without the help of many Chrome services, so we can't use the File thread for asynchronous scanning or the notification system.

Also changed the scanning so that if no signature/description is given in the blacklist, then we mark the DLL as a confirmed match if the name and the location match (before we used to match it as a 'suspected' match). A very sizable chunk of the blacklist is malware, which has no signature, so this gives us the ability to trigger the wrench badge on finding malware (that part remains opt-in through about:flags).

Also added failure count to diagnostics output (sometimes the error scrolls off screen, so having a note at the bottom helps).

BUG=51105
TEST=All diagnostics tests run as part of the unit tests.

Review URL: http://codereview.chromium.org/6098004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70600 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 39 insertions, 39 deletions

diff --git a/chrome/browser/resources/about_conflicts.html b/chrome/browser/resources/about_conflicts.html
index 301fb49..e82ac99 100644
--- a/chrome/browser/resources/about_conflicts.html
+++ b/chrome/browser/resources/about_conflicts.html
@@ -144,65 +144,65 @@ html[dir=rtl] .clearing {
   border-bottom: 1px solid #aaa;
 }
 </style>
-<script>

-

+<script>
+
   /**
   * This variable structure is here to document the structure that the template
   * expects to correctly populate the page.
-  */

-  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',

+  */
+  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',

+      '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'
-    }

-  ]

-  };

-

+    }
+  ]
+  };
+
   /**
   * Takes the |moduleListData| input argument which represents data about
   * the currently available modules and populates the html jstemplate
   * with that data. It expects an object structure like the above.
   * @param {Object} moduleListData Information about available modules
-  */

-  function renderTemplate(moduleListData) {

-    // This is the javascript code that processes the template:

-    var input = new JsEvalContext(moduleListData);

-    var output = document.getElementById('modulesTemplate');

-    jstProcess(input, output);

-  }

-

+  */
+  function renderTemplate(moduleListData) {
+    // This is the javascript code that processes the template:
+    var input = new JsEvalContext(moduleListData);
+    var output = document.getElementById('modulesTemplate');
+    jstProcess(input, output);
+  }
+
   /**
   * Asks the C++ ConflictsDOMHandler to get details about the available modules
   * and return detailed data about the configuration. The ConflictsDOMHandler
   * should reply to returnModuleList() (below).
-  */

-  function requestModuleListData() {

-    chrome.send('requestModuleList', []);

-  }

-

+  */
+  function requestModuleListData() {
+    chrome.send('requestModuleList', []);
+  }
+
   /**
   * Called by the dom_ui to re-populate the page with data representing the
   * current state of installed modules.
-  */

-  function returnModuleList(moduleListData) {

-    var bodyContainer = document.getElementById('body-container');

-    renderTemplate(moduleListData);

-    bodyContainer.style.visibility = 'visible';

-  }

-

-  // Get data and have it displayed upon loading.

+  */
+  function returnModuleList(moduleListData) {
+    var bodyContainer = document.getElementById('body-container');
+    renderTemplate(moduleListData);
+    bodyContainer.style.visibility = 'visible';
+  }
+
+  // Get data and have it displayed upon loading.
   document.addEventListener('DOMContentLoaded', requestModuleListData);
 
 </script>