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

trunk/src/url/url_canon_icu.cc

 // 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 17 matching lines @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // ICU integration functions.
 
 #include <stdlib.h>
 #include <string.h>
 #include <unicode/ucnv.h>
 #include <unicode/ucnv_cb.h>
 #include <unicode/uidna.h>
 
+#include "googleurl/src/url_canon_icu.h"
+#include "googleurl/src/url_canon_internal.h"  // for _itoa_s
+
 #include "base/logging.h"
-#include "url/url_canon_icu.h"
-#include "url/url_canon_internal.h"  // for _itoa_s
 
 namespace url_canon {
 
 namespace {
 
 // Called when converting a character that can not be represented, this will
 // append an escaped version of the numerical character reference for that code
 // point. It is of the form "&#1234;" and we will escape the non-digits to
 // "%26%231234%3B". Why? This is what Netscape did back in the olden days.
 void appendURLEscapedChar(const void* context,
@@ skipping 149 matching lines @@
 
   if (U_IS_UNICODE_CHAR(*code_point))
     return true;
 
   // Invalid code point.
   *code_point = kUnicodeReplacementCharacter;
   return false;
 }
 
 }  // namespace url_canon