Componentize URLFixerUpper.

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 "chrome/browser/google/google_util.h"
-#include "chrome/common/net/url_fixer_upper.h"
+#include "components/url_fixer/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 {
 
 net::registry_controlled_domains::PrivateRegistryFilter GetRegistryFilter(
     jboolean include_private) {
@@ skipping 48 matching lines @@
   GURL gurl = GURL(ConvertJavaStringToUTF8(env, url));
   if (gurl.is_empty())
     return false;
   return google_util::IsGoogleHomePageUrl(gurl);
 }
 
 static jstring FixupUrl(JNIEnv* env,
                         jclass clazz,
                         jstring url,
                         jstring desired_tld) {
-  GURL fixed_url = URLFixerUpper::FixupURL(
+  GURL fixed_url = url_fixer::FixupURL(
       base::android::ConvertJavaStringToUTF8(env, url),
       base::android::ConvertJavaStringToUTF8(env, desired_tld));
 
-
   return fixed_url.is_valid() ?
       base::android::ConvertUTF8ToJavaString(env, fixed_url.spec()).Release() :
       NULL;
 }
 
 // Register native methods
 bool RegisterUrlUtilities(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }