♻️ #core form, modal, amp-element-helpers ("real" diff in desc) (ampproject#35608)

rcebulko · web-flow · commit 9813cea3285c · 2021-08-12T17:27:55.000Z
* Update src/form code

* Update src/modal code

* Update src/video-interface code

* Move src/{form,modal,amp-element-helpers} -&gt; #core/dom

* Fix types

* update dep-check config

* Remove bad assert

* Update imports of form,modal,amp-element-helpers

* Fix rebase error
diff --git a/ads/google/a4a/utils.js b/ads/google/a4a/utils.js
@@ -30,7 +30,7 @@ import {getPageLayoutBoxBlocking} from '#core/dom/layout/page-layout-box';
 import {getTimingDataSync} from '#service/variable-source';
 import * as mode from '#core/mode';
 import {parseJson} from '#core/types/object/json';
-import {whenUpgradedToCustomElement} from '../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 import {createElementWithAttributes} from '#core/dom';
 
 /** @type {string}  */
diff --git a/build-system/test-configs/dep-check-config.js b/build-system/test-configs/dep-check-config.js
@@ -124,7 +124,6 @@ exports.rules = [
       // somewhere else at some point
       'ads/google/a4a/**->src/ad-cid.js',
       'ads/google/a4a/**->src/consent.js',
-      'ads/google/a4a/**->src/amp-element-helpers.js',
       'ads/google/a4a/**->src/experiments/index.js',
       'ads/google/a4a/**->src/service/index.js',
       'ads/google/a4a/utils.js->src/service/variable-source.js',
diff --git a/extensions/amp-accordion/0.1/test/test-amp-accordion.js b/extensions/amp-accordion/0.1/test/test-amp-accordion.js
@@ -23,7 +23,7 @@ import {computedStyle} from '#core/dom/style';
 import {createElementWithAttributes, tryFocus} from '#core/dom';
 import {htmlFor} from '#core/dom/static-template';
 import {poll} from '#testing/iframe';
-import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 describes.realWin(
   'amp-accordion',
diff --git a/extensions/amp-analytics/0.1/events.js b/extensions/amp-analytics/0.1/events.js
@@ -26,7 +26,7 @@ import {deepMerge, dict, hasOwn} from '#core/types/object';
 import {dev, devAssert, user, userAssert} from '../../../src/log';
 import {getData} from '../../../src/event-helper';
 import {getDataParamsFromAttributes} from '#core/dom';
-import {isAmpElement} from '../../../src/amp-element-helpers';
+import {isAmpElement} from '#core/dom/amp-element-helpers';
 import {isArray, isEnumValue, isFiniteNumber} from '#core/types';
 import {debounce} from '#core/types/function';
 import {isExperimentOn} from '#experiments';
diff --git a/extensions/amp-auto-ads/0.1/placement.js b/extensions/amp-auto-ads/0.1/placement.js
@@ -28,7 +28,7 @@ import {createElementWithAttributes} from '#core/dom';
 import {dev, user} from '../../../src/log';
 import {dict} from '#core/types/object';
 import {measurePageLayoutBox} from './measure-page-layout-box';
-import {whenUpgradedToCustomElement} from '../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 /** @const */
 const TAG = 'amp-auto-ads';
diff --git a/extensions/amp-auto-lightbox/0.1/amp-auto-lightbox.js b/extensions/amp-auto-lightbox/0.1/amp-auto-lightbox.js
@@ -33,7 +33,7 @@ import {loadPromise} from '../../../src/event-helper';
 import {measureIntersectionNoRoot} from '#core/dom/layout/intersection-no-root';
 import {toArray} from '#core/types/array';
 import {tryParseJson} from '#core/types/object/json';
-import {whenUpgradedToCustomElement} from '../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 const TAG = 'amp-auto-lightbox';
 
diff --git a/extensions/amp-bind/0.1/bind-impl.js b/extensions/amp-bind/0.1/bind-impl.js
@@ -32,7 +32,7 @@ import {escapeCssSelectorIdent} from '#core/dom/css-selectors';
 import {findIndex, isArray, remove, toArray} from '#core/types/array';
 import {getMode} from '../../../src/mode';
 import {iterateCursor} from '#core/dom';
-import {whenUpgradedToCustomElement} from '../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 import {invokeWebWorker} from '../../../src/web-worker/amp-worker';
 import {isAmp4Email} from '../../../src/format';
diff --git a/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js b/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js
@@ -24,7 +24,7 @@ import {createElementWithAttributes} from '#core/dom';
 import {listenOncePromise} from '../../../../src/event-helper';
 import {macroTask} from '#testing/yield';
 import {parseUrlDeprecated} from '../../../../src/url';
-import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 describes.realWin(
   'amp-brightcove',
diff --git a/extensions/amp-carousel/0.1/test/test-scrollable-carousel.js b/extensions/amp-carousel/0.1/test/test-scrollable-carousel.js
@@ -20,7 +20,7 @@ import {ActionTrust} from '#core/constants/action-constants';
 import {Services} from '#service';
 import {createElementWithAttributes} from '#core/dom';
 import {user} from '../../../../src/log';
-import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 describes.realWin(
   'test-scrollable-carousel',
   {
diff --git a/extensions/amp-carousel/0.1/test/test-slidescroll.js b/extensions/amp-carousel/0.1/test/test-slidescroll.js
@@ -21,7 +21,7 @@ import {Services} from '#service';
 import {createElementWithAttributes} from '#core/dom';
 import {installResizeObserverStub} from '#testing/resize-observer-stub';
 import {user} from '../../../../src/log';
-import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 describes.realWin(
   'SlideScroll',
diff --git a/extensions/amp-consent/0.1/consent-ui.js b/extensions/amp-consent/0.1/consent-ui.js
@@ -29,7 +29,7 @@ import {insertAtStart, removeElement, tryFocus} from '#core/dom';
 import {
   isAmpElement,
   whenUpgradedToCustomElement,
-} from '../../../src/amp-element-helpers';
+} from '#core/dom/amp-element-helpers';
 import {setImportantStyles, setStyles, toggle} from '#core/dom/style';
 
 const TAG = 'amp-consent-ui';
diff --git a/extensions/amp-date-countdown/1.0/test/test-amp-date-countdown.js b/extensions/amp-date-countdown/1.0/test/test-amp-date-countdown.js
@@ -17,7 +17,7 @@
 import '../../../amp-mustache/0.2/amp-mustache';
 import '../amp-date-countdown';
 import {waitFor} from '#testing/test-helper';
-import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 describes.realWin(
   'amp-date-countdown 1.0',
diff --git a/extensions/amp-date-display/1.0/test/test-amp-date-display.js b/extensions/amp-date-display/1.0/test/test-amp-date-display.js
@@ -19,7 +19,7 @@ import '../amp-date-display';
 import {expect} from 'chai';
 import {user} from '../../../../src/log';
 import {waitFor} from '#testing/test-helper';
-import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 describes.realWin(
   'amp-date-display 1.0',
diff --git a/extensions/amp-experiment/1.0/mutation/attribute-mutation-default-style.js b/extensions/amp-experiment/1.0/mutation/attribute-mutation-default-style.js
@@ -18,7 +18,7 @@ import {assertAttributeMutationFormat} from './mutation';
 import {assertDoesNotContainDisplay} from '../../../../src/assert-display';
 import {dev, user} from '../../../../src/log';
 import {dict, hasOwn} from '#core/types/object';
-import {isAmpElement} from '../../../../src/amp-element-helpers';
+import {isAmpElement} from '#core/dom/amp-element-helpers';
 import {setStyles} from '#core/dom/style';
 
 /** @const {RegExp} */
diff --git a/extensions/amp-form/0.1/amp-form.js b/extensions/amp-form/0.1/amp-form.js
@@ -56,7 +56,7 @@ import {
   formOrNullForElement,
   getFormAsObject,
   setFormForElement,
-} from '../../../src/form';
+} from '#core/dom/form';
 import {getFormValidator, isCheckValiditySupported} from './form-validators';
 import {getMode} from '../../../src/mode';
 import {installFormProxy} from './form-proxy';
diff --git a/extensions/amp-form/0.1/form-dirtiness.js b/extensions/amp-form/0.1/form-dirtiness.js
@@ -19,7 +19,7 @@ import {createCustomEvent} from '../../../src/event-helper';
 import {createFormDataWrapper} from '../../../src/form-data-wrapper';
 import {dev} from '../../../src/log';
 import {dict, map} from '#core/types/object';
-import {isDisabled, isFieldDefault, isFieldEmpty} from '../../../src/form';
+import {isDisabled, isFieldDefault, isFieldEmpty} from '#core/dom/form';
 
 export const DIRTINESS_INDICATOR_CLASS = 'amp-form-dirty';
 
diff --git a/extensions/amp-form/0.1/form-verifiers.js b/extensions/amp-form/0.1/form-verifiers.js
@@ -15,7 +15,7 @@
  */
 
 import {LastAddedResolver} from '#core/data-structures/promise';
-import {isFieldDefault} from '../../../src/form';
+import {isFieldDefault} from '#core/dom/form';
 import {iterateCursor} from '#core/dom';
 import {user} from '../../../src/log';
 
diff --git a/extensions/amp-iframe/0.1/test/test-amp-iframe.js b/extensions/amp-iframe/0.1/test/test-amp-iframe.js
@@ -20,7 +20,7 @@ import {CommonSignals} from '#core/constants/common-signals';
 import {LayoutPriority} from '#core/dom/layout';
 import {Services} from '#service';
 import {createElementWithAttributes} from '#core/dom';
-import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 import {installResizeObserverStub} from '#testing/resize-observer-stub';
 import {isAdLike} from '../../../../src/iframe-helper';
diff --git a/extensions/amp-image-lightbox/0.1/test/test-amp-image-lightbox.js b/extensions/amp-image-lightbox/0.1/test/test-amp-image-lightbox.js
@@ -24,7 +24,7 @@ import {Keys} from '#core/constants/key-codes';
 import {Services} from '#service';
 import {WindowInterface} from '#core/window/interface';
 import {parseSrcset} from '#core/dom/srcset';
-import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 describes.realWin(
   'amp-image-lightbox component',
diff --git a/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js b/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js
@@ -21,7 +21,7 @@ import {ActionTrust} from '#core/constants/action-constants';
 import {Keys} from '#core/constants/key-codes';
 import {Services} from '#service';
 import {whenCalled} from '#testing/test-helper';
-import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 describes.realWin(
   'amp-lightbox component',
diff --git a/extensions/amp-list/0.1/test/test-amp-list.js b/extensions/amp-list/0.1/test/test-amp-list.js
@@ -24,7 +24,7 @@ import {Deferred} from '#core/data-structures/promise';
 import {Services} from '#service';
 import {createElementWithAttributes} from '#core/dom';
 import {resetExperimentTogglesForTesting, toggleExperiment} from '#experiments';
-import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 describes.repeated(
   'amp-list',
diff --git a/extensions/amp-mega-menu/0.1/amp-mega-menu.js b/extensions/amp-mega-menu/0.1/amp-mega-menu.js
@@ -28,7 +28,7 @@ import {
 import {dev, userAssert} from '../../../src/log';
 import {isConnectedNode, isRTL, tryFocus} from '#core/dom';
 import {mod} from '#core/math';
-import {setModalAsClosed, setModalAsOpen} from '../../../src/modal';
+import {setModalAsClosed, setModalAsOpen} from '#core/dom/modal';
 import {toArray} from '#core/types/array';
 
 /** @const {string} */
diff --git a/extensions/amp-render/1.0/test/test-amp-render.js b/extensions/amp-render/1.0/test/test-amp-render.js
@@ -26,7 +26,7 @@ import {ActionTrust} from '#core/constants/action-constants';
 import {Services} from '#service';
 import {htmlFor} from '#core/dom/static-template';
 import {waitFor} from '#testing/test-helper';
-import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 describes.realWin(
   'amp-render-v1.0',
diff --git a/extensions/amp-selector/0.1/test/test-amp-selector.js b/extensions/amp-selector/0.1/test/test-amp-selector.js
@@ -21,7 +21,7 @@ import {AmpSelector} from '../amp-selector';
 import {Keys} from '#core/constants/key-codes';
 import {Services} from '#service';
 import {createElementWithAttributes} from '#core/dom';
-import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 describes.realWin(
   'amp-selector',
diff --git a/extensions/amp-sidebar/0.1/amp-sidebar.js b/extensions/amp-sidebar/0.1/amp-sidebar.js
@@ -39,7 +39,7 @@ import {
   unobserveContentSize,
 } from '#core/dom/layout/size-observer';
 import {removeFragment} from '../../../src/url';
-import {setModalAsClosed, setModalAsOpen} from '../../../src/modal';
+import {setModalAsClosed, setModalAsOpen} from '#core/dom/modal';
 import {setStyles, toggle} from '#core/dom/style';
 import {toArray} from '#core/types/array';
 import {unmountAll} from '#core/dom/resource-container-helper';
diff --git a/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js b/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js
@@ -21,9 +21,9 @@ import {ActionTrust} from '#core/constants/action-constants';
 import {Keys} from '#core/constants/key-codes';
 import {Services} from '#service';
 import {assertScreenReaderElement} from '#testing/test-helper';
-import {clearModalStack, getModalStackLength} from '../../../../src/modal';
+import {clearModalStack, getModalStackLength} from '#core/dom/modal';
 import {createElementWithAttributes} from '#core/dom';
-import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 // Represents the correct value of KeyboardEvent.which for the Escape key
 const KEYBOARD_EVENT_WHICH_ESCAPE = 27;
diff --git a/extensions/amp-sidebar/0.2/amp-sidebar.js b/extensions/amp-sidebar/0.2/amp-sidebar.js
@@ -40,7 +40,7 @@ import {
   unobserveContentSize,
 } from '#core/dom/layout/size-observer';
 import {removeFragment} from '../../../src/url';
-import {setModalAsClosed, setModalAsOpen} from '../../../src/modal';
+import {setModalAsClosed, setModalAsOpen} from '#core/dom/modal';
 import {setStyles, toggle} from '#core/dom/style';
 import {toArray} from '#core/types/array';
 import {unmountAll} from '#core/dom/resource-container-helper';
diff --git a/extensions/amp-sidebar/0.2/test/test-amp-sidebar.js b/extensions/amp-sidebar/0.2/test/test-amp-sidebar.js
@@ -20,7 +20,7 @@ import {ActionTrust} from '#core/constants/action-constants';
 import {Keys} from '#core/constants/key-codes';
 import {Services} from '#service';
 import {assertScreenReaderElement} from '#testing/test-helper';
-import {clearModalStack, getModalStackLength} from '../../../../src/modal';
+import {clearModalStack, getModalStackLength} from '#core/dom/modal';
 import {createElementWithAttributes} from '#core/dom';
 import {toggleExperiment} from '#experiments';
 
diff --git a/extensions/amp-sticky-ad/1.0/amp-sticky-ad.js b/extensions/amp-sticky-ad/1.0/amp-sticky-ad.js
@@ -28,7 +28,7 @@ import {dev, user, userAssert} from '../../../src/log';
 import {isExperimentOn} from '#experiments';
 import {realChildElements} from '#core/dom/query';
 import {removeElement} from '#core/dom';
-import {whenUpgradedToCustomElement} from '../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 class AmpStickyAd extends AMP.BaseElement {
   /** @param {!AmpElement} element */
diff --git a/extensions/amp-story-360/0.1/amp-story-360.js b/extensions/amp-story-360/0.1/amp-story-360.js
@@ -34,7 +34,7 @@ import {dev, user, userAssert} from '../../../src/log';
 import {htmlFor} from '#core/dom/static-template';
 import {listenOncePromise} from '../../../src/event-helper';
 import {timeStrToMillis} from '../../amp-story/1.0/utils';
-import {whenUpgradedToCustomElement} from '../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 /** @const {string} */
 const TAG = 'AMP_STORY_360';
diff --git a/extensions/amp-story-education/0.1/amp-story-education.js b/extensions/amp-story-education/0.1/amp-story-education.js
@@ -29,7 +29,7 @@ import {dict} from '#core/types/object';
 import {getLocalizationService} from '../../amp-story/1.0/amp-story-localization-service';
 import {htmlFor} from '#core/dom/static-template';
 import {removeChildren} from '#core/dom';
-import {setModalAsClosed, setModalAsOpen} from '../../../src/modal';
+import {setModalAsClosed, setModalAsOpen} from '#core/dom/modal';
 import {toggle} from '#core/dom/style';
 
 /** @type {string} */
diff --git a/extensions/amp-story-panning-media/0.1/amp-story-panning-media.js b/extensions/amp-story-panning-media/0.1/amp-story-panning-media.js
@@ -28,7 +28,7 @@ import {deepEquals} from '#core/types/object/json';
 import {dev, user} from '../../../src/log';
 import {prefersReducedMotion} from '#core/dom/media-query-props';
 import {setImportantStyles} from '#core/dom/style';
-import {whenUpgradedToCustomElement} from '../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 /** @const {string} */
 const TAG = 'AMP_STORY_PANNING_MEDIA';
diff --git a/extensions/amp-story/1.0/amp-story-draggable-drawer.js b/extensions/amp-story/1.0/amp-story-draggable-drawer.js
@@ -29,7 +29,7 @@ import {createShadowRootWithStyle} from './utils';
 import {dev, devAssert} from '../../../src/log';
 import {getLocalizationService} from './amp-story-localization-service';
 import {htmlFor} from '#core/dom/static-template';
-import {isAmpElement} from '../../../src/amp-element-helpers';
+import {isAmpElement} from '#core/dom/amp-element-helpers';
 import {listen} from '../../../src/event-helper';
 import {resetStyles, setImportantStyles, toggle} from '#core/dom/style';
 
diff --git a/extensions/amp-story/1.0/amp-story-page.js b/extensions/amp-story/1.0/amp-story-page.js
@@ -78,7 +78,7 @@ import {propagateAttributes} from '#core/dom/propagate-attributes';
 import {px, toggle} from '#core/dom/style';
 import {renderPageAttachmentUI} from './amp-story-open-page-attachment';
 import {renderPageDescription} from './semantic-render';
-import {whenUpgradedToCustomElement} from '../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 import {toArray} from '#core/types/array';
 import {upgradeBackgroundAudio} from './audio';
diff --git a/extensions/amp-story/1.0/amp-story-render-service.js b/extensions/amp-story/1.0/amp-story-render-service.js
@@ -16,7 +16,7 @@
 
 import {CommonSignals} from '#core/constants/common-signals';
 import {Services} from '#service';
-import {whenUpgradedToCustomElement} from '../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 /**
  * Maximum milliseconds to wait for service to load.
diff --git a/extensions/amp-story/1.0/amp-story.js b/extensions/amp-story/1.0/amp-story.js
@@ -108,7 +108,7 @@ import {
   shouldShowStoryUrlInfo,
 } from './utils';
 import {upgradeBackgroundAudio} from './audio';
-import {whenUpgradedToCustomElement} from '../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 import LocalizedStringsAr from './_locales/ar.json' assert {type: 'json'}; // lgtm[js/syntax-error]
 import LocalizedStringsDe from './_locales/de.json' assert {type: 'json'}; // lgtm[js/syntax-error]
 import LocalizedStringsDefault from './_locales/default.json' assert {type: 'json'}; // lgtm[js/syntax-error]
diff --git a/extensions/amp-story/1.0/background-blur.js b/extensions/amp-story/1.0/background-blur.js
@@ -18,7 +18,7 @@ import {CommonSignals} from '#core/constants/common-signals';
 import {scopedQuerySelectorAll} from '#core/dom/query';
 import {setImportantStyles} from '#core/dom/style';
 import {user} from '../../../src/log';
-import {whenUpgradedToCustomElement} from '../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 /** @const {number} */
 const CANVAS_SIZE = 3;
diff --git a/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js b/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js
@@ -21,7 +21,7 @@ import {createElementWithAttributes} from '#core/dom';
 import {installResizeObserverStub} from '#testing/resize-observer-stub';
 import {listenOncePromise} from '../../../../src/event-helper';
 import {macroTask} from '#testing/yield';
-import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers';
+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 describes.realWin(
   'amp-video-iframe',
diff --git a/src/core/dom/amp-element-helpers.js b/src/core/dom/amp-element-helpers.js
diff --git a/src/core/dom/form.js b/src/core/dom/form.js
diff --git a/src/core/dom/modal.js b/src/core/dom/modal.js
diff --git a/src/custom-element.js b/src/custom-element.js
diff --git a/src/form-data-wrapper.js b/src/form-data-wrapper.js
diff --git a/src/video-interface.js b/src/video-interface.js
diff --git a/test/integration/test-amp-carousel.js b/test/integration/test-amp-carousel.js
diff --git a/test/integration/test-shadow-dom-element.js b/test/integration/test-shadow-dom-element.js
diff --git a/test/integration/test-visibility-states.js b/test/integration/test-visibility-states.js
diff --git a/test/unit/test-amp-element-helpers.js b/test/unit/test-amp-element-helpers.js
diff --git a/test/unit/test-form.js b/test/unit/test-form.js
diff --git a/test/unit/test-modal.js b/test/unit/test-modal.js

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import {ActionTrust} from '#core/constants/action-constants';`
`20`	`20`	`import {Services} from '#service';`
`21`	`21`	`import {createElementWithAttributes} from '#core/dom';`
`22`	`22`	`import {user} from '../../../../src/log';`
`23`		`-import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers';`
	`23`	`+import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';`
`24`	`24`	`describes.realWin(`
`25`	`25`	`'test-scrollable-carousel',`
`26`	`26`	`{`