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

trunk/src/url/url_canon_etc.cc

 // Copyright 2007, 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 13 matching lines @@
 // 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.
 
 // Canonicalizers for random bits that aren't big enough for their own files.
 
 #include <string.h>
 
-#include "url/url_canon.h"
-#include "url/url_canon_internal.h"
+#include "googleurl/src/url_canon.h"
+#include "googleurl/src/url_canon_internal.h"
 
 namespace url_canon {
 
 namespace {
 
 // Returns true if the given character should be removed from the middle of a
 // URL.
 inline bool IsRemovableURLWhitespace(int ch) {
   return ch == '\r' || ch == '\n' || ch == '\t';
 }
@@ skipping 337 matching lines @@
 }
 
 void CanonicalizeRef(const char16* spec,
                      const url_parse::Component& ref,
                      CanonOutput* output,
                      url_parse::Component* out_ref) {
   DoCanonicalizeRef<char16, char16>(spec, ref, output, out_ref);
 }
 
 }  // namespace url_canon