[Win] Add reporting of total number of modules loaded in browser process.

chrome/browser/ui/chrome_pages.cc

Index: chrome/browser/ui/chrome_pages.cc
diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
index 3ed57f8f97f904507c79f0643d27892b620c2b47..c68267dfe0ebcb3bbdffc79325767920d58f4804 100644
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -184,10 +184,10 @@ void ShowExtensions(Browser* browser,
 void ShowConflicts(Browser* browser) {
 #if defined(OS_WIN)
   EnumerateModulesModel* model = EnumerateModulesModel::GetInstance();
-  if (model->modules_to_notify_about() > 0) {
-    GURL help_center_url = model->GetFirstNotableConflict();
-    if (help_center_url.is_valid()) {
-      ShowSingletonTab(browser, help_center_url);
+  if (model->ShouldShowConflictWarning()) {
+    GURL conflict_url = model->GetConflictUrl();
+    if (conflict_url.is_valid()) {

[Peter Kasting, 2016/08/05 00:10:08]

I don't think the system should be set up so you need to do both the
ShouldShowConflictWarning() check and this check.  Either:

* Make GetConflictUrl() unconditionally return a valid URL, and remove this
is_valid() check, or
* Make GetConflictUrl() solely responsible for checking
ShouldShowConflictWarning(), and remove that condition from this caller.

Currently, GetConflictUrl() does the latter, so the smallest change would be to
implement that.  You might choose to do the former anyway, depending on what
your future plans for that method are.  If you do the former, consider whether
you could make the URL in question a constant instead of something returned by a
method.

[chrisha, 2016/08/12 19:04:40]

Collapsed logic into GetConflictUrl.

+      ShowSingletonTab(browser, conflict_url);
       model->AcknowledgeConflictNotification();
       return;
     }