Update from chromium a8e7c94b1b79a0948d05a1fcfff53391d22ce37a

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

url_canon_icu.h

diff --git a/url_canon_icu.h b/url_canon_icu.h
index 18b1f09..80d7953 100644
--- a/url_canon_icu.h
+++ b/url_canon_icu.h
@@ -24,11 +24,11 @@
   // 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.

url_canon_stdstring.h

diff --git a/url_canon_stdstring.h b/url_canon_stdstring.h
index 62622b4..c3d8ba1 100644
--- a/url_canon_stdstring.h
+++ b/url_canon_stdstring.h
@@ -36,12 +36,12 @@
 class URL_EXPORT StdStringCanonOutput : public CanonOutput {
  public:
   StdStringCanonOutput(std::string* str);
-  virtual ~StdStringCanonOutput();
+  ~StdStringCanonOutput() override;
 
   // Must be called after writing has completed but before the string is used.
   void Complete();
 
-  virtual void Resize(int sz) override;
+  void Resize(int sz) override;
 
  protected:
   std::string* str_;