From 35aea69d311b270868b1811f81d10c7ed3bfa9e5 Mon Sep 17 00:00:00 2001
From: Dmitrii Filippov <dmfilippov@google.com>
Date: Tue, 7 Apr 2020 12:14:11 +0200
Subject: [PATCH] Get rid of global Gerrit Api methods

Change-Id: I240680b46956e5d50eaf3857b14e331596c44e01
---
 .../admin/gr-admin-view/gr-admin-view.js      |   3 +-
 .../gr-change-list-item.js                    |   3 +-
 .../gr-change-list/gr-change-list.js          |   3 +-
 .../gr-change-actions/gr-change-actions.js    |   3 +-
 .../gr-change-metadata-it_test.html           |   3 +
 .../gr-change-metadata_test.html              |   6 +-
 .../change/gr-change-view/gr-change-view.js   |   4 +-
 .../gr-change-view/gr-change-view_test.html   |   5 +-
 .../change/gr-file-list/gr-file-list.js       |   3 +-
 .../gr-reply-dialog-it_test.html              |   6 +-
 .../gr-error-manager_test.html                |   4 +
 .../core/gr-main-header/gr-main-header.js     |   3 +-
 .../app/elements/custom-dark-theme_test.html  |   3 +-
 .../app/elements/custom-light-theme_test.html |   3 +-
 polygerrit-ui/app/elements/gr-app.js          |   9 +-
 .../gr-admin-api/gr-admin-api_test.html       |   7 +-
 .../gr-dom-hooks/gr-dom-hooks_test.html       |   3 +
 .../gr-endpoint-decorator.js                  |   3 +-
 .../gr-endpoint-decorator_test.html           |   9 +-
 .../gr-external-style/gr-external-style.js    |   3 +-
 .../gr-external-style_test.html               |   4 +
 .../plugins/gr-plugin-host/gr-plugin-host.js  |   5 +-
 .../gr-popup-interface_test.html              |   2 +
 .../plugins/gr-repo-api/gr-repo-api_test.html |   6 +-
 .../gr-settings-api/gr-settings-api_test.html |   6 +-
 .../gr-styles-api/gr-styles-api_test.html     |   9 +-
 .../gr-theme-api/gr-theme-api_test.html       |   6 +-
 .../elements/shared/gr-avatar/gr-avatar.js    |   3 +-
 .../shared/gr-avatar/gr-avatar_test.html      |  14 +-
 .../gr-event-interface_test.html              |   4 +
 .../gr-annotation-actions-context_test.html   |   2 +
 .../gr-annotation-actions-js-api_test.html    |   4 +
 .../gr-change-actions-js-api_test.html        |   7 +-
 .../gr-change-reply-js-api_test.html          |   4 +
 .../shared/gr-js-api-interface/gr-gerrit.js   | 237 +++++++++---------
 .../gr-js-api-interface/gr-gerrit_test.html   |   3 +
 .../gr-js-api-interface-element.js            |   5 +-
 .../gr-js-api-interface_test.html             |   8 +-
 .../gr-plugin-action-context_test.html        |   3 +
 .../gr-plugin-endpoints.js                    |   4 +-
 .../gr-plugin-endpoints_test.html             |   3 +
 .../gr-plugin-loader_test.html                |  65 ++---
 .../gr-plugin-rest-api_test.html              |   3 +
 .../gr-js-api-interface/gr-public-js-api.js   |   9 +-
 44 files changed, 307 insertions(+), 195 deletions(-)

diff --git a/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view.js b/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view.js
index a0841f805c..b318ee6650 100644
--- a/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view.js
+++ b/polygerrit-ui/app/elements/admin/gr-admin-view/gr-admin-view.js
@@ -43,6 +43,7 @@ import {BaseUrlBehavior} from '../../../behaviors/base-url-behavior/base-url-beh
 import {AdminNavBehavior} from '../../../behaviors/gr-admin-nav-behavior/gr-admin-nav-behavior.js';
 import {URLEncodingBehavior} from '../../../behaviors/gr-url-encoding-behavior/gr-url-encoding-behavior.js';
 import {GerritNav} from '../../core/gr-navigation/gr-navigation.js';
+import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
 
 const INTERNAL_GROUP_REGEX = /^[\da-f]{40}$/;
 
