Cleanup Gerrit global variable from tests and types

Change-Id: I70d8fcd68a8c7982f0ebbb9242f9cf4455fac86f
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 36b0caa..5d9745e 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
@@ -36,9 +36,9 @@
 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';
+import {_testOnly_initGerritPluginApi} from '../../shared/gr-js-api-interface/gr-gerrit.js';
 
-initGerritPluginApi();
+const pluginApi = _testOnly_initGerritPluginApi();
 
 suite('gr-change-metadata tests', () => {
   let element;
@@ -754,7 +754,7 @@
       element.revision = {};
       let hookEl;
       let plugin;
-      Gerrit.install(
+      pluginApi.install(
           p => {
             plugin = p;
             plugin.hook('change-metadata-item').getLastAttached()