[CrOS Multidevice] Fix flaky OSSettingsMultideviceFeatureItemV3Test.All

Fixed and ran 100 times with the failing gn args, and they pass.
Re-enables the browser test.

Fixed: 1146224
Change-Id: I6e53f6c0e6fa0d97dd527a0e16c6ee508c91ed43
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2628503
Commit-Queue: Regan Hsu <hsuregan@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843410}

chrome/test/data/webui/settings/chromeos/multidevice_feature_item_tests.js

@@ -7,7 +7,7 @@
 
 // #import {MultiDeviceFeature, MultiDeviceFeatureState, routes, Router} from 'chrome://os-settings/chromeos/os_settings.js';
 // #import {assertEquals, assertFalse, assertTrue} from '../../chai_assert.js';
-// #import {eventToPromise, flushTasks} from 'chrome://test/test_util.m.js';
+// #import {eventToPromise} from 'chrome://test/test_util.m.js';
 // #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 // clang-format on
 
@@ -69,18 +69,6 @@ suite('Multidevice', function() {
     assertEquals(initialRoute, settings.Router.getInstance().getCurrentRoute());
   }
 
-  /**
-   * Clicks an element, asserts whether the click fires a
-   * 'feature-toggle-clicked' event.
-   * @param {HTMLElement} element. Target of click.
-   */
-  async function checkWhetherFeatureToggleClickedFired(element) {
-    const expectedEvent =
-        test_util.eventToPromise('feature-toggle-clicked', featureToggle);
-    element.click();
-    await Promise.all([expectedEvent, test_util.flushTasks()]);
-  }
-
   setup(function() {
     PolymerTest.clearBody();
 
@@ -127,8 +115,12 @@ suite('Multidevice', function() {
     featureItem.feature = settings.MultiDeviceFeature.BETTER_TOGETHER_SUITE;
     featureState = settings.MultiDeviceFeatureState.ENABLED_BY_USER;
     featureItem.subpageRoute = null;
+    Polymer.dom.flush();
 
-    await checkWhetherFeatureToggleClickedFired(featureItem.$$('#linkWrapper'));
+    const expectedEvent =
+        test_util.eventToPromise('feature-toggle-clicked', featureToggle);
+    featureItem.$$('#linkWrapper').click();
+    await expectedEvent;
   });
 
   test('toggle click does not navigate to subpage in any state', function() {

chrome/test/data/webui/settings/chromeos/os_settings_v3_browsertest.js

@@ -218,8 +218,7 @@ TEST_F(
  ['InternetPage', 'internet_page_tests.m.js'],
  ['KerberosPage', 'kerberos_page_test.m.js'],
  ['LocalizedLink', 'localized_link_test.m.js'],
- // TODO(https://crbug.com/1146224): Re-enable flaky test.
- // ['MultideviceFeatureItem', 'multidevice_feature_item_tests.m.js'],
+ ['MultideviceFeatureItem', 'multidevice_feature_item_tests.m.js'],
  ['MultideviceFeatureToggle', 'multidevice_feature_toggle_tests.m.js'],
  ['MultidevicePage', 'multidevice_page_tests.m.js'],
  ['MultideviceSmartLockSubPage', 'multidevice_smartlock_subpage_test.m.js'],