BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 12 insertions, 11 deletions

diff --git a/chromium/ui/base/webui/jstemplate_builder.h b/chromium/ui/base/webui/jstemplate_builder.h
index 5b1c1170690..97a4a558a2d 100644
--- a/chromium/ui/base/webui/jstemplate_builder.h
+++ b/chromium/ui/base/webui/jstemplate_builder.h
@@ -15,8 +15,8 @@
 
 #include <string>
 
+#include "base/component_export.h"
 #include "base/strings/string_piece.h"
-#include "ui/base/ui_base_export.h"
 
 namespace base {
 class DictionaryValue;
@@ -27,22 +27,23 @@ namespace webui {
 // A helper function that generates a string of HTML to be loaded.  The
 // string includes the HTML and the javascript code necessary to generate the
 // full page with support for i18n Templates.
-UI_BASE_EXPORT std::string GetI18nTemplateHtml(
-    const base::StringPiece& html_template,
-    const base::DictionaryValue* json);
+COMPONENT_EXPORT(UI_BASE)
+std::string GetI18nTemplateHtml(const base::StringPiece& html_template,
+                                const base::DictionaryValue* json);
 
 // A helper function that generates a string of HTML to be loaded.  The
 // string includes the HTML and the javascript code necessary to generate the
 // full page with support for both i18n Templates and JsTemplates.
-UI_BASE_EXPORT std::string GetTemplatesHtml(
-    const base::StringPiece& html_template,
-    const base::DictionaryValue* json,
-    const base::StringPiece& template_id);
+COMPONENT_EXPORT(UI_BASE)
+std::string GetTemplatesHtml(const base::StringPiece& html_template,
+                             const base::DictionaryValue* json,
+                             const base::StringPiece& template_id);
 
 // Assigns the given json data into |loadTimeData|, without a <script> tag.
-UI_BASE_EXPORT void AppendJsonJS(const base::DictionaryValue* json,
-                                 std::string* output,
-                                 bool from_js_module);
+COMPONENT_EXPORT(UI_BASE)
+void AppendJsonJS(const base::DictionaryValue* json,
+                  std::string* output,
+                  bool from_js_module);
 
 }  // namespace webui