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

chrome/android/java/src/org/chromium/chrome/browser/UrlUtilities.java

 // 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.
 
 package org.chromium.chrome.browser;
 
 import android.text.TextUtils;
 
 import org.chromium.base.CollectionUtil;
 import org.chromium.base.Log;
@@ skipping 108 matching lines @@
     /**
      * @param uri A URI.
      *
      * @return Whether the URI's scheme is for a internal chrome page.
      */
     public static boolean isInternalScheme(URI uri) {
         return INTERNAL_SCHEMES.contains(uri.getScheme());
     }
 
     /**
-     * Refer to url_fixer::FixupURL.
+     * Refer to url_formatter::FixupURL.
      *
      * Given a URL-like string, returns a real URL or null. For example:
      *  - "google.com" -> "http://google.com/"
      *  - "about:" -> "chrome://version/"
      *  - "//mail.google.com:/" -> "file:///mail.google.com:/"
      *  - "..." -> null
      */
     public static String fixupUrl(String uri) {
         if (TextUtils.isEmpty(uri)) return null;
         return nativeFixupUrl(uri, null);
@@ skipping 235 matching lines @@
     }
 
     private static native boolean nativeSameDomainOrHost(String primaryUrl, String secondaryUrl,
             boolean includePrivateRegistries);
     private static native String nativeGetDomainAndRegistry(String url,
             boolean includePrivateRegistries);
     public static native boolean nativeIsGoogleSearchUrl(String url);
     public static native boolean nativeIsGoogleHomePageUrl(String url);
     private static native String nativeFixupUrl(String url, String desiredTld);
 }