WebUI: Remove usage of CallJavaScriptFunctionUnsafe from chrome://nacl

Bug: None
Change-Id: I86da18034e0664780e24559868357c0d0df0ef4c
Reviewed-on: https://chromium-review.googlesource.com/c/1423698Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: John Lee <johntlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#625833}

chrome/browser/resources/about_nacl.html

@@ -19,6 +19,8 @@
     </span>
   </div>
 </div>
+<script src="chrome://resources/js/promise_resolver.js"></script>
+<script src="chrome://resources/js/cr.js"></script>
 <script src="chrome://resources/js/load_time_data.js"></script>
 <script src="chrome://nacl/about_nacl.js"></script>
 <script src="chrome://nacl/strings.js"></script>

chrome/browser/resources/about_nacl.js

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-const nacl = {};
-
 (function() {
 /**
  * Takes the |moduleListData| input argument which represents data about
@@ -19,24 +17,18 @@ function renderTemplate(moduleListData) {
 }
 
 /**
- * Asks the C++ NaClUIDOMHandler to get details about the NaCl and return
- * the data in returnNaClInfo() (below).
+ * Asks the C++ NaClUIDOMHandler to get details about the NaCl and
+ * re-populates the page with the data.
  */
 function requestNaClInfo() {
-  chrome.send('requestNaClInfo');
+  cr.sendWithPromise('requestNaClInfo').then((moduleListData) => {
+    $('loading-message').hidden = 'hidden';
+    $('body-container').hidden = '';
+    renderTemplate(moduleListData);
+  });
 }
 
-/**
- * Called by the WebUI to re-populate the page with data representing the
- * current state of NaCl.
- * @param {Object} moduleListData Information about available modules
- */
-nacl.returnNaClInfo = function(moduleListData) {
-  $('loading-message').hidden = 'hidden';
-  $('body-container').hidden = '';
-  renderTemplate(moduleListData);
-};
-
 // Get data and have it displayed upon loading.
 document.addEventListener('DOMContentLoaded', requestNaClInfo);
+
 })();

chrome/browser/ui/webui/nacl_ui.cc

@@ -120,8 +120,8 @@ class NaClDomHandler : public WebUIMessageHandler {
   // Adds the information relevant to NaCl to list.
   void AddNaClInfo(base::ListValue* list);
 
-  // Whether the page has requested data.
-  bool page_has_requested_data_;
+  // The callback ID for requested data.
+  std::string callback_id_;
 
   // Whether the plugin information is ready.
   bool has_plugin_info_;
@@ -139,8 +139,7 @@ class NaClDomHandler : public WebUIMessageHandler {
 };
 
 NaClDomHandler::NaClDomHandler()
-    : page_has_requested_data_(false),
-      has_plugin_info_(false),
+    : has_plugin_info_(false),
       pnacl_path_validated_(false),
       pnacl_path_exists_(false),
       weak_ptr_factory_(this) {
@@ -282,11 +281,15 @@ void NaClDomHandler::AddNaClInfo(base::ListValue* list) {
 }
 
 void NaClDomHandler::HandleRequestNaClInfo(const base::ListValue* args) {
-  page_has_requested_data_ = true;
+  CHECK(callback_id_.empty());
+  CHECK_EQ(1U, args->GetSize());
+  callback_id_ = args->GetList()[0].GetString();
+
   // Force re-validation of PNaCl's path in the next call to
   // MaybeRespondToPage(), in case PNaCl went from not-installed
   // to installed since the request.
   pnacl_path_validated_ = false;
+  AllowJavascript();
   MaybeRespondToPage();
 }
 
@@ -349,7 +352,7 @@ bool CheckPathAndVersion(std::string* version) {
 void NaClDomHandler::MaybeRespondToPage() {
   // Don't reply until everything is ready.  The page will show a 'loading'
   // message until then.
-  if (!page_has_requested_data_ || !has_plugin_info_)
+  if (callback_id_.empty() || !has_plugin_info_)
     return;
 
   if (!pnacl_path_validated_) {
@@ -365,7 +368,8 @@ void NaClDomHandler::MaybeRespondToPage() {
 
   base::DictionaryValue naclInfo;
   PopulatePageInformation(&naclInfo);
-  web_ui()->CallJavascriptFunctionUnsafe("nacl.returnNaClInfo", naclInfo);
+  ResolveJavascriptCallback(base::Value(callback_id_), naclInfo);
+  callback_id_.clear();
 }
 
 }  // namespace