Index: components/cronet/android/test/sdch_test_util.cc |
diff --git a/components/cronet/android/test/sdch_test_util.cc b/components/cronet/android/test/sdch_test_util.cc |
index 695ca0dfc16d5aa95ca8a60ec452f4d672eff2f1..8d74ea287ddea89dbc7303253a0e5dc8c3c6fbd0 100644 |
--- a/components/cronet/android/test/sdch_test_util.cc |
+++ b/components/cronet/android/test/sdch_test_util.cc |
@@ -12,7 +12,6 @@ |
#include "base/bind.h" |
#include "base/macros.h" |
#include "components/cronet/android/cronet_url_request_context_adapter.h" |
-#include "components/cronet/android/url_request_context_adapter.h" |
#include "jni/SdchObserver_jni.h" |
#include "net/base/sdch_manager.h" |
#include "net/base/sdch_observer.h" |
@@ -89,15 +88,6 @@ void AddSdchObserverOnNetworkThread( |
context_adapter->GetURLRequestContext()); |
} |
-// TODO(xunjieli): Delete this once legacy API is removed. |
-void AddSdchObserverOnNetworkThreadLegacyAPI( |
- const GURL& target_url, |
- const base::android::ScopedJavaGlobalRef<jobject>& jsdch_observer_ref, |
- URLRequestContextAdapter* context_adapter) { |
- AddSdchObserverHelper(target_url, jsdch_observer_ref, |
- context_adapter->GetURLRequestContext()); |
-} |
- |
} // namespace |
void AddSdchObserver(JNIEnv* env, |
@@ -119,24 +109,6 @@ void AddSdchObserver(JNIEnv* env, |
jsdch_observer_ref, base::Unretained(context_adapter))); |
} |
-void AddSdchObserverLegacyAPI(JNIEnv* env, |
- const JavaParamRef<jobject>& jsdch_observer, |
- const JavaParamRef<jstring>& jtarget_url, |
- jlong jadapter) { |
- base::android::ScopedJavaGlobalRef<jobject> jsdch_observer_ref; |
- // ScopedJavaGlobalRef do not hold onto the env reference, so it is safe to |
- // use it across threads. |AddSdchObserverHelper| will acquire a new |
- // JNIEnv before calling into Java. |
- jsdch_observer_ref.Reset(env, jsdch_observer); |
- GURL target_url(base::android::ConvertJavaStringToUTF8(env, jtarget_url)); |
- URLRequestContextAdapter* context_adapter = |
- reinterpret_cast<URLRequestContextAdapter*>(jadapter); |
- context_adapter->PostTaskToNetworkThread( |
- FROM_HERE, |
- base::Bind(&AddSdchObserverOnNetworkThreadLegacyAPI, target_url, |
- jsdch_observer_ref, base::Unretained(context_adapter))); |
-} |
- |
bool RegisterSdchTestUtil(JNIEnv* env) { |
return RegisterNativesImpl(env); |
} |