chrome/browser/android/url_utilities.cc - Issue 1171333003: Move net::FormatUrl and friends outside of //net and into //components

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1171333003: Move net::FormatUrl and friends outside of //net and into //components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase again now that CQ is fixed Created 5 years, 4 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

Index: chrome/browser/android/url_utilities.cc

diff --git a/chrome/browser/android/url_utilities.cc b/chrome/browser/android/url_utilities.cc

index 495a0cd9a4f5d0b8a24de0796254c690dfd49ddd..e9224f43ccf3fe5d1756079d339f43dfda49d9f4 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 "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"

@@ -80,7 +80,7 @@ static jstring FixupUrl(JNIEnv* env,

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)

« no previous file with comments | « chrome/browser/android/tab_android.cc ('k') | chrome/browser/autocomplete/history_url_provider_unittest.cc » ('j') | no next file with comments »