Use FireWebUIListener() a little more

FireWebUIListener(name, ...) is essentially an alias for:

  CallJavascriptFunction("cr.webUIListenerCallback", base::Value(name), ...);

Using it reduces the amount of times we paste "cr.webUIListenerCallback" and
generally reduces the amount of parallel paths for notifying running web
UI pages.

R=aee@chromium.org
BUG=none

Change-Id: Id3ee2622949c0fd1bba9705655de4cb0faf386f4
Reviewed-on: https://chromium-review.googlesource.com/c/1431293Reviewed-by: Esmael El-Moslimany <aee@chromium.org>
Commit-Queue: Esmael El-Moslimany <aee@chromium.org>
Auto-Submit: Dan Beam (slow until 1/29) <dbeam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#625390}

chrome/browser/ui/webui/settings/chromeos/device_power_handler.cc

@@ -392,9 +392,7 @@ void PowerHandler::SendPowerManagementSettings(bool force) {
   dict.SetInteger(kLidClosedBehaviorKey, lid_closed_behavior);
   dict.SetBoolean(kLidClosedControlledKey, lid_closed_controlled);
   dict.SetBoolean(kHasLidKey, has_lid);
-  CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::Value(kPowerManagementSettingsChangedName),
-                         dict);
+  FireWebUIListener(kPowerManagementSettingsChangedName, dict);
 
   last_idle_behavior_ = idle_behavior;
   last_idle_controlled_ = idle_controlled;

chrome/browser/ui/webui/settings/font_handler.cc

@@ -108,9 +108,7 @@ const extensions::Extension* FontHandler::GetAdvancedFontSettingsExtension() {
 }
 
 void FontHandler::NotifyAdvancedFontSettingsAvailability() {
-  CallJavascriptFunction(
-      "cr.webUIListenerCallback",
-      base::Value("advanced-font-settings-installed"),
+  FireWebUIListener("advanced-font-settings-installed",
                     base::Value(GetAdvancedFontSettingsExtension() != nullptr));
 }
 

chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc

@@ -339,8 +339,8 @@ void ClearBrowsingDataHandler::OnStateChanged(syncer::SyncService* sync) {
 void ClearBrowsingDataHandler::UpdateSyncState() {
   identity::IdentityManager* identity_manager =
       IdentityManagerFactory::GetForProfile(profile_);
-  CallJavascriptFunction(
-      "cr.webUIListenerCallback", base::Value("update-sync-state"),
+  FireWebUIListener(
+      "update-sync-state",
       base::Value(identity_manager && identity_manager->HasPrimaryAccount()),
       base::Value(sync_service_ && sync_service_->IsSyncFeatureActive() &&
                   sync_service_->GetActiveDataTypes().Has(
@@ -383,9 +383,8 @@ void ClearBrowsingDataHandler::AddCounter(
 
 void ClearBrowsingDataHandler::UpdateCounterText(
     std::unique_ptr<browsing_data::BrowsingDataCounter::Result> result) {
-  CallJavascriptFunction(
-      "cr.webUIListenerCallback", base::Value("update-counter-text"),
-      base::Value(result->source()->GetPrefName()),
+  FireWebUIListener(
+      "update-counter-text", base::Value(result->source()->GetPrefName()),
       base::Value(browsing_data_counter_utils::GetChromeCounterTextFromResult(
           result.get(), profile_)));
 }

chrome/browser/ui/webui/settings/settings_import_data_handler.cc

@@ -209,8 +209,7 @@ void ImportDataHandler::ImportEnded() {
   importer_host_->set_observer(NULL);
   importer_host_ = NULL;
 
-  CallJavascriptFunction(
-      "cr.webUIListenerCallback", base::Value("import-data-status-changed"),
+  FireWebUIListener("import-data-status-changed",
                     base::Value(import_did_succeed_ ? kImportStatusSucceeded
                                                     : kImportStatusFailed));
 }

chrome/browser/ui/webui/settings/site_settings_handler.cc

@@ -495,8 +495,7 @@ void SiteSettingsHandler::OnUsageCleared() {
 
 #if defined(OS_CHROMEOS)
 void SiteSettingsHandler::OnPrefEnableDrmChanged() {
-  CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::Value("prefEnableDrmChanged"));
+  FireWebUIListener("prefEnableDrmChanged");
 }
 #endif
 
@@ -509,15 +508,12 @@ void SiteSettingsHandler::OnContentSettingChanged(
     return;
 
   if (primary_pattern.ToString().empty()) {
-    CallJavascriptFunction(
-        "cr.webUIListenerCallback",
-        base::Value("contentSettingCategoryChanged"),
-        base::Value(
-            site_settings::ContentSettingsTypeToGroupName(content_type)));
+    FireWebUIListener("contentSettingCategoryChanged",
+                      base::Value(site_settings::ContentSettingsTypeToGroupName(
+                          content_type)));
   } else {
-    CallJavascriptFunction(
-        "cr.webUIListenerCallback",
-        base::Value("contentSettingSitePermissionChanged"),
+    FireWebUIListener(
+        "contentSettingSitePermissionChanged",
         base::Value(
             site_settings::ContentSettingsTypeToGroupName(content_type)),
         base::Value(primary_pattern.ToString()),