url: Changes to make it build standalone.

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 e529fcbd9a8600f7e85432549f864ffe2ff07aaf..9f54f1a95e63966c015f2f577b26ee8882a16b7c 100644
--- a/url/url_canon_icu.h
+++ b/url/url_canon_icu.h
@@ -29,10 +29,11 @@
 
 // ICU integration functions.
 
-#ifndef GOOGLEURL_SRC_URL_CANON_ICU_H__
-#define GOOGLEURL_SRC_URL_CANON_ICU_H__
+#ifndef URL_URL_CANON_ICU_H_
+#define URL_URL_CANON_ICU_H_
 
-#include "googleurl/src/url_canon.h"
+#include "base/compiler_specific.h"
+#include "url/url_canon.h"
 
 typedef struct UConverter UConverter;
 
@@ -51,7 +52,7 @@ class ICUCharsetConverter : public CharsetConverter {
 
   GURL_API virtual void ConvertFromUTF16(const char16* input,
                                          int input_len,
-                                         CanonOutput* output);
+                                         CanonOutput* output) OVERRIDE;
 
  private:
   // The ICU converter, not owned by this class.
@@ -60,4 +61,4 @@ class ICUCharsetConverter : public CharsetConverter {
 
 }  // namespace url_canon
 
-#endif  // GOOGLEURL_SRC_URL_CANON_ICU_H__
+#endif  // URL_URL_CANON_ICU_H_