MD Settings: change how tap is handled on custom toggle rows

chrome/test/data/webui/settings/metrics_reporting_tests.js

 // Copyright 2016 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.
 
 suite('metrics reporting', function() {
   /** @type {settings.TestPrivacyPageBrowserProxy} */
   var testBrowserProxy;
 
   /** @type {SettingsPrivacyPageElement} */
   var page;
 
   setup(function() {
     testBrowserProxy = new TestPrivacyPageBrowserProxy();
     settings.PrivacyPageBrowserProxyImpl.instance_ = testBrowserProxy;
     PolymerTest.clearBody();
     page = document.createElement('settings-privacy-page');
   });
 
   teardown(function() { page.remove(); });
 
   test('changes to whether metrics reporting is enabled/managed', function() {
     return testBrowserProxy.whenCalled('getMetricsReporting').then(function() {
       Polymer.dom.flush();
 
       var control = page.$.metricsReportingControl;
       assertEquals(testBrowserProxy.metricsReporting.enabled, control.checked);
-      var indicatorVisible = !!page.$$('#indicator');
-      assertEquals(testBrowserProxy.metricsReporting.managed, indicatorVisible);
+      assertEquals(testBrowserProxy.metricsReporting.managed,
+                   !!control.pref.controlledBy);
 
       var changedMetrics = {
         enabled: !testBrowserProxy.metricsReporting.enabled,
         managed: !testBrowserProxy.metricsReporting.managed,
       };
       cr.webUIListenerCallback('metrics-reporting-change', changedMetrics);
       Polymer.dom.flush();
 
       assertEquals(changedMetrics.enabled, control.checked);
-      indicatorVisible = !!page.$$('#indicator');
-      assertEquals(changedMetrics.managed, indicatorVisible);
+      assertEquals(changedMetrics.managed, !!control.pref.controlledBy);
 
       var toggled = !changedMetrics.enabled;
+      control.checked = toggled;
+      control.notifyChangedByUserInteraction();
 
-      MockInteractions.tap(control);
-      return testBrowserProxy.whenCalled('setMetricsReportingEnabled', toggled);
+      return testBrowserProxy.whenCalled('setMetricsReportingEnabled').then(
+          function(enabled) {
+            assertEquals(toggled, enabled);
+          });
     });
   });
 
   test('metrics reporting restart button', function() {
     return testBrowserProxy.whenCalled('getMetricsReporting').then(function() {
       Polymer.dom.flush();
 
       // Restart button should be hidden by default (in any state).
       assertFalse(!!page.$$('#restart'));
 
@@ skipping 30 matching lines @@
       // Receiving the same values should have no effect.
        cr.webUIListenerCallback('metrics-reporting-change', {
         enabled: false,
         managed: false,
       });
       Polymer.dom.flush();
       assertTrue(!!page.$$('#restart'));
     });
   });
 });