Replace CallJavascriptFunction with FireWebUIListener in sync-confirmation.

This is in preparation of migrating this UI to Polymer3/JS Modules, in which
global namespaces like sync.confirmation will not exist.

Bug: 1012533
Change-Id: I7fb3f6f3767a760d09c827acec133ef3f2c020f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1853804
Commit-Queue: Thomas Tangl <tangltom@chromium.org>
Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Thomas Tangl <tangltom@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705013}

chrome/browser/resources/signin/sync_confirmation/sync_confirmation.js

@@ -6,6 +6,7 @@ cr.define('sync.confirmation', function() {
   'use strict';
 
   function initialize() {
+    cr.addWebUIListener('clear-focus', clearFocus);
     const syncConfirmationBrowserProxy =
         sync.confirmation.SyncConfirmationBrowserProxyImpl.getInstance();
     // Prefer using |document.body.offsetHeight| instead of
@@ -24,7 +25,6 @@ cr.define('sync.confirmation', function() {
   }
 
   return {
-    clearFocus: clearFocus,
     initialize: initialize,
   };
 });

chrome/browser/resources/signin/sync_confirmation/sync_disabled_confirmation.js

@@ -43,6 +43,7 @@ cr.define('sync.confirmation', function() {
   }
 
   function initialize() {
+    cr.addWebUIListener('clear-focus', clearFocus);
     document.addEventListener('keydown', onKeyDown);
     $('confirmButton').addEventListener('click', onConfirm);
     $('undoButton').addEventListener('click', onUndo);
@@ -67,11 +68,7 @@ cr.define('sync.confirmation', function() {
     }
   }
 
-  // TODO(tangltom): clearFocus is called directly by the C++ handler.
-  // C++ handlers should not be calling JS functions by name anymore. They
-  // should be firing events with FireWebuiListener and have the page itself
-  // decide whether to listen or not listen to the event.
-  return {clearFocus: clearFocus, initialize: initialize};
+  return {initialize: initialize};
 });
 
 document.addEventListener('DOMContentLoaded', sync.confirmation.initialize);

chrome/browser/ui/webui/signin/sync_confirmation_handler.cc

@@ -211,6 +211,8 @@ void SyncConfirmationHandler::CloseModalSigninWindow(
 
 void SyncConfirmationHandler::HandleInitializedWithSize(
     const base::ListValue* args) {
+  AllowJavascript();
+
   if (!browser_)
     return;
 
@@ -237,5 +239,5 @@ void SyncConfirmationHandler::HandleInitializedWithSize(
   // TODO(anthonyvd): Figure out why this is needed on Mac and not other
   // platforms and if there's a way to start unfocused while avoiding this
   // workaround.
-  web_ui()->CallJavascriptFunctionUnsafe("sync.confirmation.clearFocus");
+  FireWebUIListener("clear-focus");
 }

chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc

@@ -225,8 +225,9 @@ TEST_F(SyncConfirmationHandlerTest, TestSetImageIfPrimaryAccountReady) {
   handler()->HandleInitializedWithSize(&args);
 
   ExpectAccountImageChanged(*web_ui()->call_data()[0]);
-  EXPECT_EQ("sync.confirmation.clearFocus",
+  EXPECT_EQ("cr.webUIListenerCallback",
             web_ui()->call_data()[1]->function_name());
+  EXPECT_EQ("clear-focus", web_ui()->call_data()[1]->arg1()->GetString());
 }
 
 TEST_F(SyncConfirmationHandlerTest, TestSetImageIfPrimaryAccountReadyLater) {
@@ -236,8 +237,9 @@ TEST_F(SyncConfirmationHandlerTest, TestSetImageIfPrimaryAccountReadyLater) {
 
   EXPECT_EQ(2U, web_ui()->call_data().size());
   ExpectAccountImageChanged(*web_ui()->call_data()[0]);
-  EXPECT_EQ("sync.confirmation.clearFocus",
+  EXPECT_EQ("cr.webUIListenerCallback",
             web_ui()->call_data()[1]->function_name());
+  EXPECT_EQ("clear-focus", web_ui()->call_data()[1]->arg1()->GetString());
 
   identity_test_env()->SimulateSuccessfulFetchOfAccountInfo(
       account_info_.account_id, account_info_.email, account_info_.gaia, "",