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

chrome/browser/ui/webui/conflicts_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/conflicts_ui.h"
 
 #if defined(OS_WIN)
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted_memory.h"
+#include "base/scoped_observer.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/win/enumerate_modules_model.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/chromium_strings.h"
@@ skipping 45 matching lines @@
   source->SetDefaultResource(IDR_ABOUT_CONFLICTS_HTML);
   return source;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // ConflictsDOMHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-// The handler for JavaScript messages for the about:flags page.
+// The handler for JavaScript messages for the about:conflicts page.
 class ConflictsDOMHandler : public WebUIMessageHandler,
-                            public content::NotificationObserver {
+                            public EnumerateModulesModel::Observer {
  public:
-  ConflictsDOMHandler() {}
+  ConflictsDOMHandler();
   ~ConflictsDOMHandler() override {}
 
   // WebUIMessageHandler implementation.
   void RegisterMessages() override;
 
   // Callback for the "requestModuleList" message.
   void HandleRequestModuleList(const base::ListValue* args);
 
  private:
   void SendModuleList();
 
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
+  // EnumerateModulesModel::Observer implementation.
+  void OnScanCompleted() override;
 
-  content::NotificationRegistrar registrar_;
+  ScopedObserver<EnumerateModulesModel,
+                 EnumerateModulesModel::Observer> observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ConflictsDOMHandler);
 };
 
+ConflictsDOMHandler::ConflictsDOMHandler()
+    : observer_(this) {
+}
+
 void ConflictsDOMHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("requestModuleList",
       base::Bind(&ConflictsDOMHandler::HandleRequestModuleList,
                  base::Unretained(this)));
 }
 
 void ConflictsDOMHandler::HandleRequestModuleList(const base::ListValue* args) {
-  // This request is handled asynchronously. See Observe for when we reply back.
-  registrar_.Add(this, chrome::NOTIFICATION_MODULE_LIST_ENUMERATED,
-                 content::NotificationService::AllSources());
-  EnumerateModulesModel::GetInstance()->ScanNow();
+  // The request is handled asynchronously, and will callback via
+  // OnScanCompleted on completion.
+  auto* model = EnumerateModulesModel::GetInstance();
+
+  // The JS shouldn't be abusive and call 'requestModuleList' twice, but it's
+  // easy enough to defend against this.
+  if (!observer_.IsObserving(model)) {
+    observer_.Add(model);
+    model->ScanNow();
+  }
 }
 
 void ConflictsDOMHandler::SendModuleList() {
-  EnumerateModulesModel* loaded_modules = EnumerateModulesModel::GetInstance();
+  auto* loaded_modules = EnumerateModulesModel::GetInstance();
   base::ListValue* list = loaded_modules->GetModuleList();
   base::DictionaryValue results;
   results.Set("moduleList", list);
 
   // Add the section title and the total count for bad modules found.
   int confirmed_bad = loaded_modules->confirmed_bad_modules_detected();
   int suspected_bad = loaded_modules->suspected_bad_modules_detected();
   base::string16 table_title;
   if (!confirmed_bad && !suspected_bad) {
     table_title += l10n_util::GetStringFUTF16(
         IDS_CONFLICTS_CHECK_PAGE_TABLE_TITLE_SUFFIX_ONE,
             base::IntToString16(list->GetSize()));
   } else {
     table_title += l10n_util::GetStringFUTF16(
         IDS_CONFLICTS_CHECK_PAGE_TABLE_TITLE_SUFFIX_TWO,
             base::IntToString16(list->GetSize()),
             base::IntToString16(confirmed_bad),
             base::IntToString16(suspected_bad));
   }
   results.SetString("modulesTableTitle", table_title);
 
   web_ui()->CallJavascriptFunctionUnsafe("returnModuleList", results);
 }
 
-void ConflictsDOMHandler::Observe(int type,
-                                  const content::NotificationSource& source,
-                                  const content::NotificationDetails& details) {
-  DCHECK_EQ(chrome::NOTIFICATION_MODULE_LIST_ENUMERATED, type);
-
+void ConflictsDOMHandler::OnScanCompleted() {
   SendModuleList();
-  registrar_.RemoveAll();
+  observer_.Remove(EnumerateModulesModel::GetInstance());
 }
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // ConflictsUI
 //
 ///////////////////////////////////////////////////////////////////////////////
 
 ConflictsUI::ConflictsUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   content::RecordAction(UserMetricsAction("ViewAboutConflicts"));
   web_ui->AddMessageHandler(new ConflictsDOMHandler());
 
   // Set up the about:conflicts source.
   Profile* profile = Profile::FromWebUI(web_ui);
   content::WebUIDataSource::Add(profile, CreateConflictsUIHTMLSource());
 }
 
 // static
 base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
   return static_cast<base::RefCountedMemory*>(
       ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
           IDR_CONFLICT_FAVICON, scale_factor));
 }
 
 #endif