chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc - Issue 863203009: Store Proxy Servers as proxy servers and not GURLs.

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/net/spdyproxy/data_reduction_proxy_settings_android.cc

Issue 863203009: Store Proxy Servers as proxy servers and not GURLs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed failing test code. Created 5 years, 10 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/net/spdyproxy/data_reduction_proxy_settings_android.cc

diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc

index 85dc0b171f84eb274a113f355299023e7316e9c0..ce94aaea1023689846a51820ba1b7d7667e52a2a 100644

--- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc

+++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc

@@ -15,6 +15,7 @@

#include "components/data_reduction_proxy/core/browser/data_reduction_proxy_usage_stats.h"

#include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h"

#include "jni/DataReductionProxySettings_jni.h"

+#include "net/proxy/proxy_server.h"

using base::android::ConvertUTF8ToJavaString;

@@ -46,7 +47,7 @@ jboolean DataReductionProxySettingsAndroid::IsIncludedInAltFieldTrial(

ScopedJavaLocalRef<jstring>

DataReductionProxySettingsAndroid::GetDataReductionProxyOrigin(

JNIEnv* env, jobject obj) {

- return ConvertUTF8ToJavaString(env, Settings()->params()->origin().spec());

+ return ConvertUTF8ToJavaString(env, Settings()->params()->origin().ToURI());

}

jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyEnabled(

« no previous file with comments | « no previous file | chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc » ('j') | no next file with comments »