MD History: Focus the search field on load without 'showing' it

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;
@@ skipping 98 matching lines @@
   function registerTests() {
     suite('history-toolbar', function() {
       var app;
       var element;
       var toolbar;
       var TEST_HISTORY_RESULTS =
           [createHistoryEntry('2016-03-15', 'https://google.com')];
       ;
 
       setup(function() {
+        window.resultsRendered = false;
         app = replaceApp();
 
         element = app.$['history'].$['infinite-list'];
         toolbar = app.$['toolbar'];
       });
 
       test('search bar is focused on load in wide mode', function() {
-        window.resultsRendered = false;
-        app.hasDrawer_ = false;
+        toolbar.$['main-toolbar'].narrow_ = false;
 
         historyResult(createHistoryInfo(), []);
         return flush().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() {
-        app.hasDrawer_ = true;
+        toolbar.$['main-toolbar'].narrow_ = true;
 
         historyResult(createHistoryInfo(), []);
-        // Ensure the search bar is focused on load.
-        assertFalse(
-            $('history-app')
-                .$.toolbar.$['main-toolbar']
-                .getSearchField()
-                .isSearchFocused());
+        return flush().then(() => {
+          // Ensure the search bar is focused on load.
+          assertFalse(
+              $('history-app')
+                  .$.toolbar.$['main-toolbar']
+                  .getSearchField()
+                  .isSearchFocused());
+        });
       });
     });
   };
 
   return {
     registerTests: registerTests
   };
 });