Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Unified Diff: components/cronet/android/cronet_loader.cc

Issue 726013002: [Cronet] Hook up library loader, system proxy and network change notifier to async api. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compilation error. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/cronet/android/cronet_loader.h ('k') | components/cronet/android/cronet_url_request_adapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/android/cronet_loader.cc
diff --git a/components/cronet/android/cronet_loader.cc b/components/cronet/android/cronet_loader.cc
deleted file mode 100644
index ac68005a7dc53f4c0fe387e689c35a6b5f473ad0..0000000000000000000000000000000000000000
--- a/components/cronet/android/cronet_loader.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// 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/chromium_url_request.h"
-#include "components/cronet/android/chromium_url_request_context.h"
-#include "components/cronet/android/cronet_histogram_manager.h"
-#include "components/cronet/android/cronet_url_request.h"
-#include "components/cronet/android/cronet_url_request_context.h"
-#include "net/android/net_jni_registrar.h"
-#include "url/android/url_jni_registrar.h"
-#include "url/url_util.h"
-
-#if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
-#include "base/i18n/icu_util.h"
-#endif
-
-namespace cronet {
-namespace {
-
-const base::android::RegistrationMethod kCronetRegisteredMethods[] = {
- {"BaseAndroid", base::android::RegisterJni},
- {"ChromiumUrlRequest", ChromiumUrlRequestRegisterJni},
- {"ChromiumUrlRequestContext", ChromiumUrlRequestContextRegisterJni},
- {"CronetHistogramManager", CronetHistogramManagerRegisterJni},
- {"CronetUrlRequest", CronetUrlRequestRegisterJni},
- {"CronetUrlRequestContext", CronetUrlRequestContextRegisterJni},
- {"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.
-jint CronetOnLoad(JavaVM* vm, void* reserved) {
- JNIEnv* env;
- if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
- return -1;
- }
-
- base::android::InitVM(vm);
-
- if (!base::android::RegisterNativeMethods(
- env, kCronetRegisteredMethods, arraysize(kCronetRegisteredMethods))) {
- return -1;
- }
-
- g_at_exit_manager = new base::AtExitManager();
-
-#if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID)
- base::i18n::InitializeICU();
-#endif
-
- url::Initialize();
-
- return JNI_VERSION_1_6;
-}
-
-void CronetOnUnLoad(JavaVM* jvm, void* reserved) {
- if (g_at_exit_manager) {
- delete g_at_exit_manager;
- g_at_exit_manager = NULL;
- }
-}
-
-} // namespace cronet
« no previous file with comments | « components/cronet/android/cronet_loader.h ('k') | components/cronet/android/cronet_url_request_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698