net/proxy/proxy_config_service_android.cc - Issue 6362186595172352: net: Migrate from googleurl/ includes to url/ ones.

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: net/proxy/proxy_config_service_android.cc

Issue 6362186595172352: net: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase and revert nss_ocsp.cc changes Created 7 years, 5 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:

Index: net/proxy/proxy_config_service_android.cc

diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc

index e7634456e4bc75fb98d1b56e7f1c66dbedda14c7..41bef8a4cd8dbdd91e772a2acc4104932f59e50c 100644

--- a/net/proxy/proxy_config_service_android.cc

+++ b/net/proxy/proxy_config_service_android.cc

@@ -16,12 +16,12 @@

#include "base/memory/ref_counted.h"

#include "base/observer_list.h"

#include "base/sequenced_task_runner.h"

-#include "base/strings/string_util.h"

#include "base/strings/string_tokenizer.h"

-#include "googleurl/src/url_parse.h"

+#include "base/strings/string_util.h"

#include "jni/ProxyChangeListener_jni.h"

#include "net/base/host_port_pair.h"

#include "net/proxy/proxy_config.h"

+#include "url/url_parse.h"

using base::android::AttachCurrentThread;

using base::android::ConvertUTF8ToJavaString;

« no previous file with comments | « net/proxy/proxy_config.h ('k') | net/proxy/proxy_config_service_linux.cc » ('j') | no next file with comments »