Fix JS compilation breakage related to PromiseResolver.

Review URL: https://codereview.chromium.org/1763893002

Cr-Commit-Position: refs/heads/master@{#379143}

21 files changed, 34 insertions, 1 deletions

diff --git a/chrome/browser/resources/bookmark_manager/js/compiled_resources.gyp b/chrome/browser/resources/bookmark_manager/js/compiled_resources.gyp
index 2a9872b..3233437 100644
--- a/chrome/browser/resources/bookmark_manager/js/compiled_resources.gyp
+++ b/chrome/browser/resources/bookmark_manager/js/compiled_resources.gyp
@@ -31,6 +31,7 @@
           '../../../../../ui/webui/resources/js/event_tracker.js',
           '../../../../../ui/webui/resources/js/compiled_resources.gyp:i18n_template_no_process',
           '../../../../../ui/webui/resources/js/load_time_data.js',
+          '../../../../../ui/webui/resources/js/promise_resolver.js',
           '../../../../../ui/webui/resources/js/util.js',
           '../../../../../chrome/browser/resources/bookmark_manager/js/bmm.js',
           '../../../../../chrome/browser/resources/bookmark_manager/js/bmm/bookmark_list.js',
diff --git a/chrome/browser/resources/extensions/compiled_resources.gyp b/chrome/browser/resources/extensions/compiled_resources.gyp
index 7779b4e..b5730d7 100644
--- a/chrome/browser/resources/extensions/compiled_resources.gyp
+++ b/chrome/browser/resources/extensions/compiled_resources.gyp
@@ -28,6 +28,7 @@
           '../../../../ui/webui/resources/js/cr/ui/overlay.js',
           '../../../../ui/webui/resources/js/event_tracker.js',
           '../../../../ui/webui/resources/js/load_time_data.js',
+          '../../../../ui/webui/resources/js/promise_resolver.js',
           '../../../../ui/webui/resources/js/util.js',
           'focus_row.js',
         ],
diff --git a/chrome/browser/resources/help/compiled_resources.gyp b/chrome/browser/resources/help/compiled_resources.gyp
index 53f39ed..1f1c0e7 100644
--- a/chrome/browser/resources/help/compiled_resources.gyp
+++ b/chrome/browser/resources/help/compiled_resources.gyp
@@ -19,6 +19,7 @@
           '../../../../ui/webui/resources/js/cr/ui/page_manager/page.js',
           '../../../../ui/webui/resources/js/cr/ui/page_manager/page_manager.js',
           '../../../../ui/webui/resources/js/event_tracker.js',
+          '../../../../ui/webui/resources/js/promise_resolver.js',
           '../../../../ui/webui/resources/js/util.js',
           '../../../../chrome/browser/resources/help/channel_change_page.js',
           '../../../../chrome/browser/resources/help/help_page.js',
diff --git a/chrome/browser/resources/history/compiled_resources.gyp b/chrome/browser/resources/history/compiled_resources.gyp
index 0ed4fb8..c52cd76 100644
--- a/chrome/browser/resources/history/compiled_resources.gyp
+++ b/chrome/browser/resources/history/compiled_resources.gyp
@@ -24,6 +24,7 @@
           '../../../../ui/webui/resources/js/cr/ui/position_util.js',
           '../../../../ui/webui/resources/js/event_tracker.js',
           '../../../../ui/webui/resources/js/compiled_resources.gyp:load_time_data',
+          '../../../../ui/webui/resources/js/promise_resolver.js',
           '../../../../ui/webui/resources/js/util.js',
           'history_focus_manager.js',
         ],
diff --git a/chrome/browser/resources/md_downloads/compiled_resources.gyp b/chrome/browser/resources/md_downloads/compiled_resources.gyp
index 6c27098..9aa47ef 100644
--- a/chrome/browser/resources/md_downloads/compiled_resources.gyp
+++ b/chrome/browser/resources/md_downloads/compiled_resources.gyp
@@ -15,6 +15,7 @@
           '../../../../ui/webui/resources/js/event_tracker.js',
           '../../../../ui/webui/resources/js/cr/ui.js',
           '../../../../ui/webui/resources/js/cr/ui/command.js',
