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

trunk/src/url/url_canon.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
 // copyright notice, this list of conditions and the following disclaimer
 // in the documentation and/or other materials provided with the
 // distribution.
 //     * Neither the name of Google Inc. nor the names of its
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 // 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.
+#ifndef GOOGLEURL_SRC_URL_CANON_H__
+#define GOOGLEURL_SRC_URL_CANON_H__
 
-#ifndef URL_URL_CANON_H_
-#define URL_URL_CANON_H_
-
+#include <string.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "base/string16.h"
-#include "url/url_common.h"
-#include "url/url_parse.h"
+#include "googleurl/src/url_common.h"
+#include "googleurl/src/url_parse.h"
 
 namespace url_canon {
 
 // Canonicalizer output -------------------------------------------------------
 
 // Base class for the canonicalizer output, this maintains a buffer and
 // supports simple resizing and append operations on it.
 //
 // It is VERY IMPORTANT that no virtual function calls be made on the common
 // code path. We only have two virtual function calls, the destructor and a
@@ skipping 854 matching lines @@
                                  const url_parse::Parsed& base_parsed,
                                  bool base_is_file,
                                  const char16* relative_url,
                                  const url_parse::Component& relative_component,
                                  CharsetConverter* query_converter,
                                  CanonOutput* output,
                                  url_parse::Parsed* out_parsed);
 
 }  // namespace url_canon
 
-#endif  // URL_URL_CANON_H_
+#endif  // GOOGLEURL_SRC_URL_CANON_H__