md-settings: Fix back navigation from /resetProfileSettings.

chrome/test/data/webui/md_history/history_toolbar_test.js

Index: chrome/test/data/webui/md_history/history_toolbar_test.js
diff --git a/chrome/test/data/webui/md_history/history_toolbar_test.js b/chrome/test/data/webui/md_history/history_toolbar_test.js
index bbac0e3370d6a1a2eba20c362973d3ea49a14d06..6910024eb12f97f2d3aa1bdf5c0304b42d455408 100644
--- a/chrome/test/data/webui/md_history/history_toolbar_test.js
+++ b/chrome/test/data/webui/md_history/history_toolbar_test.js
@@ -19,13 +19,13 @@ cr.define('md_history.history_toolbar_test', 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);
 
@@ -127,7 +127,7 @@ cr.define('md_history.history_toolbar_focus_test', 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']
@@ -140,7 +140,7 @@ cr.define('md_history.history_toolbar_focus_test', 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')