Oobe enterprise enrollment: fix CFM test

Bug: 1102928
Change-Id: Ia61d67aa02227840144d6b5bff4964287ca17083
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2287590
Commit-Queue: Yunke Zhou <yunkez@google.com>
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: Denis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786254}

chrome/browser/chromeos/login/enrollment/enrollment_local_policy_server_browsertest.cc

@@ -252,6 +252,7 @@ IN_PROC_BROWSER_TEST_F(EnrollmentLocalPolicyServerBase, ManualEnrollment) {
   TriggerEnrollmentAndSignInSuccessfully();
 
   enrollment_ui_.WaitForStep(test::ui::kEnrollmentStepSuccess);
+  test::OobeJS().ExpectTrue("Oobe.isEnrollmentSuccessfulForTest()");
   EXPECT_TRUE(StartupUtils::IsDeviceRegistered());
   EXPECT_TRUE(InstallAttributes::Get()->IsCloudManaged());
 }

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

@@ -321,7 +321,7 @@ cr.define('cr.ui', function() {
    * attribute screen if it's present.
    */
   Oobe.isEnrollmentSuccessfulForTest = function() {
-    const step = $('enterprise-enrollment').currentStep_;
+    const step = $('enterprise-enrollment').uiStep;
     if (step === ENROLLMENT_STEP.ATTRIBUTE_PROMPT) {
       chrome.send('oauthEnrollAttributes', ['', '']);
       return true;