[CrOS Settings] Add ESimManager bindings to OS Settings

Add ESimManager bindings to OS Settings and create
FakeESimManagerRemote to use as a mock for unit testing.

Bug: 1093185
Change-Id: I03ab65d280f497ef9fac39bd1b48cef725083441
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2536113Reviewed-by: Nasko Oskov <nasko@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Azeem Arshad <azeemarshad@chromium.org>
Commit-Queue: Gordon Seto <gordonseto@google.com>
Cr-Commit-Position: refs/heads/master@{#828004}

chrome/browser/chrome_browser_interface_binders.cc

@@ -189,6 +189,7 @@
 #include "chromeos/components/scanning/mojom/scanning.mojom.h"
 #include "chromeos/components/scanning/scanning_ui.h"
 #include "chromeos/services/cellular_setup/public/mojom/cellular_setup.mojom.h"
+#include "chromeos/services/cellular_setup/public/mojom/esim_manager.mojom.h"
 #include "chromeos/services/multidevice_setup/multidevice_setup_service.h"
 #include "chromeos/services/multidevice_setup/public/mojom/multidevice_setup.mojom.h"
 #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h"  // nogncheck
@@ -697,6 +698,10 @@ void PopulateChromeWebUIFrameBinders(
       chromeos::cellular_setup::CellularSetupDialogUI,
       chromeos::settings::OSSettingsUI>(map);
 
+  RegisterWebUIControllerInterfaceBinder<
+      chromeos::cellular_setup::mojom::ESimManager,
+      chromeos::settings::OSSettingsUI>(map);
+
   RegisterWebUIControllerInterfaceBinder<
       chromeos::crostini_installer::mojom::PageHandlerFactory,
       chromeos::CrostiniInstallerUI>(map);

chrome/browser/resources/settings/chromeos/BUILD.gn

@@ -46,6 +46,7 @@ if (optimize_webui) {
       # TODO(calamity): Update optimize_webui to handle generated files.
       "chrome://resources/chromeos/colors/cros_colors.generated.css",
       "chrome://resources/mojo/chromeos/services/cellular_setup/public/mojom/cellular_setup.mojom.html",
+      "chrome://resources/mojo/chromeos/services/cellular_setup/public/mojom/esim_manager.mojom.html",
       "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom.html",
       "chrome://resources/mojo/mojo/public/mojom/base/unguessable_token.mojom-lite.js",
       "chrome://os-settings/app-management/app_management.mojom-lite.js",
@@ -93,8 +94,11 @@ if (optimize_webui) {
     ]
     excludes = [
       "chrome://resources/mojo/chromeos/services/cellular_setup/public/mojom/cellular_setup.mojom-lite.js",
+      "chrome://resources/mojo/chromeos/services/cellular_setup/public/mojom/esim_manager.mojom-lite.js",
       "chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom-lite.js",
       "chrome://resources/mojo/chromeos/services/network_config/public/mojom/network_types.mojom-lite.js",
+      "chrome://resources/mojo/mojo/public/mojom/base/big_buffer.mojom-lite.js",
+      "chrome://resources/mojo/mojo/public/mojom/base/string16.mojom-lite.js",
       "chrome://resources/mojo/mojo/public/mojom/base/unguessable_token.mojom-lite.js",
       "chrome://resources/mojo/services/network/public/mojom/ip_address.mojom-lite.js",
       "chrome://resources/cr_components/chromeos/network/mojo_interface_provider.m.js",

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

@@ -6,6 +6,7 @@
 
 #include <utility>
 
+#include "ash/public/cpp/esim_manager.h"
 #include "ash/public/cpp/network_config_service.h"
 #include "base/metrics/histogram_functions.h"
 #include "chrome/browser/nearby_sharing/contacts/nearby_share_contact_manager.h"
@@ -26,6 +27,7 @@
 #include "chrome/grit/os_settings_resources_map.h"
 #include "chromeos/constants/chromeos_features.h"
 #include "chromeos/services/cellular_setup/cellular_setup_impl.h"
+#include "chromeos/services/cellular_setup/public/mojom/esim_manager.mojom.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/web_ui_data_source.h"
@@ -105,6 +107,11 @@ void OSSettingsUI::BindInterface(
       std::move(receiver));
 }
 
+void OSSettingsUI::BindInterface(
+    mojo::PendingReceiver<cellular_setup::mojom::ESimManager> receiver) {
+  ash::GetESimManager(std::move(receiver));
+}
+
 void OSSettingsUI::BindInterface(
     mojo::PendingReceiver<network_config::mojom::CrosNetworkConfig> receiver) {
   ash::GetNetworkConfigService(std::move(receiver));

chrome/browser/ui/webui/settings/chromeos/os_settings_ui.h

@@ -16,6 +16,7 @@
 #include "chrome/browser/ui/webui/settings/chromeos/search/user_action_recorder.mojom-forward.h"
 #include "chrome/browser/ui/webui/webui_load_timer.h"
 #include "chromeos/services/cellular_setup/public/mojom/cellular_setup.mojom-forward.h"
+#include "chromeos/services/cellular_setup/public/mojom/esim_manager.mojom-forward.h"
 #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom-forward.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/self_owned_receiver.h"
@@ -45,6 +46,11 @@ class OSSettingsUI : public ui::MojoWebUIController {
   void BindInterface(
       mojo::PendingReceiver<cellular_setup::mojom::CellularSetup> receiver);
 
+  // Instantiates implementor of the mojom::ESimManager mojo interface
+  // passing the pending receiver that will be internally bound.
+  void BindInterface(
+      mojo::PendingReceiver<cellular_setup::mojom::ESimManager> receiver);
+
   // Instantiates implementor of the mojom::CrosNetworkConfig mojo interface
   // passing the pending receiver that will be internally bound.
   void BindInterface(

chrome/test/data/webui/BUILD.gn

@@ -253,6 +253,7 @@ if (include_js_tests) {
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/setup_loading_page_test.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/fake_cellular_setup_remote.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/fake_cellular_setup_delegate.m.js",
+        "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/cellular_setup/fake_esim_manager_remote.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/cr_policy_network_behavior_mojo_tests.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/cr_policy_network_indicator_mojo_tests.m.js",
         "$root_gen_dir/chrome/test/data/webui/cr_components/chromeos/network/network_apnlist_test.m.js",

chrome/test/data/webui/cr_components/chromeos/cellular_setup/BUILD.gn

@@ -19,12 +19,14 @@ js_modulizer("modulize") {
     "setup_loading_page_test.js",
     "fake_cellular_setup_delegate.js",
     "fake_cellular_setup_remote.js",
+    "fake_esim_manager_remote.js",
     "fake_media_devices.js",
   ]
   namespace_rewrites = cr_components_chromeos_namespace_rewrites + [
                          "cellular_setup.FakeCellularSetupDelegate|FakeCellularSetupDelegate",
                          "cellular_setup.FakeCarrierPortalHandlerRemote|FakeCarrierPortalHandlerRemote",
                          "cellular_setup.FakeCellularSetupRemote|FakeCellularSetupRemote",
+                         "cellular_setup.FakeESimManagerRemote|FakeESimManagerRemote",
                          "cellular_setup.FakeMediaDevices|FakeMediaDevices",
                        ]
 }

chrome/test/data/webui/cr_components/chromeos/cellular_setup/esim_flow_ui_test.js

@@ -7,16 +7,22 @@
 // #import 'chrome://resources/cr_components/chromeos/cellular_setup/esim_flow_ui.m.js';
 
 // #import {flush, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// #import {setESimManagerRemoteForTesting} from 'chrome://resources/cr_components/chromeos/cellular_setup/mojo_interface_provider.m.js';
 // #import {ButtonState} from 'chrome://resources/cr_components/chromeos/cellular_setup/cellular_types.m.js';
 // #import {ESimPageName} from 'chrome://resources/cr_components/chromeos/cellular_setup/esim_flow_ui.m.js';
 // #import {assertTrue} from '../../../chai_assert.js';
+// #import {FakeESimManagerRemote} from './fake_esim_manager_remote.m.js';
 // #import {FakeCellularSetupDelegate} from './fake_cellular_setup_delegate.m.js';
 // clang-format on
 
 suite('CrComponentsEsimFlowUiTest', function() {
   let eSimPage;
+  let eSimManagerRemote;
 
   setup(function() {
+    eSimManagerRemote = new cellular_setup.FakeESimManagerRemote();
+    cellular_setup.setESimManagerRemoteForTesting(eSimManagerRemote);
+
     eSimPage = document.createElement('esim-flow-ui');
     eSimPage.delegate = new cellular_setup.FakeCellularSetupDelegate();
     eSimPage.initSubflow();

chrome/test/data/webui/cr_components/chromeos/cellular_setup/fake_esim_manager_remote.js

+// Copyright 2020 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.
+
+
+cr.define('cellular_setup', function() {
+  /** @implements {chromeos.cellularSetup.mojom.ESimManagerInterface} */
+  /* #export */ class FakeESimManagerRemote {
+    /**
+     * @override
+     * @return {!Promise<{euiccs: !Array<!Euicc>,}>}
+     */
+    getAvailableEuiccs() {
+      return new Promise((res) => {
+        res({
+          euiccs: [{
+            eid: '1',
+            isActive: true,
+          }]
+        });
+      });
+    }
+
+    /**
+     * @override
+     * @param { !string } eid
+     * @return {!Promise<{profiles: Array<!ESimProfile>,}>}
+     */
+    getProfiles(eid) {
+      return new Promise((res) => {
+        res({
+          profiles: [{
+            activationCode: 'activation-code-1',
+            eid: '1',
+            iccid: '1',
+            name: 'profile1',
+            nickname: 'profile1',
+            serviceProvider: 'provider1',
+            state: chromeos.cellularSetup.mojom.ProfileState.kPending,
+          }]
+        });
+      });
+    }
+  }
+
+  // #cr_define_end
+  return {
+    FakeESimManagerRemote: FakeESimManagerRemote,
+  };
+});
\ No newline at end of file

chrome/test/data/webui/cr_components/chromeos/cr_components_chromeos_browsertest.js

@@ -70,6 +70,7 @@ GEN('#include "content/public/test/browser_test.h"');
   ]],
   ['EsimFlowUi', 'cellular_setup/esim_flow_ui_test.js',[
     './cellular_setup/fake_cellular_setup_delegate.js',
+    './cellular_setup/fake_esim_manager_remote.js',
   ]],
   ['FinalPage', 'cellular_setup/final_page_test.js', [
     './cellular_setup/fake_cellular_setup_delegate.js',

chromeos/resources/cellular_resources.grdp

@@ -8,4 +8,12 @@
       file="${mojom_root}/chromeos/services/cellular_setup/public/mojom/cellular_setup.mojom-lite.js"
       use_base_dir="false"
       type="BINDATA" />
+  <include name="IDR_ESIM_MANAGER_MOJOM_HTML"
+      file="${mojom_root}/chromeos/services/cellular_setup/public/mojom/esim_manager.mojom.html"
+      use_base_dir="false"
+      type="BINDATA" />
+  <include name="IDR_ESIM_MANAGER_MOJOM_LITE_JS"
+      file="${mojom_root}/chromeos/services/cellular_setup/public/mojom/esim_manager.mojom-lite.js"
+      use_base_dir="false"
+      type="BINDATA" />
 </grit-part>

content/browser/webui/shared_resources_data_source.cc

@@ -114,6 +114,12 @@ const std::map<int, std::string> CreateChromeosMojoResourceIdToAliasMap() {
       {IDR_CELLULAR_SETUP_MOJOM_LITE_JS,
        "mojo/chromeos/services/cellular_setup/public/mojom/"
        "cellular_setup.mojom-lite.js"},
+      {IDR_ESIM_MANAGER_MOJOM_HTML,
+       "mojo/chromeos/services/cellular_setup/public/mojom/"
+       "esim_manager.mojom.html"},
+      {IDR_ESIM_MANAGER_MOJOM_LITE_JS,
+       "mojo/chromeos/services/cellular_setup/public/mojom/"
+       "esim_manager.mojom-lite.js"},
       {IDR_MULTIDEVICE_DEVICE_SYNC_MOJOM_HTML,
        "mojo/chromeos/services/device_sync/public/mojom/"
        "device_sync.mojom.html"},

ui/webui/resources/cr_components/chromeos/cellular_setup/BUILD.gn

@@ -109,6 +109,7 @@ js_library("esim_flow_ui") {
   deps = [
     ":activation_code_page",
     ":cellular_setup_delegate",
+    ":mojo_interface_provider",
     ":profile_discovery_list_item",
     ":profile_discovery_list_page",
     ":subflow_behavior",
@@ -324,6 +325,7 @@ js_library("esim_flow_ui.m") {
     ":cellular_setup_delegate.m",
     ":cellular_types.m",
     ":final_page.m",
+    ":mojo_interface_provider.m",
     ":profile_discovery_list_item.m",
     ":profile_discovery_list_page.m",
     ":subflow_behavior.m",

ui/webui/resources/cr_components/chromeos/cellular_setup/esim_flow_ui.html

 <link rel="import" href="../../../html/polymer.html">
 <link rel="import" href="../../../html/i18n_behavior.html">
+<link rel="import" href="mojo_interface_provider.html">
 <link rel="import" href="subflow_behavior.html">
 <link rel="import" href="cellular_types.html">
 <link rel="import" href="cellular_setup_delegate.html">

ui/webui/resources/cr_components/chromeos/cellular_setup/mojo_interface_provider.html

 <link rel="import" href="../../../html/cr.html">
 <link rel="import" href="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.html">
+<link rel="import" href="chrome://resources/mojo/mojo/public/mojom/base/big_buffer.mojom.html">
+<link rel="import" href="chrome://resources/mojo/mojo/public/mojom/base/string16.mojom.html">
 <link rel="import" href="chrome://resources/mojo/chromeos/services/cellular_setup/public/mojom/cellular_setup.mojom.html">
+<link rel="import" href="chrome://resources/mojo/chromeos/services/cellular_setup/public/mojom/esim_manager.mojom.html">
 <script src="mojo_interface_provider.js"></script>

ui/webui/resources/cr_components/chromeos/cellular_setup/mojo_interface_provider.js

@@ -5,11 +5,15 @@
 // clang-format off
 // #import 'chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js';
 // #import 'chrome://resources/mojo/url/mojom/url.mojom-lite.js';
+// #import 'chrome://resources/mojo/mojo/public/mojom/base/big_buffer.mojom-lite.js';
+// #import 'chrome://resources/mojo/mojo/public/mojom/base/string16.mojom-lite.js';
 // #import 'chrome://resources/mojo/chromeos/services/cellular_setup/public/mojom/cellular_setup.mojom-lite.js';
+// #import 'chrome://resources/mojo/chromeos/services/cellular_setup/public/mojom/esim_manager.mojom-lite.js';
 // clang-format on
 
 cr.define('cellular_setup', function() {
   let cellularRemote = null;
+  let eSimManagerRemote = null;
 
   /**
    * @param {?chromeos.cellularSetup.mojom.CellularSetupRemote}
@@ -32,6 +36,32 @@ cr.define('cellular_setup', function() {
     return cellularRemote;
   }
 
+  /**
+   * @param {?chromeos.cellularSetup.mojom.ESimManagerRemote}
+   *        testESimManagerRemote A test eSimManager remote
+   */
+  /* #export */ function setESimManagerRemoteForTesting(testESimManagerRemote) {
+    eSimManagerRemote = testESimManagerRemote;
+  }
+
+  /**
+   * @returns {!chromeos.cellularSetup.mojom.ESimManagerRemote}
+   */
+  /* #export */ function getESimManagerRemote() {
+    if (eSimManagerRemote) {
+      return eSimManagerRemote;
+    }
+
+    eSimManagerRemote = chromeos.cellularSetup.mojom.ESimManager.getRemote();
+
+    return eSimManagerRemote;
+  }
+
   // #cr_define_end
-  return {setCellularSetupRemoteForTesting, getCellularSetupRemote};
+  return {
+    setCellularSetupRemoteForTesting,
+    getCellularSetupRemote,
+    setESimManagerRemoteForTesting,
+    getESimManagerRemote
+  };
 });

ui/webui/resources/cr_components/chromeos/os_cr_components.gni

@@ -16,6 +16,8 @@ cr_components_chromeos_namespace_rewrites = [
   "cellularSetup.getTimeoutMsForPSimUIState|getTimeoutMsForPSimUIState",
   "cellular_setup.getCellularSetupRemote|getCellularSetupRemote",
   "cellular_setup.setCellularSetupRemoteForTesting|setCellularSetupRemoteForTesting",
+  "cellular_setup.getESimManagerRemote|getESimManagerRemote",
+  "cellular_setup.setESimManagerRemoteForTesting|setESimManagerRemoteForTesting",
   "cellular_setup.CellularSetupDelegate|CellularSetupDelegate",
   "network_config.MojoInterfaceProvider|MojoInterfaceProvider",
   "network_config.MojoInterfaceProviderImpl|MojoInterfaceProviderImpl",
@@ -29,7 +31,7 @@ cr_components_chromeos_auto_imports = [
   "ui/webui/resources/cr_components/chromeos/cellular_setup/cellular_types.html|ButtonState,Button,ButtonBarState,CellularSetupPageName",
   "ui/webui/resources/cr_components/chromeos/cellular_setup/cellular_setup_delegate.html|CellularSetupDelegate",
   "ui/webui/resources/cr_components/chromeos/cellular_setup/subflow_behavior.html|SubflowBehavior",
-  "ui/webui/resources/cr_components/chromeos/cellular_setup/mojo_interface_provider.html|setCellularSetupRemoteForTesting,getCellularSetupRemote",
+  "ui/webui/resources/cr_components/chromeos/cellular_setup/mojo_interface_provider.html|setCellularSetupRemoteForTesting,getCellularSetupRemote,setESimManagerRemoteForTesting,getESimManagerRemote",
   "ui/webui/resources/cr_components/chromeos/network/cr_policy_network_behavior_mojo.html|CrPolicyNetworkBehaviorMojo",
   "ui/webui/resources/cr_components/chromeos/network/onc_mojo.html|OncMojo",
   "ui/webui/resources/cr_components/chromeos/network/network_config_element_behavior.html|NetworkConfigElementBehavior",