| 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 10be12aff8d7541f09b8d355836c4f53a43f2521..497d4cbe279f0df0a4ff0ea1d9ff8fec8e65bbd2 100644
|
| --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc
|
| +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc
|
| @@ -291,8 +291,8 @@ std::string DataReductionProxySettingsAndroid::GetProxyPacScript() {
|
| }
|
|
|
| // Used by generated jni code.
|
| -static jint Init(JNIEnv* env, jobject obj) {
|
| +static jlong Init(JNIEnv* env, jobject obj) {
|
| DataReductionProxySettingsAndroid* settings =
|
| new DataReductionProxySettingsAndroid(env, obj);
|
| - return reinterpret_cast<jint>(settings);
|
| + return reinterpret_cast<intptr_t>(settings);
|
| }
|
|
|