[MD History] Unify query state in history-app.

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 element;
       var toolbar;
       var TEST_HISTORY_RESULTS;
 
       suiteSetup(function() {
         element = $('history-app').$['history-list'];
         toolbar = $('history-app').$['toolbar'];
         TEST_HISTORY_RESULTS =
             [createHistoryEntry('2016-03-15', 'https://google.com')];
       });
 
       test('selecting checkbox causes toolbar to change', function(done) {
-        element.addNewResults(TEST_HISTORY_RESULTS, '');
+        element.addNewResults(TEST_HISTORY_RESULTS);
 
         flush(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.
@@ skipping 15 matching lines @@
         registerMessageCallback('queryHistory', this, function (info) {
           assertEquals(info[0], 'Test');
           done();
         });
 
         toolbar.onSearch('Test');
       });
 
       test('more from this site sends and sets correct data', function(done) {
         registerMessageCallback('queryHistory', this, function (info) {
-          assertEquals(info[0], 'example.com');
+          assertEquals('example.com', info[0]);
           flush(function() {
             assertEquals(toolbar.$$('#search-input').$$('#search-input').value,
                 'example.com');
             done();
           });
         });
 
         element.$.sharedMenu.itemData = {domain: 'example.com'};
         MockInteractions.tap(element.$.menuMoreButton);
       });
 
       teardown(function() {
         element.historyData = [];
+        element.searchedTerm = '';
         registerMessageCallback('queryHistory', this, undefined);
         toolbar.count = 0;
       });
     });
   }
   return {
     registerTests: registerTests
   };
 });