FilesApp: clean up polymer imports in create_test_main.py script

Change-Id: If33a6bd0bd57a5c9313402a1b78b3f2d815f73e4
Reviewed-on: https://chromium-review.googlesource.com/c/1345681Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
Reviewed-by: Joel Hockey <joelhockey@chromium.org>
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609937}

ui/file_manager/file_manager/foreground/elements/files_icon_button.html

@@ -15,8 +15,8 @@
 
 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-behaviors/iron-button-state.html">
-<link rel="import" href="chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/foreground/elements/files_ripple.html">
-<link rel="import" href="chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj/foreground/elements/files_toggle_ripple.html">
+<link rel="import" href="files_ripple.html">
+<link rel="import" href="files_toggle_ripple.html">
 
 <dom-module id="files-icon-button">
   <template>

ui/file_manager/file_manager/test/scripts/create_test_main.py

@@ -36,6 +36,12 @@ output = args.output or os.path.abspath(
 ROOT_SRC = os.path.abspath(os.path.join(sys.path[0], '../..'))
 ROOT_GEN = os.path.dirname(os.path.abspath(output))
 ROOT = os.path.relpath(ROOT_SRC, ROOT_GEN) + '/'
+POLYMER_1 = '../../../third_party/polymer/v1_0/components-chromium/'
+ROOT_POLYMER = '%s/%s' % (ROOT_SRC, POLYMER_1)
+# Replacement for chrome://resources/html/polymer.html.
+POLYMER_IMPORTS = (
+    '<script src="../../webui/resources/js/polymer_config.js"></script>\n'
+    '<link rel="import" href="%spolymer/polymer.html">' % POLYMER_1)
 scripts = []
 GENERATED = 'Generated at %s by: %s' % (time.ctime(), sys.path[0])
 GENERATED_HTML = '<!-- %s -->\n\n' % GENERATED
@@ -99,8 +105,7 @@ main_html = (read('main.html')
                       '../../webui/resources/css/action_link.css')
              .replace('<link rel="import" '
                       'href="chrome://resources/html/polymer.html">',
-                      '<script src="../../webui/resources/js/'
-                      'polymer_config.js"></script>')
+                      POLYMER_IMPORTS)
              .replace('href="', 'href="' + ROOT)
              .replace('src="', 'src="' + ROOT)
              .replace(ROOT + 'chrome://resources/css/text_defaults.css',
@@ -154,13 +159,9 @@ includes2scripts('background/js/background_scripts.js')
 # However, test/js/test_util.js copies some functions from it into its own
 # test context, so provide it here.
 scripts += ['<script src="%s%s"></script>' %
-    (ROOT, 'background/js/runtime_loaded_test_util.js')]
+            (ROOT, 'background/js/runtime_loaded_test_util.js')]
 
 main_html = replaceline(main_html, 'foreground/js/main_scripts.js', [
-    ('<link rel="import" href="%s../../../third_party/polymer/v1_0/'
-     'components-chromium/polymer/polymer.html">' % ROOT),
-    ('<link rel="import" href="%s../../../third_party/polymer/v1_0/'
-     'components-chromium/paper-progress/paper-progress.html">' % ROOT),
     "<script>var FILE_MANAGER_ROOT = '%s';</script>" % ROOT,
     ] + scripts)
 
@@ -197,6 +198,7 @@ for filename, substitutions in (
         ('$GRDP', json.dumps(strings, sort_keys=True, indent=2)),
     )),
     ('foreground/elements/elements_bundle.html', (
+        ('chrome://resources/polymer/v1_0/', ROOT_POLYMER),
         ('="files_ripple', elements_path('files_ripple')),
         ('="files_toast', elements_path('files_toast')),
         ('="files_toggle_ripple', elements_path('files_toggle_ripple')),
@@ -207,11 +209,11 @@ for filename, substitutions in (
         ("= 'foreground", "= 'test/gen/foreground"),
     )),
     ('foreground/elements/files_quick_view.html', (
+        ('chrome://resources/polymer/v1_0/', ROOT_POLYMER),
         ('="files_icon', elements_path('files_icon')),
         ('="files_metadata', elements_path('files_metadata')),
         ('="files_tooltip', elements_path('files_tooltip')),
         ('="files_quick', elements_path('files_quick')),
-        ('="icons', elements_path('icons')),
         ('webview', 'iframe'),
     )),
     ('foreground/elements/files_safe_media.html', (('webview', 'iframe'),)),
@@ -223,6 +225,9 @@ for filename, substitutions in (
          ('this.webview_.contentWindow.content.type = this.type;'
           'this.webview_.contentWindow.content.src = this.src;')),
     )),
+    ('foreground/elements/icons.html', (
+        ('chrome://resources/polymer/v1_0/', ROOT_POLYMER),
+    )),
     ):
   buf = read(filename)
   for old, new in substitutions: