cros: Fix browsertests for polymer2

Now uses '$.' instead of  '/deep/' to find elements

BUG=chromium:875480

Change-Id: I1c7282cce123047987f436fd90018409545069f7
Reviewed-on: https://chromium-review.googlesource.com/1233839Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Roman Sorokin <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592486}

chrome/browser/chromeos/login/enterprise_enrollment_browsertest.cc

@@ -37,19 +37,14 @@ namespace chromeos {
 
 namespace {
 
-constexpr char kAdMachineNameInput[] =
-    "document.querySelector('#oauth-enroll-ad-join-ui /deep/ "
-    "#machineNameInput')";
-constexpr char kAdMachineOrgUnitInput[] =
-    "document.querySelector('#oauth-enroll-ad-join-ui /deep/ "
-    "#orgUnitInput')";
-constexpr char kAdEncryptionTypesSelect[] =
-    "document.querySelector('#oauth-enroll-ad-join-ui /deep/ "
-    "#encryptionList')";
-constexpr char kAdUsernameInput[] =
-    "document.querySelector('#oauth-enroll-ad-join-ui /deep/ #userInput')";
-constexpr char kAdPasswordInput[] =
-    "document.querySelector('#oauth-enroll-ad-join-ui /deep/ #passwordInput')";
+#define AD_JS_ELEMENT "document.querySelector('#oauth-enroll-ad-join-ui').$."
+constexpr char kAdMachineNameInput[] = AD_JS_ELEMENT "machineNameInput";
+constexpr char kAdMachineOrgUnitInput[] = AD_JS_ELEMENT "orgUnitInput";
+constexpr char kAdEncryptionTypesSelect[] = AD_JS_ELEMENT "encryptionList";
+constexpr char kAdUsernameInput[] = AD_JS_ELEMENT "userInput";
+constexpr char kAdPasswordInput[] = AD_JS_ELEMENT "passwordInput";
+constexpr char kAdSubmitCreds[] = AD_JS_ELEMENT "adCreds.$.button.fire('tap')";
+#undef AD_JS_ELEMENT
 constexpr char kAdUserDomain[] = "user.domain.com";
 constexpr char kAdMachineDomain[] = "machine.domain.com";
 constexpr char kAdMachineDomainDN[] =
@@ -267,17 +262,15 @@ class ActiveDirectoryJoinTest : public EnterpriseEnrollmentTest {
           encryption_types + "'";
       js_checker().ExecuteAsync(set_encryption_types);
     }
-    js_checker().ExecuteAsync(
-        "document.querySelector('#oauth-enroll-ad-join-ui /deep/ #adCreds"
-        "    /deep/ #button').fire('tap')");
+    js_checker().ExecuteAsync(kAdSubmitCreds);
     ExecutePendingJavaScript();
   }
 
   void ClickRetryOnErrorScreen() {
     js_checker().ExecuteAsync(
         "document.querySelector('"
-        "#oauth-enroll-active-directory-join-error-card /deep/ #submitButton'"
-        ").fire('tap')");
+        "#oauth-enroll-active-directory-join-error-card').$.submitButton"
+        ".fire('tap')");
     ExecutePendingJavaScript();
   }
 

testing/buildbot/filters/webui_polymer2_browser_tests.filter

@@ -41,10 +41,6 @@
 -TtsAccessibilityTest.*
 
 # ChromeOS only test failures.
--ActiveDirectoryJoinTest.TestActiveDirectoryEnrollment_DistinguishedName
--ActiveDirectoryJoinTest.TestActiveDirectoryEnrollment_ErrorCard
--ActiveDirectoryJoinTest.TestActiveDirectoryEnrollment_Success
--ActiveDirectoryJoinTest.TestActiveDirectoryEnrollment_UIErrors
 -AudioPlayerBrowserTest.ChangeTracks
 -AudioPlayerBrowserTest.ChangeTracksPlayList
 -AudioPlayerBrowserTest.ChangeTracksPlayListIcon
@@ -96,7 +92,7 @@
 # enabled by default and run the full set of tests, and collect any missing
 # failing tests.
 
-ActiveDirectoryJoinTest.TestActiveDirectoryEnrollment_ErrorCard
+ActiveDirectoryJoinTest.*
 AudioPlayerBrowserTest.ChangeTracksPlayList
 AudioPlayerBrowserTest.ChangeTracksPlayListIcon
 AudioPlayerBrowserTest.ChangeVolumeLevel