| OLD | NEW | 
|    1 // Copyright 2014 The Chromium Authors. All rights reserved. |    1 // Copyright 2014 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 "components/cronet/android/cronet_library_loader.h" |    5 #include "components/cronet/android/cronet_library_loader.h" | 
|    6  |    6  | 
|    7 #include <jni.h> |    7 #include <jni.h> | 
|    8  |    8  | 
|    9 #include "base/android/base_jni_registrar.h" |    9 #include "base/android/base_jni_registrar.h" | 
|   10 #include "base/android/jni_android.h" |   10 #include "base/android/jni_android.h" | 
|   11 #include "base/android/jni_registrar.h" |   11 #include "base/android/jni_registrar.h" | 
|   12 #include "base/at_exit.h" |   12 #include "base/at_exit.h" | 
|   13 #include "base/logging.h" |   13 #include "base/logging.h" | 
|   14 #include "base/message_loop/message_loop.h" |   14 #include "base/message_loop/message_loop.h" | 
|   15 #include "components/cronet/android/chromium_url_request.h" |   15 #include "components/cronet/android/chromium_url_request.h" | 
|   16 #include "components/cronet/android/chromium_url_request_context.h" |   16 #include "components/cronet/android/chromium_url_request_context.h" | 
|   17 #include "components/cronet/android/cronet_histogram_manager.h" |   17 #include "components/cronet/android/cronet_histogram_manager.h" | 
 |   18 #include "components/cronet/android/cronet_upload_data_stream_delegate.h" | 
|   18 #include "components/cronet/android/cronet_url_request.h" |   19 #include "components/cronet/android/cronet_url_request.h" | 
|   19 #include "components/cronet/android/cronet_url_request_context_adapter.h" |   20 #include "components/cronet/android/cronet_url_request_context_adapter.h" | 
|   20 #include "jni/CronetLibraryLoader_jni.h" |   21 #include "jni/CronetLibraryLoader_jni.h" | 
|   21 #include "net/android/net_jni_registrar.h" |   22 #include "net/android/net_jni_registrar.h" | 
|   22 #include "net/android/network_change_notifier_factory_android.h" |   23 #include "net/android/network_change_notifier_factory_android.h" | 
|   23 #include "net/base/network_change_notifier.h" |   24 #include "net/base/network_change_notifier.h" | 
|   24 #include "url/android/url_jni_registrar.h" |   25 #include "url/android/url_jni_registrar.h" | 
|   25 #include "url/url_util.h" |   26 #include "url/url_util.h" | 
|   26  |   27  | 
|   27 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID) |   28 #if !defined(USE_ICU_ALTERNATIVES_ON_ANDROID) | 
|   28 #include "base/i18n/icu_util.h" |   29 #include "base/i18n/icu_util.h" | 
|   29 #endif |   30 #endif | 
|   30  |   31  | 
|   31 namespace cronet { |   32 namespace cronet { | 
|   32 namespace { |   33 namespace { | 
|   33  |   34  | 
|   34 const base::android::RegistrationMethod kCronetRegisteredMethods[] = { |   35 const base::android::RegistrationMethod kCronetRegisteredMethods[] = { | 
|   35     {"BaseAndroid", base::android::RegisterJni}, |   36     {"BaseAndroid", base::android::RegisterJni}, | 
|   36     {"ChromiumUrlRequest", ChromiumUrlRequestRegisterJni}, |   37     {"ChromiumUrlRequest", ChromiumUrlRequestRegisterJni}, | 
|   37     {"ChromiumUrlRequestContext", ChromiumUrlRequestContextRegisterJni}, |   38     {"ChromiumUrlRequestContext", ChromiumUrlRequestContextRegisterJni}, | 
|   38     {"CronetHistogramManager", CronetHistogramManagerRegisterJni}, |   39     {"CronetHistogramManager", CronetHistogramManagerRegisterJni}, | 
|   39     {"CronetLibraryLoader", RegisterNativesImpl}, |   40     {"CronetLibraryLoader", RegisterNativesImpl}, | 
 |   41     {"CronetUploadDataStreamDelegate", | 
 |   42      CronetUploadDataStreamDelegateRegisterJni}, | 
|   40     {"CronetUrlRequest", CronetUrlRequestRegisterJni}, |   43     {"CronetUrlRequest", CronetUrlRequestRegisterJni}, | 
|   41     {"CronetUrlRequestContextAdapter", |   44     {"CronetUrlRequestContextAdapter", | 
|   42      CronetUrlRequestContextAdapterRegisterJni}, |   45      CronetUrlRequestContextAdapterRegisterJni}, | 
|   43     {"NetAndroid", net::android::RegisterJni}, |   46     {"NetAndroid", net::android::RegisterJni}, | 
|   44     {"UrlAndroid", url::android::RegisterJni}, |   47     {"UrlAndroid", url::android::RegisterJni}, | 
|   45 }; |   48 }; | 
|   46  |   49  | 
|   47 base::AtExitManager* g_at_exit_manager = NULL; |   50 base::AtExitManager* g_at_exit_manager = NULL; | 
|   48 // MessageLoop on the main thread, which is where objects that receive Java |   51 // MessageLoop on the main thread, which is where objects that receive Java | 
|   49 // notifications generally live. |   52 // notifications generally live. | 
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   94   DCHECK(!g_main_message_loop); |   97   DCHECK(!g_main_message_loop); | 
|   95   g_main_message_loop = new base::MessageLoopForUI(); |   98   g_main_message_loop = new base::MessageLoopForUI(); | 
|   96   base::MessageLoopForUI::current()->Start(); |   99   base::MessageLoopForUI::current()->Start(); | 
|   97   DCHECK(!g_network_change_notifier); |  100   DCHECK(!g_network_change_notifier); | 
|   98   net::NetworkChangeNotifier::SetFactory( |  101   net::NetworkChangeNotifier::SetFactory( | 
|   99       new net::NetworkChangeNotifierFactoryAndroid()); |  102       new net::NetworkChangeNotifierFactoryAndroid()); | 
|  100   g_network_change_notifier = net::NetworkChangeNotifier::Create(); |  103   g_network_change_notifier = net::NetworkChangeNotifier::Create(); | 
|  101 } |  104 } | 
|  102  |  105  | 
|  103 }  // namespace cronet |  106 }  // namespace cronet | 
| OLD | NEW |