+          '../../../../ui/webui/resources/js/promise_resolver.js',
           '../../../../ui/webui/resources/js/util.js',
           '../../../../third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior/iron-a11y-keys-behavior-extracted.js',
           '../../../../third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-button-state-extracted.js',
diff --git a/chrome/browser/resources/md_extensions/compiled_resources.gyp b/chrome/browser/resources/md_extensions/compiled_resources.gyp
index 868cae3..7f1c769 100644
--- a/chrome/browser/resources/md_extensions/compiled_resources.gyp
+++ b/chrome/browser/resources/md_extensions/compiled_resources.gyp
@@ -12,6 +12,7 @@
           '../../../../ui/webui/resources/js/compiled_resources.gyp:load_time_data',
           '../../../../ui/webui/resources/js/cr.js',
           '../../../../ui/webui/resources/js/i18n_behavior.js',
+          '../../../../ui/webui/resources/js/promise_resolver.js',
           'item.js',
           'item_list.js',
           'manager.js',
diff --git a/chrome/browser/resources/md_history/compiled_resources.gyp b/chrome/browser/resources/md_history/compiled_resources.gyp
index 7160a59..9bb654e 100644
--- a/chrome/browser/resources/md_history/compiled_resources.gyp
+++ b/chrome/browser/resources/md_history/compiled_resources.gyp
@@ -18,6 +18,7 @@
           '../../../../ui/webui/resources/js/cr.js',
           '../../../../ui/webui/resources/js/cr/ui/position_util.js',
           '../../../../ui/webui/resources/js/load_time_data.js',
+          '../../../../ui/webui/resources/js/promise_resolver.js',
           '../../../../ui/webui/resources/js/util.js',
           'history.js',
           'history_item.js',
diff --git a/chrome/browser/resources/media_router/compiled_resources.gyp b/chrome/browser/resources/media_router/compiled_resources.gyp
index 5b7abe5..7d3ece1 100644
--- a/chrome/browser/resources/media_router/compiled_resources.gyp
+++ b/chrome/browser/resources/media_router/compiled_resources.gyp
@@ -34,6 +34,7 @@
           '../../../../third_party/polymer/v1_0/components-chromium/paper-toolbar/paper-toolbar-extracted.js',
           '../../../../ui/webui/resources/js/cr.js',
           '../../../../ui/webui/resources/js/compiled_resources.gyp:load_time_data',
+          '../../../../ui/webui/resources/js/promise_resolver.js',
           '../../../../ui/webui/resources/js/util.js',
           'media_router.js',
           'media_router_data.js',
diff --git a/chrome/browser/resources/ntp4/compiled_resources.gyp b/chrome/browser/resources/ntp4/compiled_resources.gyp
index 8b2b37c..4f9b08e 100644
--- a/chrome/browser/resources/ntp4/compiled_resources.gyp
+++ b/chrome/browser/resources/ntp4/compiled_resources.gyp
@@ -13,8 +13,8 @@
           '../../../../ui/webui/resources/js/event_tracker.js',
           '../../../../ui/webui/resources/js/load_time_data.js',
           '../../../../ui/webui/resources/js/parse_html_subset.js',
+          '../../../../ui/webui/resources/js/promise_resolver.js',
           '../../../../ui/webui/resources/js/util.js',
-          '../../../../ui/webui/resources/js/cr.js',
           '../../../../ui/webui/resources/js/cr/event_target.js',
           '../../../../ui/webui/resources/js/cr/ui.js',
           '../../../../ui/webui/resources/js/cr/ui/bubble.js',
