[MD History] Fix item selection when deleting via menu item.

chrome/browser/resources/md_history/list_container.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.
 
 Polymer({
   is: 'history-list-container',
 
   properties: {
     // The path of the currently selected page.
     selectedPage_: String,
@@ skipping 220 matching lines @@
   },
 
   /** @private */
   onRemoveFromHistoryTap_: function() {
     var browserService = md_history.BrowserService.getInstance();
     browserService.recordAction('EntryMenuRemoveFromHistory');
     var menu = assert(this.$.sharedMenu.getIfExists());
     var itemData = menu.itemData;
     browserService.deleteItems([itemData.item])
         .then(function(items) {
-          this.getSelectedList_().removeItemsByPath([itemData.path]);
-          // This unselect-all is to reset the toolbar when deleting a selected
-          // item. TODO(tsergeant): Make this automatic based on observing list
+          // This unselect-all resets the toolbar when deleting a selected item
+          // and clears selection state which can be invalid if items move
+          // around during deletion.
+          // TODO(tsergeant): Make this automatic based on observing list
           // modifications.
           this.fire('unselect-all');
+          this.getSelectedList_().removeItemsByPath([itemData.path]);
 
           var index = itemData.index;
           if (index == undefined)
             return;
 
           var browserService = md_history.BrowserService.getInstance();
           browserService.recordHistogram(
               'HistoryPage.RemoveEntryPosition', index,
               UMA_MAX_BUCKET_VALUE);
           if (index <= UMA_MAX_SUBSET_BUCKET_VALUE) {
             browserService.recordHistogram(
                 'HistoryPage.RemoveEntryPositionSubset', index,
                 UMA_MAX_SUBSET_BUCKET_VALUE);
           }
         }.bind(this));
     menu.closeMenu();
   },
 
   /**
    * @return {HTMLElement}
    * @private
    */
   getSelectedList_: function() { return this.$.content.selectedItem; },
 });