url: Fix the TODO in url_parse.h header.

this removes url/url_parse.h header, since it was just a pass through
for url/third_party/mozilla/url_parse.h, and update the call sites.

BUG=None
R=brettw@chromium.org

Review URL: https://codereview.chromium.org/1152373003

Cr-Commit-Position: refs/heads/master@{#331390}

11 files changed, 11 insertions, 22 deletions

diff --git a/url/gurl.h b/url/gurl.h
index c0ad418..bafafd8 100644
--- a/url/gurl.h
+++ b/url/gurl.h
@@ -10,11 +10,11 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
+#include "url/third_party/mozilla/url_parse.h"
 #include "url/url_canon.h"
 #include "url/url_canon_stdstring.h"
 #include "url/url_constants.h"
 #include "url/url_export.h"
-#include "url/url_parse.h"
 
 class URL_EXPORT GURL {
  public:
diff --git a/url/url_canon.h b/url/url_canon.h
index 432f291..832a957 100644
--- a/url/url_canon.h
+++ b/url/url_canon.h
@@ -9,8 +9,8 @@
 #include <string.h>
 
 #include "base/strings/string16.h"
+#include "url/third_party/mozilla/url_parse.h"
 #include "url/url_export.h"
-#include "url/url_parse.h"
 
 namespace url {
 
diff --git a/url/url_canon_ip.h b/url/url_canon_ip.h
index 19ecfdb..bc581f1 100644
--- a/url/url_canon_ip.h
+++ b/url/url_canon_ip.h
@@ -6,9 +6,9 @@
 #define URL_URL_CANON_IP_H_
 
 #include "base/strings/string16.h"
+#include "url/third_party/mozilla/url_parse.h"
 #include "url/url_canon.h"
 #include "url/url_export.h"
-#include "url/url_parse.h"
 
 namespace url {
 
diff --git a/url/url_canon_unittest.cc b/url/url_canon_unittest.cc
index 3ab8710..67cced2 100644
--- a/url/url_canon_unittest.cc
+++ b/url/url_canon_unittest.cc
@@ -6,10 +6,10 @@
 
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/third_party/mozilla/url_parse.h"
 #include "url/url_canon.h"
 #include "url/url_canon_internal.h"
 #include "url/url_canon_stdstring.h"
-#include "url/url_parse.h"
 #include "url/url_test_utils.h"
 
 namespace url {
diff --git a/url/url_parse.h b/url/url_parse.h
deleted file mode 100644
index 3b9c546..0000000
--- a/url/url_parse.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef URL_URL_PARSE_H_
-#define URL_URL_PARSE_H_
-
-// TODO(tfarina): Remove this file when the callers are updated.
-#include "url/third_party/mozilla/url_parse.h"
-
-#endif  // URL_URL_PARSE_H_
diff --git a/url/url_parse_file.cc b/url/url_parse_file.cc
index c08ddc6..fcbb12d 100644
--- a/url/url_parse_file.cc
+++ b/url/url_parse_file.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
+#include "url/third_party/mozilla/url_parse.h"
 #include "url/url_file.h"
-#include "url/url_parse.h"
 #include "url/url_parse_internal.h"
 
 // Interesting IE file:isms...
diff --git a/url/url_parse_internal.h b/url/url_parse_internal.h
index 4070b7e..f1e0960 100644
--- a/url/url_parse_internal.h
+++ b/url/url_parse_internal.h
@@ -7,7 +7,7 @@
 
 // Contains common inline helper functions used by the URL parsing routines.
 
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
 
 namespace url {
 
diff --git a/url/url_parse_unittest.cc b/url/url_parse_unittest.cc
index 71b2438..636be6c 100644
--- a/url/url_parse_unittest.cc
+++ b/url/url_parse_unittest.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
 
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
 
 // Interesting IE file:isms...
 //
diff --git a/url/url_util.h b/url/url_util.h
index a700286..bf05e87 100644
--- a/url/url_util.h
+++ b/url/url_util.h
@@ -8,10 +8,10 @@
 #include <string>
 
 #include "base/strings/string16.h"
+#include "url/third_party/mozilla/url_parse.h"
 #include "url/url_canon.h"
 #include "url/url_constants.h"
 #include "url/url_export.h"
-#include "url/url_parse.h"
 
 namespace url {
 
diff --git a/url/url_util_internal.h b/url/url_util_internal.h
index c72598f..756c736 100644
--- a/url/url_util_internal.h
+++ b/url/url_util_internal.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/strings/string16.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
 
 namespace url {
 
diff --git a/url/url_util_unittest.cc b/url/url_util_unittest.cc
index 73ff93b8..aa08b9d 100644
--- a/url/url_util_unittest.cc
+++ b/url/url_util_unittest.cc
@@ -4,9 +4,9 @@
 
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/third_party/mozilla/url_parse.h"
 #include "url/url_canon.h"
 #include "url/url_canon_stdstring.h"
-#include "url/url_parse.h"
 #include "url/url_test_utils.h"
 #include "url/url_util.h"