md-settings: Fix back navigation from /resetProfileSettings.

chrome/test/data/webui/md_history/history_toolbar_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_toolbar_test', function() {
   function registerTests() {
     suite('history-toolbar', function() {
       var app;
       var element;
       var toolbar;
       var TEST_HISTORY_RESULTS;
 
       suiteSetup(function() {
         TEST_HISTORY_RESULTS =
             [createHistoryEntry('2016-03-15', 'https://google.com')];
       });
 
       setup(function() {
         app = replaceApp();
         element = app.$['history'].$['infinite-list'];
         toolbar = app.$['toolbar'];
-        return flush();
+        return PolymerTest.flushTasks();
       });
 
       test('selecting checkbox causes toolbar to change', function() {
         element.addNewResults(TEST_HISTORY_RESULTS);
 
-        return flush().then(function() {
+        return PolymerTest.flushTasks().then(function() {
           var item = element.$$('history-item');
           MockInteractions.tap(item.$.checkbox);
 
           // Ensure that when an item is selected that the count held by the
           // toolbar increases.
           assertEquals(1, toolbar.count);
           // Ensure that the toolbar boolean states that at least one item is
           // selected.
           assertTrue(toolbar.itemsSelected_);
 
@@ skipping 81 matching lines @@
         app = replaceApp();
 
         element = app.$['history'].$['infinite-list'];
         toolbar = app.$['toolbar'];
       });
 
       test('search bar is focused on load in wide mode', function() {
         toolbar.$['main-toolbar'].narrow_ = false;
 
         historyResult(createHistoryInfo(), []);
-        return flush().then(() => {
+        return PolymerTest.flushTasks().then(() => {
           // Ensure the search bar is focused on load.
           assertTrue(
               app.$.toolbar.$['main-toolbar']
                   .getSearchField()
                   .isSearchFocused());
         });
       });
 
       test('search bar is not focused on load in narrow mode', function() {
         toolbar.$['main-toolbar'].narrow_ = true;
 
         historyResult(createHistoryInfo(), []);
-        return flush().then(() => {
+        return PolymerTest.flushTasks().then(() => {
           // Ensure the search bar is focused on load.
           assertFalse(
               $('history-app')
                   .$.toolbar.$['main-toolbar']
                   .getSearchField()
                   .isSearchFocused());
         });
       });
     });
   };
 
   return {
     registerTests: registerTests
   };
 });