MD WebUI: Do not restore focus from <cr-shared-menu> when closing with tap

chrome/test/data/webui/cr_elements/cr_shared_menu_tests.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.
 
 /** @fileoverview Suite of tests for cr-shared-menu. */
 suite('cr-shared-menu', function() {
   var menu;
 
   var button;
+  var button2;
 
   var item1;
   var item2;
   var item3;
 
   function afterOpen(callback) {
     menu.addEventListener('iron-overlay-opened', function f() {
       menu.removeEventListener('iron-overlay-opened', f);
       callback();
     });
@@ skipping 15 matching lines @@
     item2 = document.createElement('paper-item');
     menu.appendChild(item2);
     item3 = document.createElement('paper-item');
     menu.appendChild(item3);
 
     button = document.createElement('button');
     button.addEventListener('tap', function() {
       menu.toggleMenu(button, {});
     });
 
+    button2 = document.createElement('button');
+    button2.addEventListener('tap', function() {
+      menu.toggleMenu(button2, {});
+    });
+
     document.body.appendChild(menu);
     document.body.appendChild(button);
+    document.body.appendChild(button2);
   });
 
   test('opening and closing menu', function(done) {
     MockInteractions.tap(button);
     assertTrue(menu.menuOpen);
 
     afterOpen(function() {
       // Using tap to close the menu requires that the iron-overlay-behavior
       // has finished initializing, which happens asynchronously between
       // tapping the button and firing iron-overlay-opened.
       MockInteractions.tap(document.body);
       assertFalse(menu.menuOpen);
 
-      MockInteractions.tap(button);
-      assertTrue(menu.menuOpen);
-
-      // Pressing escape should close the menu.
-      MockInteractions.pressAndReleaseKeyOn(menu, 27);
-      assertTrue(menu.menuOpen);
       done();
     });
   });
+
+  test('open and close menu with escape', function(done) {
+    MockInteractions.tap(button);
+    assertTrue(menu.menuOpen);
+    afterOpen(function() {
+      // Pressing escape should close the menu.
+      MockInteractions.pressAndReleaseKeyOn(menu, 27);
+      assertFalse(menu.menuOpen);
+      done();
+    });
+  });
 
   test('refocus button on close', function(done) {
     button.focus();
     MockInteractions.tap(button);
 
     afterOpen(function() {
       assertTrue(menu.menuOpen);
       // Focus is applied asynchronously after the menu is opened.
       assertEquals(item1, menu.shadowRoot.activeElement);
 
       menu.closeMenu();
       assertFalse(menu.menuOpen);
 
       // Button should regain focus after closing the menu.
       assertEquals(button, document.activeElement);
 
       done();
     });
   });
 
+  test('refocus latest button on close', function(done) {
+    // Regression test for crbug.com/628080.
+    button.focus();
+    MockInteractions.tap(button);
+
+    afterOpen(function() {
+      button2.focus();
+      MockInteractions.tap(button2);
+
+      afterOpen(function() {
+        menu.closeMenu();
+        assertEquals(button2, document.activeElement);
+        done();
+      });
+    });
+  });
+
   test('closeMenu does not refocus button when focus moves', function(done) {
     var input = document.createElement('input');
     document.body.appendChild(input);
 
     button.focus();
     MockInteractions.tap(button);
 
     afterOpen(function() {
       input.focus();
       menu.closeMenu();
@@ skipping 14 matching lines @@
       assertEquals(item3, menu.shadowRoot.activeElement);
 
       // Simulate tab on last element.
       MockInteractions.pressAndReleaseKeyOn(item3, 9);
       assertEquals(item1, menu.shadowRoot.activeElement);
 
       done();
     });
   });
 });