@@ -118,7 +119,7 @@ class GrAdminView extends mixinBehaviors( [
   reload() {
     const promises = [
       this.$.restAPI.getAccount(),
-      Gerrit.awaitPluginsLoaded(),
+      pluginLoader.awaitPluginsLoaded(),
     ];
     return Promise.all(promises).then(result => {
       this._account = result[0];
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.js b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.js
index 2fa287c9c1..da13492389 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.js
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.js
@@ -39,6 +39,7 @@ import {URLEncodingBehavior} from '../../../behaviors/gr-url-encoding-behavior/g
 import {RESTClientBehavior} from '../../../behaviors/rest-client-behavior/rest-client-behavior.js';
 import {GerritNav} from '../../core/gr-navigation/gr-navigation.js';
 import {pluginEndpoints} from '../../shared/gr-js-api-interface/gr-plugin-endpoints.js';
+import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
 
 const CHANGE_SIZE = {
   XS: 10,
@@ -99,7 +100,7 @@ class GrChangeListItem extends mixinBehaviors( [
   /** @override */
   attached() {
     super.attached();
-    Gerrit.awaitPluginsLoaded().then(() => {
+    pluginLoader.awaitPluginsLoaded().then(() => {
       this._dynamicCellEndpoints = pluginEndpoints.getDynamicEndpoints(
           'change-list-item-cell');
     });
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list.js b/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list.js
index 48ac61e916..0a19ae179b 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list.js
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list/gr-change-list.js
@@ -37,6 +37,7 @@ import {KeyboardShortcutBehavior} from '../../../behaviors/keyboard-shortcut-beh
 import {RESTClientBehavior} from '../../../behaviors/rest-client-behavior/rest-client-behavior.js';
 import {GerritNav} from '../../core/gr-navigation/gr-navigation.js';
 import {pluginEndpoints} from '../../shared/gr-js-api-interface/gr-plugin-endpoints.js';
+import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
 
 const NUMBER_FIXED_COLUMNS = 3;
 const CLOSED_STATUS = ['MERGED', 'ABANDONED'];
@@ -177,7 +178,7 @@ class GrChangeList extends mixinBehaviors( [
   /** @override */
   attached() {
     super.attached();
-    Gerrit.awaitPluginsLoaded().then(() => {
+    pluginLoader.awaitPluginsLoaded().then(() => {
       this._dynamicHeaderEndpoints = pluginEndpoints.getDynamicEndpoints(
           'change-list-header');
     });
diff --git a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js
index 2cd5de533a..d65757a84d 100644
--- a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js
+++ b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.js
@@ -43,6 +43,7 @@ import {htmlTemplate} from './gr-change-actions_html.js';
 import {PatchSetBehavior} from '../../../behaviors/gr-patch-set-behavior/gr-patch-set-behavior.js';
 import {RESTClientBehavior} from '../../../behaviors/rest-client-behavior/rest-client-behavior.js';
 import {GerritNav} from '../../core/gr-navigation/gr-navigation.js';
+import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
 
 const ERR_BRANCH_EMPTY = 'The destination branch can’t be empty.';
 const ERR_COMMIT_EMPTY = 'The commit message can’t be empty.';
@@ -533,7 +534,7 @@ class GrChangeActions extends mixinBehaviors( [
   }
 
   _handleLoadingComplete() {
-    Gerrit.awaitPluginsLoaded().then(() => this._loading = false);
+    pluginLoader.awaitPluginsLoaded().then(() => this._loading = false);
   }
 
   _sendShowRevisionActions(detail) {
diff --git a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata-it_test.html b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata-it_test.html
index 8c9eedd299..4fa474253a 100644
--- a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata-it_test.html
+++ b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata-it_test.html
@@ -43,6 +43,9 @@ import './gr-change-metadata.js';
 import {dom} from '@polymer/polymer/lib/legacy/polymer.dom.js';
 import {resetPlugins} from '../../../test/test-utils.js';
 import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
+import {initGerritPluginApi} from '../../shared/gr-js-api-interface/gr-gerrit.js';
+
+initGerritPluginApi();
 
 suite('gr-change-metadata integration tests', () => {
   let sandbox;
diff --git a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata_test.html b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata_test.html
index 3288fb065c..36b0caa69a 100644
--- a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata_test.html
+++ b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata_test.html
@@ -35,6 +35,10 @@ import '../../../test/common-test-setup.js';
 import '../../core/gr-router/gr-router.js';
 import './gr-change-metadata.js';
 import {GerritNav} from '../../core/gr-navigation/gr-navigation.js';
+import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
+import {initGerritPluginApi} from '../../shared/gr-js-api-interface/gr-gerrit.js';
+
+initGerritPluginApi();
 
 suite('gr-change-metadata tests', () => {
   let element;
@@ -758,7 +762,7 @@ suite('gr-change-metadata tests', () => {
           },
           '0.1',
           'http://some/plugins/url.html');
-      Gerrit._loadPlugins([]);
+      pluginLoader.loadPlugins([]);
       flush(() => {
         assert.strictEqual(hookEl.plugin, plugin);
         assert.strictEqual(hookEl.change, element.change);
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
index c9869ce7f1..edd6ed80db 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js
@@ -483,7 +483,7 @@ class GrChangeView extends mixinBehaviors( [
       this._setDiffViewMode();
     });
 
-    Gerrit.awaitPluginsLoaded()
+    pluginLoader.awaitPluginsLoaded()
         .then(() => {
           this._dynamicTabHeaderEndpoints =
             pluginEndpoints.getDynamicEndpoints('change-view-tab-header');
@@ -1164,7 +1164,7 @@ class GrChangeView extends mixinBehaviors( [
   }
 
   _maybeShowRevertDialog() {
-    Gerrit.awaitPluginsLoaded()
+    pluginLoader.awaitPluginsLoaded()
         .then(this._getLoggedIn.bind(this))
         .then(loggedIn => {
           if (!loggedIn || !this._change ||
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
index 2586b4e184..1f0af30a7c 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.html
@@ -50,6 +50,9 @@ import {_testOnly_resetEndpoints} from '../../shared/gr-js-api-interface/gr-plug
 import {util} from '../../../scripts/util.js';
 import {GerritNav} from '../../core/gr-navigation/gr-navigation.js';
 import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
+import {initGerritPluginApi} from '../../shared/gr-js-api-interface/gr-gerrit.js';
+
+initGerritPluginApi();
 
 suite('gr-change-view tests', () => {
   const kb = KeyboardShortcutBinder;
@@ -311,7 +314,7 @@ suite('gr-change-view tests', () => {
     });
     element = fixture('basic');
     sandbox.stub(element.$.actions, 'reload').returns(Promise.resolve());
-    Gerrit._loadPlugins([]);
+    pluginLoader.loadPlugins([]);
     Gerrit.install(
         plugin => {
           plugin.registerDynamicCustomComponent(
diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.js b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.js
index 90f9ed7ec9..eb85cd7e43 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.js
+++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.js
@@ -45,6 +45,7 @@ import {GrFileListConstants} from '../gr-file-list-constants.js';
 import {GrCountStringFormatter} from '../../shared/gr-count-string-formatter/gr-count-string-formatter.js';
 import {GerritNav} from '../../core/gr-navigation/gr-navigation.js';
 import {pluginEndpoints} from '../../shared/gr-js-api-interface/gr-plugin-endpoints.js';
+import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
 
 // Maximum length for patch set descriptions.
 const PATCH_DESC_MAX_LENGTH = 500;
@@ -299,7 +300,7 @@ class GrFileList extends mixinBehaviors( [
   /** @override */
   attached() {
     super.attached();
-    Gerrit.awaitPluginsLoaded().then(() => {
+    pluginLoader.awaitPluginsLoaded().then(() => {
       this._dynamicHeaderEndpoints = pluginEndpoints.getDynamicEndpoints(
           'change-view-file-list-header');
       this._dynamicContentEndpoints = pluginEndpoints.getDynamicEndpoints(
diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog-it_test.html b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog-it_test.html
index 4f921bd689..f7e41159ac 100644
--- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog-it_test.html
+++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog-it_test.html
@@ -42,6 +42,10 @@ import '../../plugins/gr-plugin-host/gr-plugin-host.js';
 import './gr-reply-dialog.js';
 import {dom} from '@polymer/polymer/lib/legacy/polymer.dom.js';
 import {resetPlugins} from '../../../test/test-utils.js';
+import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
+import {initGerritPluginApi} from '../../shared/gr-js-api-interface/gr-gerrit.js';
+
+initGerritPluginApi();
 
 suite('gr-reply-dialog tests', () => {
   let element;
@@ -149,7 +153,7 @@ suite('gr-reply-dialog tests', () => {
     const importSpy =
         sandbox.spy(element.shadowRoot
             .querySelector('gr-endpoint-decorator'), '_import');
-    Gerrit.awaitPluginsLoaded().then(() => {
+    pluginLoader.awaitPluginsLoaded().then(() => {
       Promise.all(importSpy.returnValues).then(() => {
         flush(() => {
           const textarea = element.$.textarea.getNativeTextarea();
diff --git a/polygerrit-ui/app/elements/core/gr-error-manager/gr-error-manager_test.html b/polygerrit-ui/app/elements/core/gr-error-manager/gr-error-manager_test.html
index 44c3cdedf7..8788ef098f 100644
--- a/polygerrit-ui/app/elements/core/gr-error-manager/gr-error-manager_test.html
+++ b/polygerrit-ui/app/elements/core/gr-error-manager/gr-error-manager_test.html
@@ -39,6 +39,10 @@ void (0);
 import '../../../test/common-test-setup.js';
 import './gr-error-manager.js';
 import {dom} from '@polymer/polymer/lib/legacy/polymer.dom.js';
+import {initGerritPluginApi} from '../../shared/gr-js-api-interface/gr-gerrit.js';
+
+initGerritPluginApi();
+
 suite('gr-error-manager tests', () => {
   let element;
   let sandbox;
diff --git a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js
index d8188b52e0..3294f5f6e9 100644
--- a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js
+++ b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js
@@ -31,6 +31,7 @@ import {htmlTemplate} from './gr-main-header_html.js';
 import {BaseUrlBehavior} from '../../../behaviors/base-url-behavior/base-url-behavior.js';
 import {DocsUrlBehavior} from '../../../behaviors/docs-url-behavior/docs-url-behavior.js';
 import {AdminNavBehavior} from '../../../behaviors/gr-admin-nav-behavior/gr-admin-nav-behavior.js';
+import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
 
 const DEFAULT_LINKS = [{
   title: 'Changes',
@@ -266,7 +267,7 @@ class GrMainHeader extends mixinBehaviors( [
     const promises = [
       this.$.restAPI.getAccount(),
       this.$.restAPI.getTopMenus(),
-      Gerrit.awaitPluginsLoaded(),
+      pluginLoader.awaitPluginsLoaded(),
     ];
 
     return Promise.all(promises).then(result => {
diff --git a/polygerrit-ui/app/elements/custom-dark-theme_test.html b/polygerrit-ui/app/elements/custom-dark-theme_test.html
index 3d707ea8fe..c04e4d06ec 100644
--- a/polygerrit-ui/app/elements/custom-dark-theme_test.html
+++ b/polygerrit-ui/app/elements/custom-dark-theme_test.html
@@ -34,6 +34,7 @@ limitations under the License.
 import '../test/common-test-setup.js';
 import './gr-app.js';
 import {util} from '../scripts/util.js';
+import {pluginLoader} from './shared/gr-js-api-interface/gr-plugin-loader.js';
 
 suite('gr-app custom dark theme tests', () => {
   let sandbox;
@@ -74,7 +75,7 @@ suite('gr-app custom dark theme tests', () => {
     const importForThemeSpy = sandbox.spy(
         element.$['app-element'].$.externalStyleForTheme,
         '_import');
-    Gerrit.awaitPluginsLoaded().then(() => {
+    pluginLoader.awaitPluginsLoaded().then(() => {
       Promise.all(importSpy.returnValues.concat(importForThemeSpy.returnValues))
           .then(() => {
             flush(done);
diff --git a/polygerrit-ui/app/elements/custom-light-theme_test.html b/polygerrit-ui/app/elements/custom-light-theme_test.html
index 5ca89f220c..fbd382594b 100644
--- a/polygerrit-ui/app/elements/custom-light-theme_test.html
+++ b/polygerrit-ui/app/elements/custom-light-theme_test.html
@@ -34,6 +34,7 @@ limitations under the License.
 import '../test/common-test-setup.js';
 import './gr-app.js';
 import {util} from '../scripts/util.js';
+import {pluginLoader} from './shared/gr-js-api-interface/gr-plugin-loader.js';
 
 suite('gr-app custom light theme tests', () => {
   let sandbox;
@@ -74,7 +75,7 @@ suite('gr-app custom light theme tests', () => {
     const importForThemeSpy = sandbox.spy(
         element.$['app-element'].$.externalStyleForTheme,
         '_import');
-    Gerrit.awaitPluginsLoaded().then(() => {
+    pluginLoader.awaitPluginsLoaded().then(() => {
       Promise.all(importSpy.returnValues.concat(importForThemeSpy.returnValues))
           .then(() => {
             flush(done);
diff --git a/polygerrit-ui/app/elements/gr-app.js b/polygerrit-ui/app/elements/gr-app.js
index ce6d613ac6..c9910d39e0 100644
--- a/polygerrit-ui/app/elements/gr-app.js
+++ b/polygerrit-ui/app/elements/gr-app.js
@@ -35,11 +35,6 @@ setCancelSyntheticClickEvents(false);
 
 import 'polymer-resin/standalone/polymer-resin.js';
 import {initGlobalVariables} from './gr-app-global-var-init.js';
-// Initialize global variables before any other imports
-// If a plugin is loaded in one of the subsequent import (with async/await, for
-// example), then all global variables must be initialized at this time
-initGlobalVariables();
-
 import './gr-app-element.js';
 import './change-list/gr-embed-dashboard/gr-embed-dashboard.js';
 import {GestureEventListeners} from '@polymer/polymer/lib/mixins/gesture-event-listeners.js';
@@ -47,6 +42,7 @@ import {LegacyElementMixin} from '@polymer/polymer/lib/legacy/legacy-element-mix
 import {PolymerElement} from '@polymer/polymer/polymer-element.js';
 import {htmlTemplate} from './gr-app_html.js';
 import {SafeTypes} from '../behaviors/safe-types-behavior/safe-types-behavior.js';
+import {initGerritPluginApi} from './shared/gr-js-api-interface/gr-gerrit.js';
 
 security.polymer_resin.install({
   allowedIdentifierPrefixes: [''],
@@ -64,3 +60,6 @@ class GrApp extends GestureEventListeners(
 }
 
 customElements.define(GrApp.is, GrApp);
+
+initGlobalVariables();
+initGerritPluginApi();
diff --git a/polygerrit-ui/app/elements/plugins/gr-admin-api/gr-admin-api_test.html b/polygerrit-ui/app/elements/plugins/gr-admin-api/gr-admin-api_test.html
index 41e88a1e0b..89f9cdb442 100644
--- a/polygerrit-ui/app/elements/plugins/gr-admin-api/gr-admin-api_test.html
+++ b/polygerrit-ui/app/elements/plugins/gr-admin-api/gr-admin-api_test.html
@@ -27,6 +27,11 @@ limitations under the License.
 <script type="module">
 import '../../../test/common-test-setup.js';
 import '../../shared/gr-js-api-interface/gr-js-api-interface.js';
+import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
+import {initGerritPluginApi} from '../../shared/gr-js-api-interface/gr-gerrit.js';
+
+initGerritPluginApi();
+
 suite('gr-admin-api tests', () => {
   let sandbox;
   let adminApi;
@@ -36,7 +41,7 @@ suite('gr-admin-api tests', () => {
     let plugin;
     Gerrit.install(p => { plugin = p; }, '0.1',
         'http://test.com/plugins/testplugin/static/test.js');
-    Gerrit._loadPlugins([]);
+    pluginLoader.loadPlugins([]);
     adminApi = plugin.admin();
   });
 
diff --git a/polygerrit-ui/app/elements/plugins/gr-dom-hooks/gr-dom-hooks_test.html b/polygerrit-ui/app/elements/plugins/gr-dom-hooks/gr-dom-hooks_test.html
index 43affdf744..2f05636553 100644
--- a/polygerrit-ui/app/elements/plugins/gr-dom-hooks/gr-dom-hooks_test.html
+++ b/polygerrit-ui/app/elements/plugins/gr-dom-hooks/gr-dom-hooks_test.html
@@ -34,6 +34,9 @@ limitations under the License.
 import '../../../test/common-test-setup.js';
 import '../../shared/gr-js-api-interface/gr-js-api-interface.js';
 import {GrDomHook, GrDomHooksManager} from './gr-dom-hooks.js';
+import {initGerritPluginApi} from '../../shared/gr-js-api-interface/gr-gerrit.js';
+
+initGerritPluginApi();
 
 suite('gr-dom-hooks tests', () => {
   const PUBLIC_METHODS =[
diff --git a/polygerrit-ui/app/elements/plugins/gr-endpoint-decorator/gr-endpoint-decorator.js b/polygerrit-ui/app/elements/plugins/gr-endpoint-decorator/gr-endpoint-decorator.js
index fdbd52058a..62057a1546 100644
--- a/polygerrit-ui/app/elements/plugins/gr-endpoint-decorator/gr-endpoint-decorator.js
+++ b/polygerrit-ui/app/elements/plugins/gr-endpoint-decorator/gr-endpoint-decorator.js
@@ -24,6 +24,7 @@ import {LegacyElementMixin} from '@polymer/polymer/lib/legacy/legacy-element-mix
 import {PolymerElement} from '@polymer/polymer/polymer-element.js';
 import {htmlTemplate} from './gr-endpoint-decorator_html.js';
 import {pluginEndpoints} from '../../shared/gr-js-api-interface/gr-plugin-endpoints.js';
+import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
 
 const INIT_PROPERTIES_TIMEOUT_MS = 10000;
 
@@ -163,7 +164,7 @@ class GrEndpointDecorator extends GestureEventListeners(
     super.ready();
     this._endpointCallBack = this._initModule.bind(this);
     pluginEndpoints.onNewEndpoint(this.name, this._endpointCallBack);
-    Gerrit.awaitPluginsLoaded()
+    pluginLoader.awaitPluginsLoaded()
         .then(() => Promise.all(
             pluginEndpoints.getPlugins(this.name).map(
                 pluginUrl => this._import(pluginUrl)))
diff --git a/polygerrit-ui/app/elements/plugins/gr-endpoint-decorator/gr-endpoint-decorator_test.html b/polygerrit-ui/app/elements/plugins/gr-endpoint-decorator/gr-endpoint-decorator_test.html
index 7236857568..bc23fabb95 100644
--- a/polygerrit-ui/app/elements/plugins/gr-endpoint-decorator/gr-endpoint-decorator_test.html
+++ b/polygerrit-ui/app/elements/plugins/gr-endpoint-decorator/gr-endpoint-decorator_test.html
@@ -46,6 +46,10 @@ import './gr-endpoint-decorator.js';
 import '../gr-endpoint-param/gr-endpoint-param.js';
 import {dom} from '@polymer/polymer/lib/legacy/polymer.dom.js';
 import {resetPlugins} from '../../../test/test-utils.js';
+import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
+import {initGerritPluginApi} from '../../shared/gr-js-api-interface/gr-gerrit.js';
+
+initGerritPluginApi();
 
 suite('gr-endpoint-decorator', () => {
   let container;
@@ -61,14 +65,15 @@ suite('gr-endpoint-decorator', () => {
     });
     resetPlugins();
     container = fixture('basic');
-    Gerrit.install(p => plugin = p, '0.1', 'http://some/plugin/url.html');
+    Gerrit.install(p => plugin = p, '0.1',
+        'http://some/plugin/url.html');
     // Decoration
     decorationHook = plugin.registerCustomComponent('first', 'some-module');
     // Replacement
     replacementHook = plugin.registerCustomComponent(
         'second', 'other-module', {replace: true});
     // Mimic all plugins loaded.
-    Gerrit._loadPlugins([]);
+    pluginLoader.loadPlugins([]);
     flush(done);
   });
 
diff --git a/polygerrit-ui/app/elements/plugins/gr-external-style/gr-external-style.js b/polygerrit-ui/app/elements/plugins/gr-external-style/gr-external-style.js
index ffa0c3cb6b..68b14944e4 100644
--- a/polygerrit-ui/app/elements/plugins/gr-external-style/gr-external-style.js
+++ b/polygerrit-ui/app/elements/plugins/gr-external-style/gr-external-style.js
@@ -24,6 +24,7 @@ import {LegacyElementMixin} from '@polymer/polymer/lib/legacy/legacy-element-mix
 import {PolymerElement} from '@polymer/polymer/polymer-element.js';
 import {htmlTemplate} from './gr-external-style_html.js';
 import {pluginEndpoints} from '../../shared/gr-js-api-interface/gr-plugin-endpoints.js';
+import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
 
 /** @extends Polymer.Element */
 class GrExternalStyle extends GestureEventListeners(
@@ -99,7 +100,7 @@ class GrExternalStyle extends GestureEventListeners(
   /** @override */
   ready() {
     super.ready();
-    Gerrit.awaitPluginsLoaded().then(() => this._importAndApply());
+    pluginLoader.awaitPluginsLoaded().then(() => this._importAndApply());
   }
 }
 
diff --git a/polygerrit-ui/app/elements/plugins/gr-external-style/gr-external-style_test.html b/polygerrit-ui/app/elements/plugins/gr-external-style/gr-external-style_test.html
index 74e5427295..2d72b488e4 100644
--- a/polygerrit-ui/app/elements/plugins/gr-external-style/gr-external-style_test.html
+++ b/polygerrit-ui/app/elements/plugins/gr-external-style/gr-external-style_test.html
@@ -33,6 +33,10 @@ limitations under the License.
 import '../../../test/common-test-setup.js';
 import './gr-external-style.js';
 import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
+import {initGerritPluginApi} from '../../shared/gr-js-api-interface/gr-gerrit.js';
+
+initGerritPluginApi();
+
 suite('gr-external-style integration tests', () => {
   const TEST_URL = 'http://some/plugin/url.html';
 
diff --git a/polygerrit-ui/app/elements/plugins/gr-plugin-host/gr-plugin-host.js b/polygerrit-ui/app/elements/plugins/gr-plugin-host/gr-plugin-host.js
index 935b774aa2..d1b2106f63 100644
--- a/polygerrit-ui/app/elements/plugins/gr-plugin-host/gr-plugin-host.js
+++ b/polygerrit-ui/app/elements/plugins/gr-plugin-host/gr-plugin-host.js
@@ -20,6 +20,7 @@ import '../../shared/gr-js-api-interface/gr-js-api-interface.js';
 import {GestureEventListeners} from '@polymer/polymer/lib/mixins/gesture-event-listeners.js';
 import {LegacyElementMixin} from '@polymer/polymer/lib/legacy/legacy-element-mixin.js';
 import {PolymerElement} from '@polymer/polymer/polymer-element.js';
+import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
 
 /** @extends Polymer.Element */
 class GrPluginHost extends GestureEventListeners(
@@ -42,7 +43,7 @@ class GrPluginHost extends GestureEventListeners(
     const jsPlugins =
         this._handleMigrations(plugins.js_resource_paths || [], htmlPlugins);
     const shouldLoadTheme = config.default_theme &&
-          !Gerrit._isPluginPreloaded('preloaded:gerrit-theme');
+          !pluginLoader.isPluginPreloaded('preloaded:gerrit-theme');
     const themeToLoad =
           shouldLoadTheme ? [config.default_theme] : [];
 
@@ -57,7 +58,7 @@ class GrPluginHost extends GestureEventListeners(
       pluginOpts[config.default_theme] = {sync: true};
     }
 
-    Gerrit._loadPlugins(pluginsPending, pluginOpts);
+    pluginLoader.loadPlugins(pluginsPending, pluginOpts);
   }
 
   /**
diff --git a/polygerrit-ui/app/elements/plugins/gr-popup-interface/gr-popup-interface_test.html b/polygerrit-ui/app/elements/plugins/gr-popup-interface/gr-popup-interface_test.html
index f0896f8acd..612c61fd4f 100644
--- a/polygerrit-ui/app/elements/plugins/gr-popup-interface/gr-popup-interface_test.html
+++ b/polygerrit-ui/app/elements/plugins/gr-popup-interface/gr-popup-interface_test.html
@@ -47,7 +47,9 @@ import '../../../test/common-test-setup.js';
 import '../../shared/gr-js-api-interface/gr-js-api-interface.js';
 import {dom} from '@polymer/polymer/lib/legacy/polymer.dom.js';
 import {GrPopupInterface} from './gr-popup-interface.js';
+import {initGerritPluginApi} from '../../shared/gr-js-api-interface/gr-gerrit.js';
 
+initGerritPluginApi();
 suite('gr-popup-interface tests', () => {
   let container;
   let instance;
diff --git a/polygerrit-ui/app/elements/plugins/gr-repo-api/gr-repo-api_test.html b/polygerrit-ui/app/elements/plugins/gr-repo-api/gr-repo-api_test.html
index d16d50495e..ce1abc4b6b 100644
--- a/polygerrit-ui/app/elements/plugins/gr-repo-api/gr-repo-api_test.html
+++ b/polygerrit-ui/app/elements/plugins/gr-repo-api/gr-repo-api_test.html
@@ -34,6 +34,10 @@ limitations under the License.
 <script type="module">
 import '../../../test/common-test-setup.js';
 import '../gr-endpoint-decorator/gr-endpoint-decorator.js';
+import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
+import {initGerritPluginApi} from '../../shared/gr-js-api-interface/gr-gerrit.js';
+
+initGerritPluginApi();
 
 suite('gr-repo-api tests', () => {
   let sandbox;
@@ -44,7 +48,7 @@ suite('gr-repo-api tests', () => {
     let plugin;
     Gerrit.install(p => { plugin = p; }, '0.1',
         'http://test.com/plugins/testplugin/static/test.js');
-    Gerrit._loadPlugins([]);
+    pluginLoader.loadPlugins([]);
     repoApi = plugin.project();
   });
 
diff --git a/polygerrit-ui/app/elements/plugins/gr-settings-api/gr-settings-api_test.html b/polygerrit-ui/app/elements/plugins/gr-settings-api/gr-settings-api_test.html
index 8c588c4d38..d436d17f78 100644
--- a/polygerrit-ui/app/elements/plugins/gr-settings-api/gr-settings-api_test.html
+++ b/polygerrit-ui/app/elements/plugins/gr-settings-api/gr-settings-api_test.html
@@ -36,6 +36,10 @@ limitations under the License.
 <script type="module">
 import '../../../test/common-test-setup.js';
 import '../gr-endpoint-decorator/gr-endpoint-decorator.js';
+import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
+import {initGerritPluginApi} from '../../shared/gr-js-api-interface/gr-gerrit.js';
+
+initGerritPluginApi();
 
 suite('gr-settings-api tests', () => {
   let sandbox;
@@ -46,7 +50,7 @@ suite('gr-settings-api tests', () => {
     let plugin;
     Gerrit.install(p => { plugin = p; }, '0.1',
         'http://test.com/plugins/testplugin/static/test.js');
-    Gerrit._loadPlugins([]);
+    pluginLoader.loadPlugins([]);
     settingsApi = plugin.settings();
   });
 
diff --git a/polygerrit-ui/app/elements/plugins/gr-styles-api/gr-styles-api_test.html b/polygerrit-ui/app/elements/plugins/gr-styles-api/gr-styles-api_test.html
index 0044fa7260..ede99e83de 100644
--- a/polygerrit-ui/app/elements/plugins/gr-styles-api/gr-styles-api_test.html
+++ b/polygerrit-ui/app/elements/plugins/gr-styles-api/gr-styles-api_test.html
@@ -40,6 +40,11 @@ Polymer({is: 'gr-style-test-element'});
 import '../../../test/common-test-setup.js';
 import '../../shared/gr-js-api-interface/gr-js-api-interface.js';
 import {dom} from '@polymer/polymer/lib/legacy/polymer.dom.js';
+import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
+import {initGerritPluginApi} from '../../shared/gr-js-api-interface/gr-gerrit.js';
+
+initGerritPluginApi();
+
 suite('gr-styles-api tests', () => {
   let sandbox;
   let stylesApi;
@@ -49,7 +54,7 @@ suite('gr-styles-api tests', () => {
     let plugin;
     Gerrit.install(p => { plugin = p; }, '0.1',
         'http://test.com/plugins/testplugin/static/test.js');
-    Gerrit._loadPlugins([]);
+    pluginLoader.loadPlugins([]);
     stylesApi = plugin.styles();
   });
 
@@ -78,7 +83,7 @@ suite('gr-styles-api tests', () => {
       let plugin;
       Gerrit.install(p => { plugin = p; }, '0.1',
           'http://test.com/plugins/testplugin/static/test.js');
-      Gerrit._loadPlugins([]);
+      pluginLoader.loadPlugins([]);
       stylesApi = plugin.styles();
       displayInlineStyle = stylesApi.css('display: inline');
       displayNoneStyle = stylesApi.css('display: none');
diff --git a/polygerrit-ui/app/elements/plugins/gr-theme-api/gr-theme-api_test.html b/polygerrit-ui/app/elements/plugins/gr-theme-api/gr-theme-api_test.html
index 7c524ddfc3..fdc6bec37e 100644
--- a/polygerrit-ui/app/elements/plugins/gr-theme-api/gr-theme-api_test.html
+++ b/polygerrit-ui/app/elements/plugins/gr-theme-api/gr-theme-api_test.html
@@ -35,6 +35,10 @@ limitations under the License.
 <script type="module">
 import '../../../test/common-test-setup.js';
 import '../gr-endpoint-decorator/gr-endpoint-decorator.js';
+import {pluginLoader} from '../../shared/gr-js-api-interface/gr-plugin-loader.js';
+import {initGerritPluginApi} from '../../shared/gr-js-api-interface/gr-gerrit.js';
+
+initGerritPluginApi();
 
 suite('gr-theme-api tests', () => {
   let sandbox;
@@ -66,7 +70,7 @@ suite('gr-theme-api tests', () => {
         /** @override */
         ready() { customHeader = this; },
       });
-      Gerrit._loadPlugins([]);
+      pluginLoader.loadPlugins([]);
     });
 
     test('sets logo and title', done => {
diff --git a/polygerrit-ui/app/elements/shared/gr-avatar/gr-avatar.js b/polygerrit-ui/app/elements/shared/gr-avatar/gr-avatar.js
index f009efd11e..75181b1d9e 100644
--- a/polygerrit-ui/app/elements/shared/gr-avatar/gr-avatar.js
+++ b/polygerrit-ui/app/elements/shared/gr-avatar/gr-avatar.js
@@ -25,6 +25,7 @@ import {LegacyElementMixin} from '@polymer/polymer/lib/legacy/legacy-element-mix
 import {PolymerElement} from '@polymer/polymer/polymer-element.js';
 import {htmlTemplate} from './gr-avatar_html.js';
 import {BaseUrlBehavior} from '../../../behaviors/base-url-behavior/base-url-behavior.js';
+import {pluginLoader} from '../gr-js-api-interface/gr-plugin-loader.js';
 
 /**
  * @extends Polymer.Element
@@ -60,7 +61,7 @@ class GrAvatar extends mixinBehaviors( [
     super.attached();
     Promise.all([
       this._getConfig(),
-      Gerrit.awaitPluginsLoaded(),
+      pluginLoader.awaitPluginsLoaded(),
     ]).then(([cfg]) => {
       this._hasAvatars = !!(cfg && cfg.plugin && cfg.plugin.has_avatars);
 
diff --git a/polygerrit-ui/app/elements/shared/gr-avatar/gr-avatar_test.html b/polygerrit-ui/app/elements/shared/gr-avatar/gr-avatar_test.html
index f64f163f0f..294d86d59b 100644
--- a/polygerrit-ui/app/elements/shared/gr-avatar/gr-avatar_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-avatar/gr-avatar_test.html
@@ -33,6 +33,8 @@ limitations under the License.
 <script type="module">
 import '../../../test/common-test-setup.js';
 import './gr-avatar.js';
+import {pluginLoader} from '../gr-js-api-interface/gr-plugin-loader.js';
+
 suite('gr-avatar tests', () => {
   let element;
   let sandbox;
@@ -116,11 +118,11 @@ suite('gr-avatar tests', () => {
     assert.strictEqual(element.style.backgroundImage, '');
 
     // Emulate plugins loaded.
-    Gerrit._loadPlugins([]);
+    pluginLoader.loadPlugins([]);
 
     Promise.all([
       element.$.restAPI.getConfig(),
-      Gerrit.awaitPluginsLoaded(),
+      pluginLoader.awaitPluginsLoaded(),
     ]).then(() => {
       assert.isFalse(element.hasAttribute('hidden'));
 
@@ -151,11 +153,11 @@ suite('gr-avatar tests', () => {
       assert.isFalse(element.hasAttribute('hidden'));
 
       // Emulate plugins loaded.
-      Gerrit._loadPlugins([]);
+      pluginLoader.loadPlugins([]);
 
       return Promise.all([
         element.$.restAPI.getConfig(),
-        Gerrit.awaitPluginsLoaded(),
+        pluginLoader.awaitPluginsLoaded(),
       ]).then(() => {
         assert.isTrue(element.hasAttribute('hidden'));
 
@@ -191,11 +193,11 @@ suite('gr-avatar tests', () => {
           _account_id: 123,
         };
         // Emulate plugins loaded.
-        Gerrit._loadPlugins([]);
+        pluginLoader.loadPlugins([]);
 
         return Promise.all([
           element.$.restAPI.getConfig(),
-          Gerrit.awaitPluginsLoaded(),
+          pluginLoader.awaitPluginsLoaded(),
         ]).then(() => {
           assert.isTrue(element.hasAttribute('hidden'));
         });
diff --git a/polygerrit-ui/app/elements/shared/gr-event-interface/gr-event-interface_test.html b/polygerrit-ui/app/elements/shared/gr-event-interface/gr-event-interface_test.html
index a933e50a25..9dc162f077 100644
--- a/polygerrit-ui/app/elements/shared/gr-event-interface/gr-event-interface_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-event-interface/gr-event-interface_test.html
@@ -32,6 +32,10 @@ limitations under the License.
 import '../../../test/common-test-setup.js';
 import '../gr-js-api-interface/gr-js-api-interface.js';
 import {EventEmitter} from './gr-event-interface.js';
+import {initGerritPluginApi} from '../gr-js-api-interface/gr-gerrit.js';
+
+initGerritPluginApi();
+
 suite('gr-event-interface tests', () => {
   let sandbox;
 
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-annotation-actions-context_test.html b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-annotation-actions-context_test.html
index 86c34c20c0..71c9de88b5 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-annotation-actions-context_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-annotation-actions-context_test.html
@@ -35,6 +35,8 @@ import '../../../test/common-test-setup.js';
 import './gr-js-api-interface.js';
 import {GrAnnotation} from '../../diff/gr-diff-highlight/gr-annotation.js';
 import {GrAnnotationActionsContext} from './gr-annotation-actions-context.js';
+import {initGerritPluginApi} from './gr-gerrit.js';
+initGerritPluginApi();
 
 suite('gr-annotation-actions-context tests', () => {
   let instance;
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-annotation-actions-js-api_test.html b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-annotation-actions-js-api_test.html
index 13aa6f467d..4741e9f331 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-annotation-actions-js-api_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-annotation-actions-js-api_test.html
@@ -37,6 +37,10 @@ limitations under the License.
 <script type="module">
 import '../../../test/common-test-setup.js';
 import '../../change/gr-change-actions/gr-change-actions.js';
+import {initGerritPluginApi} from './gr-gerrit.js';
+
+initGerritPluginApi();
+
 suite('gr-annotation-actions-js-api tests', () => {
   let annotationActions;
   let sandbox;
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-change-actions-js-api_test.html b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-change-actions-js-api_test.html
index 29e9917c99..6b9a407737 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-change-actions-js-api_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-change-actions-js-api_test.html
@@ -39,6 +39,9 @@ import '../../../test/common-test-setup.js';
 import '../../change/gr-change-actions/gr-change-actions.js';
 import {dom} from '@polymer/polymer/lib/legacy/polymer.dom.js';
 import {resetPlugins} from '../../../test/test-utils.js';
+import {pluginLoader} from './gr-plugin-loader.js';
+import {initGerritPluginApi} from './gr-gerrit.js';
+initGerritPluginApi();
 
 suite('gr-js-api-interface tests', () => {
   let element;
@@ -59,7 +62,7 @@ suite('gr-js-api-interface tests', () => {
       Gerrit.install(p => { plugin = p; }, '0.1',
           'http://test.com/plugins/testplugin/static/test.js');
       // Mimic all plugins loaded.
-      Gerrit._loadPlugins([]);
+      pluginLoader.loadPlugins([]);
       changeActions = plugin.changeActions();
       element = fixture('basic');
     });
@@ -87,7 +90,7 @@ suite('gr-js-api-interface tests', () => {
           'http://test.com/plugins/testplugin/static/test.js');
       changeActions = plugin.changeActions();
       // Mimic all plugins loaded.
-      Gerrit._loadPlugins([]);
+      pluginLoader.loadPlugins([]);
     });
 
     teardown(() => {
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-change-reply-js-api_test.html b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-change-reply-js-api_test.html
index edc31b8a27..f9ea312fb4 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-change-reply-js-api_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-change-reply-js-api_test.html
@@ -37,6 +37,10 @@ breaking changes to gr-reply-dialog won’t be noticed.
 <script type="module">
 import '../../../test/common-test-setup.js';
 import '../../change/gr-reply-dialog/gr-reply-dialog.js';
+import {initGerritPluginApi} from './gr-gerrit.js';
+
+initGerritPluginApi();
+
 suite('gr-change-reply-js-api tests', () => {
   let element;
   let sandbox;
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-gerrit.js b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-gerrit.js
index 37a18c7b3c..2209eb3bdf 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-gerrit.js
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-gerrit.js
@@ -33,57 +33,19 @@ function flushPreinstalls() {
     window.Gerrit.flushPreinstalls();
   }
 }
-flushPreinstalls();
 export const _testOnly_flushPreinstalls = flushPreinstalls;
 
-window.Gerrit = window.Gerrit || {};
-const Gerrit = window.Gerrit;
+export function initGerritPluginApi() {
+  window.Gerrit = window.Gerrit || {};
+  flushPreinstalls();
+  initGerritPluginsMethods(window.Gerrit);
+  // Preloaded plugins should be installed after Gerrit.install() is set,
+  // since plugin preloader substitutes Gerrit.install() temporarily.
+  // (Gerrit.install() is set in initGerritPluginsMethods)
+  pluginLoader.installPreloadedPlugins();
+}
 
-/**
- * @deprecated Use plugin.styles().css(rulesStr) instead. Please, consult
- * the documentation how to replace it accordingly.
- */
-Gerrit.css = function(rulesStr) {
-  console.warn('Gerrit.css(rulesStr) is deprecated!',
-      'Use plugin.styles().css(rulesStr)');
-  if (!Gerrit._customStyleSheet) {
-    const styleEl = document.createElement('style');
-    document.head.appendChild(styleEl);
-    Gerrit._customStyleSheet = styleEl.sheet;
-  }
-
-  const name = '__pg_js_api_class_' +
-      Gerrit._customStyleSheet.cssRules.length;
-  Gerrit._customStyleSheet.insertRule('.' + name + '{' + rulesStr + '}', 0);
-  return name;
-};
-
-Gerrit.install = function(callback, opt_version, opt_src) {
-  pluginLoader.install(callback, opt_version, opt_src);
-};
-
-Gerrit.getLoggedIn = function() {
-  console.warn('Gerrit.getLoggedIn() is deprecated! ' +
-      'Use plugin.restApi().getLoggedIn()');
-  return document.createElement('gr-rest-api-interface').getLoggedIn();
-};
-
-Gerrit.get = function(url, callback) {
-  console.warn('.get() is deprecated! Use plugin.restApi().get()');
-  send('GET', url, callback);
-};
-
-Gerrit.post = function(url, payload, callback) {
-  console.warn('.post() is deprecated! Use plugin.restApi().post()');
-  send('POST', url, callback, payload);
-};
-
-Gerrit.put = function(url, payload, callback) {
-  console.warn('.put() is deprecated! Use plugin.restApi().put()');
-  send('PUT', url, callback, payload);
-};
-
-Gerrit.delete = function(url, opt_callback) {
+export function deprecatedDelete(url, opt_callback) {
   console.warn('.delete() is deprecated! Use plugin.restApi().delete()');
   return getRestAPI().send('DELETE', url)
       .then(response => {
@@ -101,72 +63,119 @@ Gerrit.delete = function(url, opt_callback) {
         }
         return response;
       });
-};
+}
 
-Gerrit.awaitPluginsLoaded = function() {
-  return pluginLoader.awaitPluginsLoaded();
-};
-
-// TODO(taoalpha): consider removing these proxy methods
-// and using _pluginLoader directly
-
-Gerrit._loadPlugins = function(plugins, opt_option) {
-  pluginLoader.loadPlugins(plugins, opt_option);
-};
-
-Gerrit._arePluginsLoaded = function() {
-  return pluginLoader.arePluginsLoaded();
-};
-
-Gerrit._isPluginPreloaded = function(url) {
-  return pluginLoader.isPluginPreloaded(url);
-};
-
-Gerrit._isPluginEnabled = function(pathOrUrl) {
-  return pluginLoader.isPluginEnabled(pathOrUrl);
-};
-
-Gerrit._isPluginLoaded = function(pathOrUrl) {
-  return pluginLoader.isPluginLoaded(pathOrUrl);
-};
-
-// Preloaded plugins should be installed after Gerrit.install() is set,
-// since plugin preloader substitutes Gerrit.install() temporarily.
-pluginLoader.installPreloadedPlugins();
-
-// TODO(taoalpha): List all internal supported event names.
-// Also convert this to inherited class once we move Gerrit to class.
-Gerrit._eventEmitter = new EventEmitter();
-['addListener',
-  'dispatch',
-  'emit',
-  'off',
-  'on',
-  'once',
-  'removeAllListeners',
-  'removeListener',
-].forEach(method => {
+function initGerritPluginsMethods(globalGerritObj) {
   /**
-   * Enabling EventEmitter interface on Gerrit.
-   *
-   * This will enable to signal across different parts of js code without relying on DOM,
-   * including core to core, plugin to plugin and also core to plugin.
-   *
-   * @example
-   *
-   * // Emit this event from pluginA
-   * Gerrit.install(pluginA => {
-   *   fetch("some-api").then(() => {
-   *     Gerrit.on("your-special-event", {plugin: pluginA});
-   *   });
-   * });
-   *
-   * // Listen on your-special-event from pluignB
-   * Gerrit.install(pluginB => {
-   *   Gerrit.on("your-special-event", ({plugin}) => {
-   *     // do something, plugin is pluginA
-   *   });
-   * });
+   * @deprecated Use plugin.styles().css(rulesStr) instead. Please, consult
+   * the documentation how to replace it accordingly.
    */
-  Gerrit[method] = Gerrit._eventEmitter[method].bind(Gerrit._eventEmitter);
-});
+  globalGerritObj.css = function(rulesStr) {
+    console.warn('Gerrit.css(rulesStr) is deprecated!',
+        'Use plugin.styles().css(rulesStr)');
+    if (!globalGerritObj._customStyleSheet) {
+      const styleEl = document.createElement('style');
+      document.head.appendChild(styleEl);
+      globalGerritObj._customStyleSheet = styleEl.sheet;
+    }
+
+    const name = '__pg_js_api_class_' +
+        globalGerritObj._customStyleSheet.cssRules.length;
+    globalGerritObj._customStyleSheet
+        .insertRule('.' + name + '{' + rulesStr + '}', 0);
+    return name;
+  };
+
+  globalGerritObj.install = function(callback, opt_version, opt_src) {
+    pluginLoader.install(callback, opt_version, opt_src);
+  };
+
+  globalGerritObj.getLoggedIn = function() {
+    console.warn('Gerrit.getLoggedIn() is deprecated! ' +
+        'Use plugin.restApi().getLoggedIn()');
+    return document.createElement('gr-rest-api-interface').getLoggedIn();
+  };
+
+  globalGerritObj.get = function(url, callback) {
+    console.warn('.get() is deprecated! Use plugin.restApi().get()');
+    send('GET', url, callback);
+  };
+
+  globalGerritObj.post = function(url, payload, callback) {
+    console.warn('.post() is deprecated! Use plugin.restApi().post()');
+    send('POST', url, callback, payload);
+  };
+
+  globalGerritObj.put = function(url, payload, callback) {
+    console.warn('.put() is deprecated! Use plugin.restApi().put()');
+    send('PUT', url, callback, payload);
+  };
+
+  globalGerritObj.delete = function(url, opt_callback) {
+    deprecatedDelete(url, opt_callback);
+  };
+
+  globalGerritObj.awaitPluginsLoaded = function() {
+    return pluginLoader.awaitPluginsLoaded();
+  };
+
+  // TODO(taoalpha): consider removing these proxy methods
+  // and using pluginLoader directly
+  globalGerritObj._loadPlugins = function(plugins, opt_option) {
+    pluginLoader.loadPlugins(plugins, opt_option);
+  };
+
+  globalGerritObj._arePluginsLoaded = function() {
+    return pluginLoader.arePluginsLoaded();
+  };
+
+  globalGerritObj._isPluginPreloaded = function(url) {
+    return pluginLoader.isPluginPreloaded(url);
+  };
+
+  globalGerritObj._isPluginEnabled = function(pathOrUrl) {
+    return pluginLoader.isPluginEnabled(pathOrUrl);
+  };
+
+  globalGerritObj._isPluginLoaded = function(pathOrUrl) {
+    return pluginLoader.isPluginLoaded(pathOrUrl);
+  };
+
+  // TODO(taoalpha): List all internal supported event names.
+  // Also convert this to inherited class once we move Gerrit to class.
+  globalGerritObj._eventEmitter = new EventEmitter();
+  ['addListener',
+    'dispatch',
+    'emit',
+    'off',
+    'on',
+    'once',
+    'removeAllListeners',
+    'removeListener',
+  ].forEach(method => {
+    /**
+     * Enabling EventEmitter interface on Gerrit.
+     *
+     * This will enable to signal across different parts of js code without relying on DOM,
+     * including core to core, plugin to plugin and also core to plugin.
+     *
+     * @example
+     *
+     * // Emit this event from pluginA
+     * Gerrit.install(pluginA => {
+     *   fetch("some-api").then(() => {
+     *     Gerrit.on("your-special-event", {plugin: pluginA});
+     *   });
+     * });
+     *
+     * // Listen on your-special-event from pluignB
+     * Gerrit.install(pluginB => {
+     *   Gerrit.on("your-special-event", ({plugin}) => {
+     *     // do something, plugin is pluginA
+     *   });
+     * });
+     */
+    globalGerritObj[method] = globalGerritObj._eventEmitter[method]
+        .bind(globalGerritObj._eventEmitter);
+  });
+}
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-gerrit_test.html b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-gerrit_test.html
index adf4fa6f86..8cb4496f9f 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-gerrit_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-gerrit_test.html
@@ -35,6 +35,9 @@ import '../../../test/common-test-setup.js';
 import './gr-js-api-interface.js';
 import {pluginLoader} from './gr-plugin-loader.js';
 import {resetPlugins} from '../../../test/test-utils.js';
+import {initGerritPluginApi} from './gr-gerrit.js';
+
+initGerritPluginApi();
 
 suite('gr-gerrit tests', () => {
   let element;
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface-element.js b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface-element.js
index dfa7cc3866..997e08c067 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface-element.js
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface-element.js
@@ -21,6 +21,7 @@ import {GestureEventListeners} from '@polymer/polymer/lib/mixins/gesture-event-l
 import {LegacyElementMixin} from '@polymer/polymer/lib/legacy/legacy-element-mixin.js';
 import {PolymerElement} from '@polymer/polymer/polymer-element.js';
 import {PatchSetBehavior} from '../../../behaviors/gr-patch-set-behavior/gr-patch-set-behavior.js';
+import {pluginLoader} from './gr-plugin-loader.js';
 
 // Note: for new events, naming convention should be: `a-b`
 const EventType = {
@@ -74,7 +75,7 @@ class GrJsApiInterface extends mixinBehaviors( [
   }
 
   handleEvent(type, detail) {
-    Gerrit.awaitPluginsLoaded().then(() => {
+    pluginLoader.awaitPluginsLoaded().then(() => {
       switch (type) {
         case EventType.HISTORY:
           this._handleHistory(detail);
@@ -288,7 +289,7 @@ class GrJsApiInterface extends mixinBehaviors( [
    * @return {!Promise<?GrAnnotationActionsInterface>}
    */
   getCoverageAnnotationApi() {
-    return Gerrit.awaitPluginsLoaded()
+    return pluginLoader.awaitPluginsLoaded()
         .then(() => this._getEventCallbacks(EventType.ANNOTATE_DIFF)
             .find(api => api.getCoverageProvider()));
   }
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface_test.html b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface_test.html
index 0bb02ad89a..bf7ba66071 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface_test.html
@@ -38,6 +38,10 @@ import {GrPopupInterface} from '../../plugins/gr-popup-interface/gr-popup-interf
 import {GrSettingsApi} from '../../plugins/gr-settings-api/gr-settings-api.js';
 import {GrPluginActionContext} from './gr-plugin-action-context.js';
 import {PLUGIN_LOADING_TIMEOUT_MS} from './gr-api-utils.js';
+import {pluginLoader} from './gr-plugin-loader.js';
+import {initGerritPluginApi} from './gr-gerrit.js';
+
+initGerritPluginApi();
 
 suite('gr-js-api-interface tests', () => {
   let element;
@@ -69,7 +73,7 @@ suite('gr-js-api-interface tests', () => {
     errorStub = sandbox.stub(console, 'error');
     Gerrit.install(p => { plugin = p; }, '0.1',
         'http://test.com/plugins/testplugin/static/test.js');
-    Gerrit._loadPlugins([]);
+    pluginLoader.loadPlugins([]);
   });
 
   teardown(() => {
@@ -238,7 +242,7 @@ suite('gr-js-api-interface tests', () => {
       revisions: {def: {_number: 2}, abc: {_number: 1}},
     };
     const spy = sandbox.spy();
-    Gerrit._loadPlugins(['plugins/test.html']);
+    pluginLoader.loadPlugins(['plugins/test.html']);
     plugin.on(element.EventType.SHOW_CHANGE, spy);
     element.handleEvent(element.EventType.SHOW_CHANGE,
         {change: testChange, patchNum: 1});
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-action-context_test.html b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-action-context_test.html
index 84033b2358..fa1c50767b 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-action-context_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-action-context_test.html
@@ -35,6 +35,9 @@ import '../../../test/common-test-setup.js';
 import './gr-js-api-interface.js';
 import {dom} from '@polymer/polymer/lib/legacy/polymer.dom.js';
 import {GrPluginActionContext} from './gr-plugin-action-context.js';
+import {initGerritPluginApi} from './gr-gerrit.js';
+
+initGerritPluginApi();
 
 suite('gr-plugin-action-context tests', () => {
   let instance;
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-endpoints.js b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-endpoints.js
index 38f0f10132..388243c540 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-endpoints.js
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-endpoints.js
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+import {pluginLoader} from './gr-plugin-loader.js';
+
 /** @constructor */
 export function GrPluginEndpoints() {
   this._endpoints = {};
@@ -79,7 +81,7 @@ GrPluginEndpoints.prototype.registerModule = function(plugin, endpoint, type,
   }
   const moduleInfo = this._getOrCreateModuleInfo(plugin, endpoint, type,
       moduleName, domHook);
-  if (Gerrit._arePluginsLoaded() && this._callbacks[endpoint]) {
+  if (pluginLoader.arePluginsLoaded() && this._callbacks[endpoint]) {
     this._callbacks[endpoint].forEach(callback => callback(moduleInfo));
   }
 };
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-endpoints_test.html b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-endpoints_test.html
index 87bea57ed9..5b5e6ebc85 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-endpoints_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-endpoints_test.html
@@ -29,6 +29,9 @@ import '../../../test/common-test-setup.js';
 import './gr-js-api-interface.js';
 import {GrPluginEndpoints} from './gr-plugin-endpoints.js';
 import {pluginLoader} from './gr-plugin-loader.js';
+import {initGerritPluginApi} from './gr-gerrit.js';
+
+initGerritPluginApi();
 
 suite('gr-plugin-endpoints tests', () => {
   let sandbox;
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-loader_test.html b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-loader_test.html
index d49b31f801..c066ffbdaf 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-loader_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-loader_test.html
@@ -38,6 +38,9 @@ import {PRELOADED_PROTOCOL, PLUGIN_LOADING_TIMEOUT_MS} from './gr-api-utils.js';
 import {pluginLoader} from './gr-plugin-loader.js';
 import {resetPlugins} from '../../../test/test-utils.js';
 import {_testOnly_flushPreinstalls} from './gr-gerrit.js';
+import {initGerritPluginApi} from './gr-gerrit.js';
+
+initGerritPluginApi();
 
 suite('gr-plugin-loader tests', () => {
   let plugin;
@@ -100,23 +103,23 @@ suite('gr-plugin-loader tests', () => {
         done();
       },
     });
-    Gerrit._loadPlugins([]);
+    pluginLoader.loadPlugins([]);
   });
 
   test('arePluginsLoaded', done => {
-    assert.isFalse(Gerrit._arePluginsLoaded());
+    assert.isFalse(pluginLoader.arePluginsLoaded());
     const plugins = [
       'http://test.com/plugins/foo/static/test.js',
       'http://test.com/plugins/bar/static/test.js',
     ];
 
-    Gerrit._loadPlugins(plugins);
-    assert.isFalse(Gerrit._arePluginsLoaded());
+    pluginLoader.loadPlugins(plugins);
+    assert.isFalse(pluginLoader.arePluginsLoaded());
     // Timeout on loading plugins
     window.clock.tick(PLUGIN_LOADING_TIMEOUT_MS * 2);
 
     flush(() => {
-      assert.isTrue(Gerrit._arePluginsLoaded());
+      assert.isTrue(pluginLoader.arePluginsLoaded());
       done();
     });
   });
@@ -134,11 +137,11 @@ suite('gr-plugin-loader tests', () => {
       'http://test.com/plugins/foo/static/test.js',
       'http://test.com/plugins/bar/static/test.js',
     ];
-    Gerrit._loadPlugins(plugins);
+    pluginLoader.loadPlugins(plugins);
 
     flush(() => {
       assert.isTrue(pluginsLoadedStub.calledWithExactly(['foo', 'bar']));
-      assert.isTrue(Gerrit._arePluginsLoaded());
+      assert.isTrue(pluginLoader.arePluginsLoaded());
       done();
     });
   });
@@ -157,13 +160,13 @@ suite('gr-plugin-loader tests', () => {
       'http://test.com/plugins/bar/static/test.js',
       'bar/static/test.js',
     ];
-    Gerrit._loadPlugins(plugins);
+    pluginLoader.loadPlugins(plugins);
     assert.isTrue(
         plugins.every(plugin => pluginLoader.isPluginEnabled(plugin))
     );
 
     flush(() => {
-      assert.isTrue(Gerrit._arePluginsLoaded());
+      assert.isTrue(pluginLoader.arePluginsLoaded());
       assert.isTrue(
           plugins.every(plugin => pluginLoader.isPluginLoaded(plugin))
       );
@@ -194,11 +197,11 @@ suite('gr-plugin-loader tests', () => {
       pluginsLoaded: (...args) => pluginsLoadedStub(...args),
     });
 
-    Gerrit._loadPlugins(plugins);
+    pluginLoader.loadPlugins(plugins);
 
     flush(() => {
       assert.isTrue(pluginsLoadedStub.calledWithExactly(['bar']));
-      assert.isTrue(Gerrit._arePluginsLoaded());
+      assert.isTrue(pluginLoader.arePluginsLoaded());
       assert.isTrue(alertStub.calledOnce);
       done();
     });
@@ -226,14 +229,14 @@ suite('gr-plugin-loader tests', () => {
       pluginsLoaded: (...args) => pluginsLoadedStub(...args),
     });
 
-    Gerrit._loadPlugins(plugins);
+    pluginLoader.loadPlugins(plugins);
     assert.isTrue(
         plugins.every(plugin => pluginLoader.isPluginEnabled(plugin))
     );
 
     flush(() => {
       assert.isTrue(pluginsLoadedStub.calledWithExactly(['bar']));
-      assert.isTrue(Gerrit._arePluginsLoaded());
+      assert.isTrue(pluginLoader.arePluginsLoaded());
       assert.isTrue(alertStub.calledOnce);
       assert.isTrue(pluginLoader.isPluginLoaded(plugins[1]));
       assert.isFalse(pluginLoader.isPluginLoaded(plugins[0]));
@@ -261,11 +264,11 @@ suite('gr-plugin-loader tests', () => {
       pluginsLoaded: (...args) => pluginsLoadedStub(...args),
     });
 
-    Gerrit._loadPlugins(plugins);
+    pluginLoader.loadPlugins(plugins);
 
     flush(() => {
       assert.isTrue(pluginsLoadedStub.calledWithExactly([]));
-      assert.isTrue(Gerrit._arePluginsLoaded());
+      assert.isTrue(pluginLoader.arePluginsLoaded());
       assert.isTrue(alertStub.calledTwice);
       done();
     });
@@ -290,11 +293,11 @@ suite('gr-plugin-loader tests', () => {
       pluginsLoaded: (...args) => pluginsLoadedStub(...args),
     });
 
-    Gerrit._loadPlugins(plugins);
+    pluginLoader.loadPlugins(plugins);
 
     flush(() => {
       assert.isTrue(pluginsLoadedStub.calledWithExactly(['foo']));
-      assert.isTrue(Gerrit._arePluginsLoaded());
+      assert.isTrue(pluginLoader.arePluginsLoaded());
       assert.isTrue(alertStub.calledOnce);
       done();
     });
@@ -314,11 +317,11 @@ suite('gr-plugin-loader tests', () => {
       'http://test.com/plugins/foo/static/test2.js',
       'http://test.com/plugins/bar/static/test.js',
     ];
-    Gerrit._loadPlugins(plugins);
+    pluginLoader.loadPlugins(plugins);
 
     flush(() => {
       assert.isTrue(pluginsLoadedStub.calledWithExactly(['foo', 'bar']));
-      assert.isTrue(Gerrit._arePluginsLoaded());
+      assert.isTrue(pluginLoader.arePluginsLoaded());
       done();
     });
   });
@@ -343,7 +346,7 @@ suite('gr-plugin-loader tests', () => {
         failToLoadStub(...args);
       });
 
-      Gerrit._loadPlugins([
+      pluginLoader.loadPlugins([
         'foo/bar',
       ]);
 
@@ -355,7 +358,7 @@ suite('gr-plugin-loader tests', () => {
     });
 
     test('relative path for plugins', () => {
-      Gerrit._loadPlugins([
+      pluginLoader.loadPlugins([
         'foo/bar.js',
         'foo/bar.html',
       ]);
@@ -374,7 +377,7 @@ suite('gr-plugin-loader tests', () => {
       const testUrl = '/test';
       sandbox.stub(BaseUrlBehavior, 'getBaseUrl', () => testUrl);
 
-      Gerrit._loadPlugins([
+      pluginLoader.loadPlugins([
         'foo/bar.js',
         'foo/bar.html',
       ]);
@@ -392,7 +395,7 @@ suite('gr-plugin-loader tests', () => {
     });
 
     test('absolute path for plugins', () => {
-      Gerrit._loadPlugins([
+      pluginLoader.loadPlugins([
         'http://e.com/foo/bar.js',
         'http://e.com/foo/bar.html',
       ]);
@@ -428,7 +431,7 @@ suite('gr-plugin-loader tests', () => {
     });
 
     test('Should try load plugins from assets path instead', () => {
-      Gerrit._loadPlugins([
+      pluginLoader.loadPlugins([
         'foo/bar.js',
         'foo/bar.html',
       ]);
@@ -443,7 +446,7 @@ suite('gr-plugin-loader tests', () => {
     });
 
     test('Should honor original path if exists', () => {
-      Gerrit._loadPlugins([
+      pluginLoader.loadPlugins([
         'http://e.com/foo/bar.html',
         'http://e.com/foo/bar.js',
       ]);
@@ -459,7 +462,7 @@ suite('gr-plugin-loader tests', () => {
 
     test('Should try replace current host with assetsPath', () => {
       const host = window.location.origin;
-      Gerrit._loadPlugins([
+      pluginLoader.loadPlugins([
         `${host}/foo/bar.html`,
         `${host}/foo/bar.js`,
       ]);
@@ -475,7 +478,7 @@ suite('gr-plugin-loader tests', () => {
   });
 
   test('adds js plugins will call the body', () => {
-    Gerrit._loadPlugins([
+    pluginLoader.loadPlugins([
       'http://e.com/foo/bar.js',
       'http://e.com/bar/foo.js',
     ]);
@@ -498,12 +501,12 @@ suite('gr-plugin-loader tests', () => {
       Gerrit.install(() => pluginCallback(url), undefined, url);
     });
 
-    Gerrit._loadPlugins(plugins);
+    pluginLoader.loadPlugins(plugins);
 
-    Gerrit.awaitPluginsLoaded().then(() => {
+    pluginLoader.awaitPluginsLoaded().then(() => {
       assert.isTrue(installed);
 
-      Gerrit.awaitPluginsLoaded().then(() => {
+      pluginLoader.awaitPluginsLoaded().then(() => {
         done();
       });
     });
@@ -525,7 +528,7 @@ suite('gr-plugin-loader tests', () => {
         bar: () => void 0,
       };
 
-      Gerrit._loadPlugins([
+      pluginLoader.loadPlugins([
         'http://e.com/plugins/foo.js',
         'plugins/bar.html',
         'http://e.com/plugins/test/foo.js',
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-rest-api_test.html b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-rest-api_test.html
index 45f83eea0b..5eb569ee03 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-rest-api_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-plugin-rest-api_test.html
@@ -27,6 +27,9 @@ limitations under the License.
 import '../../../test/common-test-setup.js';
 import './gr-js-api-interface.js';
 import {GrPluginRestApi} from './gr-plugin-rest-api.js';
+import {initGerritPluginApi} from './gr-gerrit.js';
+
+initGerritPluginApi();
 
 suite('gr-plugin-rest-api tests', () => {
   let instance;
diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-public-js-api.js b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-public-js-api.js
index a2bfe33c1d..d111d5c2d5 100644
--- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-public-js-api.js
+++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-public-js-api.js
@@ -33,11 +33,8 @@ import {GrStylesApi} from '../../plugins/gr-styles-api/gr-styles-api.js';
 import {GrPluginActionContext} from './gr-plugin-action-context.js';
 import {pluginEndpoints} from './gr-plugin-endpoints.js';
 
-import {
-  PRELOADED_PROTOCOL,
-  getPluginNameFromUrl,
-  send,
-} from './gr-api-utils.js';
+import {PRELOADED_PROTOCOL, getPluginNameFromUrl, send} from './gr-api-utils.js';
+import {deprecatedDelete} from './gr-gerrit.js';
 
 (function(window) {
   'use strict';
@@ -195,7 +192,7 @@ import {
   };
 
   Plugin.prototype.delete = function(url, opt_callback) {
-    return Gerrit.delete(this.url(url), opt_callback);
+    return deprecatedDelete(this.url(url), opt_callback);
   };
 
   Plugin.prototype.annotationApi = function() {