Downloads WebUI: Merge downloads.js into manager.js

This is in preparation of migrating to Polymer3. There is no clear benefit of
keeping these scripts separated anymore, and it does get in the way of making
the optimized Polymer3 version from working correctly.

Bug: 1022215
Change-Id: I40e29c2f22b687e8ba9bad076bc6f6a16ce95731
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1914833Reviewed-by: Rebekah Potter <rbpotter@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715161}

chrome/browser/resources/downloads/BUILD.gn

@@ -66,7 +66,6 @@ js_type_check("closure_compile") {
   deps = [
     ":browser_proxy",
     ":constants",
-    ":downloads",
     ":item",
     ":manager",
     ":search_service",
@@ -88,13 +87,6 @@ js_library("constants") {
   ]
 }
 
-js_library("downloads") {
-  deps = [
-    ":manager",
-    "//ui/webui/resources/js:cr",
-  ]
-}
-
 js_library("icon_loader") {
   deps = [
     "//ui/webui/resources/js:assert",

chrome/browser/resources/downloads/downloads.html

@@ -42,6 +42,5 @@
   <link rel="import" href="chrome://resources/html/polymer.html">
   <link rel="import" href="i18n_setup.html">
   <link rel="import" href="manager.html">
-  <script src="downloads.js"></script>
 </body>
 </html>

chrome/browser/resources/downloads/downloads.js

-// Copyright 2015 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.
-
-window.addEventListener('load', function() {
-  downloads.Manager.onLoad().then(function() {
-    requestIdleCallback(function() {
-      chrome.send(
-          'metricsHandler:recordTime',
-          ['Download.ResultsRenderedTime', window.performance.now()]);
-      document.fonts.load('bold 12px Roboto');
-    });
-  });
-});

chrome/browser/resources/downloads/downloads_resources.grd

@@ -43,9 +43,6 @@
       <structure name="IDR_DOWNLOADS_CONSTANTS_JS"
           file="constants.js"
           type="chrome_html" />
-      <structure name="IDR_DOWNLOADS_DOWNLOADS_JS"
-          file="downloads.js"
-          type="chrome_html" />
       <structure name="IDR_DOWNLOADS_I18N_SETUP_HTML"
           file="i18n_setup.html"
           type="chrome_html" />

chrome/browser/resources/downloads/manager.js

@@ -109,6 +109,17 @@ cr.define('downloads', function() {
 
       this.boundOnKeyDown_ = e => this.onKeyDown_(e);
       document.addEventListener('keydown', this.boundOnKeyDown_);
+
+      this.loaded_.promise.then(() => {
+        requestIdleCallback(function() {
+          chrome.send(
+              'metricsHandler:recordTime',
+              ['Download.ResultsRenderedTime', window.performance.now()]);
+          document.fonts.load('bold 12px Roboto');
+        });
+      });
+
+      this.searchService_.loadMore();
     },
 
     /** @override */
@@ -256,15 +267,6 @@ cr.define('downloads', function() {
       this.hasShadow_ = container.scrollTop > 0;
     },
 
-    /**
-     * @return {!Promise}
-     * @private
-     */
-    onLoad_: function() {
-      this.searchService_.loadMore();
-      return this.loaded_.promise;
-    },
-
     /** @private */
     onSearchChanged_: function() {
       this.inSearchMode_ = this.searchService_.isSearching();
@@ -343,15 +345,5 @@ cr.define('downloads', function() {
     },
   });
 
-  /** @return {!downloads.Manager} */
-  Manager.get = function() {
-    return /** @type {!downloads.Manager} */ (
-        queryRequiredElement('downloads-manager'));
-  };
-  /** @return {!Promise} */
-  Manager.onLoad = function() {
-    return Manager.get().onLoad_();
-  };
-
   return {Manager: Manager};
 });

chrome/test/data/webui/downloads/manager_tests.js

@@ -21,7 +21,6 @@ suite('manager tests', function() {
 
     manager = document.createElement('downloads-manager');
     document.body.appendChild(manager);
-    assertEquals(manager, downloads.Manager.get());
   });
 
   test('long URLs elide', async () => {