diff --git a/chrome/browser/resources/options/compiled_resources.gyp b/chrome/browser/resources/options/compiled_resources.gyp
index 242ff67..ba84fb7 100644
--- a/chrome/browser/resources/options/compiled_resources.gyp
+++ b/chrome/browser/resources/options/compiled_resources.gyp
@@ -39,6 +39,7 @@
           '../../../../ui/webui/resources/js/event_tracker.js',
           '../../../../ui/webui/resources/js/load_time_data.js',
           '../../../../ui/webui/resources/js/parse_html_subset.js',
+          '../../../../ui/webui/resources/js/promise_resolver.js',
           '../../../../ui/webui/resources/js/util.js',
           '../../../../chrome/browser/resources/chromeos/keyboard/keyboard_utils.js',
         ],
diff --git a/chrome/browser/resources/print_preview/compiled_resources.gyp b/chrome/browser/resources/print_preview/compiled_resources.gyp
index f54c04c..2f05765 100644
--- a/chrome/browser/resources/print_preview/compiled_resources.gyp
+++ b/chrome/browser/resources/print_preview/compiled_resources.gyp
@@ -14,6 +14,7 @@
           '../../../../ui/webui/resources/js/cr/ui/focus_outline_manager.js',
           '../../../../ui/webui/resources/js/event_tracker.js',
           '../../../../ui/webui/resources/js/load_time_data.js',
+          '../../../../ui/webui/resources/js/promise_resolver.js',
           '../../../../ui/webui/resources/js/util.js',
         ],
         'externs': ['<(EXTERNS_DIR)/chrome_send.js'],
diff --git a/chrome/browser/resources/settings/appearance_page/compiled_resources.gyp b/chrome/browser/resources/settings/appearance_page/compiled_resources.gyp
index ee686a5..5e8fff6 100644
--- a/chrome/browser/resources/settings/appearance_page/compiled_resources.gyp
+++ b/chrome/browser/resources/settings/appearance_page/compiled_resources.gyp
@@ -12,6 +12,7 @@
           '../../../../../ui/webui/resources/js/compiled_resources.gyp:cr',
           '../../../../../ui/webui/resources/js/cr.js',
           '../../../../../ui/webui/resources/js/i18n_behavior.js',
+          '../../../../../ui/webui/resources/js/promise_resolver.js',
           '../../../../../third_party/polymer/v1_0/components-chromium/iron-a11y-keys-behavior/iron-a11y-keys-behavior-extracted.js',
           '../../../../../third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-button-state-extracted.js',
           '../../../../../third_party/polymer/v1_0/components-chromium/iron-behaviors/iron-control-state-extracted.js',
@@ -40,6 +41,7 @@
           '../../../../../ui/webui/resources/js/compiled_resources.gyp:load_time_data',
           '../../../../../ui/webui/resources/js/cr.js',
           '../../../../../ui/webui/resources/js/i18n_behavior.js',
+          '../../../../../ui/webui/resources/js/promise_resolver.js',
           '../controls/pref_control_behavior.js',
           '../controls/settings_dropdown_menu.js',
           '../prefs/pref_util.js',
diff --git a/chrome/browser/resources/uber/compiled_resources.gyp b/chrome/browser/resources/uber/compiled_resources.gyp
index 87b8274..e21a6e6 100644
--- a/chrome/browser/resources/uber/compiled_resources.gyp
+++ b/chrome/browser/resources/uber/compiled_resources.gyp
@@ -9,6 +9,7 @@
         'depends': [
           '../../../../ui/webui/resources/js/cr.js',
           '../../../../ui/webui/resources/js/compiled_resources.gyp:load_time_data',
+          '../../../../ui/webui/resources/js/promise_resolver.js',
           '../../../../ui/webui/resources/js/util.js',
         ],
         'externs': ['<(EXTERNS_DIR)/chrome_send.js'],
@@ -21,6 +22,7 @@
         'depends': [
           '../../../../ui/webui/resources/js/cr.js',
           '../../../../ui/webui/resources/js/compiled_resources.gyp:load_time_data',
+          '../../../../ui/webui/resources/js/promise_resolver.js',
           '../../../../ui/webui/resources/js/util.js',
           'uber_utils.js',
         ],
