Index: components/cronet/android/cronet_url_request_context.cc |
diff --git a/components/cronet/android/chromium_url_request_context.cc b/components/cronet/android/cronet_url_request_context.cc |
similarity index 73% |
copy from components/cronet/android/chromium_url_request_context.cc |
copy to components/cronet/android/cronet_url_request_context.cc |
index f870adfe242d0a14d086ad01af4d754e15a13f39..8c0e9664da580eee95eeaeb6ebf95403007fad26 100644 |
--- a/components/cronet/android/chromium_url_request_context.cc |
+++ b/components/cronet/android/cronet_url_request_context.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "components/cronet/android/chromium_url_request_context.h" |
+#include "components/cronet/android/cronet_url_request_context.h" |
#include <string> |
@@ -13,33 +13,34 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/metrics/statistics_recorder.h" |
#include "base/values.h" |
-#include "components/cronet/android/chromium_url_request.h" |
-#include "components/cronet/android/url_request_adapter.h" |
-#include "components/cronet/android/url_request_context_adapter.h" |
+#include "components/cronet/android/cronet_url_request.h" |
+#include "components/cronet/android/cronet_url_request_adapter.h" |
+#include "components/cronet/android/cronet_url_request_context_adapter.h" |
#include "components/cronet/url_request_context_config.h" |
-#include "jni/ChromiumUrlRequestContext_jni.h" |
+#include "jni/CronetUrlRequestContext_jni.h" |
namespace { |
-// Delegate of URLRequestContextAdapter that delivers callbacks to the Java |
+// Delegate of CronetURLRequestContextAdapter that delivers callbacks to the |
+// Java |
// layer. |
-class JniURLRequestContextAdapterDelegate |
- : public cronet::URLRequestContextAdapter:: |
- URLRequestContextAdapterDelegate { |
+class JniCronetURLRequestContextAdapterDelegate |
+ : public cronet::CronetURLRequestContextAdapter:: |
+ CronetURLRequestContextAdapterDelegate { |
public: |
- JniURLRequestContextAdapterDelegate(JNIEnv* env, jobject owner) |
+ JniCronetURLRequestContextAdapterDelegate(JNIEnv* env, jobject owner) |
: owner_(env->NewGlobalRef(owner)) {} |
virtual void OnContextInitialized( |
- cronet::URLRequestContextAdapter* context) OVERRIDE { |
+ cronet::CronetURLRequestContextAdapter* context) OVERRIDE { |
JNIEnv* env = base::android::AttachCurrentThread(); |
- cronet::Java_ChromiumUrlRequestContext_initNetworkThread(env, owner_); |
+ cronet::Java_CronetUrlRequestContext_initNetworkThread(env, owner_); |
// TODO(dplotnikov): figure out if we need to detach from the thread. |
// The documentation says we should detach just before the thread exits. |
} |
protected: |
- virtual ~JniURLRequestContextAdapterDelegate() { |
+ virtual ~JniCronetURLRequestContextAdapterDelegate() { |
JNIEnv* env = base::android::AttachCurrentThread(); |
env->DeleteGlobalRef(owner_); |
} |
@@ -53,7 +54,7 @@ class JniURLRequestContextAdapterDelegate |
namespace cronet { |
// Explicitly register static JNI functions. |
-bool ChromiumUrlRequestContextRegisterJni(JNIEnv* env) { |
+bool CronetUrlRequestContextRegisterJni(JNIEnv* env) { |
return RegisterNativesImpl(env); |
} |
@@ -61,12 +62,8 @@ bool ChromiumUrlRequestContextRegisterJni(JNIEnv* env) { |
static jlong CreateRequestContextAdapter(JNIEnv* env, |
jobject object, |
jobject context, |
- jstring user_agent, |
jint log_level, |
jstring config) { |
- std::string user_agent_string = |
- base::android::ConvertJavaStringToUTF8(env, user_agent); |
- |
std::string config_string = |
base::android::ConvertJavaStringToUTF8(env, config); |
@@ -93,8 +90,8 @@ static jlong CreateRequestContextAdapter(JNIEnv* env, |
logging::SetMinLogLevel(static_cast<int>(log_level)); |
// TODO(dplotnikov): set application context. |
- URLRequestContextAdapter* adapter = new URLRequestContextAdapter( |
- new JniURLRequestContextAdapterDelegate(env, object), user_agent_string); |
+ CronetURLRequestContextAdapter* adapter = new CronetURLRequestContextAdapter( |
+ new JniCronetURLRequestContextAdapterDelegate(env, object)); |
adapter->AddRef(); // Hold onto this ref-counted object. |
adapter->Initialize(context_config.Pass()); |
return reinterpret_cast<jlong>(adapter); |
@@ -104,11 +101,13 @@ static jlong CreateRequestContextAdapter(JNIEnv* env, |
static void ReleaseRequestContextAdapter(JNIEnv* env, |
jobject object, |
jlong urlRequestContextAdapter) { |
- URLRequestContextAdapter* adapter = |
- reinterpret_cast<URLRequestContextAdapter*>(urlRequestContextAdapter); |
+ CronetURLRequestContextAdapter* adapter = |
+ reinterpret_cast<CronetURLRequestContextAdapter*>( |
+ urlRequestContextAdapter); |
// TODO(mef): Revisit this from thread safety point of view: Can we delete a |
// thread while running on that thread? |
- // URLRequestContextAdapter is a ref-counted object, and may have pending |
+ // CronetURLRequestContextAdapter is a ref-counted object, and may have |
+ // pending |
// tasks, |
// so we need to release it instead of deleting here. |
adapter->Release(); |
@@ -132,8 +131,9 @@ static void StartNetLogToFile(JNIEnv* env, |
jobject jcaller, |
jlong urlRequestContextAdapter, |
jstring fileName) { |
- URLRequestContextAdapter* adapter = |
- reinterpret_cast<URLRequestContextAdapter*>(urlRequestContextAdapter); |
+ CronetURLRequestContextAdapter* adapter = |
+ reinterpret_cast<CronetURLRequestContextAdapter*>( |
+ urlRequestContextAdapter); |
std::string file_name = base::android::ConvertJavaStringToUTF8(env, fileName); |
adapter->StartNetLogToFile(file_name); |
} |
@@ -142,8 +142,9 @@ static void StartNetLogToFile(JNIEnv* env, |
static void StopNetLog(JNIEnv* env, |
jobject jcaller, |
jlong urlRequestContextAdapter) { |
- URLRequestContextAdapter* adapter = |
- reinterpret_cast<URLRequestContextAdapter*>(urlRequestContextAdapter); |
+ CronetURLRequestContextAdapter* adapter = |
+ reinterpret_cast<CronetURLRequestContextAdapter*>( |
+ urlRequestContextAdapter); |
adapter->StopNetLog(); |
} |