Revert 193777 "url: Changes to make it build standalone."

trunk/src/url/url_canon_icu.h

 // Copyright 2011, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 11 matching lines @@
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // ICU integration functions.
 
-#ifndef URL_URL_CANON_ICU_H_
-#define URL_URL_CANON_ICU_H_
+#ifndef GOOGLEURL_SRC_URL_CANON_ICU_H__
+#define GOOGLEURL_SRC_URL_CANON_ICU_H__
 
-#include "base/compiler_specific.h"
-#include "url/url_canon.h"
+#include "googleurl/src/url_canon.h"
 
 typedef struct UConverter UConverter;
 
 namespace url_canon {
 
 // An implementation of CharsetConverter that implementations can use to
 // interface the canonicalizer with ICU's conversion routines.
 class ICUCharsetConverter : public CharsetConverter {
  public:
   // Constructs a converter using an already-existing ICU character set
   // converter. This converter is NOT owned by this object; the lifetime must
   // be managed by the creator such that it is alive as long as this is.
   GURL_API ICUCharsetConverter(UConverter* converter);
 
   GURL_API virtual ~ICUCharsetConverter();
 
   GURL_API virtual void ConvertFromUTF16(const char16* input,
                                          int input_len,
-                                         CanonOutput* output) OVERRIDE;
+                                         CanonOutput* output);
 
  private:
   // The ICU converter, not owned by this class.
   UConverter* converter_;
 };
 
 }  // namespace url_canon
 
-#endif  // URL_URL_CANON_ICU_H_
+#endif  // GOOGLEURL_SRC_URL_CANON_ICU_H__