diff --git a/ui/file_manager/audio_player/js/compiled_resources.gyp b/ui/file_manager/audio_player/js/compiled_resources.gyp
index fc90f0b..98f6fa3 100644
--- a/ui/file_manager/audio_player/js/compiled_resources.gyp
+++ b/ui/file_manager/audio_player/js/compiled_resources.gyp
@@ -15,6 +15,7 @@
           # Referenced in common/js/util.js.
           '../../../webui/resources/js/cr/ui/dialogs.js',
           '../../../webui/resources/js/load_time_data.js',
+          '../../../webui/resources/js/promise_resolver.js',
           '../../../webui/resources/js/util.js',
           '../../file_manager/common/js/util.js',
           '../../file_manager/common/js/async_util.js',
@@ -66,6 +67,7 @@
           '../../../webui/resources/js/cr/ui/array_data_model.js',
           '../../../webui/resources/js/cr/ui/dialogs.js',
           '../../../webui/resources/js/load_time_data.js',
+          '../../../webui/resources/js/promise_resolver.js',
           '../../../webui/resources/js/util.js',
           '../../file_manager/common/js/async_util.js',
           '../../file_manager/common/js/file_type.js',
diff --git a/ui/file_manager/file_manager/background/js/compiled_resources.gyp b/ui/file_manager/file_manager/background/js/compiled_resources.gyp
index f1b735f..8232bc9 100644
--- a/ui/file_manager/file_manager/background/js/compiled_resources.gyp
+++ b/ui/file_manager/file_manager/background/js/compiled_resources.gyp
@@ -11,6 +11,7 @@
           '../../../../webui/resources/js/load_time_data.js',
           '../../../../webui/resources/js/cr.js',
           '../../../../webui/resources/js/cr/ui.js',
+          '../../../../webui/resources/js/promise_resolver.js',
           '../../../../webui/resources/js/util.js',
           '../../../../webui/resources/js/cr/event_target.js',
           '../../../../webui/resources/js/cr/ui/array_data_model.js',
diff --git a/ui/file_manager/file_manager/foreground/js/compiled_resources.gyp b/ui/file_manager/file_manager/foreground/js/compiled_resources.gyp
index c4f6c4b..36d5f54 100644
--- a/ui/file_manager/file_manager/foreground/js/compiled_resources.gyp
+++ b/ui/file_manager/file_manager/foreground/js/compiled_resources.gyp
@@ -11,6 +11,7 @@
           '../../../../../third_party/jstemplate/compiled_resources.gyp:jstemplate',
           '../../../../../ui/webui/resources/js/load_time_data.js',
           '../../../../../ui/webui/resources/js/cr.js',
+          '../../../../../ui/webui/resources/js/promise_resolver.js',
           '../../../../../ui/webui/resources/js/util.js',
           '../../../../../ui/webui/resources/js/compiled_resources.gyp:i18n_template_no_process',
           '../../../../../ui/webui/resources/js/event_tracker.js',
diff --git a/ui/file_manager/gallery/js/compiled_resources.gyp b/ui/file_manager/gallery/js/compiled_resources.gyp
index 781e4dd..45747b5 100644
--- a/ui/file_manager/gallery/js/compiled_resources.gyp
+++ b/ui/file_manager/gallery/js/compiled_resources.gyp
@@ -14,6 +14,7 @@
           '../../../webui/resources/js/cr/ui/array_data_model.js',
           '../../../webui/resources/js/cr/ui/dialogs.js',
           '../../../webui/resources/js/load_time_data.js',
+          '../../../webui/resources/js/promise_resolver.js',
           '../../../webui/resources/js/util.js',
           '../../file_manager/common/js/util.js',
           '../../file_manager/common/js/async_util.js',
@@ -64,6 +65,7 @@
           '../../../../third_party/polymer/v1_0/components-chromium/paper-input/paper-input-extracted.js',
           '../../../../third_party/polymer/v1_0/components-chromium/paper-progress/paper-progress-extracted.js',
           '../../../../third_party/polymer/v1_0/components-chromium/paper-ripple/paper-ripple-extracted.js',
