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
[email protected]
Review URL: https://codereview.chromium.org/1152373003
Cr-Commit-Position: refs/heads/master@{#331390}
diff --git a/chrome/browser/autocomplete/history_quick_provider.cc b/chrome/browser/autocomplete/history_quick_provider.cc
index 81582ce..f4b4277ae 100644
--- a/chrome/browser/autocomplete/history_quick_provider.cc
+++ b/chrome/browser/autocomplete/history_quick_provider.cc
@@ -41,7 +41,7 @@
#include "net/base/escape.h"
#include "net/base/net_util.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
#include "url/url_util.h"
bool HistoryQuickProvider::disabled_ = false;
diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc
index 4e000f8..93581bf 100644
--- a/chrome/browser/autocomplete/history_url_provider.cc
+++ b/chrome/browser/autocomplete/history_url_provider.cc
@@ -42,7 +42,7 @@
#include "net/base/net_util.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
#include "url/gurl.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
#include "url/url_util.h"
namespace {
diff --git a/chrome/browser/autocomplete/shortcuts_provider.cc b/chrome/browser/autocomplete/shortcuts_provider.cc
index 8ead62e7..443eb72 100644
--- a/chrome/browser/autocomplete/shortcuts_provider.cc
+++ b/chrome/browser/autocomplete/shortcuts_provider.cc
@@ -33,7 +33,7 @@
#include "components/omnibox/omnibox_field_trial.h"
#include "components/omnibox/url_prefix.h"
#include "components/url_fixer/url_fixer.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
namespace {
diff --git a/chrome/browser/prerender/prerender_util.cc b/chrome/browser/prerender/prerender_util.cc
index f779907..45266ee 100644
--- a/chrome/browser/prerender/prerender_util.cc
+++ b/chrome/browser/prerender/prerender_util.cc
@@ -12,8 +12,8 @@
#include "content/public/common/resource_type.h"
#include "net/http/http_response_headers.h"
#include "net/url_request/url_request.h"
+#include "url/third_party/mozilla/url_parse.h"
#include "url/url_canon.h"
-#include "url/url_parse.h"
#include "url/url_util.h"
using content::ResourceType;
diff --git a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
index ba008230..71a03b7 100644
--- a/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
+++ b/chrome/browser/ui/webui/options/chromeos/user_image_source.cc
@@ -15,7 +15,7 @@
#include "net/base/escape.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/codec/png_codec.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
namespace {
diff --git a/chrome/test/perf/url_parse_perftest.cc b/chrome/test/perf/url_parse_perftest.cc
index 76ae046a..34065c12 100644
--- a/chrome/test/perf/url_parse_perftest.cc
+++ b/chrome/test/perf/url_parse_perftest.cc
@@ -5,9 +5,9 @@
#include "base/test/perf_time_logger.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.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"
// TODO(darin): chrome code should not depend on WebCore innards
#if 0
diff --git a/components/omnibox/autocomplete_input.h b/components/omnibox/autocomplete_input.h
index 8aa5235..d4f68f05 100644
--- a/components/omnibox/autocomplete_input.h
+++ b/components/omnibox/autocomplete_input.h
@@ -13,7 +13,7 @@
#include "components/metrics/proto/omnibox_event.pb.h"
#include "components/metrics/proto/omnibox_input_type.pb.h"
#include "url/gurl.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
class AutocompleteSchemeClassifier;
diff --git a/components/omnibox/autocomplete_input_unittest.cc b/components/omnibox/autocomplete_input_unittest.cc
index 7d2eaa4..38f824ba 100644
--- a/components/omnibox/autocomplete_input_unittest.cc
+++ b/components/omnibox/autocomplete_input_unittest.cc
@@ -12,7 +12,7 @@
#include "components/metrics/proto/omnibox_input_type.pb.h"
#include "components/omnibox/test_scheme_classifier.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
using base::ASCIIToUTF16;
using metrics::OmniboxEventProto;
diff --git a/components/password_manager/core/browser/affiliation_utils.h b/components/password_manager/core/browser/affiliation_utils.h
index 0231ce7..a8f13be7 100644
--- a/components/password_manager/core/browser/affiliation_utils.h
+++ b/components/password_manager/core/browser/affiliation_utils.h
@@ -53,7 +53,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "net/base/net_util.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
namespace autofill {
struct PasswordForm;
diff --git a/components/policy/core/browser/url_blacklist_manager.cc b/components/policy/core/browser/url_blacklist_manager.cc
index edffe03..5d85138e 100644
--- a/components/policy/core/browser/url_blacklist_manager.cc
+++ b/components/policy/core/browser/url_blacklist_manager.cc
@@ -19,8 +19,8 @@
#include "components/pref_registry/pref_registry_syncable.h"
#include "net/base/filename_util.h"
#include "net/base/net_errors.h"
+#include "url/third_party/mozilla/url_parse.h"
#include "url/url_constants.h"
-#include "url/url_parse.h"
using url_matcher::URLMatcher;
using url_matcher::URLMatcherCondition;
diff --git a/components/search_engines/template_url.h b/components/search_engines/template_url.h
index cd337d2..393c20f8 100644
--- a/components/search_engines/template_url.h
+++ b/components/search_engines/template_url.h
@@ -18,7 +18,7 @@
#include "components/search_engines/template_url_id.h"
#include "ui/gfx/geometry/size.h"
#include "url/gurl.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
class SearchTermsData;
class TemplateURL;
diff --git a/components/url_fixer/url_fixer.cc b/components/url_fixer/url_fixer.cc
index f10958a..811f1fb 100644
--- a/components/url_fixer/url_fixer.cc
+++ b/components/url_fixer/url_fixer.cc
@@ -18,8 +18,8 @@
#include "net/base/filename_util.h"
#include "net/base/net_util.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+#include "url/third_party/mozilla/url_parse.h"
#include "url/url_file.h"
-#include "url/url_parse.h"
#include "url/url_util.h"
const char* url_fixer::home_directory_override = NULL;
diff --git a/components/url_fixer/url_fixer_unittest.cc b/components/url_fixer/url_fixer_unittest.cc
index 893b75ea..c2b3e26 100644
--- a/components/url_fixer/url_fixer_unittest.cc
+++ b/components/url_fixer/url_fixer_unittest.cc
@@ -15,7 +15,7 @@
#include "net/base/filename_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
namespace url {
diff --git a/google_apis/gaia/fake_gaia.cc b/google_apis/gaia/fake_gaia.cc
index 1bf87ca7..02fccd1c 100644
--- a/google_apis/gaia/fake_gaia.cc
+++ b/google_apis/gaia/fake_gaia.cc
@@ -27,7 +27,7 @@
#include "net/http/http_status_code.h"
#include "net/test/embedded_test_server/http_request.h"
#include "net/test/embedded_test_server/http_response.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
#define REGISTER_RESPONSE_HANDLER(url, method) \
request_handlers_.insert(std::make_pair( \
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index 26868a0..ed5681c 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -45,15 +45,15 @@
#include "base/strings/utf_string_conversions.h"
#include "base/sys_byteorder.h"
#include "base/values.h"
-#include "url/gurl.h"
-#include "url/url_canon.h"
-#include "url/url_canon_ip.h"
-#include "url/url_parse.h"
#include "net/base/dns_util.h"
#include "net/base/net_module.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
#include "net/grit/net_resources.h"
#include "net/http/http_content_disposition.h"
+#include "url/gurl.h"
+#include "url/third_party/mozilla/url_parse.h"
+#include "url/url_canon.h"
+#include "url/url_canon_ip.h"
#if defined(OS_ANDROID)
#include "net/android/network_library.h"
diff --git a/net/base/registry_controlled_domains/registry_controlled_domain.cc b/net/base/registry_controlled_domains/registry_controlled_domain.cc
index e5b8e4cb..778e858a 100644
--- a/net/base/registry_controlled_domains/registry_controlled_domain.cc
+++ b/net/base/registry_controlled_domains/registry_controlled_domain.cc
@@ -51,7 +51,7 @@
#include "net/base/net_module.h"
#include "net/base/net_util.h"
#include "url/gurl.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
namespace net {
namespace registry_controlled_domains {
diff --git a/net/base/url_util.h b/net/base/url_util.h
index 362be873..533c908 100644
--- a/net/base/url_util.h
+++ b/net/base/url_util.h
@@ -9,7 +9,7 @@
#include "base/compiler_specific.h"
#include "net/base/net_export.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
class GURL;
diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc
index 503388a..c3b34d96 100644
--- a/net/proxy/proxy_config_service_android.cc
+++ b/net/proxy/proxy_config_service_android.cc
@@ -23,7 +23,7 @@
#include "jni/ProxyChangeListener_jni.h"
#include "net/base/host_port_pair.h"
#include "net/proxy/proxy_config.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
using base::android::AttachCurrentThread;
using base::android::ConvertUTF8ToJavaString;
diff --git a/net/tools/tld_cleanup/tld_cleanup_util.cc b/net/tools/tld_cleanup/tld_cleanup_util.cc
index 8cf2323f..f4d93ac 100644
--- a/net/tools/tld_cleanup/tld_cleanup_util.cc
+++ b/net/tools/tld_cleanup/tld_cleanup_util.cc
@@ -9,7 +9,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "url/gurl.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
namespace {
diff --git a/ppapi/shared_impl/ppb_url_util_shared.h b/ppapi/shared_impl/ppb_url_util_shared.h
index 3627ac4..907c4b8 100644
--- a/ppapi/shared_impl/ppb_url_util_shared.h
+++ b/ppapi/shared_impl/ppb_url_util_shared.h
@@ -11,7 +11,7 @@
#include "ppapi/c/dev/ppb_url_util_dev.h"
#include "ppapi/c/pp_var.h"
#include "ppapi/shared_impl/ppapi_shared_export.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
class GURL;
diff --git a/remoting/host/setup/oauth_helper.cc b/remoting/host/setup/oauth_helper.cc
index 65f06bc..3ad1b4fc0 100644
--- a/remoting/host/setup/oauth_helper.cc
+++ b/remoting/host/setup/oauth_helper.cc
@@ -7,7 +7,7 @@
#include "base/strings/stringprintf.h"
#include "google_apis/google_api_keys.h"
#include "net/base/escape.h"
-#include "url/url_parse.h"
+#include "url/third_party/mozilla/url_parse.h"
namespace {
diff --git a/url/gurl.h b/url/gurl.h
index c0ad418..bafafd88 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..636be6c2 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"
