1 files changed, 69 insertions, 0 deletions
diff --git a/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.cc b/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.cc
new file mode 100644
index 000000000000..384527871162
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_webui_web_ui_data_source_impl.cc
@@ -0,0 +1,69 @@
+--- content/browser/webui/web_ui_data_source_impl.cc.orig	2018-07-19 22:40:51.613006000 +0200
++++ content/browser/webui/web_ui_data_source_impl.cc	2018-07-19 22:47:18.163395000 +0200
+@@ -112,24 +112,24 @@
+ WebUIDataSourceImpl::~WebUIDataSourceImpl() {
+ }
+ 
+-void WebUIDataSourceImpl::AddString(base::StringPiece name,
++void WebUIDataSourceImpl::AddString(const std::string& name,
+                                     const base::string16& value) {
+   // TODO(dschuyler): Share only one copy of these strings.
+   localized_strings_.SetKey(name, base::Value(value));
+-  replacements_[name.as_string()] = base::UTF16ToUTF8(value);
++  replacements_[name] = base::UTF16ToUTF8(value);
+ }
+ 
+-void WebUIDataSourceImpl::AddString(base::StringPiece name,
++void WebUIDataSourceImpl::AddString(const std::string& name,
+                                     const std::string& value) {
+   localized_strings_.SetKey(name, base::Value(value));
+-  replacements_[name.as_string()] = value;
++  replacements_[name] = value;
+ }
+ 
+-void WebUIDataSourceImpl::AddLocalizedString(base::StringPiece name, int ids) {
++void WebUIDataSourceImpl::AddLocalizedString(const std::string& name, int ids) {
+   std::string utf8_str =
+       base::UTF16ToUTF8(GetContentClient()->GetLocalizedString(ids));
+   localized_strings_.SetKey(name, base::Value(utf8_str));
+-  replacements_[name.as_string()] = utf8_str;
++  replacements_[name] = utf8_str;
+ }
+ 
+ void WebUIDataSourceImpl::AddLocalizedStrings(
+@@ -139,7 +139,7 @@
+                                               &replacements_);
+ }
+ 
+-void WebUIDataSourceImpl::AddBoolean(base::StringPiece name, bool value) {
++void WebUIDataSourceImpl::AddBoolean(const std::string& name, bool value) {
+   localized_strings_.SetBoolean(name, value);
+   // TODO(dschuyler): Change name of |localized_strings_| to |load_time_data_|
+   // or similar. These values haven't been found as strings for
+@@ -148,21 +148,21 @@
+   // replacements.
+ }
+ 
+-void WebUIDataSourceImpl::AddInteger(base::StringPiece name, int32_t value) {
++void WebUIDataSourceImpl::AddInteger(const std::string& name, int32_t value) {
+   localized_strings_.SetInteger(name, value);
+ }
+ 
+-void WebUIDataSourceImpl::SetJsonPath(base::StringPiece path) {
++void WebUIDataSourceImpl::SetJsonPath(const std::string& path) {
+   DCHECK(json_path_.empty());
+   DCHECK(!path.empty());
+ 
+-  json_path_ = path.as_string();
++  json_path_ = path;
+   excluded_paths_.insert(json_path_);
+ }
+ 
+-void WebUIDataSourceImpl::AddResourcePath(base::StringPiece path,
++void WebUIDataSourceImpl::AddResourcePath(const std::string &path,
+                                           int resource_id) {
+-  path_to_idr_map_[path.as_string()] = resource_id;
++  path_to_idr_map_[path] = resource_id;
+ }
+ 
+ void WebUIDataSourceImpl::SetDefaultResource(int resource_id) {