+          '../../../webui/resources/js/promise_resolver.js',
           '../../../webui/resources/js/util.js',
           '../../../webui/resources/js/event_tracker.js',
           '../../../webui/resources/js/load_time_data.js',
diff --git a/ui/file_manager/video_player/js/compiled_resources.gyp b/ui/file_manager/video_player/js/compiled_resources.gyp
index 5123864..749d44b 100644
--- a/ui/file_manager/video_player/js/compiled_resources.gyp
+++ b/ui/file_manager/video_player/js/compiled_resources.gyp
@@ -14,6 +14,7 @@
           '../../../webui/resources/js/cr/ui/array_data_model.js',
           # Referenced in common/js/util.js.
           '../../../webui/resources/js/cr/ui/dialogs.js',
+          '../../../webui/resources/js/promise_resolver.js',
           '../../../webui/resources/js/load_time_data.js',
           '../../../webui/resources/js/util.js',
           '../../file_manager/common/js/util.js',
@@ -66,6 +67,7 @@
           '../../../webui/resources/js/cr.js',
           '../../../webui/resources/js/load_time_data.js',
           '../../../webui/resources/js/event_tracker.js',
+          '../../../webui/resources/js/promise_resolver.js',
           '../../../webui/resources/js/util.js',
           '../../../webui/resources/js/cr/ui.js',
           '../../../webui/resources/js/cr/event_target.js',
diff --git a/ui/webui/resources/js/compiled_resources.gyp b/ui/webui/resources/js/compiled_resources.gyp
index 6646ce1..28d0d45 100644
--- a/ui/webui/resources/js/compiled_resources.gyp
+++ b/ui/webui/resources/js/compiled_resources.gyp
@@ -10,6 +10,7 @@
     {
       'target_name': 'cr',
       'variables': {
+        'depends': ['compiled_resources.gyp:promise_resolver'],
         'externs': ['../../../../third_party/closure_compiler/externs/chrome_send.js'],
       },
       'includes': ['../../../../third_party/closure_compiler/compile_js.gypi'],
@@ -43,6 +44,10 @@
       'includes': ['../../../../third_party/closure_compiler/compile_js.gypi'],
     },
     {
+      'target_name': 'promise_resolver',
+      'includes': ['../../../../third_party/closure_compiler/compile_js.gypi'],
+    },
+    {
       'target_name': 'i18n_template_no_process',
       'variables': {
         'depends': ['compiled_resources.gyp:load_time_data'],
diff --git a/ui/webui/resources/js/compiled_resources2.gyp b/ui/webui/resources/js/compiled_resources2.gyp
index 4f35014..5f0d811 100644
--- a/ui/webui/resources/js/compiled_resources2.gyp
+++ b/ui/webui/resources/js/compiled_resources2.gyp
@@ -14,6 +14,7 @@
     {
       'target_name': 'cr',
       'dependencies': [
+        'promise_resolver',
         '<(EXTERNS_GYP):chrome_send',
         'assert',
       ],
@@ -41,6 +42,10 @@
       'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
     },
     {
+      'target_name': 'promise_resolver',
+      'includes': ['../../../../third_party/closure_compiler/compile_js2.gypi'],
+    },
+    {
       'target_name': 'i18n_template_no_process',
       'dependencies': [
         'load_time_data',
diff --git a/ui/webui/resources/js/cr/ui/compiled_resources.gyp b/ui/webui/resources/js/cr/ui/compiled_resources.gyp
index 1d4cde6..8f06cd1 100644
--- a/ui/webui/resources/js/cr/ui/compiled_resources.gyp
+++ b/ui/webui/resources/js/cr/ui/compiled_resources.gyp
@@ -18,6 +18,7 @@
       'variables': {
         'depends': [
           '../../cr.js',
+          '../../promise_resolver.js',
           '../../util.js',
         ],
         'externs': [