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

trunk/src/url/url_canon_internal_file.h

 // 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 18 matching lines @@
 
 // As with url_canon_internal.h, this file is intended to be included in
 // another C++ file where the template types are defined. This allows the
 // programmer to use this to use these functions for their own strings
 // types, without bloating the code by having inline templates used in
 // every call site.
 //
 // *** This file must be included after url_canon_internal as we depend on some
 // functions in it. ***
 
-#ifndef URL_URL_CANON_INTERNAL_FILE_H_
-#define URL_URL_CANON_INTERNAL_FILE_H_
+#ifndef GOOGLEURL_SRC_URL_CANON_INTERNAL_FILE_H__
+#define GOOGLEURL_SRC_URL_CANON_INTERNAL_FILE_H__
 
-#include "url/url_file.h"
-#include "url/url_parse_internal.h"
+#include "googleurl/src/url_file.h"
+#include "googleurl/src/url_parse_internal.h"
 
 using namespace url_canon;
 
 // Given a pointer into the spec, this copies and canonicalizes the drive
 // letter and colon to the output, if one is found. If there is not a drive
 // spec, it won't do anything. The index of the next character in the input
 // spec is returned (after the colon when a drive spec is found, the begin
 // offset if one is not).
 template<typename CHAR>
 static int FileDoDriveSpec(const CHAR* spec, int begin, int end,
@@ skipping 93 matching lines @@
 
   // Things following the path we can use the standard canonicalizers for.
   success &= URLCanonInternal<CHAR, UCHAR>::DoQuery(
       source.query, parsed.query, output, &new_parsed->query);
   success &= URLCanonInternal<CHAR, UCHAR>::DoRef(
       source.ref, parsed.ref, output, &new_parsed->ref);
 
   return success;
 }
 
-#endif  // URL_URL_CANON_INTERNAL_FILE_H_
+#endif  // GOOGLEURL_SRC_URL_CANON_INTERNAL_FILE_H__