| Index: chrome/browser/android/url_utilities.cc
|
| diff --git a/chrome/browser/android/url_utilities.cc b/chrome/browser/android/url_utilities.cc
|
| index 5acd960351c1048dbe62c334de56c6da4cac8ae1..85c04b92a0d5a90ce248719f0b8f52d26d0b596e 100644
|
| --- a/chrome/browser/android/url_utilities.cc
|
| +++ b/chrome/browser/android/url_utilities.cc
|
| @@ -5,6 +5,7 @@
|
| #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 "jni/UrlUtilities_jni.h"
|
| #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
|
| #include "url/gurl.h"
|
| @@ -69,6 +70,18 @@ static jboolean IsGoogleHomePageUrl(JNIEnv* env, jclass clazz, jstring url) {
|
| return google_util::IsGoogleHomePageUrl(gurl);
|
| }
|
|
|
| +static jstring FixupUrl(JNIEnv* env,
|
| + jclass clazz,
|
| + jstring url,
|
| + jstring desired_tld) {
|
| + GURL fixed_url = URLFixerUpper::FixupURL(
|
| + base::android::ConvertJavaStringToUTF8(env, url),
|
| + base::android::ConvertJavaStringToUTF8(env, desired_tld));
|
| +
|
| + return base::android::ConvertUTF8ToJavaString(env, fixed_url.spec())
|
| + .Release();
|
| +}
|
| +
|
| // Register native methods
|
| bool RegisterUrlUtilities(JNIEnv* env) {
|
| return RegisterNativesImpl(env);
|
|
|