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

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

Index: chrome/test/data/webui/settings/metrics_reporting_tests.js
diff --git a/chrome/test/data/webui/settings/metrics_reporting_tests.js b/chrome/test/data/webui/settings/metrics_reporting_tests.js
index de2f12c0040dcc342e0d04d0df662f988af121b3..e9ef617d5ef001b2b36b0d1ea3241c1a3a141ddb 100644
--- a/chrome/test/data/webui/settings/metrics_reporting_tests.js
+++ b/chrome/test/data/webui/settings/metrics_reporting_tests.js
@@ -24,8 +24,8 @@ suite('metrics reporting', function() {
 
       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,
@@ -35,13 +35,16 @@ suite('metrics reporting', function() {
       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);
+          });
     });
   });