Update from chromium a8e7c94b1b79a0948d05a1fcfff53391d22ce37a

url/url_canon_icu.h

Index: url/url_canon_icu.h
diff --git a/url/url_canon_icu.h b/url/url_canon_icu.h
index 18b1f096b67d77131c2b3e01aa41e2a929acb88b..80d795390748fc605ebc9860a8d8b4b82d1a84bb 100644
--- a/url/url_canon_icu.h
+++ b/url/url_canon_icu.h
@@ -24,11 +24,11 @@ class URL_EXPORT ICUCharsetConverter : public CharsetConverter {
   // be managed by the creator such that it is alive as long as this is.
   ICUCharsetConverter(UConverter* converter);
 
-  virtual ~ICUCharsetConverter();
+  ~ICUCharsetConverter() override;
 
-  virtual void ConvertFromUTF16(const base::char16* input,
-                                int input_len,
-                                CanonOutput* output) override;
+  void ConvertFromUTF16(const base::char16* input,
+                        int input_len,
+                        CanonOutput* output) override;
 
  private:
   // The ICU converter, not owned by this class.