Obliterate legacy cronet API. All of its users have been migrated.

components/cronet/android/test/sdch_test_util.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sdch_test_util.h"
 
 #include <string>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #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"
 #include "net/url_request/url_request_context.h"
 #include "url/gurl.h"
 
 using base::android::JavaParamRef;
 
 namespace cronet {
 
@@ skipping 56 matching lines @@
 }
 
 void AddSdchObserverOnNetworkThread(
     const GURL& target_url,
     const base::android::ScopedJavaGlobalRef<jobject>& jsdch_observer_ref,
     CronetURLRequestContextAdapter* context_adapter) {
   AddSdchObserverHelper(target_url, jsdch_observer_ref,
                         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,
                      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));
   CronetURLRequestContextAdapter* context_adapter =
       reinterpret_cast<CronetURLRequestContextAdapter*>(jadapter);
   context_adapter->PostTaskToNetworkThread(
       FROM_HERE,
       base::Bind(&AddSdchObserverOnNetworkThread, target_url,
                  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);
 }
 
 }  // namespace cronet