MD Bookmarks: Remove '/?id=1' from URL when displaying Bookmarks Bar

chrome/test/data/webui/md_bookmarks/router_test.js

 // Copyright 2017 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.
 
 suite('<bookmarks-router>', function() {
   var store;
   var router;
 
   function navigateTo(route) {
     window.history.replaceState({}, '', route);
@@ skipping 25 matching lines @@
     assertEquals('select-folder', store.lastAction.name);
     assertEquals('2', store.lastAction.id);
   });
 
   test('route updates from ID', function() {
     store.data.selectedFolder = '2';
     store.notifyObservers();
 
     return Promise.resolve().then(function() {
       assertEquals('chrome://bookmarks/?id=2', window.location.href);
+      store.data.selectedFolder = '1';
+      store.notifyObservers();
+    }).then(function() {
+      // Selecting Bookmarks bar clears route.
+      assertEquals('chrome://bookmarks/', window.location.href);
     });
   });
 
   test('route updates from search', function() {
     store.data.search = {term: 'bloop'};
     store.notifyObservers();
 
     return Promise.resolve()
         .then(function() {
           assertEquals('chrome://bookmarks/?q=bloop', window.location.href);
 
           // Ensure that the route doesn't change when the search finishes.
           store.data.selectedFolder = null;
           store.notifyObservers();
         })
         .then(function() {
           assertEquals('chrome://bookmarks/?q=bloop', window.location.href);
         });
   });
+
+  test('bookmarks bar selected with empty route', function() {
+    navigateTo('/?id=2');
+    navigateTo('/');
+    assertEquals('select-folder', store.lastAction.name);
+    assertEquals('1', store.lastAction.id);
+  });
 });
 
 suite('URL preload', function() {
   /**
    * Reset the page state with a <bookmarks-app> and a clean Store, with the
    * given |url| to trigger routing initialization code.
    */
   function setupWithUrl(url) {
     PolymerTest.clearBody();
     bookmarks.Store.instance_ = undefined;
@@ skipping 38 matching lines @@
     var state = bookmarks.Store.getInstance().data;
     assertEquals('2', state.selectedFolder);
     assertDeepEquals(['21'], bookmarks.util.getDisplayedList(state));
   });
 
   test('loading an invalid folder URL selects the Bookmarks Bar', function() {
     setupWithUrl('/?id=42');
     var state = bookmarks.Store.getInstance().data;
     assertEquals('1', state.selectedFolder);
     return Promise.resolve().then(function() {
-      assertEquals('chrome://bookmarks/?id=1', window.location.href);
+      assertEquals('chrome://bookmarks/', window.location.href);
     });
   });
 });