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}

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;

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 {

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 {
 

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;

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 {
 

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

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;
 

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;

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;

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;

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;

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;

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 {
 

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( \

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"

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 {

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;
 

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;

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 {
 

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;
 

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 {
 

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:

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 {
 

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 {
 

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 {

url/url_parse.h

@@ -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_

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...

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 {
 

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...
 //

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 {
 

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 {
 

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"