OOBE: Minor preparations for HTMLImports polyfill

Prepare parts of the code to work with the HTMLImports polyfill by
removing some global definitions usage in cr_ui.js and explicitly
making oobe_types.js a dependency of security_token_pin_browsertest.

Bug: 1111387
Change-Id: Ifbd2374fc7117f2cefa76c1baa3f96ec813a57a9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2550221Reviewed-by: Denis Kuznetsov [CET] <antrim@chromium.org>
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Auto-Submit: Renato Silva <rrsilva@google.com>
Cr-Commit-Position: refs/heads/master@{#829292}

chrome/browser/resources/chromeos/login/cr_ui.js

@@ -312,15 +312,22 @@ cr.define('cr.ui', function() {
   /**
    * Returns true if enrollment was successful. Dismisses the enrollment
    * attribute screen if it's present.
+   *
+   *  TODO(crbug.com/1111387) - Remove inline values from
+   *  ENROLLMENT_STEP once fully migrated to JS modules.
    */
   Oobe.isEnrollmentSuccessfulForTest = function() {
     const step = $('enterprise-enrollment').uiStep;
-    if (step === ENROLLMENT_STEP.ATTRIBUTE_PROMPT) {
+    // See [ENROLLMENT_STEP.ATTRIBUTE_PROMPT]
+    // from c/b/r/chromeos/login/enterprise_enrollment.js
+    if (step === 'attribute-prompt') {
       chrome.send('oauthEnrollAttributes', ['', '']);
       return true;
     }
 
-    return step === ENROLLMENT_STEP.SUCCESS;
+    // See [ENROLLMENT_STEP.SUCCESS]
+    // from c/b/r/chromeos/login/enterprise_enrollment.js
+    return step === 'success';
   };
 
   /**

chrome/browser/resources/chromeos/login/enterprise_enrollment.js

@@ -14,7 +14,14 @@ var INJECTED_WEBVIEW_SCRIPT = String.raw`
                        keyboard.initializeKeyboardFlow(true);
                      })();`;
 
-/** @const */ var ENROLLMENT_STEP = {
+/**
+ * @const
+ * When making changes to any of these parameters, make sure that their use in
+ * chrome/browser/resources/chromeos/login/cr_ui.js is updated as well.
+ * TODO(crbug.com/1111387) - Remove this dependency when fully migrated
+ * to JS modules.
+ * */
+var ENROLLMENT_STEP = {
   SIGNIN: 'signin',
   AD_JOIN: 'ad-join',
   WORKING: 'working',

chrome/browser/resources/chromeos/login/security_token_pin_browsertest.js

@@ -17,6 +17,10 @@ var PolymerSecurityTokenPinTest = class extends PolymerTest {
   get browsePreload() {
     return 'chrome://oobe/login';
   }
+
+  get extraLibraries() {
+    return super.extraLibraries.concat(['components/oobe_types.js']);
+  }
 };
 
 TEST_F('PolymerSecurityTokenPinTest', 'All', function() {

chrome/test/data/webui/BUILD.gn

@@ -128,6 +128,7 @@ if (include_js_tests) {
 
     if (is_chromeos) {
       sources += [
+        "../../../browser/resources/chromeos/login/components/oobe_types.js",
         "../../../browser/resources/chromeos/login/security_token_pin_browsertest.js",
         "../../../browser/ui/webui/chromeos/bluetooth_pairing_dialog_browsertest.js",
         "../../../browser/ui/webui/chromeos/certificate_manager_dialog_browsertest.js",