Add registered shell extensions to enumerated module list on about:conflicts....

chrome/browser/enumerate_modules_model_win.h

Index: chrome/browser/enumerate_modules_model_win.h
===================================================================
--- chrome/browser/enumerate_modules_model_win.h	(revision 66602)
+++ chrome/browser/enumerate_modules_model_win.h	(working copy)
@@ -30,6 +30,7 @@
   // time of scan.
   enum ModuleType {
     LOADED_MODULE,
+    SHELL_EXTENSION,
     WINSOCK_MODULE_REGISTRATION,
   };
 
@@ -133,6 +134,19 @@
   // ReportBack to let the observer know we are done.
   void ScanOnFileThread();
 
+  // Enumerate all modules loaded into the Chrome process.
+  void EnumerateLoadedModules();
+
+  // Enumerate all registered Windows shell extensions.
+  void EnumerateShellExtensions();
+
+  // Enumerate all registered Winsock LSP modules.
+  void EnumerateWinsockModule();
+
+  // Given a |module|, initializes the structure and loads additional
+  // information using the location field of the module.
+  void PopulateModuleInformation(Module* module);
+
   // Builds up a vector of path values mapping to environment variable,
   // with pairs like [c:\windows\, %systemroot%]. This is later used to
   // collapse paths like c:\windows\system32 into %systemroot%\system32, which