MD Bookmarks: Update URL router to work in new data binding system

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

Index: chrome/test/data/webui/md_bookmarks/md_bookmarks_browsertest.js
diff --git a/chrome/test/data/webui/md_bookmarks/md_bookmarks_browsertest.js b/chrome/test/data/webui/md_bookmarks/md_bookmarks_browsertest.js
index 459d5ea8827b5a2475542c591479a446854ac7d1..02f230a4150d3c268a814880e26d83fffde7fd83 100644
--- a/chrome/test/data/webui/md_bookmarks/md_bookmarks_browsertest.js
+++ b/chrome/test/data/webui/md_bookmarks/md_bookmarks_browsertest.js
@@ -97,14 +97,43 @@ TEST_F('MaterialBookmarksReducersTest', 'All', function() {
   mocha.run();
 });
 
+function MaterialBookmarksRouterTest() {}
+
+MaterialBookmarksRouterTest.prototype = {
+  __proto__: MaterialBookmarksBrowserTest.prototype,
+
+  extraLibraries: MaterialBookmarksBrowserTest.prototype.extraLibraries.concat([
+    'router_test.js',
+  ]),
+};
+
+TEST_F('MaterialBookmarksRouterTest', 'All', function() {
+  mocha.grep('<bookmarks-router>').run();
+});
+
+function MaterialBookmarksRouterOnLoadTest() {}
+
+MaterialBookmarksRouterOnLoadTest.prototype = {
+  __proto__: MaterialBookmarksRouterTest.prototype,
+
+  browsePreload: 'chrome://bookmarks/?q=testQuery',
+
+  setUp: function() {
+    chrome.bookmarks.search = function(query) {
+      window.searchedQuery = query;
+    };
+  },
+};
+
+TEST_F('MaterialBookmarksRouterOnLoadTest', 'All', function() {
+  mocha.grep('URL preload').run();
+});
+
 function MaterialBookmarksStoreClientTest() {}
 
 MaterialBookmarksStoreClientTest.prototype = {
   __proto__: MaterialBookmarksBrowserTest.prototype,
 
-  // TODO(tsergeant): Remove special preload once Client is used in the page.
-  browsePreload: 'chrome://bookmarks/store_client.html',
-
   extraLibraries: MaterialBookmarksBrowserTest.prototype.extraLibraries.concat([
     'store_client_test.js',
   ]),