Update from https://crrev.com/309415

url/url_canon.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef URL_URL_CANON_H_
 #define URL_URL_CANON_H_
 
 #include <stdlib.h>
 #include <string.h>
 
@@ skipping 136 matching lines @@
  public:
   RawCanonOutputT() : CanonOutputT<T>() {
     this->buffer_ = fixed_buffer_;
     this->buffer_len_ = fixed_capacity;
   }
   virtual ~RawCanonOutputT() {
     if (this->buffer_ != fixed_buffer_)
       delete[] this->buffer_;
   }
 
-  virtual void Resize(int sz) {
+  void Resize(int sz) override {
     T* new_buf = new T[sz];
     memcpy(new_buf, this->buffer_,
            sizeof(T) * (this->cur_len_ < sz ? this->cur_len_ : sz));
     if (this->buffer_ != fixed_buffer_)
       delete[] this->buffer_;
     this->buffer_ = new_buf;
     this->buffer_len_ = sz;
   }
 
  protected:
@@ skipping 715 matching lines @@
                                    bool base_is_file,
                                    const base::char16* relative_url,
                                    const Component& relative_component,
                                    CharsetConverter* query_converter,
                                    CanonOutput* output,
                                    Parsed* out_parsed);
 
 }  // namespace url
 
 #endif  // URL_URL_CANON_H_