Revved to chromium c06ba3f6d7a67bc04ae2f6c041c22a86bdcf372a refs/remotes/origin/HEAD

url_canon_icu.h

diff --git a/url_canon_icu.h b/url_canon_icu.h
index c963289..18b1f09 100644
--- a/url_canon_icu.h
+++ b/url_canon_icu.h
@@ -28,7 +28,7 @@
 
   virtual void ConvertFromUTF16(const base::char16* input,
                                 int input_len,
-                                CanonOutput* output) OVERRIDE;
+                                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 e859fe2..62622b4 100644
--- a/url_canon_stdstring.h
+++ b/url_canon_stdstring.h
@@ -41,7 +41,7 @@
   // Must be called after writing has completed but before the string is used.
   void Complete();
 
-  virtual void Resize(int sz) OVERRIDE;
+  virtual void Resize(int sz) override;
 
  protected:
   std::string* str_;