Move net::FormatUrl and friends outside of //net and into //components

chrome/browser/android/url_utilities.cc

 // 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.
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "components/google/core/browser/google_util.h"
-#include "components/url_fixer/url_fixer.h"
+#include "components/url_formatter/url_fixer.h"
 #include "jni/UrlUtilities_jni.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/gurl.h"
 
 using base::android::ConvertJavaStringToUTF8;
 
 namespace {
 
 GURL ConvertJavaStringToGURL(JNIEnv*env, jstring url) {
   return url ? GURL(ConvertJavaStringToUTF8(env, url)) : GURL();
@@ skipping 54 matching lines @@
   if (gurl.is_empty())
     return false;
   return google_util::IsGoogleHomePageUrl(gurl);
 }
 
 static jstring FixupUrl(JNIEnv* env,
                         jclass clazz,
                         jstring url,
                         jstring optional_desired_tld) {
   DCHECK(url);
-  GURL fixed_url = url_fixer::FixupURL(
+  GURL fixed_url = url_formatter::FixupURL(
       base::android::ConvertJavaStringToUTF8(env, url),
       optional_desired_tld
           ? base::android::ConvertJavaStringToUTF8(env, optional_desired_tld)
           : std::string());
 
   return fixed_url.is_valid() ?
       base::android::ConvertUTF8ToJavaString(env, fixed_url.spec()).Release() :
       nullptr;
 }
 
 // Register native methods
 bool RegisterUrlUtilities(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }