md-settings: Fix back navigation from /resetProfileSettings.

chrome/test/data/webui/md_history/history_routing_test.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.
 
 cr.define('md_history.history_routing_test', function() {
   function registerTests() {
     suite('routing-test', function() {
       var app;
       var list;
       var toolbar;
 
       function navigateTo(route) {
         window.history.replaceState({}, '', route);
         window.dispatchEvent(new CustomEvent('location-changed'));
       }
 
       setup(function() {
         assertEquals('chrome://history/', window.location.href);
         app = replaceApp();
         sidebar = app.$['content-side-bar']
         toolbar = app.$['toolbar'];
       });
 
       test('changing route changes active view', function() {
         assertEquals('history', app.$.content.selected);
         navigateTo('/syncedTabs');
-        return flush().then(function() {
+        return PolymerTest.flushTasks().then(function() {
           assertEquals('syncedTabs', app.$.content.selected);
           assertEquals('chrome://history/syncedTabs', window.location.href);
         });
       });
 
       test('route updates from sidebar', function() {
         var menu = sidebar.$.menu;
         assertEquals('history', app.selectedPage_);
         assertEquals('chrome://history/', window.location.href);
 
@@ skipping 60 matching lines @@
 
       suiteSetup(function() {
         app = $('history-app');
         toolbar = app.$['toolbar'];
         expectedQuery = 'query';
       });
 
       test('search initiated on load', function(done) {
         var verifyFunction = function(info) {
           assertEquals(expectedQuery, info[0]);
-          flush().then(function() {
+          PolymerTest.flushTasks().then(function() {
             assertEquals(
                 expectedQuery,
                 toolbar.$['main-toolbar'].getSearchField().getValue());
             done();
           });
         };
 
         if (window.historyQueryInfo) {
           verifyFunction(window.historyQueryInfo);
           return;
         }
 
         registerMessageCallback('queryHistory', this, verifyFunction);
       });
     });
   }
   return {
     registerTests: registerTests
   };
 });