| 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 ce94aaea1023689846a51820ba1b7d7667e52a2a..8eaf2d20eab92e09356c18ce13dd4bd18a709cd8 100644
|
| --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc
|
| +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc
|
| @@ -31,12 +31,12 @@ DataReductionProxySettingsAndroid::~DataReductionProxySettingsAndroid() {
|
|
|
| jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyAllowed(
|
| JNIEnv* env, jobject obj) {
|
| - return Settings()->params()->allowed();
|
| + return Settings()->Allowed();
|
| }
|
|
|
| jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyPromoAllowed(
|
| JNIEnv* env, jobject obj) {
|
| - return Settings()->params()->promo_allowed();
|
| + return Settings()->PromoAllowed();
|
| }
|
|
|
| jboolean DataReductionProxySettingsAndroid::IsIncludedInAltFieldTrial(
|
| @@ -47,7 +47,7 @@ jboolean DataReductionProxySettingsAndroid::IsIncludedInAltFieldTrial(
|
| ScopedJavaLocalRef<jstring>
|
| DataReductionProxySettingsAndroid::GetDataReductionProxyOrigin(
|
| JNIEnv* env, jobject obj) {
|
| - return ConvertUTF8ToJavaString(env, Settings()->params()->origin().ToURI());
|
| + return ConvertUTF8ToJavaString(env, Settings()->PrimaryOrigin());
|
| }
|
|
|
| jboolean DataReductionProxySettingsAndroid::IsDataReductionProxyEnabled(
|
|
|