Merge UrlRequest.java into ChromiumUrlRequest.java

components/cronet/android/cronet_jni.cc

 // Copyright 2014 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 "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/at_exit.h"
-#include "components/cronet/android/org_chromium_net_UrlRequest.h"
-#include "components/cronet/android/org_chromium_net_UrlRequestContext.h"
+#include "components/cronet/android/chromium_url_request.h"
+#include "components/cronet/android/chromium_url_request_context.h"
 #include "net/android/net_jni_registrar.h"
 #include "url/android/url_jni_registrar.h"
 
 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
 #include "base/i18n/icu_util.h"
 #endif
 
 namespace {
 
 const base::android::RegistrationMethod kCronetRegisteredMethods[] = {
-  {"BaseAndroid", base::android::RegisterJni},
-  {"NetAndroid", net::android::RegisterJni},
-  {"UrlAndroid", url::android::RegisterJni},
-  {"UrlRequest", cronet::UrlRequestRegisterJni},
-  {"UrlRequestContext", cronet::UrlRequestContextRegisterJni},
+    {"BaseAndroid", base::android::RegisterJni},
+    {"ChromiumUrlRequest", cronet::ChromiumUrlRequestRegisterJni},
+    {"ChromiumUrlRequestContext", cronet::ChromiumUrlRequestContextRegisterJni},
+    {"NetAndroid", net::android::RegisterJni},
+    {"UrlAndroid", url::android::RegisterJni},
 };
 
 base::AtExitManager* g_at_exit_manager = NULL;
 
 }  // namespace
 
 // Checks the available version of JNI. Also, caches Java reflection artifacts.
 extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   JNIEnv* env;
   if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
@@ skipping 16 matching lines @@
   return JNI_VERSION_1_6;
 }
 
 extern "C" void JNIEXPORT JNICALL JNI_OnUnLoad(JavaVM* jvm, void* reserved) {
   if (g_at_exit_manager) {
     delete g_at_exit_manager;
     g_at_exit_manager = NULL;
   }
 }