Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5490)

Unified Diff: chrome/browser/android/url_utilities.cc

Issue 320253004: Componentize URLFixerUpper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Win64 fix Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/android/tab_android.cc ('k') | chrome/browser/autocomplete/autocomplete_input.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/url_utilities.cc
diff --git a/chrome/browser/android/url_utilities.cc b/chrome/browser/android/url_utilities.cc
index 51a67db01ce82397479f131b51b85273141a7e05..364b0ccdf0113b8ffe8ce317d0bdacb5753fd10b 100644
--- a/chrome/browser/android/url_utilities.cc
+++ b/chrome/browser/android/url_utilities.cc
@@ -5,7 +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 "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"
@@ -74,11 +74,10 @@ 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;
« no previous file with comments | « chrome/browser/android/tab_android.cc ('k') | chrome/browser/autocomplete/autocomplete_input.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698