OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "sdch_test_util.h" | 5 #include "sdch_test_util.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 const GURL& target_url, | 93 const GURL& target_url, |
94 const base::android::ScopedJavaGlobalRef<jobject>& jsdch_observer_ref, | 94 const base::android::ScopedJavaGlobalRef<jobject>& jsdch_observer_ref, |
95 URLRequestContextAdapter* context_adapter) { | 95 URLRequestContextAdapter* context_adapter) { |
96 AddSdchObserverHelper(target_url, jsdch_observer_ref, | 96 AddSdchObserverHelper(target_url, jsdch_observer_ref, |
97 context_adapter->GetURLRequestContext()); | 97 context_adapter->GetURLRequestContext()); |
98 } | 98 } |
99 | 99 |
100 } // namespace | 100 } // namespace |
101 | 101 |
102 void AddSdchObserver(JNIEnv* env, | 102 void AddSdchObserver(JNIEnv* env, |
103 jobject jsdch_observer, | 103 const JavaParamRef<jobject>& jsdch_observer, |
104 jstring jtarget_url, | 104 const JavaParamRef<jstring>& jtarget_url, |
105 jlong jadapter) { | 105 jlong jadapter) { |
106 base::android::ScopedJavaGlobalRef<jobject> jsdch_observer_ref; | 106 base::android::ScopedJavaGlobalRef<jobject> jsdch_observer_ref; |
107 // ScopedJavaGlobalRef do not hold onto the env reference, so it is safe to | 107 // ScopedJavaGlobalRef do not hold onto the env reference, so it is safe to |
108 // use it across threads. |AddSdchObserverHelper| will acquire a new | 108 // use it across threads. |AddSdchObserverHelper| will acquire a new |
109 // JNIEnv before calling into Java. | 109 // JNIEnv before calling into Java. |
110 jsdch_observer_ref.Reset(env, jsdch_observer); | 110 jsdch_observer_ref.Reset(env, jsdch_observer); |
111 | 111 |
112 GURL target_url(base::android::ConvertJavaStringToUTF8(env, jtarget_url)); | 112 GURL target_url(base::android::ConvertJavaStringToUTF8(env, jtarget_url)); |
113 CronetURLRequestContextAdapter* context_adapter = | 113 CronetURLRequestContextAdapter* context_adapter = |
114 reinterpret_cast<CronetURLRequestContextAdapter*>(jadapter); | 114 reinterpret_cast<CronetURLRequestContextAdapter*>(jadapter); |
115 context_adapter->PostTaskToNetworkThread( | 115 context_adapter->PostTaskToNetworkThread( |
116 FROM_HERE, | 116 FROM_HERE, |
117 base::Bind(&AddSdchObserverOnNetworkThread, target_url, | 117 base::Bind(&AddSdchObserverOnNetworkThread, target_url, |
118 jsdch_observer_ref, base::Unretained(context_adapter))); | 118 jsdch_observer_ref, base::Unretained(context_adapter))); |
119 } | 119 } |
120 | 120 |
121 void AddSdchObserverLegacyAPI(JNIEnv* env, | 121 void AddSdchObserverLegacyAPI(JNIEnv* env, |
122 jobject jsdch_observer, | 122 const JavaParamRef<jobject>& jsdch_observer, |
123 jstring jtarget_url, | 123 const JavaParamRef<jstring>& jtarget_url, |
124 jlong jadapter) { | 124 jlong jadapter) { |
125 base::android::ScopedJavaGlobalRef<jobject> jsdch_observer_ref; | 125 base::android::ScopedJavaGlobalRef<jobject> jsdch_observer_ref; |
126 // ScopedJavaGlobalRef do not hold onto the env reference, so it is safe to | 126 // ScopedJavaGlobalRef do not hold onto the env reference, so it is safe to |
127 // use it across threads. |AddSdchObserverHelper| will acquire a new | 127 // use it across threads. |AddSdchObserverHelper| will acquire a new |
128 // JNIEnv before calling into Java. | 128 // JNIEnv before calling into Java. |
129 jsdch_observer_ref.Reset(env, jsdch_observer); | 129 jsdch_observer_ref.Reset(env, jsdch_observer); |
130 GURL target_url(base::android::ConvertJavaStringToUTF8(env, jtarget_url)); | 130 GURL target_url(base::android::ConvertJavaStringToUTF8(env, jtarget_url)); |
131 URLRequestContextAdapter* context_adapter = | 131 URLRequestContextAdapter* context_adapter = |
132 reinterpret_cast<URLRequestContextAdapter*>(jadapter); | 132 reinterpret_cast<URLRequestContextAdapter*>(jadapter); |
133 context_adapter->PostTaskToNetworkThread( | 133 context_adapter->PostTaskToNetworkThread( |
134 FROM_HERE, | 134 FROM_HERE, |
135 base::Bind(&AddSdchObserverOnNetworkThreadLegacyAPI, target_url, | 135 base::Bind(&AddSdchObserverOnNetworkThreadLegacyAPI, target_url, |
136 jsdch_observer_ref, base::Unretained(context_adapter))); | 136 jsdch_observer_ref, base::Unretained(context_adapter))); |
137 } | 137 } |
138 | 138 |
139 bool RegisterSdchTestUtil(JNIEnv* env) { | 139 bool RegisterSdchTestUtil(JNIEnv* env) { |
140 return RegisterNativesImpl(env); | 140 return RegisterNativesImpl(env); |
141 } | 141 } |
142 | 142 |
143 } // namespace cronet | 143 } // namespace cronet |
OLD | NEW |