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

trunk/src/url/url_canon.h

Index: trunk/src/url/url_canon.h
===================================================================
--- trunk/src/url/url_canon.h	(revision 194154)
+++ trunk/src/url/url_canon.h	(working copy)
@@ -26,16 +26,15 @@
 // 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 <stdlib.h>
 #include <string.h>
+#include <stdlib.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 {
 
@@ -910,4 +909,4 @@
 
 }  // namespace url_canon
 
-#endif  // URL_URL_CANON_H_
+#endif  // GOOGLEURL_SRC_URL_CANON_H__