MD Settings: Use FireWebUIListener() helper wherever possible.

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

 // Copyright 2016 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/settings/about_handler.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 595 matching lines @@
     base::string16 types_msg = GetAllowedConnectionTypesMessage();
     if (!types_msg.empty())
       event->SetString("connectionTypes", types_msg);
     else
       event->Set("connectionTypes", base::MakeUnique<base::Value>());
   } else {
     event->Set("connectionTypes", base::MakeUnique<base::Value>());
   }
 #endif  // defined(OS_CHROMEOS)
 
-  CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::Value("update-status-changed"), *event);
+  FireWebUIListener("update-status-changed", *event);
 }
 
 #if defined(OS_MACOSX)
 void AboutHandler::SetPromotionState(VersionUpdater::PromotionState state) {
   // Worth noting: PROMOTE_DISABLED indicates that promotion is possible,
   // there's just something else going on right now (e.g. checking for update).
   bool hidden = state == VersionUpdater::PROMOTE_HIDDEN;
   bool disabled = state == VersionUpdater::PROMOTE_HIDDEN ||
                   state == VersionUpdater::PROMOTE_DISABLED ||
                   state == VersionUpdater::PROMOTED;
   bool actionable = state == VersionUpdater::PROMOTE_DISABLED ||
                     state == VersionUpdater::PROMOTE_ENABLED;
 
   base::string16 text = base::string16();
   if (actionable)
     text = l10n_util::GetStringUTF16(IDS_ABOUT_CHROME_AUTOUPDATE_ALL);
   else if (state == VersionUpdater::PROMOTED)
     text = l10n_util::GetStringUTF16(IDS_ABOUT_CHROME_AUTOUPDATE_ALL_IS_ON);
 
   base::DictionaryValue promo_state;
   promo_state.SetBoolean("hidden", hidden);
   promo_state.SetBoolean("disabled", disabled);
   promo_state.SetBoolean("actionable", actionable);
   if (!text.empty())
     promo_state.SetString("text", text);
 
-  CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::Value("promotion-state-changed"), promo_state);
+  FireWebUIListener("promotion-state-changed", promo_state);
 }
 #endif  // defined(OS_MACOSX)
 
 #if defined(OS_CHROMEOS)
 void AboutHandler::OnRegulatoryLabelDirFound(
     std::string callback_id,
     const base::FilePath& label_dir_path) {
   if (label_dir_path.empty()) {
     ResolveJavascriptCallback(base::Value(callback_id), base::Value());
     return;
@@ skipping 19 matching lines @@
       label_dir_path.AppendASCII(kRegulatoryLabelImageFilename).MaybeAsASCII();
   std::string url =
       std::string("chrome://") + chrome::kChromeOSAssetHost + "/" + image_path;
   regulatory_info->SetString("url", url);
 
   ResolveJavascriptCallback(base::Value(callback_id), *regulatory_info);
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace settings